From: Fabian Groffen <grobian@gentoo.org>
Date: Sun, 14 Jul 2019 16:30:33 +0000 (+0200)
Subject: app-portage/portage-utils: bump 0.80 pre
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=631b38ecd0e5d3724590ddd53c0ff453d5ddcf45;p=gentoo.git

app-portage/portage-utils: bump 0.80 pre

Closes: https://bugs.gentoo.org/688442
Closes: https://bugs.gentoo.org/689290
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
---

diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 13cff118abee..6b4568731267 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,3 +1,3 @@
 DIST portage-utils-0.62.tar.xz 527216 BLAKE2B ac8331b74998ddb86db55a937992447bccf60611cc259ceb5fe79918c1a43b6dc4633e4ad64462e2df5c39e8d8aa193bd57ab24dcd714e088357eb3cb177e972 SHA512 71b2888cef1bf7549c3829cc7d4bbe2e99a711434bae4fb78c55b9c37815b61623518f19ab87db30f533d771398933c085640dc7c8ffcedf87a70ac702a52fa1
 DIST portage-utils-0.74.tar.xz 1587792 BLAKE2B 7c4588e3d44266a5260df42cc685aa03c584248e9970956033e4191a7a842a4b2162110ac99c2bb18645aaafc6ae6ee960e9b26ba0a8863497911eef1e943f64 SHA512 cd3f44c135b3d44e15a95eed41281fce62f225a9d05d5d5bb1be230b2d59cdb87755f011b313a9ec32e4cafdf3b3979c4ef423365edd7dcc472ca2e38c09c83e
-DIST portage-utils-0.80_pre20190620.tar.xz 1761544 BLAKE2B fe39bebe6ed7afb525b7a3dbcfb2668b29195d7da7128fffb42be313e79b3d68792203bdc7711fa1961b9a1520b72e01b154e3d948aed2861feb44f130995d75 SHA512 2fc877e04213af57ba4050e9830004a0552fea5ac052d625a5635c4383b492e2ae5dcf45b01c63711b6ca6c2574b65ec44b41acd33cd03886bfa5fcc27c7d043
+DIST portage-utils-0.80_pre20190714.tar.xz 1762284 BLAKE2B 5000db2ea6ba04f1206c4ed63c9b16bf1317c1cbdfb0e677ce0c1f1f252bbde36f2bf7dd19ff22635653b58f64bef794cc21da2e945a06fddd2e7f8aaab6c853 SHA512 1c1979b627edbf5d5ca40043dc897f955c18e57c91485426ea48cd8574e4dbba1687df796ba600aaa2cd03699c1bf6217acd513f4e4d9cd1991083e0d5cf49da
diff --git a/app-portage/portage-utils/metadata.xml b/app-portage/portage-utils/metadata.xml
index dac8feca7f1d..3aac9818b8b0 100644
--- a/app-portage/portage-utils/metadata.xml
+++ b/app-portage/portage-utils/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="qmanifest">Build qmanifest applet, this adds additional dependencies for GPG, OpenSSL and BLAKE2B hashing</flag>
+		<flag name="qtegrity">Build qtegrity applet, this adds additional dependencies for OpenSSL</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-portage/portage-utils/portage-utils-0.80_pre20190620.ebuild b/app-portage/portage-utils/portage-utils-0.80_pre20190714.ebuild
similarity index 83%
rename from app-portage/portage-utils/portage-utils-0.80_pre20190620.ebuild
rename to app-portage/portage-utils/portage-utils-0.80_pre20190714.ebuild
index daaaf9474d2c..1c8161df1e84 100644
--- a/app-portage/portage-utils/portage-utils-0.80_pre20190620.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.80_pre20190714.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="nls static openmp +qmanifest libressl"
+IUSE="nls static openmp +qmanifest +qtegrity libressl"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3 autotools
@@ -43,6 +43,22 @@ RDEPEND="
 			app-crypt/gpgme:=
 		)
 	)
+	qtegrity? (
+		openmp? (
+			|| (
+				>=sys-devel/gcc-4.2:*[openmp]
+				sys-devel/clang-runtime:*[openmp]
+			)
+		)
+		static? (
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+		)
+		!static? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
 "
 DEPEND="${RDEPEND}"
 
@@ -51,6 +67,7 @@ src_configure() {
 		--disable-maintainer-mode \
 		--with-eprefix="${EPREFIX}" \
 		$(use_enable qmanifest) \
+		$(use_enable qtegrity) \
 		$(use_enable openmp) \
 		$(use_enable static)
 }
diff --git a/app-portage/portage-utils/portage-utils-9999.ebuild b/app-portage/portage-utils/portage-utils-9999.ebuild
index ba0d7c726581..423703f19f3f 100644
--- a/app-portage/portage-utils/portage-utils-9999.ebuild
+++ b/app-portage/portage-utils/portage-utils-9999.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="nls static openmp +qmanifest libressl"
+IUSE="nls static openmp +qmanifest +qtegrity libressl"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3 autotools
@@ -43,6 +43,22 @@ RDEPEND="
 			app-crypt/gpgme:=
 		)
 	)
+	qtegrity? (
+		openmp? (
+			|| (
+				>=sys-devel/gcc-4.2:*[openmp]
+				sys-devel/clang-runtime:*[openmp]
+			)
+		)
+		static? (
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+		)
+		!static? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
 "
 DEPEND="${RDEPEND}"
 
@@ -51,6 +67,7 @@ src_configure() {
 		--disable-maintainer-mode \
 		--with-eprefix="${EPREFIX}" \
 		$(use_enable qmanifest) \
+		$(use_enable qtegrity) \
 		$(use_enable openmp) \
 		$(use_enable static)
 }