gentoo resync : 05.04.2018

4 files changed, 6 insertions, 62 deletions

diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 6f5d27b4ee90..73841b8f3a0f 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -3,12 +3,11 @@ AUX portage-utils-0.64-fix-quiet.patch 1384 BLAKE2B e535a4bd027212281d790d7c4234
 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.63.tar.xz 529012 BLAKE2B 25ecf32a6a64484af5d3c73c2a9482b379ba420260de159b59a17ebd864b0ff49fcaa248db1e7d9a9c9582655ed6d4cb7a3e413212247890167b37c4275d201a SHA512 2b0bceee63b894e7f517f3c938a1873aa90c41b668abbf6a39125a1bb9ce1059731e34216cc357787b5cbf83a0cf0748530147262673ea0bc26404d6274714eb
 DIST portage-utils-0.64.tar.xz 533124 BLAKE2B c3e0ecdc2d82af197dabb8434677d4c3bfbbee01c482c496d89d2f7be988ef894e0b3c7cb64337216144644a48ee3213fc1683ae6d75091e471189a4550b8c71 SHA512 e384b88454607aa9123ac3a71d55fb16de475ba59f4ba6efd236594f42140e75650696430138cdb6e1c4e1792db091bbc1db42b1c1102fd579af6514ecefffb7
 DIST portage-utils-0.65.tar.xz 542804 BLAKE2B bddc1a0ffa52a8d871547e5f4cbbca254e2ac56d84b7271dac127e6be64b13bc0168a7ed256b782b0e844720e536076fe7a7df3ec04a862c85b2501110de2d11 SHA512 a76be4d86b07ba39fa577efe477973f888062094d6f3a98b873e10998e10e3d0d08137444e11d14489ff8f465d984e8929b5ee91c26944bad7a245683ee4d056
-EBUILD portage-utils-0.62.ebuild 2243 BLAKE2B 383eb4fa9791b2f9f99b6a71004a410342b1751b5e987f698f8a70df90fa1186ed6f91050788cfb68f983df5fece3be98da5b65cd7aa62678f1b534554e09736 SHA512 b6f941532e77f9670b7ccfcfb2fa8ef039335e88ccaeb6d32370aab032674435e1acfbc633a22ce98f736626351df77d8e2ee9bf6e5bdb37f0c6427c4fdc317b
-EBUILD portage-utils-0.63.ebuild 1190 BLAKE2B bc78f2a5ec957e2bb6a60f9377028579ca6fffffd4b46803d977dc463ea3e4dace74de224e5d88262a92e46b81882c6ded1bdb38595a5cbdf62ba4754bae5e3c SHA512 dcc3384a68e6f44066eb9eaa35909cca3076724939d38800d8a3290354dcf11809c19274605acf5f88423418ec76b9a0e8b7e1dcce2b19ef8f1e61f1dbab3a0f
-EBUILD portage-utils-0.64-r1.ebuild 1398 BLAKE2B 758b9c648ba5b99d785a41b2c841aa1696aceec018b44edc1bc48efd7e4612173f8c77ed94239cbce3baa4dc1e7a16d25db862bbe38496bca41a7980584cbb45 SHA512 98e4047ac08e739af34409aa6963c27e481376d24d6dd3dea031928b19d2ba8bee4d89f2345f46e67c5cc3e09112d5c00bcb29d8383f44566b19ddc3c6a6c71d
+DIST portage-utils-0.70.tar.xz 551192 BLAKE2B ca15637ee6532eebd3a064559bb933aad3042c19994e5dcb8234249312dac139288e4ed38f9c2b46ce1921d97398485bb7276ccf285b2f97df3889a2c91f4d9f SHA512 de3d0813a2e71ca93722828b9b8ee8211e7d5383b81a8ae343624e98618522c0d56945422ae6fadbe0694c4b0f381aa0047eb28bfa7e63e0d95c468e3e2934ab
+EBUILD portage-utils-0.62.ebuild 2009 BLAKE2B d3e8eb50957fa5481104a2e9ab3158e08d7869b9b5c01a45af40542aeeb46d89d50a19c929f01768c6971c7258b8252691bde1986ee3eeaa6b4ad0dde537cf8b SHA512 89e9460924ec60bafff6f2fccecabc20771d185152007c3fa78c0d8033e1ec63b0797bebd0ca792c7cb77693c4d1cfe4cb24d3f788d69a494bcae1005f912e47
 EBUILD portage-utils-0.64.ebuild 1308 BLAKE2B cd497cc22dbda169a006b1a14e5264eacd5594ae35d48511e8d605d48d96135f5a3dab037955bbc8b634ac68982d29b31398d7302d8989cab365150400d72fb2 SHA512 f99299e75aa903edcf4e556671ad2653f5d430b1b84e6d8404a4bcd889731c0c180ab8451295f4da62f51a36459e83b993072e54753fbb619be124955bce3cf5
 EBUILD portage-utils-0.65.ebuild 1334 BLAKE2B 6b2c8edcbc9b741884de727da07206f00db0e3d5c039c9d0a0dee3ee53d6ca550df56880ad3be875831c1eb7b7efffda5c373ce1a4e25c731318b0c9a11ae038 SHA512 40ff0725e9d17a38dae97463a28959b52dee0e845027ab35383fb03aaab3b3b7f4c72cf2359a862e2f4f59f42cbb63b36f175b7e874aab0ffe2a0549b25640a9
+EBUILD portage-utils-0.70.ebuild 1092 BLAKE2B dc0f835b1e8e2065b6068fd011f2e6a953f046d366f46053dd534a3621379c68707b4612cbce46f74923a5535b280388c4cd3cc4b691826c08bb87d7c6b00ee6 SHA512 1b4a097f7408ebb6634d4b232ad3dc407b444c4dbb73b8d3b1c6b904cabddf0c3c53b4c51cd008355e7586f248fe663beff3a853dbfb847e29c7ab82c16ed390
 MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
diff --git a/app-portage/portage-utils/portage-utils-0.62.ebuild b/app-portage/portage-utils/portage-utils-0.62.ebuild
index 41f25c46ca28..e7b698c0d6f9 100644
--- a/app-portage/portage-utils/portage-utils-0.62.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.62.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 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="m68k"
 IUSE="nls static"
 
 RDEPEND="dev-libs/iniparser:0"
diff --git a/app-portage/portage-utils/portage-utils-0.63.ebuild b/app-portage/portage-utils/portage-utils-0.63.ebuild
deleted file mode 100644
index 02488936420e..000000000000
--- a/app-portage/portage-utils/portage-utils-0.63.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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() {
-	epatch "${FILESDIR}"/${PN}-0.61-solaris.patch
-	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)
-}
diff --git a/app-portage/portage-utils/portage-utils-0.64-r1.ebuild b/app-portage/portage-utils/portage-utils-0.70.ebuild
index fcbb87997aae..300ced4574a3 100644
--- a/app-portage/portage-utils/portage-utils-0.64-r1.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.70.ebuild
@@ -3,12 +3,12 @@
 
 EAPI="6"
 
-inherit toolchain-funcs epatch
+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"
+	https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,18 +20,6 @@ DEPEND="${RDEPEND}
 	app-arch/xz-utils
 	static? ( dev-libs/iniparser:0[static-libs] )"
 
-PATCHES=(
-	"${FILESDIR}"/portage-utils-0.64-fix-quiet.patch
-)
-
-src_prepare() {
-	default
-	# 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 || \