gentoo resync : 15.01.2020

8 files changed, 4 insertions, 246 deletions

diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index c0d40b74afe3..12392c763513 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,14 +1,8 @@
-AUX portage-utils-0.74-qdepends-Q-regex.patch 2337 BLAKE2B b277b8097559877c60093583b13ffc0e5524ac08ed75fc2cc8b98e46c8f11c54ed6a28607ef841249b182ad35d5a899e97d20588b7062ae19593c8cb30a824fe SHA512 f6c7e8bd264a8b20effce89f1d7938e4b98c7292cb7b806cd1b7be1bdfd879bd482fdb52ec4e80e72c059ea7a73f35b6a589d974bce03cbff503fc8e3dfcb35f
-AUX post_sync 190 BLAKE2B ad1a8705af98cc7d0122173e6edb821eb7be6f024fda5eb145d713fb0d43f475fb3f6c8582ecaca88f11852097aa1cd9b866e690ccdc760194a316b72d1ebb37 SHA512 0153d2931c2d2a0f03e74f75dadc14d115c0d0e50cbc43e17c1b05a6a406b4bf47435bd32d1b2f559ce6a576e24a30dcf47e8ea6d346371553560ceb055b4429
-AUX q-reinitialize 68 BLAKE2B f1c2cd5009f30018dfc2d508a627253c08fc6e74859d072b917a0518850b879ecd0318df7a86c8597d28cf4410312f757aaf5cf8780899180a5e2a9a906b1ac2 SHA512 d322fc0e3fd82583e9cfc6ffa95636134e4491e63fc1a1f34dcda58a1749c3ebcda97caee47bea4f44fb056c35c97e30819dd22e5c2ed8c936e0863466ebf6ae
 DIST portage-utils-0.74.tar.xz 1587792 BLAKE2B 7c4588e3d44266a5260df42cc685aa03c584248e9970956033e4191a7a842a4b2162110ac99c2bb18645aaafc6ae6ee960e9b26ba0a8863497911eef1e943f64 SHA512 cd3f44c135b3d44e15a95eed41281fce62f225a9d05d5d5bb1be230b2d59cdb87755f011b313a9ec32e4cafdf3b3979c4ef423365edd7dcc472ca2e38c09c83e
 DIST portage-utils-0.80.tar.xz 1762692 BLAKE2B 32e4502d517ec088eadf17a4a348b9b9bc33348380b65f93ac7c043150732ba3ff0d18ee96f8877c697a91000fdc036de392d6e6711d62248bb7c57e25d4433f SHA512 cca86877e87e5bd2e9423822db4b7afa15e8f291717c808ef0455b121db0778b2364552e9f1d5e1a8bad3f1f8880ae2b5dbd586bf1dd74d7c4f4e72fa990c78c
