mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
Merge updates from master
This commit is contained in:
Repository mirror & CI
@@ -10,12 +10,12 @@ inherit desktop font optfeature python-single-r1 cmake verify-sig xdg
|
||||
DESCRIPTION="WYSIWYM (What You See Is What You Mean) document processor based on LaTeX"
|
||||
HOMEPAGE="https://www.lyx.org/"
|
||||
SRC_URI="
|
||||
http://ftp.lyx.org/pub/lyx/stable/$(ver_cut 1-2).x/${P/_rc/~RC}.tar.xz
|
||||
http://ftp.lyx.org/pub/lyx/devel/lyx-$(ver_cut 1-2)/${P/_rc/~RC}.tar.xz
|
||||
http://ftp.lyx.org/pub/lyx/stable/$(ver_cut 1-2).x/${P/_rc/~RC}.tar.xz.sig
|
||||
http://ftp.lyx.org/pub/lyx/devel/lyx-$(ver_cut 1-2)/${P/_rc/~RC}.tar.xz.sig
|
||||
http://ftp.lyx.org/pub/lyx/stable/$(ver_cut 1-2).x/${P/_rc/\~RC}.tar.xz
|
||||
http://ftp.lyx.org/pub/lyx/devel/lyx-$(ver_cut 1-2)/${P/_rc/\~RC}.tar.xz
|
||||
http://ftp.lyx.org/pub/lyx/stable/$(ver_cut 1-2).x/${P/_rc/\~RC}.tar.xz.sig
|
||||
http://ftp.lyx.org/pub/lyx/devel/lyx-$(ver_cut 1-2)/${P/_rc/\~RC}.tar.xz.sig
|
||||
"
|
||||
S=${WORKDIR}/${P/_rc/~RC}
|
||||
S=${WORKDIR}/${P/_rc/\~RC}
|
||||
|
||||
LICENSE="GPL-2+"
|
||||
SLOT="0"
|
||||
|
||||
@@ -10,14 +10,14 @@ inherit desktop font optfeature python-single-r1 cmake verify-sig xdg
|
||||
DESCRIPTION="WYSIWYM (What You See Is What You Mean) document processor based on LaTeX"
|
||||
HOMEPAGE="https://www.lyx.org/"
|
||||
SRC_URI="
|
||||
http://ftp.lyx.org/pub/lyx/stable/$(ver_cut 1-2).x/${P/_rc/~RC}.tar.xz
|
||||
http://ftp.lyx.org/pub/lyx/devel/lyx-$(ver_cut 1-2)/${P/_rc/~RC}.tar.xz
|
||||
http://ftp.lyx.org/pub/lyx/stable/$(ver_cut 1-2).x/${P/_rc/\~RC}.tar.xz
|
||||
http://ftp.lyx.org/pub/lyx/devel/lyx-$(ver_cut 1-2)/${P/_rc/\~RC}.tar.xz
|
||||
verify-sig? (
|
||||
http://ftp.lyx.org/pub/lyx/stable/$(ver_cut 1-2).x/${P/_rc/~RC}.tar.xz.sig
|
||||
http://ftp.lyx.org/pub/lyx/devel/lyx-$(ver_cut 1-2)/${P/_rc/~RC}.tar.xz.sig
|
||||
http://ftp.lyx.org/pub/lyx/stable/$(ver_cut 1-2).x/${P/_rc/\~RC}.tar.xz.sig
|
||||
http://ftp.lyx.org/pub/lyx/devel/lyx-$(ver_cut 1-2)/${P/_rc/\~RC}.tar.xz.sig
|
||||
)
|
||||
"
|
||||
S=${WORKDIR}/${P/_rc/~RC}
|
||||
S=${WORKDIR}/${P/_rc/\~RC}
|
||||
|
||||
LICENSE="GPL-2+"
|
||||
SLOT="0"
|
||||
|
||||
@@ -21,7 +21,7 @@ if [[ -z ${_CARGO_ECLASS} ]]; then
|
||||
_CARGO_ECLASS=1
|
||||
|
||||
if [[ -n ${RUST_NEEDS_LLVM} ]]; then
|
||||
inherit llvm-r1
|
||||
inherit llvm-r1
|
||||
fi
|
||||
|
||||
if [[ -n ${CARGO_OPTIONAL} ]]; then
|
||||
@@ -310,7 +310,7 @@ _cargo_set_crate_uris() {
|
||||
local crate commit crate_uri crate_dir host repo_ext feat_expr
|
||||
|
||||
for crate in "${!GIT_CRATES[@]}"; do
|
||||
IFS=';' read -r crate_uri commit crate_dir host <<< "${GIT_CRATES[${crate}]}" || die "${ECLASS}: could not create heredoc"
|
||||
IFS=';' read -rd '' crate_uri commit crate_dir host < <(printf %s "${GIT_CRATES[${crate}]}")
|
||||
|
||||
if [[ -z ${host} ]]; then
|
||||
case "${crate_uri}" in
|
||||
|
||||
@@ -376,7 +376,8 @@ _ngx_set_mod_required_use() {
|
||||
if has "${mod}" "${_NGX_MODULES[@]#+}"; then
|
||||
result=''
|
||||
# Feed comma-delimited dependencies into the dep_list array.
|
||||
IFS=, read -ra dep_list <<< "${_NGX_DEP_TABLE[${mod}]}"
|
||||
mapfile -td ',' dep_list < <(printf %s "${_NGX_DEP_TABLE[${mod}]}")
|
||||
|
||||
for dep in "${dep_list[@]}"; do
|
||||
has "${dep}" "${_NGX_MODULES[@]#+}" &&
|
||||
result+=" nginx_modules_${dep}"
|
||||
|
||||
@@ -68,7 +68,7 @@ _sec_keys_set_globals() {
|
||||
for key in "${SEC_KEYS_VALIDPGPKEYS[@]}"; do
|
||||
fingerprint=${key%%:*}
|
||||
name=${key#${fingerprint}:}; name=${name%%:*}
|
||||
IFS=, read -r -a locations <<<"${key##*:}"
|
||||
mapfile -td ',' locations < <(printf %s "${key##*:}")
|
||||
[[ ${locations[@]} ]] || die "${ECLASS}: ${name}: PGP key remote is mandatory"
|
||||
for loc in "${locations[@]}"; do
|
||||
case ${loc} in
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{11..14} )
|
||||
MY_P=${P/_rc2/~rc2}
|
||||
MY_P=${P/_rc2/\~rc2}
|
||||
|
||||
inherit autotools flag-o-matic python-single-r1
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{11..14} )
|
||||
MY_P=${P/_rc2/~rc2}
|
||||
MY_P=${P/_rc2/\~rc2}
|
||||
|
||||
inherit autotools flag-o-matic python-single-r1
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@@ -35,7 +35,7 @@ DATASETS=(
|
||||
)
|
||||
|
||||
for DATASET in ${!DATASETS[@]}; do
|
||||
read FILENAME VERSION ENVVAR <<< "${DATASETS[$DATASET]}"
|
||||
read -rd '' FILENAME VERSION ENVVAR < <(printf %s "${DATASETS[$DATASET]}")
|
||||
SRC_URI+="${SRC_DATA}/${FILENAME}.${VERSION}.tar.gz "
|
||||
done
|
||||
unset DATASET FILENAME VERSION ENVVAR
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@@ -35,7 +35,7 @@ DATASETS=(
|
||||
)
|
||||
|
||||
for DATASET in ${!DATASETS[@]}; do
|
||||
read FILENAME VERSION ENVVAR <<< "${DATASETS[$DATASET]}"
|
||||
read -rd '' FILENAME VERSION ENVVAR < <(printf %s "${DATASETS[$DATASET]}")
|
||||
SRC_URI+="${SRC_DATA}/${FILENAME}.${VERSION}.tar.gz "
|
||||
done
|
||||
unset DATASET FILENAME VERSION ENVVAR
|
||||
|
||||
@@ -91,7 +91,7 @@ QA_FLAGS_IGNORED="
|
||||
|
||||
submodule_uris() {
|
||||
for line in "${SUBMODULES[@]}"; do
|
||||
read -r name hoster dep url commit <<< "${line}" || die
|
||||
read -rd '' name hoster dep url commit < <(printf %s "${line}")
|
||||
|
||||
if [ ${hoster} == "github" ];
|
||||
then
|
||||
|
||||
Reference in New Issue
Block a user