Clean up old. Add IUSE=static-libs.

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

9 files changed, 33 insertions, 269 deletions

diff --git a/net-libs/libnfnetlink/ChangeLog b/net-libs/libnfnetlink/ChangeLog
index 5d34871416ac..f7c4929f8c76 100644
--- a/net-libs/libnfnetlink/ChangeLog
+++ b/net-libs/libnfnetlink/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-libs/libnfnetlink
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnfnetlink/ChangeLog,v 1.42 2011/08/28 15:54:58 armin76 Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnfnetlink/ChangeLog,v 1.43 2012/02/14 22:29:23 jer Exp $
+
+*libnfnetlink-1.0.0-r1 (14 Feb 2012)
+
+  14 Feb 2012; Jeroen Roovers <jer@gentoo.org> -libnfnetlink-0.0.25.ebuild,
+  -libnfnetlink-0.0.30.ebuild, -libnfnetlink-0.0.33.ebuild,
+  -libnfnetlink-0.0.38.ebuild, -libnfnetlink-0.0.39.ebuild,
+  -libnfnetlink-0.0.40.ebuild, -libnfnetlink-0.0.41.ebuild,
+  +libnfnetlink-1.0.0-r1.ebuild:
+  Clean up old. Add IUSE=static-libs.
 
   28 Aug 2011; Raúl Porcel <armin76@gentoo.org> libnfnetlink-1.0.0.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #376881
diff --git a/net-libs/libnfnetlink/Manifest b/net-libs/libnfnetlink/Manifest
index 835f78f49cce..6b97c386a734 100644
--- a/net-libs/libnfnetlink/Manifest
+++ b/net-libs/libnfnetlink/Manifest
@@ -1,28 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST libnfnetlink-0.0.25.tar.bz2 218728 RMD160 44365fbb25ebf829671563bdb4b94d2872f0c2a8 SHA1 8bad4670ef7cc965ae3c352082e3ed7ed62100d0 SHA256 8ca0a0327dc474d056ce0332995af7f55e5183cac87f6286297f525d2e547de6
-DIST libnfnetlink-0.0.30.tar.bz2 223684 RMD160 3b8beb93286b428b4f4a3b3510c83548c08412f5 SHA1 593770fc1dee032554b2229f63fd2a4ae8f32a2a SHA256 a6a336a5b3e063748d93ae910bbf6b2d36ead9f9ecd6011b14325b8814b54bc2
-DIST libnfnetlink-0.0.33.tar.bz2 229198 RMD160 360ebc947ceb165813e87dbc2e2b14564dfd6897 SHA1 ef86ff5a6197620b09eaf8f844838c6e323c504b SHA256 809666856e0ce4082ef9285e4f0328a50ce7581a803c0ebf9e90fe66ad570737
-DIST libnfnetlink-0.0.38.tar.bz2 236043 RMD160 7200f81e63fe9c235b5075467beea2a35808ed5e SHA1 f60cfdeeb07a987990143e5fbaaf1ef1874c6fa5 SHA256 87b09371a2d4792dc7c5933e8bcf75fda3dd1717ab315ff788fbdf5c1692e4a6
-DIST libnfnetlink-0.0.39.tar.bz2 239533 RMD160 1785eca85e7609bc71dc42c82638e8d504bf1d45 SHA1 2452689b4e683cbdf588bcbbac48a7d306e1da2a SHA256 9cd2317dac67fd2161565a21c7b3f9f43b6b6cd93441233226310478ffd4bf50
-DIST libnfnetlink-0.0.40.tar.bz2 239471 RMD160 fe234178108ccc37bfd2fa94f8f678eb7d948d2f SHA1 f4806eb66decb1a90ece556ffcb6a7f9bdfcb0f8 SHA256 4e01038dbebc2af15bdb64c880e43ad8bd42e7a3669e0a2544afc2788c3cc714
-DIST libnfnetlink-0.0.41.tar.bz2 239667 RMD160 c317b8a1bf26d80344edcf868ab17c268426ced4 SHA1 8698d998754f91654e759d2d05313c9de9fcead9 SHA256 7fea4eb784aba82d655a870f53599765318202d5cfc9750e390056d2ca27eb17
 DIST libnfnetlink-1.0.0.tar.bz2 239916 RMD160 c8466b92c7436be62644d2f81ae57e0467ed95bb SHA1 892ca50366702ed9fa36268a17226f328aa1d7a5 SHA256 3752b03a4c09821ee9a2528d69289423a01e7171f1a22dfdd11d5459e03972fb
