gentoo resync : 28.04.2019

3 files changed, 37 insertions, 45 deletions

diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 9faf0469de57..647b5bcee7ae 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,11 +1,10 @@
 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.64.tar.xz 533124 BLAKE2B c3e0ecdc2d82af197dabb8434677d4c3bfbbee01c482c496d89d2f7be988ef894e0b3c7cb64337216144644a48ee3213fc1683ae6d75091e471189a4550b8c71 SHA512 e384b88454607aa9123ac3a71d55fb16de475ba59f4ba6efd236594f42140e75650696430138cdb6e1c4e1792db091bbc1db42b1c1102fd579af6514ecefffb7
 DIST portage-utils-0.73.tar.xz 1585564 BLAKE2B b743f459770ebceaa86cc47b0a9d0172ee495bbe2930cd57c2909d3ac2d7c1672447e84240245e1b98922004f4f34418d75b39c7e1550a34a07b964b7ecbcc8d SHA512 d35af62e3b6551c5224a3afb89ebf2e08cf42de266389c3423782c19fcfe8934433a4554ea5ed629de495a66371f0220c479fa84f24d68655211b8538e18d105
 DIST portage-utils-0.74.tar.xz 1587792 BLAKE2B 7c4588e3d44266a5260df42cc685aa03c584248e9970956033e4191a7a842a4b2162110ac99c2bb18645aaafc6ae6ee960e9b26ba0a8863497911eef1e943f64 SHA512 cd3f44c135b3d44e15a95eed41281fce62f225a9d05d5d5bb1be230b2d59cdb87755f011b313a9ec32e4cafdf3b3979c4ef423365edd7dcc472ca2e38c09c83e
 EBUILD portage-utils-0.62.ebuild 2014 BLAKE2B 58941548aecefed7c7a4bee3ec9e60de24ede0380c4a6cb4e3184ff457fb07c946e792d3e60e2a16bef4897b287fd19f9315fdaea4012bc19220379763418812 SHA512 3fc3be2e3e29821cd26cb7d8a9e7e6a026e17c839308039ef2011700677e3f05e2322e367e737e822ccbf1621221f7ff8ca929c6f60817dfdd295981745cda1d
-EBUILD portage-utils-0.64.ebuild 1296 BLAKE2B 32d3375e708bb4e55f2addce4366d88289b47d928e9c331ebbe559f7954f76bac2240a90adcbe1b9f6828b54a20765810ed3d663a4972b3aad6b7af65a2b2c1d SHA512 6ca693b29d59ef4b46cd2179f92fe200ed846611d785e6440d94beb62190a53507d88560bdb852b7a0661c3ccf1ad616c31706710f20a4769fd6d8a3c469fb7c
 EBUILD portage-utils-0.73.ebuild 1081 BLAKE2B 5e765d3f7e41b622fafd1424dde7541fcaa557832d26eb91b392d41401a1cf591be5498632eac2c83c217f0583a7c80507d86b343154e131b1eb74735f22fb45 SHA512 f0bdfd0b1ea3dd278ffaa8d66614b7750a15e5cf78f9ddca9c4c12ab40e58075c31639b02e1da58579140a25d23a2a8704f646cd3a9a4f96aa930bbe67062816
 EBUILD portage-utils-0.74.ebuild 1066 BLAKE2B ab52c50d0d46d3bafca5ae63d4b5c57a9abe7fda5861827bd32d149bd4f27e820c935cd8fe6bf12b4e0bd92bd82261df94d9f0198a31b074fa559dffbd059ba9 SHA512 47e9b2b3e7d63b482f3db32d2bd561512bed1ececa67f14d44aa9b6f7a4ba80213c54904e2e5c174870b082ad33d5f6160a35a6aa47fca737aa1bf0b826f48b9
+EBUILD portage-utils-9999.ebuild 1036 BLAKE2B 5f8f0cd1f69b04ed5946ec0203a8a65becc1953e85058c079088dc9e965959aadb07c9cd4b749dae367cc20f81f09b6c2ec1de06bf328372b629d04f5c29042a SHA512 aa23862f72f5d25d54890c2b953891730658f07d1ee5d24a0d36f8f9a7ed02653e4d9d0e44e6a6adc909ae5247fb6b59a2a0aade1a1448c5f36c721b7965305f
 MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
diff --git a/app-portage/portage-utils/portage-utils-0.64.ebuild b/app-portage/portage-utils/portage-utils-0.64.ebuild
deleted file mode 100644
index 1a7cb5264db2..000000000000
--- a/app-portage/portage-utils/portage-utils-0.64.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-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/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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"
-IUSE="nls static"
-
-RDEPEND="dev-libs/iniparser:0"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	static? ( dev-libs/iniparser:0[static-libs] )"
-
-src_prepare() {
-	# bug #638970, caused by gemato writing Manifest.gz files in
-	# metadata/md5-cache dir, unlike hashgen
-	sed -i -e '/find [.] -mindepth/s/-type f/-type f ! -name "Manifest.*"/' \
-		tests/atom_explode/dotest || die
-}
-
-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-9999.ebuild b/app-portage/portage-utils/portage-utils-9999.ebuild
new file mode 100644
index 000000000000..d2afd91deb57
--- /dev/null
+++ b/app-portage/portage-utils/portage-utils-9999.ebuild
@@ -0,0 +1,36 @@
+# 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"
+
+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="~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
+	static? ( dev-libs/iniparser:0[static-libs] )"
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf --with-eprefix="${EPREFIX}"
+}