gentoo resync : 31.03.2018

4 files changed, 26 insertions, 3 deletions

diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 2404fa90975d..6c42bfccd62b 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -8,7 +8,7 @@ DIST portage-utils-0.64.tar.xz 533124 BLAKE2B c3e0ecdc2d82af197dabb8434677d4c3bf
 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 1156 BLAKE2B f48b8b7f8022efc4139a3fef3e4972bc60bae01d1fe1406ed9fe28ed2ec57c0a3474be929f98d70fc0e063f5a9cd9bea5ae4b5427e54ba75fa1ed4e8fdbfb33d SHA512 f844f217e2e3c516813c53b1193af4f81c91c574a4bd29dacc66eb39eca52a4f63c94c607b191ff8285ef659f5fa353115271f01744106ee7030909533645f56
-EBUILD portage-utils-0.64.ebuild 1076 BLAKE2B 7c628f6982c03850ce60c99d49dca418c5f64ab41461fff8a88fe591411d36b74e0f2a8b4044e9d09afd79b40836a26e86c5c8655c9b8a9d2ab8a0af47c0568a SHA512 3987f4f6fff46cfa493cfd18dcd76ef375625abc90de44031b42ba920c49c8c780a8c4e5f0ba5e75481db0beb466230664ed46bdcf9751a9dac7d47de181079d
-EBUILD portage-utils-0.65.ebuild 1092 BLAKE2B dc0f835b1e8e2065b6068fd011f2e6a953f046d366f46053dd534a3621379c68707b4612cbce46f74923a5535b280388c4cd3cc4b691826c08bb87d7c6b00ee6 SHA512 1b4a097f7408ebb6634d4b232ad3dc407b444c4dbb73b8d3b1c6b904cabddf0c3c53b4c51cd008355e7586f248fe663beff3a853dbfb847e29c7ab82c16ed390
+EBUILD portage-utils-0.64-r1.ebuild 1398 BLAKE2B 758b9c648ba5b99d785a41b2c841aa1696aceec018b44edc1bc48efd7e4612173f8c77ed94239cbce3baa4dc1e7a16d25db862bbe38496bca41a7980584cbb45 SHA512 98e4047ac08e739af34409aa6963c27e481376d24d6dd3dea031928b19d2ba8bee4d89f2345f46e67c5cc3e09112d5c00bcb29d8383f44566b19ddc3c6a6c71d
+EBUILD portage-utils-0.64.ebuild 1309 BLAKE2B 51b5176cd52cbef728acd31e0ca1d1563d656272da448aa602ddb30d501d777ee22a2b19bb3a3dd110a0f3613b2375c8603694cc474d8e7d4d1d98785b23768c SHA512 24a5017ddbd7281b520a8d600e9c2416243f9d0c98500c62f21f7238bb098a2f96c96d99f6fa51dcec9b9776dd31d53c0be3adaf10d514a3869aea04fb148dae
+EBUILD portage-utils-0.65.ebuild 1334 BLAKE2B 6b2c8edcbc9b741884de727da07206f00db0e3d5c039c9d0a0dee3ee53d6ca550df56880ad3be875831c1eb7b7efffda5c373ce1a4e25c731318b0c9a11ae038 SHA512 40ff0725e9d17a38dae97463a28959b52dee0e845027ab35383fb03aaab3b3b7f4c72cf2359a862e2f4f59f42cbb63b36f175b7e874aab0ffe2a0549b25640a9
 MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
diff --git a/app-portage/portage-utils/portage-utils-0.64-r1.ebuild b/app-portage/portage-utils/portage-utils-0.64-r1.ebuild
index d85fe56221cf..fcbb87997aae 100644
--- a/app-portage/portage-utils/portage-utils-0.64-r1.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.64-r1.ebuild
@@ -24,6 +24,14 @@ 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 || \
diff --git a/app-portage/portage-utils/portage-utils-0.64.ebuild b/app-portage/portage-utils/portage-utils-0.64.ebuild
index b56d5c2a0f0e..74b28b849f53 100644
--- a/app-portage/portage-utils/portage-utils-0.64.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.64.ebuild
@@ -20,6 +20,13 @@ 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 || \
diff --git a/app-portage/portage-utils/portage-utils-0.65.ebuild b/app-portage/portage-utils/portage-utils-0.65.ebuild
index 300ced4574a3..f9e459521076 100644
--- a/app-portage/portage-utils/portage-utils-0.65.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.65.ebuild
@@ -20,6 +20,14 @@ DEPEND="${RDEPEND}
 	app-arch/xz-utils
 	static? ( dev-libs/iniparser:0[static-libs] )"
 
+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 || \