gentoo resync : 08.06.2019

4 files changed, 99 insertions, 71 deletions

diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index ec9a96099767..aa699fcbc0d0 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_pre20190530.tar.xz 1758056 BLAKE2B 2d595db45ecfe125da80924b145be4d1ebfcda09afb3dd39c4dfa084b4113e162637cbfc8f3362554b39de55339462de9714cbef6194816b7340e77c335d3432 SHA512 720bb057e6428d51832d1e92e8ae1fb4d7b6c1f407f78656ef4853822b08525849614f7f760a395385d69400c08bf103eb05308b87bd9f7189cac53e95e93583
+DIST portage-utils-0.80_pre20190605.tar.xz 1756988 BLAKE2B 2a6dd8fbfd3ea68fa205010727ba30e17fef6c1ccdfeb7fbe4adcea981c1b57ef027ab607c1f07aa1ef78d530cff004289a27f294c893d1fd204014e77c44b45 SHA512 2bfede4765454eff9247504dc189915cab5f82c32760ef6e42f9452bfa6e7583c046c228bdc043c8c1ad190301b7b530d5753514989bed8633140a43bf0f5106
 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_pre20190530.ebuild 1258 BLAKE2B 828316494d67b4712d6917a1a1504257a622d9c65c13a8378113da30676a1e7eb96310459a33edd655852ca5454e477a960b66cf1e6e480e66dda62c40ddf7cc SHA512 14cb6d702ee4dbba7f8c3ab2b21cccc66f6c4379cb02eabdc01a95dfc3e7e3b794825cc4174f12ccd2c39c143b32391c6cddb07efa7da5ff1527a8963db8406a
-EBUILD portage-utils-9999.ebuild 1298 BLAKE2B 323a076f738e9700c561e234cb93ab703d8533946a626035fa9749e76a4442f96488d3bc737bfac18798d4a2c2f81e1027465c13829052bedefc1dc7ad81ccc4 SHA512 533e36b48b751fdb3b2d4a52082a00fe93b8145d9f6f15c79de842db8ad00c2bf6b5d39eef9dd9075366300f9a710024e14aeb084d66f0c1305991628a0de1b9
+EBUILD portage-utils-0.80_pre20190605.ebuild 2079 BLAKE2B 03b6ffeb21b35a5f5e6281c82b41c37f63c6d0df341eb60157f5a8b052ccc54ea81c995b886f9f083b22aa52f573c285ff06390023784521ccb7f0803a8edded SHA512 39a1b6c1303b091687cfb3a931cfbc64bea349e1c92b8c2af2b603fcd5814511d3e7e7432b1d0f28a2f1417f1e1cd51394d51d40a5d2acf821085a2c0e9f8ce3
+EBUILD portage-utils-9999.ebuild 1562 BLAKE2B daa09f9974e4cd309d1cbb26fe787fb8e7c80e32353bdb40a876f4be2ed7aecb7bf43caafc51ed74b01268bc294630a40d799159da83121e3dd4789b6544273e SHA512 708375c66fffbb3f81b438d67fbe572806c152d2a99dff39fa8e15088b0b5b0f0a4ccd6f8275cae6517a5ae06fa91ad5b56db5d693b3d503dbd47dd6766e52d5
 MISC metadata.xml 390 BLAKE2B 8912128b1d4cc1afd29f01ca9b9014a5e1726d2a74fd42e57836f40ecfab15c2fc89bc403c9e4a41fd14e40fd732e546d93ed03004c820b5a25be69e0725e606 SHA512 a152ae18c44f4a4946b62e8724d84409c4cc1ffa66892e649551b3815935de4f3a926b7b9926fef9d5c9594fb9f70ef7571e1f9ea3c3709516b47665279a549d
