From 172d10efdbb66e1835349b8ac1a46e2019915088 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 12 Jan 2026 07:10:59 +0000 Subject: [PATCH] app-portage/portage-utils: Sync with Gentoo It's from Gentoo commit 3816b605960bb758a7f2271b15fa1bb3dacf209e. Signed-off-by: Flatcar Buildbot --- .../app-portage/portage-utils/Manifest | 4 +- .../app-portage/portage-utils/metadata.xml | 1 - .../portage-utils-0.95-r1.ebuild | 75 ------------------- .../portage-utils-0.96-r1.ebuild | 75 ------------------- .../portage-utils/portage-utils-0.97.ebuild | 2 +- ....96.1.ebuild => portage-utils-0.99.ebuild} | 52 ++++++++----- .../portage-utils/portage-utils-9999.ebuild | 2 +- 7 files changed, 38 insertions(+), 173 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.95-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.96-r1.ebuild rename sdk_container/src/third_party/portage-stable/app-portage/portage-utils/{portage-utils-0.96.1.ebuild => portage-utils-0.99.ebuild} (64%) diff --git a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/Manifest b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/Manifest index bbb5571ae0..1047f1ff58 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/Manifest @@ -1,4 +1,2 @@ -DIST portage-utils-0.95.tar.xz 1806140 BLAKE2B 5a468a7b4006073203ba634a5d70398e254ef5db7e9b71fbcf20bce68942f74acce1d42b5d315931f93e8698c8dd2f38f328fcc6fdaa86addba7dbcc21fce5fa SHA512 2d1f4b986a377249043259d8ada1a35a7dd55179f0ef5c2c18a4180c8f1f7064133ab2677426098e61b1355fa26cb0f8aa3c6ea06d46af4c4ba2df4eb53489a4 -DIST portage-utils-0.96.1.tar.xz 1807156 BLAKE2B 6bf334c0083e5e8b0d6206ff43d4df0e32a9576ddedbe055cb6ef903b5f11d0878512ace7f93ea37207181321ca160a8f721b3095b2bcbfcdbb353ba3f5d4873 SHA512 769e734e0738aa52408fd6c151706085148818a19b2ad1051684e2d54fe9f486f2e3a25e8fb408c83325cfb428644c6c0aa3b6d1bac0d2189680c70d9657bcbf -DIST portage-utils-0.96.tar.xz 1806032 BLAKE2B 93ef9658a4b0bae7fb0527462bd9d0d19f396262818380d8ec2022c9fda596265c50adc262bdf296a4dd8c6b891b064316281d21444c8b903db20ca2463879e3 SHA512 cc32f53532c082544cabe505d8b90b947b6ab48742678aa98cbe9ba291625e8449ed0ecd90e01dc00b06c209b34001ad57a060918658e53d3babdc5c76ea7b02 DIST portage-utils-0.97.tar.xz 1861616 BLAKE2B bdb4c6c1260a00304fb2c659629e0ddd4ca0378b1a060ea8b1f02ecb6060b4101c6e8984a6befd8b831a2b415fcdc5a51b6dac2fb203b36585f4a7d389ea0913 SHA512 f0f9ecf87df6e08b7f7dbdfe758c1a585a6836478d3adbcecdc2e33c9cfd78a5a10ae3090f0aa5ad0fa8a1eff88bf9e512d861b46bc77e5a536b46a3b36cd466 +DIST portage-utils-0.99.tar.xz 2093056 BLAKE2B 8c857140103b01a51e3a1acb38df2d9e281e17b522445628b14c0eb4894ec929682d5417a056902ab9640ccd8e3ed31310d11b26856b443dbc7ffb4ad256c870 SHA512 10952eedb055dd064e59ad00c76d20bb13c683908d27c431e1d403c07b1896d0882f75fe96b23b1335dda6ac9670acc476f716420130a45e17fc64eafc2da084 diff --git a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/metadata.xml b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/metadata.xml index 628d617954..d93835b0df 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/metadata.xml @@ -9,7 +9,6 @@ Build GLEP-78 gpkg support in qpkg Build gtree repository cache support Build qmanifest applet, this adds additional dependencies for GPG, OpenSSL and BLAKE2B hashing - Build qtegrity applet, this adds additional dependencies for OpenSSL proj/portage-utils diff --git a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.95-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.95-r1.ebuild deleted file mode 100644 index 2bc5f96ae9..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.95-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Small and fast Portage helper tools written in C" -HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 autotools - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git" -else - SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="openmp +qmanifest +qtegrity static" - -RDEPEND=" - openmp? ( || ( - sys-devel/gcc:*[openmp] - llvm-runtimes/openmp - ) ) - qmanifest? ( - !static? ( - app-crypt/gpgme:= - app-crypt/libb2:= - dev-libs/openssl:= - virtual/zlib:= - ) - ) - qtegrity? ( - !static? ( - dev-libs/openssl:= - ) - )" -DEPEND="${RDEPEND} - qmanifest? ( - static? ( - app-crypt/gpgme[static-libs] - app-crypt/libb2[static-libs] - dev-libs/openssl[static-libs] - virtual/zlib:=[static-libs] - ) - ) - qtegrity? ( - static? ( - dev-libs/openssl[static-libs] - ) - )" -BDEPEND="virtual/pkgconfig" - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - default - [[ ${PV} == *9999 ]] && eautoreconf -} - -src_configure() { - use static && append-ldflags -static - - econf \ - --disable-maintainer-mode \ - --with-eprefix="${EPREFIX}" \ - $(use_enable qmanifest) \ - $(use_enable qtegrity) \ - $(use_enable openmp) -} diff --git a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.96-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.96-r1.ebuild deleted file mode 100644 index 2bc5f96ae9..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.96-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Small and fast Portage helper tools written in C" -HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 autotools - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git" -else - SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="openmp +qmanifest +qtegrity static" - -RDEPEND=" - openmp? ( || ( - sys-devel/gcc:*[openmp] - llvm-runtimes/openmp - ) ) - qmanifest? ( - !static? ( - app-crypt/gpgme:= - app-crypt/libb2:= - dev-libs/openssl:= - virtual/zlib:= - ) - ) - qtegrity? ( - !static? ( - dev-libs/openssl:= - ) - )" -DEPEND="${RDEPEND} - qmanifest? ( - static? ( - app-crypt/gpgme[static-libs] - app-crypt/libb2[static-libs] - dev-libs/openssl[static-libs] - virtual/zlib:=[static-libs] - ) - ) - qtegrity? ( - static? ( - dev-libs/openssl[static-libs] - ) - )" -BDEPEND="virtual/pkgconfig" - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - default - [[ ${PV} == *9999 ]] && eautoreconf -} - -src_configure() { - use static && append-ldflags -static - - econf \ - --disable-maintainer-mode \ - --with-eprefix="${EPREFIX}" \ - $(use_enable qmanifest) \ - $(use_enable qtegrity) \ - $(use_enable openmp) -} diff --git a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.97.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.97.ebuild index 46da0dbb61..4da9374dda 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.97.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.97.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git" else SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris" fi LICENSE="GPL-2" diff --git a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.96.1.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.99.ebuild similarity index 64% rename from sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.96.1.ebuild rename to sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.99.ebuild index 73c1d31bf3..f2dde63249 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.96.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.99.ebuild @@ -13,14 +13,26 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git" else SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris" fi LICENSE="GPL-2" SLOT="0" -IUSE="openmp +qmanifest +qtegrity static" +IUSE="+gpkg gtree openmp +qmanifest static" RDEPEND=" + gpkg? ( + !static? ( + app-crypt/gpgme:= + app-arch/libarchive:= + ) + ) + gtree? ( + !static? ( + app-crypt/gpgme:= + app-arch/libarchive:=[zstd] + ) + ) openmp? ( || ( sys-devel/gcc:*[openmp] llvm-runtimes/openmp @@ -29,33 +41,38 @@ RDEPEND=" !static? ( app-crypt/gpgme:= app-crypt/libb2:= - dev-libs/openssl:= virtual/zlib:= ) - ) - qtegrity? ( - !static? ( - dev-libs/openssl:= - ) )" DEPEND="${RDEPEND} + gpkg? ( + static? ( + app-crypt/gpgme[static-libs] + app-arch/libarchive[static-libs] + ) + ) + gtree? ( + static? ( + app-crypt/gpgme[static-libs] + app-arch/libarchive[static-libs,zstd] + ) + ) qmanifest? ( static? ( app-crypt/gpgme[static-libs] app-crypt/libb2[static-libs] - dev-libs/openssl[static-libs] virtual/zlib:=[static-libs] ) - ) - qtegrity? ( - static? ( - dev-libs/openssl[static-libs] - ) )" BDEPEND="virtual/pkgconfig" -# bug #898362, gnulib check explicitly looks for MIN in some headers -QA_CONFIG_IMPL_DECL_SKIP="MIN" +# bug #898362, gnulib explicit checks +QA_CONFIG_IMPL_DECL_SKIP=( + "MIN" + "unreachable" + "alignof" + "static_assert" +) pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp @@ -72,7 +89,8 @@ src_configure() { econf \ --disable-maintainer-mode \ --with-eprefix="${EPREFIX}" \ + $(use_enable gpkg) \ + $(use_enable gtree) \ $(use_enable qmanifest) \ - $(use_enable qtegrity) \ $(use_enable openmp) } diff --git a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-9999.ebuild index 534435c849..3d8a079dc1 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-9999.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git" else SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris" fi LICENSE="GPL-2"