-DIST portage-utils-0.81.tar.xz 1763088 BLAKE2B 1fa40950f9deff721ebfd8f3dc06a1ec99e1f5c1e8bce7cb20120feef4d0789f6ff02dac43fae84d9d554d9b9867423db43a0e7cb7a6070a60cb0619f36547ad SHA512 d9fa971e27aa8a58d4278cea8e9ec238f92d03e51f44b7124f51289613800790dcd5a0c886c3930dd89abd8cd032d0cfd05723e12ba7e2403a85a2d72b359ce1
-DIST portage-utils-0.82.tar.xz 1768888 BLAKE2B 27ef8a3835eab54be3e06e48496c5c3e1f2e89f350b80dc52c1e7615c3b2e0c1a5d771d070071057d6c308981f29e8e9d79739184596d3eb2d38a03b162fddf6 SHA512 dc4b452f7b8b0c81e7dbb1ba02984fb45e6cb3588525a2b464519c80f9287fc270ee9eeb4d097e6a96f2f2f06c73b1fe89cb0b01b0cae82b099aaf2326aca2a0
-EBUILD portage-utils-0.74-r1.ebuild 1118 BLAKE2B f51e775f5fa127ff2d6fd4e75096602f8bab392bb2773a2f6fc5ab20adfd3e99af4e9ee69d9260402fff33419bc762412fc2014b9feb219af11aee6c9ee9d0a9 SHA512 bdb0de9152c30e8064d67abcd65dd569b5549bb8eb21b25d4d57f8f126edb270e091684cf53d62a4e4557871ff1c9f3056dca0a1cdbbda2253cddb0396189744
+DIST portage-utils-0.84.tar.xz 1774396 BLAKE2B 964711e1d2277dbde814e86f9717381ea0b87fb2d8ae639c6134974cc141bdc88b4ee6a37c932495fb9b6153003d78832c34237a5c7076d4a0f7b7d9cfd3151a SHA512 90abe61dc30af4de34f57ff603afe4982d5951e7e0d702444ee7ab5e265976d03cda53518004b9ae1aa19c85eb235a732ea3fcf19705ac86977a42d49fe3b22e
 EBUILD portage-utils-0.74.ebuild 1051 BLAKE2B c8647973636f57b948978607ab73d4bea3a86eb51f045ecef3ca641a5d68976070cbf5c00520291c8876c6f003510c782252e5c5fc7a99245897a2e3585916b6 SHA512 158a8a3a4892bd99c48c6f0ae75c00b9b3c4df56678b6eb7deec2eb4f4a6974a0a4788f54dd4fc1e3b6d27d95cc989683f19ccf1bae214d376da0726255722fa
 EBUILD portage-utils-0.80.ebuild 2251 BLAKE2B 9c7238b96dc6dc7acc9ca3765f1f545ea2cf8df62c492820ee8e1c8c979a3b5337f01080d6a68b920a9a3fd1458bfc2a2cae9b795a3f7178b83ac6d15838b2e4 SHA512 7ef7e5094c1bb02bc633c410f27db6e77d6cfdbc820adbded8996e889aaa27071ff4a1fba992ba70f32723c4d76d240941caf135afc6d38eb42d708f6078b805
-EBUILD portage-utils-0.81.ebuild 2264 BLAKE2B 467b8bf1ed1795c6e09d9f86f188d727f2992c0717e7215af591be2246e3f0a97a51fb2cb602cb588ca62f7dab2452bd08fa583f79a19e403334f1be720270df SHA512 3569b23821830052a63e010be3835cdc213e37b565eb1898b0c6702e22f7a39ebe50b98cb71c606bec8fb5e35659a77e155ee816be7ae8f4468f2db98ee78ce9
-EBUILD portage-utils-0.82.ebuild 2265 BLAKE2B be63572b8f87c47047c7af7778bbe6c4fca211b1758982b8b60c05c50dd523f1952446f044ca6efd652995d6f386ef8182cb2e53e0b8c2fccddd582bbb781c7e SHA512 7a930db170ec1e6690fa8066a0d78cc71e2f712963656a72aa946470df8032e3ebacdd6f87fdceb9b34ca7bb1c8b28fc5e60a9d15909c4bf1d9cddfa746c29ca
-EBUILD portage-utils-9999.ebuild 1885 BLAKE2B d0cc4e20e992c06091cdadfda6049b6b367fc972aa6b372ebef996e95fa321d96e75a267f9e164123f6083d08dd653037965bebd106155508bfce5d73c21c96f SHA512 c11f51098cc8637d86b9143d715f506574acea6b2e51715b2309f04f4e714ee43bbd8b874815bd6ef1edd7be0a760162c7338962d5ef839966c84c8352a95322
+EBUILD portage-utils-0.84.ebuild 2183 BLAKE2B 37dfa27802791a8f0488b31b0b378698f4d43dc5682e859696430aaa5ff3cf83d527d421e3fb2851159b4af50ff67aed9acae91e11f2da922f0483912cbaed5a SHA512 cd25ee41e03afb0c70b726afe0cebce0d71befab9b3944b0fa45b3eef400390ba15c583204bf9c24ad960e7ffc6bdc1b9086ad18d9bc7ca8ffa7813c38d814e6
+EBUILD portage-utils-9999.ebuild 1803 BLAKE2B 1f972e1295a2093606cc66f0c43a33f0134348dcd289e8c4b65d67d4607ea9c02908a1a112e14a1ecd82f7d43ed3510bd5931ff25ee428818a8dbb2a9de5d80b SHA512 43bd8cbaefea948ba613e8a85e3d3b812f15ee1a9b40ec7addfe617845f8bb72aaebb838e20dd094999e0a3fd2be9ddc1f899b83f529955ef39397de47330b49
 MISC metadata.xml 490 BLAKE2B 36af527c82aa05f09ef3187a5c93ec34412a625a00016ad87fa1f6e7a00108f87bd3c8af42aad0aec87fa11e1ec25da71f1f4776c0da053e7426b8006d876103 SHA512 eacb9a20b0228c67896f7633619e67ef0e2de38444436ed720f849b8d9fcbed3c2569d2534e38fb7060cd755195bfd74cbcc9d77dbd5da4fb7b1654f87f70a1f
