commit: 6e53fd9652e1c5eb9b7b2dfecf33b5530068dc36 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Mon Dec 29 21:27:00 2025 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Mon Dec 29 21:31:52 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e53fd96
app-portage/portage-utils-0.98: version bump - qwhich add -r flag limit to repo - better ROOT support - qlop duration improvement #945271 - qlist -L to resolve symlinks to find targets - check freshness of cache before using #934549, #898194 - improve color.map support #958487 - GLEP-78 gpkg support #833571 - jobserver support using q -j Closes: https://bugs.gentoo.org/961552 Closes: https://bugs.gentoo.org/724892 Closes: https://bugs.gentoo.org/833571 Closes: https://bugs.gentoo.org/958487 Closes: https://bugs.gentoo.org/898194 Closes: https://bugs.gentoo.org/945271 Closes: https://bugs.gentoo.org/934549 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> app-portage/portage-utils/Manifest | 1 + .../portage-utils/portage-utils-0.95-r1.ebuild | 75 ---------------------- .../portage-utils/portage-utils-0.96-r1.ebuild | 75 ---------------------- ...ils-0.96.1.ebuild => portage-utils-0.98.ebuild} | 52 ++++++++++----- 4 files changed, 36 insertions(+), 167 deletions(-) diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest index bbb5571ae09c..f08818886447 100644 --- a/app-portage/portage-utils/Manifest +++ b/app-portage/portage-utils/Manifest @@ -2,3 +2,4 @@ DIST portage-utils-0.95.tar.xz 1806140 BLAKE2B 5a468a7b4006073203ba634a5d70398e2 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.98.tar.xz 1996552 BLAKE2B 2bc34548c11d4e065ca9699ef9c324b8985e5e9977f2f696e392ada70ae13148cdcb5673165fd87795890414e1d2e69c1bd7f0fce70b64f66fc3d09b92210737 SHA512 36d6eae1773a45744b2cc9938cea1e5c99dbc0391bd3e886f21ba3d5db94615eaf43dadf10a2e5ccaf107491c7197463edcfc1ef1f410d515e0cfb85fcdce945 diff --git a/app-portage/portage-utils/portage-utils-0.95-r1.ebuild b/app-portage/portage-utils/portage-utils-0.95-r1.ebuild deleted file mode 100644 index 73a6989ad7d7..000000000000 --- a/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 ~arm64-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/app-portage/portage-utils/portage-utils-0.96-r1.ebuild b/app-portage/portage-utils/portage-utils-0.96-r1.ebuild deleted file mode 100644 index 73a6989ad7d7..000000000000 --- a/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 ~arm64-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/app-portage/portage-utils/portage-utils-0.96.1.ebuild b/app-portage/portage-utils/portage-utils-0.98.ebuild similarity index 64% rename from app-portage/portage-utils/portage-utils-0.96.1.ebuild rename to app-portage/portage-utils/portage-utils-0.98.ebuild index 377480f0cb31..3d8a079dc145 100644 --- a/app-portage/portage-utils/portage-utils-0.96.1.ebuild +++ b/app-portage/portage-utils/portage-utils-0.98.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 ~arm64-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} - qmanifest? ( + gpkg? ( static? ( app-crypt/gpgme[static-libs] - app-crypt/libb2[static-libs] - dev-libs/openssl[static-libs] - virtual/zlib:=[static-libs] + app-arch/libarchive[static-libs] ) ) - qtegrity? ( + gtree? ( static? ( - dev-libs/openssl[static-libs] + app-crypt/gpgme[static-libs] + app-arch/libarchive[static-libs,zstd] + ) + ) + qmanifest? ( + static? ( + app-crypt/gpgme[static-libs] + app-crypt/libb2[static-libs] + virtual/zlib:=[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) }
