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

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

7 files changed, 40 insertions, 146 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/Manifest b/net-libs/libpcap/Manifest
index f4ab32a0323d..578e7145215b 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX libpcap-1.1-cross-linux.patch 1050 RMD160 ca856c3f295752de47f3d813c324720960ba5fd0 SHA1 7b33a9ec9c65f5e108cbcb3855f0b954cfb75210 SHA256 b1b6375abe00207c4ea69d0e7150eb2ed080eff4b7a1112e69af587f2004474a
-AUX libpcap-1.1.1-ignore-ENODEV.patch 1363 RMD160 ddbd33d8aa610d9f3653bfaa9bad5c29ae3097ca SHA1 40532cee84b5838c57468e02056b42e2a1721e5a SHA256 1fa73b0ce9552352df0024af5172433fbdd3fb856b6aa53b90ceb8a31fded00c
-AUX libpcap-1.2.0-cross-linux.patch 583 RMD160 9173c7f93c76de3cc2b4690d8b4e5fb350f3f093 SHA1 f58ea8adb0f6a991290a0f3d0258548fdacee0b1 SHA256 89344641676edfd9dc70b05569ac26a8ac79815fa5df0cf8e2ee77b3f9c5877f
-DIST libpcap-1.1.1.tar.gz 581984 RMD160 760159c594cc995c9e05c0cd8637a02a3b2725e2 SHA1 18581af5e78a40b7b2c9a6cd8ce40e7cb1cd9c63 SHA256 508cca15547e55d1318498b838456a21770c450beb2dc7d7d4a96d90816e5a85
-DIST libpcap-1.2.0.tar.gz 597758 RMD160 d13daaa4863d7336914ff8ab1a9b424e4dc49ad4 SHA1 44f1edf687c21ad69f65ed03c8c4911950881335 SHA256 702ac51cfaa5c17d6b92771b22835d58eda4dc9e1f596c80a0b031e4c45c07d6
-DIST libpcap-1.2.1.tar.gz 603208 RMD160 b14861cc6067139c94ad3f9657c6c334d581eb16 SHA1 67f44a9f1e5ac0c31bce5cefa564c783b27d1e46 SHA256 a135a6ef7e539729a57c7ed345bdb9b64159e13404174006a7972eb33f00debd
-DIST libpcap-1.3.0.tar.gz 608967 RMD160 3d80cd06c89b32bee1f344bfe720624c2c35763f SHA1 90aa2f0fcfb4bf79fc50ccdaa70f484d96295be3 SHA256 41cbd9ed68383afd9f1fda279cb78427d36879d9e34ee707e31a16a1afd872b9
-EBUILD libpcap-1.1.1-r1.ebuild 1506 RMD160 021dd79c42ae4ffe5344e790c554d6ca9dae0375 SHA1 82d1f3fa9c03f07ab339eec531dcad60bbfcf53c SHA256 444facea2d0a7cbd870bf3582ca724640be99598f7fda965bc28243d39191b05
-EBUILD libpcap-1.2.0.ebuild 1458 RMD160 4042c761908d3635dd882040b1ebe34437e57db2 SHA1 6b6434740e4f92bea891521307bd80dd969e0d29 SHA256 b3b3ce87557a0eaab05748d194248135f439d579b94848ec391d204be8b6dab5
-EBUILD libpcap-1.2.1.ebuild 1591 RMD160 c91bf0aa6e3db919fc44f21e538ee8cf501f38dd SHA1 380f90dfac5d3815c3b34f288f264608713618eb SHA256 c58edb8acc3a4c71146c384bb0319c66eeaffc32c61b182ddbceaa0ec8216b65
-EBUILD libpcap-1.3.0.ebuild 1586 RMD160 753544060a7cc0b764a7fcc07eea6f0f8bf10747 SHA1 3c7ebfa55ef97dabf8bfb548825748ffa7406035 SHA256 d4b2289ba28a4a5a72d8f5db50f8a12e296082325e75e31a2fd23f413aac43e1
-MISC ChangeLog 22994 RMD160 43fb98bae2bfb26627a75c61ff2a7c848d4b12a3 SHA1 f22e03e67f9ccd1d83111b03fef2bd76e9008fed SHA256 75ee76feb8862dd72b19aff1c837480e13ffa35d97cd32db65b86c99a7b734e8
-MISC metadata.xml 388 RMD160 3b1443ce61438e34f2f95c0f5cc30a084d6f0449 SHA1 2a2b22d69ff3531819eb0fb9878bb43ee2ca93fd SHA256 0b03dfcc45267fcf74372c8a6cebe9df940147c62c8c4fb6ef47fc9e34e7dce0
+AUX libpcap-1.1-cross-linux.patch 1050 SHA256 b1b6375abe00207c4ea69d0e7150eb2ed080eff4b7a1112e69af587f2004474a SHA512 15938d432fec9c6867e8a4c899b9ad413b08ecab939f0c6d5d8eeb00acbcf53d3a09377a2d3f1e8510dbc36078f32da97189d45af27da9a53c106d8313671819 WHIRLPOOL e373e5d8fcfa1fbb38fe8c9058361db91848cc805d0d198ca793d3591d78d3c8d94029d7598f660b17ec527d9e8e7ef8687a8ea400186c4b8b2833cec0ab92c0
+AUX libpcap-1.1.1-ignore-ENODEV.patch 1363 SHA256 1fa73b0ce9552352df0024af5172433fbdd3fb856b6aa53b90ceb8a31fded00c SHA512 3fb928ed0fead6a91585823d22fe3295ec190cd41671c62662c4a900ea077949a77b5df2bc7c1abb081117c78539ddfdc273bead5f9bc3228c258b27e759200e WHIRLPOOL ab67cd9f41a4b6e7185aece951daa70f3ba54582ea4339bfc12f45f94ca66be371500793c148c833a7e47812e3ac53c898118a3ecead929181542ac25ee04cb1
+AUX libpcap-1.2.0-cross-linux.patch 583 SHA256 89344641676edfd9dc70b05569ac26a8ac79815fa5df0cf8e2ee77b3f9c5877f SHA512 4249129122f8ae382e086820ac4852d1413e3a7dd1f8db370aace1e94a1b0cf40d5f6d97213ca52e224e02472fed60b03c7f89d0ccd45e44ef0039a432595adb WHIRLPOOL 47598355e51ca3a15f1f817927aa73481c9a02ca15ca57ea487e1b42918a85b53aaa311be991dfc3362a2df3dd9ecee3059738e08760af8d6d9e4770578db3e3
+DIST libpcap-1.1.1.tar.gz 581984 SHA256 508cca15547e55d1318498b838456a21770c450beb2dc7d7d4a96d90816e5a85 SHA512 eecdde95815575857a722176d6caf26b8e7cf6886435fa2a4bc652d83b54a1d0fcfa7f4f87075448e83874d6340619d722b49c139a61c37f2284d890789165ac WHIRLPOOL 86f49406b15bad8799302f7653b28da70dd00bbb1243d87e7843d6dd121f4bd729379d6178a2f463b78104202c852d83d772274cf999519bbb7ac9d95419af6e
+DIST libpcap-1.3.0.tar.gz 608967 SHA256 41cbd9ed68383afd9f1fda279cb78427d36879d9e34ee707e31a16a1afd872b9 SHA512 c023abb3da7b9f62835fa04ca43b50203d7e3da7b624d09a693c8b02fd531c3845e1c86cbc587ae02816614133f5342585f6a2985fdaf92889fcfaca7bfb8908 WHIRLPOOL 774897ce4dcd1655945313a145399da9db0063967ce246e1c7beb21f038ee4c5bcfe2b4ec7b08316a013fdb33b50781f5195bf169a2ca6f84ddc2bf5bca78f15
+EBUILD libpcap-1.1.1-r1.ebuild 1521 SHA256 93673c49162ba3723aa4217a01c6a890d28791311096a8161bd95c2e9532b764 SHA512 d0e60691f4fab29ce256ad53d4e30a05bcfc9aa934244b45ca3888fe19ca38a9084131d0bd6cf24572fd835c646b7446546a641791d6ca3cca25dc02db286a59 WHIRLPOOL 8ff93463ca08ff460d7a84b66666f58fa76efd32cecb6be61b875b5b17fc7d69e8a4d1ef6c7c9850f8a3d43c98242da1e9e19819d6286bda31e226795b2d46d5
+EBUILD libpcap-1.3.0.ebuild 1604 SHA256 46c4155351520af8c080a3fa9eebb1d04dde311028ebf84a455f6e5ee198abb3 SHA512 b48342b0e6a3e9977f8be664d488cb29d3b45b2418527397693cd5ecddc85883d33416d59109fa083c99dd8fa94399951e5ec258eba5d345dabeb6e7a5f61f8f WHIRLPOOL 5edf569d8c86d45a70742290a5403631a8955d7b6e04d43a48adee6ea6ee72ffbb025ec53eb774344376dd48b0d1fcd8d81804f7fbab8e6031e490e8ab128725
+MISC ChangeLog 23286 SHA256 254bc2bb4659af66c69cea2d07ecbe78d19051cf22eedf7f324f70871f6df2fc SHA512 712016edee63a8c5e48790c8a8ebf6f0528c045c7aa6ced769b2eb9d8076cec4115e270ca6f79a8703d9bcbacb2ded1459ba85a70082bbdacd7f13c7b2d15344 WHIRLPOOL 4a717955e4dca936c42add7dab7909c9f7e7ceab9868d2d317a072268a6cd60e396af73d78544eef887cae3f1dd88a4f72ea69c2837bfd5b8e334d0ba07091a4
+MISC metadata.xml 400 SHA256 b7e2799afef193562fe29d8eb0cf8ac52af4f28bd02079ad56ec0e139596f2ba SHA512 5fe3cb8ab5a89287b571ffb268ef3a7386c7e16f6ca84ac68d5017d0fca8673028c603e1077febf9ca7e164e27ee48a7e1446b0cc5f325bd7450eb7d16767a78 WHIRLPOOL 58b8166ae70f1e1570a37bfe56ef3c871c98b396d1057fa7dc7e86c08a3e4560832197c03fd4947863a01a2bd5f63272fa9257d13ffecb2f4d121db04139ee74
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/g44YACgkQVWmRsqeSphNIdwCeJ/U0I75zVzYbI37nTj7GXD88
-yVEAnRo2tLx9bg/tKHTGpLYHO9ydLikt
-=u4UK
+iQEcBAEBCAAGBQJQO6Y7AAoJEBzRPIrUMBNCzBMH/ioPfQSFdfBfqLFM54C4pQ2t
+tiEQXqW/YuFpnhBgAUcvC8XhR5cVAnzYSzZm/xd0zSjRj5/ZleUvSz1dl3XpM5ut
+z370R5+j+wssPlAVkDACRUlLwaX3UzuHLFRdO4nZ9QCITjTNxDiWAaj2u0TYwF8N
+by3SjGz31EQNE/pjgnHVFdyT//M9DT040aNEcoRzJPGWk5DhWI4SeTOmTuuG9k05
+bJXB9WT/h2e90bqFmPHSAHVGsETqnpI+MksyPpz2m9WNufnK23XU8UMY7Nf1wFhK
+m26lJF6fpDoyLiOcBZ5IpMIhgsa8YJ5KEdpBQZyBZ2WMAx8rT3R92iy+JESDYGA=
+=3Lds
 -----END PGP SIGNATURE-----
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>