From f2bdc27fe0f79f8f9a3945eb2b1163ce75c56439 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Feb 2025 00:13:18 +0000 Subject: gentoo auto-resync : 16:02:2025 - 00:13:18 --- eclass/Manifest.gz | Bin 40361 -> 40356 bytes eclass/apache-2.eclass | 33 ++++----------------------------- eclass/llvm.org.eclass | 12 +++--------- eclass/python-any-r1.eclass | 6 +++--- eclass/python-r1.eclass | 4 ++-- eclass/python-utils-r1.eclass | 24 ++++++++++++------------ eclass/tests/python-utils-r1.sh | 22 ++++++++++++++++++++-- 7 files changed, 44 insertions(+), 57 deletions(-) (limited to 'eclass') diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz index 04bad1d3d192..a46bf7f258e0 100644 Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass index 352337f551d6..c62d19ed6b28 100644 --- a/eclass/apache-2.eclass +++ b/eclass/apache-2.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: apache-2.eclass @@ -6,7 +6,7 @@ # apache-bugs@gentoo.org # @AUTHOR: # polynomial-c@gentoo.org -# @SUPPORTED_EAPIS: 7 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: Provides a common set of functions for apache-2.x ebuilds # @DESCRIPTION: # This eclass handles apache-2.x ebuild functions such as LoadModule generation @@ -19,7 +19,7 @@ inherit autotools flag-o-matic lua-single multilib ssl-cert toolchain-funcs && die "Do not use this eclass with anything else than www-servers/apache ebuilds!" case ${EAPI} in - 7) ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -132,10 +132,7 @@ _apache2_set_mpms() { _apache2_set_mpms unset -f _apache2_set_mpms -NGHTTP2_VERSION=1.2.1 -if ver_test ${PV} -ge 2.4.55 ; then - NGHTTP2_VERSION=1.50.0 -fi +NGHTTP2_VERSION=1.50.0 # Dependencies RDEPEND=" @@ -412,26 +409,6 @@ generate_load_module() { "${GENTOO_PATCHDIR}"/conf/httpd.conf } -# @FUNCTION: check_upgrade -# @DESCRIPTION: -# This internal function checks if the previous configuration file for built-in -# modules exists in ROOT and prevents upgrade in this case. Users are supposed -# to convert this file to the new APACHE2_MODULES USE_EXPAND variable and remove -# it afterwards. -check_upgrade() { - if [[ -e "${EROOT}"etc/apache2/apache2-builtin-mods ]]; then - eerror "The previous configuration file for built-in modules" - eerror "(${EROOT}etc/apache2/apache2-builtin-mods) exists on your" - eerror "system." - eerror - eerror "Please read https://wiki.gentoo.org/wiki/Project:Apache/Upgrading" - eerror "for detailed information how to convert this file to the new" - eerror "APACHE2_MODULES USE_EXPAND variable." - eerror - die "upgrade not possible with existing ${ROOT}etc/apache2/apache2-builtin-mods" - fi -} - # ============================================================================== # EXPORTED FUNCTIONS # ============================================================================== @@ -442,8 +419,6 @@ check_upgrade() { # creates the apache user and group and informs about CONFIG_SYSVIPC being # needed (we don't depend on kernel sources and therefore cannot check). apache-2_pkg_setup() { - check_upgrade - setup_mpm setup_modules diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass index 77a194ed49f4..2dbb71a54334 100644 --- a/eclass/llvm.org.eclass +++ b/eclass/llvm.org.eclass @@ -72,18 +72,12 @@ if [[ -z ${_LLVM_SOURCE_TYPE+1} ]]; then _LLVM_SOURCE_TYPE=snapshot case ${PV} in + 21.0.0_pre20250215) + EGIT_COMMIT=c30a7f459452d5766da244564bc1d5888346c364 + ;; 21.0.0_pre20250211) EGIT_COMMIT=2cd8207b26ea4269630feba661f68554d7ae3c15 ;; - 21.0.0_pre20250208) - EGIT_COMMIT=6f241e36831927e3aea113cfc017c34fdeda340a - ;; - 21.0.0_pre20250201) - EGIT_COMMIT=bfa7edcc6652bdb37d53e0cec64926aab3f280eb - ;; - 20.0.0_pre20250125) - EGIT_COMMIT=1f26ac10ca1bef40a80be8f81a6f109713bc586f - ;; *) die "Unknown snapshot: ${PV}" ;; diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass index adc7b1bfec47..d581b6a4647f 100644 --- a/eclass/python-any-r1.eclass +++ b/eclass/python-any-r1.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: python-any-r1.eclass @@ -175,7 +175,7 @@ _python_any_set_globals() { _python_export "${i}" PYTHON_PKG_DEP # note: need to strip '=' slot operator for || deps - deps="${PYTHON_PKG_DEP/:=} ${deps}" + deps="${PYTHON_PKG_DEP/=} ${deps}" done deps="|| ( ${deps})" @@ -258,7 +258,7 @@ python_gen_any_dep() { local i_depstr=${depstr//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}} i_depstr=${i_depstr//\$\{PYTHON_SINGLE_USEDEP\}/${PYTHON_SINGLE_USEDEP}} # note: need to strip '=' slot operator for || deps - out="( ${PYTHON_PKG_DEP/:=} ${i_depstr} ) ${out}" + out="( ${PYTHON_PKG_DEP/=} ${i_depstr} ) ${out}" done echo "|| ( ${out})" } diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass index 9b03a269e88b..02d7215320a2 100644 --- a/eclass/python-r1.eclass +++ b/eclass/python-r1.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: python-r1.eclass @@ -518,7 +518,7 @@ python_gen_any_dep() { local i_depstr=${depstr//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}} i_depstr=${i_depstr//\$\{PYTHON_SINGLE_USEDEP\}/${PYTHON_SINGLE_USEDEP}} # note: need to strip '=' slot operator for || deps - out="( ${PYTHON_PKG_DEP/:=} ${i_depstr} ) ${out}" + out="( ${PYTHON_PKG_DEP/=} ${i_depstr} ) ${out}" fi done echo "|| ( ${out})" diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 0cb132b72e3a..affb8e55a50d 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: python-utils-r1.eclass @@ -39,7 +39,7 @@ inherit multiprocessing toolchain-funcs # @DESCRIPTION: # All supported Python implementations, most preferred last. _PYTHON_ALL_IMPLS=( - pypy3 + pypy3 pypy3_11 python3_13t python3_{10..13} ) @@ -137,7 +137,7 @@ _python_set_impls() { # please keep them in sync with _PYTHON_ALL_IMPLS # and _PYTHON_HISTORICAL_IMPLS case ${i} in - pypy3|python3_9|python3_1[0-3]|python3_13t) + pypy3|pypy3_11|python3_9|python3_1[0-3]|python3_13t) ;; jython2_7|pypy|pypy1_[89]|pypy2_0|python2_[5-7]|python3_[1-9]) obsolete+=( "${i}" ) @@ -233,7 +233,8 @@ _python_impl_matches() { return 0 ;; 3.8|3.9|3.1[1-3]) - [[ ${impl%t} == python${pattern/./_} ]] && return 0 + [[ ${impl%t} == python${pattern/./_} || ${impl} == pypy${pattern/./_} ]] && + return 0 ;; *) # unify value style to allow lax matching @@ -304,14 +305,10 @@ _python_export() { local impl var case "${1}" in - python*|jython*) + python*|jython*|pypy|pypy3*) impl=${1/_/.} shift ;; - pypy|pypy3) - impl=${1} - shift - ;; *) impl=${EPYTHON} if [[ -z ${impl} ]]; then @@ -453,7 +450,10 @@ _python_export() { PYTHON_PKG_DEP="dev-lang/python:${impl#python}${PYTHON_REQ_USE:+[${PYTHON_REQ_USE}]}" ;; pypy3) - PYTHON_PKG_DEP=">=dev-lang/pypy-3.10:=[symlink${PYTHON_REQ_USE:+,${PYTHON_REQ_USE}}]" + PYTHON_PKG_DEP="dev-lang/pypy:3.10=[symlink${PYTHON_REQ_USE:+,${PYTHON_REQ_USE}}]" + ;; + pypy3.*) + PYTHON_PKG_DEP="dev-lang/pypy:${impl#pypy}=${PYTHON_REQ_USE:+[${PYTHON_REQ_USE}]}" ;; *) die "Invalid implementation: ${impl}" @@ -641,7 +641,7 @@ python_optimize() { "${PYTHON}" -O -m compileall -j "${jobs}" -q -f -d "${instpath}" "${d}" "${PYTHON}" -OO -m compileall -j "${jobs}" -q -f -d "${instpath}" "${d}" ;; - python*|pypy3) + python*|pypy3*) # Python 3.9+ "${PYTHON}" -m compileall -j "${jobs}" -o 0 -o 1 -o 2 --hardlink-dupes -q -f -d "${instpath}" "${d}" ;; @@ -1080,7 +1080,7 @@ python_fix_shebang() { python|python3) match=1 ;; - python2|python[23].[0-9]|python3.[1-9][0-9]|pypy|pypy3|jython[23].[0-9]) + python2|python[23].[0-9]|python3.[1-9][0-9]|pypy|pypy3|pypy3.[1-9][0-9]|jython[23].[0-9]) # Explicit mismatch. match=1 error=1 diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh index 81c3c6f78158..4969da103566 100755 --- a/eclass/tests/python-utils-r1.sh +++ b/eclass/tests/python-utils-r1.sh @@ -127,11 +127,26 @@ if [[ -x /usr/bin/pypy3 ]]; then test_var PYTHON_SITEDIR pypy3 "/usr/lib*/pypy3.*/site-packages" test_var PYTHON_INCLUDEDIR pypy3 "/usr/include/pypy3.*" fi -test_var PYTHON_PKG_DEP pypy3 '*dev-lang/pypy*:=\[symlink\]' -PYTHON_REQ_USE=sqlite test_var PYTHON_PKG_DEP pypy3 '*dev-lang/pypy*:=\[symlink,sqlite\]' +test_var PYTHON_PKG_DEP pypy3 '*dev-lang/pypy*:3.10=\[symlink\]' +PYTHON_REQ_USE=sqlite test_var PYTHON_PKG_DEP pypy3 '*dev-lang/pypy*:3.10=\[symlink,sqlite\]' test_var PYTHON_SCRIPTDIR pypy3 /usr/lib/python-exec/pypy3 eoutdent +for minor in 11; do + ebegin "Testing pypy3.${minor}" + eindent + test_var EPYTHON "pypy3.${minor}" "pypy3.${minor}" + test_var PYTHON "pypy3.${minor}" "/usr/bin/pypy3.${minor}" + if [[ -x /usr/bin/pypy3.${minor} ]]; then + test_var PYTHON_SITEDIR "pypy3.${minor}" "/usr/lib*/pypy3.${minor}/site-packages" + test_var PYTHON_INCLUDEDIR "pypy3.${minor}" "/usr/include/pypy3.${minor}" + fi + test_var PYTHON_PKG_DEP "pypy3.${minor}" '*dev-lang/pypy*:3.11=' + PYTHON_REQ_USE=sqlite test_var PYTHON_PKG_DEP "pypy3.${minor}" '*dev-lang/pypy*:3.11=\[sqlite\]' + test_var PYTHON_SCRIPTDIR "pypy3.${minor}" "/usr/lib/python-exec/pypy3.${minor}" + eoutdent +done + for EPREFIX in '' /foo; do einfo "Testing python_fix_shebang with EPREFIX=${EPREFIX@Q}" eindent @@ -213,6 +228,9 @@ test_is "_python_impl_matches python3_12 3.12" 0 test_is "_python_impl_matches pypy3 3.10" 0 test_is "_python_impl_matches pypy3 3.11" 1 test_is "_python_impl_matches pypy3 3.12" 1 +test_is "_python_impl_matches pypy3_11 3.10" 1 +test_is "_python_impl_matches pypy3_11 3.11" 0 +test_is "_python_impl_matches pypy3_11 3.12" 1 eoutdent rm "${tmpfile}" -- cgit v1.2.3