Only build static libs if USE flag is defined.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

6 files changed, 29 insertions, 92 deletions

diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog
index 64a06698132c..3b06d4d18c8e 100644
--- a/dev-libs/libffi/ChangeLog
+++ b/dev-libs/libffi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libffi
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.57 2008/12/24 18:31:29 wormo Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.58 2009/06/01 07:15:38 ssuominen Exp $
+
+  01 Jun 2009; Samuli Suominen <ssuominen@gentoo.org> -libffi-3.0.5.ebuild,
+  -libffi-3.0.6.ebuild, libffi-3.0.8.ebuild, metadata.xml:
+  Only build static libs if USE flag is defined.
 
 *libffi-3.0.8 (24 Dec 2008)
 
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 7cfdafc3cadd..d89625ff1acb 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -1,9 +1,5 @@
 AUX libffi-3.0.5-includedir.patch 905 RMD160 6ede2aa0ed7f834d2e002172988a22a3d6a6d3d4 SHA1 a8d54fea3be522529b42b01366615144a813557d SHA256 5306bf6e93188dfddf447fa2f4c4e69adad30a9f85c1312fc214d20d1dd59630
-DIST libffi-3.0.5.tar.gz 720907 RMD160 666d7a56f03b01d64a3c389a0cd0eedb1d5b8254 SHA1 66c899b30d96e666475d9ad55525b5c2e079dc66 SHA256 0eaa7b5a1ec87ef18ba1295d634b72b4aca18adeb67a1b9201ff4b48a3d115c4
-DIST libffi-3.0.6.tar.gz 717171 RMD160 da8f547209e6b13dc7be86ea29ad5fa5e85844e5 SHA1 04a5f38c76dfe3e078767645ca89f2ff71721104 SHA256 5571050294e261a8261687bddee1ea406011ce54be927b471a4b95cbc40dfc66
 DIST libffi-3.0.8.tar.gz 722834 RMD160 4144f64e79ebf95161a6afd58ceaeef8372b5e57 SHA1 ce44d10c39d9a37479c8777e206cac0f36c48712 SHA256 2c7c5b88a68fb362262889ba25ef25dc27864b7bbf03547a8a36b8d567569406
