xz-utils: upgraded package to upstream
Upgraded app-arch/xz-utils to version 5.2.3 on amd64, arm, x86
BUG=chromium:710066
TEST=for b in reef daisy x86-zgb; do
FEATURES=test emerge-$b -q --nodeps xz-utils; done
Will also run through commit queue
Change-Id: Icd3399b442e321e680dfc21b1c46d04f75c8b647
Reviewed-on: https://chromium-review.googlesource.com/474066
Commit-Ready: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Chirantan Ekbote <chirantan@chromium.org>
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 599e7de..aa840b9 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1 +1 @@
-DIST xz-5.2.0.tar.gz 1445562 SHA256 231ef369982240bb20ed7cffa52bb12a4a297ce6871f480ab85e8a7ba98bf3d6 SHA512 dc272d4f8d437bfe22ed75355fcd647018a2514e4b011552c913074c0ae7d306ae2a20f3227895ea8123918088d826b2c5595dc15ba6ba2d8062e780d8707a28 WHIRLPOOL a629c42215c5c8ee366d757a4a08ecf9773aea3422f8c51cf8dffcb74edaab4fa3f760a7a3c11e85564b3a2d6154e06f9a76afc460c1120406539233254caa9e
+DIST xz-5.2.3.tar.gz 1490665 SHA256 71928b357d0a09a12a4b4c5fafca8c31c19b0e7d3b8ebb19622e96f26dbf28cb SHA512 a5eb4f707cf31579d166a6f95dbac45cf7ea181036d1632b4f123a4072f502f8d57cd6e7d0588f0bf831a07b8fc4065d26589a25c399b95ddcf5f73435163da6 WHIRLPOOL 1a3f5b5a0018770098c50ba310cac705dcc44bd5bf58079903eb076e26443c1f687f0c75d4a47aa0df279ab44ca36b340e21b73881521c93a9353165d309be9e
diff --git a/app-arch/xz-utils/metadata.xml b/app-arch/xz-utils/metadata.xml
index 96a2d58..56c1244 100644
--- a/app-arch/xz-utils/metadata.xml
+++ b/app-arch/xz-utils/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-arch/xz-utils/xz-utils-5.2.0.ebuild b/app-arch/xz-utils/xz-utils-5.2.3.ebuild
similarity index 86%
rename from app-arch/xz-utils/xz-utils-5.2.0.ebuild
rename to app-arch/xz-utils/xz-utils-5.2.3.ebuild
index f5d7577..e873401 100644
--- a/app-arch/xz-utils/xz-utils-5.2.0.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.3.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-5.2.0.ebuild,v 1.1 2014/12/22 11:41:31 lu_zero Exp $
# Remember: we cannot leverage autotools in this ebuild in order
# to avoid circular deps with autotools
-EAPI="4"
+EAPI=5
inherit eutils multilib toolchain-funcs libtool multilib-minimal
@@ -28,7 +27,7 @@
# 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="nls static-libs +threads"
+IUSE="elibc_FreeBSD nls static-libs +threads"
RDEPEND="!<app-arch/lzma-4.63
!app-arch/lzma-utils
@@ -46,6 +45,7 @@
}
multilib_src_configure() {
+ use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
ECONF_SOURCE="${S}" econf \
$(use_enable nls) \
$(use_enable threads) \
@@ -55,7 +55,7 @@
multilib_src_install() {
default
- multilib_is_native_abi && gen_usr_ldscript -a lzma
+ gen_usr_ldscript -a lzma
}
multilib_src_install_all() {
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.2.0 b/metadata/md5-cache/app-arch/xz-utils-5.2.0
deleted file mode 100644
index 7e05f3c..0000000
--- a/metadata/md5-cache/app-arch/xz-utils-5.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
-DESCRIPTION=utils for managing LZMA compressed files
-EAPI=4
-HOMEPAGE=http://tukaani.org/xz/
-IUSE=nls static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=*
-LICENSE=public-domain LGPL-2.1+ GPL-2+
-RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
-SLOT=0
-SRC_URI=http://tukaani.org/xz/xz-5.2.0.tar.gz
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build 0983c7893df461213a05f791cc7dea6d multilib-minimal 13dd976916c35a1e2c8d170e840c7018 toolchain-funcs 48b38a216afb92db6314d6c3187abea3
-_md5_=d7fc101fa2fc6b21dd82724b377bee20
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.2.3 b/metadata/md5-cache/app-arch/xz-utils-5.2.3
new file mode 100644
index 0000000..82d4466
--- /dev/null
+++ b/metadata/md5-cache/app-arch/xz-utils-5.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
+DESCRIPTION=utils for managing LZMA compressed files
+EAPI=5
+HOMEPAGE=http://tukaani.org/xz/
+IUSE=elibc_FreeBSD nls static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=*
+LICENSE=public-domain LGPL-2.1+ GPL-2+
+RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
+SLOT=0
+SRC_URI=http://tukaani.org/xz/xz-5.2.3.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
+_md5_=e9b6cb628e04df948ea21a20f0662107