-EBUILD libnfnetlink-0.0.25.ebuild 1135 RMD160 297a533552f160c27eef3affdd5316906f9b72b4 SHA1 d899fef0f591e7ba2ec5d2a0383c656981d32da8 SHA256 89ad0d3a42acad7372d7ffbec4b2e89ebec6c82b951ff54a5b1c4ec629866f34
-EBUILD libnfnetlink-0.0.30.ebuild 1131 RMD160 a09da62e1d0f4d75202a852ef069fd3add56b4be SHA1 c76adb07bbac8efdd4497c1b0f0fe247034ad2d2 SHA256 90826aeb2fefde8977eb5bc6be6c511286207e345b58c78cceaeedfabdd0529c
-EBUILD libnfnetlink-0.0.33.ebuild 1132 RMD160 348ca696b70779d805124d789db0c245efb512ea SHA1 651a774aeb37e20da5029c008598d88d42ac830a SHA256 fd6eda4a784752d191d5af23c3b7b434555b635a0db3cbf8a07fd5e1537d5da9
-EBUILD libnfnetlink-0.0.38.ebuild 1136 RMD160 fbfdb2e9b1e115921a54f4044f99c41295d595e9 SHA1 c6aeb1a495d2f9423303e48eb0e9121b6628a620 SHA256 95200223f8257c154387344b647404d1bd96f05ca5bd60c0de1ceab2eb1b511e
-EBUILD libnfnetlink-0.0.39.ebuild 1132 RMD160 7c151ae58fbfb5c18406807b623c9911933b3420 SHA1 d8f73f13f4ed52a9e3b6581b9112983089c2eb67 SHA256 8d2e9760a89aeff715ac68a6eaac7473c6c54f7351f27b9a381bb4ad59462b7f
-EBUILD libnfnetlink-0.0.40.ebuild 1136 RMD160 fadcd5e82bf534b1e1f2c06caa0af033fd4323e1 SHA1 2ccf8afee5a0c473acd8910c8d2e8620165c4b5d SHA256 7dd2a280cf7e501d025b8a16d3a9774940f7effc1faa4f50c2ae41e8224fdf09
-EBUILD libnfnetlink-0.0.41.ebuild 1136 RMD160 b63c163f49928c376c96457323859b68f64b6556 SHA1 afbb3d0802944eafcbdaaa8c399c098cd0459e63 SHA256 f674eb4b934c136f197ff71b1b6bc0e6829fad64f7f00fed647f09eb921008e9
+EBUILD libnfnetlink-1.0.0-r1.ebuild 1367 RMD160 89b2ea6e66e251f8bdc98643aa4fdf2b98556752 SHA1 bc080e88aacbf698bb060bb3defb81d75857399f SHA256 7d0926a9c29113f089efe6a3bc69acdfcf3bac50cea91e8039866abba24be624
 EBUILD libnfnetlink-1.0.0.ebuild 1280 RMD160 d7affa284c1e5cb269352a72a7238624b2682d89 SHA1 36d3b6cde822a0164dbd402f21508651b6a6c256 SHA256 6116bc808e9b297e88d5418c9e11049a54b5d8edf61630884fcfacbd48a64fa5
-MISC ChangeLog 5473 RMD160 fadad8aa28aa2bba59ffaa84d01f9083a8b553ec SHA1 07120425894eaa15ac058ac798c6238a3426c1bc SHA256 924fe60c0e80524ecde0ab177f6723f4706edc086aa3bf5eaac5c186f1c6a269
+MISC ChangeLog 5835 RMD160 2706162ca7a1c38ca8dbf52bc40ffa5b83abee18 SHA1 6ddc8d0a195a342d81e7c7b9433084bdfe2977eb SHA256 6b102cfe6b577e7e30904f4d0c53eb1862d1fe2b7d42b3e62315e64bb3eb5e35
 MISC metadata.xml 329 RMD160 5ef3919891a47d1001d0b85e46c4aec5e88095ce SHA1 4ef2e18e9e34dddd8812c826506427714d0189ed SHA256 d4d9a436c12f8005cfdf77eba787f5d3f4f1f51f934c1508c71df969d50076ae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5aZNgACgkQuQc30/atMkDsPwCguPOOY1jEe9dCORBnevXk392g
