Version bump up to latest git snapshot. Fixes too many bugs, e.g. now it works with any interface, builds with -fPIC on FreeBSD (bug #262060, thank Timothy Redaelli).

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 29 insertions, 78 deletions

diff --git a/net-libs/libpcap/ChangeLog b/net-libs/libpcap/ChangeLog
index 6e68c47cf749..d98216862aa0 100644
--- a/net-libs/libpcap/ChangeLog
+++ b/net-libs/libpcap/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/libpcap
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.119 2009/05/26 08:48:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.120 2009/06/17 07:14:24 pva Exp $
+
+*libpcap-1.0.1_pre20090616 (17 Jun 2009)
+
+  17 Jun 2009; Peter Volkov <pva@gentoo.org> -libpcap-1.0.0.ebuild,
+  -libpcap-1.0.0-r1.ebuild, +libpcap-1.0.1_pre20090616.ebuild:
+  Version bump up to latest git snapshot. Fixes too many bugs, e.g. now it
+  works with any interface, builds with -fPIC on FreeBSD (bug #262060, thank
+  Timothy Redaelli).
 
 *libpcap-1.0.0-r2 (26 May 2009)
 
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index c576b7de295a..0439b6a2f625 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -14,9 +14,9 @@ AUX libpcap-1.0.0-whitespace.patch 679 RMD160 6a62d2e5737a8627e43b853a687b31c5b4
 AUX libpcap-cross-linux.patch 1114 RMD160 e76fd1ea94d34e8533416c476d95166ad13579ec SHA1 0853cb1cf102c6d9b41d22b4c62b0e1bac6d73a8 SHA256 4b3fe1e2b7ecefbf82e20120f8c3bf9c5050cb7ccc1e0be77a04af5ef7cbb459
 DIST libpcap-0.9.8.tar.gz 520526 RMD160 2f5ecbc9840d8bd646798c977b7a02abe191311e SHA1 11dfe67cfc1c279c7346d626a99ad4ba90621028 SHA256 c4158398de4411627b14f52626e4cef39443f4d5c1b9bce8c07f8526d18362f9
 DIST libpcap-1.0.0.tar.gz 524273 RMD160 20857fe6af5dc70fffb19da46e0fee908f55b3ea SHA1 9893654027ae11033d785045ff35583da43fe8fa SHA256 a214c4e1d7e22a758f66fe1d08f0ce41c3ba801a4c13dd1188e1e38288ac73c0
+DIST libpcap-1.0.1-20090616.tar.gz 591419 RMD160 9d5c01f703191efef76b02bafd8ae9af2a5a77ca SHA1 ce647384280b00703f49774a18c7fc6e97a86782 SHA256 1cca9d33c695d85b97d4e80dbaf84503beea5a5a6dcc88d3e122d4b1530a4035
 EBUILD libpcap-0.9.8-r2.ebuild 1893 RMD160 7eb603ca3e2cbe57ce3857536b1ecca7b8769742 SHA1 edcc59e68dc8a21036c1f5b9df87b9cb0516ef93 SHA256 f5c8ed79b684c390791df95dfaad5b2ab0a6f7108ca6048823f5101f18c24a4e
-EBUILD libpcap-1.0.0-r1.ebuild 1713 RMD160 92070239b089b6edf4b2b9b07dd395478ac4eadb SHA1 8aa7bfec1c906bba048c892a97deac395a923faf SHA256 6b877f1d9a760fb1d796d8a9b242e541cae970b2e8d9700f409226702e0de901
 EBUILD libpcap-1.0.0-r2.ebuild 1753 RMD160 5919c3b1b5a10563bad6c9df2d50533ac5698aa9 SHA1 ed4594fbd71a1b0ef60201c43a6586d36607a5db SHA256 6e1ebec9bce66d7b08c713ea4db7e09a443d408313b0572776d38f74506eda1c
-EBUILD libpcap-1.0.0.ebuild 1848 RMD160 5157adebf36517e05378d9194039075e541497a4 SHA1 f186df5c489c0fb4c6258f98255ff943da61b2f1 SHA256 afc354237c91f1d67694c24ccaa589734b805c5c193699ed324eb6aa1408becb
-MISC ChangeLog 15547 RMD160 d1a14552619b441dc720908ee942ff0e7afc7457 SHA1 6e2797d4ee2b75e097ed7aaf7fc2222c807a31cd SHA256 7ae6c5c99ad46e3831c1a6f54aa6eea7d644daff29a96d9ae021cb972d273e79
+EBUILD libpcap-1.0.1_pre20090616.ebuild 1673 RMD160 49498c53ef57470a9effeea61c39968d9c7309db SHA1 addbaff7975fb3cb91b2a6dbd6573f91a27c5e8b SHA256 5b6ac7a40d412f344737182005e5a9c73476bb063e3c4bc1c7efe2cf7142b435
+MISC ChangeLog 15894 RMD160 9228fd49985fedd2708cb6c40edc6e9cd3af75ef SHA1 7ec2a51a122c370bb15642fe0c3074c7513206a4 SHA256 f8e63f8f91a7f821c88a85b48547c913c39768b229db694c0fb4dc9b3d285805
 MISC metadata.xml 261 RMD160 5bcf72e234ef387b24ffb9221623eaf927a41f02 SHA1 31a589dbbde4597dc3df248c57b5213889c67423 SHA256 92d6c306fe13ead877997b8ff3007ffa601a1e7c96ca3ec2208f88884a95c791
diff --git a/net-libs/libpcap/libpcap-1.0.0.ebuild b/net-libs/libpcap/libpcap-1.0.0.ebuild
deleted file mode 100644
index cb75473c4587..000000000000
--- a/net-libs/libpcap/libpcap-1.0.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.0.0.ebuild,v 1.1 2008/11/08 12:58:17 cedk Exp $
-
-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 ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="ipv6"
-
-RDEPEND="!virtual/libpcap"
-DEPEND="${RDEPEND}
-	sys-devel/flex"
-PROVIDE="virtual/libpcap"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-whitespace.patch
-	epatch "${FILESDIR}"/${PN}-0.8.1-fPIC.patch
-	epatch "${FILESDIR}"/${PN}-cross-linux.patch
-	epatch "${FILESDIR}"/${PN}-0.9.8-largefile.patch
-	epatch "${FILESDIR}"/${P}-bindir.patch
-	eautoreconf
-}
-
-src_compile() {
-	econf $(use_enable ipv6)
-	emake || die "compile problem"
-
-	# no provision for this in the Makefile, so...
-	$(tc-getCC) ${LDFLAGS} -Wl,-soname,libpcap.so.0 -shared -fPIC -o libpcap.so.${PV:0:3} *.o \
-		|| die "couldn't make a shared lib"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# We need this to build pppd on G/FBSD systems
-	if [[ "${USERLAND}" == "BSD" ]]; then
-		insinto /usr/include
-		doins pcap-int.h || die "failed to install pcap-int.h"
-	fi
-
-	insopts -m 755
-	insinto /usr/$(get_libdir)
-	doins libpcap.so.${PV:0:3}
-	dosym libpcap.so.${PV:0:3} /usr/$(get_libdir)/libpcap.so.0
-	dosym libpcap.so.${PV:0:3} /usr/$(get_libdir)/libpcap.so
-
-	# We are not installing README.{Win32,aix,hpux,tru64} (bug 183057)
-	dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel,.sita}
-}
diff --git a/net-libs/libpcap/libpcap-1.0.0-r1.ebuild b/net-libs/libpcap/libpcap-1.0.1_pre20090616.ebuild
index 0c72d51224ad..1c051a34d2fc 100644
--- a/net-libs/libpcap/libpcap-1.0.0-r1.ebuild
+++ b/net-libs/libpcap/libpcap-1.0.1_pre20090616.ebuild
@@ -1,13 +1,17 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.0.0-r1.ebuild,v 1.5 2009/05/12 10:09:41 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.0.1_pre20090616.ebuild,v 1.1 2009/06/17 07:14:24 pva Exp $
 
