fixed a few breakages - symlinks in root. Also the ring component didn't seem to be active

(Portage version: 2.0.51.22-r1)

7 files changed, 57 insertions, 91 deletions

diff --git a/net-libs/libpcap-ringbuffer/ChangeLog b/net-libs/libpcap-ringbuffer/ChangeLog
index 8e3f311c5516..7629f6ad9a9b 100644
--- a/net-libs/libpcap-ringbuffer/ChangeLog
+++ b/net-libs/libpcap-ringbuffer/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-libs/libpcap-ringbuffer
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap-ringbuffer/ChangeLog,v 1.4 2005/06/03 08:37:21 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap-ringbuffer/ChangeLog,v 1.5 2005/06/11 08:27:44 dragonheart Exp $
+
+*libpcap-ringbuffer-1.0.20050129-r2 (11 Jun 2005)
+
+  11 Jun 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/libpcap-ringbuffer-1.0.20050129-makefile.patch,
+  -libpcap-ringbuffer-1.0.20050129.ebuild,
+  -libpcap-ringbuffer-1.0.20050129-r1.ebuild,
+  +libpcap-ringbuffer-1.0.20050129-r2.ebuild:
+  fixed a few breakages - symlinks in root. Also the ring component didn't
+  seem to be linked in.
 
 *libpcap-ringbuffer-1.0.20050129-r1 (03 Jun 2005)
 
diff --git a/net-libs/libpcap-ringbuffer/Manifest b/net-libs/libpcap-ringbuffer/Manifest
index e0cf1f8bb4d5..80be91c6313b 100644
--- a/net-libs/libpcap-ringbuffer/Manifest
+++ b/net-libs/libpcap-ringbuffer/Manifest
@@ -1,19 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 e49089ecce4e38b96d3be7d3c959a898 ChangeLog 997
 MD5 3518cc7e500dab348a9a4aee5972d7c8 libpcap-ringbuffer-1.0.20041001.ebuild 1659
 MD5 c14eecc39f9e4d6b37b94f4e81df755d metadata.xml 257
-MD5 0de5bced2c0d3a42143d82a65be94120 libpcap-ringbuffer-1.0.20050129.ebuild 1659
-MD5 47c5cd5700c22ccfc2baf90fb00c6966 libpcap-ringbuffer-1.0.20050129-r1.ebuild 1711
+MD5 c2d28df1aa221fe2d22511007916f7e9 libpcap-ringbuffer-1.0.20050129-r2.ebuild 1703
 MD5 a515448deadd95cb78cacf175a0aeba4 files/digest-libpcap-ringbuffer-1.0.20041001 72
