Remove old; replace libnl USE flag with netlink, as that is what other packages are using, with the same meaning.

(Portage version: 2.2.0_alpha122/cvs/Linux x86_64)

6 files changed, 22 insertions, 128 deletions

diff --git a/net-libs/libpcap/ChangeLog b/net-libs/libpcap/ChangeLog
index 7198afc7365e..2c93d55a98c2 100644
--- a/net-libs/libpcap/ChangeLog
+++ b/net-libs/libpcap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libpcap
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.168 2012/06/19 20:39:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.169 2012/08/27 16:54:09 flameeyes Exp $
+
+  27 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> -libpcap-1.2.0.ebuild,
+  -libpcap-1.2.1.ebuild, libpcap-1.1.1-r1.ebuild, libpcap-1.3.0.ebuild,
+  metadata.xml:
+  Remove old; replace libnl USE flag with netlink, as that is what other
+  packages are using, with the same meaning.
 
 *libpcap-1.3.0 (19 Jun 2012)
 
diff --git a/net-libs/libpcap/libpcap-1.1.1-r1.ebuild b/net-libs/libpcap/libpcap-1.1.1-r1.ebuild
index 3b875840f8ee..11991bc2bc3f 100644
--- a/net-libs/libpcap/libpcap-1.1.1-r1.ebuild
+++ b/net-libs/libpcap/libpcap-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.1.1-r1.ebuild,v 1.16 2012/02/29 02:13:45 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.1.1-r1.ebuild,v 1.17 2012/08/27 16:54:09 flameeyes Exp $
 
 EAPI=4
 inherit autotools eutils multilib toolchain-funcs
@@ -13,10 +13,10 @@ SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="bluetooth ipv6 libnl static-libs"
+IUSE="bluetooth ipv6 netlink static-libs"
 
 RDEPEND="bluetooth? ( net-wireless/bluez )
-	libnl? ( dev-libs/libnl:1.1 )"
+	netlink? ( dev-libs/libnl:1.1 )"
 DEPEND="${RDEPEND}
 	sys-devel/flex
 	virtual/yacc"
@@ -34,7 +34,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable ipv6) \
-		$(use_with libnl) \
+		$(use_with netlink libnl) \
 		$(use_enable bluetooth)
 }
 
diff --git a/net-libs/libpcap/libpcap-1.2.0.ebuild b/net-libs/libpcap/libpcap-1.2.0.ebuild
deleted file mode 100644
index 483bbb48926d..000000000000
--- a/net-libs/libpcap/libpcap-1.2.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.2.0.ebuild,v 1.2 2011/12/16 18:00:56 jer Exp $
-
-EAPI=4
-inherit autotools eutils multilib toolchain-funcs
-
-DESCRIPTION="A system-independent library for user-level network packet capture"
-HOMEPAGE="http://www.tcpdump.org/"
-SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
-	http://www.jp.tcpdump.org/release/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="bluetooth ipv6 libnl static-libs"
-
-RDEPEND="bluetooth? ( net-wireless/bluez )
-	libnl? ( dev-libs/libnl:1.1 )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc"
-
-DOCS=( CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel} )
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-cross-linux.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_with libnl) \
-		$(use_enable bluetooth)
-}
-
-src_compile() {
-	emake all shared
-}
-
-src_install() {
-	default
-
-	# remove static libraries (--disable-static does not work)
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -exec rm {} + || die
-	fi
-
-	# We need this to build pppd on G/FBSD systems
-	if [[ "${USERLAND}" == "BSD" ]]; then
-		insinto /usr/include
-		doins pcap-int.h
-	fi
-}
diff --git a/net-libs/libpcap/libpcap-1.2.1.ebuild b/net-libs/libpcap/libpcap-1.2.1.ebuild
deleted file mode 100644
index 205dc0583b78..000000000000
--- a/net-libs/libpcap/libpcap-1.2.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.2.1.ebuild,v 1.3 2012/04/26 14:29:58 aballier Exp $
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="A system-independent library for user-level network packet capture"
-HOMEPAGE="http://www.tcpdump.org/"
-SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
-	http://www.jp.tcpdump.org/release/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="bluetooth ipv6 libnl static-libs"
-
-RDEPEND="bluetooth? ( net-wireless/bluez )
-	libnl? ( dev-libs/libnl:1.1 )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc"
-
-DOCS=( CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel} )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.2.0-cross-linux.patch
-	# Prefix' Solaris uses GNU ld
-	sed -i -e 's/freebsd\*/freebsd*|solaris*/' \
-		-e 's/sparc64\*/sparc64*|sparcv9*/'  aclocal.m4 || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_with libnl) \
-		$(use_enable bluetooth)
-}
-
-src_compile() {
-	emake all shared
-}
-
-src_install() {
-	default
-
-	# remove static libraries (--disable-static does not work)
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -exec rm {} + || die
-	fi
-
-	# We need this to build pppd on G/FBSD systems
-	if [[ "${USERLAND}" == "BSD" ]]; then
-		insinto /usr/include
-		doins pcap-int.h
-	fi
-}
diff --git a/net-libs/libpcap/libpcap-1.3.0.ebuild b/net-libs/libpcap/libpcap-1.3.0.ebuild
index 08153cc4576e..062b6b87d196 100644
--- a/net-libs/libpcap/libpcap-1.3.0.ebuild
+++ b/net-libs/libpcap/libpcap-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.3.0.ebuild,v 1.1 2012/06/19 20:39:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.3.0.ebuild,v 1.2 2012/08/27 16:54:09 flameeyes Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -13,10 +13,10 @@ SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="bluetooth ipv6 libnl static-libs"
+IUSE="bluetooth ipv6 netlink static-libs"
 
 RDEPEND="bluetooth? ( net-wireless/bluez )
-	libnl? ( dev-libs/libnl:1.1 )"
+	netlink? ( dev-libs/libnl:1.1 )"
 DEPEND="${RDEPEND}
 	sys-devel/flex
 	virtual/yacc"
@@ -34,7 +34,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable ipv6) \
-		$(use_with libnl) \
+		$(use_with netlink libnl) \
 		$(use_enable bluetooth)
 }
 
diff --git a/net-libs/libpcap/metadata.xml b/net-libs/libpcap/metadata.xml
index 86833c40cbba..cdd3235f03e9 100644
--- a/net-libs/libpcap/metadata.xml
+++ b/net-libs/libpcap/metadata.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
-<longdescription>A system-independent library for user-level network packet capture</longdescription>
-<use>
-	<flag name='libnl'>link with <pkg>dev-libs/libnl</pkg> (used to put wireless
-	interfaces in monitor mode)</flag>
-</use>
+  <herd>netmon</herd>
+  <longdescription>A system-independent library for user-level network packet capture</longdescription>
+  <use>
+    <flag name='netlink'>
+      Use <pkg>dev-libs/libnl</pkg> to put wireless interfaces in monitor mode.
+    </flag>
+  </use>
 </pkgmetadata>