+EAPI=2
 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"
+MY_P=${PN}-${PV/_pre/-}
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+#	SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
+#		http://www.jp.tcpdump.org/release/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -20,28 +24,26 @@ DEPEND="${RDEPEND}
 	sys-devel/flex"
 PROVIDE="virtual/libpcap"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-cross-linux.patch"
-	epatch "${FILESDIR}/${P}-install-bindir.patch"
-	epatch "${FILESDIR}/${P}-install-headers.patch"
-	epatch "${FILESDIR}/${P}-optional-bluetooth.patch"
-	epatch "${FILESDIR}/${P}-LDFLAGS.patch"
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.0.0-cross-linux.patch"
+	echo ${PV} > VERSION # Avoid CVS in version
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	econf $(use_enable ipv6) \
 		$(use_enable bluetooth)
+}
+
+src_compile() {
 	emake all shared || die "compile problem"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install install-shared || die "emake install failed"
 
-	dosym libpcap.so.${PV:0:5} /usr/$(get_libdir)/libpcap.so.1
-	dosym libpcap.so.${PV:0:5} /usr/$(get_libdir)/libpcap.so
+	dosym libpcap.so.${PV} /usr/$(get_libdir)/libpcap.so.1
+	dosym libpcap.so.${PV} /usr/$(get_libdir)/libpcap.so
 
 	# We need this to build pppd on G/FBSD systems
 	if [[ "${USERLAND}" == "BSD" ]]; then
@@ -50,5 +52,5 @@ src_install() {
 	fi
 
 	# We are not installing README.{Win32,aix,hpux,tru64} (bug 183057)
-	dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel}
+	dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel} || die
 }