Clean up patches. Remove old.

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

6 files changed, 12 insertions, 75 deletions

diff --git a/net-libs/libnids/ChangeLog b/net-libs/libnids/ChangeLog
index 695f9af8620d..c77b35f5e543 100644
--- a/net-libs/libnids/ChangeLog
+++ b/net-libs/libnids/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libnids
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/ChangeLog,v 1.51 2012/03/10 16:34:03 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/ChangeLog,v 1.52 2012/03/11 18:25:54 jer Exp $
+
+  11 Mar 2012; Jeroen Roovers <jer@gentoo.org> -libnids-1.18.ebuild,
+  files/libnids-1.18-chksum.c-ebx.patch, files/libnids-1.18-elif.patch,
+  -libnids-1.24.ebuild, files/libnids-1.24-ldflags.patch:
+  Clean up patches. Remove old.
 
   10 Mar 2012; Brent Baude <ranger@gentoo.org> libnids-1.24-r1.ebuild:
   Marking libnids-1.24-r1 ppc for bug 397159
diff --git a/net-libs/libnids/files/libnids-1.18-chksum.c-ebx.patch b/net-libs/libnids/files/libnids-1.18-chksum.c-ebx.patch
index 5c7dc3fb1079..b3e9e2cf4a92 100644
--- a/net-libs/libnids/files/libnids-1.18-chksum.c-ebx.patch
+++ b/net-libs/libnids/files/libnids-1.18-chksum.c-ebx.patch
@@ -1,5 +1,5 @@
---- src/checksum.c.orig	2003-09-20 22:40:44.000000000 +0200
-+++ src/checksum.c	2004-11-02 20:36:59.290981656 +0100
+--- a/src/checksum.c
++++ b/src/checksum.c
 @@ -29,6 +29,7 @@
  	movl 16(%esp),%ecx	# Function arg: int len
          movl 12(%esp),%esi	# Function arg: u_char *buff*/
diff --git a/net-libs/libnids/files/libnids-1.18-elif.patch b/net-libs/libnids/files/libnids-1.18-elif.patch
index 106ffdc14c8a..cb7dfe8ee02b 100644
--- a/net-libs/libnids/files/libnids-1.18-elif.patch
+++ b/net-libs/libnids/files/libnids-1.18-elif.patch
@@ -1,5 +1,5 @@
---- a/src/killtcp.c	2002-08-21 18:19:40.000000000 +0200
-+++ b/src/killtcp.c	2012-01-07 19:15:45.451020838 +0100
+--- a/src/killtcp.c
++++ b/src/killtcp.c
 @@ -100,6 +100,6 @@
      if (initialized)
  	abort();
diff --git a/net-libs/libnids/files/libnids-1.24-ldflags.patch b/net-libs/libnids/files/libnids-1.24-ldflags.patch
index 3ce84c7bf5c8..0f3daca463b6 100644
--- a/net-libs/libnids/files/libnids-1.24-ldflags.patch
+++ b/net-libs/libnids/files/libnids-1.24-ldflags.patch
@@ -1,5 +1,5 @@
---- src/Makefile.in.org	2010-03-01 22:13:17.000000000 +0100
-+++ src/Makefile.in	2010-04-01 22:59:21.000000000 +0200
+--- a/src/Makefile.in
++++ b/src/Makefile.in
 @@ -65,7 +65,7 @@
  	ar -cr $@ $(OBJS)
  	$(RANLIB) $@
diff --git a/net-libs/libnids/libnids-1.18.ebuild b/net-libs/libnids/libnids-1.18.ebuild
deleted file mode 100644
index 5b20be7f620f..000000000000
--- a/net-libs/libnids/libnids-1.18.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.18.ebuild,v 1.17 2012/02/05 18:36:58 armin76 Exp $
-
-inherit eutils
-
-DESCRIPTION="emulates the IP stack of Linux 2.0.x and offers IP defragmentation, TCP stream assembly and TCP port scan detection."
-HOMEPAGE="http://www.packetfactory.net/Projects/libnids/"
-SRC_URI="http://www.packetfactory.net/Projects/libnids/dist/${P/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1.1"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="net-libs/libpcap
-	>=net-libs/libnet-1.1.0-r3"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-chksum.c-ebx.patch
-}
-
-src_compile() {
-	econf --enable-shared || die "econf failed"
-	make || die "emake failed"
-}
-
-src_install() {
-	make install_prefix="${D}" install || die "make install failed"
-	dodoc CHANGES CREDITS MISC README
-}
diff --git a/net-libs/libnids/libnids-1.24.ebuild b/net-libs/libnids/libnids-1.24.ebuild
deleted file mode 100644
index a160f5012842..000000000000
--- a/net-libs/libnids/libnids-1.24.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.24.ebuild,v 1.9 2012/02/05 18:36:58 armin76 Exp $
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="emulates the IP stack of Linux 2.0.x and offers IP defragmentation, TCP stream assembly and TCP port scan detection."
-HOMEPAGE="http://libnids.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1.2"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="net-libs/libpcap
-	dev-libs/glib
-	>=net-libs/libnet-1.1.0-r3"
-RDEPEND="${DEPEND}
-	!net-libs/libnids:1.1"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-ldflags.patch"
-}
-
-src_configure() {
-	econf --enable-shared || die "econf failed"
-}
-
-src_install() {
-	emake install_prefix="${D}" install || die "emake install failed"
-	dodoc CHANGES CREDITS MISC README
-	dodoc doc/*
-}