gentoo resync : 30.04.2018

4 files changed, 45 insertions, 25 deletions

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 8c3a00cecd0a..98fba31a59ce 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,6 +1,6 @@
-DIST xz-5.2.2.tar.gz 1464228 BLAKE2B aea079d094ad23e305eb273c4b126816d36ec3b92e6d626bdf6cb6903bb49183c764b97a85eda52dfe5fb5ebc9bb87913a8caa0523a00acc2d2f4edf70b1418f SHA512 8d6249f93c5c43e1c8eeb21f93b22330fd54575e20bbb4af3d06721192d9f0ca3351878964c9640238ac410b7dd9f16329793c7be7355c7ca0db92c6db6ab813
 DIST xz-5.2.3.tar.gz 1490665 BLAKE2B 470791a67fe635165559b0364c9c0e968f3fc32ba7af53d0173d620ca65c68428e0d4d18ada341a063ea3eabb1b51a71cf873218ca0622fd41e01c20a6f04078 SHA512 a5eb4f707cf31579d166a6f95dbac45cf7ea181036d1632b4f123a4072f502f8d57cd6e7d0588f0bf831a07b8fc4065d26589a25c399b95ddcf5f73435163da6
-EBUILD xz-utils-5.2.2.ebuild 2089 BLAKE2B 0c68b78919f7d14466656ddf055c791ecc0c9237792b6083995ceb7fa6d8d98196435fc036b9cb09864590b2a7d2268321592f3060bfa9c97ddc120f1793b4dc SHA512 f4eb3ae00c16f8ce2933d1a0bb6e6e5b09fada4b671a27bcf6e0bb669000f449f54cc4d977543d9daacfe678386799a3c1d3c2f96a3b7426f342dad5733b8a97
-EBUILD xz-utils-5.2.3.ebuild 2597 BLAKE2B 5315c9bd41ebe1c6a8b59faefc7446931d6b13270c320d5e45404becad60a649b2438813deaad55beca07fe50c6d4cec123fe54787fb30f6f2c3a4f1bb6da093 SHA512 396641b18da127285a11dd4ea74c0279a38f6a297196b32f2e667b358ba94edd0b7d3d93e69861265209dec847d230ea443e392db64373f7ed86f75f55bfda65
-EBUILD xz-utils-9999.ebuild 2594 BLAKE2B 75fe6db86dbe267353f4843d743a88097951575d2cf1396f8307aee097b4a72237bc709dc66208504337aed13eb54f1b98487b116c6c51e78e535a9bcc6dde48 SHA512 7c5dcf80d5bdf042304c4bfde56b12e6138769191a23436fd52268d361dedab49df0658d6f95b90055445f6309889ebdad1764a147242b9b477663a1032bdca5
+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-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.3.ebuild b/app-arch/xz-utils/xz-utils-5.2.3.ebuild
index 516ab9467936..337c639f0bf5 100644
--- a/app-arch/xz-utils/xz-utils-5.2.3.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.3.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=5
 
-inherit eutils multilib toolchain-funcs libtool multilib-minimal
+inherit multilib toolchain-funcs libtool multilib-minimal preserve-libs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
-	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 ~arm-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-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"
 	S=${WORKDIR}/${MY_P}
 	EXTRA_DEPEND=
 fi
diff --git a/app-arch/xz-utils/xz-utils-5.2.2.ebuild b/app-arch/xz-utils/xz-utils-5.2.4-r1.ebuild
index 727c5970e60f..6916173e206e 100644
--- a/app-arch/xz-utils/xz-utils-5.2.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.4-r1.ebuild
@@ -4,9 +4,9 @@
 # Remember: we cannot leverage autotools in this ebuild in order
 #           to avoid circular deps with autotools
 
-EAPI="4"
+EAPI=6
 
-inherit eutils multilib toolchain-funcs libtool multilib-minimal
+inherit multilib toolchain-funcs libtool multilib-minimal preserve-libs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
@@ -16,8 +16,9 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
-	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"
-	S=${WORKDIR}/${MY_P}
+	[[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
+	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"
+	S="${WORKDIR}/${MY_P}"
 	EXTRA_DEPEND=
 fi
 
@@ -27,7 +28,7 @@ HOMEPAGE="https://tukaani.org/xz/"
 # See top-level COPYING file as it outlines the various pieces and their licenses.
 LICENSE="public-domain LGPL-2.1+ GPL-2+"
 SLOT="0"
-IUSE="elibc_FreeBSD nls static-libs +threads"
+IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads"
 
 RDEPEND="!<app-arch/lzma-4.63
 	!app-arch/lzma-utils
@@ -35,7 +36,11 @@ RDEPEND="!<app-arch/lzma-4.63
 DEPEND="${RDEPEND}
 	${EXTRA_DEPEND}"
 
+# Tests currently do not account for smaller feature set
+RESTRICT="!extra-filters? ( test )"
+
 src_prepare() {
+	default
 	if [[ ${PV} == "9999" ]] ; then
 		eautopoint
 		eautoreconf
@@ -45,12 +50,27 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	local myconf=(
+		$(use_enable nls)
+		$(use_enable threads)
+		$(use_enable static-libs static)
+	)
+	multilib_is_native_abi ||
+		myconf+=( --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} )
+	if ! use extra-filters; then
+		myconf+=(
+			# LZMA1 + LZMA2 for standard .lzma & .xz files
+			--enable-encoders=lzma1,lzma2
+			--enable-decoders=lzma1,lzma2
+			# those are used by default, depending on preset
+			--enable-match-finders=hc3,hc4,bt4
+			# CRC64 is used by default, though some (old?) files use CRC32
+			--enable-checks=crc32,crc64
+		)
+	fi
+
 	use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable nls) \
-		$(use_enable threads) \
-		$(use_enable static-libs static) \
-		$(multilib_is_native_abi || echo --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts})
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 
 multilib_src_install() {
@@ -59,9 +79,8 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files --all
-	rm "${ED}"/usr/share/doc/xz/COPYING* || die
-	mv "${ED}"/usr/share/doc/{xz,${PF}} || die
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+	rm "${ED%/}"/usr/share/doc/${PF}/COPYING* || die
 }
 
 pkg_preinst() {
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index e770562d7a4c..6916173e206e 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -4,9 +4,9 @@
 # Remember: we cannot leverage autotools in this ebuild in order
 #           to avoid circular deps with autotools
 
-EAPI=5
+EAPI=6
 
-inherit eutils multilib toolchain-funcs libtool multilib-minimal
+inherit multilib toolchain-funcs libtool multilib-minimal preserve-libs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
@@ -16,8 +16,9 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
+	[[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
 	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"
-	S=${WORKDIR}/${MY_P}
+	S="${WORKDIR}/${MY_P}"
 	EXTRA_DEPEND=
 fi
 
@@ -39,6 +40,7 @@ DEPEND="${RDEPEND}
 RESTRICT="!extra-filters? ( test )"
 
 src_prepare() {
+	default
 	if [[ ${PV} == "9999" ]] ; then
 		eautopoint
 		eautoreconf
@@ -77,9 +79,8 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files --all
-	rm "${ED}"/usr/share/doc/xz/COPYING* || die
-	mv "${ED}"/usr/share/doc/{xz,${PF}} || die
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+	rm "${ED%/}"/usr/share/doc/${PF}/COPYING* || die
 }
 
 pkg_preinst() {