-EBUILD libffi-3.0.5.ebuild 955 RMD160 1e44e9892b8cfc860c68e3f2b7630e03ca825c9a SHA1 7bb92df2f381b5d0c1158151b9e3b23ff9a91265 SHA256 31a91b6b0e67e5bd1732e792f828e49ab6bccb0fbe8e68fab95168715255890a
-EBUILD libffi-3.0.6.ebuild 955 RMD160 f37a26576bad082d5ab2f312b39c35c64dcc0a23 SHA1 f1fb037933d7da4abcba4eb568f28b48c4a55e2a SHA256 fb8190a2f8d0082b11cf24cf368619de776c5201e60c716826c814cc4d3a7c10
-EBUILD libffi-3.0.8.ebuild 955 RMD160 4d8d5d71f4a4f55538423857f3ed9d49f3cc66a3 SHA1 258da5a37d8c171a246b5e1b7379b17fb0d40644 SHA256 4f35cabf7f7f62ad000533ec09f7fd50cc200dd127a713d7c24e478a3fdb796d
-MISC ChangeLog 8667 RMD160 f79ec65b6b9ff66afa4bebbc116ca551e580d4cf SHA1 227f9fdbee3c4e22289519bb7d443c4d5c9f2e5e SHA256 cb855fb7907911cd74b2774fd9f089c241d4ca1581e858c25fed99bb4b51d618
-MISC metadata.xml 1736 RMD160 3343c41eacd7727d15f6d9827e60ee106f0a9308 SHA1 020068d6c5b77175cbfe7252d2b5384b51d09559 SHA256 cc690496f84a717983090ed07758220f1b2882b8f07d52bddaee0d8b7830c139
+EBUILD libffi-3.0.8.ebuild 950 RMD160 d086bdab22a814187fec5dcb8f6c50ff00ddad93 SHA1 3d9770f1135fd941d753c7905ad882e00040e5e9 SHA256 d7b318533557e98a47391bcfb84cb4e00700ac1dfdec23b421f4a67fc0cb142e
+MISC ChangeLog 8856 RMD160 4057a4fb6e42f4d202edd36f28ed68604f65c385 SHA1 aa89d756b60c04ae2035e16c97a1cf0a4e41c7d4 SHA256 131849e3de3ea4fa967494f8075a04ebeb05e44085028efb54e177e30ff14630
+MISC metadata.xml 1809 RMD160 13416f25fdf564df21d71028665edc69d54d835f SHA1 5105aa89968d427d572b63884c8cf7a70d6e510d SHA256 d4f60c0bae9b9cee7a9db178826fb7a39cc2a584f045997b98bd456e332ab634
diff --git a/dev-libs/libffi/libffi-3.0.5.ebuild b/dev-libs/libffi/libffi-3.0.5.ebuild
deleted file mode 100644
index 6b653be6178f..000000000000
--- a/dev-libs/libffi/libffi-3.0.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.5.ebuild,v 1.5 2008/06/29 12:49:08 hkbst Exp $
-
-inherit eutils
-
-DESCRIPTION="a portable, high level programming interface to various calling conventions."
-HOMEPAGE="http://sourceware.org/libffi"
-SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug test"
-
-DEPEND="test? ( dev-util/dejagnu )"
-RDEPEND=""
-
-pkg_setup() {
-	ewarn "This package provides a separate libffi which may conflict with the"
-	ewarn "one provided by sys-devel/gcc when it is built with libffi use flag on."
-	ebeep
-}
-
-src_compile() {
-	econf --disable-dependency-tracking \
-		$(use_enable debug) || die "econf failed."
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc ChangeLog* README TODO
-}
diff --git a/dev-libs/libffi/libffi-3.0.6.ebuild b/dev-libs/libffi/libffi-3.0.6.ebuild
deleted file mode 100644
index 7342c835e9ed..000000000000
--- a/dev-libs/libffi/libffi-3.0.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.6.ebuild,v 1.1 2008/09/02 15:08:51 hkbst Exp $
-
-inherit eutils
-
-DESCRIPTION="a portable, high level programming interface to various calling conventions."
-HOMEPAGE="http://sourceware.org/libffi"
-SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug test"
-
-DEPEND="test? ( dev-util/dejagnu )"
-RDEPEND=""
-
-pkg_setup() {
-	ewarn "This package provides a separate libffi which may conflict with the"
-	ewarn "one provided by sys-devel/gcc when it is built with libffi use flag on."
-	ebeep
-}
-
-src_compile() {
-	econf --disable-dependency-tracking \
-		$(use_enable debug) || die "econf failed."
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc ChangeLog* README TODO
-}
diff --git a/dev-libs/libffi/libffi-3.0.8.ebuild b/dev-libs/libffi/libffi-3.0.8.ebuild
index b88f688f4d7a..9d6bf468d42b 100644
--- a/dev-libs/libffi/libffi-3.0.8.ebuild
+++ b/dev-libs/libffi/libffi-3.0.8.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.8.ebuild,v 1.1 2008/12/24 18:31:29 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.8.ebuild,v 1.2 2009/06/01 07:15:38 ssuominen Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="a portable, high level programming interface to various calling conventions."
@@ -11,24 +12,25 @@ SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug test"
+IUSE="debug static-libs test"
 
-DEPEND="test? ( dev-util/dejagnu )"
 RDEPEND=""
+DEPEND="test? ( dev-util/dejagnu )"
 
-pkg_setup() {
-	ewarn "This package provides a separate libffi which may conflict with the"
-	ewarn "one provided by sys-devel/gcc when it is built with libffi use flag on."
-	ebeep
-}
-
-src_compile() {
-	econf --disable-dependency-tracking \
-		$(use_enable debug) || die "econf failed."
-	emake || die "emake failed."
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable static-libs static) \
+		$(use_enable debug)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc ChangeLog* README TODO
 }
+
+pkg_postinst() {
+	ewarn "Please unset USE flag libffi in sys-devel/gcc. There is no"
+	ewarn "file collision but your package might link to wrong library."
+	ebeep
+}
diff --git a/dev-libs/libffi/metadata.xml b/dev-libs/libffi/metadata.xml
index 238cc07b775d..effecf0b70ba 100644
--- a/dev-libs/libffi/metadata.xml
+++ b/dev-libs/libffi/metadata.xml
@@ -33,4 +33,7 @@
 		exist above libffi that handles type conversions for values passed
 		between the two languages.
 	</longdescription>
+	<use>
+		<flag name='static-libs'>Compile static archives</flag>
+	</use>
 </pkgmetadata>