Add support for USE="nls static-libs threads" by Toffanin #286203 and require libtool-2 #286068 by Nicolas Cornu.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

5 files changed, 50 insertions, 36 deletions

diff --git a/app-arch/xz-utils/ChangeLog b/app-arch/xz-utils/ChangeLog
index 365c70859670..796d0b7e0d2a 100644
--- a/app-arch/xz-utils/ChangeLog
+++ b/app-arch/xz-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/xz-utils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/ChangeLog,v 1.4 2009/08/28 07:40:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/ChangeLog,v 1.5 2009/09/26 16:49:19 vapier Exp $
+
+  26 Sep 2009; Mike Frysinger <vapier@gentoo.org>
+  xz-utils-4.999.9_beta.ebuild, xz-utils-9999.ebuild, metadata.xml:
+  Add support for USE="nls static-libs threads" by Toffanin #286203 and
+  require libtool-2 #286068 by Nicolas Cornu.
 
 *xz-utils-4.999.9_beta (28 Aug 2009)
 
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 5600b7dd0c87..64d802279ae6 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,17 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST xz-4.999.8beta.tar.gz 879382 RMD160 41303aed49cfb976da54d7e3e88210b4eeaebbbd SHA1 d282518518488c37ec268401e1b8247749279c44 SHA256 059da5a9fe51c28b38f67e5b8063a451c516f37fbb268177fd1081b70dd97f53
 DIST xz-4.999.9beta.tar.gz 1037541 RMD160 1253ce01746c748c8549effa5041224044919c4e SHA1 9627de3997ddcdb02f8d327e84b2cf1941ecd230 SHA256 fa3901d1c034842da47fec1a24a9b5a5bd435f5ecfbb444c168512e2daddb86f
-EBUILD xz-utils-4.999.8_beta.ebuild 1285 RMD160 c0a1c3686432bcf2649a8f985d6df802d233faa7 SHA1 7a5dd23938ebb48fa8685dba101c35c253c275de SHA256 c8256d909883610898de0ea8808f5b21a4e415ca1b324cbb0908c2d2165c4c83
-EBUILD xz-utils-4.999.9_beta.ebuild 1285 RMD160 18305f9b0462730f71487c289045834aa4b791bc SHA1 2260ed60b55217a63091ed6a33be3e7cb1cdffe9 SHA256 0cd6ca9f5a6838a6feb669cdd14e087bb96fa6fa73b816d72584eccc0a3ab79d
-EBUILD xz-utils-9999.ebuild 1292 RMD160 7ffb39584d0fc4fa5acfe033f08cbb7381df4e0d SHA1 203e43d1a6d3326b470dcc2b43aa3214a2956328 SHA256 d48fb79286447e48371f34554c0e73a7314bff2acda5e45f10f09c09c24b6b30
-MISC ChangeLog 819 RMD160 feb063969d62a3e03e55f9cb530dd422ce486056 SHA1 7eb2c6576e5c87f09e34ecf2f5f454cf4bb92a49 SHA256 6b7c93bf6a540e49eff380d556a6602d4ebd83fc3a6db26138e6e0e52fc7b583
-MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+EBUILD xz-utils-4.999.9_beta.ebuild 1400 RMD160 731ceb2595b6a97f46a2ddde99ffd449b3f86e7c SHA1 dbb4e92813212eddd568660d645e7f7a5cc828f2 SHA256 3ef494020ffde7b3a5dae6e7191621f4adc0ece99041b303bb8a664ac5871ac5
+EBUILD xz-utils-9999.ebuild 1392 RMD160 7776ea5dac7e29e6495a3fe259ed74080601e52d SHA1 6fa8817753653b2773ac5d249e7874f546d8c83f SHA256 1e95dcddaaca9d18ef7b842931ea852d061becefe23f46f9988cb9bdbdc08a51
+MISC ChangeLog 1056 RMD160 30c594c4ea3401a4a3f915d8d258c97b5e06603d SHA1 102af07437298732bd069b8a9ca3ca0343e40ff4 SHA256 9208597c1060701e585a7238b284615cf34b1930afdae7bb7c1393b0d72d20f3
+MISC metadata.xml 233 RMD160 8a23c78579a6d7720db28d5e35f54026846353f5 SHA1 f7c86be6d75f578d25b423b462a2bc5dd5401725 SHA256 213ca3e07ec5f7318758c92a6afa26a03ab6e3d7fd12c07856c4031069996d40
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqXifAACgkQlPl3HsVfCDpw+wCdG94ypt/33myYrVUVjnyUsVqR
-TFgAnA3AUCPFbubIHQTXUEvcTMJP1+8I
-=cdid
+iEYEARECAAYFAkq+RhUACgkQlPl3HsVfCDonpQCeMsFDWCe9AC/Cb6ykgf2GfO4J
+qZ8AnRod3Qzrq0bN17H9R/yjg2gfJq2C
+=yaqt
 -----END PGP SIGNATURE-----