-MD5 88de1c13f5c2a764d4613cd7070766c6 files/digest-libpcap-ringbuffer-1.0.20050129 72
-MD5 88de1c13f5c2a764d4613cd7070766c6 files/digest-libpcap-ringbuffer-1.0.20050129-r1 72
+MD5 13baa2560936dddce623fc3b2d207aa9 files/libpcap-ringbuffer-1.0.20050129-makefile.patch 2426
 MD5 2801bbe6917277fe63e0115dac7648b5 files/libpcap-ringbuffer-1.0.20050129-mmap-exec.patch 728
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCoBbWmdTrptrqvGERAje/AJ9z60J1os5yGnLgl7Kq/WPXKeJSLgCdEFCr
-G6pGCRDKXEXrxzRKNhaRMDI=
-=xS9t
------END PGP SIGNATURE-----
+MD5 88de1c13f5c2a764d4613cd7070766c6 files/digest-libpcap-ringbuffer-1.0.20050129-r2 72
diff --git a/net-libs/libpcap-ringbuffer/files/digest-libpcap-ringbuffer-1.0.20050129-r1 b/net-libs/libpcap-ringbuffer/files/digest-libpcap-ringbuffer-1.0.20050129-r1
deleted file mode 100644
index 77df015e2728..000000000000
--- a/net-libs/libpcap-ringbuffer/files/digest-libpcap-ringbuffer-1.0.20050129-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 17f5d0ea2e00d5f54f23966d453a9660 libpcap-1.0.20050129.tar.gz 601748
diff --git a/net-libs/libpcap-ringbuffer/files/digest-libpcap-ringbuffer-1.0.20050129 b/net-libs/libpcap-ringbuffer/files/digest-libpcap-ringbuffer-1.0.20050129-r2
index 77df015e2728..77df015e2728 100644
--- a/net-libs/libpcap-ringbuffer/files/digest-libpcap-ringbuffer-1.0.20050129
+++ b/net-libs/libpcap-ringbuffer/files/digest-libpcap-ringbuffer-1.0.20050129-r2
diff --git a/net-libs/libpcap-ringbuffer/files/libpcap-ringbuffer-1.0.20050129-makefile.patch b/net-libs/libpcap-ringbuffer/files/libpcap-ringbuffer-1.0.20050129-makefile.patch
new file mode 100644
index 000000000000..1df732515f7e
--- /dev/null
+++ b/net-libs/libpcap-ringbuffer/files/libpcap-ringbuffer-1.0.20050129-makefile.patch
@@ -0,0 +1,38 @@
+--- Makefile.am.orig	2005-06-11 15:49:35.000000000 +1000
++++ Makefile.am	2005-06-11 15:48:22.000000000 +1000
+@@ -105,11 +105,11 @@
+ 	cp pcap-namedb.h $(DESTDIR)$(includedir)
+ 	rm -f $(DESTDIR)$(libdir)/libpcap.la
+ 	rm -f $(DESTDIR)$(libdir)/libpcap.so*
+-	(cd $(DESTDIR)$(libdir); ln -s libpcap-0.$(RMINOR).$(RREVISION).so libpcap.so)
+-	(cd $(DESTDIR)$(libdir); ln -s libpcap-0.$(RMINOR).$(RREVISION).so libpcap.so.0.$(RMINOR).$(RREVISION))
+-	(cd $(DESTDIR)$(libdir); ln -s libpcap-0.$(RMINOR).$(RREVISION).so libpcap.so.0.$(RMINOR))
+-	(cd $(DESTDIR)$(libdir); ln -s libpcap-0.$(RMINOR).$(RREVISION).so libpcap.so.0.7)
+-	(cd $(DESTDIR)$(libdir); ln -s libpcap-0.$(RMINOR).$(RREVISION).so libpcap.so.0)
++	(cd $(DESTDIR)$(libdir); ln -s libpcap.so.$(VCURRENT).$(VREVISION).${VAGE) libpcap.so)
++	(cd $(DESTDIR)$(libdir); ln -s libpcap.so.$(VCURRENT).$(VREVISION).${VAGE) libpcap.so.0.$(RMINOR).$(RREVISION))
++	(cd $(DESTDIR)$(libdir); ln -s libpcap.so.$(VCURRENT).$(VREVISION).${VAGE) libpcap.so.0.$(RMINOR))
++	(cd $(DESTDIR)$(libdir); ln -s libpcap.so.$(VCURRENT).$(VREVISION).${VAGE) libpcap.so.0.7)
++	(cd $(DESTDIR)$(libdir); ln -s libpcap.so.$(VCURRENT).$(VREVISION).${VAGE) libpcap.so.0)
+ 
+ # generated source
+ 
+--- Makefile.in.orig	2005-06-11 15:42:42.000000000 +1000
++++ Makefile.in	2005-06-11 15:50:23.000000000 +1000
+@@ -514,11 +514,11 @@
+ 	cp pcap-namedb.h $(DESTDIR)$(includedir)
+ 	rm -f $(DESTDIR)$(libdir)/libpcap.la
+ 	rm -f $(DESTDIR)$(libdir)/libpcap.so*
+-	(cd $(DESTDIR)$(libdir); ln -s libpcap-0.$(RMINOR).$(RREVISION).so libpcap.so)
+-	(cd $(DESTDIR)$(libdir); ln -s libpcap-0.$(RMINOR).$(RREVISION).so libpcap.so.0.$(RMINOR).$(RREVISION))
+-	(cd $(DESTDIR)$(libdir); ln -s libpcap-0.$(RMINOR).$(RREVISION).so libpcap.so.0.$(RMINOR))
+-	(cd $(DESTDIR)$(libdir); ln -s libpcap-0.$(RMINOR).$(RREVISION).so libpcap.so.0.7)
+-	(cd $(DESTDIR)$(libdir); ln -s libpcap-0.$(RMINOR).$(RREVISION).so libpcap.so.0)
++	(cd $(DESTDIR)$(libdir); ln -s libpcap.so.$(VCURRENT).$(VREVISION).$(VAGE) libpcap.so)
++	(cd $(DESTDIR)$(libdir); ln -s libpcap.so.$(VCURRENT).$(VREVISION).$(VAGE) libpcap.so.0.$(RMINOR).$(RREVISION))
++	(cd $(DESTDIR)$(libdir); ln -s libpcap.so.$(VCURRENT).$(VREVISION).$(VAGE) libpcap.so.0.$(RMINOR))
++	(cd $(DESTDIR)$(libdir); ln -s libpcap.so.$(VCURRENT).$(VREVISION).$(VAGE) libpcap.so.0.7)
++	(cd $(DESTDIR)$(libdir); ln -s libpcap.so.$(VCURRENT).$(VREVISION).$(VAGE) libpcap.so.0)
+ 
+ # generated source
+ 
diff --git a/net-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20050129-r1.ebuild b/net-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20050129-r2.ebuild
index 4ac9cc9c2e96..5c327e636aab 100644
--- a/net-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20050129-r1.ebuild
+++ b/net-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20050129-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20050129-r1.ebuild,v 1.1 2005/06/03 08:37:21 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20050129-r2.ebuild,v 1.1 2005/06/11 08:27:44 dragonheart Exp $
 
 inherit toolchain-funcs linux-info multilib eutils
 
