From c8e331071da74d11d651ebd32bbf4efbd25e0f8e Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 20 Jun 2024 08:25:07 +0100 Subject: [PATCH 01/12] sys-apps/util-linux: optimize src_unpack See 7e4aeaf563a8d9b6997d872e9ce513e01b7ee022 and 5cc8ea52655a502cf3f1bc818d163e5154c05b3d. Note that as mgorny points out at https://github.com/gentoo/gentoo/pull/37220#discussion_r1646906325, we still unpack twice, so we should look at that next. Signed-off-by: Sam James --- sys-apps/util-linux/util-linux-2.40.1-r3.ebuild | 14 +++----------- sys-apps/util-linux/util-linux-9999.ebuild | 14 +++----------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild index 340527c06ae40..ac289f40eb68a 100644 --- a/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild +++ b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild @@ -116,18 +116,10 @@ src_unpack() { fi if use verify-sig ; then - mkdir "${T}"/verify-sig || die - pushd "${T}"/verify-sig &>/dev/null || die - # Upstream sign the decompressed .tar - # Let's do it separately in ${T} then cleanup to avoid external - # effects on normal unpack. - cp "${DISTDIR}"/${MY_P}.tar.xz . || die - xz -d ${MY_P}.tar.xz || die - verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign - - popd &>/dev/null || die - rm -r "${T}"/verify-sig || die + verify-sig_verify_detached \ + <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz) \ + "${DISTDIR}"/${MY_P}.tar.sign fi default diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index 90d69b34f8779..c9f50b8ca79a8 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -116,18 +116,10 @@ src_unpack() { fi if use verify-sig ; then - mkdir "${T}"/verify-sig || die - pushd "${T}"/verify-sig &>/dev/null || die - # Upstream sign the decompressed .tar - # Let's do it separately in ${T} then cleanup to avoid external - # effects on normal unpack. - cp "${DISTDIR}"/${MY_P}.tar.xz . || die - xz -d ${MY_P}.tar.xz || die - verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign - - popd &>/dev/null || die - rm -r "${T}"/verify-sig || die + verify-sig_verify_detached \ + <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz) \ + "${DISTDIR}"/${MY_P}.tar.sign fi default From 4ce34155c34dbc7bda271b9f92a2f3291baa0d4b Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 20 Jun 2024 08:26:34 +0100 Subject: [PATCH 02/12] x11-plugins/wmmp3: Stabilize 0.12-r2 ppc, #933628 Signed-off-by: Sam James --- x11-plugins/wmmp3/wmmp3-0.12-r2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-plugins/wmmp3/wmmp3-0.12-r2.ebuild b/x11-plugins/wmmp3/wmmp3-0.12-r2.ebuild index 1118757da3603..a2be7f324c989 100644 --- a/x11-plugins/wmmp3/wmmp3-0.12-r2.ebuild +++ b/x11-plugins/wmmp3/wmmp3-0.12-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="~amd64 ppc ~sparc ~x86" IUSE="" RDEPEND="x11-libs/libX11 From 54638734607fa04b21386e47b566d9f33e42349c Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 20 Jun 2024 08:26:36 +0100 Subject: [PATCH 03/12] x11-plugins/wmweather: Stabilize 2.4.8 ppc64, #933630 Signed-off-by: Sam James --- x11-plugins/wmweather/wmweather-2.4.8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-plugins/wmweather/wmweather-2.4.8.ebuild b/x11-plugins/wmweather/wmweather-2.4.8.ebuild index 2fb481c9a1c0f..2ebe3e7ccfc8b 100644 --- a/x11-plugins/wmweather/wmweather-2.4.8.ebuild +++ b/x11-plugins/wmweather/wmweather-2.4.8.ebuild @@ -10,7 +10,7 @@ S="${WORKDIR}/${P}/src" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~mips ~ppc ppc64 ~sparc ~x86" RDEPEND="x11-libs/libX11 x11-libs/libXext From 74096262e64b1b2c4e0ff31db952ea973d3fd91a Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 20 Jun 2024 08:26:37 +0100 Subject: [PATCH 04/12] app-text/tessdata_fast: Stabilize 4.1.0 ppc64, #933634 Signed-off-by: Sam James --- app-text/tessdata_fast/tessdata_fast-4.1.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/tessdata_fast/tessdata_fast-4.1.0.ebuild b/app-text/tessdata_fast/tessdata_fast-4.1.0.ebuild index fdbd66e4efdc8..4208ea595bfb2 100644 --- a/app-text/tessdata_fast/tessdata_fast-4.1.0.ebuild +++ b/app-text/tessdata_fast/tessdata_fast-4.1.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="${URI_PREFIX}eng.traineddata -> eng.traineddata-${P} LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86" IUSE="+osd" RDEPEND="!app-text/tessdata_best From 6e1170891d5cc9e69f41694dd6b9f360262a5a4d Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 20 Jun 2024 08:26:38 +0100 Subject: [PATCH 05/12] app-backup/rdiff-backup: Stabilize 2.2.6 ppc64, #933636 Signed-off-by: Sam James --- app-backup/rdiff-backup/rdiff-backup-2.2.6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-backup/rdiff-backup/rdiff-backup-2.2.6.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.2.6.ebuild index 259082ffc7375..b10de32276e8b 100644 --- a/app-backup/rdiff-backup/rdiff-backup-2.2.6.ebuild +++ b/app-backup/rdiff-backup/rdiff-backup-2.2.6.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rdiff-backup/rdiff-backup" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" # Tests use a tox environment and separate steps for test env preparation RESTRICT="test" From a65cbc8ba1661f70bbee539d338a9050c6df7df3 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 20 Jun 2024 08:26:39 +0100 Subject: [PATCH 06/12] app-crypt/easy-rsa: Stabilize 3.2.0 ppc64, #933638 Signed-off-by: Sam James --- app-crypt/easy-rsa/easy-rsa-3.2.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-crypt/easy-rsa/easy-rsa-3.2.0.ebuild b/app-crypt/easy-rsa/easy-rsa-3.2.0.ebuild index dfc60f804c7fe..e62052e5f57af 100644 --- a/app-crypt/easy-rsa/easy-rsa-3.2.0.ebuild +++ b/app-crypt/easy-rsa/easy-rsa-3.2.0.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86" DEPEND=">=dev-libs/openssl-0.9.6:0=" RDEPEND="${DEPEND}" From 1919c8b044079ee404bbbe8b584676535a49dc70 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 20 Jun 2024 08:26:40 +0100 Subject: [PATCH 07/12] net-dns/dnssec-root: Stabilize 20210902 ppc64, #933644 Signed-off-by: Sam James --- net-dns/dnssec-root/dnssec-root-20210902.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-dns/dnssec-root/dnssec-root-20210902.ebuild b/net-dns/dnssec-root/dnssec-root-20210902.ebuild index 69d9b0620c5e7..b68cd009f5197 100644 --- a/net-dns/dnssec-root/dnssec-root-20210902.ebuild +++ b/net-dns/dnssec-root/dnssec-root-20210902.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://data.iana.org/root-anchors/root-anchors.xml -> root-anchors-${P LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" IUSE="" BDEPEND=">=dev-perl/XML-XPath-1.420.0" From 819d45153de4706f795310e0c5081b78a5717f4e Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 20 Jun 2024 08:26:42 +0100 Subject: [PATCH 08/12] dev-db/redis: Stabilize 7.2.5 arm64, #934585 Signed-off-by: Sam James --- dev-db/redis/redis-7.2.5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-db/redis/redis-7.2.5.ebuild b/dev-db/redis/redis-7.2.5.ebuild index b82b9e409b2fa..ca63086bc02b0 100644 --- a/dev-db/redis/redis-7.2.5.ebuild +++ b/dev-db/redis/redis-7.2.5.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://download.redis.io/releases/${P}.tar.gz" LICENSE="BSD Boost-1.0" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="+jemalloc selinux ssl systemd tcmalloc test" RESTRICT="!test? ( test )" From 9e5a18fae806d289ee772b48f687e96db871115c Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 20 Jun 2024 08:28:53 +0100 Subject: [PATCH 09/12] app-crypt/easy-rsa: Stabilize 3.2.0 arm, #933638 Signed-off-by: Sam James --- app-crypt/easy-rsa/easy-rsa-3.2.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-crypt/easy-rsa/easy-rsa-3.2.0.ebuild b/app-crypt/easy-rsa/easy-rsa-3.2.0.ebuild index e62052e5f57af..caa7903176dbc 100644 --- a/app-crypt/easy-rsa/easy-rsa-3.2.0.ebuild +++ b/app-crypt/easy-rsa/easy-rsa-3.2.0.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86" DEPEND=">=dev-libs/openssl-0.9.6:0=" RDEPEND="${DEPEND}" From 6e50fceb9b77da5cfbd6862b6b0d3c3986e36a40 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 20 Jun 2024 08:28:54 +0100 Subject: [PATCH 10/12] net-dns/dnssec-root: Stabilize 20210902 arm, #933644 Signed-off-by: Sam James --- net-dns/dnssec-root/dnssec-root-20210902.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-dns/dnssec-root/dnssec-root-20210902.ebuild b/net-dns/dnssec-root/dnssec-root-20210902.ebuild index b68cd009f5197..bf9a30588897c 100644 --- a/net-dns/dnssec-root/dnssec-root-20210902.ebuild +++ b/net-dns/dnssec-root/dnssec-root-20210902.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://data.iana.org/root-anchors/root-anchors.xml -> root-anchors-${P LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" +KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" IUSE="" BDEPEND=">=dev-perl/XML-XPath-1.420.0" From 15fbf774e0357c750bd1934592370223c595b6bd Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Wed, 19 Jun 2024 14:11:51 +0200 Subject: [PATCH 11/12] readme.gentoo-r1.eclass: fix description of DISABLE_AUTOFORMATTING by s/fmt/fold/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The autoformatting tool was switched from fmt to fold in 3f9cdecb18c6 ("Change formatting tool as discussed with Ulrich Müller in bug #460050, thanks a lot to him for his help.") but the description of the DISABLE_AUTOFORMATTING variable still talks about fmt being used. See also https://bugs.gentoo.org/460050#c7 Signed-off-by: Florian Schmaus --- eclass/readme.gentoo-r1.eclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eclass/readme.gentoo-r1.eclass b/eclass/readme.gentoo-r1.eclass index 202ba31f4f708..35c3d37485501 100644 --- a/eclass/readme.gentoo-r1.eclass +++ b/eclass/readme.gentoo-r1.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: readme.gentoo-r1.eclass @@ -34,8 +34,8 @@ esac # @DEFAULT_UNSET # @DESCRIPTION: # If non-empty, DOC_CONTENTS information will be strictly respected, -# not getting it automatically formatted by fmt. If empty, it will -# rely on fmt for formatting and 'echo -e' options to tweak lines a bit. +# not getting it automatically formatted by fold. If empty, it will +# rely on fold for formatting and 'echo -e' options to tweak lines a bit. # @ECLASS_VARIABLE: FORCE_PRINT_ELOG # @DEFAULT_UNSET From 5f5fe1e48984b8d2dc0202ac734a4feb49b46568 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Thu, 20 Jun 2024 09:29:36 +0200 Subject: [PATCH 12/12] readme.gentoo-r1.eclass: use two spaces after full stop Signed-off-by: Florian Schmaus --- eclass/readme.gentoo-r1.eclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eclass/readme.gentoo-r1.eclass b/eclass/readme.gentoo-r1.eclass index 35c3d37485501..48023d9c049f8 100644 --- a/eclass/readme.gentoo-r1.eclass +++ b/eclass/readme.gentoo-r1.eclass @@ -10,7 +10,7 @@ # @BLURB: install a doc file shown via elog messages # @DESCRIPTION: # An eclass for installing a README.gentoo doc file recording tips -# shown via elog messages. With this eclass, those elog messages will only be +# shown via elog messages. With this eclass, those elog messages will only be # shown at first package installation and a file for later reviewing will be # installed under /usr/share/doc/${PF} # @@ -34,7 +34,7 @@ esac # @DEFAULT_UNSET # @DESCRIPTION: # If non-empty, DOC_CONTENTS information will be strictly respected, -# not getting it automatically formatted by fold. If empty, it will +# not getting it automatically formatted by fold. If empty, it will # rely on fold for formatting and 'echo -e' options to tweak lines a bit. # @ECLASS_VARIABLE: FORCE_PRINT_ELOG @@ -50,7 +50,7 @@ esac # @FUNCTION: readme.gentoo_create_doc # @DESCRIPTION: # Create doc file with ${DOC_CONTENTS} variable (preferred) and, if not set, -# look for "${FILESDIR}/README.gentoo" contents. You can use +# look for "${FILESDIR}/README.gentoo" contents. You can use # ${FILESDIR}/README.gentoo-${SLOT} also. # Usually called at src_install phase. readme.gentoo_create_doc() { @@ -84,7 +84,7 @@ readme.gentoo_create_doc() { # @FUNCTION: readme.gentoo_print_elog # @DESCRIPTION: -# Print elog messages with "${T}"/README.gentoo contents. They will be +# Print elog messages with "${T}"/README.gentoo contents. They will be # shown only when package is installed at first time. # Usually called at pkg_postinst phase. #