diff --git a/app-arch/xz-utils/metadata.xml b/app-arch/xz-utils/metadata.xml
index 96a2d586367d..d8a0a4ac7912 100644
--- a/app-arch/xz-utils/metadata.xml
+++ b/app-arch/xz-utils/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
+<use>
+	<flag name="static-libs">Build static libraries</flag>
+</use>
 </pkgmetadata>
diff --git a/app-arch/xz-utils/xz-utils-4.999.9_beta.ebuild b/app-arch/xz-utils/xz-utils-4.999.9_beta.ebuild
index c4a77b505f73..08256fef992b 100644
--- a/app-arch/xz-utils/xz-utils-4.999.9_beta.ebuild
+++ b/app-arch/xz-utils/xz-utils-4.999.9_beta.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-4.999.9_beta.ebuild,v 1.1 2009/08/28 07:40:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-4.999.9_beta.ebuild,v 1.2 2009/09/26 16:49:19 vapier Exp $
 
 # Remember: we cannot leverage autotools in this ebuild in order
 #           to avoid circular deps with autotools
 
+EAPI="2"
+
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://ctrl.tukaani.org/xz.git"
 	inherit git autotools
 	SRC_URI=""
-	EXTRA_DEPEND="sys-devel/gettext dev-util/cvs" #272880
+	EXTRA_DEPEND="sys-devel/gettext dev-util/cvs >=sys-devel/libtool-2" #272880 286068
 else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
@@ -25,7 +27,7 @@ HOMEPAGE="http://tukaani.org/xz/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE=""
+IUSE="nls static-libs +threads"
 
 RDEPEND="!app-arch/lzma
 	!app-arch/lzma-utils
@@ -33,16 +35,20 @@ RDEPEND="!app-arch/lzma
 DEPEND="${RDEPEND}
 	${EXTRA_DEPEND}"
 
+if [[ ${PV} == "9999" ]] ; then
 src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
-		cd "${S}"
-		./autogen.sh || die
-	else
-		unpack ${A}
-		cd "${S}"
-		sed -i 's:-static::' $(find -name Makefile.in)
-	fi
+	git_src_unpack
+	cd "${S}"
+	./autogen.sh || die
+}
+fi
+
+src_configure() {
+	econf \
+		--enable-dynamic=yes \
+		$(use_enable nls) \
+		$(use_enable threads) \
+		$(use_enable static-libs static)
 }
 
 src_install() {
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index 01dbcc11e801..b61ce5190b1a 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild,v 1.2 2009/07/05 20:28:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild,v 1.3 2009/09/26 16:49:19 vapier Exp $
 
 # Remember: we cannot leverage autotools in this ebuild in order
 #           to avoid circular deps with autotools
 
+EAPI="2"
+
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://ctrl.tukaani.org/xz.git"
 	inherit git autotools
 	SRC_URI=""
-	EXTRA_DEPEND="sys-devel/gettext dev-util/cvs" #272880
+	EXTRA_DEPEND="sys-devel/gettext dev-util/cvs >=sys-devel/libtool-2" #272880 286068
 else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
@@ -25,7 +27,7 @@ HOMEPAGE="http://tukaani.org/xz/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE=""
+IUSE="nls static-libs +threads"
 
 RDEPEND="!app-arch/lzma
 	!app-arch/lzma-utils
@@ -33,20 +35,20 @@ RDEPEND="!app-arch/lzma
 DEPEND="${RDEPEND}
 	${EXTRA_DEPEND}"
 
+if [[ ${PV} == "9999" ]] ; then
 src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
-		cd "${S}"
-		./autogen.sh || die
-	else
-		unpack ${A}
-		cd "${S}"
-	fi
+	git_src_unpack
+	cd "${S}"
+	./autogen.sh || die
 }
+fi
 
-src_compile() {
-	econf --enable-dynamic || die
-	emake || die
+src_configure() {
+	econf \
+		--enable-dynamic=yes \
+		$(use_enable nls) \
+		$(use_enable threads) \
+		$(use_enable static-libs static)
 }
 
 src_install() {