corrected the naming convention of the shared object in ebuild from 0.6 to 0.8 to match current version of libpcap. A revdep-rebuild or equivalent will be required for users that have any port that remains directly linked to the /usr/lib/libpcap.so.0.6 library after the update.

4 files changed, 54 insertions, 96 deletions

diff --git a/net-libs/libpcap/ChangeLog b/net-libs/libpcap/ChangeLog
index 562d442fc535..ca4e136efa67 100644
--- a/net-libs/libpcap/ChangeLog
+++ b/net-libs/libpcap/ChangeLog
@@ -1,97 +1,12 @@
 # ChangeLog for net-libs/libpcap
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.22 2004/03/30 21:26:52 weeve Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.23 2004/04/01 02:33:54 solar Exp $
 
-*libpcap-0.8.3 (30 Mar 2004)
+*libpcap-0.8.3-r1 (31 Mar 2004)
 
-  30 Mar 2004; Jason Wever <weeve@gentoo.org> libpcap-0.8.3.ebuild:
-  Stable on sparc.
+  31 Mar 2004; <solar@gentoo.org> libpcap-0.8.3-r1.ebuild:
+  corrected the naming convention of the shared object in ebuild from 0.6 to 0.8
+  to match current version of libpcap. A revdep-rebuild or equivalent will be
+  required for users that have any port that remains directly linked to the
+  /usr/lib/libpcap.so.0.6 library after the update
 
-  30 Mar 2004; <solar@gentoo.org> :
-  bumping libpcap to 0.8.3 for tcpdump Bugzilla Bug 46258
-
-*libpcap-0.7.2-r1 (15 Feb 2004)
-*libpcap-0.8.1-r1 (15 Feb 2004)
-
-  15 Feb 2004; Michael Boman <mboman@gentoo.org> libpcap-0.7.2-r1.ebuild,
-  libpcap-0.8.1-r1.ebuild, metadata.xml:
-  Fixing bug #41647, #41648 and #41649
-
-  These ebuilds seems to be unmaintained so i'm making myself the
-  maintainer for now.
-
-  15 Jan 2004; <gustavoz@gentoo.org> libpcap-0.8.1.ebuild:
-  marked hppa and sparc, fixes #38206
-
-*libpcap-0.8.1 (03 Jan 2004)
-
-  03 Jan 2004; Daniel Ahlberg <aliz@gentoo.org> libpcap-0.8.1.ebuild,
-  files/libpcap-0.8.1-fPIC.patch:
-  Version bump. Closing #37092.
-
-  22 Apr 2003; Daniel Ahlberg <aliz@gentoo.org> :
-  Unmask to keep libpcap in sync to tcpdump. Closes #19517.
-
-*libpcap-0.7.2 (03 Mar 2003)
-
-  27 Apr 2003; Zach Welch <zwelch@gentoo.org> libpcap-0.7.2.ebuild:
-  add arm keyword
-
-  03 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> :
-  Version bump.
-
-  27 Feb 2003; Peter Johanson <latexer@gentoo.org> libpcap-0.7.1-r1.ebuild :
-  Changed to stable on x86
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
-
-*libpcap-0.7.1-r2 (3 Jan 2003)
-
-  25 Feb 2003; Guy Martin <gmsoft@gentoo.org> libpcap-0.7.1-r2.ebuild :
-  Added hppa to keywords.
-
-  15 Feb 2003; Nicholas Wourms <dragon@gentoo.org> libpcap-0.7.1-r2.ebuild :
-  Added mips keyword to ebuild.
-
-  10 Feb 2003; Peter Johanson <latexer@gentoo.org> libpcap-0.7.1-r2.ebuild :
-  Added ~alpha to KEYWORDS
-
-  3 Jan 2003; Stefan Jones <cretin@gentoo.org> :
-  Added -fpic to the CFLAGS to aid prelinking.
-
-*libpcap-0.7.1-r1 (31 Aug 2002)
-
-  30 Mar 2003; Christian Birchinger <joker@gentoo.org>
-  libpcap-0.7.1-r1.ebuild:
-  Added sparc stable keyword
-
-  15 Feb 2003; Nicholas Wourms <dragon@gentoo.org> libpcap-0.7.1-r1.ebuild :
-  Added mips keyword to ebuild.
-
-  02 Nov 2002; Calum Selkirk <cselkirk@gentoo.org> libpcap-0.7.1-r1.ebuild :
-
-  Added ~arch so as to remove from package.mask
-
-  31 Aug 2002; Calum Selkirk <cselkirk@gentoo.org> libpcap-0.7.1-r1.ebuild
-  files/digest-libpcap-0.7.1-r1 :
-
-  Added a patch for Prism Header data capture (wireless). This patch allows
-  Airsnort (and other wireless packet sniffers) to work.
-
-*libpcap-0.7.1 (11 May 2002)
-
-  15 Feb 2003; Nicholas Wourms <dragon@gentoo.org> libpcap-0.7.1.ebuild :
-  Added mips keyword to ebuild.
-
-  11 May 2002; Spider <spider@gentoo.org> libpcap-0.7.1.ebuild :
-  version bump for the new tcpdump
-  
-*libpcap-0.6.2-r1 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index bea8391ff1b0..0896e230cba2 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -1,13 +1,15 @@
 MD5 818795bbe6bcec5e05f97ebbe6d61630 ChangeLog 3254
