Add live version in preparation of 0.5.7 version bump.

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

4 files changed, 74 insertions, 8 deletions

diff --git a/net-analyzer/netsniff-ng/ChangeLog b/net-analyzer/netsniff-ng/ChangeLog
index 2f963ead99e9..05c3863c6569 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netsniff-ng/ChangeLog,v 1.5 2012/11/07 01:21:11 xmw Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netsniff-ng/ChangeLog,v 1.6 2013/05/31 08:06:12 xmw Exp $
+
+*netsniff-ng-9999 (31 May 2013)
+
+  31 May 2013; Michael Weber <xmw@gentoo.org> +netsniff-ng-9999.ebuild,
+  metadata.xml:
+  Add live version in preparation of 0.5.7 version bump.
 
 *netsniff-ng-0.5.7-r1 (07 Nov 2012)
 
diff --git a/net-analyzer/netsniff-ng/Manifest b/net-analyzer/netsniff-ng/Manifest
index 69bc19a477d1..2593e362811f 100644
--- a/net-analyzer/netsniff-ng/Manifest
+++ b/net-analyzer/netsniff-ng/Manifest
@@ -4,12 +4,13 @@ Hash: SHA256
 AUX netsniff-ng-0.5.6-man-no-compress.patch 1459 SHA256 49914cab8857c6f44b20c902c3f92613ee6168d18709166598df1a1b779fbfef SHA512 955bb365dc3c5ea00bce4e1411f95270d3671cad00e54acbd9956f0f013792c4e0e8d9adf4339a898f1356407e6f009348cff56d8db97e07e6128f86b9bf6966 WHIRLPOOL 1621ff07a9b8c446cd14ec1ffb40d90d392fbf42252c286bca8a29da7156d09ff34695f3de417a65a801fd51cab4098bc7adde3a9cedfad8f317b125a01d5928
 DIST netsniff-ng-0.5.7-r1.tar.gz 2957112 SHA256 ab4e1ef6aadb00b998349aff66e4e1cec53910113344c53ac8eb947fd46b5e89 SHA512 b400d8b21edb4395b946ac105bbb25a83330151e09d1efd130537375930ea03b928c166b792f44ccbacfa72f9de818c37553a0be98970c26da5ba255a1f2d6c1 WHIRLPOOL b83e1351e60fdaa076e611fd308b61be549a1cc6663f6039affd3fa3be002ec485776f67ceba54879584fc1822a9ad178141833ac5522d2444e67859cf8fbe58
 EBUILD netsniff-ng-0.5.7-r1.ebuild 728 SHA256 31c4c3bba827b3c01be304aadcb53ab0332c7dc8110ee39f10b94f13315c737a SHA512 6bc21116ce8fbb1325655595a23e221776e071e99a6546ebce36a7d52de80dee09878692172c1668374794a5966de74a7b4b5334432ec71143dac0ecd4f3319f WHIRLPOOL 78c34ac745d35526271310c95ea4f02093de754636d4c9af7a836f5676bdf7659d717f4b82e0b3442746afb6c8357f64250fae464dd7ff2e0001ffe504bb34a7
