Version bump thanks to Michael (kensington) and Yun Zheng Hu (bug #393085).

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

5 files changed, 88 insertions, 11 deletions

diff --git a/net-libs/libpcap/ChangeLog b/net-libs/libpcap/ChangeLog
index b540a8374362..e60a81da01e0 100644
--- a/net-libs/libpcap/ChangeLog
+++ b/net-libs/libpcap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libpcap
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.158 2011/12/11 15:52:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.159 2011/12/16 17:30:38 jer Exp $
+
+*libpcap-1.2.0 (16 Dec 2011)
+
+  16 Dec 2011; Jeroen Roovers <jer@gentoo.org> libpcap-1.1.1-r1.ebuild,
+  +libpcap-1.2.0.ebuild, +files/libpcap-1.2.0-cross-linux.patch:
+  Version bump thanks to Michael (kensington) and Yun Zheng Hu (bug #393085).
 
   11 Dec 2011; Raúl Porcel <armin76@gentoo.org> libpcap-1.1.1-r1.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #385875
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 0a00bf472a8e..0bcd23e20db2 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -3,15 +3,18 @@ Hash: SHA1
 
 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
-EBUILD libpcap-1.1.1-r1.ebuild 1509 RMD160 95ce84d2cb0cba01df6bb3dcbc02881fccefc7e4 SHA1 434014c96749fc803a94544c17fb2d6382902ba8 SHA256 4b96cd626452ba6960edf28e817a3a8e382ee85a85d61333d30bdcabba1ffa6d
+DIST libpcap-1.2.0.tar.gz 597758 RMD160 d13daaa4863d7336914ff8ab1a9b424e4dc49ad4 SHA1 44f1edf687c21ad69f65ed03c8c4911950881335 SHA256 702ac51cfaa5c17d6b92771b22835d58eda4dc9e1f596c80a0b031e4c45c07d6
+EBUILD libpcap-1.1.1-r1.ebuild 1452 RMD160 fd0f1695d758850729898dedf8c2e1435a35903c SHA1 154a3663cdb59e0af0fe17a42c0093614dad8d7c SHA256 852c0c053eaad46b9012bab8fada17a21d1dc46423e5519d30f3c4c44f9f7343
 EBUILD libpcap-1.1.1.ebuild 1599 RMD160 08504e5a914345e82329af0fece2a406347360fa SHA1 989100de9cbe05bff48f1f0e46343f7f6491a314 SHA256 a416ceb0e4429e7ef2363618bc1e383cff88503e7afc9636641688b023871fb7
-MISC ChangeLog 21639 RMD160 ea7ee211349f4c6b09e1804ae4d8dbb3757a4910 SHA1 e15b6df4aa659cf05e9ea8ab3dbf5360ac0f1372 SHA256 d197bc445eaea69875d17d601cff9fc271a3c5fbe41c3a66daf456b3ca82b2fe
+EBUILD libpcap-1.2.0.ebuild 1454 RMD160 986d12c4df7c511ea8df84c7b8914d280d99c267 SHA1 a1d68461460184fc1b19aacf2e6b9b231c4945f8 SHA256 c26465c0d8e8b2114033cfe3e2d31878e6c5c3d485949d8393eeafade848cf54
+MISC ChangeLog 21881 RMD160 e4b882c792e61c5b0c20f3268e93db31983c1dde SHA1 dfddd020b3771b735669364e94e9432ef2620675 SHA256 e4d17d1b20584229d2df6023ea16523cee6983aff5078d722ff4eec461639261
 MISC metadata.xml 388 RMD160 3b1443ce61438e34f2f95c0f5cc30a084d6f0449 SHA1 2a2b22d69ff3531819eb0fb9878bb43ee2ca93fd SHA256 0b03dfcc45267fcf74372c8a6cebe9df940147c62c8c4fb6ef47fc9e34e7dce0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7k0cMACgkQuQc30/atMkAk8gCgl+6iDbRTSYFAvlgICHmTIpT4
-0iEAoLw0gnFuGFyb8F5jpBtXiADM3jD9
-=23EC
+iEYEARECAAYFAk7rgEQACgkQVWmRsqeSphPIAwCdEYclN+AJ+D7pr+AtPsxpc98A
+bE4Anil1n3PD019xPZ4pVXkKyuOBsbAk
+=zUjB
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libpcap/files/libpcap-1.2.0-cross-linux.patch b/net-libs/libpcap/files/libpcap-1.2.0-cross-linux.patch
new file mode 100644
index 000000000000..81eddcc395d1
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.2.0-cross-linux.patch
@@ -0,0 +1,16 @@
+--- a/libpcap-1.2.0/configure.in
++++ b/libpcap-1.2.0/configure.in
+@@ -291,7 +291,12 @@
+ dnl XXX This could be done for cross-compiling, but for now it's not.
+ dnl
+ if test -z "$with_pcap" && test "$cross_compiling" = yes; then
+-	AC_MSG_ERROR(pcap type not determined when cross-compiling; use --with-pcap=...)
++	if test -z "$with_pcap" ; then
++		case $host in
++			*-linux*) with_pcap="linux";;
++			*) AC_MSG_ERROR(pcap type not determined when cross-compiling; use --with-pcap=...);;
++		esac
++	fi
+ fi
+ AC_ARG_WITH(pcap,
+ AC_HELP_STRING([--with-pcap=TYPE],[use packet capture TYPE]))
diff --git a/net-libs/libpcap/libpcap-1.1.1-r1.ebuild b/net-libs/libpcap/libpcap-1.1.1-r1.ebuild
index 367b2eee997e..c88a8edf8ba2 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-2011 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.12 2011/12/11 15:52:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.1.1-r1.ebuild,v 1.13 2011/12/16 17:30:38 jer Exp $
 
 EAPI=4
 inherit autotools eutils multilib toolchain-funcs
@@ -24,10 +24,7 @@ DEPEND="${RDEPEND}
 DOCS=( CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel} )
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-1.1-cross-linux.patch" \
-		"${FILESDIR}/${P}-ignore-ENODEV.patch"
-
+	epatch "${FILESDIR}/${P}-cross-linux.patch"
 	eautoreconf
 }
 
diff --git a/net-libs/libpcap/libpcap-1.2.0.ebuild b/net-libs/libpcap/libpcap-1.2.0.ebuild
new file mode 100644
index 000000000000..0da4be3e7def
--- /dev/null
+++ b/net-libs/libpcap/libpcap-1.2.0.ebuild
@@ -0,0 +1,55 @@
+# 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.1 2011/12/16 17:30:38 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 )"
+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
+}