Make dev-libs/glib and net-libs/libnet optional thanks to Rafał Mużyło (bug #325005).

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

4 files changed, 54 insertions, 3 deletions

diff --git a/net-libs/libnids/ChangeLog b/net-libs/libnids/ChangeLog
index b3f50f49e9b6..8f2f25129936 100644
--- a/net-libs/libnids/ChangeLog
+++ b/net-libs/libnids/ChangeLog
@@ -1,6 +1,13 @@
 # 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.41 2010/06/28 04:18:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/ChangeLog,v 1.42 2010/06/28 05:52:12 jer Exp $
+
+*libnids-1.24-r1 (28 Jun 2010)
+
+  28 Jun 2010; Jeroen Roovers <jer@gentoo.org> +libnids-1.24-r1.ebuild,
+  metadata.xml:
+  Make dev-libs/glib and net-libs/libnet optional thanks to Rafał Mużyło
+  (bug #325005).
 
 *libnids-1.18-r1 (28 Jun 2010)
 
diff --git a/net-libs/libnids/Manifest b/net-libs/libnids/Manifest
index 757f317a6a78..2172652a99ad 100644
--- a/net-libs/libnids/Manifest
+++ b/net-libs/libnids/Manifest
@@ -4,6 +4,7 @@ DIST libnids-1.18.tar.gz 114013 RMD160 b33ba8237ba0bb31d2515bd5b7552449cfcca8f3
 DIST libnids-1.24.tar.gz 151021 RMD160 66a1a332a70b316fd83905887dc731b5bf28d715 SHA1 9a421df05cefdc4f5f7db95efc001b3c2b5249ce SHA256 314b4793e0902fbf1fdb7fb659af37a3c1306ed1aad5d1c84de6c931b351d359
 EBUILD libnids-1.18-r1.ebuild 944 RMD160 1eb2f369ec82bbe6ad07e95a43892f46235062dc SHA1 2f9288c19791c15e2fd435a9a2f4f177341f9084 SHA256 7ea782a946cca9989583ad39106d1b8b9f6e64c3002798798bfab8614e112ea1
 EBUILD libnids-1.18.ebuild 927 RMD160 b5ce9c01990961226aaa827916728d9763bbafa6 SHA1 4cf5bb2c0d102bad2a01e1d617113bc0ff1a181a SHA256 8cb9190cd05d7412f4b1f3bf198ce365fbcea8589866855249a8431493473c10
+EBUILD libnids-1.24-r1.ebuild 1084 RMD160 05f61146c1fb4b194d677d4ff4a1f0d811ae6a71 SHA1 d214eb1951480836e31fb84dac780225e3882fa8 SHA256 40d36e64145c0a9cf2a8d7a1db3f96d2cf44651aed8883638deb0e73ce5b9139
 EBUILD libnids-1.24.ebuild 911 RMD160 fc7afecc590d6319b998b54783269310a03e1213 SHA1 7c0c19da78f81140e33465a6a60a8befb707b734 SHA256 e4f5609aee2286a12f6bad4654cfa749cd15b3018079c2fdfe53e2052407935a
-MISC ChangeLog 6108 RMD160 1eba8752189d421addb3e37143a34af28610e3a2 SHA1 74ded927b8454f82ac89e8a55f9a9b211a482377 SHA256 cf8e2821902b96175201b19674225e0f7166eb8362a4a12fea87c336c0650feb
-MISC metadata.xml 311 RMD160 ae9b46487554338fb7a8aa378cc4cd4abb4221dc SHA1 b84c84c470b3951b91ec4eafaa86fd6d7021a715 SHA256 4c7b843b6b1f2f54738ce21e5ade6da1da64af15a2f9f82f5fd810f744c36b32
+MISC ChangeLog 6322 RMD160 e5782c4485aa5ab14de5fc3a4e2b8157a692a189 SHA1 b03b9b9bd5a928638e23a43acb465f311a195d7e SHA256 e0d4071426f0a7dd021bb0aacd7bd75cdd8b14869ffcdd719fec86e36fbe812c
+MISC metadata.xml 483 RMD160 2735c54f423a6bdd2d47536a7d22eec3b2717e2f SHA1 3012df70c36825300e4e78c707ccd4414b53db7d SHA256 fea8cd5f14b2ecdcb26227be10d73862452542ea2ac9e41738c8dd1a1a093015
diff --git a/net-libs/libnids/libnids-1.24-r1.ebuild b/net-libs/libnids/libnids-1.24-r1.ebuild
new file mode 100644
index 000000000000..00a47bd81371
--- /dev/null
+++ b/net-libs/libnids/libnids-1.24-r1.ebuild
@@ -0,0 +1,39 @@
+# 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.24-r1.ebuild,v 1.1 2010/06/28 05:52:12 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="+glib +libnet"
+
+DEPEND="net-libs/libpcap
+	glib? ( dev-libs/glib )
+	libnet? ( >=net-libs/libnet-1.1.0-r3 )"
+RDEPEND="${DEPEND}
+	!net-libs/libnids:1.1"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-ldflags.patch"
+}
+
+src_configure() {
+	local myconf="--enable-shared"
+	use glib || myconf="${myconf} --disable-libglib"
+	use libnet || myconf="${myconf} --disable-libnet"
+	econf ${myconf} || die "econf failed"
+}
+
+src_install() {
+	emake install_prefix="${D}" install || die "emake install failed"
+	dodoc CHANGES CREDITS MISC README
+	dodoc doc/*
+}
diff --git a/net-libs/libnids/metadata.xml b/net-libs/libnids/metadata.xml
index ce33fa86db57..d1407310966f 100644
--- a/net-libs/libnids/metadata.xml
+++ b/net-libs/libnids/metadata.xml
@@ -3,4 +3,8 @@
 <pkgmetadata>
 <herd>netmon</herd>
 <longdescription>emulates the IP stack of Linux 2.0.x and offers IP defragmentation, TCP stream assembly and TCP port scan detection.</longdescription>
+<use>
+<flag name="glib">Use <pkg>dev-libs/glib</pkg> for multiprocessing support</flag>
+<flag name="libnet">Include code requiring <pkg>net-libs/libnet</pkg></flag>
+</use>
 </pkgmetadata>