Fix bug #397881, thanks to Agostino Sarubbo. Shorten DESCRIPTION to something more fitting. Set RDEPEND.

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

4 files changed, 25 insertions, 8 deletions

diff --git a/net-libs/libnids/ChangeLog b/net-libs/libnids/ChangeLog
index 0850b2dfedd9..af95110e6ef7 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.43 2010/09/06 17:42:40 jer Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/ChangeLog,v 1.44 2012/01/07 18:27:28 jer Exp $
+
+  07 Jan 2012; Jeroen Roovers <jer@gentoo.org> libnids-1.18-r1.ebuild,
+  +files/libnids-1.18-elif.patch, libnids-1.24-r1.ebuild:
+  Fix bug #397881, thanks to Agostino Sarubbo. Shorten DESCRIPTION to something
+  more fitting. Set RDEPEND.
 
   06 Sep 2010; Jeroen Roovers <jer@gentoo.org> libnids-1.18.ebuild,
   libnids-1.18-r1.ebuild, libnids-1.24.ebuild, libnids-1.24-r1.ebuild:
diff --git a/net-libs/libnids/files/libnids-1.18-elif.patch b/net-libs/libnids/files/libnids-1.18-elif.patch
new file mode 100644
index 000000000000..cabb883569e3
--- /dev/null
+++ b/net-libs/libnids/files/libnids-1.18-elif.patch
@@ -0,0 +1,10 @@
+--- src/killtcp.c.org	2002-08-21 18:19:40.000000000 +0200
++++ src/killtcp.c	2012-01-07 19:15:45.451020838 +0100
+@@ -100,6 +100,6 @@
+     if (initialized)
+ 	abort();
+ }
+-#elif
++#else
+ #error Something wrong with LIBNET_VER
+ #endif
diff --git a/net-libs/libnids/libnids-1.18-r1.ebuild b/net-libs/libnids/libnids-1.18-r1.ebuild
index 6cca1126b56c..29d23aa08189 100644
--- a/net-libs/libnids/libnids-1.18-r1.ebuild
+++ b/net-libs/libnids/libnids-1.18-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-r1.ebuild,v 1.2 2010/09/06 17:42:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.18-r1.ebuild,v 1.3 2012/01/07 18:27:28 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."
+DESCRIPTION="an implementation of an E-component of Network Intrusion Detection System"
 HOMEPAGE="http://www.packetfactory.net/Projects/libnids/"
 SRC_URI="http://www.packetfactory.net/Projects/libnids/dist/${P/_}.tar.gz"
 
@@ -17,10 +17,12 @@ IUSE=""
 
 DEPEND="net-libs/libpcap
 	>=net-libs/libnet-1.1.0-r3"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-chksum.c-ebx.patch \
+		"${FILESDIR}"/${P}-elif.patch \
 		"${FILESDIR}"/${PN}-1.24-ldflags.patch
 }
 
diff --git a/net-libs/libnids/libnids-1.24-r1.ebuild b/net-libs/libnids/libnids-1.24-r1.ebuild
index 47b7832451fe..5df738bf48c6 100644
--- a/net-libs/libnids/libnids-1.24-r1.ebuild
+++ b/net-libs/libnids/libnids-1.24-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-r1.ebuild,v 1.2 2010/09/06 17:42:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.24-r1.ebuild,v 1.3 2012/01/07 18:27:28 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."
+DESCRIPTION="an implementation of an E-component of Network Intrusion Detection System"
 HOMEPAGE="http://libnids.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"