Fix quoting. Do not install COPYING.

(Portage version: 2.2_rc67/cvs/Linux i686)

5 files changed, 11 insertions, 71 deletions

diff --git a/net-libs/libnids/ChangeLog b/net-libs/libnids/ChangeLog
index 65c3666c211c..4f4e621de1c1 100644
--- a/net-libs/libnids/ChangeLog
+++ b/net-libs/libnids/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libnids
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/ChangeLog,v 1.39 2010/05/04 18:53:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/ChangeLog,v 1.40 2010/06/28 04:09:08 jer Exp $
+
+  28 Jun 2010; Jeroen Roovers <jer@gentoo.org> libnids-1.18.ebuild,
+  -files/libnids-1.20-chksum.c-ebx.patch, -libnids-1.23-r1.ebuild,
+  -files/libnids-1.23-elif.patch:
+  Fix quoting. Do not install COPYING.
 
   04 May 2010; Raúl Porcel <armin76@gentoo.org> libnids-1.24.ebuild:
   alpha/sparc stable wrt #312637
diff --git a/net-libs/libnids/files/libnids-1.20-chksum.c-ebx.patch b/net-libs/libnids/files/libnids-1.20-chksum.c-ebx.patch
deleted file mode 100644
index fc32358fc18f..000000000000
--- a/net-libs/libnids/files/libnids-1.20-chksum.c-ebx.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --exclude='*~' -urN libnids-1.20.orig/src/checksum.c libnids-1.20/src/checksum.c
---- libnids-1.20.orig/src/checksum.c	2005-02-23 21:18:28.227101168 -0500
-+++ libnids-1.20/src/checksum.c	2005-02-23 21:21:56.665413728 -0500
-@@ -50,6 +50,7 @@
- 	movl 16(%esp),%ecx	# Function arg: int len
-         movl 12(%esp),%esi	# Function arg: u_char *buff*/
- 
-+"	push %%ebx						\n"
- "	testl $2, %%esi						\n"		
- "	jz 2f							\n"			
- "	subl $2, %%ecx						\n"		
-@@ -105,7 +106,7 @@
- "5:	movb (%%esi),%%cl					\n"
- "6:	addl %%ecx,%%eax					\n"
- "	adcl $0, %%eax						\n"
--"7: 								\n"
-+"7: 	pop %%ebx						\n"
-        : "=a"(sum), "=c"(len), "=S"(buff)
-        : "0"(sum), "1"(len), "2"(buff)
-        : "di", "dx" , "cc");
diff --git a/net-libs/libnids/files/libnids-1.23-elif.patch b/net-libs/libnids/files/libnids-1.23-elif.patch
deleted file mode 100644
index 30408dca0f27..000000000000
--- a/net-libs/libnids/files/libnids-1.23-elif.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libnids-1.23/src/killtcp.c.orig	2006-05-08 22:05:51.000000000 +0200
-+++ libnids-1.23/src/killtcp.c	2009-07-02 17:42:29.000000000 +0200
-@@ -118,6 +118,6 @@
-     if (initialized)
- 	abort();
- }
--#elif
-+#else
- #error Something wrong with LIBNET_VER
- #endif
diff --git a/net-libs/libnids/libnids-1.18.ebuild b/net-libs/libnids/libnids-1.18.ebuild
index e0a494d1cf61..de13b56f6bbb 100644
--- a/net-libs/libnids/libnids-1.18.ebuild
+++ b/net-libs/libnids/libnids-1.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.14 2009/05/29 17:06:54 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.18.ebuild,v 1.15 2010/06/28 04:09:08 jer Exp $
 
 inherit eutils
 
@@ -18,8 +18,8 @@ DEPEND="net-libs/libpcap
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-chksum.c-ebx.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-chksum.c-ebx.patch
 }
 
 src_compile() {
@@ -29,5 +29,5 @@ src_compile() {
 
 src_install() {
 	make install_prefix="${D}" install || die "make install failed"
-	dodoc CHANGES COPYING CREDITS MISC README
+	dodoc CHANGES CREDITS MISC README
 }
diff --git a/net-libs/libnids/libnids-1.23-r1.ebuild b/net-libs/libnids/libnids-1.23-r1.ebuild
deleted file mode 100644
index 89ee76c4dfa6..000000000000
--- a/net-libs/libnids/libnids-1.23-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.23-r1.ebuild,v 1.2 2009/07/02 15:49:21 jer 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="LGPL-2.1"
-SLOT="1.2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="net-libs/libpcap
-	>=net-libs/libnet-1.1.0-r3"
-RDEPEND="${DEPEND}
-	!net-libs/libnids:1.1"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.20-chksum.c-ebx.patch"
-	epatch "${FILESDIR}/${P}-elif.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/*
-}