gentoo resync : 18.05.2019

4 files changed, 4 insertions, 96 deletions

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 824ac91766d7..c72b9bf879f8 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,6 +1,4 @@
-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 2571 BLAKE2B 1788e6fad91fb53b24e7569cde03460bff0a2e3b47944fcefeef171a6aab6f8c4252d2b5bf85de7d2270bfccca81322e263dc9e533df609c4b20987cded81daa SHA512 fab45e4cf1b6641778a9ba2938899904f58ccc45a08eaa438bc48518abc029901839cc161d658cdae1196b253d11e9e066c5d401842cb6e77079eb3ba676c961
-EBUILD xz-utils-5.2.4-r2.ebuild 2681 BLAKE2B 799cd9c8adbd4ce02283e088dabe4e04fda65bed108e9d54320b796f4e4a5027ceb4f56684809b379cfb7fa0f9625338bf12ec3d4b32d9fcbc131fb7f707ed37 SHA512 d767afee370f31ef0d6e5bd7106ef0460c613220e3f4613ab857bc4b316709a176342d47dfbfecee0e51dbd3f117ab9e524531ed2cb8d2be546d9694d67b1507
-EBUILD xz-utils-9999.ebuild 2640 BLAKE2B acd0b41c7920abc224dbcfcc464986f98cc0be29c8c9bb2b5868f6c7fc8b3b25366171bf0938fa3ec7bc433f2fea2ebb959240ca29ed6e00a8718aadc415382f SHA512 4ba55614686767f42af701167beb3df92e1714b2010c34a52005e87a1090ce7bd707c82eb2e65873a6eea413f68cc147ac20f09c36f52f57e5c93bea24681127
+EBUILD xz-utils-5.2.4-r2.ebuild 2693 BLAKE2B aa5671f827997a8f32a850f64e4f797223fe6c290c10ebacd626a37bcf2d79e2682e08b8c3da914333f76040c39d104bc3c87eed5bb78cf34208409ce6a9776d SHA512 958d42f3cadcf435322b749c7a573f1148646b10b9113695871c996ea9d7d9a30e060c45afa069faa121f6dd74fb45c7ca017794af2fe26ec5002e7d9fbb98e9
+EBUILD xz-utils-9999.ebuild 2652 BLAKE2B 02d447457fb4c4911e913e8128a513a8f664a035534ad1a5df105024b1c5ce0b903ea0610010498413626bd00416804bb3ab2364ea48053ae40bb90f1d45d575 SHA512 60d58ec8c41c9aec1a6aadf07cae78764d8fb4ef1ea11426abead71f653906a3d2d47e5e4e247335a76c2d04da90c04c0a8b6dd33f525d046094f2e9d7c024ef
 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
deleted file mode 100644
index 80a98b5080c0..000000000000
--- a/app-arch/xz-utils/xz-utils-5.2.3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Remember: we cannot leverage autotools in this ebuild in order
-#           to avoid circular deps with autotools
-
-EAPI=5
-
-inherit multilib toolchain-funcs libtool multilib-minimal preserve-libs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
-	inherit git-r3 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="https://tukaani.org/xz/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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
-
-DESCRIPTION="utils for managing LZMA compressed files"
-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 +extra-filters nls static-libs +threads"
-
-RDEPEND="!<app-arch/lzma-4.63
-	!<app-arch/p7zip-4.57"
-DEPEND="${RDEPEND}
-	${EXTRA_DEPEND}"
-
-# Tests currently do not account for smaller feature set
-RESTRICT="!extra-filters? ( test )"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		eautopoint
-		eautoreconf
-	else
-		elibtoolize  # to allow building shared libs on Solaris/x64
-	fi
-}
-
-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 "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-	gen_usr_ldscript -a lzma
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	rm "${ED}"/usr/share/doc/xz/COPYING* || die
-	mv "${ED}"/usr/share/doc/{xz,${PF}} || die
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
-}
diff --git a/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild b/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
index fa809174d2ac..3ba0a112b9ef 100644
--- a/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
@@ -17,7 +17,7 @@ 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 ~riscv s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index ee898fc2451a..002f769a1c13 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -17,7 +17,7 @@ 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 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-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 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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