Version bump (bug 520318).

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

3 files changed, 11 insertions, 66 deletions

diff --git a/net-analyzer/netsniff-ng/ChangeLog b/net-analyzer/netsniff-ng/ChangeLog
index 33db8a3e55cf..4ef3767eb009 100644
--- a/net-analyzer/netsniff-ng/ChangeLog
+++ b/net-analyzer/netsniff-ng/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/netsniff-ng
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netsniff-ng/ChangeLog,v 1.9 2014/09/01 16:11:01 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netsniff-ng/ChangeLog,v 1.10 2014/09/01 16:24:28 xmw Exp $
+
+*netsniff-ng-0.5.9_rc3 (01 Sep 2014)
+
+  01 Sep 2014; Michael Weber <xmw@gentoo.org> +netsniff-ng-0.5.9_rc3.ebuild,
+  -netsniff-ng-0.5.8_rc2.ebuild, -netsniff-ng-0.5.8_rc3.ebuild:
+  Version bump (bug 520318).
 
 *netsniff-ng-0.5.8 (01 Sep 2014)
 
diff --git a/net-analyzer/netsniff-ng/netsniff-ng-0.5.8_rc2.ebuild b/net-analyzer/netsniff-ng/netsniff-ng-0.5.8_rc2.ebuild
deleted file mode 100644
index 026e62baf939..000000000000
--- a/net-analyzer/netsniff-ng/netsniff-ng-0.5.8_rc2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netsniff-ng/netsniff-ng-0.5.8_rc2.ebuild,v 1.1 2013/08/05 07:42:05 xmw Exp $
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="high performance network sniffer for packet inspection"
-HOMEPAGE="http://netsniff-ng.org/"
-MY_P=${P/_rc/-rc}
-SRC_URI="http://pub.${PN}.org/${PN}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/geoip
-	dev-libs/libcli
-	dev-libs/libnl:3
-	dev-libs/userspace-rcu
-	net-libs/libnet:1.1
-	net-libs/libnetfilter_conntrack
-	net-libs/libpcap
-	sys-libs/ncurses:5
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison
-	=net-libs/nacl-0_p20110221*
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	#needed for <libcli-1.9.7
-	epatch "${FILESDIR}"/${PN}-0.5.8-libcli-test.patch \
-		"${FILESDIR}"/${PN}-0.5.8-fortify_source.patch
-
-	sed -e '/CFLAGS/s:?=:+=:' \
-		-e '/CFLAGS/s:\(-g\|-O2\|-O3\|-m\(arch\|tune\)=native\)::g' \
-		 -i Makefile || die
-
-	if ! grep nacl-20110221 curvetun/nacl_build.sh >/dev/null ; then
-		die "have nacl-20110221, expected $(grep ${MY_NACL_P} curvetun/nacl_build.sh)"
-	fi
-
-	export NACL_INC_DIR="${EROOT}usr/include/nacl"
-	export NACL_LIB_DIR="${EROOT}usr/$(get_libdir)/nacl"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LD="$(tc-getCC)" CCACHE="" \
-		LEX=lex YAAC=bison STRIP=@true \
-		Q= HARDENING=1
-}
-
-src_install() {
-	emake PREFIX="${ED}" install
-	dodoc AUTHORS README REPORTING-BUGS
-}
diff --git a/net-analyzer/netsniff-ng/netsniff-ng-0.5.8_rc3.ebuild b/net-analyzer/netsniff-ng/netsniff-ng-0.5.9_rc3.ebuild
index d327497d2c8d..c36bcd3aff99 100644
--- a/net-analyzer/netsniff-ng/netsniff-ng-0.5.8_rc3.ebuild
+++ b/net-analyzer/netsniff-ng/netsniff-ng-0.5.9_rc3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netsniff-ng/netsniff-ng-0.5.8_rc3.ebuild,v 1.1 2013/12/03 09:22:14 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netsniff-ng/netsniff-ng-0.5.9_rc3.ebuild,v 1.1 2014/09/01 16:24:28 xmw Exp $
 
 EAPI=5
 
@@ -55,6 +55,7 @@ src_compile() {
 }
 
 src_install() {
-	emake PREFIX="${ED}" install
+	emake PREFIX="${ED}usr" ETCDIR="${ED}etc" install
+
 	dodoc AUTHORS README REPORTING-BUGS
 }