Fix quoting. Do not install COPYING.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

6 files changed, 13 insertions, 77 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/Manifest b/net-libs/libnids/Manifest
index e64b3230be2b..d63770650957 100644
--- a/net-libs/libnids/Manifest
+++ b/net-libs/libnids/Manifest
@@ -1,12 +1,8 @@
 AUX libnids-1.18-chksum.c-ebx.patch 615 RMD160 53ba9fe99c2175ff64277f485887d68a4695d1c2 SHA1 5dbf69478187792dc824366cf29ae74846c95a78 SHA256 7d092dfa010001e5935c1f1104a34cec061f813664501566a504b942d2232c78
-AUX libnids-1.20-chksum.c-ebx.patch 718 RMD160 1b56bb762262de9162f335a9a7db94affa0c5fbe SHA1 4ab5207a3db17d757f3adfb27d5e1ee71ef14f1a SHA256 2c7dad4f142a007d55ac40cf04cf3fe724a346f435ddbbbb21300c9f950756c6
-AUX libnids-1.23-elif.patch 257 RMD160 2fdf726d721f343b224a5f35309653bb7837520e SHA1 4ea5d041b5a77b30f988cddab18a6ec6a0da02d9 SHA256 a33a50486dc6e838afd40d307e405bdb43fe91251be4e097169c99b6afd13af5
 AUX libnids-1.24-ldflags.patch 494 RMD160 d838d04e2ab8021eabfc7560315e71a48cec13e5 SHA1 ecdeec72628a325c9c838751e0d33f4ef312182b SHA256 e1d61d854398cd23570fb81cba078449d6c74a61644a3451b3f9c19d37c68ef9
 DIST libnids-1.18.tar.gz 114013 RMD160 b33ba8237ba0bb31d2515bd5b7552449cfcca8f3 SHA1 3494e614e5e5d2f60f2ffe738307e60e77e04a81 SHA256 b0275c914197a53c6ccf631eac756fd37ec6f2d8f09f15757061495cf9be0fcd
-DIST libnids-1.23.tar.gz 140975 RMD160 38994ad04f688291315bfcde38d8795e7a4c4226 SHA1 105bff0d0d35ab95ec90cce98cfb409f64ed44b4 SHA256 755cd72483c2cdccbc6634c00de9e2d8666419fd80da36a2bdb3f81657130643
 DIST libnids-1.24.tar.gz 151021 RMD160 66a1a332a70b316fd83905887dc731b5bf28d715 SHA1 9a421df05cefdc4f5f7db95efc001b3c2b5249ce SHA256 314b4793e0902fbf1fdb7fb659af37a3c1306ed1aad5d1c84de6c931b351d359
-EBUILD libnids-1.18.ebuild 935 RMD160 52ee730875e61ef35b10b0b44d585e4244a6681f SHA1 3b432eff0b8cbb1bebefa57ac6074849ac71ba12 SHA256 7d0f5d7f69941cbc7f24d72f2e3202ea6f6f9d7bba52c852ebef78f0c265b059
-EBUILD libnids-1.23-r1.ebuild 953 RMD160 1e0c8c2ac9ba71a22b3f1ccbc28613e8b374cf78 SHA1 b174600e6e5c170e05c3351222d312a4987edc0c SHA256 da80ad42d147c8a45357cb403b2b5dfdc457f64ef383b14dcb36978f33b20fb2
+EBUILD libnids-1.18.ebuild 927 RMD160 b5ce9c01990961226aaa827916728d9763bbafa6 SHA1 4cf5bb2c0d102bad2a01e1d617113bc0ff1a181a SHA256 8cb9190cd05d7412f4b1f3bf198ce365fbcea8589866855249a8431493473c10
 EBUILD libnids-1.24.ebuild 900 RMD160 2420fc1010e9504923a4792743fd74c742394989 SHA1 78b23a1246afef970dd8db7cfb21009a6c37ee0b SHA256 657bccdaa2a5c21a438d9f1490b435cb18ec58c6999fa46a7b302908e295af6c
-MISC ChangeLog 5664 RMD160 9eaf3731815a53a48c1108cb1f485bf1ac8648fa SHA1 b70198a8bbec7deb6b493f95dfcee4bf61f3c706 SHA256 4d03b2c9f75e8256472001eaa0a713b8a2323f5177d7cae38431d4d91dd93bc2
+MISC ChangeLog 5869 RMD160 d1563ab50e7b8c320b754ab00761416650e8619f SHA1 4705b9240e79311ad3c6b0bc7761c101871d02b9 SHA256 bb83093ab1f4fed4e82997c55a156b5e6fefcdd3e96cb5768a0f3c30fc66d14f
 MISC metadata.xml 311 RMD160 ae9b46487554338fb7a8aa378cc4cd4abb4221dc SHA1 b84c84c470b3951b91ec4eafaa86fd6d7021a715 SHA256 4c7b843b6b1f2f54738ce21e5ade6da1da64af15a2f9f82f5fd810f744c36b32
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/*
-}