new version; remove older ones

6 files changed, 36 insertions, 70 deletions

diff --git a/sys-apps/iptables/files/digest-iptables-1.2.3 b/sys-apps/iptables/files/digest-iptables-1.2.3
deleted file mode 100644
index 858219d17eb5..000000000000
--- a/sys-apps/iptables/files/digest-iptables-1.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 68c55130d68a03c451de0ac900c67448 iptables-1.2.3.tar.bz2 212992
diff --git a/sys-apps/iptables/files/digest-iptables-1.2.4 b/sys-apps/iptables/files/digest-iptables-1.2.4
deleted file mode 100644
index a0eea7a3a1ba..000000000000
--- a/sys-apps/iptables/files/digest-iptables-1.2.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e78e5780bc61b9c3016b0ac312c7777f iptables-1.2.4.tar.bz2 225280
diff --git a/sys-apps/iptables/files/digest-iptables-1.2.5 b/sys-apps/iptables/files/digest-iptables-1.2.5
new file mode 100644
index 000000000000..0b1b6ddd8eb3
--- /dev/null
+++ b/sys-apps/iptables/files/digest-iptables-1.2.5
@@ -0,0 +1 @@
+MD5 3446aec70217df6cc5be7c155817f54e iptables-1.2.5.tar.bz2 245760
diff --git a/sys-apps/iptables/iptables-1.2.3.ebuild b/sys-apps/iptables/iptables-1.2.3.ebuild
deleted file mode 100644
index 5f4eee8ad0f4..000000000000
--- a/sys-apps/iptables/iptables-1.2.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: System Team <system@gentoo.org>
-# Author: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iptables/iptables-1.2.3.ebuild,v 1.2 2001/10/06 17:13:29 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Kernel 2.4 routing and traffic control utilities"
-SRC_URI="http://netfilter.samba.org/${P}.tar.bz2"
-
-DEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	mv Makefile Makefile.orig
-	sed -e "s/-O2/${CFLAGS}/g" -e "s:/usr/local:/usr:g" Makefile.orig > Makefile
-}
-
-src_compile() {
-	#I had a problem with emake - DR
-	make || die
-}
-
-src_install() {
-	dodir /usr/lib /usr/share/man/man8 /usr/sbin
-	make LIBDIR=${D}/usr/lib BINDIR=${D}/usr/sbin MANDIR=${D}/usr/share/man install || die
-	dodoc COPYING KNOWN_BUGS
-}
diff --git a/sys-apps/iptables/iptables-1.2.4.ebuild b/sys-apps/iptables/iptables-1.2.4.ebuild
deleted file mode 100644
index da8b21262d0c..000000000000
--- a/sys-apps/iptables/iptables-1.2.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: System Team <system@gentoo.org>
-# Author: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iptables/iptables-1.2.4.ebuild,v 1.1 2001/11/04 09:04:02 azarah Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Kernel 2.4 routing and traffic control utilities"
-SRC_URI="http://netfilter.samba.org/${P}.tar.bz2"
-
-DEPEND="virtual/glibc"
-
-
-src_unpack() {
-
-	unpack ${A}
-	
-	cd ${S}
-	mv Makefile Makefile.orig
-	sed -e "s/-O2/${CFLAGS}/g" -e "s:/usr/local:/usr:g" Makefile.orig > Makefile
-}
-
-src_compile() {
-
-	#I had a problem with emake - DR
-	make || die
-}
-
-src_install() {
-
-	dodir /usr/{lib,share/man/man8,sbin}
-	
-	make LIBDIR=${D}/usr/lib 			\
-		BINDIR=${D}/usr/sbin			\
-		MANDIR=${D}/usr/share/man		\
-		install || die
-		
-	dodoc COPYING KNOWN_BUGS
-}
diff --git a/sys-apps/iptables/iptables-1.2.5.ebuild b/sys-apps/iptables/iptables-1.2.5.ebuild
new file mode 100644
index 000000000000..253643b11bed
--- /dev/null
+++ b/sys-apps/iptables/iptables-1.2.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Maintainer: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iptables/iptables-1.2.5.ebuild,v 1.1 2002/01/25 21:14:34 azarah Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Kernel 2.4 routing and traffic control utilities"
+SRC_URI="http://netfilter.samba.org/files/${P}.tar.bz2"
+
+DEPEND="virtual/glibc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	mv Makefile Makefile.orig
+	sed -e "s/-O2/${CFLAGS}/g" -e "s:/usr/local::g" Makefile.orig > Makefile
+}
+
+src_compile() {
+	#I had a problem with emake - DR
+	make || die
+}
+
+src_install() {
+	dodir /usr/{lib,share/man/man8,sbin}
+	# iptables and libraries are now installed to /sbin and /lib.  Why?  So systems
+	# with remote network-mounted /usr filesystems can get their network interfaces
+	# up and running correctly without /usr.
+	make LIBDIR=${D}/lib \
+		BINDIR=${D}/sbin \
+		MANDIR=${D}/usr/share/man \
+		INCDIR=${D}/usr/include \
+		install || die
+	dodoc COPYING KNOWN_BUGS
+}