gentoo resync : 13.05.2018

5 files changed, 7 insertions, 4 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index bd7d99a84951..c80c03f2a0dd 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 49072a28052d..58e75e7aa05e 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -4,5 +4,5 @@ AUX rpm-4.9.1.2-libdir.patch 1056 BLAKE2B 5be54a8109c2c24fcd0c197c0a62e433047ac4
 DIST rpm-4.11.0.1.tar.bz2 3670158 BLAKE2B 8190cd760ce86275a27a64aca7622340a2894f4f7aad0171425c7f5d3cfcf58e82c2a792f7d4687fff9270fe3f9c861027b6eea43f3602be8b12098dbccf408f SHA512 72bd3054b2d0def1e25fba7113eda14def38baef62b558e65cafaf3b374823d0905d982772cffddfd9dc6698eff293251acb2ace7dfda0964085669caa88d535
 DIST rpm-4.12.0.1.tar.bz2 4129093 BLAKE2B 85addde70d031f179566771350f5907311cf61a077b647b5dbb75e1e157141e541cb7a236e5a1d4fce881d98eb7c0331a0eadd0ca1dd09e53d9d28dd954203bf SHA512 ae751b04cec2463f1f259aec4b4750fca1e4cef6144b7e612d0c94f7b6a2864ed119547568f6acebb7fefddb7b040b6021c1f32cf465963db0b627f524c5760f
 EBUILD rpm-4.11.0.1.ebuild 2739 BLAKE2B 80664cf24466365a81eb4774a49a146327367b20c26fabc11c872ad8c4c22079235ae9dc0ece0956478668fcf47caca1215fe77674f7f06e778eea7003502ef6 SHA512 ecade45798b73e1a573edac06b60dbe0d0e2d4915a13beb41bbdfdc2596e208899bf6b7a36ad1144d65ebf1c186889c6f9928575ff7f5f14516deb5687b2d83a
-EBUILD rpm-4.12.0.1.ebuild 2895 BLAKE2B d427a4186655dc4b84df4a74abd842237a0c7668f7a20c23791e6b8f2a6a8cedc1a260f94ce35b160f31b79f45732c750d0dff974320a8e4c597a626c675fe28 SHA512 3e31c722000ec68d734b43ba533eab59cef96dac93473e2bd7a01b9d19313f839c02725c785b500ae6a9529739d655e3afbe4f804edd7980dcd4282b5cae082b
+EBUILD rpm-4.12.0.1.ebuild 2894 BLAKE2B cf3ba401cf5c1b327c9911416926e849e52841bbc1ab937eaea44949a68ce91bc609ad2c6cf241d57f93b948ded48753cd888cadb3ff21a78fcc5b8586e9c355 SHA512 cf4c78083f32a3f54d732261d284e6a8ea4b7f5d6ff5150ff398627929b8329913a188e629fb930c7c042e4391725ce83546ec030a8d47095eb8065bc202d9f2
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-arch/rpm/rpm-4.12.0.1.ebuild b/app-arch/rpm/rpm-4.12.0.1.ebuild
index e0418711eda3..18a141c8aa2b 100644
--- a/app-arch/rpm/rpm-4.12.0.1.ebuild
+++ b/app-arch/rpm/rpm-4.12.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://rpm.org/releases/rpm-$(get_version_component_range 1-2).x/${P}.t
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="nls python doc caps lua acl selinux"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 98fba31a59ce..14d9626b57da 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,6 +1,6 @@
 DIST xz-5.2.3.tar.gz 1490665 BLAKE2B 470791a67fe635165559b0364c9c0e968f3fc32ba7af53d0173d620ca65c68428e0d4d18ada341a063ea3eabb1b51a71cf873218ca0622fd41e01c20a6f04078 SHA512 a5eb4f707cf31579d166a6f95dbac45cf7ea181036d1632b4f123a4072f502f8d57cd6e7d0588f0bf831a07b8fc4065d26589a25c399b95ddcf5f73435163da6
 DIST xz-5.2.4.tar.gz 1572354 BLAKE2B 877242324afd3c7eb21d3a9414c53843f4d1bb089206e8e545e280b32ff5372f7fb4a1b0c27cb6fdf0d0a27a668e9772ecc3fffc181df95d081ca9c2e987b83b SHA512 e5bf6eb88365d2dbdc774db49261fb9fae0544ed297891fc20f1ed223f4072cb0357cbd98146ac35b6d29410a12b6739bbd111cd57d4a225bef255ed46988578
 EBUILD xz-utils-5.2.3.ebuild 2600 BLAKE2B 3543e5f2c3021c9243b4484359fefd4705d6f7cef894ea14aa54190ff07f7b75e63996efcbd7c809b3125084c572b0141902bda3afce0bffd004ca43912818f8 SHA512 1e60ce955c6b67554ba5e59d1d7eb7d4ed37b830c4ea2d039732232057039a6b4a5b626bc333f93fa61e63c967ba3a33514427466e7ecdbb7db8e12f289950f4
-EBUILD xz-utils-5.2.4-r1.ebuild 2669 BLAKE2B 78a6e7face7f1eb0eaaca0fcf483e92c8304571a082f14e9eb8b3593822bf0684a687949f10e63e88406e723d6d99ff7207a13a8b66a71c75c96a83adb56bfe5 SHA512 614cd4bc390b0f12c0859f1f60f008528a32ec02b15e95b3cffed30c921dacc937f3bc8536bd39ed0c2f43c1e3cfaba894fd325588f4ab7ef6ce5fa319511c3d
+EBUILD xz-utils-5.2.4-r2.ebuild 2723 BLAKE2B 6e7f66aafe7a6422a1652f824b23b279861d660a468eefa9fdbbd99c24802b0a7ebe8cad19f938d521b9f85ecb0ad256b9e91e45220849a096cee173c8d94eee SHA512 a8b47c2cb48f427561dc278280c569bb62b09c1f52102d55e4fe12c534a571b5901be1d899d6be93d1fe65a3d81a38b42a540caf873d4084ba6b4cf4b590e290
 EBUILD xz-utils-9999.ebuild 2669 BLAKE2B 78a6e7face7f1eb0eaaca0fcf483e92c8304571a082f14e9eb8b3593822bf0684a687949f10e63e88406e723d6d99ff7207a13a8b66a71c75c96a83adb56bfe5 SHA512 614cd4bc390b0f12c0859f1f60f008528a32ec02b15e95b3cffed30c921dacc937f3bc8536bd39ed0c2f43c1e3cfaba894fd325588f4ab7ef6ce5fa319511c3d
 MISC metadata.xml 462 BLAKE2B 66d5625b239d042389ce8fef820efdc3ce3b5cbf21f6d0aedc4874d450ea1897dc8438575f3efc5a491ea857a8b990e6a51b16d0ff0b4982b41307bb52535cf1 SHA512 8f4ca7b987587a240f932ff1719f096de148db6e11c4e0af5f2f55552cab5d0af1256be337dbe8493b584d2c25a70a308dc28b90712078fb58f40cae37cfe5b1
diff --git a/app-arch/xz-utils/xz-utils-5.2.4-r1.ebuild b/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
index 6916173e206e..dd59406bd52a 100644
--- a/app-arch/xz-utils/xz-utils-5.2.4-r1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
@@ -79,7 +79,10 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
 	rm "${ED%/}"/usr/share/doc/${PF}/COPYING* || die
 }