diff --git a/app-portage/portage-utils/portage-utils-0.80_pre20190530.ebuild b/app-portage/portage-utils/portage-utils-0.80_pre20190530.ebuild
deleted file mode 100644
index 5ff83758116d..000000000000
--- a/app-portage/portage-utils/portage-utils-0.80_pre20190530.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit 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"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-RDEPEND="dev-libs/iniparser:0"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	static? ( dev-libs/iniparser:0[static-libs] )
-	qmanifest? (
-		openmp? (
-			|| (
-				>=sys-devel/gcc-4.2:*[openmp]
-				sys-devel/clang-runtime:*[openmp]
-			)
-		)
-		app-crypt/libb2
-		dev-libs/openssl:0=
-		sys-libs/zlib
-		app-crypt/gpgme
-	)
-	"
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		--disable-maintainer-mode \
-		--with-eprefix="${EPREFIX}" \
-		$(use_enable qmanifest) \
-		$(use_enable openmp)
-}
diff --git a/app-portage/portage-utils/portage-utils-0.80_pre20190605.ebuild b/app-portage/portage-utils/portage-utils-0.80_pre20190605.ebuild
new file mode 100644
index 000000000000..754e9aafaac0
--- /dev/null
+++ b/app-portage/portage-utils/portage-utils-0.80_pre20190605.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 libressl"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
+	KEYWORDS="~amd64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+RDEPEND="
+	static? ( dev-libs/iniparser:0[static-libs] )
+	!static? ( dev-libs/iniparser:0 )
+	qmanifest? (
+		openmp? (
+			|| (
+				>=sys-devel/gcc-4.2:*[openmp]
+				sys-devel/clang-runtime:*[openmp]
+			)
+		)
+		static? (
+			app-crypt/libb2:=[static-libs]
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+			sys-libs/zlib[static-libs]
+			app-crypt/gpgme[static-libs]
+		)
+		!static? (
+			app-crypt/libb2
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+			sys-libs/zlib
+			app-crypt/gpgme
+		)
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf \
+		--disable-maintainer-mode \
+		--with-eprefix="${EPREFIX}" \
+		$(use_enable qmanifest) \
+		$(use_enable openmp) \
+		$(use_enable static)
+}
+
+pkg_postinst() {
+	local pvr
+	local doshow=
+	for pvr in ${REPLACING_VERSIONS} ; do
+		[[ ${pvr} != "0.8"[01]* ]] && doshow=true
+	done
+
+	if [[ ${doshow} == true ]] ; then
+		elog "This is a pre-release of the next version of Portage Utils"
+		elog "which has undergone significant changes.  Please read the"
+		elog "manpages for applets like qlop(1) where argument options have"
+		elog "changed."
+		elog "There will likely be changes to come before 0.80, and bugs are"
+		elog "possible.  Please report the latter, and request the former if"
+		elog "applicable."
+	fi
+}
diff --git a/app-portage/portage-utils/portage-utils-9999.ebuild b/app-portage/portage-utils/portage-utils-9999.ebuild
index 25967bcab798..d116c33af568 100644
--- a/app-portage/portage-utils/portage-utils-9999.ebuild
+++ b/app-portage/portage-utils/portage-utils-9999.ebuild
@@ -3,14 +3,12 @@
 
 EAPI="6"
 
-inherit 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"
+IUSE="nls static openmp +qmanifest libressl"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3 autotools
@@ -21,10 +19,9 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
-RDEPEND="dev-libs/iniparser:0"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
+RDEPEND="
 	static? ( dev-libs/iniparser:0[static-libs] )
+	!static? ( dev-libs/iniparser:0 )
 	qmanifest? (
 		openmp? (
 			|| (
@@ -32,21 +29,29 @@ DEPEND="${RDEPEND}
 				sys-devel/clang-runtime:*[openmp]
 			)
 		)
-		app-crypt/libb2
-		dev-libs/openssl:0=
-		sys-libs/zlib
-		app-crypt/gpgme
+		static? (
+			app-crypt/libb2:=[static-libs]
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+			sys-libs/zlib[static-libs]
+			app-crypt/gpgme[static-libs]
+		)
+		!static? (
+			app-crypt/libb2
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+			sys-libs/zlib
+			app-crypt/gpgme
+		)
 	)
-	"
-
-src_prepare() {
-	default
-}
+"
+DEPEND="${RDEPEND}"
 
 src_configure() {
 	econf \
 		--disable-maintainer-mode \
 		--with-eprefix="${EPREFIX}" \
 		$(use_enable qmanifest) \
-		$(use_enable openmp)
+		$(use_enable openmp) \
+		$(use_enable static)
 }