gentoo resync : 13.10.2019

6 files changed, 8 insertions, 95 deletions

diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index d43f31d92679..ad3dfa3d2bfe 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,16 +1,10 @@
 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.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.tar.xz 1762692 BLAKE2B 32e4502d517ec088eadf17a4a348b9b9bc33348380b65f93ac7c043150732ba3ff0d18ee96f8877c697a91000fdc036de392d6e6711d62248bb7c57e25d4433f SHA512 cca86877e87e5bd2e9423822db4b7afa15e8f291717c808ef0455b121db0778b2364552e9f1d5e1a8bad3f1f8880ae2b5dbd586bf1dd74d7c4f4e72fa990c78c
-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
-<<<<<<< HEAD
-EBUILD portage-utils-0.80.ebuild 2265 BLAKE2B d8392092181c22beeba7c84c96c8673933daa0e45702bfbf7a59f17915c31bc2944b4c3325076d08d1808d56d2ef3a4865b14fae2045b8c5bcf0a52ef9a438fc SHA512 445d9762af65e0298ea202925233fd06ee8c1befec44523b241699150b661a931ebc3a435196fe839ba73ae0e7a4cc7372e49a6917308fd4e95c395035584682
-=======
-EBUILD portage-utils-0.80.ebuild 2261 BLAKE2B 59996f8647837f026aa76cb10a47f1dea99ed14d60caa7061ec4ac2efbee2a49d685ae55f30e97351275d3961ebef51a358409175e8d3aa477593b8f6704864b SHA512 f9887ad80dab3aa88837988ab46d41c3bf40723a9b95a603d50dd8870bf1267aac03aa344f4d056245a156a3793a771264bcff499c309ac76910feaad62dca7e
->>>>>>> next
-EBUILD portage-utils-9999.ebuild 1907 BLAKE2B 93409bc140a20ad03ae376ffe230545f6c8f393c0b18090bb2bee0746d3224f80295bb5a09afa06a1bac4742f6fa8d305cfa88b4dea29d7198016bf9466f672d SHA512 f3279b48dc6fb1071ebc6b062d5c0bfddef898af3fd21970c69e7aeb979207e84b6d9c24926bfa624d1bf8cfb86f467c02f9214e35d493a1649c9113e07c7aa5
+EBUILD portage-utils-0.74-r1.ebuild 1118 BLAKE2B f51e775f5fa127ff2d6fd4e75096602f8bab392bb2773a2f6fc5ab20adfd3e99af4e9ee69d9260402fff33419bc762412fc2014b9feb219af11aee6c9ee9d0a9 SHA512 bdb0de9152c30e8064d67abcd65dd569b5549bb8eb21b25d4d57f8f126edb270e091684cf53d62a4e4557871ff1c9f3056dca0a1cdbbda2253cddb0396189744
+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-9999.ebuild 1885 BLAKE2B d0cc4e20e992c06091cdadfda6049b6b367fc972aa6b372ebef996e95fa321d96e75a267f9e164123f6083d08dd653037965bebd106155508bfce5d73c21c96f SHA512 c11f51098cc8637d86b9143d715f506574acea6b2e51715b2309f04f4e714ee43bbd8b874815bd6ef1edd7be0a760162c7338962d5ef839966c84c8352a95322
 MISC metadata.xml 490 BLAKE2B 36af527c82aa05f09ef3187a5c93ec34412a625a00016ad87fa1f6e7a00108f87bd3c8af42aad0aec87fa11e1ec25da71f1f4776c0da053e7426b8006d876103 SHA512 eacb9a20b0228c67896f7633619e67ef0e2de38444436ed720f849b8d9fcbed3c2569d2534e38fb7060cd755195bfd74cbcc9d77dbd5da4fb7b1654f87f70a1f
diff --git a/app-portage/portage-utils/portage-utils-0.62.ebuild b/app-portage/portage-utils/portage-utils-0.62.ebuild
deleted file mode 100644
index 28eb664c0b5d..000000000000
--- a/app-portage/portage-utils/portage-utils-0.62.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit flag-o-matic toolchain-funcs eutils
-
-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/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="m68k"
-IUSE="nls static"
-
-RDEPEND="dev-libs/iniparser:0"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	static? ( dev-libs/iniparser:0[static-libs] )"
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	# 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)
-}
-
-src_install() {
-	default
-
-	exeinto /etc/portage/bin
-	doexe "${FILESDIR}"/post_sync
-	insinto /etc/portage/postsync.d
-	doins "${FILESDIR}"/q-reinitialize
-
-	# Portage fixes shebangs, we just need to fix the paths in the files
-	sed -i \
-		-e "s:\(/etc/portage/postsync.d\|/usr/bin/q\):${EPREFIX}&:g" \
-		"${ED}"/etc/portage/bin/post_sync \
-		"${ED}"/etc/portage/postsync.d/q-reinitialize || die
-}
-
-pkg_preinst() {
-	# preserve +x bit on postsync files #301721
-	local x
-	pushd "${ED}" >/dev/null
-	for x in etc/portage/postsync.d/* ; do
-		[[ -x ${EROOT}/${x} ]] && chmod +x "${x}"
-	done
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "${EPREFIX}/etc/portage/postsync.d/q-reinitialize has been installed for convenience"
-		elog "If you wish for it to be automatically run at the end of every --sync:"
-		elog "   # chmod +x ${EPREFIX}/etc/portage/postsync.d/q-reinitialize"
-		elog "Normally this should only take a few seconds to run but file systems"
-		elog "such as ext3 can take a lot longer.  To disable, simply do:"
-		elog "   # chmod -x ${EPREFIX}/etc/portage/postsync.d/q-reinitialize"
-	fi
-}
diff --git a/app-portage/portage-utils/portage-utils-0.74-r1.ebuild b/app-portage/portage-utils/portage-utils-0.74-r1.ebuild
index 4f2fd4df0749..0f7b316377f7 100644
--- a/app-portage/portage-utils/portage-utils-0.74-r1.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.74-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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"
diff --git a/app-portage/portage-utils/portage-utils-0.74.ebuild b/app-portage/portage-utils/portage-utils-0.74.ebuild
index 471c7b47be7d..2f4d01d634a2 100644
--- a/app-portage/portage-utils/portage-utils-0.74.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.74.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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"
diff --git a/app-portage/portage-utils/portage-utils-0.80.ebuild b/app-portage/portage-utils/portage-utils-0.80.ebuild
index 5af98dad7ebe..570f89a51977 100644
--- a/app-portage/portage-utils/portage-utils-0.80.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.80.ebuild
@@ -15,11 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
 else
 	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-<<<<<<< HEAD
-	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~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"
-=======
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~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"
->>>>>>> next
+	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="
diff --git a/app-portage/portage-utils/portage-utils-9999.ebuild b/app-portage/portage-utils/portage-utils-9999.ebuild
index 423703f19f3f..00881bad1181 100644
--- a/app-portage/portage-utils/portage-utils-9999.ebuild
+++ b/app-portage/portage-utils/portage-utils-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	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 ~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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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="