gentoo resync : 19.07.2019

4 files changed, 41 insertions, 6 deletions

diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 7752706dccab..2ff334026df2 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -3,10 +3,10 @@ AUX post_sync 190 BLAKE2B ad1a8705af98cc7d0122173e6edb821eb7be6f024fda5eb145d713
 AUX q-reinitialize 68 BLAKE2B f1c2cd5009f30018dfc2d508a627253c08fc6e74859d072b917a0518850b879ecd0318df7a86c8597d28cf4410312f757aaf5cf8780899180a5e2a9a906b1ac2 SHA512 d322fc0e3fd82583e9cfc6ffa95636134e4491e63fc1a1f34dcda58a1749c3ebcda97caee47bea4f44fb056c35c97e30819dd22e5c2ed8c936e0863466ebf6ae
 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_pre20190719.tar.xz 1760524 BLAKE2B 4e16950d937a69bd601e6a69704082c0d8de6a02577dd359ec261c20fdb368c7a30382ec76159f59644c0c2fefd433a831ad85fd91912be21b08b598d4dec491 SHA512 0857a6ea55a60ab960b87460218575bfd236cbfff7227abfec4501e87b85f2baeca3d6bc7b3ed93412f5a5494e17fcf093bfd7aa3aa976b5cf17f505ab2d905f
 EBUILD portage-utils-0.62.ebuild 2006 BLAKE2B c44402ebef59a344bfb3ed571a46b7a58dda17b3b1d231aee55c77d42a59c62ec5de69b595a67ca2dbadc568022f63385950964f0350303c65cecc5f541b36df SHA512 579f27018139dd0dda0781d7b9483ca4a467d069f6b0a8aa55a9786b8cd3fbfa78919b7fa6b85044f78bac6ad6ec896ec7bd990cb428d0dddf5bfeb1f2175272
 EBUILD portage-utils-0.74-r1.ebuild 1140 BLAKE2B d58ad14ab2c7f786fc36147436e68ba29bdd100c912538cc2f28ff8a54be4c0556a87cafc512cd62c2b3be50c9ba784cf4b5dbe184929f3684b39d5df4e324f4 SHA512 84b221b821b7beedc52d15aefe9646e571c66f4086e89c4ac8cee7cc398b19428eb09000ca033f0eaadeb84222c468d002c76ed84070eb26a5e7200572679445
 EBUILD portage-utils-0.74.ebuild 1073 BLAKE2B 813ec25c4030ad26b1b28294c268c0f3bbbe296488a811ecd2a8d87ea6bb7f1caaa9ecdee34f272e9cf5879cf3454506ad7a62be2d3e74b926cdd012e239be3a SHA512 fa9079a716b50a4caa61fba5225ec28a2fc4d8ea2c95cb8bc283434a7c96392fa9898537c6f98277860fe06a23fe02c255c17e54a2869e371235e094a99a8e4a
-EBUILD portage-utils-0.80_pre20190620.ebuild 2082 BLAKE2B c89384283d82201480e205d0f0db94cf27ec89a7f903ea5447bef0749ef4a0861ca7e7714403ea26ba9ae28ab4e514e2e1b447e4ecb6892c0a3c3ebd36c1fd36 SHA512 e457545fdfacfb622850b134ef7c74e47994dac4ce97b467a91263d8245497925b0ccadf5406af7d20b54683ddeb6142da96a94f8aeec8391853fe84074f92e4
-EBUILD portage-utils-9999.ebuild 1542 BLAKE2B bb5c9e5992b4e27e841fe1d8478d24059f2f2ed653afc763347b3ff121eaf8f0d2703f5d55c15fba21d4a8d7e349b1863c2889577ef120f45e4ba36de36f7171 SHA512 fc4245c16681466cdf1f387f508cd862471335b8213a6f09dea00d7adbb85288f3092038ea758707382830bb61bcef54614153bc0925a288216f21939b877a51
-MISC metadata.xml 390 BLAKE2B 8912128b1d4cc1afd29f01ca9b9014a5e1726d2a74fd42e57836f40ecfab15c2fc89bc403c9e4a41fd14e40fd732e546d93ed03004c820b5a25be69e0725e606 SHA512 a152ae18c44f4a4946b62e8724d84409c4cc1ffa66892e649551b3815935de4f3a926b7b9926fef9d5c9594fb9f70ef7571e1f9ea3c3709516b47665279a549d
+EBUILD portage-utils-0.80_pre20190719.ebuild 2447 BLAKE2B 15f875ba7bfa8d5e168a71482ec37be3e81db955241c20fef2851a92cd772a70404d205458ccb1ec0d2ffba6b482b236f29a2b2b93a04b509550909104e8a537 SHA512 9e1a8ca755ea39f7c1809a5be02385ab2ecb13f08961b8fa93ef4bf78b3da566be1907496ee9eff907336749cd39fae32adc90278f4b822d13f397798b4adad0
+EBUILD portage-utils-9999.ebuild 1907 BLAKE2B 93409bc140a20ad03ae376ffe230545f6c8f393c0b18090bb2bee0746d3224f80295bb5a09afa06a1bac4742f6fa8d305cfa88b4dea29d7198016bf9466f672d SHA512 f3279b48dc6fb1071ebc6b062d5c0bfddef898af3fd21970c69e7aeb979207e84b6d9c24926bfa624d1bf8cfb86f467c02f9214e35d493a1649c9113e07c7aa5
+MISC metadata.xml 490 BLAKE2B 36af527c82aa05f09ef3187a5c93ec34412a625a00016ad87fa1f6e7a00108f87bd3c8af42aad0aec87fa11e1ec25da71f1f4776c0da053e7426b8006d876103 SHA512 eacb9a20b0228c67896f7633619e67ef0e2de38444436ed720f849b8d9fcbed3c2569d2534e38fb7060cd755195bfd74cbcc9d77dbd5da4fb7b1654f87f70a1f
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_pre20190719.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_pre20190719.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)
 }