Old.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 7 insertions, 48 deletions

diff --git a/net-libs/libnids/ChangeLog b/net-libs/libnids/ChangeLog
index 79e9e4b45d51..2f90b61cf50c 100644
--- a/net-libs/libnids/ChangeLog
+++ b/net-libs/libnids/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libnids
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/ChangeLog,v 1.70 2015/03/02 09:30:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/ChangeLog,v 1.71 2015/03/13 19:32:02 jer Exp $
+
+  13 Mar 2015; Jeroen Roovers <jer@gentoo.org> -libnids-1.24-r3.ebuild,
+  libnids-1.24-r6.ebuild:
+  Old.
 
   02 Mar 2015; Agostino Sarubbo <ago@gentoo.org> libnids-1.24-r6.ebuild:
   Stable for ppc, wrt bug #517420
diff --git a/net-libs/libnids/libnids-1.24-r3.ebuild b/net-libs/libnids/libnids-1.24-r3.ebuild
deleted file mode 100644
index 505ba5b8c5aa..000000000000
--- a/net-libs/libnids/libnids-1.24-r3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.24-r3.ebuild,v 1.5 2014/08/24 08:07:02 jer Exp $
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-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"
-
-LICENSE="GPL-2"
-SLOT="1.2"
-KEYWORDS="amd64 ppc x86"
-IUSE="+glib +libnet static-libs"
-
-RDEPEND="
-	!net-libs/libnids:1.1
-	glib? ( dev-libs/glib )
-	libnet? ( >=net-libs/libnet-1.1.0-r3 )
-	net-libs/libpcap
-"
-DEPEND="
-	${RDEPEND}
-	glib? ( virtual/pkgconfig )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-ldflags.patch"
-	sed -i src/Makefile.in -e 's|\tar |\t$(AR) |g' || die
-}
-
-src_configure() {
-	tc-export AR
-	local myconf="--enable-shared"
-	use glib || myconf="${myconf} --disable-libglib"
-	use libnet || myconf="${myconf} --disable-libnet"
-	econf ${myconf}
-}
-
-src_install() {
-	emake install_prefix="${D}" install
-	use static-libs || rm -f "${D}"/usr/lib*/libnids.a
-	dodoc CHANGES CREDITS MISC README doc/*
-}
diff --git a/net-libs/libnids/libnids-1.24-r6.ebuild b/net-libs/libnids/libnids-1.24-r6.ebuild
index 3bfd81c1a7a3..1e9f9f86e7b6 100644
--- a/net-libs/libnids/libnids-1.24-r6.ebuild
+++ b/net-libs/libnids/libnids-1.24-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.24-r6.ebuild,v 1.3 2015/03/02 09:30:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.24-r6.ebuild,v 1.4 2015/03/13 19:32:02 jer Exp $
 
 EAPI=5
 inherit eutils flag-o-matic toolchain-funcs
@@ -16,7 +16,7 @@ IUSE="+glib +libnet static-libs"
 
 RDEPEND="
 	!net-libs/libnids:1.1
-	glib? ( dev-libs/glib )
+	glib? ( dev-libs/glib:2 )
 	libnet? ( >=net-libs/libnet-1.1.0-r3 )
 	net-libs/libpcap
 "