Merge updates from master

dev-python/beniget/beniget-0.4.1-r1.ebuild

@@ -1,9 +1,9 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1

dev-tex/pdfannotextractor/pdfannotextractor-0.2-r2.ebuild

@@ -24,9 +24,6 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~x64-macos"
 
-CP_DEPEND="
-	dev-java/commons-logging:0
-"
 COMMON_DEPEND="virtual/latex-base"
 DEPEND="
 	${COMMON_DEPEND}
@@ -34,8 +31,8 @@ DEPEND="
 "
 BDEPEND="app-arch/unzip"
 RDEPEND="
-	${CP_DEPEND}
-	${COMMIN_DEPEND}
+	dev-java/commons-logging:0
+	${COMMON_DEPEND}
 	virtual/perl-Getopt-Long
 	dev-perl/File-Which
 	>=virtual/jre-11
@@ -43,9 +40,6 @@ RDEPEND="
 "
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="
-	commons-logging
-"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.2-javajars.patch
@@ -69,6 +63,7 @@ src_compile() {
 src_install() {
 	java-pkg_dojar scripts/pax.jar pdfbox.jar fontbox.jar
 	java-pkg_dolauncher ${PN} --main pax.PDFAnnotExtractor
+	java-pkg_addcp "$(java-pkg_getjars --runtime-only --with-dependencies commons-logging)"
 
 	insinto ${TEXMF}/latex/pax
 	doins tex/pax.sty

eclass/java-utils-2.eclass

@@ -1137,7 +1137,7 @@ java-pkg_jarfrom() {
 }
 
 # @FUNCTION: java-pkg_getjars
-# @USAGE: [--build-only] [--with-dependencies] <package1>[,<package2>...]
+# @USAGE: [--build-only] [--runtime-only] [--with-dependencies] <package1>[,<package2>...]
 # @DESCRIPTION:
 # Get the classpath provided by any number of packages
 # Among other things, this can be passed to 'javac -classpath' or 'ant -lib'.
@@ -1157,6 +1157,7 @@ java-pkg_jarfrom() {
 # Parameters:
 #	--build-only - makes the jar(s) not added into package.env DEPEND line.
 #	  (assumed automatically when called inside src_test)
+#	--runtime-only - marks the jar(s) not added into package.env RDEPEND line.
 #	--with-dependencies - get jars also from requested package's dependencies
 #	  transitively.
 # $1 - list of packages to get jars from
@@ -1165,6 +1166,7 @@ java-pkg_jarfrom() {
 java-pkg_getjars() {
 	debug-print-function ${FUNCNAME} $*
 
+	local dep_constraint
 	local build_only=""
 	local deep=""
 
@@ -1173,6 +1175,9 @@ java-pkg_getjars() {
 	while [[ "${1}" == --* ]]; do
 		if [[ "${1}" = "--build-only" ]]; then
 			build_only="build"
+			dep_constraint="build"
+		elif [[ "${1}" = "--runtime-only" ]]; then
+			dep_constraint="runtime"
 		elif [[ "${1}" = "--with-dependencies" ]]; then
 			deep="--with-dependencies"
 		else
@@ -1191,7 +1196,7 @@ java-pkg_getjars() {
 	debug-print "${pkgs}:${jars}"
 
 	for pkg in ${pkgs//,/ }; do
-		java-pkg_ensure-dep "${build_only}" "${pkg}"
+		java-pkg_ensure-dep "${dep_constraint}" "${pkg}"
 	done
 
 	for pkg in ${pkgs//,/ }; do
@@ -1808,7 +1813,6 @@ java-pkg_ant-tasks-depend() {
 	fi
 }
 
-
 # @FUNCTION: ejunit_
 # @INTERNAL
 # @DESCRIPTION:

net-misc/asterisk-g729/asterisk-g729-16.0.3.1.10.ebuild

@@ -22,7 +22,7 @@ amd64? (
 
 LICENSE="Digium"
 SLOT="0/${AST_PV}"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="=net-misc/asterisk-$(ver_cut 1)*"
 

net-misc/asterisk-g729/asterisk-g729-18.0.3.1.10.ebuild

@@ -22,7 +22,7 @@ amd64? (
 
 LICENSE="Digium"
 SLOT="0/${AST_PV}"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="=net-misc/asterisk-$(ver_cut 1)*"