gentoo auto-resync : 29:08:2022 - 04:45:37

4 files changed, 118 insertions, 33 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 69c198c95b52..ae492d4f8a03 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 2c22fd4017c1..1f140374dbc9 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,6 +1,8 @@
 DIST portage-utils-0.93.3.tar.xz 1796828 BLAKE2B cfad7ab27ff2d92f631f4e31012e8903c5fa6113485f727338812059379cdd4a9552d80dc3aef6bb91264c361c0554fe9054a12347e274c4c5c3db66fd36008b SHA512 c1245aa78d236263cd266fc8565312c2ac30cb992037a7b0f26da04ecf2dfeebc85bff653784e186cf2c7d7468e4772fb0bd93bcdb3a37d46e493d000933e5a1
 DIST portage-utils-0.94.1.tar.xz 1871688 BLAKE2B bec5ddd514b397c157c3b1bff70d61730f15804a6751f56eb69c4030a35fc6a6b11fa1e2bde94332772660f02bf9428623210733ae9e2f1290f29aa3b31a1813 SHA512 29fdb4093997eb95703d407da6b00305c949f0a00ae3aa5cfb2c47b66bddc59e034fae114663b40b611f906332066b648018aa4e5bc1b935e61a64f4b4bf1088
+DIST portage-utils-0.94.2.tar.xz 1804152 BLAKE2B 416e72851744cfe595ff11dc3c39b4b7a2ed243fa59e1b94ba1e94072e8c63382a29256f918af229f4bee0543509108cc7a3f1222a7810e0a9e47a89726cd8e1 SHA512 d4fc9d9cbb9ecca3269c1e4bc192e623e1f671be072bac57b6be0a885fa99344f313644d17533f3c062591d2709d36d88f0370479fb488fd4636b42724b8f15f
 EBUILD portage-utils-0.93.3.ebuild 1525 BLAKE2B 31633b095b9fb0dbc0e9a4c5810be266484b0d353578969d587d725722c7f6870031453466b8e8ea70b094ff3129e94d71a81a7000b432f739f4b64a811df561 SHA512 c2f182e8b08adad0f5b22ff08bd1a41aec90a0fa03e40070ab3535947a5d3eee57d5fe4d6bec28b6d228ef9e8baddbe69203a4cc24833a7e02af5e2cfb615186
 EBUILD portage-utils-0.94.1.ebuild 1527 BLAKE2B 151daa8796816527ddd518cc5be942f1026a199f9e75938b9932fc7742e7b5666b8162cacbcd6183fc150883e6823592271fcb8897e732a7fdd7064fe616620f SHA512 84e4c36a170e9d3bfe23f5d8349c9fcee4da28fbde075722060703729c9dcf0417592350c6c03474d376cde7c23646cdd81d8f156d68cdaabf45dec626973892
-EBUILD portage-utils-9999.ebuild 1533 BLAKE2B 38201ef3c2be293fa34ed8538a3dba939b94593d90ced165d3171ebad1f50379736247217f2102565b9390caaa012c3f4b78022e2999dd458c333a2b6a8a17e0 SHA512 79275bb329369f6047b4decf95493ba6bb3a1e906d6211056f95e45473e6556ecbe655e599727aec91fe749fd41f717ff4b5e8f08b3a967de029a71dc31cab10
+EBUILD portage-utils-0.94.2.ebuild 1654 BLAKE2B 6582abc4a5666204d307764051662f1fc217a42c136ff10f8d94b74b019863a7041c1decdf81fa8a28f8896fcf3d66687d56d7001b2368fb070498b464cee530 SHA512 4e3a8de13028c6b9df3feb15812e9fb771f79f1b0cc5b59bb71043cf9210aecfeed4e1e68efbf20a46e92b4e98aee62bbff6a93e7453e5ebe6b3242f12dbefe1
+EBUILD portage-utils-9999.ebuild 1654 BLAKE2B 6582abc4a5666204d307764051662f1fc217a42c136ff10f8d94b74b019863a7041c1decdf81fa8a28f8896fcf3d66687d56d7001b2368fb070498b464cee530 SHA512 4e3a8de13028c6b9df3feb15812e9fb771f79f1b0cc5b59bb71043cf9210aecfeed4e1e68efbf20a46e92b4e98aee62bbff6a93e7453e5ebe6b3242f12dbefe1
 MISC metadata.xml 574 BLAKE2B 1448e8343748e8bbc61128f3a621010ae1f7095872c271962ac24e62abcea8cca7c52034008c0d5691a56ca7f2e242ab4cec7d38fceecc2c39f858d1ceb30ab1 SHA512 dcf9949c990845794a534b34e44e820b16b3700bc993e13707bfac6d26269d2aba00fd3f873b9157ead222d2fa5cdd63d263c098bfc79c1b1f66097fa24f552e
diff --git a/app-portage/portage-utils/portage-utils-0.94.2.ebuild b/app-portage/portage-utils/portage-utils-0.94.2.ebuild
new file mode 100644
index 000000000000..b07e43f8a485
--- /dev/null
+++ b/app-portage/portage-utils/portage-utils-0.94.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="openmp +qmanifest +qtegrity static"
+
+RDEPEND="
+	qmanifest? (
+		!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"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+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-9999.ebuild b/app-portage/portage-utils/portage-utils-9999.ebuild
index c1242cd92bab..b07e43f8a485 100644
--- a/app-portage/portage-utils/portage-utils-9999.ebuild
+++ b/app-portage/portage-utils/portage-utils-9999.ebuild
@@ -1,15 +1,13 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+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"
 
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls static openmp +qmanifest +qtegrity"
-
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
@@ -18,50 +16,60 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="openmp +qmanifest +qtegrity static"
+
 RDEPEND="
 	qmanifest? (
-		openmp? (
-			|| (
-				>=sys-devel/gcc-4.2:*[openmp]
-				sys-devel/clang-runtime:*[openmp]
-			)
-		)
-		static? (
-			app-crypt/libb2:=[static-libs]
-			dev-libs/openssl:0=[static-libs]
-			sys-libs/zlib:=[static-libs]
-			app-crypt/gpgme:=[static-libs]
-		)
 		!static? (
+			app-crypt/gpgme:=
 			app-crypt/libb2:=
-			dev-libs/openssl:0=
+			dev-libs/openssl:=
 			sys-libs/zlib:=
-			app-crypt/gpgme:=
 		)
 	)
 	qtegrity? (
-		openmp? (
-			|| (
-				>=sys-devel/gcc-4.2:*[openmp]
-				sys-devel/clang-runtime:*[openmp]
-			)
+		!static? (
+			dev-libs/openssl:=
 		)
+	)"
+DEPEND="${RDEPEND}
+	qmanifest? (
 		static? (
-			dev-libs/openssl:0=[static-libs]
-		)
-		!static? (
-			dev-libs/openssl:0=
+			app-crypt/gpgme[static-libs]
+			app-crypt/libb2[static-libs]
+			dev-libs/openssl[static-libs]
+			sys-libs/zlib[static-libs]
 		)
 	)
-"
-DEPEND="${RDEPEND}"
+	qtegrity? (
+		static? (
+			dev-libs/openssl[static-libs]
+		)
+	)"
+BDEPEND="virtual/pkgconfig"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+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) \
-		$(use_enable static)
+		$(use_enable openmp)
 }