Version bump for bug 81689; also fixed src_install (setting install_prefix to ${D} caused part of ${D} to be installed).

(Portage version: 2.0.51.16)

6 files changed, 75 insertions, 23 deletions

diff --git a/net-libs/libnids/ChangeLog b/net-libs/libnids/ChangeLog
index 53c100f6b51e..1a5544e84dd9 100644
--- a/net-libs/libnids/ChangeLog
+++ b/net-libs/libnids/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/libnids
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/ChangeLog,v 1.14 2005/01/29 21:19:57 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/ChangeLog,v 1.15 2005/02/25 00:43:39 ka0ttic Exp $
+
+*libnids-1.20 (24 Feb 2005)
+
+  24 Feb 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/libnids-1.20-chksum.c-ebx.patch, libnids-1.18.ebuild,
+  +libnids-1.20.ebuild:
+  Version bump for bug 81689; also fixed src_install (setting install_prefix
+  to ${D} caused part of ${D} to be installed).
 
   30 Jan 2005; Daniel Black <dragonheart@gentoo.org> libnids-1.18.ebuild:
   Transition dependancy from net-libs/libpcap to virtual/libpcap
diff --git a/net-libs/libnids/Manifest b/net-libs/libnids/Manifest
index fcf3310d7c14..38e28e8fb65a 100644
--- a/net-libs/libnids/Manifest
+++ b/net-libs/libnids/Manifest
@@ -1,15 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 29a55f34472da99e9eee320d0b50e431 ChangeLog 2287
+MD5 84f6e9255b36f3b6db0af5a6994d2976 libnids-1.20.ebuild 868
+MD5 59498b1d323a5fd7128567de10341517 libnids-1.18.ebuild 908
+MD5 0b7f9230aae771ee5934c0d23d145e61 ChangeLog 2578
 MD5 c9a3c259574bc6c3d7583402ad67e763 metadata.xml 311
-MD5 56872b47c16ba5065fc9b99e3b7c56bf libnids-1.18.ebuild 991
-MD5 4f1acaf2ec159ddfba1e456f21c99112 files/libnids-1.18-chksum.c-ebx.patch 615
+MD5 9562afeb0aef6794b0b94779fab9c381 files/libnids-1.20-chksum.c-ebx.patch 718
 MD5 b8821b8ac4cbf9a8d5c0ce7eadc5f710 files/digest-libnids-1.18 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB+/4DmdTrptrqvGERAtOlAJ4k7stxnz+G6KQ/kdkjHSaQD/O0xQCdFkzt
-8JgaXS8CtuS1FHe+Q71ZP78=
-=5hDl
------END PGP SIGNATURE-----
+MD5 8c22ab811547cb71906e15bee2d4160e files/digest-libnids-1.20 64
+MD5 4f1acaf2ec159ddfba1e456f21c99112 files/libnids-1.18-chksum.c-ebx.patch 615
diff --git a/net-libs/libnids/files/digest-libnids-1.20 b/net-libs/libnids/files/digest-libnids-1.20
new file mode 100644
index 000000000000..d1ca0db1717e
--- /dev/null
+++ b/net-libs/libnids/files/digest-libnids-1.20
@@ -0,0 +1 @@
+MD5 a36cbd45cbada12420ecc8f82a7e0852 libnids-1.20.tar.gz 119226
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
new file mode 100644
index 000000000000..fc32358fc18f
--- /dev/null
+++ b/net-libs/libnids/files/libnids-1.20-chksum.c-ebx.patch
@@ -0,0 +1,20 @@
+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/libnids-1.18.ebuild b/net-libs/libnids/libnids-1.18.ebuild
index 224c39a70089..698fc42b7f4c 100644
--- a/net-libs/libnids/libnids-1.18.ebuild
+++ b/net-libs/libnids/libnids-1.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.6 2005/01/29 21:19:57 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.18.ebuild,v 1.7 2005/02/25 00:43:39 ka0ttic Exp $
 
 inherit eutils
 
@@ -19,18 +19,15 @@ DEPEND="virtual/libpcap
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/libnids-1.18-chksum.c-ebx.patch
+	epatch ${FILESDIR}/${P}-chksum.c-ebx.patch
 }
 
 src_compile() {
-	econf --enable-shared || die
-	make || die
+	econf --enable-shared || die "econf failed"
+	make || die "emake failed"
 }
 
 src_install() {
-	einstall install_prefix=${D} || die
-	mkdir -p ${D}/usr/include/ ${D}/usr/share/man/man3/
-	cp -dpR ${D}/${D}/* ${D}/
-	rm -rf ${D}/${D} ${D}/var
+	einstall || die "make install failed"
 	dodoc CHANGES COPYING CREDITS MISC README
 }
diff --git a/net-libs/libnids/libnids-1.20.ebuild b/net-libs/libnids/libnids-1.20.ebuild
new file mode 100644
index 000000000000..6cedec1f699f
--- /dev/null
+++ b/net-libs/libnids/libnids-1.20.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.20.ebuild,v 1.1 2005/02/25 00:43:39 ka0ttic 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://libnids.sourceforget.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="1.2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+IUSE=""
+
+DEPEND="virtual/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() {
+	einstall || die "make install failed"
+	dodoc CHANGES COPYING CREDITS MISC README
+}