@@ -31,11 +31,12 @@ src_unpack() {
 	cd ${S}
 	sed -i 's:@CFLAGS@:@CFLAGS@ -fPIC:' Makefile.in || die "fPIC patch failed."
 	epatch ${FILESDIR}/${P}-mmap-exec.patch
+	epatch ${FILESDIR}/${P}-makefile.patch
 }
 
 src_compile() {
 	cd ${S}
-	econf `use_enable ipv6` || die "bad configure"
+	econf `use_enable ipv6` --with-pcap=ring || die "bad configure"
 	emake || die "compile problem"
 
 	# no provision for this in the Makefile, so...
@@ -48,15 +49,8 @@ src_install() {
 	dodir /usr/$(get_libdir)
 	emake DESTDIR=${D} install || die "install problem"
 	dodoc CREDITS CHANGES FILES README* VERSION
-
-	dolib libpcap.so.${PV:0:3}
-
-	doins /usr/$(get_libdir)
-
-	for link in "" .0 .0.7 .0.8
-	do
-		dosym libpcap.so.${PV:0:3} libpcap.so${link}
-	done
+	mv libpcap.so.${PV:0:3} libpcap.so.${PV:0:3}.0
+	dolib libpcap.so.${PV:0:3}.0
 }
 
 pkg_postinst() {
diff --git a/net-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20050129.ebuild b/net-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20050129.ebuild
deleted file mode 100644
index ac3ef8c3ba9a..000000000000
--- a/net-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20050129.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20050129.ebuild,v 1.1 2005/03/24 00:56:18 vanquirius Exp $
-
-inherit toolchain-funcs linux-info multilib
-
-MY_P=${PN:0:7}-${PV}
-
-DESCRIPTION="A libpcap version which supports MMAP mode (ringbuffer)  on the linux kernel 2.[46].x"
-HOMEPAGE="http://public.lanl.gov/cpw/"
-SRC_URI="${HOMEPAGE}${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="ipv6"
-
-DEPEND="virtual/libc
-	!virtual/libpcap"
-
-PROVIDE="virtual/libpcap"
-
-S=${WORKDIR}/${MY_P}
-
-# Used in linux-info to check minium Kernel support
-CONFIG_CHECK="PACKET_MMAP"
-PACKET_MMAP_ERROR="Make sure you have PACKET_MMAP compiled in your kernel to make use of libpcap's ringbuffer feature."
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i 's:@CFLAGS@:@CFLAGS@ -fPIC:' Makefile.in || die "fPIC patch failed."
-}
-
-src_compile() {
-	cd ${S}
-	econf `use_enable ipv6` || die "bad configure"
-	emake || die "compile problem"
-
-	# no provision for this in the Makefile, so...
-	$(tc-getCC) -Wl,-soname,libpcap.so.0 -shared -fPIC -o libpcap.so.${PV:0:3} *.o \
-		|| die "couldn't make a shared lib"
-}
-
-src_install() {
-	dodir /usr/include
-	dodir /usr/$(get_libdir)
-	emake DESTDIR=${D} install || die "install problem"
-	dodoc CREDITS CHANGES FILES README* VERSION
-
-	dolib libpcap.so.${PV:0:3}
-
-	doins /usr/$(get_libdir)
-
-	for link in "" .0 .0.7 .0.8
-	do
-		dosym libpcap.so.${PV:0:3} libpcap.so${link}
-	done
-}
-
-pkg_postinst() {
-	einfo "For usage with tcpdump and further details see:"
-	einfo "/usr/share/doc/${PF}/README.ring.gz"
-}