diff --git a/app-portage/portage-utils/files/portage-utils-0.74-qdepends-Q-regex.patch b/app-portage/portage-utils/files/portage-utils-0.74-qdepends-Q-regex.patch
deleted file mode 100644
index 6d10161d704e..000000000000
--- a/app-portage/portage-utils/files/portage-utils-0.74-qdepends-Q-regex.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-qdepends: restore regex matching capabilities for reverse dependencies
-
-The use of atom matching unintendedly removed the ability to use
-regexes, which broke app-admin/gentoo-perl-helpers.  This patch removes
-the atom matching, and reverts to using regex matching always to restore
-behaviour.
-
-Bug: https://bugs.gentoo.org/683430
-
---- a/qdepends.c
-+++ b/qdepends.c
-@@ -483,11 +483,9 @@
- 	int ret;
- 	regex_t preg;
- 	regmatch_t match;
--	depend_atom *aq;
- 	depend_atom *as;
- 	depend_atom *ac;
- 	char firstmatch = 0;
--	char *sslot;
- 
- 	if (!q_vdb_pkg_eat(pkg_ctx, state->depend_file, &depend, &depend_len))
- 		return 0;
-@@ -526,34 +524,17 @@
- 		return 1;
- 	}
- 
--	aq = atom_explode(state->query);
--	if (!aq) {
--		/* "fall" back to old behaviour of just performing an extended
--		 * regular expression match */
--		if (wregcomp(&preg, state->query, REG_EXTENDED) != 0) {
--			dep_burn_tree(dep_tree);
--			return 1;
--		}
-+	/* fallback for old behaviour of just performing an extended
-+	 * regular expression match */
-+	if (wregcomp(&preg, state->query, REG_EXTENDED) != 0) {
-+		dep_burn_tree(dep_tree);
-+		return 1;
- 	}
- 
- 	match.rm_eo = 0;
- 	firstmatch = 1;
- 	do {  /* find all matches */
--		if (!aq) {
--			ret = regexec(&preg, ptr + match.rm_eo, 1, &match, 0);
--		} else {
--			char *loc;
--			ret = -1;
--			snprintf(qbuf, sizeof(qbuf), "%s%s%s",
--					aq->CATEGORY ? aq->CATEGORY : "",
--					aq->CATEGORY ? "/" : "",
--					aq->PN);
--			if ((loc = strstr(ptr + match.rm_eo, qbuf)) != NULL) {
--				ret = 0;
--				match.rm_so = loc - ptr;
--				match.rm_eo = match.rm_so + strlen(qbuf);
--			}
--		}
-+		ret = regexec(&preg, ptr + match.rm_eo, 1, &match, 0);
- 		if (ret != 0)
- 			break;
- 
-@@ -571,18 +552,6 @@
- 					ptr + match.rm_so);
- 		ac = atom_explode(qbuf);
- 
--		/* drop SLOT when not present in aq so we can match atoms
--		 * regardless */
--		sslot = ac->SLOT;
--		if (aq->SLOT == NULL && ac->SLOT != NULL)
--			ac->SLOT = NULL;
--		ret = atom_compare(ac, aq);
--		ac->SLOT = sslot;
--		if (ret != EQUAL) {
--			atom_implode(ac);
--			break;
--		}
--
- 		if (firstmatch == 1) {
- 			firstmatch = 0;
- 			printf("%s%s/%s%s%s%c", BOLD, catname, BLUE,
-@@ -615,11 +584,7 @@
- 	if (verbose && firstmatch == 0)
- 		printf("\n");
- 
--	if (!aq) {
--		regfree(&preg);
--	} else {
--		atom_implode(aq);
--	}
-+	regfree(&preg);
- 	atom_implode(as);
- 	dep_burn_tree(dep_tree);
- 
diff --git a/app-portage/portage-utils/files/post_sync b/app-portage/portage-utils/files/post_sync
deleted file mode 100644
index e94ea5d0257a..000000000000
--- a/app-portage/portage-utils/files/post_sync
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# Copyright 2006-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-for f in /etc/portage/postsync.d/* ; do
-	[ -x "${f}" ] && "${f}"
-done
-:
diff --git a/app-portage/portage-utils/files/q-reinitialize b/app-portage/portage-utils/files/q-reinitialize
deleted file mode 100644
index 7bca1a86b3ae..000000000000
--- a/app-portage/portage-utils/files/q-reinitialize
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-[ -x /usr/bin/q ] && /usr/bin/q -r ${PORTAGE_QUIET:+-q}
-:
diff --git a/app-portage/portage-utils/portage-utils-0.74-r1.ebuild b/app-portage/portage-utils/portage-utils-0.74-r1.ebuild
deleted file mode 100644
index 0f7b316377f7..000000000000
--- a/app-portage/portage-utils/portage-utils-0.74-r1.ebuild
+++ /dev/null
@@ -1,38 +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"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls static"
-
-RDEPEND="dev-libs/iniparser:0"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	static? ( dev-libs/iniparser:0[static-libs] )"
-
-PATCHES=( "${FILESDIR}"/${P}-qdepends-Q-regex.patch )
-
-src_configure() {
-	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
-	if use prefix || ! use kernel_linux || \
-	   has_version '<sys-libs/glibc-2.10'
-	then
-		econf --with-eprefix="${EPREFIX}"
-	else
-		tc-export CC
-	fi
-}
-
-src_compile() {
-	emake NLS=$(usex nls) STATIC=$(usex static)
-}
diff --git a/app-portage/portage-utils/portage-utils-0.81.ebuild b/app-portage/portage-utils/portage-utils-0.81.ebuild
deleted file mode 100644
index a898b264573d..000000000000
--- a/app-portage/portage-utils/portage-utils-0.81.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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 +qtegrity libressl"
-
-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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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:=
-		)
-	)
-	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}"
-
-src_configure() {
-	econf \
-		--disable-maintainer-mode \
-		--with-eprefix="${EPREFIX}" \
-		$(use_enable qmanifest) \
-		$(use_enable qtegrity) \
-		$(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 version of Portage utils has undergone significant changes."
-		elog "Please read the elog manpages for applets like qlop(1) and"
-		elog "qfile(1) where argument options have changed."
-	fi
-}
diff --git a/app-portage/portage-utils/portage-utils-0.82.ebuild b/app-portage/portage-utils/portage-utils-0.84.ebuild
index 489d1d862b19..d1e5d7ff75ff 100644
--- a/app-portage/portage-utils/portage-utils-0.82.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.84.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -19,8 +19,6 @@ else
 fi
 
 RDEPEND="
-	static? ( dev-libs/iniparser:0[static-libs] )
-	!static? ( dev-libs/iniparser:0 )
 	qmanifest? (
 		openmp? (
 			|| (
diff --git a/app-portage/portage-utils/portage-utils-9999.ebuild b/app-portage/portage-utils/portage-utils-9999.ebuild
index 00881bad1181..437145f4f2ff 100644
--- a/app-portage/portage-utils/portage-utils-9999.ebuild
+++ b/app-portage/portage-utils/portage-utils-9999.ebuild
@@ -19,8 +19,6 @@ else
 fi
 
 RDEPEND="
-	static? ( dev-libs/iniparser:0[static-libs] )
-	!static? ( dev-libs/iniparser:0 )
 	qmanifest? (
 		openmp? (
 			|| (