-zGEAn0eOWtPKSWCfp4aBvLJdDI3tHyTJ
-=+qaG
+iEYEARECAAYFAk864EoACgkQVWmRsqeSphNKdgCfXa3Zl45Eg4sbN7ZeQ//1AI9T
+k2EAn1v4nWxO38pUZi7RRMyBHoyDmCIY
+=BtNY
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libnfnetlink/libnfnetlink-0.0.25.ebuild b/net-libs/libnfnetlink/libnfnetlink-0.0.25.ebuild
deleted file mode 100644
index 3b7772bece80..000000000000
--- a/net-libs/libnfnetlink/libnfnetlink-0.0.25.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnfnetlink/libnfnetlink-0.0.25.ebuild,v 1.11 2010/01/25 18:36:50 armin76 Exp $
-
-inherit linux-info
-
-DESCRIPTION="the low-level library for netfilter related kernel/userspace communication"
-HOMEPAGE="http://www.netfilter.org/projects/libnfnetlink/"
-SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is lt 2 6 14 ; then
-		die "${PN} requires at least 2.6.14 kernel version"
-	fi
-
-	#netfilter core team has changed some option names with kernel 2.6.20
-	if kernel_is lt 2 6 20 ; then
-		CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
-	else
-		CONFIG_CHECK="~NF_CT_NETLINK"
-		ERROR_NF_CT_NETLINK="CONFIG_NF_CT_NETLINK:\t is not set when it should be. You can activate it in the Core Netfilter Configuration"
-	fi
-
-	check_extra_config
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README
-}
diff --git a/net-libs/libnfnetlink/libnfnetlink-0.0.30.ebuild b/net-libs/libnfnetlink/libnfnetlink-0.0.30.ebuild
deleted file mode 100644
index d4b0fb78a41c..000000000000
--- a/net-libs/libnfnetlink/libnfnetlink-0.0.30.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnfnetlink/libnfnetlink-0.0.30.ebuild,v 1.8 2010/01/25 18:36:50 armin76 Exp $
-
-inherit linux-info
-
-DESCRIPTION="the low-level library for netfilter related kernel/userspace communication"
-HOMEPAGE="http://www.netfilter.org/projects/libnfnetlink/"
-SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is lt 2 6 14 ; then
-		die "${PN} requires at least 2.6.14 kernel version"
-	fi
-
-	#netfilter core team has changed some option names with kernel 2.6.20
-	if kernel_is lt 2 6 20 ; then
-		CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
-	else
-		CONFIG_CHECK="~NF_CT_NETLINK"
-		ERROR_NF_CT_NETLINK="CONFIG_NF_CT_NETLINK:\t is not set when it should be. You can activate it in the Core Netfilter Configuration"
-	fi
-
-	check_extra_config
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README
-}
diff --git a/net-libs/libnfnetlink/libnfnetlink-0.0.33.ebuild b/net-libs/libnfnetlink/libnfnetlink-0.0.33.ebuild
deleted file mode 100644
index c05d8c2b654d..000000000000
--- a/net-libs/libnfnetlink/libnfnetlink-0.0.33.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnfnetlink/libnfnetlink-0.0.33.ebuild,v 1.7 2010/01/25 18:36:50 armin76 Exp $
-
-inherit linux-info
-
-DESCRIPTION="the low-level library for netfilter related kernel/userspace communication"
-HOMEPAGE="http://www.netfilter.org/projects/libnfnetlink/"
-SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ~ppc sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is lt 2 6 14 ; then
-		die "${PN} requires at least 2.6.14 kernel version"
-	fi
-
-	#netfilter core team has changed some option names with kernel 2.6.20
-	if kernel_is lt 2 6 20 ; then
-		CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
-	else
-		CONFIG_CHECK="~NF_CT_NETLINK"
-		ERROR_NF_CT_NETLINK="CONFIG_NF_CT_NETLINK:\t is not set when it should be. You can activate it in the Core Netfilter Configuration"
-	fi
-
-	check_extra_config
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README
-}
diff --git a/net-libs/libnfnetlink/libnfnetlink-0.0.38.ebuild b/net-libs/libnfnetlink/libnfnetlink-0.0.38.ebuild
deleted file mode 100644
index 05fc6c8fb405..000000000000
--- a/net-libs/libnfnetlink/libnfnetlink-0.0.38.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnfnetlink/libnfnetlink-0.0.38.ebuild,v 1.3 2010/01/25 18:36:50 armin76 Exp $
-
-inherit linux-info
-
-DESCRIPTION="the low-level library for netfilter related kernel/userspace communication"
-HOMEPAGE="http://www.netfilter.org/projects/libnfnetlink/"
-SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is lt 2 6 18 ; then
-		die "${PN} requires at least 2.6.18 kernel version"
-	fi
-
-	#netfilter core team has changed some option names with kernel 2.6.20
-	if kernel_is lt 2 6 20 ; then
-		CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
-	else
-		CONFIG_CHECK="~NF_CT_NETLINK"
-		ERROR_NF_CT_NETLINK="CONFIG_NF_CT_NETLINK:\t is not set when it should be. You can activate it in the Core Netfilter Configuration"
-	fi
-
-	check_extra_config
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README
-}
diff --git a/net-libs/libnfnetlink/libnfnetlink-0.0.40.ebuild b/net-libs/libnfnetlink/libnfnetlink-0.0.40.ebuild
deleted file mode 100644
index 00448c328104..000000000000
--- a/net-libs/libnfnetlink/libnfnetlink-0.0.40.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnfnetlink/libnfnetlink-0.0.40.ebuild,v 1.3 2010/01/25 18:36:50 armin76 Exp $
-
-inherit linux-info
-
-DESCRIPTION="the low-level library for netfilter related kernel/userspace communication"
-HOMEPAGE="http://www.netfilter.org/projects/libnfnetlink/"
-SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is lt 2 6 18 ; then
-		die "${PN} requires at least 2.6.18 kernel version"
-	fi
-
-	#netfilter core team has changed some option names with kernel 2.6.20
-	if kernel_is lt 2 6 20 ; then
-		CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
-	else
-		CONFIG_CHECK="~NF_CT_NETLINK"
-		ERROR_NF_CT_NETLINK="CONFIG_NF_CT_NETLINK:\t is not set when it should be. You can activate it in the Core Netfilter Configuration"
-	fi
-
-	check_extra_config
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README
-}
diff --git a/net-libs/libnfnetlink/libnfnetlink-0.0.41.ebuild b/net-libs/libnfnetlink/libnfnetlink-0.0.41.ebuild
deleted file mode 100644
index bfc72673cf91..000000000000
--- a/net-libs/libnfnetlink/libnfnetlink-0.0.41.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnfnetlink/libnfnetlink-0.0.41.ebuild,v 1.3 2010/01/25 18:36:50 armin76 Exp $
-
-inherit linux-info
-
-DESCRIPTION="the low-level library for netfilter related kernel/userspace communication"
-HOMEPAGE="http://www.netfilter.org/projects/libnfnetlink/"
-SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is lt 2 6 18 ; then
-		die "${PN} requires at least 2.6.18 kernel version"
-	fi
-
-	#netfilter core team has changed some option names with kernel 2.6.20
-	if kernel_is lt 2 6 20 ; then
-		CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
-	else
-		CONFIG_CHECK="~NF_CT_NETLINK"
-		ERROR_NF_CT_NETLINK="CONFIG_NF_CT_NETLINK:\t is not set when it should be. You can activate it in the Core Netfilter Configuration"
-	fi
-
-	check_extra_config
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README
-}
diff --git a/net-libs/libnfnetlink/libnfnetlink-0.0.39.ebuild b/net-libs/libnfnetlink/libnfnetlink-1.0.0-r1.ebuild
index aa6dea429873..bc4a6d7dddf1 100644
--- a/net-libs/libnfnetlink/libnfnetlink-0.0.39.ebuild
+++ b/net-libs/libnfnetlink/libnfnetlink-1.0.0-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnfnetlink/libnfnetlink-0.0.39.ebuild,v 1.6 2010/01/25 18:36:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnfnetlink/libnfnetlink-1.0.0-r1.ebuild,v 1.1 2012/02/14 22:29:23 jer Exp $
 