+MD5 4edc7ca25d7593d5dd3f087e06e29243 libpcap-0.8.1.ebuild 1096
 MD5 b108ccf84b15b81e3ac2a5318873aeb7 libpcap-0.7.2-r1.ebuild 1125
 MD5 c0e72b2a6d016dc65e929dbd2b4c26a0 libpcap-0.7.2.ebuild 1107
 MD5 f2530d9bfd406eeaae41b39b89977b35 libpcap-0.8.1-r1.ebuild 1188
-MD5 4edc7ca25d7593d5dd3f087e06e29243 libpcap-0.8.1.ebuild 1096
 MD5 22e890de685863b2ced8c1b5fd6b318a metadata.xml 402
 MD5 0affb5d0f3f11cde1d1519b5f47672e9 libpcap-0.8.3.ebuild 1102
+MD5 a7ec43cfba18c014bc88ddd6b04d6353 libpcap-0.8.3-r1.ebuild 1134
+MD5 a8a2dac67059729725555570b2e7ed9f files/digest-libpcap-0.8.1 65
+MD5 29710cca211a266690d649eff1ffe287 files/libpcap-0.8.1-fPIC.patch 298
 MD5 6ccab63a4b33bed475b2c7215a55698d files/digest-libpcap-0.7.2 65
 MD5 6ccab63a4b33bed475b2c7215a55698d files/digest-libpcap-0.7.2-r1 65
-MD5 a8a2dac67059729725555570b2e7ed9f files/digest-libpcap-0.8.1 65
 MD5 a8a2dac67059729725555570b2e7ed9f files/digest-libpcap-0.8.1-r1 65
-MD5 29710cca211a266690d649eff1ffe287 files/libpcap-0.8.1-fPIC.patch 298
 MD5 aa690ff148a4b4bbb5a59276fbb583a8 files/digest-libpcap-0.8.3 65
+MD5 aa690ff148a4b4bbb5a59276fbb583a8 files/digest-libpcap-0.8.3-r1 65
diff --git a/net-libs/libpcap/files/digest-libpcap-0.8.3-r1 b/net-libs/libpcap/files/digest-libpcap-0.8.3-r1
new file mode 100644
index 000000000000..496dd7e819c6
--- /dev/null
+++ b/net-libs/libpcap/files/digest-libpcap-0.8.3-r1
@@ -0,0 +1 @@
+MD5 56a9d4615d8354fcfe8cff8c8443c77b libpcap-0.8.3.tar.gz 302551
diff --git a/net-libs/libpcap/libpcap-0.8.3-r1.ebuild b/net-libs/libpcap/libpcap-0.8.3-r1.ebuild
new file mode 100644
index 000000000000..973e1a09a527
--- /dev/null
+++ b/net-libs/libpcap/libpcap-0.8.3-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-0.8.3-r1.ebuild,v 1.1 2004/04/01 02:33:54 solar Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="pcap-Library"
+SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
+	http://www.jp.tcpdump.org/release/${P}.tar.gz"
+HOMEPAGE="http://www.tcpdump.org/"
+DEPEND="virtual/glibc"
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~amd64 ~ia64"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	epatch ${FILESDIR}/${PN}-0.8.1-fPIC.patch
+}
+
+src_compile() {
+	econf `use_enable ipv6` || die "bad configure"
+	emake || die "compile problem"
+
+	# no provision for this in the Makefile, so...
+	gcc -Wl,-soname,libpcap.so.0 -shared -fPIC -o libpcap.so.${PV:0:3} *.o
+	read
+	assert "couldn't make a shared lib"
+}
+
+src_install() {
+	einstall || die
+
+	insopts -m 755
+	insinto /usr/lib ; doins libpcap.so.${PV:0:3}
+	dosym /usr/lib/libpcap.so.${PV:0:3} /usr/lib/libpcap.so.0
+	dosym /usr/lib/libpcap.so.${PV:0:3} /usr/lib/libpcap.so
+
+	dodoc CREDITS CHANGES FILES README* VERSION LICENSE
+}