[gentoo-commits] repo/gentoo:master commit in: app-portage/portage-utils/

["Fabian Groffen" <grobian@gentoo.org>]

commit:     8616ac9fa23c6cfb013673c339832fc07b39d6df
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 20 13:42:22 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Apr 20 13:43:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8616ac9f

app-portage/portage-utils-0.97: version bump

This release no longer requires OpenSSL and fixes a bunch of ASAN
issues.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 app-portage/portage-utils/Manifest                 |  1 +
 ...utils-9999.ebuild => portage-utils-0.97.ebuild} | 26 ++++++++--------------
 .../portage-utils/portage-utils-9999.ebuild        | 26 ++++++++--------------
 3 files changed, 19 insertions(+), 34 deletions(-)

diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 8fe52687a1b1..bbb5571ae09c 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,3 +1,4 @@
 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

diff --git a/app-portage/portage-utils/portage-utils-9999.ebuild b/app-portage/portage-utils/portage-utils-0.97.ebuild
similarity index 77%
copy from app-portage/portage-utils/portage-utils-9999.ebuild
copy to app-portage/portage-utils/portage-utils-0.97.ebuild
index 31ad40ade17a..64f18b80703d 100644
--- a/app-portage/portage-utils/portage-utils-9999.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.97.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="openmp +qmanifest +qtegrity static"
+IUSE="openmp +qmanifest static"
 
 RDEPEND="
 	openmp? ( || (
@@ -29,33 +29,26 @@ RDEPEND="
 		!static? (
 			app-crypt/gpgme:=
 			app-crypt/libb2:=
-			dev-libs/openssl:=
 			sys-libs/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]
 			sys-libs/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
@@ -73,6 +66,5 @@ src_configure() {
 		--disable-maintainer-mode \
 		--with-eprefix="${EPREFIX}" \
 		$(use_enable qmanifest) \
-		$(use_enable qtegrity) \
 		$(use_enable openmp)
 }

diff --git a/app-portage/portage-utils/portage-utils-9999.ebuild b/app-portage/portage-utils/portage-utils-9999.ebuild
index 31ad40ade17a..64f18b80703d 100644
--- a/app-portage/portage-utils/portage-utils-9999.ebuild
+++ b/app-portage/portage-utils/portage-utils-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="openmp +qmanifest +qtegrity static"
+IUSE="openmp +qmanifest static"
 
 RDEPEND="
 	openmp? ( || (
@@ -29,33 +29,26 @@ RDEPEND="
 		!static? (
 			app-crypt/gpgme:=
 			app-crypt/libb2:=
-			dev-libs/openssl:=
 			sys-libs/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]
 			sys-libs/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
@@ -73,6 +66,5 @@ src_configure() {
 		--disable-maintainer-mode \
 		--with-eprefix="${EPREFIX}" \
 		$(use_enable qmanifest) \
-		$(use_enable qtegrity) \
 		$(use_enable openmp)
 }