From ed8790423bbbf2b2636f21f1f2937020d9d4bcd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Van=C4=9Bk?= Date: Wed, 26 Jun 2024 08:15:24 +0200 Subject: [PATCH 1/5] dev-python/beniget: enable py3.13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Petr Vaněk --- dev-python/beniget/beniget-0.4.1-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-python/beniget/beniget-0.4.1-r1.ebuild b/dev-python/beniget/beniget-0.4.1-r1.ebuild index 2724ad10c0f47..217cf3a0f4669 100644 --- a/dev-python/beniget/beniget-0.4.1-r1.ebuild +++ b/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 From 58a14ddf9fde291e1000b0ec804c0c6e875f3540 Mon Sep 17 00:00:00 2001 From: Joonas Niilola Date: Wed, 26 Jun 2024 09:19:38 +0300 Subject: [PATCH 2/5] net-misc/asterisk-g729: Stabilize 16.0.3.1.10 amd64, #934891 Signed-off-by: Joonas Niilola --- net-misc/asterisk-g729/asterisk-g729-16.0.3.1.10.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.10.ebuild b/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.10.ebuild index 9a1121ec9fb73..ba68b2878ec97 100644 --- a/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.10.ebuild +++ b/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)*" From 45e3631b53eda215ea17306adb8b689ec2279efb Mon Sep 17 00:00:00 2001 From: Joonas Niilola Date: Wed, 26 Jun 2024 09:19:38 +0300 Subject: [PATCH 3/5] net-misc/asterisk-g729: Stabilize 18.0.3.1.10 amd64, #934891 Signed-off-by: Joonas Niilola --- net-misc/asterisk-g729/asterisk-g729-18.0.3.1.10.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.10.ebuild b/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.10.ebuild index 9a1121ec9fb73..ba68b2878ec97 100644 --- a/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.10.ebuild +++ b/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)*" From 67ffceb423d8517ad2911d289ec6e999862bd570 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Tue, 25 Jun 2024 11:08:47 +0200 Subject: [PATCH 4/5] java-utils-2.eclass: add --runtime-only argument to java-pkg_getjars Some packages only need the jar at runtime, not at compile time. For example https://bugs.gentoo.org/934659#c2 Bug: https://bugs.gentoo.org/934659 Signed-off-by: Florian Schmaus --- eclass/java-utils-2.eclass | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index adbc5242053ad..3c2d190c4c152 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -1137,7 +1137,7 @@ java-pkg_jarfrom() { } # @FUNCTION: java-pkg_getjars -# @USAGE: [--build-only] [--with-dependencies] [,...] +# @USAGE: [--build-only] [--runtime-only] [--with-dependencies] [,...] # @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: From 1caa504d29e682992f287e15d649ceac986ae18b Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Tue, 25 Jun 2024 10:44:54 +0200 Subject: [PATCH 5/5] dev-tex/pdfannotextractor: fix typo s/COMMIN/COMMON, do not use CP_DEPEND Closes: https://bugs.gentoo.org/934659 Closes: https://github.com/gentoo/gentoo/pull/37290 Signed-off-by: Florian Schmaus --- ...-0.2-r1.ebuild => pdfannotextractor-0.2-r2.ebuild} | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) rename dev-tex/pdfannotextractor/{pdfannotextractor-0.2-r1.ebuild => pdfannotextractor-0.2-r2.ebuild} (93%) diff --git a/dev-tex/pdfannotextractor/pdfannotextractor-0.2-r1.ebuild b/dev-tex/pdfannotextractor/pdfannotextractor-0.2-r2.ebuild similarity index 93% rename from dev-tex/pdfannotextractor/pdfannotextractor-0.2-r1.ebuild rename to dev-tex/pdfannotextractor/pdfannotextractor-0.2-r2.ebuild index f00e284e201ad..2e8ffce4d1fcb 100644 --- a/dev-tex/pdfannotextractor/pdfannotextractor-0.2-r1.ebuild +++ b/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