gentoo resync : 18.12.2017

5 files changed, 63 insertions, 22 deletions

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 7ee7a324cdbf..c413c172c9a4 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 2097 BLAKE2B 3ecb6c0db1210b0fb246cfe39a43f7dcbc7a2b8961655d16ded35184d9acbc67442c2c7c8c554f2cb3e2d92404ffe0bad0fbfa8bb76353d4f5623ed50882afd1 SHA512 19a6df27b09c8911375424a287d138b15e6db3f3c51dcd3b95fc83b3cf2bcffbd8779622e3c398e7a7d623b83b87bb4a272b98976ec12a4248b2ab826bb25f60
-EBUILD xz-utils-5.2.3.ebuild 2111 BLAKE2B 9727e5e45e5265c69e6c1f2211f4bea175354ba59251eaa7bafe30635ec6d7fccaf025cc405061aa8fe7f200d466c157ff53fe028d71449fd80d069cb71d198f SHA512 6f8d099b820445cc5ae05cb62a8e582dc80f0dc9decbe448bedd85fd340ac35313e4d510b61cd1126bb2d95f4776a69e960572a604e29b05cd6736711e500efc
-EBUILD xz-utils-9999.ebuild 2108 BLAKE2B 29a572a22b9979fb25267e3cd857ec6c0c5426d98357e01d5022550e0ed9529c407a4e977a72653a2b5944436be7dfaba206c7133af61f6abb1a2a76c894604c SHA512 46dd4e4c6de3863c0ed400de486905e408eeb33a4d3b2a9155db68001342d89a3a80334b8916df65a90d5b8fdfa4b7ea1220d328a68e97d6f423b4c1af7e85ed
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
+EBUILD xz-utils-5.2.2.ebuild 2099 BLAKE2B 5ba3aa8d0f75b216aec28b9fdfde482f008a499ad83e7e77339d19b42fcb4746dc8ecbab40a8bcc90a47409fc5aed9f4fea94698336db1606e85a95f2eb27dfc SHA512 c08130f3f0a71af52f0307f29570112e33b657ca1ea81836d31b4a78bcee20afc02c0e456a0d011325c3f6ee34610aecb4f5de8f258517a9c9ebaa85d128b739
+EBUILD xz-utils-5.2.3.ebuild 2607 BLAKE2B 150f322fb1a07ff66f46e0839a3e9123be7feb048baaaa4efce4c099dac1e7729a302d9aef860e225c88b681dfff443a19d0ad96f17d9848d3b8b456adab6a3d SHA512 3a492a0b8f063e11fe88109f22d2635f6499076d6785ff01f9900add586ce9108d1367974dcb1f93bc65c47d8ce2eb8127e7e4b499430466e7d592dbe0be128e
+EBUILD xz-utils-9999.ebuild 2604 BLAKE2B e2bfd9bf478dc11c5b93aa17b81b5738175255239d1ec79193ba4e69d50cf9d0c1fbfde4a3256d601b651234d5a1baef91c15caa620820e93c58b2ef986a6e65 SHA512 a03a44c48ded24c0a00015d592714a903fd0fc244f67f0c7198e2dd140afee6a59b26ae4c71e3e9d55ddd7b003b954b8b8348fca47ae193aec58f550b8f9f012
+MISC metadata.xml 462 BLAKE2B 66d5625b239d042389ce8fef820efdc3ce3b5cbf21f6d0aedc4874d450ea1897dc8438575f3efc5a491ea857a8b990e6a51b16d0ff0b4982b41307bb52535cf1 SHA512 8f4ca7b987587a240f932ff1719f096de148db6e11c4e0af5f2f55552cab5d0af1256be337dbe8493b584d2c25a70a308dc28b90712078fb58f40cae37cfe5b1
diff --git a/app-arch/xz-utils/metadata.xml b/app-arch/xz-utils/metadata.xml
index 56c124413057..fac09b73379a 100644
--- a/app-arch/xz-utils/metadata.xml
+++ b/app-arch/xz-utils/metadata.xml
@@ -5,4 +5,9 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<use>
+	<flag name='extra-filters'>Build additional filters that are not
+		used in any of the default xz presets. This includes delta
+		and BCJ coders, additional match finders and SHA256 checks.</flag>
+</use>
 </pkgmetadata>
diff --git a/app-arch/xz-utils/xz-utils-5.2.2.ebuild b/app-arch/xz-utils/xz-utils-5.2.2.ebuild
index 227aa3cf924f..738007c75cbf 100644
--- a/app-arch/xz-utils/xz-utils-5.2.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.2.ebuild
@@ -9,13 +9,13 @@ EAPI="4"
 inherit eutils multilib toolchain-funcs libtool multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://git.tukaani.org/xz.git"
+	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
 	inherit git-2 autotools
 	SRC_URI=""
 	EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
 else
 	MY_P="${PN/-utils}-${PV/_}"
-	SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
+	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 ~sparc-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=
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 b074679f0e09..219b2145b252 100644
--- a/app-arch/xz-utils/xz-utils-5.2.3.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.3.ebuild
@@ -9,13 +9,13 @@ EAPI=5
 inherit eutils multilib toolchain-funcs libtool multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://git.tukaani.org/xz.git"
+	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
 	inherit git-2 autotools
 	SRC_URI=""
 	EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
 else
 	MY_P="${PN/-utils}-${PV/_}"
-	SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
+	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 ~sparc-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=
@@ -27,7 +27,7 @@ HOMEPAGE="http://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,6 +35,9 @@ 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() {
 	if [[ ${PV} == "9999" ]] ; then
 		eautopoint
@@ -45,12 +48,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() {
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index cf2f6076d65b..26f34b6536a2 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -9,13 +9,13 @@ EAPI=5
 inherit eutils multilib toolchain-funcs libtool multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://git.tukaani.org/xz.git"
+	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
 	inherit git-2 autotools
 	SRC_URI=""
 	EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
 else
 	MY_P="${PN/-utils}-${PV/_}"
-	SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
+	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 ~sparc-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=
@@ -27,7 +27,7 @@ HOMEPAGE="http://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,6 +35,9 @@ 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() {
 	if [[ ${PV} == "9999" ]] ; then
 		eautopoint
@@ -45,12 +48,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() {