better SLOTs #17772

6 files changed, 214 insertions, 1 deletions

diff --git a/net-libs/libnet/ChangeLog b/net-libs/libnet/ChangeLog
index 83a41475d939..e7c85aaaf407 100644
--- a/net-libs/libnet/ChangeLog
+++ b/net-libs/libnet/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-libs/libnet
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/ChangeLog,v 1.17 2003/08/16 23:01:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/ChangeLog,v 1.18 2003/08/21 04:17:16 vapier Exp $
+
+*libnet-1.1.0-r3 (21 Aug 2003)
+
+  21 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Stick libnet into better SLOT's ... that is, 1.0.x is deprecated so
+  libnet-1.1.x now occupies libnet.a, libnet.h, and libnet-config ... #17772
+
+*libnet-1.0.2a-r3 (21 Aug 2003)
+
+  21 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  While libnet-1.0.x now occupies libnet-1.0.a, libnet-1.0.h, and
+  libnet-1.0-config ... #17772
 
 *libnet-1.1.0-r2 (16 Aug 2003)
 
diff --git a/net-libs/libnet/files/1.0.2a-slot.patch b/net-libs/libnet/files/1.0.2a-slot.patch
new file mode 100644
index 000000000000..af0b92f2c3a1
--- /dev/null
+++ b/net-libs/libnet/files/1.0.2a-slot.patch
@@ -0,0 +1,117 @@
+diff -ur Libnet-1.0.2a.orig/Makefile.in Libnet-1.0.2a/Makefile.in
+--- Libnet-1.0.2a.orig/Makefile.in	2003-08-17 23:53:14.000000000 -0400
++++ Libnet-1.0.2a/Makefile.in	2003-08-18 00:10:28.810521400 -0400
+@@ -18,17 +18,17 @@
+ LIB_PREFIX  =   @libdir@/
+ MAN_PREFIX  =   @MAN_PREFIX@
+ 
+-LIBNET      =   libnet
+-LIBPWRITE   =   libpwrite
++LIBNET      =   libnet-1.0
++LIBPWRITE   =   libpwrite-1.0
+ LIB         =   lib/$(LIBNET).a
+ MAN         =   doc/$(LIBNET).3
+ INCLUDE     =   include/$(LIBNET).h
+-INCLUDE-H   =   include/$(LIBNET)/$(LIBNET)-headers.h
+-INCLUDE-F   =   include/$(LIBNET)/$(LIBNET)-functions.h
+-INCLUDE-S   =   include/$(LIBNET)/$(LIBNET)-structures.h
+-INCLUDE-M   =   include/$(LIBNET)/$(LIBNET)-macros.h
+-INCLUDE-A   =   include/$(LIBNET)/$(LIBNET)-asn1.h
+-INCLUDE-O   =   include/$(LIBNET)/$(LIBNET)-ospf.h
++INCLUDE-H   =   include/libnet/$(LIBNET)-headers.h
++INCLUDE-F   =   include/libnet/$(LIBNET)-functions.h
++INCLUDE-S   =   include/libnet/$(LIBNET)-structures.h
++INCLUDE-M   =   include/libnet/$(LIBNET)-macros.h
++INCLUDE-A   =   include/libnet/$(LIBNET)-asn1.h
++INCLUDE-O   =   include/libnet/$(LIBNET)-ospf.h
+ CONFIG      =   $(LIBNET)-config
+ DEFINES     +=  @DEFS@
+ RANLIB      =   @RANLIB@
+@@ -94,7 +94,7 @@
+ install: libnet
+ 	$(ENSUREDIR) $(DESTDIR)$(prefix) 755
+ 	$(ENSUREDIR) $(DESTDIR)$(LIB_PREFIX) 755
+-	$(ENSUREDIR) $(DESTDIR)$(INC_PREFIX)$(LIBNET) 755
++	$(ENSUREDIR) $(DESTDIR)$(INC_PREFIX)/libnet/ 755
+ 	$(ENSUREDIR) $(DESTDIR)$(INC_PREFIX) 755
+ 	$(ENSUREDIR) $(DESTDIR)$(MAN_PREFIX) 755
+ 	$(ENSUREDIR) $(DESTDIR)$(BIN_PREFIX) 755
+@@ -102,12 +102,12 @@
+ 	rm -f $(DESTDIR)$(LIB_PREFIX)$(LIBPWRITE).a
+ 	cd $(DESTDIR)$(LIB_PREFIX); $(LN) -f -s $(LIBNET).a $(LIBPWRITE).a
+ 	$(INSTALL_DATA) $(INCLUDE) $(DESTDIR)$(INC_PREFIX)
+-	$(INSTALL_DATA) $(INCLUDE-H) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
+-	$(INSTALL_DATA) $(INCLUDE-F) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
+-	$(INSTALL_DATA) $(INCLUDE-S) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
+-	$(INSTALL_DATA) $(INCLUDE-M) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
+-	$(INSTALL_DATA) $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
+-	$(INSTALL_DATA) $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
++	$(INSTALL_DATA) $(INCLUDE-H) $(DESTDIR)$(INC_PREFIX)/libnet/
++	$(INSTALL_DATA) $(INCLUDE-F) $(DESTDIR)$(INC_PREFIX)/libnet/
++	$(INSTALL_DATA) $(INCLUDE-S) $(DESTDIR)$(INC_PREFIX)/libnet/
++	$(INSTALL_DATA) $(INCLUDE-M) $(DESTDIR)$(INC_PREFIX)/libnet/
++	$(INSTALL_DATA) $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)/libnet/
++	$(INSTALL_DATA) $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)/libnet/
+ 	$(INSTALL_DATA) $(MAN) $(DESTDIR)$(MAN_PREFIX)
+ 	$(INSTALL_DATA) $(CONFIG) $(DESTDIR)$(BIN_PREFIX)
+ 
+@@ -142,6 +142,6 @@
+ 	    cd support/bpf-lkm/etherspoof && rm -rf Makefile; \
+ 	fi
+ 	rm -f config.log config.cache config.status Makefile include/config.h \
+-	version.h support/bpf-lkm/etherspoof conftest* libnet-config
++	version.h support/bpf-lkm/etherspoof conftest* libnet-1.0-config
+ 
+ # EOF
+diff -ur Libnet-1.0.2a.orig/configure.in Libnet-1.0.2a/configure.in
+--- Libnet-1.0.2a.orig/configure.in	2003-08-17 23:53:14.000000000 -0400
++++ Libnet-1.0.2a/configure.in	2003-08-17 23:54:35.000000000 -0400
+@@ -261,6 +261,6 @@
+ AC_OUTPUT(Makefile test/Makefile test/TCP/Makefile test/Ethernet/Makefile \
+     test/UDP/Makefile test/ICMP/Makefile test/Random/Makefile \
+     test/OSPF/Makefile util/Makefile util/Get-mac/Makefile example/Makefile \
+-    libnet-config, chmod +x libnet-config)
++    libnet-1.0-config, chmod +x libnet-1.0-config)
+ 
+ dnl EOF
+diff -ur Libnet-1.0.2a.orig/include/libnet.h Libnet-1.0.2a/include/libnet.h
+--- Libnet-1.0.2a.orig/include/libnet.h	2003-08-17 23:53:14.000000000 -0400
++++ Libnet-1.0.2a/include/libnet.h	2003-08-18 00:01:38.000000000 -0400
+@@ -74,12 +74,12 @@
+ #include <errno.h>
+ #include <assert.h>
+ 
+-#include "./libnet/libnet-headers.h"
+-#include "./libnet/libnet-structures.h"
+-#include "./libnet/libnet-macros.h"
+-#include "./libnet/libnet-asn1.h"
+-#include "./libnet/libnet-functions.h"
+-#include "./libnet/libnet-ospf.h"
++#include "./libnet/libnet-1.0-headers.h"
++#include "./libnet/libnet-1.0-structures.h"
++#include "./libnet/libnet-1.0-macros.h"
++#include "./libnet/libnet-1.0-asn1.h"
++#include "./libnet/libnet-1.0-functions.h"
++#include "./libnet/libnet-1.0-ospf.h"
+ 
+ #define LIBNET_VERSION  "1.0.2a"
+ 
+diff -ur Libnet-1.0.2a.orig/libnet-config.in Libnet-1.0.2a/libnet-config.in
+--- Libnet-1.0.2a.orig/libnet-config.in	2003-08-17 23:53:14.000000000 -0400
++++ Libnet-1.0.2a/libnet-config.in	2003-08-17 23:54:53.000000000 -0400
+@@ -9,12 +9,12 @@
+ 
+ libnet_defines="@LIBNET_CONFIG_DEFINES@"
+ libnet_cflags="@LIBNET_CONFIG_CFLAGS@"
+-libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet"
++libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet-1.0"
+ 
+ usage()
+ {
+         cat <<EOF
+-Usage: libnet-config [OPTIONS]
++Usage: libnet-1.0-config [OPTIONS]
+ Options:
+         [--libs]
+         [--cflags]
+Only in Libnet-1.0.2a/support/bpf-lkm/OpenBSD: OpenBSD
diff --git a/net-libs/libnet/files/digest-libnet-1.0.2a-r3 b/net-libs/libnet/files/digest-libnet-1.0.2a-r3
new file mode 100644
index 000000000000..b7debea8cbbc
--- /dev/null
+++ b/net-libs/libnet/files/digest-libnet-1.0.2a-r3
@@ -0,0 +1 @@
+MD5 ddf53f0f484184390e8c2a1bd0853667 libnet.tar.gz 140191
diff --git a/net-libs/libnet/files/digest-libnet-1.1.0-r3 b/net-libs/libnet/files/digest-libnet-1.1.0-r3
new file mode 100644
index 000000000000..bdfe61b76eae
--- /dev/null
+++ b/net-libs/libnet/files/digest-libnet-1.1.0-r3
@@ -0,0 +1 @@
+MD5 b46e650d9d0e7ad5ef9439c7cd281922 libnet-1.1.0.tar.gz 210621
diff --git a/net-libs/libnet/libnet-1.0.2a-r3.ebuild b/net-libs/libnet/libnet-1.0.2a-r3.ebuild
new file mode 100644
index 000000000000..13378d277540
--- /dev/null
+++ b/net-libs/libnet/libnet-1.0.2a-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/libnet-1.0.2a-r3.ebuild,v 1.1 2003/08/21 04:17:16 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="library to provide an API for commonly used low-level network functions (mainly packet injection)"
+HOMEPAGE="http://www.packetfactory.net/libnet/"
+SRC_URI="http://www.packetfactory.net/libnet/dist/${PN}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="1.0"
+KEYWORDS="x86 ppc sparc arm alpha amd64"
+
+S=${WORKDIR}/Libnet-${PV}
+
+src_unpack() {
+ 	unpack ${A}
+	epatch ${FILESDIR}/libnet-gcc33-fix
+	epatch ${FILESDIR}/${PV}-slot.patch
+	cd ${S}
+	mv libnet-config.in libnet-${SLOT}-config.in || die "moving libnet-config"
+	cd ${S}/include
+	ln -s libnet.h libnet-${SLOT}.h
+	cd libnet
+	for f in *.h ; do
+		ln -s ${f} ${f/-/-${SLOT}-} || die "linking ${f}"
+	done
+	cd ${S}/doc
+	ln -s libnet.3 libnet-${SLOT}.3 || die "linking manpage"
+	cd ${S}
+	autoconf || die
+}
+
+src_compile() {
+	econf || die
+	emake CFLAGS="${CFLAGS}" || die "Failed to compile"
+}
+
+src_install() {
+	make install DESTDIR=${D} || die
+
+	dodoc VERSION doc/{README,TODO*,CHANGELOG*,COPYING}
+	newdoc README README.1st
+	docinto example ; dodoc example/libnet*
+	docinto Ancillary ; dodoc doc/Ancillary/*
+}
+
+pkg_postinst(){
+	einfo "libnet ${SLOT} is deprecated !"
+	einfo "config script: libnet-${SLOT}-config"
+	einfo "manpage: libnet-${SLOT}"
+	einfo "library: libnet-${SLOT}.a"
+	einfo "include: libnet-${SLOT}.h"
+}
diff --git a/net-libs/libnet/libnet-1.1.0-r3.ebuild b/net-libs/libnet/libnet-1.1.0-r3.ebuild
new file mode 100644
index 000000000000..c23192c4c565
--- /dev/null
+++ b/net-libs/libnet/libnet-1.1.0-r3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/libnet-1.1.0-r3.ebuild,v 1.1 2003/08/21 04:17:16 vapier Exp $
+
+DESCRIPTION="library to provide an API for commonly used low-level network functions (mainly packet injection)"
+HOMEPAGE="http://www.packetfactory.net/libnet/"
+SRC_URI="http://www.packetfactory.net/libnet/dist/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="1.1"
+KEYWORDS="x86 alpha"
+
+S=${WORKDIR}/Libnet-latest
+
+src_compile(){
+	econf || die
+	emake || die "Failed to compile"
+}
+
+src_install(){
+	make DESTDIR=${D} install || die "Failed to install"
+	dobin libnet-config
+
+	dodoc VERSION README doc/*
+	docinto Ancillary ; dodoc doc/Ancillary/README*
+	docinto sample ; dodoc sample/*.[ch]
+}