+EAPI=4
 inherit linux-info
 
 DESCRIPTION="the low-level library for netfilter related kernel/userspace communication"
@@ -10,11 +11,10 @@ SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ~ppc sparc x86"
-IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static-libs"
 
-DEPEND=""
-RDEPEND=""
+DOCS=( README )
 
 pkg_setup() {
 	linux-info_pkg_setup
@@ -24,17 +24,25 @@ pkg_setup() {
 	fi
 
 	#netfilter core team has changed some option names with kernel 2.6.20
+	error_common=' is not set when it should be. You can activate it in the Core Netfilter Configuration'
 	if kernel_is lt 2 6 20 ; then
 		CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
+		ERROR_IP_NF_CONNTRACK_NETLINK="CONFIG_IP_NF_CONNTRACK_NETLINK:\t${error_common}"
 	else
 		CONFIG_CHECK="~NF_CT_NETLINK"
-		ERROR_NF_CT_NETLINK="CONFIG_NF_CT_NETLINK:\t is not set when it should be. You can activate it in the Core Netfilter Configuration"
+		ERROR_NF_CT_NETLINK="CONFIG_NF_CT_NETLINK:\t${error_common}"
 	fi
 
 	check_extra_config
 }
 
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README
+	default
+	if ! use static-libs; then
+		rm -f "${D}"/usr/lib*/*.la || die
+	fi
 }