-MISC ChangeLog 1223 SHA256 825cbdf10d16a4c475614ec7411dfc0bbc2ba9e5b53fb76dbbd093bdee060c3d SHA512 45319d294006536fe3ed7b65655851f30871897931c4036f2b269d4537a75aba78b626c96e49c8d3d11464ce05cc37e2c7a413400715c0311dc20ceee2a6dd11 WHIRLPOOL 8b905072bfce59d795bb5cb81df9d0f09e9469d67c3937c05d7ad699db35bb53067bdb413d982d58afb948f14e864921e52fd5a89fc17cb12f8ea62c3e55067c
-MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
+EBUILD netsniff-ng-9999.ebuild 1358 SHA256 2b9a24cdce3aa08b2fea28b69828c5341ffc0d6e69bd5affe8057e402581b43c SHA512 078ed7cd8e0bd2df6351d3f927717157d01c481ee079269ae1808f90be3e5612362c53cd6102236f8e1a55d375d37ed0011844281cb94e5308c55b6dfb186cf1 WHIRLPOOL 8546022e383979bfe1977f366797dccd2eaff0a9f8a3a29d7ac4bafc52731c0024e41bc286481697a7e68351cef06fa8ef1a85736aef4114ab898f08a77c3a41
+MISC ChangeLog 1402 SHA256 5ef2e40daecbc8cd88d5e5240957bf69117641cde745aef871b191eae300cc64 SHA512 43ebf15656f6d6cee1650c6987520068560f3fb3bcf1032e37be1b6a0387e8c3b5e6a59e8f6db4e95e092bba555c61980da48aede5721746dbe124927dd3519c WHIRLPOOL 0e4563c46b792511e4f1c953cae8679cf0f36291a65cf123535c7594ca7ac13dc173b138dbb643a0be63537b60a78f7119273eb0d25bbe0f9c4b34ceb047d59f
+MISC metadata.xml 345 SHA256 b04e4f6c928419224d889bddda7029b5f78b8b0b741bbb9b63ea3c1942b1c50c SHA512 a161308003725677852320429c74269bb8e05de980ba9deb1be9a06c4abf286b10005caad8cfe934e5d863509d39e5a9e3fdc759b921b0af77d56836d44f3d43 WHIRLPOOL beedd6275307b2ca93ac44318f1a0215f2687bf1f6a7885effc01a696cbe76d3de0f0b145cfa2330c800f77590cdbcccdf2575896731e47450a434b439b942f2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlCZt4QACgkQknrdDGLu8JBzwAEAl8lnvwqjhUTqgMWOm2pYUnLJ
-WVb8KEPeEx/lGeLIuoEA/02HjPqX5Cm/MRA9VY9RRMFC2XtRyQy0le4oWc8setQY
-=MJ+k
+iF4EAREIAAYFAlGoWfgACgkQknrdDGLu8JBOSQD/QoNmgIasr+6XQEv6ociCgzqx
+bBnthaY006QXEnYwbQIA/2ldyy0EedPKyy9RmrNT6a5p2GPWBlC/Zl6ofBsy2UDl
+=eXAs
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/netsniff-ng/metadata.xml b/net-analyzer/netsniff-ng/metadata.xml
index 59acc2cc580e..09d6f932f1cc 100644
--- a/net-analyzer/netsniff-ng/metadata.xml
+++ b/net-analyzer/netsniff-ng/metadata.xml
@@ -5,5 +5,9 @@
 <email>xmw@gentoo.org</email>
 <name>Michael Weber</name>
 </maintainer>
+<use>
+	<flag name="curvetun">Build curvetun utility</flag>
+	<flag name="mausezahn">Build mausezahn utility</flag>
+</use>
 </pkgmetadata>
 
diff --git a/net-analyzer/netsniff-ng/netsniff-ng-9999.ebuild b/net-analyzer/netsniff-ng/netsniff-ng-9999.ebuild
new file mode 100644
index 000000000000..0c9cfbfebefc
--- /dev/null
+++ b/net-analyzer/netsniff-ng/netsniff-ng-9999.ebuild
@@ -0,0 +1,55 @@
+# 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-9999.ebuild,v 1.1 2013/05/31 08:06:12 xmw Exp $
+
+EAPI=5
+
+inherit git-2 multilib toolchain-funcs
+
+DESCRIPTION="high performance network sniffer for packet inspection"
+HOMEPAGE="http://netsniff-ng.org/"
+EGIT_REPO_URI="git://github.com/borkmann/${PN}.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="curvetun mausezahn"
+
+RDEPEND="dev-libs/geoip
+	dev-libs/libnl:3
+	dev-libs/userspace-rcu
+	net-libs/libnetfilter_conntrack
+	sys-libs/ncurses:5
+	mausezahn? (
+		dev-libs/libcli
+		net-libs/libnet:1.1 )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison
+	curvetun? (	=net-libs/nacl-0_p20110221* )"
+
+src_prepare() {
+	if ! use mausezahn ; then
+		sed -e '/^TOOLS /s:mausezahn::' \
+			-i Makefile
+	fi
+	if ! use curvetun ; then
+		sed -e '/^TOOLS /s:curvetun::' \
+			-i Makefile
+	else
+		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
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LD="$(tc-getCC)" CCACHE="" \
+		LEX=lex YAAC=bison STRIP=@true \
+		NACL_INC_DIR="${EROOT}usr/include/nacl" \
+		NACL_LIB_DIR="${EROOT}usr/$(get_libdir)/nacl"
+}
+
+src_install() {
+	emake PREFIX="${ED}" install
+}