reinit the tree, so we can have metadata

1721 files changed, 71369 insertions, 0 deletions

diff --git a/net-analyzer/2ping/2ping-4.0.1.ebuild b/net-analyzer/2ping/2ping-4.0.1.ebuild
new file mode 100644
index 000000000000..0d7959a2a340
--- /dev/null
+++ b/net-analyzer/2ping/2ping-4.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A bi-directional ping utility"
+HOMEPAGE="https://www.finnie.org/software/2ping/"
+SRC_URI="https://www.finnie.org/software/2ping/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="server"
+
+src_install() {
+	distutils-r1_src_install
+	doman doc/2ping.1
+	dodoc doc/{2ping-protocol-examples.py,2ping-protocol.md}
+	use server && {
+		doinitd "${FILESDIR}"/2pingd
+		newconfd "${FILESDIR}"/2pingd.conf 2pingd
+	}
+}
diff --git a/net-analyzer/2ping/2ping-4.1.ebuild b/net-analyzer/2ping/2ping-4.1.ebuild
new file mode 100644
index 000000000000..c99ba3938765
--- /dev/null
+++ b/net-analyzer/2ping/2ping-4.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A bi-directional ping utility"
+HOMEPAGE="https://www.finnie.org/software/2ping/"
+SRC_URI="https://www.finnie.org/software/2ping/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="server"
+
+src_install() {
+	distutils-r1_src_install
+	doman doc/2ping.1
+	dodoc doc/{2ping-protocol-examples.py,2ping-protocol.md}
+	use server && {
+		doinitd "${FILESDIR}"/2pingd
+		newconfd "${FILESDIR}"/2pingd.conf 2pingd
+	}
+}
diff --git a/net-analyzer/2ping/Manifest b/net-analyzer/2ping/Manifest
new file mode 100644
index 000000000000..bca375269bb8
--- /dev/null
+++ b/net-analyzer/2ping/Manifest
@@ -0,0 +1,9 @@
+AUX 2pingd 692 SHA256 c4265bd80fb4d88107fe2808105882de512b6d9ccda107a7c26023f92291de0c SHA512 7d898b96e6888233b7628af7a9a0641a4ce2f6ebe38192b88bb7f479d99067f6d34843f1b43746eed03b7512782496534e35240abf8b866a4e8f00ee9421deb1 WHIRLPOOL 0f50770861552a46cc3a86f1cf33c91c8908128b0c52ed70eb86fcf0f64df29d885aca0ca943b434b1c697fa538be7aeaf208ffaa20e9bf833218191d9a25169
+AUX 2pingd.conf 57 SHA256 b1ede8d386e74ff05cd992f5bb860910790402cb958338ff7f029aa3e1cdeeae SHA512 c8c666116e841b86a1f17a891453e6ea25976ad485b8299062971b45395420dd46ecc9ac36cb1de5000207372f8586850f62c6178ece5f70732bf17ae9ab4af9 WHIRLPOOL c9e304f73afa889bc9c26c35f20305c95dea942a7fd616c932e8bfc3668056ef9751c47be611cbbd816d2ce613af7eb9144e154e3ca1e8eda2a52280eaeada5e
+DIST 2ping-4.0.1.tar.gz 67347 SHA256 95aa1a694da402cee7fefd1da61a08828bf11d82b012824802098a3d5e380567 SHA512 21d3f9f8833d10f7d9f692e0d3a8dbe524ee5ad064122d808aad99f295389efc51c3979ff0dc9533705363be21e0457a886ba0d8a4532705791a4fdf24050eb7 WHIRLPOOL ec4abc9cba2018addaa1a82323cf78e60d266ebe6a16b60639a7d4c0fc21ff2381ecc1d35b0db3c50b7cc54f84edcf9bf82dc8f62021e197854125da39d9a26f
+DIST 2ping-4.1.tar.gz 69510 SHA256 85331ae57f445bc8895ba4e61da4c7300b67fde55642f5e42ea02f2daf07b1ed SHA512 926a515156bf0b9e7c09e72f0e557571f3905646eaec2e8c4702a7dd7ed77b9ab298323028beb02c844d719839458f9d056fb5d29443e908b0d927754f856553 WHIRLPOOL 2e2c2c56dbe203569460be3862e1ca4b0c22ca88fe705bf86f6ffb4e85b15511b521e78b80c382c3ab833da64f3ac6efa0890f33dc4f7fa8a3151c16d49a5964
+EBUILD 2ping-4.0.1.ebuild 637 SHA256 ade810458522609c1a141891cd2a038518e6fc038e23c6ba680c3d9e4a773323 SHA512 f9269a4595ff43bb30cb45e64f9113fa0ec39ed3665fc22b283356a79e6c0e4b48048815747af5cb57914c5414210357e5e101fb59a6bfa951a513c8fb0bc475 WHIRLPOOL b2a9635681c920bce9d4d685907f609575815a0860ef9e916594b71eead72466244603d45302b03973e11116d7726778c0f10dd53de3e6a6e57e7d951af23b58
+EBUILD 2ping-4.1.ebuild 633 SHA256 ffd0ddd8de9f3160195096f494314b238eb0345929301c6e29aa8f895bb66c58 SHA512 f31e0a9f1e9ffaa3a4b3a1d1360a5038fa479250414e641d04dcf29b798ca05a98a78e18665d850d2d746e554d6ef265b68ae7340a1153f8ac7aa9171dbdeeb2 WHIRLPOOL bfe8be9ded2c1c4ad7cba7e7e933c700bf56773b15f467fd2c68a707b252e23f8b2be34e751ed220e5a27cb2983c33783fd35d06c5d6d04608a1632ad0a868de
+MISC ChangeLog 4039 SHA256 3c37aa03c46f2a6a8390a068698ca3f6335f6328fd284f20ace0a99aaffe8fd3 SHA512 417ce5a60db922809b6012da5f4db14b10e52c1dc3d1ae87fce70d0681e972a453e2a167fb275e37fe7ffd57fe81ec96720954fb5bf3bc9d1baae0788146af2b WHIRLPOOL 39e0138f8065fea6d27bbf2a7ae75f154b78dbdb24a31ab08ef7f19a54e6da56fb76e12e34a8ac6cd6e3e090f983210caacc90119296592635c6b5aa1c4c42e8
+MISC ChangeLog-2015 1006 SHA256 0395876d87f783065d1880cbfdbb0d9e30485184f63c1e0328fd60d9f80a5b14 SHA512 fd0505d5290ad8d3c136906efcaff625bc78c6be51543f56a3fed3ebc6bea7f2e46c179885c872aefde30e0ae9a0cf1f16025fc98ca6d8e0a13fc76e914815b3 WHIRLPOOL c064a343cafebe741356511f3c05ab47139b45d7951023b333bbb3920b66dad908fba5649fab49939a59fbfdbf780b550982f2ebeffc899e69f744eb75fb2e05
+MISC metadata.xml 400 SHA256 45606d9543632fd285aff0478cdb730986f604d2547b8d5a2845d9f13bbd6e40 SHA512 9d35147319cbab8e826a2f0a8badee2169e70b8a52065d8639f2326ff0bfe1717a5e8b5422072f71677e2e4a99ec14a7d6e688662f2342d7917499c35a686154 WHIRLPOOL b39dd2f2f35ee80d946e1c70ed9e6638ceda7c3841e6b45d52d11ba8c9ce844030f74e460ad3117ce8571fbb37ac7d172f4f0249aeebe7bce71d7e3c8da7c9c7
diff --git a/net-analyzer/2ping/files/2pingd b/net-analyzer/2ping/files/2pingd
new file mode 100644
index 000000000000..b558de2d18f6
--- /dev/null
+++ b/net-analyzer/2ping/files/2pingd
@@ -0,0 +1,35 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DAEMON="/usr/bin/2ping"
+PIDFILE="/run/2ping.pid"
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting 2ping server"
+	start-stop-daemon --start \
+		--background --make-pidfile \
+		--pidfile "${PIDFILE}" \
+		--exec "${DAEMON}" -- \
+		--listen -q ${OPTS} \
+		>/dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping 2ping server"
+	start-stop-daemon --stop --pidfile "${PIDFILE}"
+	eend $?
+}
+
+restart() {
+	ebegin "Restarting 2ping server"
+	start-stop-daemon --stop --pidfile "${PIDFILE}"
+	sleep 1
+	start-stop-daemon --start --exec "${DAEMON}" --pidfile "${PIDFILE}"
+	eend $?
+}
diff --git a/net-analyzer/2ping/files/2pingd.conf b/net-analyzer/2ping/files/2pingd.conf
new file mode 100644
index 000000000000..12c263d3d054
--- /dev/null
+++ b/net-analyzer/2ping/files/2pingd.conf
@@ -0,0 +1,2 @@
+#Pass any extra 2ping server options here
+#OPTS="--ipv6"
diff --git a/net-analyzer/2ping/metadata.xml b/net-analyzer/2ping/metadata.xml
new file mode 100644
index 000000000000..94525d10a811
--- /dev/null
+++ b/net-analyzer/2ping/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<longdescription>
+		A bi-directional ping utility
+	</longdescription>
+	<use>
+		<flag name="server">Install the server init scripts.</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-analyzer/aimsniff/Manifest b/net-analyzer/aimsniff/Manifest
new file mode 100644
index 000000000000..2d0de0519369
--- /dev/null
+++ b/net-analyzer/aimsniff/Manifest
@@ -0,0 +1,7 @@
+AUX aimsniff.rc 315 SHA256 15bf0d041da578ee737f555ba3c2eb869290267dff13d1a2aaad6793d7657bad SHA512 2a096e76c8e877ea0216fee7c3e63b35b253d3faa586546a29ebb4f68b0c07ce00ac4859fb3ad49318db994c047e020747dc37b56afdc1f56681b308f7c22a52 WHIRLPOOL 5749814206d85eb6f71bc68d7c9990e3bd6ef54e8676595682f617b0fbaa7497617e7a16eef2fcf6332562b7cda6e66e73475c4caa18bdc5727847733bbbcd08
+DIST aimsniff-0.9d.tar.gz 24044 SHA256 11ce4cd3e1dcdabee0319dbb8a52c176debfbcd59c0c0c913078bb4b85619ac1 SHA512 eba8d1ff21c6c841f5e1b344769c38bf00936613c975dd60e0c3922e67805733c2e949006be36a83d75fc6c9c77de510a6914d184c6159e46b9d35cc4f12efa6 WHIRLPOOL 40a882204e0da03843a6a461b036dfb6a84f29fbee22f83c4d962ba0ca838b71499b51f8736ff99eadad7a0ecd30405c7df743081d258b0f4a7141bb20ef69cd
+DIST was-0.1.2b.tar.gz 73651 SHA256 0d1af84e7ed529cf0f8a63f4c72e8656ceccf0316cc42dcc9d856cbf8091635b SHA512 afbe8554c16df8305e781cf2dde3af1e7b25345dc1f5defc7723654479cc91d8f6fe9ddc3850fd487f77b241d40274edb2b7328ab011df93996264f14b98e6cd WHIRLPOOL cabbdbb0131ff633472b18226ed424c5d905f0dfbb92a36ccdd08cdba024ba94b88e4b497e10d9d6c4ebd000efa832a0a66ecd105e50a894ed48591633d80d16
+EBUILD aimsniff-0.9d.ebuild 2820 SHA256 b087a7c3a3fcb99ee0be0a93678571bad20d8fca56ce0e1c055a2e383b7d325d SHA512 b702cfc8b55717ab744db639101b014ddf5a4459cf79861aacb5376ac022c66b7268fde97d8f5338236a0dfeaa57aa02bafec8c9d0c9b54b37d11abcc7f7e7ee WHIRLPOOL cdd6ea766b874d5c139110499d4c21f447707745bb4657bc829659ae02c86c8200d267787c9b34790ccfbb1c9f692ab0332ddc0ed709863109ee60ceef6cece9
+MISC ChangeLog 2692 SHA256 1ddeb85cf7e419d7d085885f4bf2b99d9df6ec59a9415379704c0d8cee18b286 SHA512 9139c084ece8ee8188bf104f04483f6463868f994f8d0c36c9d0100d04c09a1ddf5cdfe415d7eee1df1ff638aaa621eaff340136cb91556a6ba3bd0df8c2fe1f WHIRLPOOL 1ece59b8ab2065d73ff96abc36f6d8d3f8467f3798f280668f003fe700e76df87baaaee410f15c0b51bc0ed86aa0b2601b1c362728647f167452273174a1fc38
+MISC ChangeLog-2015 5001 SHA256 b02063d5bc0ebd6a8e10eced1d9ae68144ac21948781b8a7559d2a611db0c808 SHA512 d58cc0c46fefbd09ecad3df81a9b55efa9e721a1451b0fcdcbe6a85e54e0591c2f50c2873cfadbd8b53a97b805ce1c6ab35d342eeb00c0f4e526eb8d2618070f WHIRLPOOL f71d35a0318ee43b07f6adbe0d22340593bf04a45bfe5b70f5f680905d097f37fb897f844e61fde444448cd1ec08c959d3b28538de425136221e7431bf338417
+MISC metadata.xml 562 SHA256 12b987453f8e246c906e87621ebed55947789a3eef6d1909f5148dfb73911c41 SHA512 57f79d4bdc238b26c61f64910c918f1ddba52db97dd05d3fe29043f01fdda9d80511c051adcf308592b70003af8b07e29547978aabc1ec8b615ed5cf39619147 WHIRLPOOL c814c89e2ac0a95a6f644a3533f3fb83351be3587e6b3dd20e8873519e120a3c4f2179cb7e3c9cf9c6cf49dcd43c0d213372606ac98d39a255bb4e113bad9c5b
diff --git a/net-analyzer/aimsniff/aimsniff-0.9d.ebuild b/net-analyzer/aimsniff/aimsniff-0.9d.ebuild
new file mode 100644
index 000000000000..e08fa33d31c5
--- /dev/null
+++ b/net-analyzer/aimsniff/aimsniff-0.9d.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils webapp eutils depend.apache
+
+WAS_VER="0.1.2b"
+
+DESCRIPTION="Utility for monitoring and archiving AOL Instant Messenger messages across a network"
+HOMEPAGE="https://sourceforge.net/projects/aimsniff/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.gz
+	http? ( mirror://sourceforge/${PN}/was-${WAS_VER}.tar.gz )
+"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ppc x86"
+#SLOT empty due to webapp
+IUSE="samba mysql http"
+
+RDEPEND="
+	dev-lang/perl[gdbm]
+	dev-perl/Net-Pcap
+	dev-perl/NetPacket
+	dev-perl/Unicode-String
+	dev-perl/Proc-Daemon
+	dev-perl/Proc-Simple
+	dev-perl/DBI
+	dev-perl/Unix-Syslog
+	mysql? ( virtual/mysql dev-perl/DBD-mysql )
+	samba? ( net-fs/samba )
+"
+
+want_apache2 http
+
+pkg_setup() {
+	depend.apache_pkg_setup http
+
+	use http && webapp_pkg_setup
+}
+
+src_install() {
+	use http && webapp_src_preinst
+
+	newsbin aimSniff.pl aimsniff
+	insinto /etc/${PN}
+	doins aimsniff.config
+	insinto /usr/share/doc/${PF}
+	doins table.struct
+	dodoc README ChangeLog
+
+	if use http; then
+		cp ../was-${WAS_VER}/docs/README README.WAS
+		dodoc README.WAS
+
+		rm -rf ../was-${WAS_VER}/docs
+		mv ../was-${WAS_VER}/ "${D}"${MY_HTDOCSDIR}/was
+
+		webapp_serverowned ${MY_HTDOCSDIR}/was
+
+		# This file needs to be serverowned as the server won't be able to write to it if it were
+		# webapp_configfile'ed.
+		webapp_serverowned ${MY_HTDOCSDIR}/was/.config.php
+
+		webapp_src_install
+	fi
+
+	newinitd "${FILESDIR}"/aimsniff.rc aimsniff
+}
+
+pkg_postinst() {
+	if use mysql
+	then
+		echo
+		elog "To create and enable the mysql database, please run: "
+		elog "emerge --config =${PF}"
+
+		if use http; then
+			echo "To create and enable the mysql database, please run:
+			emerge --config =${PF}" > apache-postinst
+			webapp_postinst_txt en apache-postinst
+		fi
+	fi
+
+	if use http; then
+		elog
+		elog "Go to http://${HOSTNAME}/was/admin.php to configure WAS."
+
+		echo "Go to http://${HOSTNAME}/was/admin.php to configure WAS." > was-postinst
+		webapp_postinst_txt en was-postinst
+	fi
+}
+
+pkg_config() {
+	echo
+	einfo "Creating mysql database aimsniff using /usr/share/doc/${PF}/table.struct:"
+	echo -n "Please enter your mysql root password: "
+	read mysql_root
+	/usr/bin/mysqladmin -p$mysql_root -u root create aimsniff
+	/usr/bin/mysql -p$mysql_root -u root aimsniff < /usr/share/doc/${PF}/table.struct
+	echo -n "Please enter your username that you want to connect to the database with: "
+	read user
+	echo -n "Please enter the password that you want to use for your database: "
+	read password
+	einfo "Granting permisions on database using 'GRANT ALL ON aimsniff.* TO $user IDENTIFIED BY '$password';'"
+	echo "GRANT ALL ON aimsniff.* TO $user@localhost IDENTIFIED BY '$password';" | /usr/bin/mysql -p$mysql_root -u root aimsniff
+	echo
+}
diff --git a/net-analyzer/aimsniff/files/aimsniff.rc b/net-analyzer/aimsniff/files/aimsniff.rc
new file mode 100644
index 000000000000..276a21e730be
--- /dev/null
+++ b/net-analyzer/aimsniff/files/aimsniff.rc
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting asniff"
+	start-stop-daemon -o --quiet --start --exec /usr/sbin/aimsniff -- \
+	    -C=/etc/aimsniff/aimsniff.config
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping asniff"
+	start-stop-daemon -o --stop  -p /var/run/aimsniff_parent.pid -s QUIT
+	eend $?
+}
diff --git a/net-analyzer/aimsniff/metadata.xml b/net-analyzer/aimsniff/metadata.xml
new file mode 100644
index 000000000000..5a524c1fda91
--- /dev/null
+++ b/net-analyzer/aimsniff/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>aimsniff is a utility used for retrieving and storing AIM messages across a network.</longdescription>
+	<use>
+		<flag name="http">Install the WAS (Web AIM Sniff) frontend</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">aimsniff</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/alive/Manifest b/net-analyzer/alive/Manifest
new file mode 100644
index 000000000000..316ecc387ce4
--- /dev/null
+++ b/net-analyzer/alive/Manifest
@@ -0,0 +1,8 @@
+AUX alive-2.0.2-ping-test.patch 378 SHA256 904d65420f8700c839c3c96b15b3e6d1789c1cc655b7dc1b3e233438a42fa0dd SHA512 6479364f35345aad12fcabf4f11f84a601740771e0e602afc757a39f45eaabdd0d5d6b3d3d95a5307edaef2e84250e4ba784a9757fa75bad21363735c14cfd78 WHIRLPOOL 383e75cf5b1ec27a0e000326f114ceae83319a11aa8e66de45540fdf0139da0f3fb7bd4a639504f6a53ecaf9335b27fd507d41a0deee5ef4a1bb156ac7804f47
+DIST alive-2.0.1.tar.xz 172320 SHA256 539fabc6e3e8fee9dc4753b5ba8cf3cde566bd4b0d9410d81b54c18e11644ba6 SHA512 9f1d4020b72568e96ea67010728cb1274a883f7328444009839be999a1fc9466e8199d8415e589e27314106a8ae1c4a18f0b1bd342185e7878895ad962289ecf WHIRLPOOL 881b4b4a8d5d78d64353f1ef374c8dbf5a522276b1545b255ebf7f1ce8eedc7a27e358c620dfe91cda38e980023e3caa92291028be8ed3009bd31698fbf89c70
+DIST alive-2.0.2.tar.xz 174936 SHA256 120dd9ef361833623be353ad8cfac585abae51a16fedd3a84f1d99a842793fef SHA512 7e9c88f62ab5c0248d1e42b81e2106f43fc9587543782623e8a564ab99fd1d4a55058a175dc46d25520454c07f732101c7e62248ce992d1a8a615f531b1c090e WHIRLPOOL 8c223e26565e0d85ab0e075bd66b78452d5e3446681f9fd2d020a1b0ddee347b7fa6b9144b041684b15cd7f21709271ea6b1d8e1566cc0f3a530a69eb9c1384e
+EBUILD alive-2.0.1.ebuild 381 SHA256 9eab2a62bd2e64589991434a8d7479897cb0446d2d3e908737e6af110b6ff003 SHA512 8b50355d330264922ebe4b14d4a507cdaf814b738ff18664b87ea63f3b5f3f6b0d02526a3e4f02793fb2c057d1d10cbe31d1bd227af57cbc92299884f5257fd6 WHIRLPOOL 3e679ed49457458ec92d0e72d1446a46408cbc72c61132dc1afe5bc6df121b5dacfcdaf3a5bf51b7de8e70fe7424ebfb297f08abc0059162f8d45476c35593d3
+EBUILD alive-2.0.2.ebuild 535 SHA256 773393749481e43b18461243b35067995fb45cf526fa816b4253223265ba0ac0 SHA512 a6b1b826070288fc1192a28cc8860e73610218611e9c36a0d21ca59420cc8a45582ef9113aede2e7fe28e6207d3b41a8625ce66f5e639e4d757b414d5515e374 WHIRLPOOL 531c9e0156d8a40dc021c0f30dc5d88419614f8f044e87e12ccb0ec8641d043419897e6c1b534c84991a367bac20cadb73605887d8e4e68ab54192bca2f49d10
+MISC ChangeLog 2683 SHA256 a6d7621fdcddff399e7fb10e7483257a725922e26a7f6cbbd9e495887ff254a7 SHA512 06531b706ec6d782356691a71512d8b6a4fe7afca48c5ae349908e1d7a2b19f1eba7a84c01a5e687f25f4ec264cec617bee2ddca197bde41e07a1aa3030df53d WHIRLPOOL 8a42ee465d3fb30949f7293e116c9ed037d07d555fc909ce8437b7a8cb366960e1caf4479c7c584c7ce2df510d2917119eaa6ffbef34c909a4a6d3177cee39c2
+MISC ChangeLog-2015 600 SHA256 114137b3474664227d73d27e9b9dd9b935fff64d67d443447363f16cfb0badff SHA512 71436c88e1daa2de856f2b72723e265f8fb24b69900dd984eb1ec83c702b5179137705b6954c1db6165f4c438ee8ff5ea3adfc6031edda890466f8304bf8a32e WHIRLPOOL e7e564d5cbb40d9ca281a68886c85f98cd381e563050333b17f3566e3617562f85832dab507801b6c95903c22ccfb2a75a7b36f1ad48fe3f9d276d27971ca8d1
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/alive/alive-2.0.1.ebuild b/net-analyzer/alive/alive-2.0.1.ebuild
new file mode 100644
index 000000000000..56023534aa01
--- /dev/null
+++ b/net-analyzer/alive/alive-2.0.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="a periodic ping program"
+HOMEPAGE="https://www.gnu.org/software/alive/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE=""
+
+DEPEND="app-arch/xz-utils"
+RDEPEND="
+	dev-scheme/guile
+	net-misc/iputils
+"
diff --git a/net-analyzer/alive/alive-2.0.2.ebuild b/net-analyzer/alive/alive-2.0.2.ebuild
new file mode 100644
index 000000000000..7c00e7498f3c
--- /dev/null
+++ b/net-analyzer/alive/alive-2.0.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="a periodic ping program"
+HOMEPAGE="https://www.gnu.org/software/alive/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE=""
+
+COMMON_DEPEND="net-misc/iputils"
+DEPEND="
+	app-arch/xz-utils
+	${COMMON_DEPEND}
+"
+RDEPEND="
+	dev-scheme/guile
+	${COMMON_DEPEND}
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ping-test.patch
+	eautoreconf
+}
diff --git a/net-analyzer/alive/files/alive-2.0.2-ping-test.patch b/net-analyzer/alive/files/alive-2.0.2-ping-test.patch
new file mode 100644
index 000000000000..3b1b1257c9b3
--- /dev/null
+++ b/net-analyzer/alive/files/alive-2.0.2-ping-test.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -35,11 +35,6 @@
+  [alive_cv_nice_ping=yes],
+  [alive_cv_nice_ping=no])])
+ 
+-dnl Luckily both inetutils-ping and iputils-ping are nice.
+-AS_IF([test xno = x$alive_cv_nice_ping],
+-[AC_MSG_ERROR([$PING does not support ‘-n -c 1’.
+-Please install a ping program that does, and retry.])])
+-
+ AC_CONFIG_FILES([
+   Makefile
+   src/Makefile
diff --git a/net-analyzer/alive/metadata.xml b/net-analyzer/alive/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/alive/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/amap/Manifest b/net-analyzer/amap/Manifest
new file mode 100644
index 000000000000..ceb529a8114f
--- /dev/null
+++ b/net-analyzer/amap/Manifest
@@ -0,0 +1,7 @@
+AUX 4.8-system-pcre.patch 1232 SHA256 608adf3637c8670ad5cfe4a2f69cdab5640b427f94bfed3e00df5c68dbeeca66 SHA512 d22cb148748ec58920c0a66f67adb4df23dd081ab9c4e2e05881ce7029679e2ccf14e3cf6d199c63e5c0974ee6528fa8b0e85044cfdbba32833457e88a856934 WHIRLPOOL 95ff632d7fe74bfa917426bb6c28fe6f4aa9594e4f34c71a4525bfec3e2745040517daf4181978a9d97c85c8395302b0a841b72ce4cd1df21a99cc20b25430ef
+DIST amap-5.4.tar.gz 263331 SHA256 a75ea58de75034de6b10b0de0065ec88e32f9e9af11c7d69edbffc4da9a5b059 SHA512 e1a9f03940eded3eedad0028786f4ea6c18077072d52eb2f843ef0b4ff736bf1766c4bdb4eff52d3a8f6038d8f795e39be1c15bcae8283ddae8f40a7fff8647d WHIRLPOOL a7f08440d4e9ccf8ef1909aecebd95bb7a2bb7ddb5917d76b796e146821fe2d962518673faedd9f7665e18b97302e5ac50953f875473dd41328e1b5e77996240
+EBUILD amap-5.4-r1.ebuild 1640 SHA256 e75268e4f4c4b70391c7890dd8178efb97209ea54d802a1c8a4c072ded36e614 SHA512 4b231ecac2b0e06d9bab6fc0786e48f516a7a0fc5489b199fe1c1978731c3d8dadaee9b66bab580ead7a221066a658976b41713b2269232c4177cacfdeb9d455 WHIRLPOOL 6104d4c27dd5fe699511207597f690d99adb5e3fa229ef03249686637fc5f9baa298d7eb9e554284a9f7a5c6ee84089f20086e1b7e70d9052fee384cf6d8a350
+EBUILD amap-5.4.ebuild 1578 SHA256 a4c5d6d198721f6f0e41c5207b811fe1ed3e396d21ae385decde4943a5c4c9a9 SHA512 fa9614124ba7947ecdc46b3e31950e32dd40e2b699d6bd6f03d940a149f17468c92a5571be13061ac602a25192bda1d4da5bae14f408c35dc3fa50647902514c WHIRLPOOL 3de3ea4e62cb16b3bf1aec74cd5112e239b3288d91ef3bdba6d441142d08ad7ccb730a82cacc07932e6940df4795ed6bff110455f74cd00b35605875af58132d
+MISC ChangeLog 2611 SHA256 33984471a82fb47f85fd27868784144510049faea233f50813e8eea6b7171012 SHA512 6cc7512328d936dd1cb2b07eb54119367a2a5cf3b15130bbb87d170641f8d63cd2cfffdcc7c95a61efbd7758ee53d6d06840180266a4d9cd0fc3c41ad0fa1dea WHIRLPOOL df8d8ddc44cbdd525dbce59d7f340d3d25ff7f9ba5257d16231bb25eb5e0e9fc79e3ab6670a035d05b32f8838fd396d6ac25497d182dc2c28f69e40e9d968e99
+MISC ChangeLog-2015 7154 SHA256 6c3d96543b50c1a6ebdc22fd7c379295ef66a52473ebf0f1cd584850c3747fea SHA512 cbb8ce5b2f276509a84304fe1e00e96b55293fa3c06583c51fc5382a6aac57e1c38d8aa181cabf4d5fb50ac4d67cd20b6f79c0c004a8d5b285fd2180852fab7e WHIRLPOOL 58c5b54f31e38aec21c67220b507a8f1d46a405fc688137ee9f2f6f1bacb29b31d5d9f63f68b9aa71ce80c00979c77aa2cd29433af2326d750d34770becb31d1
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/amap/amap-5.4-r1.ebuild b/net-analyzer/amap/amap-5.4-r1.ebuild
new file mode 100644
index 000000000000..e29b58609849
--- /dev/null
+++ b/net-analyzer/amap/amap-5.4-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A network scanning tool for pentesters"
+HOMEPAGE="https://www.thc.org/thc-amap/"
+SRC_URI="https://www.thc.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="libressl ssl"
+
+DEPEND="
+	dev-libs/libpcre
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+RDEPEND="
+	${DEPEND}
+	!sci-biology/amap
+"
+
+src_prepare() {
+	rm -r pcre-3.9 || die
+	sed -i -e "s:etc/:share/amap/:g" amap-lib.c || die
+	# Above change requires below change. See sources...
+	sed -i '/strlen(AMAP_PREFIX/s: 5 : 12 :' amap-lib.c || die
+	sed -i 's:/usr/local:/usr:' amap.h || die
+	# Files to be updated are at different location, bug 207839.
+	sed -i '/AMAP_RESOURCE/s:www:freeworld:' amap.h || die
+
+	sed -i '/DATADIR/s:/etc:/share/amap:' Makefile.am || die
+
+	epatch "${FILESDIR}"/4.8-system-pcre.patch
+}
+
+src_configure() {
+	# non-autotools configure script
+	./configure || die
+	sed -i \
+		-e '/^XDEFINES=/s:=.*:=:' \
+		-e '/^XLIBS=/s:=.*:=:' \
+		-e '/^XLIBPATHS/s:=.*:=:' \
+		-e '/^XIPATHS=/s:=.*:=:' \
+		-e "/^CC=/d" \
+		Makefile || die
+	if use ssl ; then
+		sed -i \
+			-e '/^XDEFINES=/s:=:=-DOPENSSL:' \
+			-e '/^XLIBS=/s:=:=-lcrypto -lssl:' \
+			Makefile || die
+	fi
+	sed -i Makefile \
+		-e '/-o amap/{s|(OPT) |(OPT) $(LDFLAGS) |g}' \
+		|| die
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) OPT="${CFLAGS}"
+}
+
+src_install() {
+	dobin amap amapcrap
+	insinto /usr/share/amap
+	doins appdefs.*
+
+	doman ${PN}.1
+	dodoc README TODO CHANGES
+}
diff --git a/net-analyzer/amap/amap-5.4.ebuild b/net-analyzer/amap/amap-5.4.ebuild
new file mode 100644
index 000000000000..2181149109b0
--- /dev/null
+++ b/net-analyzer/amap/amap-5.4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A network scanning tool for pentesters"
+HOMEPAGE="https://www.thc.org/thc-amap/"
+SRC_URI="https://www.thc.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+IUSE="ssl"
+
+DEPEND="
+	dev-libs/libpcre
+	ssl? ( >=dev-libs/openssl-0.9.6j )
+"
+RDEPEND="
+	${DEPEND}
+	!sci-biology/amap
+"
+
+src_prepare() {
+	rm -r pcre-3.9 || die
+	sed -i -e "s:etc/:share/amap/:g" amap-lib.c || die
+	# Above change requires below change. See sources...
+	sed -i '/strlen(AMAP_PREFIX/s: 5 : 12 :' amap-lib.c || die
+	sed -i 's:/usr/local:/usr:' amap.h || die
+	# Files to be updated are at different location, bug 207839.
+	sed -i '/AMAP_RESOURCE/s:www:freeworld:' amap.h || die
+
+	sed -i '/DATADIR/s:/etc:/share/amap:' Makefile.am || die
+
+	epatch "${FILESDIR}"/4.8-system-pcre.patch
+}
+
+src_configure() {
+	# non-autotools configure script
+	./configure || die
+	sed -i \
+		-e '/^XDEFINES=/s:=.*:=:' \
+		-e '/^XLIBS=/s:=.*:=:' \
+		-e '/^XLIBPATHS/s:=.*:=:' \
+		-e '/^XIPATHS=/s:=.*:=:' \
+		-e "/^CC=/d" \
+		Makefile || die
+	if use ssl ; then
+		sed -i \
+			-e '/^XDEFINES=/s:=:=-DOPENSSL:' \
+			-e '/^XLIBS=/s:=:=-lcrypto -lssl:' \
+			Makefile || die
+	fi
+	sed -i Makefile \
+		-e '/-o amap/{s|(OPT) |(OPT) $(LDFLAGS) |g}' \
+		|| die
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) OPT="${CFLAGS}"
+}
+
+src_install() {
+	dobin amap amapcrap
+	insinto /usr/share/amap
+	doins appdefs.*
+
+	doman ${PN}.1
+	dodoc README TODO CHANGES
+}
diff --git a/net-analyzer/amap/files/4.8-system-pcre.patch b/net-analyzer/amap/files/4.8-system-pcre.patch
new file mode 100644
index 000000000000..097bfbf45eb5
--- /dev/null
+++ b/net-analyzer/amap/files/4.8-system-pcre.patch
@@ -0,0 +1,45 @@
+diff --exclude='*~' -urN amap-4.8.orig/amap-inc.h amap-4.8/amap-inc.h
+--- amap-4.8.orig/amap-inc.h	2005-02-21 21:47:47.251638320 -0500
++++ amap-4.8/amap-inc.h	2005-02-21 21:48:27.774477912 -0500
+@@ -20,7 +20,7 @@
+ #include <errno.h>
+ #include <sys/resource.h>
+ #include <sys/wait.h>
+-#include "pcre-3.9/pcre.h"
++#include <pcre.h>
+ #ifdef OPENSSL
+  #include <openssl/ssl.h>
+  #include <openssl/err.h>
+diff --exclude='*~' -urN amap-4.8.orig/configure amap-4.8/configure
+--- amap-4.8.orig/configure	2005-02-21 21:47:47.240639992 -0500
++++ amap-4.8/configure	2005-02-21 21:48:41.379409648 -0500
+@@ -13,10 +13,6 @@
+   exit 0
+ fi
+ 
+-cd pcre-3.9 || exit 1
+-./configure || exit 1
+-cd ..
+-
+ echo
+ echo
+ echo "Starting amap auto configuration ..."
+diff --exclude='*~' -urN amap-4.8.orig/Makefile.am amap-4.8/Makefile.am
+--- amap-4.8.orig/Makefile.am	2005-02-21 21:47:47.242639688 -0500
++++ amap-4.8/Makefile.am	2005-02-21 21:49:16.070135856 -0500
+@@ -1,5 +1,5 @@
+ CC=gcc
+-LIB=-lpcre -L./pcre-3.9/ -I./pcre-3.9/
++LIB=-lpcre
+ OPT=-O2
+ OPT_DEBUG=-ggdb -Wall -lefence
+ BINDIR=/bin
+@@ -7,7 +7,7 @@
+ MANDIR=/man/man1
+ SCRIPTS=appdefs.trig appdefs.resp appdefs.rpc
+ MANPAGE=amap.1
+-all:	pcre strip
++all:	amap amapcrap
+ 
+ pcre:
+ 	cd pcre-3.9 && make
diff --git a/net-analyzer/amap/metadata.xml b/net-analyzer/amap/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/amap/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/angst/Manifest b/net-analyzer/angst/Manifest
new file mode 100644
index 000000000000..6e7a36e6e0e2
--- /dev/null
+++ b/net-analyzer/angst/Manifest
@@ -0,0 +1,6 @@
+AUX 0.4b-libnet-1.0.patch 518 SHA256 8492b351fd10697c6fd114645e9ad31dd53eba8724c9c088b0f023219188bab2 SHA512 59164bff22aa252b414820fd47fa06059be5ab2587236c378a08ab7e576bd41947d66ea872e673707586893ae61117aa4320baf583d2a30f603b53a497b49032 WHIRLPOOL ae76bed8e9d45f480bbc17ae360db2447f49fe923977572826310a0c52aa41142b6a3eb20ecb08ac7c524494e41b670424113694a71359f1c54790e7b80f8e40
+DIST angst-0.4b.tar.gz 13909 SHA256 609a7008030649171d6041bd1dd29ec1644db011ad7f8ba2074727a583366dc8 SHA512 5584b1dd01d781cd34b594fcc8970764874599a1f15b1185066ee21c11cde23af148270c178d6a0b3436d71955aaf1cd904703f9dfb0c75d0b70c04d394fb449 WHIRLPOOL 85ece3435a9adf81d20a4579beb86f96002fbe8b8f6d75e96080a88fdc4a0dc3fc133db09fab818874571709e07ec8c73ec26c5391bc2dda46a65b1ef478b0b4
+EBUILD angst-0.4b-r2.ebuild 848 SHA256 e7be369feb100484a3455443a52e4410ebcb7c9a7e6862ca0e28326423204c27 SHA512 7ddd27ba2be944a552127e8fb7f03a7e35a5a2e919d0b4c582eae4360fa9dfca3e2a8e8f65daa3bac5afc72a074e9fedca0ba39774a9f0c836a9ea0001fb4a3b WHIRLPOOL 91b9c8d706d7c9256b7a0f3a03b3497924f2aebf1965b8c77baaccdeac21a614fae25439e4ce92d550d7ca55da4e7b12deb1dd09e646e50a6a46e4d72b0e644c
+MISC ChangeLog 3005 SHA256 be89d4b5cc787b0f7766cb53cad252a0aa777ee7f3cdc2ec05fc1ea6e49d2747 SHA512 318588af0ac0101b83eb93d5a14972871bc23566eaddaef81eb3c98dbb3175ab950359b1a2ae197f82224fa4936fae5ce3578e3ff31a21c923492b368069968d WHIRLPOOL 0c9807abcad3fabe7487ec5345c837c1c4db29e21932db136651b6c875fe713b75d5e31cb6ef54f6874888b73e9c6332016bb8775d5a4399f6d540d8c094d08b
+MISC ChangeLog-2015 1931 SHA256 879e2e657b9a999483841c05c65bb71af16b719b09e7f21e7f31ed92134ad0de SHA512 92e795fc46fdc6820159f8465545362334e4e138f44823a670f3ff216be775c2ec9804c357c527083b57f915db7916808cf8b69497ff94d3020b54c6ab0170cb WHIRLPOOL 4b876e6278d508c46e7379cac14c5294bc5dc01fa5b60f0389e1f26804be4415d29c39230b8cb024158035bdbb3159c12d28a12ff948310321507d84fb6f4bdb
+MISC metadata.xml 471 SHA256 44c37beb334252194232ef19cb7f06275b15d7d670afa8eab145e073f453da9a SHA512 0632876623160e4192bdf280011de0006adec537ad7065da350fde0a0b338b264f60cd6acdaeb439316d28ac84bfe100527b532c20a65606d1bb91ba415a82b4 WHIRLPOOL f1141cf6499dfb1e446aaac78b0f21e7dda21367530648062154c786c7bab9672fffb55f5f7a1341e3415e325996eed930e7bb2d1b62b2a2cf047677eab48041
diff --git a/net-analyzer/angst/angst-0.4b-r2.ebuild b/net-analyzer/angst/angst-0.4b-r2.ebuild
new file mode 100644
index 000000000000..f06986f35421
--- /dev/null
+++ b/net-analyzer/angst/angst-0.4b-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="an active sniffer that provides methods for aggressive sniffing on switched LANs"
+HOMEPAGE="http://angst.sourceforge.net/"
+SRC_URI="http://angst.sourceforge.net/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+
+DEPEND="net-libs/libpcap
+	net-libs/libnet:1.0"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cp -av Makefile.linux{,.orig}
+	epatch "${FILESDIR}"/${PV}-libnet-1.0.patch
+	sed -i Makefile.linux \
+		-e 's|^CC =|CC ?=|g' \
+		-e '/ -o angst /s|$(OBJS)|$(LDFLAGS) &|g' \
+		|| die
+}
+
+src_compile() {
+	emake \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CC="$(tc-getCC)" \
+		-f Makefile.linux
+}
+
+src_install() {
+	dosbin angst
+	doman angst.8
+	dodoc README TODO ChangeLog
+}
diff --git a/net-analyzer/angst/files/0.4b-libnet-1.0.patch b/net-analyzer/angst/files/0.4b-libnet-1.0.patch
new file mode 100644
index 000000000000..b78243a1a187
--- /dev/null
+++ b/net-analyzer/angst/files/0.4b-libnet-1.0.patch
@@ -0,0 +1,12 @@
+--- Makefile.linux.orig	2003-08-19 01:22:26.737300264 -0400
++++ Makefile.linux	2003-08-19 01:22:26.745299048 -0400
+@@ -14,2 +14,2 @@
+-LIBS = -L/usr/local/lib `libnet-config --libs` -lpcap
+-DEFINE = `libnet-config --defines` -DLINUX #-DDEBUG
++LIBS = -L/usr/local/lib `libnet-1.0-config --libs` -lpcap
++DEFINE = `libnet-1.0-config --defines` -DLINUX #-DDEBUG
+--- angst.h.orig	2003-08-19 01:22:26.741299656 -0400
++++ angst.h	2003-08-19 01:22:26.751298136 -0400
+@@ -12 +12 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
diff --git a/net-analyzer/angst/metadata.xml b/net-analyzer/angst/metadata.xml
new file mode 100644
index 000000000000..8064bf27c79f
--- /dev/null
+++ b/net-analyzer/angst/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>an active sniffer that provides methods for aggressive sniffing on switched LAN</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">angst</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/apinger/Manifest b/net-analyzer/apinger/Manifest
new file mode 100644
index 000000000000..74383313145b
--- /dev/null
+++ b/net-analyzer/apinger/Manifest
@@ -0,0 +1,5 @@
+DIST apinger-0.4.1.tar.gz 26328 SHA256 eb63985d231e7af3ad894d4ef6a2f1c413a937598431d386b5f4044680577f93 SHA512 b8a67149f43da5b6e240dee97315c31a3e6257f1de70da81a6aa63d1e1d7d5bff0b54abe5085a57e90eb7789b7fa8b83c09a51411a6247a81b6f99de3d83120f WHIRLPOOL ab4b73dd13d62cc59becf3c18531738700083e110a6e809c853695e18616e4838b0789a7c357f5b5b81a91a37d8a940409a53562ab8a80b3fbece0f840faec7c
+EBUILD apinger-0.4.1.ebuild 723 SHA256 8ca4ea79a1b3867afb29b3d565187b73a126f794c020d448049adf112f453b13 SHA512 5d71d0686bf29d06fe35726d59b0925377c91e9a176cbfe87958453917a32b0ee853f61c5a6ba3ead9affb61856b418768ac7f4a9a60b219b139a6d8c8900ade WHIRLPOOL 01168423520fc03dd21a5fea355bc03a699c5569319f50527e9b4c05d04fb54d51b7e8d4f8bc10c0f88a861706dd63c4fe037a0a0ec2ee713c2e65fa7eecdbe9
+MISC ChangeLog 2687 SHA256 ea5f747c3134eb200fa020eda91de84b77e31aa23e29cb279f60c8049b4d1f4c SHA512 ce2121f5f8308f0633de0da981358e8c5dcca1be66313ca0831f55d1fede5c7e1f8da4d64b3886e96ad4494ed2a706a819087e7d928c6af7881b3068e3983394 WHIRLPOOL c9f848554d4aec37d1dd2f14ab6295c9e035a4c199e2a88456afabef94d95f33d7461aa8c53ac38e9fbd417c6635c42535a496bc31078f402da1811c4c46781c
+MISC ChangeLog-2015 346 SHA256 f9a9f43b8010a621751a26854603bf55b9f83366ecd3eada6ed0718d861886c8 SHA512 04ecb28634e9b9e55da27a888cab395ac73e8893dd83fa7f63eae9e58ac06e66311d06eed1a4201dd51b32b669dc6b6f43e113f6ab21f1ad700a2519cd42a364 WHIRLPOOL a0542307a7594e0fd933f1c1c28b4eeb3977193079092909f21359546923feacabfa340ad1ca0d32954bc90742ab25676e9f0ed33d0d0d543af0ba06af4fd835
+MISC metadata.xml 359 SHA256 e1cfc1898fab795732a31496eeeca034a19c903bf037c44894f8e021a09d537c SHA512 d4166ecf10d6c588adc68ccd871986e7de28191c76a18b45922925552d30534e1631b61974e21a477f9c9facedf698a964256f08b04ad3e0bbdfec87c5246d8b WHIRLPOOL fde7552ed86e648966a94c48e5860fb54fe7631a90973c903396c810da9ffd023e248e1d0fadbdc717b1f823556c87d4f9d2ea8ee4ec2fb87df9b7a4090a27da
diff --git a/net-analyzer/apinger/apinger-0.4.1.ebuild b/net-analyzer/apinger/apinger-0.4.1.ebuild
new file mode 100644
index 000000000000..8b2eb5418a76
--- /dev/null
+++ b/net-analyzer/apinger/apinger-0.4.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools
+
+# Switch to ^^ when we switch to EAPI=6.
+#MY_PN="${PN^^}"
+MY_PN="APINGER"
+MY_P="${MY_PN}_${PV//./_}"
+
+DESCRIPTION="Alarm Pinger"
+HOMEPAGE="https://github.com/Jajcus/apinger/"
+SRC_URI="${HOMEPAGE}archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	sys-devel/flex
+	virtual/yacc
+"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_prepare() {
+	sed -i -e 's|\\$||g' acinclude.m4 || die
+	eautoreconf
+}
+
+src_compile() {
+	emake -C src/ cfgparser1.h
+	default
+}
+
+src_install() {
+	default
+	insinto /etc
+	doins src/${PN}.conf
+}
diff --git a/net-analyzer/apinger/metadata.xml b/net-analyzer/apinger/metadata.xml
new file mode 100644
index 000000000000..6aec7233ff54
--- /dev/null
+++ b/net-analyzer/apinger/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Jajcus/apinger</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/argus-clients/Manifest b/net-analyzer/argus-clients/Manifest
new file mode 100644
index 000000000000..b99c5ddc9847
--- /dev/null
+++ b/net-analyzer/argus-clients/Manifest
@@ -0,0 +1,9 @@
+AUX argus-clients-3.0.4.1-disable-tcp-wrappers-automagic.patch 593 SHA256 660ffa757355cc450f646248bc324fa66038582466eb10985f4521e19bed0509 SHA512 f817bd51125c4c0c8f17b651db2edb1be232440f0a3e3922588e23f5e26c0cff3d0682a0d23654386b5db318d39daa20c6bc94966925d98e62ebae225da74894 WHIRLPOOL e7b8ba0274e356ca808388382b99d90a0fd42d6fe926b6072da0648b7abc4e5bbdfbf380e2026eda4ef7b2af7c69df04e4d573651b8cdd0554ee3c96ca7afd35
+AUX argus-clients-3.0.7.21-curses-readline.patch 611 SHA256 75fd8b13b094126170ad9d19adaeedefe333c22bc85780fab1b1097de3025482 SHA512 17910c0e2e2d3efefd1efe713bea5b394087415d103aa18254c7f8e8e4f4aae7d8670db8ab9d6045c145bfc0d5e804c653eca6e1c169813075c1af37ff01a0b2 WHIRLPOOL 5a5122fb267d5cb22a62a85911b1969ece8e55cdeb8763eebb9ba989dc1103eb21cace21598754e0a1cc607163631084f2b42559d41237d440fb252d64e10996
+DIST argus-clients-3.0.8.2.tar.gz 2776072 SHA256 32073a60ddd56ea8407a4d1b134448ff4bcdba0ee7399160c2f801a0aa913bb1 SHA512 20aac16bd6474b8f98c8fc86b21ad0b43aca62264c6de2f7f26eea876a90f7276cdaf2241a510a19ae445f40f5d0d05ec6a5869980b6889e6eb5937dbff0f855 WHIRLPOOL 87d13fdf38e5fef6901d11613c51abecb6862ae4a3d1e8eb318342dbc3a9289c2fbd8a4c5741a4f2cfc4597087f0a18d475494e53679a95d6ce732e271f4fbde
+DIST argus-clients-3.0.8.tar.gz 2627515 SHA256 aee8585d50959e00070a382f3121edfaa844a0a51dc0b73edf84c0f4eb8912c9 SHA512 79022b3c3e472ebc526b27c20c25ae97abdb9a363a91ebbe3baf405f2aba9bdd80fbc0250b444d3d7ab4488e3c1325389a4719e92d9aded7598a91c3309369c2 WHIRLPOOL 5147a80ade6beaa44029253807033b1257b0826631deba66cb1176d82919e7e454b5e95df453d15e5a0a6b9b6e09472ab84d21b06ae97e69fca4217028513849
+EBUILD argus-clients-3.0.8.2.ebuild 1453 SHA256 b01d1edde7a94360ae83e513e0edbda6b0252fcabd55e53b0725e532984eb8e2 SHA512 b5fd648853deb3a81982a462da9e6ac1c8cbcc453fb6144e5afa303a6465f33daf846212e47d781c33b9e5a0737fa8fcc6dcb0edc4ebf4a1f59583606382851b WHIRLPOOL 5b4a5bbccffd47d970dd1e41a1333325d36656c2fda1b9910dcb17b82cfaddcbb531d1437bbd013ab08983f54cc8e77f6038a3d014d13b2ba8c34ae4df8d9f3c
+EBUILD argus-clients-3.0.8.ebuild 1446 SHA256 62d387b50562971112b96d903ce65705ca25e50f89de7975b183bfd322188677 SHA512 90119ef5268e3afafb73b97d4eab3b55d761609064b1d1f371f908715d49f81992d35d6f86466f312e106b014410b1afe4b6815d5b626a2e0485f74cd968f147 WHIRLPOOL b1a10ef515eb8941efa9e9a765e91e41cf6f446bceaf2a57001732cf1ff7a2ceca636652efe77cc021bc404da824df5633c7440ee73fd0b0208f973d8ae10795
+MISC ChangeLog 2893 SHA256 04bee886ff2204b894c634c1a019879ddde14692855ba233549feab5b2391881 SHA512 2b3b86263e6e12623de28b6abb782f877e1bd99324a303ac516c991108af2bcb6c46f7e1001e59982fc99da7776bc9ae9437b4156c824c35da29cf51c2608f56 WHIRLPOOL ed515f0df15fc959a06e9287af6550be18e32788b6b00d574745ecdebcdf76cca668791987ce4fcf1c5c25d266242aebf1224f90f8266f7dc6f395c2171c4b4e
+MISC ChangeLog-2015 12347 SHA256 79222dc46ed6890c29614336d796a449042d971867bf24d44f9a7d46a8605d2e SHA512 d299ee06868c1bb0cbb6cf9495f7a2767302d16e31237ab4e4de60ceef1a9fa4e107f77cd5c8db15ab4a8989c1524a912b639267de63af3bff109e1c6cfa7df4 WHIRLPOOL 13f2bf02702a6289697ab77b1106efa4247742e4c1ee424df99787d56c03d4466e4c4ee756e9dc67d508dbc2678a9fdc3a09079604d77bb8b106a0ea982f795e
+MISC metadata.xml 383 SHA256 2c3fe7c57097d3fafe1fdc33d3444e9e7cabe0078dc54ee8cfc153b945c35a77 SHA512 16728e62acf8d17d105ce0d0c0bd32197a9157544aeee9c9601ffc716ccd70cb126086b732c2814d5c4124f3546bb1fe7efddd27b7f686ae2c1960cbf7f90780 WHIRLPOOL 1eea94b31f31998fa8e71b686a612a5d289b637ae9c6ed9e0d86a9c2667a74d14d9f49f65b79ebfe2499661915ec8ab4b17c133b25fa03631492c0e373efe210
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild
new file mode 100644
index 000000000000..efa07fed3bd7
--- /dev/null
+++ b/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="Clients for net-analyzer/argus"
+HOMEPAGE="http://www.qosient.com/argus/"
+SRC_URI="http://qosient.com/argus/dev/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug ft geoip mysql sasl tcpd"
+
+MY_CDEPEND="
+	net-analyzer/rrdtool[perl]
+	net-libs/libpcap
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	sys-libs/zlib
+	ft? ( net-analyzer/flow-tools )
+	geoip? ( dev-libs/geoip )
+	mysql? ( virtual/mysql )
+	sasl? ( dev-libs/cyrus-sasl )
+"
+
+RDEPEND="
+	${MY_CDEPEND}
+"
+
+DEPEND="
+	${MY_CDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch \
+		"${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch
+
+	sed -i -e 's| ar | $(AR) |g' common/Makefile.in || die
+	tc-export AR RANLIB
+
+	eautoreconf
+}
+
+src_configure() {
+	use debug && touch .debug
+	econf \
+		$(use_with ft libft) \
+		$(use_with geoip GeoIP /usr/) \
+		$(use_with sasl) \
+		$(use_with tcpd wrappers) \
+		$(use_with mysql)
+}
+
+src_compile() {
+	# racurses uses both libncurses and libtinfo, if present
+	emake \
+		CCOPT="${CFLAGS} ${LDFLAGS}" \
+		RANLIB=$(tc-getRANLIB) \
+		CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)"
+}
+
+src_install() {
+	dobin bin/ra*
+	dodoc ChangeLog CREDITS README CHANGES
+	doman man/man{1,5}/*
+}
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild
new file mode 100644
index 000000000000..7dbfc5a721a2
--- /dev/null
+++ b/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="Clients for net-analyzer/argus"
+HOMEPAGE="http://www.qosient.com/argus/"
+SRC_URI="http://qosient.com/argus/dev/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="debug ft geoip mysql sasl tcpd"
+
+MY_CDEPEND="
+	net-analyzer/rrdtool[perl]
+	net-libs/libpcap
+	sys-libs/ncurses
+	sys-libs/readline
+	sys-libs/zlib
+	ft? ( net-analyzer/flow-tools )
+	geoip? ( dev-libs/geoip )
+	mysql? ( virtual/mysql )
+	sasl? ( dev-libs/cyrus-sasl )
+"
+
+RDEPEND="
+	${MY_CDEPEND}
+"
+
+DEPEND="
+	${MY_CDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch \
+		"${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch
+
+	sed -i -e 's| ar | $(AR) |g' common/Makefile.in || die
+	tc-export AR RANLIB
+
+	eautoreconf
+}
+
+src_configure() {
+	use debug && touch .debug
+	econf \
+		$(use_with ft libft) \
+		$(use_with geoip GeoIP /usr/) \
+		$(use_with sasl) \
+		$(use_with tcpd wrappers) \
+		$(use_with mysql)
+}
+
+src_compile() {
+	# racurses uses both libncurses and libtinfo, if present
+	emake \
+		CCOPT="${CFLAGS} ${LDFLAGS}" \
+		RANLIB=$(tc-getRANLIB) \
+		CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)"
+}
+
+src_install() {
+	dobin bin/ra*
+	dodoc ChangeLog CREDITS README CHANGES
+	doman man/man{1,5}/*
+}
diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.4.1-disable-tcp-wrappers-automagic.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.4.1-disable-tcp-wrappers-automagic.patch
new file mode 100644
index 000000000000..a08d974ce893
--- /dev/null
+++ b/net-analyzer/argus-clients/files/argus-clients-3.0.4.1-disable-tcp-wrappers-automagic.patch
@@ -0,0 +1,23 @@
+--- configure.ac.org	2011-01-28 18:26:54.000000000 +0100
++++ configure.ac	2011-04-20 00:09:37.000000000 +0200
+@@ -121,6 +121,12 @@
+ esac
+ 
+ AC_QOSIENT_THREADS(V_THREADS)
++
++AC_ARG_WITH(wrappers,
++   [  --with-wrappers         build with libwrappers suuport],
++   with_wrappers="$withval",
++   with_wrappers="yes")
++if test "x$with_wrappers" != "xno"; then
+ AC_QOSIENT_TCPWRAP(V_WRAPDEP, V_INCLS)
+ if test ! -z "$V_WRAPDEP"; then
+    if test -f $V_WRAPDEP; then
+@@ -144,6 +150,7 @@
+    AC_DEFINE([HAVE_TCP_WRAPPER], [], [Using Tcp wrappers])
+    WRAPLIBS="$V_WRAPDEP"
+ fi
++fi
+ 
+ CURSESLIB=""
+ 
diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.7.21-curses-readline.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.7.21-curses-readline.patch
new file mode 100644
index 000000000000..787ff5ac9118
--- /dev/null
+++ b/net-analyzer/argus-clients/files/argus-clients-3.0.7.21-curses-readline.patch
@@ -0,0 +1,21 @@
+--- a/examples/ratop/Makefile.in
++++ b/examples/ratop/Makefile.in
+@@ -54,7 +54,8 @@
+ DEFS = @DEFS@
+ COMPATLIB = @COMPATLIB@ @LIB_SASL@ @LIBS@ @V_THREADS@ @V_GEOIPDEP@ @V_PCRE@ @V_FTDEP@ @ZLIB@
+ 
+-CURSESLIB = @CURSESLIB@ @V_READLINE@
++CURSESLIB = @CURSESLIB@
++V_READLINE = @V_READLINE@
+ 
+ # Standard CFLAGS
+ CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
+@@ -93,7 +94,7 @@
+ all: $(PROGS)
+ 
+ $(INSTALLBIN)/ratop: $(OBJ) $(LIB)
+-	$(CC) $(CFLAGS) -o $@ $(OBJ) $(LDFLAGS) $(LIB) $(COMPATLIB) $(CURSESLIB)
++	$(CC) $(CFLAGS) -o $@ $(OBJ) $(LDFLAGS) $(LIB) $(COMPATLIB) $(CURSESLIB) $(V_READLINE)
+ 
+ CLEANFILES = $(OBJ) $(PROGS)
+ 
diff --git a/net-analyzer/argus-clients/metadata.xml b/net-analyzer/argus-clients/metadata.xml
new file mode 100644
index 000000000000..f94ded5e56fe
--- /dev/null
+++ b/net-analyzer/argus-clients/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<use><flag name="ft">Enable support for flow packets through
+<pkg>net-analyzer/flow-tools</pkg></flag></use>
+</pkgmetadata>
diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest
new file mode 100644
index 000000000000..9a7640c7cbfc
--- /dev/null
+++ b/net-analyzer/argus/Manifest
@@ -0,0 +1,11 @@
+AUX argus-3.0.5-Makefile.patch 437 SHA256 ffbdc3e14ffd00c00e82675f47da7ffba824585b81b1cba0d0914ff220bd400d SHA512 cec8fae0027bcd48bf878781ed5b0352a1501cdd6a0470a76b6346aab3587b275d877434e1a3feddeebe3f4e166d42d07fd007a4b60cbef15d29076c188993b7 WHIRLPOOL d0f7d15e90ffe9c1743962120344365d8f4f211bc10e26ded15789abe19fb7e1e9671a40e2906be2756449b4ddcf24fb46f2fae93236025ea72e6bafcf39002c
+AUX argus-3.0.7.3-DLT_IPNET.patch 538 SHA256 5921972d79151e7809e62aabcb264f9edae2ef1a0d023338b0debf4b595c4713 SHA512 3f52c9531675713177cecb208d4b9c11e26ce60c4fa2e932520969dcbf74f37979443c2ad5039e61b803385058ea6a45e19afeed9f4b815a4dbf43ee5628621c WHIRLPOOL fdd17a2c9fd0577326daf92452dc74466e7e58290f3e338bf05296305612f68d11fa7ca037bb150cdf8e20ca1efc650a2fd63142a40ae2a06f024a182058d141
+AUX argus-3.0.8.1-disable-tcp-wrappers-automagic.patch 591 SHA256 0280a1ac020dcdf4c3791e444f44024c2943eddf5bcae0fb24339461462e72c5 SHA512 325cdc2c18ccf8665db11ab52f500395a0a76660c4c6d2620c8500a966e5f432c77d53b88549825bb90378929c6be47e35db792b59a9e74acec45a8c8ff73037 WHIRLPOOL 29ae63eb0f457237ed048f87e913be50c6894a32a7ea2fdd77faf95228b300e1335cace695c9f06998149867d17d9c6b6e86d99fc12d2721dfac958b86cc26fd
+AUX argus.initd 365 SHA256 4216da1c68e2e82e9d0eb23e0dd60459c9203854e1f6d11d78d16e437c8c66ad SHA512 54cbc2a0d92e5d0813ff6aecbf5f6d083e7de708a974af8aa90ce112e2d697b53b00e7918405973f487b2d9733bd2326a083ed13b52ee8dbbda4b06b73d95231 WHIRLPOOL 3ee148d0e2e595cf24ccf6371f9f8a4c1de8bb5cc05738a076e588a0c5e6bb5f5f9f0fed62da20cd8fad8b5c88a80c2860064f364884abc049a6a76c83654354
+DIST argus-3.0.8.1.tar.gz 523375 SHA256 1fb921104c8bd843fb9f5a1c32b57b20bfe8cd8a103b3f1d9bb686b9e6c490a4 SHA512 d96332849df7ce2297aa0d81a9f22c12763d04b2936ffaffc0e4b1942535846cfbc41dadf28791eb88d1ffd0429bdc280d16dff44369c415c713064849b158f7 WHIRLPOOL 2c9495d585c2297b3f9951e74a8fd28840941be6b298c0178d44801242d1abda4bd08f9469e2dd1a4b802735611c9ff82bc028d838628b1ccb184ba80d5dc529
+DIST argus-3.0.8.2.tar.gz 524749 SHA256 ca4e3bd5b9d4a8ff7c01cc96d1bffd46dbd6321237ec94c52f8badd51032eeff SHA512 146795880d8697e065ed23d2fbab226846d55db0b71945c5a4cab2896e48ceb6e1671ccb4e00dc3b0f984525bac4ced3773f3b9e70c3ea5f7c6972fe9bd94313 WHIRLPOOL 4a8fc3ce60df4da4cde87acec5f125d487c478a02a8789296d1f279081f6b8aabd604c3e6aefc0b8e472c4aef11dbef9e034f73a7de371ff18499d0ebb3618e8
+EBUILD argus-3.0.8.1.ebuild 1850 SHA256 d82bb4c464f603ab4e3c59d07a9e2256befa55a8275fdb40298bb846e78a5037 SHA512 7fae97954944c0c5d22f8a688a3ceeae803309c3b0f5d1d2c8144ef6fcc840e8997820d1974b3e1fbd0e72fdda3071d0b9641c59de43c098ce4aff8648448c87 WHIRLPOOL 103f219675531039833b3ea6238a7b80b5b26d5c33daff9751412788cd7e6b491479146893af33d32ddee7d06a50c8bfd1eeca2fe39964a4e5494e28b036a37a
+EBUILD argus-3.0.8.2.ebuild 1876 SHA256 8ca7018449d29f654e032e7d48912bf39e0b3e4e18486e46a377716e5462c5fd SHA512 70832f5bc42829924d7667e79018eb859e381b4cc0811e8147fe9e87b9170ff4f5250c18f020af9fe376da7cce98afca031b4550217608e3e8ee0a29cb8e8ce9 WHIRLPOOL 87c974c68e6b97756269afd808f83ceee85e354a2fabae398f12dc5d9afa30c72a5417fd01cdcdd83d987040d66208e9ca0fcd6fc7f2c8dff473d5dc97e669cf
+MISC ChangeLog 4135 SHA256 ae94681577b4a6299e5c39ba0d93aa1333589f6a3fe4ebc699368d4954864a1e SHA512 547f9de80d1db70f26925b4d8093c8f7cb20e8c70e178d6b32555e8de2d23bd5a7e4eea9e66f156c8a2133c5e7baa3a31fe1a2483c384bb14f9d8477e93b0c91 WHIRLPOOL 7693fdc92a138d845987e78152ec84141810e18988baf13e61ae7692959bde32178b91c8943884a061f0d338c83883abca4e736a846901d58cc09a2e5f0c4c5d
+MISC ChangeLog-2015 9185 SHA256 fe6b50e15a5ac84cc4c1b3d0067402edf5944b3d5caf30a147eeaf05da0b2ed9 SHA512 ff4e8208341eafca681ce21db1a2d58aa59f7ae59eb48419d898b0199d700ce1a08614851f0145727f779f0ebee18cb0d8c6dcbf3e018246533e7bf7d244f962 WHIRLPOOL adf0adea7876f811a529ab22c6072114e258ad15a6c697e6618849cdc42344768630337cd160b8d2e39648ce5b662113690b354da7ac8d9ce84475521cbcb285
+MISC metadata.xml 366 SHA256 93d538a9e291d67e36025f5ee48d8b50966778e3f3f6978cb9bd104a673e1ef4 SHA512 52ae5aab1db1228559c6c5851f3b5ceee14573c40b59c90500d574a351483c761c0d517e2918cc3b57c59b8e0350643bba3b0060f5acbb0cca6b3a22e60225cc WHIRLPOOL 9ed8849333455e9e87b3c5cf36f2cc14ca2190e40b965b5e67ce411f64d1a4e62ac4f2928458e7bda523c7e097e2e1c9e4d170dd155df2460d346fbcdf9933e1
diff --git a/net-analyzer/argus/argus-3.0.8.1.ebuild b/net-analyzer/argus/argus-3.0.8.1.ebuild
new file mode 100644
index 000000000000..605285628f0b
--- /dev/null
+++ b/net-analyzer/argus/argus-3.0.8.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils user
+
+DESCRIPTION="network Audit Record Generation and Utilization System"
+HOMEPAGE="http://www.qosient.com/argus/"
+SRC_URI="http://qosient.com/argus/src/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="debug sasl tcpd"
+
+RDEPEND="
+	net-libs/libpcap
+	sys-libs/zlib
+	sasl? ( dev-libs/cyrus-sasl )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+"
+
+DEPEND="
+	${RDEPEND}
+	>=sys-devel/bison-1.28
+	>=sys-devel/flex-2.4.6
+"
+
+src_prepare() {
+	find . -type f -execdir chmod +w {} \; #561360
+	sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \
+		-i argus/argus.c \
+		-i support/Config/argus.conf \
+		-i man/man8/argus.8 \
+		-i man/man5/argus.conf.5 || die
+
+	sed -e 's:#\(ARGUS_SETUSER_ID=\).*:\1argus:' \
+		-e 's:#\(ARGUS_SETGROUP_ID=\).*:\1argus:' \
+		-e 's:\(#ARGUS_CHROOT_DIR=\).*:\1/var/lib/argus:' \
+			-i support/Config/argus.conf || die
+	epatch \
+		"${FILESDIR}"/${PN}-3.0.8.1-disable-tcp-wrappers-automagic.patch \
+		"${FILESDIR}"/${PN}-3.0.5-Makefile.patch \
+		"${FILESDIR}"/${PN}-3.0.7.3-DLT_IPNET.patch
+	eautoreconf
+}
+
+src_configure() {
+	use debug && touch .debug # enable debugging
+	econf $(use_with tcpd wrappers) $(use_with sasl)
+}
+
+src_compile() {
+	emake CCOPT="${CFLAGS} ${LDFLAGS}"
+}
+
+src_install () {
+	doman man/man5/*.5 man/man8/*.8
+
+	dosbin bin/argus{,bug}
+
+	dodoc ChangeLog CREDITS README
+
+	insinto /etc/argus
+	doins support/Config/argus.conf
+
+	newinitd "${FILESDIR}/argus.initd" argus
+	keepdir /var/lib/argus
+}
+
+pkg_preinst() {
+	enewgroup argus
+	enewuser argus -1 -1 /var/lib/argus argus
+}
+
+pkg_postinst() {
+	elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite"
+	elog "possible that the init script will fail to work."
+}
diff --git a/net-analyzer/argus/argus-3.0.8.2.ebuild b/net-analyzer/argus/argus-3.0.8.2.ebuild
new file mode 100644
index 000000000000..927bbe427308
--- /dev/null
+++ b/net-analyzer/argus/argus-3.0.8.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils user
+
+DESCRIPTION="network Audit Record Generation and Utilization System"
+HOMEPAGE="http://www.qosient.com/argus/"
+SRC_URI="${HOMEPAGE}dev/${P/_rc/.rc.}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="debug sasl tcpd"
+
+RDEPEND="
+	net-libs/libpcap
+	sys-libs/zlib
+	sasl? ( dev-libs/cyrus-sasl )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+"
+
+DEPEND="
+	${RDEPEND}
+	>=sys-devel/bison-1.28
+	>=sys-devel/flex-2.4.6
+"
+
+S=${WORKDIR}/${P/_rc/.rc.}
+
+src_prepare() {
+	find . -type f -execdir chmod +w {} \; #561360
+	sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \
+		-i argus/argus.c \
+		-i support/Config/argus.conf \
+		-i man/man8/argus.8 \
+		-i man/man5/argus.conf.5 || die
+
+	sed -e 's:#\(ARGUS_SETUSER_ID=\).*:\1argus:' \
+		-e 's:#\(ARGUS_SETGROUP_ID=\).*:\1argus:' \
+		-e 's:\(#ARGUS_CHROOT_DIR=\).*:\1/var/lib/argus:' \
+			-i support/Config/argus.conf || die
+	epatch \
+		"${FILESDIR}"/${PN}-3.0.8.1-disable-tcp-wrappers-automagic.patch \
+		"${FILESDIR}"/${PN}-3.0.5-Makefile.patch \
+		"${FILESDIR}"/${PN}-3.0.7.3-DLT_IPNET.patch
+	eautoreconf
+}
+
+src_configure() {
+	use debug && touch .debug # enable debugging
+	econf $(use_with tcpd wrappers) $(use_with sasl)
+}
+
+src_compile() {
+	emake CCOPT="${CFLAGS} ${LDFLAGS}"
+}
+
+src_install () {
+	doman man/man5/*.5 man/man8/*.8
+
+	dosbin bin/argus{,bug}
+
+	dodoc ChangeLog CREDITS README
+
+	insinto /etc/argus
+	doins support/Config/argus.conf
+
+	newinitd "${FILESDIR}/argus.initd" argus
+	keepdir /var/lib/argus
+}
+
+pkg_preinst() {
+	enewgroup argus
+	enewuser argus -1 -1 /var/lib/argus argus
+}
+
+pkg_postinst() {
+	elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite"
+	elog "possible that the init script will fail to work."
+}
diff --git a/net-analyzer/argus/files/argus-3.0.5-Makefile.patch b/net-analyzer/argus/files/argus-3.0.5-Makefile.patch
new file mode 100644
index 000000000000..87b1c155caf8
--- /dev/null
+++ b/net-analyzer/argus/files/argus-3.0.5-Makefile.patch
@@ -0,0 +1,20 @@
+Do not continue when a sub-make errors (bug #380953).
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -55,11 +55,11 @@
+ .PHONY: install installdirs all
+ 
+ all: force
+-	@-for d in $(DIRS);\
++	@for d in $(DIRS);\
+ 	do \
+-		(cd $$d; echo "### Making in" `pwd`;\
+-			$(MAKE) $(MFLAGS) ;\
+-			echo "### Done with" `pwd`);\
++		echo "### Making in" $$d;\
++			$(MAKE) -C $$d $(MFLAGS) || exit 1;\
++		echo "### Done with" $$d;\
+ 	done
+ 
+ install:  force
diff --git a/net-analyzer/argus/files/argus-3.0.7.3-DLT_IPNET.patch b/net-analyzer/argus/files/argus-3.0.7.3-DLT_IPNET.patch
new file mode 100644
index 000000000000..f7b4bfa4cc6c
--- /dev/null
+++ b/net-analyzer/argus/files/argus-3.0.7.3-DLT_IPNET.patch
@@ -0,0 +1,17 @@
+In file included from ./ArgusModeler.h:330:0,
+                 from ./argus.h:40,
+                 from ArgusSource.c:67:
+./ArgusSource.h:893:6: error: ‘ArgusIpNetPacket’ undeclared here (not in a function)
+
+--- a/argus/ArgusSource.h
++++ b/argus/ArgusSource.h
+@@ -889,9 +889,6 @@
+ #ifdef DLT_JUNIPER_ETHER
+    { ArgusJuniperPacket,   DLT_JUNIPER_ETHER,  "ArgusJuniperPacket()" },
+ #endif
+-#ifdef DLT_IPNET
+-   { ArgusIpNetPacket,   DLT_IPNET,  "ArgusIpNetPacket()" },
+-#endif
+    { NULL, DLT_NULL, "" },
+ #endif
+    { NULL, 0, NULL},
diff --git a/net-analyzer/argus/files/argus-3.0.8.1-disable-tcp-wrappers-automagic.patch b/net-analyzer/argus/files/argus-3.0.8.1-disable-tcp-wrappers-automagic.patch
new file mode 100644
index 000000000000..917f864cf065
--- /dev/null
+++ b/net-analyzer/argus/files/argus-3.0.8.1-disable-tcp-wrappers-automagic.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -251,6 +251,11 @@
+ AC_QOSIENT_MEMORY
+ 
+ AC_QOSIENT_THREADS(V_THREADS)
++AC_ARG_WITH(wrappers,
++   [  --with-wrappers         build with libwrappers support],
++   with_wrappers="$withval",
++   with_wrappers="yes")
++if test "x$with_wrappers" != "xno"; then
+ AC_QOSIENT_TCPWRAP(V_WRAPDEP, V_INCLS)
+ if test ! -z "$V_WRAPDEP"; then
+    if test -f "$V_WRAPDEP"; then
+@@ -274,6 +279,7 @@
+    AC_DEFINE([HAVE_TCP_WRAPPER], [], [Using Tcp wrappers])
+    WRAPLIBS="$V_WRAPDEP"
+ fi
++fi
+ 
+ AC_QOSIENT_LIBPCAP(V_PCAPDEP, V_INCLS)
+ if test ! -z "$V_PCAPDEP"; then
diff --git a/net-analyzer/argus/files/argus.initd b/net-analyzer/argus/files/argus.initd
new file mode 100644
index 000000000000..2b02852fdf5c
--- /dev/null
+++ b/net-analyzer/argus/files/argus.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting argus"
+	start-stop-daemon --start --quiet --exec /usr/sbin/argus -- -d
+	eend $? 
+}
+
+stop() {
+	ebegin "Stopping argus"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/argus
+	eend $?
+}
diff --git a/net-analyzer/argus/metadata.xml b/net-analyzer/argus/metadata.xml
new file mode 100644
index 000000000000..90955da4b592
--- /dev/null
+++ b/net-analyzer/argus/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<longdescription>network Audit Record Generation and Utilization System</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/arp-scan/Manifest b/net-analyzer/arp-scan/Manifest
new file mode 100644
index 000000000000..23852c78cbb2
--- /dev/null
+++ b/net-analyzer/arp-scan/Manifest
@@ -0,0 +1,5 @@
+DIST arp-scan-1.9.tar.gz 488442 SHA256 ce908ac71c48e85dddf6dd4fe5151d13c7528b1f49717a98b2a2535bd797d892 SHA512 5061ac82d1acad3dd5dab998e4e2d2d9d2dbf436a2839ee1f68dd2997278df7e77f5dda7e54bdb13c9200d7a714b8d82737c041cec8438571d1d14c9d7f936ac WHIRLPOOL b23e193c6335c32a64363e3f0e66f6c7c39efdc292e02efdccf36452b48feb878486c5dfde4b8977e6fde6669aeeefad1931c1ea35e4a6a75b69817682b1d73a
+EBUILD arp-scan-1.9.ebuild 459 SHA256 01b62f3905114f31616c9db6d68a5ac52dde66963225f7b945db6d952ab13583 SHA512 942f0976f6516572819ae3676e6cd0bebed767b991c577652c805b6f472a49a93da206f69955d83d354639deff18188c65c8a5f51d92029a22a20fc97930abe2 WHIRLPOOL 28bed576c0b4decb7c24917da9270e7179ff34df1e68959fd2e0944ff570013812945a1dee5a212a6cb77bd7871b57a377e5d9ea3754877b23d9bd1ddd41b511
+MISC ChangeLog 2430 SHA256 a645db2722002ed074167ff81695b036023e6bf11c8084b20451443acc08be94 SHA512 85c9191c5d51ce673bcdd572a178930aebccf965e1db60a1e279cd4543e481905715ed06deb43f9da101878c450e80b8eac8f88a3fd66e7a455523af589022f1 WHIRLPOOL c4d7cf69e5b880649ce31239af36b2127a126a889e30412db4deae1afb9b56246b4c6d7630a243e8322249d7d52ef0c01c517602b5fb04741481a98986b7497f
+MISC ChangeLog-2015 377 SHA256 2c0488d65ea813676ce5fd52cd741064f35cbdd6262facd2a0c30e3189dde25f SHA512 ff02a89eba9e3496291dc186643250926906ac436fa4b482db2823cf0d1a3f765dbfba1c71ee81c94b74fadbd3910485a3ecaacda4dd000749754bd49a43a36a WHIRLPOOL 79028db78f498eb90539ef5b4bb1e64aa456dd8e7d92558e758eff1ae8e53e76a8ebdfae8c8dcd5dfe63741f41403fe5f2bfa3e261d65b8fb82e596b1cd9b6a7
+MISC metadata.xml 362 SHA256 6e357e52af906911ea37fd2f37fd6b747d62deeec2b82c85add0a5a70500a880 SHA512 513df53208e314f55d1f2a2b14fbbfe7f28ab654f4b38be1adeb24490279a8f6cf276cd29941d4453702d208425380f926c43d9aac1e045b52bf67d118438ea8 WHIRLPOOL 260745425c87783bda80f92b7e1530195585f5102f13a70dca473dd1f81c8758803be00cb6575149c3a2d5deb6b42855c7ad48b41386ba63c568c435dc36f362
diff --git a/net-analyzer/arp-scan/arp-scan-1.9.ebuild b/net-analyzer/arp-scan/arp-scan-1.9.ebuild
new file mode 100644
index 000000000000..822ad877ab64
--- /dev/null
+++ b/net-analyzer/arp-scan/arp-scan-1.9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="ARP scanning and fingerprinting tool"
+HOMEPAGE="
+	http://www.nta-monitor.com/tools-resources/security-tools/arp-scan
+	https://github.com/royhills/arp-scan
+"
+SRC_URI="http://www.nta-monitor.com/files/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	net-libs/libpcap
+"
+RDEPEND="
+	${DEPEND}
+	dev-lang/perl
+"
diff --git a/net-analyzer/arp-scan/metadata.xml b/net-analyzer/arp-scan/metadata.xml
new file mode 100644
index 000000000000..2c12d90c2aae
--- /dev/null
+++ b/net-analyzer/arp-scan/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">royhills/arp-scan</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/arp-sk/Manifest b/net-analyzer/arp-sk/Manifest
new file mode 100644
index 000000000000..90d64e733758
--- /dev/null
+++ b/net-analyzer/arp-sk/Manifest
@@ -0,0 +1,6 @@
+AUX arp-sk-0.0.16-libnet1_2.patch 1362 SHA256 6aac11b8aa24535511849289f76b1a0b5a8ec1acd43b0d2c6bebd0c36d154d42 SHA512 04cd17513d19f0e70b54840148fb8d603c06385e601f352cfadc381de5109b547e204414830fa195cfac56e662ffdfb234f54b8fec9ab68316cfdd4220bdb922 WHIRLPOOL ffcedafc850362788a1bdc6a67ee9989f5cacaf9fcc8c5f498935b080aff88ee4451e7bb50980655ab3ae99f52ceb38b960a666dc0321aabd1678aa6c08a51d8
+DIST arp-sk-0.0.16.tgz 211636 SHA256 6e1c98ff5396dd2d1c95a0d8f08f85e51cf05b1ed85ea7b5bcf73c4ca5d301dd SHA512 d827ab5c701e1e3a6444dbe7e1e7c0a73ee2bfb2339a55fc7d3591ee8e9e9aadef4dfd4aaf331251fbe22d83c9b1135068e5afa6303eae934b3fd149ca0819a6 WHIRLPOOL 66e774c1c47c912132559067c5991c16bec4738b39d474a7a7b3d0011c4b17b1c09d4073843fd705b87cd30036c6a2cf9566c384a03a0dc177925d4293db938a
+EBUILD arp-sk-0.0.16-r2.ebuild 761 SHA256 f4449934e15c6809072d941d9f8b4503016d0a47cd8a8372119ed5738e181b8a SHA512 68e39c4bd35973f696545bed0e4ad9499964190cf7b2cc6aae4131cbad63dafaee73af258ad26c0e5f26b60e2b64637a265e53e514bbdb662210c59d1854d3b1 WHIRLPOOL e9f67016cbaeb8494629a4fcdf6bf378e79ac2259983ec62343052a51010517e64fe70aa87ad0a39a8fc3ca01153136ffc98ac65b111a9a798a7d2749ef0cd86
+MISC ChangeLog 2474 SHA256 2fb809aa6955f6a0cdc457a88e86fd00d7a2c9a3320364c8f7b78ad53a045a67 SHA512 6ed876787dfafbe73863e2224feaad1ca9a23f1cacba7e5210c138287072cb218966b3f50ec24544c8575885d41dfd01895f5bc2fe0e241729ea5169e057d33b WHIRLPOOL 4c21828e587ab534a1e61a6117068573cb313955ce59d7681efe02cc56c444ddde6d4e6c68ff9035690a4d0f659bd79276b454dcad93ce4adddf6f21f21c4a98
+MISC ChangeLog-2015 2837 SHA256 bdd41f796ad4148b29144d7e2f5b1a203449ce21edb5a62f1b6286b86cb3e0ec SHA512 2ceaa893f06f29654f49696c080da6d5f0ba43bbdb00bd303dad9c68aedad89d073e8a1615809d7276ff8afd9d79ea408063ec022e40d3e673a1521f36a68765 WHIRLPOOL da91fbbbe8ef3197534b296273d23780c88a4177721a457fd409d8e174d4bc2d3ffcd37361606dbf50cf30fd3ef1f985733f5b823a51f81921e848d78db8d79d
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild b/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild
new file mode 100644
index 000000000000..773e349fc87b
--- /dev/null
+++ b/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils multilib
+
+DESCRIPTION="A swiss knife tool for ARP"
+HOMEPAGE="http://sid.rstack.org/arp-sk/"
+SRC_URI="http://sid.rstack.org/arp-sk/files/${P}.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+DEPEND=">=net-libs/libnet-1.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( ARP AUTHORS CONTRIB ChangeLog README TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnet1_2.patch
+	sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
+	rm missing || die
+	epatch_user
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	# We don't need libcompat as it has a potential to clash with other packages.
+	rm -fr "${D}"/usr/$(get_libdir)
+}
diff --git a/net-analyzer/arp-sk/files/arp-sk-0.0.16-libnet1_2.patch b/net-analyzer/arp-sk/files/arp-sk-0.0.16-libnet1_2.patch
new file mode 100644
index 000000000000..1fac654c0d86
--- /dev/null
+++ b/net-analyzer/arp-sk/files/arp-sk-0.0.16-libnet1_2.patch
@@ -0,0 +1,50 @@
+--- a/configure.in
++++ b/configure.in
+@@ -114,47 +114,6 @@
+   AC_MSG_RESULT(yes) ]
+ )
+ 
+-dnl Now let's checck the version of libnet (1.1.x requirerd)
+-AC_MSG_CHECKING(for version 1.1.x of libnet)
+-AC_TRY_RUN([
+-#include "$NETINC/libnet.h"
+-#include <string.h>
+-int main()
+-{
+-   return (strncmp(LIBNET_VERSION, "1.1.", 4));
+-}
+-],
+-[ AC_MSG_RESULT(yes)],
+-[  AC_MSG_RESULT(no)
+-   AC_MSG_ERROR(Bad libnet version found in $NETINC/libnet.h:
+-download libnet-1.1.x from http://www.packetfactory.net/projects/libnet/. 
+-If you think this version of libnet is already installed on your system
+-tell arp-sk where it is using --with-libnet=DIR)
+-]
+-dnl ,
+-dnl [  v=(`sed -n /LIBNET_VERSION/p /usr/local/include/libnet.h  | sed s/\"//g |awk '{print $3}'`)
+-dnl   echo "v=$v"
+-dnl   save_IFS="${IFS}"
+-dnl   IFS=.
+-dnl   vatb=(${v[0]})
+-dnl   IFS=$save_IFS
+-dnl   LIBNET_MAJOR=${vtab[0]}
+-dnl   LIBNET_MINOR=${vtab[1]}
+-
+-dnl   if [ $LIBNET_MAJOR==1 -a $LIBNET_MINOR==1 ]; then 
+-dnl     AC_MSG_RESULT(yes);
+-dnl   else
+-dnl    AC_MSG_RESULT(no)
+-dnl    AC_MSG_ERROR(Bad libnet version:
+-
+-dnl $NETINC/libnet.h
+-
+-dnl download libnet-1.1.x from http://www.packetfactory.net/projects/libnet/. 
+-dnl If you think this version of libnet id already installed on your system, 
+-dnl tell arp-sk where it is using --with-libnet=DIR)
+-dnl   fi
+-dnl ]
+-)
+ 
+ 
+ NETINC="-I$NETINC"
diff --git a/net-analyzer/arp-sk/metadata.xml b/net-analyzer/arp-sk/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/arp-sk/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/arping/Manifest b/net-analyzer/arping/Manifest
new file mode 100644
index 000000000000..b9a9a233f8ac
--- /dev/null
+++ b/net-analyzer/arping/Manifest
@@ -0,0 +1,10 @@
+DIST arping-2.17.tar.gz 174346 SHA256 b954655b2121abc086bb4464de2e242b5da643c3621edfdd3853118ea438ed01 SHA512 062026f522ab3d3b96c05c97aa3133995bce808a25a470207359a1236886da0300368ddac7d76568201510c0bcc2ac4ef6b34b2284c8d367c1be41972f0ee1c2 WHIRLPOOL 79f023699b0197812d286c7a5b178cf093e0cc966ebaa26d405434ff3afd4d6b15b1901faa6a8f349b66ff37eb982fa05777cffbfeef2778575a77b813eb33b2
+DIST arping-2.18.tar.gz 175691 SHA256 2b97c797969a597af6715c306ab03bb9c851fbc45c0378def257e8e2d57bf869 SHA512 0ce54bd834695d1f624e9846d1796a316e5a733b83cdeaf745f522e1311f082d646c265a90b90b524d7e718070d61dd9ca767b5365f9fd5bd0a807e37c4d4c89 WHIRLPOOL ae7f831de78ad7d4bbe0c15616717844b91a7cbfe632c9e82110caa8322225256f1c49f51bf45eeffac647a7664f3f0983ccc57dfd7dc3836eee5d19453873a7
+DIST arping-2.19.tar.gz 177178 SHA256 36e97b58076dcd478cf732682e828ec00026dd8ec8f63201d147960be25e6616 SHA512 7ad242202432d91adc34b049c5511529789cf381ef02e803f8fc61394a5540427b719981946a36f692df9b1b3186e3f39b0f867f583aa42e237ae7f7549822a2 WHIRLPOOL cce463c6b6aca5d99e73a4727002559c48d597459420aec9310c86229ab1b872b4cc01d595a8f3fc2e239103d9ffef89ae5fb84800b6c51788e71a1a663cdc8a
+EBUILD arping-2.17.ebuild 706 SHA256 fea4c2842686d350a009564769adac448c3c51b28d589724940709fc498dd0ee SHA512 8537da18d1a79d669899c82dc6344f27467824257ed327a070168060e745d23996d85692034cedf85b3a1e0073fb06f91f1b7615a134832a5d8139be0b8b127d WHIRLPOOL 0645b9791440e426577b97f7044636f4a5fe14e2641ce6b96756a042df8b3dbfc6aeeedf9ad6b55db4b0e6df7b19b75c54dbfe8782be0de2dec473a539f3dc98
+EBUILD arping-2.18.ebuild 715 SHA256 2120c520b934eb4b6c41620917ef9e4befed1582cec422049103afc1c5a3c0c8 SHA512 72eb38608ba78934fd605170084642724f5ca05c020ec4a8b95f88e2652969225a8376af4cceda3f7ec9a5b91c18b50a01c4badc1d92e9aea47e5024a8940472 WHIRLPOOL fffbebadcb1355615f07b4f82fed523a5b18977ed2e8280c26a023c6a51f379f376cee3c9f147edc68d40ec75a7af58e80063fcd03ecde74f92d6a6ec4186dc5
+EBUILD arping-2.19.ebuild 715 SHA256 2120c520b934eb4b6c41620917ef9e4befed1582cec422049103afc1c5a3c0c8 SHA512 72eb38608ba78934fd605170084642724f5ca05c020ec4a8b95f88e2652969225a8376af4cceda3f7ec9a5b91c18b50a01c4badc1d92e9aea47e5024a8940472 WHIRLPOOL fffbebadcb1355615f07b4f82fed523a5b18977ed2e8280c26a023c6a51f379f376cee3c9f147edc68d40ec75a7af58e80063fcd03ecde74f92d6a6ec4186dc5
+EBUILD arping-9999.ebuild 560 SHA256 5005b32ba9a31bfd32853f9b555972f41fc6e703e5e7d46364e3bd5169ee234d SHA512 15d957759b39e7a4322094c7e47afca64eb6793b8a54b75b2cc7540842a6e0716bf6cf6e90c371b616b21ebfab6a3cd320f44d45940177c90cfe2ecd46d0a9d6 WHIRLPOOL eb9391c8caffe011cc041ebdaa7cc5866de850222cf489fad15055546539b24dbddf4a7594a6b3d8eefce2e84d4aecdaa1c08d3e18ab1cbd1ebe827125089a68
+MISC ChangeLog 3922 SHA256 3a135a11d87165faab1006a2b82f2352ca9b7bd7a450c2f6a2d69d1975a2f650 SHA512 630a7622024f835865852c4c26ee2ea350a8f5579c86ea2df6e8a3b883ef6732306e14a71fb99866144832dfe02de55ba417fb09149e28a897a6d130c635cfc5 WHIRLPOOL 07e543a8fe512666b06bbb35ed52dc4713505d8f72d6dee60b8b931e560ffac71542e67fd850449e24e115f91c4370b3ed8538804684624680067929628f3760
+MISC ChangeLog-2015 12513 SHA256 40c30b0b140d6798be951cf1f51d5fb3fa6ba6ce289116693428c93e446e39ff SHA512 a7565e03330a6688907ed6e609b2589aebad5e9b380df50c4ba6cc79f3de55c36b1e4fc3df66d76a594eee406e3e0774f2e663260028719aecac13d345632be5 WHIRLPOOL 12940ab05cd8d5af7c9ca903d5a26d714cdd82fc88a575addb3c42b394721f88894714e98062223702d7496118a71a118445b773752ba42feea0347734115c6f
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/arping/arping-2.17.ebuild b/net-analyzer/arping/arping-2.17.ebuild
new file mode 100644
index 000000000000..daee9ee7286b
--- /dev/null
+++ b/net-analyzer/arping/arping-2.17.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit fcaps
+
+DESCRIPTION="A utility to see if a specific IP address is taken and what MAC address owns it"
+HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping"
+SRC_URI="http://www.habets.pp.se/synscan/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="test"
+
+CDEPEND="
+	net-libs/libpcap
+	net-libs/libnet:1.1
+"
+DEPEND="
+	${CDEPEND}
+	test? ( dev-libs/check )
+"
+RDEPEND="
+	${CDEPEND}
+	!net-misc/iputils[arping(+)]
+"
+
+FILECAPS=( cap_net_raw /usr/sbin/arping )
diff --git a/net-analyzer/arping/arping-2.18.ebuild b/net-analyzer/arping/arping-2.18.ebuild
new file mode 100644
index 000000000000..1552c81188ae
--- /dev/null
+++ b/net-analyzer/arping/arping-2.18.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit fcaps
+
+DESCRIPTION="A utility to see if a specific IP address is taken and what MAC address owns it"
+HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping"
+SRC_URI="http://www.habets.pp.se/synscan/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="test"
+
+CDEPEND="
+	net-libs/libpcap
+	net-libs/libnet:1.1
+"
+DEPEND="
+	${CDEPEND}
+	test? ( dev-libs/check )
+"
+RDEPEND="
+	${CDEPEND}
+	!net-misc/iputils[arping(+)]
+"
+
+FILECAPS=( cap_net_raw /usr/sbin/arping )
diff --git a/net-analyzer/arping/arping-2.19.ebuild b/net-analyzer/arping/arping-2.19.ebuild
new file mode 100644
index 000000000000..1552c81188ae
--- /dev/null
+++ b/net-analyzer/arping/arping-2.19.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit fcaps
+
+DESCRIPTION="A utility to see if a specific IP address is taken and what MAC address owns it"
+HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping"
+SRC_URI="http://www.habets.pp.se/synscan/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="test"
+
+CDEPEND="
+	net-libs/libpcap
+	net-libs/libnet:1.1
+"
+DEPEND="
+	${CDEPEND}
+	test? ( dev-libs/check )
+"
+RDEPEND="
+	${CDEPEND}
+	!net-misc/iputils[arping(+)]
+"
+
+FILECAPS=( cap_net_raw /usr/sbin/arping )
diff --git a/net-analyzer/arping/arping-9999.ebuild b/net-analyzer/arping/arping-9999.ebuild
new file mode 100644
index 000000000000..252fac54a2de
--- /dev/null
+++ b/net-analyzer/arping/arping-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools fcaps git-r3
+
+DESCRIPTION="ARP Ping"
+HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping"
+EGIT_REPO_URI="https://github.com/ThomasHabets/arping"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS=""
+
+CDEPEND="
+	net-libs/libpcap
+	net-libs/libnet:1.1
+"
+DEPEND="
+	${CDEPEND}
+	dev-libs/check
+"
+RDEPEND="
+	${CDEPEND}
+	!net-misc/iputils[arping(+)]
+"
+
+FILECAPS=( cap_net_raw /usr/sbin/arping )
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/net-analyzer/arping/metadata.xml b/net-analyzer/arping/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/arping/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/arpoison/Manifest b/net-analyzer/arpoison/Manifest
new file mode 100644
index 000000000000..c1505300680a
--- /dev/null
+++ b/net-analyzer/arpoison/Manifest
@@ -0,0 +1,5 @@
+DIST arpoison-0.6.tar.gz 8646 SHA256 2922a7f98901a2eb3b26822e576ef22a64d3585fb69c4c3c4c32c2ca3993e537 SHA512 7c14a15b9b85f777e5151fae82dfbdb44dbfc85ce8f632b7d76727bce79ed7f958f725f39348489bc4659cb5e3b7ab5370e88e33c03277e16ab2f9ff00bb4038 WHIRLPOOL 17fb536d184c60a31d5f07c91da5232763a02c953ea821938f72293500f7f3adae43c1a2e58685852cd3f27803991f31447bce03a1ad71f89b026bae22164bd4
+EBUILD arpoison-0.6-r2.ebuild 777 SHA256 7317790a3d833a34f914cb8a600950948fbee5e34c4ba5cc69d8b909cc15e83d SHA512 91565961d5cf3148236dd4522ac5343e46eb3bc76dda80d8fc5b35b0d9d5a21cfa1c3716207b580a7fde7127b596295cceb7f14a9b52bbbf67afa0d170b988bc WHIRLPOOL bb265ed71e0aa1166561f5fa753a51251966dbd0e5822c2ceada38412a3a7ddeb921890d0fff8b6b71e14fb0b562870f11c6990caaf91650d5c433a813e12548
+MISC ChangeLog 2436 SHA256 34acbbde3d65c58787a60fe904cd599480ba7b450f4936760849d42ad48c381b SHA512 238bc438dc1fe71e89f5f4ffa241b428f68e0df4edc2684465d5695d69ba80dcf8addad1ad78b47e70eb88f9ae97cd6f446ee0d88a594fcdac53e509b90a1fc5 WHIRLPOOL b56f4585b6bb48bde63c3a60ecf3bd0e6bd5b21953b1a233a085c41ae1cc9fb50d8535bf8b7d58bba751cc256fc267b48dd8f0574dc0cb34c0ba4d464af91108
+MISC ChangeLog-2015 2363 SHA256 2c094374328f8dac3b0c0af3bd17038ddd7efbae2d9a22828e07903b57aaf2d3 SHA512 c391405aab45220d8579e2668f7c67a47909abd9e0f1596d263643edd01697e4b4ab249f2e1541d4a85d9c7183124eb304d5a0bf111cc7cf456a295e5d815b34 WHIRLPOOL 25ffcf400607911838feb60ca5178e93dfdc12dfe6f2dfb80be523ef808d2d3e850e81d490ec1bf37cd84639d121e52b65aa85dbd56e2d93ea04fbfd93340bd9
+MISC metadata.xml 358 SHA256 a4d37381c3159fbd9effac3fb203b2e17fb18e7536aceadfbc509f1c19ec7011 SHA512 9a11704d5314e9ab1a061a179e757146b29c52334511578fe958455d417652c0ab523a58a17580ea6892e528d44b06aa8510293664d78ed01f35e32ef1d7bc18 WHIRLPOOL 69315ebedcf70031a60df8b0ecda3cdd48283adb3fa677c382d32f85337447f8fdc0e272542acde157e228f8eb306d3cfe5e8e29b4a1faea12c6726f004447aa
diff --git a/net-analyzer/arpoison/arpoison-0.6-r2.ebuild b/net-analyzer/arpoison/arpoison-0.6-r2.ebuild
new file mode 100644
index 000000000000..628bef5fd8bf
--- /dev/null
+++ b/net-analyzer/arpoison/arpoison-0.6-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="A utility to poison ARP caches"
+HOMEPAGE="http://arpoison.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc x86"
+
+RDEPEND="net-libs/libnet:1.1"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	# respect CFLAGS, LDFLAGS and compiler, bug #337896
+	# fix for crosscompilation, bug #375655
+	sed -i Makefile \
+		-e 's|gcc \(-Wall\)|$(CC) \1 $(CFLAGS) $(LDFLAGS)|' \
+		-e "s|libnet-config|${ROOT}usr/bin/libnet-config|g" \
+		|| die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dosbin arpoison
+	doman arpoison.8
+	dodoc README TODO
+}
diff --git a/net-analyzer/arpoison/metadata.xml b/net-analyzer/arpoison/metadata.xml
new file mode 100644
index 000000000000..22b19a014fbc
--- /dev/null
+++ b/net-analyzer/arpoison/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">arpoison</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/arpon/Manifest b/net-analyzer/arpon/Manifest
new file mode 100644
index 000000000000..2726a543303e
--- /dev/null
+++ b/net-analyzer/arpon/Manifest
@@ -0,0 +1,7 @@
+AUX arpon.confd 128 SHA256 4a53348c990a145a6c8021941ce07f9a92ad87aaff59c95346339c92445afd61 SHA512 1300ffd903366a5970c5c2b6b7a570ee6e1e696d18a5f16340c7f192c5ff4e41694a180e0d5ab86c1fb64bd015dab94eb52ef5ff429280b56f5ec4112abe3b11 WHIRLPOOL 3757ed2b7e9d05858b78284201ca174fab7ff0538a95db9d27ec2568e554fd1f202080de670f6502a14555d5204854b3d5fed61ec33ca6475969c2a88ae043c9
+AUX arpon.initd 406 SHA256 09db82d7427d8043bee67ba9fd6ef7d7b53d2bfa60c59a9247d7dc45054f0a89 SHA512 5a889f94fa495ee63475a8ca2774b09247548a0a7170b32b0c74ed5808822818fda23516959ad4c3598ed39f31ad2a2ab68b81f00a715267b0d12e194532324a WHIRLPOOL 79d9fca85f5655d81d3b6a7f3b96b1cd71b842e4cf509b936b9b9cb990a1e1395b7144e7f87a6b4c8ae676f339ac490b55c07cb851364f395bd49e157f699366
+DIST ArpON-2.7.2.tar.gz 2780607 SHA256 99adf83e4cdf2eda01601a60e2e1a611b5bce73865745fe67774c525c5f7d6d0 SHA512 7518f8f8920817725c9b3e0a6420190dcc101b1c0c7cd9eec50870b3f893fe2322eddc90cb71e9c3c35326b4e1730aa02797ca51775caa9401807da3978628b4 WHIRLPOOL a164419425ad55d35ebb2bea17cedb4d834b99a17deb0c5a46d39b047cc937113359c39c5b6e1d156daecf3490a9dbf29eeff06c22c4dd2020ffcac00552cc00
+EBUILD arpon-2.7.2.ebuild 884 SHA256 4a22bfb4fd92b348497bb5a2953f51116026471e470e8b9e535ac835190e7f9d SHA512 4427110fc2ac7557d57d2bf9b453bb2b121ac5121e287d4273f1aea4bdc503ab38f64092c1776ca64d2ad66fddbeae4a25c82b53b98d6734b3a3347b070adbbe WHIRLPOOL 4f1a59cf05b8eea8cff84d9a902ef178236ac7a8bb0168a008ec8faa193e5bc0b732ac6a8e2c7e6278527fbeb944e02f6ebadd6e5710274ee3669d9fd9474845
+MISC ChangeLog 2392 SHA256 9b03f2f6c113dabc16ecb06681d0990ae3709648c7390caa04f672ff05d1e036 SHA512 1d071db0836dfaa5b50f5255f0cf2cbadb1c90b26484dfd392ae4fe3cc4cafa7716524f9f7a33adb42185ac7b0bdd727cec33e0d4cd50e4638c21dc15f943816 WHIRLPOOL 44fe2cc6275b6d0a9a0f79b7e5ed45fe38b9321833530e666c2e2571f8364b7fd76c80e2ab00cf677f8052058250c127c135bf4986e485c3f60a7e094fe6151d
+MISC ChangeLog-2015 2622 SHA256 4d95e5a55583d8eb23581361cddd78940d7eaa4b83cc98eb52b218f042772d92 SHA512 908d7810e50f6c2633d6542b74b072dc45adddcfc4f439bfd5209f272fc4296f87aeff16704ec4132e542bd9f69d92085ca036e332711d9cc82176b942206314 WHIRLPOOL 77b87c256daf276d73331bbcf320df34e13dbe780d9b4e056e86818773acbed3e03fb63e25e3abd22fd22f973c6e89b68cc1b1aab825a974e2312825d9872d17
+MISC metadata.xml 325 SHA256 8e21c508f520ae7a27ce63f4b09a48cb74a5c1cca9612ee99adac4a089eff83b SHA512 16d4be756ad83262eab59a91c3dd5b86d550eb5640dae17a236c07380848035ed81a9a2447f306a4eddc145d484a3f542f3a427c3c938382c47057e60d4901c3 WHIRLPOOL eae5012eb956dd5b87f7b617a1122301627bdb89a35e4862f6c7359f321e1ba0bead87e95a830e4abcc63fd1cf4180e317ba95975b528af3457002df59aa7d2d
diff --git a/net-analyzer/arpon/arpon-2.7.2.ebuild b/net-analyzer/arpon/arpon-2.7.2.ebuild
new file mode 100644
index 000000000000..a79e9de5e0fa
--- /dev/null
+++ b/net-analyzer/arpon/arpon-2.7.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils readme.gentoo-r1
+
+DESCRIPTION="ArpON (Arp handler inspectiON) is a portable Arp handler"
+
+MY_PN="ArpON"
+MY_P="${MY_PN}-${PV}"
+HOMEPAGE="http://arpon.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-libs/libdnet
+	net-libs/libnet:1.1
+	net-libs/libpcap"
+
+RDEPEND=${DEPEND}
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	sed -i -e "/set(CMAKE_C_FLAGS/d" CMakeLists.txt || die
+
+	DOC_CONTENTS="${PN} now installs an init script. Please edit
+		the /etc/conf.d/arpon file to match your needs"
+
+	cmake-utils_src_prepare
+}
+
+src_install() {
+	cmake-utils_src_install
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	readme.gentoo_create_doc
+}
diff --git a/net-analyzer/arpon/files/arpon.confd b/net-analyzer/arpon/files/arpon.confd
new file mode 100644
index 000000000000..d1ce050fa4cb
--- /dev/null
+++ b/net-analyzer/arpon/files/arpon.confd
@@ -0,0 +1,5 @@
+METHOD="--darpi"
+IFACE="eth0"
+LOGFILE="/var/log/arpon.log"
+
+ARPON_OPTS="${METHOD} --iface ${IFACE} --log-file ${LOGFILE} --log"
diff --git a/net-analyzer/arpon/files/arpon.initd b/net-analyzer/arpon/files/arpon.initd
new file mode 100644
index 000000000000..dc69135c26e3
--- /dev/null
+++ b/net-analyzer/arpon/files/arpon.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting arpon"
+	start-stop-daemon --start --background --make-pidfile --pidfile "/var/run/arpon.pid" \
+		--exec /usr/sbin/arpon -- ${ARPON_OPTS} >/dev/null 2>&1
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping arpon"
+	start-stop-daemon --stop --pidfile "/var/run/arpon.pid"
+	eend $?
+}
diff --git a/net-analyzer/arpon/metadata.xml b/net-analyzer/arpon/metadata.xml
new file mode 100644
index 000000000000..2e90eb6ff783
--- /dev/null
+++ b/net-analyzer/arpon/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">arpon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/arptools/Manifest b/net-analyzer/arptools/Manifest
new file mode 100644
index 000000000000..11cc593cc7f2
--- /dev/null
+++ b/net-analyzer/arptools/Manifest
@@ -0,0 +1,5 @@
+DIST arptools-1.0.2.tar.gz 87475 SHA256 7d53ee3fc70c2ad13338d721b84507f407a41ac1d4602ef6b5532651f928e9b6 SHA512 c976a5a7778a9330ebda6ed69ef045ede3747b98d27a7e575f985646a52bf57e4a6584da280a0a13520a43b5d765b2ddbec2239d7c3ac865ffdf1ae23f5ff347 WHIRLPOOL c88b2b20bf42eac35be972c64b54df3bac71ebba03d0a2ea282ada9203a5d0681a46d3080eac3c28b7e99aaa6080257d421e7d4d2cc14f9620243a1b0f96c132
+EBUILD arptools-1.0.2.ebuild 465 SHA256 902d6cd9a862d705b574460521ad06112b023a712094226de54d8a59feeb7a28 SHA512 369aead6e23542e8a30fdb23349b38981a9c39819383fcfaf9ae7edb0ba1afb3076913c6ab6b8a0d24559e7547918644ff77bea7e8d287c6c718820b2d53fc0f WHIRLPOOL 89721e8cd5e6e58b9a34783789aa3c865529d8bdd2579ae9ca6aecd29c01e09b42d94ad7cb30483359ff0850d91a7452931107913cf9f6e5899bb672f00fe227
+MISC ChangeLog 2434 SHA256 4a5dfd0de6b753f38f5e999259145e24f04a638bed95af98f12b99e1f5f961da SHA512 d13073bcd42e90ddd5dfe8e84b3c40142d5927d3d3f7add3b7cde10c6133dfec6f8bff8107d43724ee9892fdff58734b8f6c67cb6daa4766493017799fcd3a90 WHIRLPOOL 1ccfa79f352ad379c7959d1d15ae3549749789aeb3e429858e880c6fe9a65fa6c7f42008e1edcfab47d8dd6c835383e949ea091c2c787206a2b8e7aa38c86a54
+MISC ChangeLog-2015 1169 SHA256 d182394cd31355fb5502c7a65949b4a90c89d4720f1d045db994abca4fb3e689 SHA512 a6b6d4189afa335c498f9f0b9f1fd8d8cdd1821436711124528bf272d30c60b83cc55c5d1ad886b352e8a61a96ef3091d78691d4c390eb1ccf6c6b74533ad612 WHIRLPOOL e32137ac7b8446ae7f4541cd797e6188799a370ba2109df5e27de53720206dfea27d8e6301934e848646134a0a7eccc23dcb51e41ac27cc4dff415387979e8ef
+MISC metadata.xml 355 SHA256 b3af16cd1695672974919c206f8c76b8ca75e33c055d9ff4a6ae01bfb1343933 SHA512 bc5735d7a66320f39e87c77951652a28e4100b4236cf37ebeed12e62966b1a211f8af0cc78774c537e485488108ee5fb2bada682d4e5da91cfba36483986d1ca WHIRLPOOL adbffa8f6f96d80baf1951865cfa9fb0fa39bd429658fef37a82d0f1dc50f9df270fb3785fabb259f9c3533eab2a2821306aec79dc5e1a21d8a322c7942941e5
diff --git a/net-analyzer/arptools/arptools-1.0.2.ebuild b/net-analyzer/arptools/arptools-1.0.2.ebuild
new file mode 100644
index 000000000000..803627388131
--- /dev/null
+++ b/net-analyzer/arptools/arptools-1.0.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="a collection of libnet and libpcap based ARP utilities"
+HOMEPAGE="http://www.burghardt.pl/wiki/software/arptools"
+SRC_URI="http://www.burghardt.pl/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="
+	net-libs/libnet:1.1
+	net-libs/libpcap
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
diff --git a/net-analyzer/arptools/metadata.xml b/net-analyzer/arptools/metadata.xml
new file mode 100644
index 000000000000..ab242cac92e7
--- /dev/null
+++ b/net-analyzer/arptools/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+  <email>netmon@gentoo.org</email>
+  <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
new file mode 100644
index 000000000000..596b13e2c4f3
--- /dev/null
+++ b/net-analyzer/arpwatch/Manifest
@@ -0,0 +1,8 @@
+AUX arpwatch.confd 270 SHA256 bf36f7b717291733787bd00ac22d49dafc251cd50fcc27266d56d51364fd62fa SHA512 901375c1031c776f159cc526662e727be41dd9630037a492b718c9cc48d2fb580b22bcdf90a84a02049924e67fb84a2668e3519a7ab24e6c8ad07d20cc5adf41 WHIRLPOOL d6f691d769f2320870061667b241e8504207e1e326ab9c6cdede575f2e34696fc3f722a8038044c500855ff361c7f64aa3a64e3086b2c03665d41cabc1c32c35
+AUX arpwatch.initd 991 SHA256 d1b6667f2abf5910b6b1d845049b6504faa3346cc8cc4744a8314e4fad0d3672 SHA512 de62ab2026bb04f557731b741023b6fc2333656f4709226459e8bb17fee2959ad9e24077eae730443efa3736b6f0268c474ca65905c371d228c2f2869ec4986e WHIRLPOOL 36c4a091b888f69ca3a17b2a9e494c2162ea7a01bd7cd521b645009028855ec621936a867a9fb4b362b59cfde1e82414a2a6e1eb5ed44295fe0fa87b13376315
+DIST arpwatch-2.1a15.tar.gz 202729 SHA256 c1df9737e208a96a61fa92ddad83f4b4d9be66f8992f3c917e9edf4b05ff5898 SHA512 f770b5b7954afe910dafb016e6e886a4e785564bcdc0ea0de9d7b1ca6a9a0b219a9d1b50b6f42a67afc2f836e782e8ff85ba5780583015d62c9694ac53f0bf90 WHIRLPOOL e653eb83d8dbc8777c3aaa5920bc1e5b46c64aa740c64a79b24a42abdee4625baa72a51f9f0441549b7325fcb07b94f1964887df1b6d707eddde162e1073691f
+DIST arpwatch-patchset-0.7.tar.xz 132868 SHA256 ccc3f84f452306b153175bbdec33f9913848ac57866a4ee52b974d7087b7fe48 SHA512 2cbfa37acd29c30232da9ad0a742ddc9cd35c228fb786c6798555962841006ba0f47e31097722a3303e25f2e7c665b6e93707e49c02a8a9171b484b56a133e00 WHIRLPOOL f6624f459f2172b10beb6eaa15e0e5111566cd360195e4ca08ec4e5962bb1156aaf133701730e8146cb049a9759f7063bbc225d99f824827bb8bb72d3e0cebb3
+EBUILD arpwatch-2.1.15-r8.ebuild 1388 SHA256 25b638af397f39831891ead4ad2d001a460e64d41d753f2d936ae6a05b1c0f7c SHA512 73e3289f751cce19f522353c68b65d7222561adc70e79f58b848344487258c744541b03179bf712a38ed81f3565bb41c1262aa78eaa2ede1314a9751353fb0fe WHIRLPOOL a9301dd755f82d55e8bc3eee5879f2c5b19b8162c4b299c3e7d4a8936d410b17d67131d84e99aa71ea7f32ba58ddde36bee8a304ead31598881a3f8167e69856
+MISC ChangeLog 4319 SHA256 6e635c33144ae5f6e740999ffa3fdc17db6c040bf2a6c8d2a7da89153b7e3e6f SHA512 29e6a5722940d97daccf157d21ed8d4fb710b8f2bc830dd94f087db73969ffd5a3fdf5645782370c80f1297c7538830c05303aa9824a11eb1a6466b502232afb WHIRLPOOL f61b3a72ed41351d56ce1e6e86374a70e0a20fe855af726396c1d1dde76767eeefbbb5507233347c08eb5c26a3665cba537693766b540009e5d0b91d9c169c3e
+MISC ChangeLog-2015 9831 SHA256 4153a9e3c6c41d9496069c5130a8cd519ab5af0aea06be84e06dd774b7cc33b2 SHA512 c54e6fcf6ac25e9acb8ca7032b50ab4bc99443296fc1c7febb8edc2cf75cf455a3804613ea298a1c524e81e75e94978a12a084d7a35dec5141415a8063e2cdee WHIRLPOOL 5a806fc2a61e371177f23d9c7f876af1ed8ce9d089453b2baf5aee42c6647984b63ebb2c32e781b27e2a402bb1f1a7be4cb5b62d8046d0264761c900faf1948a
+MISC metadata.xml 741 SHA256 66eb596411f77ea8a0cd155225113f33021c8d6272743cd9e094fb1568fdc6cf SHA512 0db051d36fb16c5a50239a243ca46f686e71b13387330bf98df46c9af3389d16e9842b89c15d2e6fb3fba867e5a0b36a2fd745480588ba621e117ee86aadbd00 WHIRLPOOL ce532cc877efc26d1fae3b1dcff1b483b6e97efd2f1b11acade6c541591860b7982e2fdff48f9ef4afc7479b43512a5ba52bc4b9d3de3c66c6b461af663187a0
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild
new file mode 100644
index 000000000000..d6e8e99955c9
--- /dev/null
+++ b/net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils user versionator
+
+PATCH_VER="0.7"
+
+MY_P="${PN}-$(replace_version_separator 2 'a')"
+DESCRIPTION="An ethernet monitor program that keeps track of ethernet/ip address pairings"
+HOMEPAGE="http://ee.lbl.gov/"
+SRC_URI="
+	ftp://ftp.ee.lbl.gov/${MY_P}.tar.gz
+	https://dev.gentoo.org/~jer/arpwatch-patchset-${PATCH_VER}.tar.xz
+"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc sparc x86 ~x86-fbsd"
+IUSE="selinux"
+
+DEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses:*
+"
+
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-arpwatch )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_preinst() {
+	enewuser arpwatch
+}
+
+src_prepare() {
+	EPATCH_SOURCE="${WORKDIR}"/arpwatch-patchset/ EPATCH_SUFFIX="patch" epatch
+	cp "${WORKDIR}"/arpwatch-patchset/*.8 . || die
+}
+
+src_install () {
+	dosbin arpwatch arpsnmp arp2ethers massagevendor arpfetch bihourly.sh
+	doman arpwatch.8 arpsnmp.8 arp2ethers.8 massagevendor.8 arpfetch.8 bihourly.8
+
+	insinto /usr/share/arpwatch
+	doins ethercodes.dat
+
+	insinto /usr/share/arpwatch/awk
+	doins duplicates.awk euppertolower.awk p.awk e.awk d.awk
+
+	keepdir /var/lib/arpwatch
+	dodoc README CHANGES
+
+	newinitd "${FILESDIR}"/arpwatch.initd arpwatch
+	newconfd "${FILESDIR}"/arpwatch.confd arpwatch
+}
+
+pkg_postinst() {
+	fowners arpwatch:0 "${ROOT}"/var/lib/arpwatch
+}
diff --git a/net-analyzer/arpwatch/files/arpwatch.confd b/net-analyzer/arpwatch/files/arpwatch.confd
new file mode 100644
index 000000000000..98abe0417740
--- /dev/null
+++ b/net-analyzer/arpwatch/files/arpwatch.confd
@@ -0,0 +1,11 @@
+# Config file for /etc/init.d/arpwatch
+# see arpwatch.8 for more information
+
+#IFACES="eth0 eth1"
+IFACES="eth0"
+
+# Additional options to pass to arpwatch.
+OPTIONS="-N -p"
+
+# Comment this line if you wish arpwatch to run as root user (not recommended)
+ARPUSER="arpwatch"
diff --git a/net-analyzer/arpwatch/files/arpwatch.initd b/net-analyzer/arpwatch/files/arpwatch.initd
new file mode 100644
index 000000000000..5569dcee2527
--- /dev/null
+++ b/net-analyzer/arpwatch/files/arpwatch.initd
@@ -0,0 +1,36 @@
+#!/sbin/openrc-run
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	for IFACE in ${IFACES}
+	do
+		ebegin "Starting arpwatch on ${IFACE}"
+		DATAFILE=/var/lib/arpwatch/${IFACE}.dat
+		[ ! -f ${DATAFILE} ] && touch ${DATAFILE}
+
+		if [ -z ${ARPUSER} ]; then
+			start-stop-daemon --start --quiet --pidfile=/var/run/arpwatch.${IFACE}.pid --exec \
+			/usr/sbin/arpwatch -- -i ${IFACE} -f ${DATAFILE} -P /var/run/arpwatch.${IFACE}.pid ${OPTIONS}
+		else
+			chown ${ARPUSER} ${DATAFILE}
+			start-stop-daemon --start --quiet --pidfile=/var/run/arpwatch.${IFACE}.pid --exec \
+			/usr/sbin/arpwatch -- -i $IFACE -u ${ARPUSER} -f ${DATAFILE} -P /var/run/arpwatch.${IFACE}.pid ${OPTIONS}
+		fi
+		eend $?
+	done
+}
+
+stop() {
+	for IFACE in ${IFACES}
+	do
+		ebegin "Stopping arpwatch on ${IFACE}"
+		start-stop-daemon --stop --quiet --pidfile=/var/run/arpwatch.${IFACE}.pid --exec \
+		/usr/sbin/arpwatch
+		eend $?
+	done
+}
diff --git a/net-analyzer/arpwatch/metadata.xml b/net-analyzer/arpwatch/metadata.xml
new file mode 100644
index 000000000000..45a63182fe02
--- /dev/null
+++ b/net-analyzer/arpwatch/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription lang="en">
+		The arpwatch package contains arpwatch and arpsnmp. Arpwatch and arpsnmp
+		are both network monitoring tools. Both utilities monitor Ethernet or
+		FDDI network traffic and build databases of Ethernet/IP address pairs,
+		and can report certain changes via email.  Install the arpwatch package
+		if you need networking monitoring devices which will automatically keep
+		track of the IP addresses on your network.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/authforce/Manifest b/net-analyzer/authforce/Manifest
new file mode 100644
index 000000000000..d1c7d9d0b30a
--- /dev/null
+++ b/net-analyzer/authforce/Manifest
@@ -0,0 +1,7 @@
+AUX authforce-0.9.9-curl.patch 227 SHA256 37f51b3a5b9f22ea2207d3477875cfec09eb346893050fb9203d397c9077a932 SHA512 15467c0e12cf3739ef786ace9a8e83ee6e443681ecdc58c9c9258307036c66db35556400d8baaf44cb17e1c322db5bd52da8570a5a8c05506f2b7624e0ec3563 WHIRLPOOL a27ae0ef0b5029d8cc99bd5a3642f77d4b7460de6cb45b6b1c6ec698a3a7831b01a7e3146de14476c27d69f9d12a05eb8dd055483ef5c3a6dbcd40f290c06664
+AUX authforce-0.9.9-locale.patch 325 SHA256 61391462042f6286baf6d46d59c0ec3e17562101528524e5067689c785b049bd SHA512 0aa863400f54709a726fd2913d2d6039d3591221f9fcf60c843a3a24a2191f9eab70dd03cc574dc34cbc7e2824a58071b7167cc291f7e5cfad13da6e145f9206 WHIRLPOOL 5659a3f09b539ed3007f3bc3c57c0913894f15b45581e3cc90c813857831701332ada84c310cf27861965315e3949cc5b9a9b1126300afcd3318382e1cfc45db
+DIST authforce-0.9.9.tar.gz 424557 SHA256 366adfda9dbdb2c6dfefa9c50f143fa535a77db17cbe0b7ef338f835e211f7db SHA512 fd94c6ac5f98f480af4acba2de7c0ad81dbc4c759cce8f3f722dcf8870b0c16a9e7d462f4542784737e021f9c8d480b26895dddb4d5953f730ff8a181ad474b3 WHIRLPOOL 139ecef87a2a3d6af3e8529a7ceb71af7c5a95ad35a8b4400f5be19bd0a6636c21ed561847947779f8273d49d77cf3f370fdc6b04bd0468438a461aef5e5fde7
+EBUILD authforce-0.9.9-r1.ebuild 679 SHA256 eefbdae06bdc26bd3582c707fa901dbce1645ced59fb2929bca48dec2564262e SHA512 b11a9ee43bc66a9fc9cf4dd0012d7b71a790f4f425dcd302f92fb8b5157e90246a0a45a32c90e56fb8ac222b3391044b40ca0271aba8ec1cad2cc5033a99d5bf WHIRLPOOL 4eb1269928717d8d0e0f73d9e8254cd48889a0bbd84cd862ceb34913de4e7670145da90c83ee71a5fa4ff7247ace0e5448b8c50c68ccac1b3b92d09f053a3d44
+MISC ChangeLog 2612 SHA256 47f8993a4906d70ca8a1f907338955d04a2a32b41c74678ca313cee763a45529 SHA512 361db18878f5b5c6336ab3a06d1d5b7efac9536aa4126407a6ff61463a8b2ac8c002769cf30939ea47ddedccdddc85519f2f36648fb811ab32ee649cc6fa263f WHIRLPOOL 3958780024d26b8d8da4ac6b8f0633923dc60e7e0d5bd6cde9ec4b949b8ed625267600355f5bb012f84218c8e871f275b57a96bced729259c11899815d607661
+MISC ChangeLog-2015 3145 SHA256 5f3892b496d7d30dd095a953a9c0389f0b349614606ff6ff3ee5ad0e4fbe7f46 SHA512 e03897c992a3e9832a3dce65e9365ccd0ba1b4e01468b90e6c660c69dfe168de62f390a9d5342deee84e267213731edc5489fdfef83b7361bb82644060e713e6 WHIRLPOOL 3c06d8fa7673751879633941d6a3df7612793b1692a35bc457747a73c74a309634884c86f6d2edefab48c47255d56016c0f6a6e6af6f44e4c2b8caa7ffa86802
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-analyzer/authforce/authforce-0.9.9-r1.ebuild b/net-analyzer/authforce/authforce-0.9.9-r1.ebuild
new file mode 100644
index 000000000000..fea985a8e03a
--- /dev/null
+++ b/net-analyzer/authforce/authforce-0.9.9-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit base
+
+DESCRIPTION="An HTTP authentication brute forcer"
+HOMEPAGE="http://www.divineinvasion.net/authforce/"
+SRC_URI="http://www.divineinvasion.net/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="curl nls"
+
+DEPEND="
+	sys-libs/readline
+	curl? ( net-misc/curl )
+	nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS BUGS NEWS README THANKS TODO )
+PATCHES=(
+		"${FILESDIR}"/${P}-curl.patch
+		"${FILESDIR}"/${P}-locale.patch
+		)
+
+src_configure() {
+	econf \
+		$(use_with curl) \
+		$(use_enable nls) \
+		--with-path=/usr/share/${PN}/data:.
+}
diff --git a/net-analyzer/authforce/files/authforce-0.9.9-curl.patch b/net-analyzer/authforce/files/authforce-0.9.9-curl.patch
new file mode 100644
index 000000000000..22552f8aafd4
--- /dev/null
+++ b/net-analyzer/authforce/files/authforce-0.9.9-curl.patch
@@ -0,0 +1,10 @@
+--- authforce-0.9.9/src/http.c
++++ authforce-0.9.9/src/http.c
+@@ -7,7 +7,6 @@
+ #include <time.h>
+ #ifdef USE_CURL
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #endif /* USE_CURL */
+ #ifdef MEMWATCH
diff --git a/net-analyzer/authforce/files/authforce-0.9.9-locale.patch b/net-analyzer/authforce/files/authforce-0.9.9-locale.patch
new file mode 100644
index 000000000000..89792db3ea12
--- /dev/null
+++ b/net-analyzer/authforce/files/authforce-0.9.9-locale.patch
@@ -0,0 +1,15 @@
+ src/main.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/main.c b/src/main.c
+index 0fd275a..296e181 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -14,6 +14,7 @@
+ #include "extern.h"
+ #ifdef ENABLE_NLS
+ #define _(x) dgettext(PACKAGE_NAME, x)
++#include <locale.h>
+ #else
+ #define _(x) (x)
+ #endif
diff --git a/net-analyzer/authforce/metadata.xml b/net-analyzer/authforce/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-analyzer/authforce/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-analyzer/barnyard/Manifest b/net-analyzer/barnyard/Manifest
new file mode 100644
index 000000000000..42fb3f9d3cc9
--- /dev/null
+++ b/net-analyzer/barnyard/Manifest
@@ -0,0 +1,9 @@
+AUX barnyard.64bit.diff 3625 SHA256 69213f4beac73dfe1181b4692928d7e544d71893fcdc1839fa88c49b29f13576 SHA512 f445a91759b0a1f72588f5be27ecf5bb016f01c7ce30380c2e3026c304d45eb122616d5bf4905f4ec9aebd48fa3267223be6e08092ba3d50c58663be63e36a14 WHIRLPOOL 1be576d5df78deb556d204ee2e482cf54f92e020baf24e3d5b343b3d07ba23ce819de9077cb4281bd5a7e5e7e31d7c577e3a54083a0367dfa2caa1e87ede9eb8
+AUX barnyard.confd 663 SHA256 657deeb7046a72b60cb9ccabc66a8bb85fbcbfe792b919d62de48641d776d078 SHA512 7d4f12f04a128525a2f1f329619e919add917a6ceb62a70cb082f7d9013ad17f8f9cb4ea4098ce622060e4374343c786d6efb444b7a9d20aecbdb73a7ed14536 WHIRLPOOL a70b6eb03d48a4515105632b14e7191d908059244a3e6d61c7e3400d562e406afaf167d9a18439aa081e3875f84a619a1041e9ad31147708bf62fdeef5268e5b
+AUX barnyard.rc6 620 SHA256 159db5b609aeaccc1b964c94e019fea6dc838de268f0cd85eaf2f42996ef9aa1 SHA512 8dacb73e749b49fe3dbef061a8d5dea5d3f3861a290c846a892264eb2ebf75034121efaff91a352b6ab4639fab76ff11eeb39ce31f407a4d617c9c114e1862f5 WHIRLPOOL 21a8850ab10496b3eb323809b6c12bb354a714d6ade4a90936c5977ef5b8585c8cd96c6fad655358ee7f02cb5b15b5ccfe3ec14a7a025709de25b3863e31a47c
+DIST barnyard-0.2.0-patches.tar.bz2 12911 SHA256 cecc0c983899d12ae217232e2cd34d86e780b4be34ac36ccb3f73a1b954ea6f0 SHA512 e8e5243d49b71dd76e3274e27116f99ea6c674983cb18499889c9d27a83740a6b17aa6d30c8a9acdb46103da8314679f4eba8bf1cd252d7fb6b8a34afac46b21 WHIRLPOOL 6e42d6049e5b3e12b4d88ba1e89db7bbde7bfb325a5eaa4b25e2ff79f993c50edbe256b4a0bba22cfdb9beb0dd7d3f1476de2f689e87a5dfb7d7838ee3e9b6af
+DIST barnyard-0.2.0.tar.gz 161543 SHA256 09e0f8e095e79cfe70ea069d13e7d02521a504a1f400a45556a634dccfd31a3a SHA512 73424acf2e0c620b2f8f2f407d74812f7740234ce523e37557273998108c131311fffb16cfc2cea0f652d6b21072431081bad35b045f5654e2245786d27568e6 WHIRLPOOL 0c1dc3aeeca64ba8ced705238d3d760168de45f961ef97b8e919d3f40da84dd9fd2496d700d7be23cf148a9cd3cc0b3da4f78d15a93cfada384536e5779bf0ed
+EBUILD barnyard-0.2.0-r3.ebuild 2276 SHA256 ff7afa3458f57ac1414fb8873beb696fd4e69ce2576d5907ea56c5a5a35f70f1 SHA512 1067a1255a39adec1c37a5a0067b527ac281b939b5577def41e0a558002b46279562d104e5c807719ce10adc91a8fc194f950548bf99c08f43670527886c6cfe WHIRLPOOL 7107aeacf2eec9a66bf69713aa2fc1268fcbf229aaefc4eb098fda1a6d0cbb5b39b9c717100917d56544efc5725f07d99f979dc414adb42708bed50094f39f5d
+MISC ChangeLog 2759 SHA256 3f108b0e45b7ead4b94a4e50efed7d93f62d2213cbbea01eb1cf2ef2fca2b20a SHA512 dde46e04bbfc57309518026fe30547dd59bae3dc6636d8c9e9e87c69999f7a413c0a782787cb0e56838f67cef475b081e292e3dc7078d7a5fcad2a90ebd9c261 WHIRLPOOL aae615142b11c195c1f771937fe071dbb959078aa3097218a5a64b84895007d823e2e11c906b1a5d1fbbc7618f01be4688abd4802ae4563d68c1223990846fa1
+MISC ChangeLog-2015 5049 SHA256 91aaa3220c3bb6a784fdbccc1c91468ab3757f617d5b87ef88dcef8c82b60668 SHA512 049d2cec4e95ee46967af8c2c4e5938f9d1d99c706618647709c7bef6be918df462e8ff4502b16baf80a3e9f6d4af65f9b6a43d62297636138158ea53e08fc0b WHIRLPOOL b66dc04388cabbd1916d2254491dd2b98699aba3fb1cd2ff48cec18f005db202599e64496cf6804729b81835488b2d046691588fbb905173c51f9e8babc5e360
+MISC metadata.xml 541 SHA256 f87085a687632ed3901f8e20e96018cf1e1fe9507f4120bade8cc1ebd356bd83 SHA512 7a936ec510957c8fb449857a12ff6c54b7498657af33244fcd0759c0786adc9523fda42e6a5e46b0a36c57144f9a2dc2d4179624b1fa700fac53fe83d0d73b1a WHIRLPOOL 10db3093321dfc1a78ec8bd945b351a5948feaf65d70d0d822e72189c1826f9f80625035230603d237a0e4c04dc05cafc12738a6576a7e50d72c8982c4a607d6
diff --git a/net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild b/net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild
new file mode 100644
index 000000000000..52e010ccc6b7
--- /dev/null
+++ b/net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit eutils autotools
+
+DESCRIPTION="Fast output system for Snort"
+HOMEPAGE="https://sourceforge.net/projects/barnyard"
+SRC_URI="
+	mirror://sourceforge/barnyard/barnyard-${PV/_/-}.tar.gz
+	mirror://gentoo/${P}-patches.tar.bz2"
+
+SLOT="0"
+LICENSE="QPL GPL-2"
+KEYWORDS="~amd64 -sparc ~x86"
+IUSE="mysql postgres sguil"
+
+DEPEND="
+	net-libs/libpcap
+	postgres? ( dev-db/postgresql[server] )
+	mysql? ( virtual/mysql )
+	sguil? ( dev-lang/tcl:0 )"
+RDEPEND="${DEPEND}
+	net-analyzer/snort"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+	epatch "${FILESDIR}/barnyard.64bit.diff"
+	if use sguil ; then
+		epatch "${WORKDIR}/${PV}-sguil_files.patch"
+		epatch "${WORKDIR}/${PV}-configure-in.patch"
+		cd "${S}/src/output-plugins"
+		epatch "${WORKDIR}/${PV}-op_plugbase.c.patch"
+		cd "${S}"
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use sguil ; then
+		myconf="--enable-tcl"
+	fi
+
+	econf \
+		${myconf} \
+		--sysconfdir=/etc/snort \
+		$(use_enable postgres) \
+		$(use_enable mysql)
+}
+src_compile() {
+	emake || die "compile problem"
+}
+
+src_install () {
+
+	make DESTDIR="${D}" install || die
+
+	dodoc docs/*
+	dodoc AUTHORS README
+
+	keepdir /var/log/snort
+	keepdir /var/log/snort/archive
+
+	insinto /etc/snort
+	newins etc/barnyard.conf barnyard.conf
+	if use sguil ; then
+		sed -i -e "/config hostname:/s%snorthost%$(hostname)%" \
+		-e "/config interface/s:fxp0:eth0:" \
+		-e "s:output alert_fast:#output alert_fast:" \
+		-e "s:output log_dump:#output log_dump:" \
+			"${D}/etc/snort/barnyard.conf" || die "sed failed"
+	fi
+
+	newconfd "${FILESDIR}"/barnyard.confd barnyard
+	if use sguil ; then
+		sed -i -e s:/var/log/snort:/var/lib/sguil/$(hostname): \
+		-e s:/var/run/barnyard.pid:/var/run/sguil/barnyard.pid: \
+			"${D}/etc/conf.d/barnyard" || die "sed failed"
+	fi
+
+	newinitd "${FILESDIR}"/barnyard.rc6 barnyard
+	if use sguil ; then
+		sed -i -e "/start-stop-daemon --start/s:--exec:-c sguil --exec:" \
+			"${D}/etc/init.d/barnyard" || die "sed failed"
+	fi
+}
+
+pkg_postinst() {
+	if use sguil ; then
+		elog
+		elog "Make sure to edit /etc/snort/barnyard.conf and uncomment the"
+		elog "sguil section along with supplying the appropriate database"
+		elog "information."
+		elog
+	fi
+}
diff --git a/net-analyzer/barnyard/files/barnyard.64bit.diff b/net-analyzer/barnyard/files/barnyard.64bit.diff
new file mode 100644
index 000000000000..f338d291ff1c
--- /dev/null
+++ b/net-analyzer/barnyard/files/barnyard.64bit.diff
@@ -0,0 +1,81 @@
+diff -ur barnyard-0.2.0/src/barnyard.h barnyard-0.2.0.64bit/src/barnyard.h
+--- barnyard-0.2.0/src/barnyard.h	2004-05-01 12:43:29.000000000 -0400
++++ barnyard-0.2.0.64bit/src/barnyard.h	2007-08-11 23:22:53.000000000 -0400
+@@ -34,7 +34,8 @@
+ 
+ typedef struct _SnortPktHeader
+ {
+-    struct timeval ts;     /* packet timestamp */
++    // struct timeval ts;     /* packet timestamp */
++    struct pcap_timeval ts;     /* packet timestamp */
+     u_int32_t caplen;      /* packet capture length */
+     u_int32_t pktlen;      /* packet "real" length */
+ } SnortPktHeader;
+Only in barnyard-0.2.0.64bit/src: barnyard.h~
+diff -ur barnyard-0.2.0/src/event.h barnyard-0.2.0.64bit/src/event.h
+--- barnyard-0.2.0/src/event.h	2003-05-02 22:44:12.000000000 -0400
++++ barnyard-0.2.0.64bit/src/event.h	2007-08-12 00:13:44.000000000 -0400
+@@ -19,6 +19,11 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
+ 
++struct pcap_timeval {
++    u_int32_t tv_sec;      /* seconds */
++    u_int32_t tv_usec;     /* microseconds */
++};
++
+ typedef struct _Event
+ {
+     u_int32_t sig_generator;   /* which part of snort generated the alert? */
+@@ -30,6 +35,7 @@
+     u_int32_t event_reference; /* reference to other events that have gone off,
+                                 * such as in the case of tagged packets...
+                                 */
+-    struct timeval ref_time;   /* reference time for the event reference */
++    // struct timeval ref_time;   /* reference time for the event reference */
++    struct pcap_timeval ref_time;   /* reference time for the event reference */
+ } Event;
+ #endif /* __EVENT_H__ */
+Only in barnyard-0.2.0.64bit/src: event.h~
+diff -ur barnyard-0.2.0/src/input-plugins/dp_alert.h barnyard-0.2.0.64bit/src/input-plugins/dp_alert.h
+--- barnyard-0.2.0/src/input-plugins/dp_alert.h	2004-02-19 20:59:48.000000000 -0500
++++ barnyard-0.2.0.64bit/src/input-plugins/dp_alert.h	2007-08-11 23:24:25.000000000 -0400
+@@ -34,7 +34,8 @@
+ typedef struct _UnifiedAlertRecord
+ {
+     Event event;
+-    struct timeval ts;         /* event timestamp */
++    // struct timeval ts;         /* event timestamp */
++    struct pcap_timeval ts;         /* event timestamp */
+     u_int32_t sip;             /* src ip */
+     u_int32_t dip;             /* dest ip */
+     u_int16_t sp;              /* src port */
+Only in barnyard-0.2.0.64bit/src/input-plugins: dp_alert.h~
+diff -ur barnyard-0.2.0/src/util.c barnyard-0.2.0.64bit/src/util.c
+--- barnyard-0.2.0/src/util.c	2004-03-06 17:30:15.000000000 -0500
++++ barnyard-0.2.0.64bit/src/util.c	2007-08-12 00:14:52.000000000 -0400
+@@ -514,7 +514,8 @@
+ 
+ static char tmpbuf[256];
+ 
+-int RenderTimeval(struct timeval *tv, char *timebuf, size_t len)
++// int RenderTimeval(struct timeval *tv, char *timebuf, size_t len)
++int RenderTimeval(struct pcap_timeval *tv, char *timebuf, size_t len)
+ {
+     struct tm *lt;
+     time_t timet;
+Only in barnyard-0.2.0.64bit/src: util.c~
+diff -ur barnyard-0.2.0/src/util.h barnyard-0.2.0.64bit/src/util.h
+--- barnyard-0.2.0/src/util.h	2004-03-06 19:23:50.000000000 -0500
++++ barnyard-0.2.0.64bit/src/util.h	2007-08-11 23:23:46.000000000 -0400
+@@ -39,7 +39,8 @@
+ void ClearDumpBuf();
+ void GoDaemon();
+ size_t RenderTimestamp(time_t timet, char *timebuf, size_t len);
+-int RenderTimeval(struct timeval *tv, char *timebuf, size_t len);
++// int RenderTimeval(struct timeval *tv, char *timebuf, size_t len);
++int RenderTimeval(struct pcap_timeval *tv, char *timebuf, size_t len);
+ int CreatePidFile(char *filename);
+ int String2Long(char *string, long *result);
+ int String2ULong(char *string, unsigned long *result);
+Only in barnyard-0.2.0.64bit/src: util.h~
diff --git a/net-analyzer/barnyard/files/barnyard.confd b/net-analyzer/barnyard/files/barnyard.confd
new file mode 100644
index 000000000000..be0013cb1fe9
--- /dev/null
+++ b/net-analyzer/barnyard/files/barnyard.confd
@@ -0,0 +1,19 @@
+# Config file for /etc/init.d/barnyard
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PIDFILE="/var/run/barnyard.pid"
+LOG_FILE="snort_unified.log"
+
+# You probably don't want to change this, but in case you do
+LOGDIR="/var/log/snort"
+ARCHIVEDIR="$LOGDIR/archive"
+GENMSG_FILE="/etc/snort/gen-msg.map"
+SIDMSG_FILE="/etc/snort/sid-msg.map"
+WALDO_FILE="$LOGDIR/barnyard.waldo"
+
+# Probably not this either
+CONF=/etc/snort/barnyard.conf
+
+# This pulls in the options above
+BARNYARD_OPTS="-D -c $CONF -d $LOGDIR -g $GENMSG_FILE -s $SIDMSG_FILE -w $WALDO_FILE -L $LOGDIR -a $ARCHIVEDIR -f $LOG_FILE -X $PIDFILE"
diff --git a/net-analyzer/barnyard/files/barnyard.rc6 b/net-analyzer/barnyard/files/barnyard.rc6
new file mode 100644
index 000000000000..abe42a194a60
--- /dev/null
+++ b/net-analyzer/barnyard/files/barnyard.rc6
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ ! -e $CONF ] ; then
+		eerror "You need a configuration file to run barnyard"
+		eerror "There is an example config in /etc/snort/barnyard.conf.distrib"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting barnyard"
+	start-stop-daemon --start --quiet --exec /usr/bin/barnyard \
+		-- ${BARNYARD_OPTS} >/dev/null 2>&1
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping barnyard"
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
+	eend $?
+}
diff --git a/net-analyzer/barnyard/metadata.xml b/net-analyzer/barnyard/metadata.xml
new file mode 100644
index 000000000000..f2d12be5195d
--- /dev/null
+++ b/net-analyzer/barnyard/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>Fast output system for Snort</longdescription>
+	<use>
+		<flag name="sguil">Enable sguil (The Analyst Console for Network Security
+Monitoring) support</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">barnyard</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/barnyard2/Manifest b/net-analyzer/barnyard2/Manifest
new file mode 100644
index 000000000000..3e28fed41afd
--- /dev/null
+++ b/net-analyzer/barnyard2/Manifest
@@ -0,0 +1,7 @@
+AUX barnyard2.confd 1485 SHA256 4ff02a3d3de3641eccc3deddba255ecd7ac95ae3ad1382442413d103c9712c04 SHA512 23bed3720bc832f110a3c6e8703f0e29c79491aa3bbfda112b49c6b822600d1e96bab0175dee6f133adcb44e1619d91f591fe5db10f458043c89f1948ecc25c2 WHIRLPOOL 68f2de6224d382c7eb4706397bac8b66971e6401484e69f37e6311f84dec400c04e4373cf1edf156d5c0251bd3adbe766eb6a7a4edf93ab9c308777d274fb7cf
+AUX barnyard2.initd 680 SHA256 54935130b6c89b83ce3607097505a948cf8c23e28d98b514dde7df3ac1da6771 SHA512 32370ac32444e44df517dcc86ae59c548311ab02e49d2cf81d391e111334335968ee1d639c8a36a937dfdaa6a83f5dc33fb9f44ab3d7b822ace28985eabe3423 WHIRLPOOL feb13d3a6d9aec57313b4b5400d547741580045537b86ba6cdca0223649ca712a728d349fc7c5ce984cf1278959c811faa81e215972f4506884d54cdd78b1fa0
+DIST barnyard2-1.9.tar.gz 652879 SHA256 6bce0d5bd4a6fa2be2e5b1daaed1d6d0ec8e7f50b33bc1125125c8a9e78a5b0c SHA512 441a5751b28fd5c0aca73a78a58219a6ce58393e15bf735ae012719d1180e8e58a91d4170fe5c623bfe83de8ca0c04fb6975c8c7d5b6421ceedbf2023b44e72a WHIRLPOOL fc801392a88897abbee74d62b064b48dead038fdb21fb66db8a54c1c295fcc10edb873b601b5f4f0794dd6e19546260e8f5e46465384292e354f4277e8e5323e
+EBUILD barnyard2-1.9.ebuild 1698 SHA256 31a937c3f53d7e9e161f51096ed7376abf9c8beaa69a3802e8f031ed760cd4f5 SHA512 0470caca3b6f1e2ee1013fcff6412907d854de6855c6f06df411cfea1fe8a864a50149274d4f47c826b5ef081e9d14440c01109be1acbf2e2bf8f4e317aa236a WHIRLPOOL 1341f226d3999b21f88085f670bb5fb18a22a3cd4bd151ebfb956e18153dfcf5cf0ba3bc3a34705a9c7594eb974a98ea8a4df72259dda4a252502543d3723e99
+MISC ChangeLog 3006 SHA256 aa4391e6b1a6aa44aa8e4c19ec70f55b9b85c4175bcacb9a53d7cf0b1c4f5aad SHA512 a4b8ea6ce60d50a69910df5f23d800c6cf76afef549197717ca753f9ffeb096d7b4d6f34317f3b67ccdfe93d707a16d6a878ce01352bcb0be81ad7ae09423d58 WHIRLPOOL 7edafd9b50a261a3fafe96a4373432eb0387361bfafaa40723055574c03616864ef30e39e76794f0a0da7fcfc4bd2ab6d59e52e66c1c5b75f5a5ae4fb5d6a71a
+MISC ChangeLog-2015 1721 SHA256 32ed17a9fde806b820c86354764abe907702402d46d3cd9f054e5157ccee080c SHA512 93c51bc99f9dcd8cb86108e93e86d85f1893899c27eb8eeff8a8f27ede12517456db4001152bf68ac1c41cf994b2645f5a1124bb7e6b9c531adad3ddb14d0dff WHIRLPOOL 18b74a382af265aa07085bb7f5d667b0962b1d4a4882f3b7ec7e4c45bafcbabffa49ef4ccb72cfb04e355af243eb9b68a64a34a928c84ad85a405011d1a348ce
+MISC metadata.xml 1738 SHA256 6383d379d028b444e84b6b6c6aa4e3bcfaba3af75bfc28f5e11abb192d3ed931 SHA512 830bdfa0acaa1a0d112e9b70b0a645a4e43256000bf83f9b851f5bcf7124eb27ca1322ee65e52ba2b60c69a17d0074047d1258c3fe4ccb504e95eb1df4036255 WHIRLPOOL efe25a53a3bc05e33298f95476bc95eac083ebe3053fbddcdf83c5f279ae4f32baf74887cdcb4b86d9943a689d85d33db16b24498ff5b48a12da3ad4b8127f1f
diff --git a/net-analyzer/barnyard2/barnyard2-1.9.ebuild b/net-analyzer/barnyard2/barnyard2-1.9.ebuild
new file mode 100644
index 000000000000..e09f129def05
--- /dev/null
+++ b/net-analyzer/barnyard2/barnyard2-1.9.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+DESCRIPTION="Parser for Snort unified/unified2 files"
+HOMEPAGE="http://www.securixlive.com/barnyard2/"
+SRC_URI="http://www.securixlive.com/download/barnyard2/${P}.tar.gz"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="static debug gre mpls mysql odbc postgres"
+
+DEPEND="net-libs/libpcap
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql[server] )
+	odbc? ( dev-db/unixODBC )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i -e "s:^#config interface:config interface:" \
+		"${WORKDIR}/${P}/etc/barnyard2.conf" || die
+	sed -i -e "s:^output alert_fast:#output alert_fast:" \
+		"${WORKDIR}/${P}/etc/barnyard2.conf" || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable !static shared) \
+		$(use_enable static) \
+		$(use_enable debug) \
+		$(use_enable gre) \
+		$(use_enable mpls) \
+		$(use_with mysql) \
+		$(use_with odbc) \
+		$(use_with postgres postgresql) \
+		--disable-ipv6 \
+		--disable-prelude \
+		--disable-mysql-ssl-support \
+		--disable-aruba \
+		--without-tcl \
+		--without-oracle || die
+
+	emake || die
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die
+	newconfd "${FILESDIR}/barnyard2.confd" barnyard2 || die
+	newinitd "${FILESDIR}/barnyard2.initd" barnyard2 || die
+	dodir /etc/barnyard2 \
+		/var/log/snort \
+		/var/log/snort/archive \
+		/var/log/barnyard2 || die
+	dodoc RELEASE.NOTES \
+		etc/barnyard2.conf \
+		doc/README* \
+		schemas/create_* || die
+	rm "${D}"/etc/barnyard2.conf || die
+}
+
+pkg_postinst() {
+	elog "Configuration options can be set in /etc/conf.d/barnyard2."
+	elog
+	elog "An example configuration file can be found in /usr/share/doc/${PF}."
+}
diff --git a/net-analyzer/barnyard2/files/barnyard2.confd b/net-analyzer/barnyard2/files/barnyard2.confd
new file mode 100644
index 000000000000..d114f826c707
--- /dev/null
+++ b/net-analyzer/barnyard2/files/barnyard2.confd
@@ -0,0 +1,36 @@
+# Config file for /etc/init.d/barnyard2
+
+# This file only contains variables needed by the init.d script.
+# All other configuration options are located in the barnyard2.conf file
+
+# This should be the first part of the unified/unified2 log file name (without the time stamp)
+# Ex. If you log files look like this 'snort.unified2.1239801645' then you would use 'snort.unified2'
+SPOOL_FILE="snort.unified2"
+
+# Location of your unified/unified2 log files
+SPOOL_DIR="/var/log/snort"
+
+# Directory to log to
+LOG_DIR="/var/log/barnyard2"
+
+# This MUST match what you set for "config interface:" in your barnyard2.conf
+# If you do not set this correctly then Barnyard2 will not stop when you do a 
+# "/etc/init.d/barnyard2 stop"
+INTERFACE="eth0"
+
+# You probably don't want to change this, but in case you do
+PID_FILE="barnyard2_${INTERFACE}.pid"
+PID_PATH="/var/run"
+
+# The waldo file is located in the SPOOL_DIR to support multipule instances of barnyard2
+WALDO_FILE="${SPOOL_DIR}/barnyard2.waldo"
+CONF="/etc/barnyard2/barnyard2.conf"
+
+# Location of the archive directory if you choose to use it.
+# The ARCHIVE_DIR is located in the SPOOL_DIR to support multipule instances of barnyard2
+#ARCHIVE_DIR="${SPOOL_DIR}/archive"
+
+# This pulls in the options above
+BARNYARD_OPTS="-D -c ${CONF} -d ${SPOOL_DIR} -w ${WALDO_FILE} -f ${SPOOL_FILE} -l ${LOG_DIR}"
+# Or with an archive directory
+#BARNYARD_OPTS="-D -c ${CONF} -d ${SPOOL_DIR} -w ${WALDO_FILE} -f ${LOG_FILE} -l ${LOG_DIR} -a ${ARCHIVE_DIR}"
diff --git a/net-analyzer/barnyard2/files/barnyard2.initd b/net-analyzer/barnyard2/files/barnyard2.initd
new file mode 100644
index 000000000000..d15308846f12
--- /dev/null
+++ b/net-analyzer/barnyard2/files/barnyard2.initd
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ ! -e ${CONF} ] ; then
+		eerror "You need a configuration file to run barnyard2"
+		eerror "There is an example config in /etc/snort/barnyard2.conf.distrib"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting barnyard2"
+	start-stop-daemon --start --quiet --exec /usr/bin/barnyard2 \
+		-- --pid-path ${PID_PATH} --nolock-pidfile ${BARNYARD_OPTS} >/dev/null 2>&1
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping barnyard2"
+	start-stop-daemon --stop --quiet --pidfile ${PID_PATH}/${PID_FILE}
+	eend $?
+}
diff --git a/net-analyzer/barnyard2/metadata.xml b/net-analyzer/barnyard2/metadata.xml
new file mode 100644
index 000000000000..7bd3352141b2
--- /dev/null
+++ b/net-analyzer/barnyard2/metadata.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>patrick@gentoo.org</email>
+        <name>Patrick Lauer</name>
+        <description>Maintainer</description>
+    </maintainer>
+    <maintainer type="person">
+        <email>jason.r.wallace@gmail.com</email>
+        <name>Jason Wallace</name>
+        <description>Proxy maintainer. CC him on bugs</description>
+    </maintainer>
+    <maintainer type="project">
+        <email>netmon@gentoo.org</email>
+        <name>Gentoo network monitoring and analysis project</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <longdescription>
+		Barnyard2 is a fork of the original barnyard project (which is no longer under development).
+		Barnyard2 is an open source interpreter for Snort unified2 binary output files. Its primary
+		use is allowing Snort to write to disk in an efficient manner and leaving the task of 
+		parsing binary data into various formats to a separate process that will not cause Snort to
+		miss network traffic. Barnyard2 is under active development and continues to adapt based on 
+		user feedback.
+    </longdescription>
+    <upstream>
+        <maintainer>
+            <email>dev@securixlive.com</email>
+            <name>Securixlive</name>
+        </maintainer>
+        <doc>http://www.securixlive.com/barnyard2/docs/index.php</doc>
+        <bugs-to>mailto:dev@securixlive.com</bugs-to>
+    </upstream>
+	<use>
+		<flag name="gre">Enable GRE support</flag>
+		<flag name="mpls">Enable support for mpls networks</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-analyzer/bigeye/Manifest b/net-analyzer/bigeye/Manifest
new file mode 100644
index 000000000000..46e53ae89ca9
--- /dev/null
+++ b/net-analyzer/bigeye/Manifest
@@ -0,0 +1,7 @@
+AUX bigeye-0.3-overflow.patch 364 SHA256 f253ec4b701bbda57f9273c5e5ca30352dbef99d5a93f6c4bc497170e2f3c232 SHA512 4076e00b11c5c11d432f52a536f6d32a6329b8946ea6a8db64d61c395728483e9631fd93d136390d3e34e7c05ce113f3b2e7ef2113f686bd0184b8a5cb436d18 WHIRLPOOL 29126e7966f36853e1576916f8bb647f57d1b78953f22dcb1c504495f57dad8e052d8c470562432b9c1cc4808463ad24f83a2bc622407eb4ab9e2791f1702fe7
+DIST bigeye-0.3-gcc34.diff.bz2 2774 SHA256 06e50f31e6e162502dc9e24db416301ad7bbd5439b7611faa405020085668738 SHA512 8ed54aa7b95aac8703e2bf99fde985cbbe7e62f7a6b549e58b2b54856336c5560c450a8c6ad9cbcdcd6bf61c842797c1abca001cfca20ff82614d8c328cab4ba WHIRLPOOL 72ea0009f5c55369fa5faf0e0b89d13a62ec77e7c1a3691a848ebffb9b906134b48faa7daab4682eaa304dfc34f622f6157ec40473af166ad3feaf480f73add2
+DIST bigeye-0.3.tgz 32462 SHA256 e03aacd1797dece3b8a1521f7df44dd63f8417e988ce0be218079ae49cd7490d SHA512 73a146fd2f5df86a3d16dec05cf3f278393347f341a5cc319feccf6d23e1f2fe9d29070ac154a5b2336ade146843ab163e3545e9aefad1a0fa8903928d9b1ed0 WHIRLPOOL 491699b8470472ecd9907b4d5a2e207c34ab3ed9777cdaaf3cd323daaaadb80ee8e39dbc6e718cc808393ba65daeddc0b248b5c7b46fea78765fb3d656969a7f
+EBUILD bigeye-0.3-r3.ebuild 826 SHA256 1e9c09e1ea46e94943246568d7803f46f233e523b7a4e2bf5f1cd35449f5bbb0 SHA512 5e55b334a0201118cf00363a29c86846573666bb01709858d1f8955473aba0526da6e52c7b59dcb34dabff0081946a262afca27c6fe0dd0f004aa8e9b15efaf7 WHIRLPOOL c05a2c509b489a33672b836e58af98267063fdb41d0f630cfde6d62107a1b979b0f31b661019daede84c41580f3747a9c7f5e34bb47c2dc32b0a2a5816de8461
+MISC ChangeLog 2464 SHA256 fc25a5b4b5d1c1a535fedd7965327d70faa6aac032be03b10bf777899ef28dd2 SHA512 1660d408a7288bd5073e4d1dba2b36854752db0a5757c0065c8908d300dca7d3ad1991493e22002ebcf16cba42c5c6d60a08fcf07ca8402d87112261e02b4cf2 WHIRLPOOL 1797e7397003507c0db8a600778adc820ea14c47a8ad1e4fcdd333016650a0fecc1d92c192972d1ae8637b9730ed3937739d7a6065085c0affd8f07c9ee32a1c
+MISC ChangeLog-2015 2766 SHA256 576c17fe1a885d3f3ce05a62ae624088d4f0766377cc02fde6c977df4e19a62c SHA512 ac10a85f44fbc992787680366e43c7f15e1e896e04550311d0328ca140b77665402ffcbb29ed50be3f789906f751ee20f301cf06275aff8a5385273e5885bc5b WHIRLPOOL d37200aa458fb6830989f46ae959807e8b1f82a42e430c4cfd0d2a91486624fea1342b6433803bb8e939822e03341859e4727fd98746e3b263baf8132b8d6375
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/bigeye/bigeye-0.3-r3.ebuild b/net-analyzer/bigeye/bigeye-0.3-r3.ebuild
new file mode 100644
index 000000000000..597005a10170
--- /dev/null
+++ b/net-analyzer/bigeye/bigeye-0.3-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="network utility dump and simple honeypot utility"
+HOMEPAGE="http://violating.us/projects/bigeye/"
+SRC_URI="http://violating.us/projects/bigeye/download/${P}.tgz
+	mirror://gentoo/${P}-gcc34.diff.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+src_prepare() {
+	epatch \
+		"${WORKDIR}"/${P}-gcc34.diff \
+		"${FILESDIR}"/${P}-overflow.patch
+	sed -i README \
+		-e "s|-- /messages/|-- /usr/share/bigeye/messages/|g" \
+		|| die "sed README"
+}
+
+src_compile() {
+	cd src || die
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} bigeye.c emulate.c -o bigeye || die
+}
+
+src_install() {
+	dobin src/bigeye
+
+	insinto /usr/share/bigeye
+	doins sig.file
+	doins -r messages
+
+	dodoc README
+}
diff --git a/net-analyzer/bigeye/files/bigeye-0.3-overflow.patch b/net-analyzer/bigeye/files/bigeye-0.3-overflow.patch
new file mode 100644
index 000000000000..1ca159a65b79
--- /dev/null
+++ b/net-analyzer/bigeye/files/bigeye-0.3-overflow.patch
@@ -0,0 +1,11 @@
+--- a/src/bigeye.c
++++ b/src/bigeye.c
+@@ -787,7 +787,7 @@
+ 	local.sin_family = 	AF_INET;
+ 	local.sin_port   =	htons(porta);
+ 	local.sin_addr.s_addr =	INADDR_ANY;
+-	bzero(&(local.sin_zero),sizeof(local));
++	memset(&(local.sin_zero), "\0", sizeof(local.sin_zero));
+ 
+ 	if(setsockopt(sock_a, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) < 0) {
+ 		perror("setsockopt");
diff --git a/net-analyzer/bigeye/metadata.xml b/net-analyzer/bigeye/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/bigeye/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/bing/Manifest b/net-analyzer/bing/Manifest
new file mode 100644
index 000000000000..6fe15b9960bd
--- /dev/null
+++ b/net-analyzer/bing/Manifest
@@ -0,0 +1,5 @@
+DIST bing_1.1.3.orig.tar.gz 38847 SHA256 318865a38aac472e03ba44dd34ba2bf0c535f46187a22a3075be466b293e55c3 SHA512 df56f93047454a02b305154b12898b063c340e96778db9e11114ac4598446648b3ed5fe4304e0f3e33f612069b0f0e4e231396ee878655683f923ad5418d6242 WHIRLPOOL d0eb1b03291084bcbfd3c01528611e1a9b946c44801733e81a337e9a073a6412bcad2b98c4fd65cfb2c60e2a7c370173290775f0ded9e84005904c6d73d77de3
+EBUILD bing-1.1.3-r1.ebuild 686 SHA256 1e09d7eedf169be0a8ede32e3e2ee9c6198742fd79ade03c09fbbbf4e5466f1f SHA512 e3914efe7f54fa8da148dd19b61bc8dcc2b33c6c3e5d13c54559282ecd49a2af6203b054868faf98d1a04f0d21e55b63c9c96e3d98d4621e69fc0fa0fb4c5e8e WHIRLPOOL e5b738dfa6de438a5d79925c6e6816e45399e094006a028ee1bccfaecab0846d081cb2875c73fe2da11fdcc605e14066efe51d292f86380cb0e42a5e1498fbcf
+MISC ChangeLog 2177 SHA256 859d64f8e0aec0e5180ecbe295ddefa76cb7e6c25318ad1bf9d131ba6e1f51b8 SHA512 3310326a3a6c51ffe53bde45395d82d1c4743872f4815ec870123e62b0cea5095e8fe8a3b0127b7ccbc5890fee60ce1282aa3f9bfafb8d8dc765911214dba437 WHIRLPOOL d6400591fb4daca68110706600fcba4ab72ec01aea28e6e2fc365cfcae369d142422d376ed8a8b4dbf5483f1ce7bb9c333ef62777a13d77d96aef475119e519a
+MISC ChangeLog-2015 2783 SHA256 3f64c40fc589a8a26780fafe4ae300765b5d1a28edb6ad167063094844587582 SHA512 838e0a0bb98dd888c4a0cf2e7c9717ab9a084bcba015ba235ec3a754a5e56077778e8bc26f8deadcdb1f3ca4d4613e8291270ae650fcb9f7fab4ffcf8d573e74 WHIRLPOOL 6880a3b7014292462208bb3820ba68b8ea19df546d9f725d3f344cb5204598aa87f31ebb535dff42d6e263a99ed6480ab9fec1113dee8cfb51dd98a1fb907b4f
+MISC metadata.xml 243 SHA256 ea7c9e5f065da7aa5425675f3750400b765c0eff02f0593783bb069401f73564 SHA512 efed1be9deecfbfc884a140e4ecb918eb473ec755a7910ab9afd29fa236d3c34c09c8d11454a0f8c26331539cbad1461f4824ff348b7fb7335cc88fb51d3882b WHIRLPOOL 4028c4779286eb8eece0b9834f1f83ea8bd212c5255dbfb60605cabb7559ede33da53884a1788100998b2dcf26abed2cf82468a3275cabac58f9eceb1e596757
diff --git a/net-analyzer/bing/bing-1.1.3-r1.ebuild b/net-analyzer/bing/bing-1.1.3-r1.ebuild
new file mode 100644
index 000000000000..02b9d58b1f04
--- /dev/null
+++ b/net-analyzer/bing/bing-1.1.3-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit toolchain-funcs
+
+DESCRIPTION="A point-to-point bandwidth measurement tool"
+SRC_URI="mirror://debian/pool/main/b/bing/${PN}_${PV}.orig.tar.gz"
+HOMEPAGE="http://fgouget.free.fr/bing/index-en.shtml"
+
+LICENSE="BSD-4"
+SLOT="0"
+KEYWORDS="amd64 ~arm ia64 ppc sparc x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=">=sys-apps/sed-4"
+
+src_prepare() {
+	sed -i -e "s:#COPTIM = -g: COPTIM = ${CFLAGS}:" Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"|| die "emake failed"
+}
+
+src_install() {
+	dobin bing || die
+	doman unix/bing.8 || die
+	dodoc ChangeLog Readme.{1st,txt} || die
+}
diff --git a/net-analyzer/bing/metadata.xml b/net-analyzer/bing/metadata.xml
new file mode 100644
index 000000000000..3c3d5ced6412
--- /dev/null
+++ b/net-analyzer/bing/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/bmon/Manifest b/net-analyzer/bmon/Manifest
new file mode 100644
index 000000000000..1e3b295784a8
--- /dev/null
+++ b/net-analyzer/bmon/Manifest
@@ -0,0 +1,6 @@
+AUX bmon-3.6-docdir-examples.patch 235 SHA256 edca507e8736edc26ec82f67557e59568ea565fb17a5b50b90117b0d723356f0 SHA512 2b74637c6dacfa03e680774787d8287ae084ba426a3e0e178b74f1468179916509ee5de2e0c93f7abe04356d0146ad6dd8e191d9a66718ec8eaf50cb6126afc8 WHIRLPOOL c1e8b690df7949df26fed1db267234c019408eaf6a0c58d82560bde7e2e2630d551a68d114c914c6cdf7800cab69c4e2faecdf2739214dca721fa43ea99ca9a5
+DIST bmon-4.0.tar.gz 61843 SHA256 d5e503ff6b116c681ebf4d10e238604dde836dceb9c0008eb92416a96c87ca40 SHA512 2a5b527a78cc1084c3b96d8d621b002ee86d377776d7e25f711dc2869e59bcd6277cc5f103549fe0b635b1368228a66941d5069fd1240cff678b308d7e17218d WHIRLPOOL ba1a562da80b3d950807941c2a97a20750a6d1b2d15eaa6d585fbc1eb5dc82bfcbf4ceabe5fddba0d72a76542c0aed26420b28b478cca9e8c28e67b380c9f0fb
+EBUILD bmon-4.0.ebuild 977 SHA256 1102b7818602939223eea8cfc2a5fb4b3511070e5d467a1cdc330bd9d9c40f27 SHA512 64e34261413488c02d7d84a9baad0c648a06fdfd3703d813b334e344ebcfe382cbda873137c9e3bf944db59181e4c04576add61e4c81113d034613a357078c70 WHIRLPOOL 4503729693c203c8f2e35bc4e9371db72371286233ae2511b696adcae65ab9fea197c095ac20f3288452e5e1093d52ed717aa41ecd530eb296b291f3c2da77b8
+MISC ChangeLog 5313 SHA256 b39922a45416c32fed728161cae2b8ce39a6fa145666a3cca31715dbd35800ef SHA512 0d1a3bb79bb742bc82359f51b39c7f8a7918908dc2ccfc81204169588b6c382959950c932e316eb57588e5cd10d566d4a60d0a4638b869f96980ae4039b8d63d WHIRLPOOL f6629dadaff31229b3a7bb9f642d4b9874dce6d87dd039b6b25396df5b30f4816ebc8b78cae467b4e8487f0ee9fa95a7993b9d25032990918554aa5d4afdbe9c
+MISC ChangeLog-2015 8713 SHA256 6f491713b8945f5c76fac69383fa4cd8556f5c1fb8ebdc2b20fe934bdc720c77 SHA512 23e391efc470e08f5c4213a3d9544216564472b5db8e394a2b8a5a52718d2c0a3b8fc8b807297dc584e44e1e8d8d4dc3a74e80cc2564178c996a6180e6ba0297 WHIRLPOOL da711cb1812700722435729c9f2b15e2e3e8b8320e019e053d5bb4f4fc9247e85ffbbf82cb7b921159e029357003c84c89e7d6822ed8d3debc2dafed1f38f6e5
+MISC metadata.xml 355 SHA256 b96419c5d63290d7eebe3f46ed0bbd98039df8d974421ab3d4bfcf24d1f04e3e SHA512 44b31fb1a2801c74cd4ba7260566447df31b9dd7bd55ed1ffdabc0bcfef8d5459e753cbbb0a2a31c5f2d87e7853972281cb9412b642e282be9a02be2f519fcef WHIRLPOOL 0e546a994631d07ec5597bee678842f539b38910845843b3947856a8d536dd6d53aabd454f984c28ea2e6b96f0e5acd934bbafe1ea740aa6bc04e504016dc4ad
diff --git a/net-analyzer/bmon/bmon-4.0.ebuild b/net-analyzer/bmon/bmon-4.0.ebuild
new file mode 100644
index 000000000000..95e18c2a29a5
--- /dev/null
+++ b/net-analyzer/bmon/bmon-4.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils linux-info toolchain-funcs
+
+DESCRIPTION="interface bandwidth monitor"
+HOMEPAGE="http://www.infradead.org/~tgr/bmon/ https://github.com/tgraf/bmon/"
+SRC_URI="
+	https://codeload.github.com/tgraf/${PN}/tar.gz/v${PV} -> ${P}.tar.gz
+"
+
+LICENSE="BSD-2 MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ~ppc ppc64 ~sparc x86"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.3-r2:0=
+	dev-libs/confuse:=
+	dev-libs/libnl:3
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( ChangeLog )
+
+CONFIG_CHECK="~NET_SCHED"
+ERROR_NET_SCHED="
+	CONFIG_NET_SCHED is not set when it should be.
+	Run ${PN} -i proc to use the deprecated proc interface instead.
+"
+
+src_prepare() {
+	eapply \
+		"${FILESDIR}"/${PN}-3.6-docdir-examples.patch
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		CURSES_LIB="$( $(tc-getPKG_CONFIG) --libs ncurses)" \
+		--docdir="/usr/share/doc/${PF}"
+}
diff --git a/net-analyzer/bmon/files/bmon-3.6-docdir-examples.patch b/net-analyzer/bmon/files/bmon-3.6-docdir-examples.patch
new file mode 100644
index 000000000000..bb7d969cedde
--- /dev/null
+++ b/net-analyzer/bmon/files/bmon-3.6-docdir-examples.patch
@@ -0,0 +1,10 @@
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -1,6 +1,6 @@
+ # -*- Makefile -*-
+ 
+-exampledir = $(datarootdir)/doc/@PACKAGE@/examples
++exampledir = $(docdir)/examples
+ example_DATA = bmon.conf
+ 
+ EXTRA_DIST = $(example_DATA)
diff --git a/net-analyzer/bmon/metadata.xml b/net-analyzer/bmon/metadata.xml
new file mode 100644
index 000000000000..df5705b8008d
--- /dev/null
+++ b/net-analyzer/bmon/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tgraf/bmon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/braa/Manifest b/net-analyzer/braa/Manifest
new file mode 100644
index 000000000000..8e000214c74e
--- /dev/null
+++ b/net-analyzer/braa/Manifest
@@ -0,0 +1,6 @@
+AUX braa-0.8-gentoo.diff 451 SHA256 c74c826e37ca12165c206040ce3599100b78a09543fe95e7879660443745d875 SHA512 cb3981542c50076beff544f68cf4596e62fe199d68497f0d1b03fd70b90344fec8f7bc00797cb40de699028a56b37708dd1bfc405e8d85a3977b1fcd0ed99b2a WHIRLPOOL 6f42e4ff48a43f1cfaf1e2be71a4ce3459992e3c3d4210bad6274cd5c9abb695f633c7e4bd2aca87f39b2dd50a4024d200652db385f45e4db1e4ef4b8bce6f87
+DIST braa-0.82.tar.gz 39927 SHA256 d650d34cdf30fcbbbbf4e4f11c8f5d51fd5caa3cca58d620fa1d978b8c18919c SHA512 8c88d288287a12c19c8d49606c8d2b70531b7f2be1aa3c4ccc6b01739aead751c03c56dc3f1a346b3dd20730a8bd0d30e33167a5f7c676f629348195762e23d4 WHIRLPOOL 23bd927ee9be8331069865c75389ee6417adec1ffaa4f2c4604cec0f55f786e341249e1bc96948d1e43fb5b6a925aea2e3940a2d8dce3c4060591105efe1c82a
+EBUILD braa-0.82.ebuild 509 SHA256 92251f225cb1fbd34201ba4452eae523fb74fa795ad9b92b57c31ec6f6e4eb05 SHA512 c8c4d8d74dcb1108f930eaf394a216f63fcc7972298a5b82d9592e0bacfc547c1cf80c912d24bbf933aa7a4a99d49c5831b75b11501e010fdc0f5afefb61f6b6 WHIRLPOOL 03bfe096e39e9f91ab8982fe8b2be79cdccac5e8d1cba040435c70b5bc06f1da026d95f5eb28509b26a85feadf378ae3cd2ace5f2d759ff589e62a00b7264ab0
+MISC ChangeLog 2449 SHA256 fee953491d0a3fe4507456c6f30bf16d0cd17c24b6333945264c27a413bb1f15 SHA512 8df6725f4f03ed1d42e199790f4b60224cb0011da6fac81634c4e31b53cdccd5da16b6f7313ad9c63710a1cba40533b9c1a97c43eee286b8b5da29cce481c6b1 WHIRLPOOL 9ef8c40ad601481c671590778e4e60e78ee45beb90a2c72284b719695becd402ad3bfbab7a21d28f88602a8647f938c647e548e261cdaf5fef0fea6ce92db504
+MISC ChangeLog-2015 2545 SHA256 6b0674433437f7037a0670d2ba5c39a6a977206127bcfe6aa05997071b1f488d SHA512 ff972ad8198e844f12578bc8feea0d9e824c023e74b6babb5ba499f7fda1866ec82e6963142eed7542dcb864ee35e238727950e87ab4533f0e734fb65e938fa9 WHIRLPOOL d7f2b906f74ff0387e7c51452b0db4b25587ea665c23d51b6a18dae658380d3ca29dd12b8bffe922063451526b951821e82ab9875e6505e5f3ab2b824962e127
+MISC metadata.xml 280 SHA256 b04c5b9d91f6c4d6e36583488fd032751034d1e035085609c9bdf7677cf1e83f SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef WHIRLPOOL 6f3756b9ac748acccb6ac5a4de133cf93988e8c904f606376fecbb6a21ce038e86437fecca43b2521538da2570d33ff1a6a1e0cab290a3d71a9b4f2734f16328
diff --git a/net-analyzer/braa/braa-0.82.ebuild b/net-analyzer/braa/braa-0.82.ebuild
new file mode 100644
index 000000000000..574816f9353c
--- /dev/null
+++ b/net-analyzer/braa/braa-0.82.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Quick and dirty mass SNMP scanner"
+HOMEPAGE="http://s-tech.elsat.net.pl/braa/"
+SRC_URI="http://s-tech.elsat.net.pl/braa/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.8-gentoo.diff
+	sed -i braa.c -e 's|0.81|0.82|g' || die
+	tc-export CC
+}
+
+src_install() {
+	dobin braa
+	dodoc README
+}
diff --git a/net-analyzer/braa/files/braa-0.8-gentoo.diff b/net-analyzer/braa/files/braa-0.8-gentoo.diff
new file mode 100644
index 000000000000..3167269f4a68
--- /dev/null
+++ b/net-analyzer/braa/files/braa-0.8-gentoo.diff
@@ -0,0 +1,24 @@
+--- a/Makefile
++++ b/Makefile
+@@ -4,8 +4,6 @@
+ ###################################################################
+ 
+ # Linux, FreeBSD, OpenBSD
+-CFLAGS = 
+-LDFLAGS = 
+ 
+ # Solaris / SPARC
+ # CFLAGS = -DSOLARIS_SPARC
+@@ -24,9 +22,8 @@
+ LIBS = 
+ 
+ all: ${OBJECTS}
+-	cc $(OBJECTS) -o $(OUT) $(LDFLAGS) $(LIBS)
+-	strip $(OUT)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) -o $(OUT) $(LIBS)
+ 
+ clean:
+ 	rm -rf $(OBJECTS) $(OUT)
+-	
+\ No newline at end of file
++	
diff --git a/net-analyzer/braa/metadata.xml b/net-analyzer/braa/metadata.xml
new file mode 100644
index 000000000000..2c2a7923cfc8
--- /dev/null
+++ b/net-analyzer/braa/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/bro/Manifest b/net-analyzer/bro/Manifest
new file mode 100644
index 000000000000..0b19a1e830f4
--- /dev/null
+++ b/net-analyzer/bro/Manifest
@@ -0,0 +1,6 @@
+AUX bro-2.4.1-fix-python-install-dir.patch 1748 SHA256 0a4c5797d08a14072656b23dfd03e7fff9161f8d85ed6439857cddd5e85c6d07 SHA512 0957f05ef4e4efff90f23a6ac885277f4d57df8ade4cf2f9a22b6935fc46679369857ad181f7bb4f071cb4c373d6b4bc8c49c8e8f9bea9325d85a7b2d2e6b62e WHIRLPOOL 73c79b49be9dc8d2d30ecad3cc4d3d22c573e1bff9ca1e56d1e9c5e72801a7df554c4313bbb74a7a1a10fb7853795e127ba6eef55e2cedaba5861c4f777e4c66
+AUX bro-2.4.1-remove-unnecessary-remove.patch 878 SHA256 57bd6f4ba5f58d8879bebb6f9ce1f1ca82e31ae88aae95f1887f0f3245a9be7b SHA512 e996a7571c3f9b85f1eb40206c07825f0cfdf7f9fc4a930d8dbb216e8e4636461f0a6be01fc341e6b4d5396d7637d76e39911c3d65e2d645da959d3aad17252d WHIRLPOOL 28d2fe1487bb3cf2fd590a5979bf83100b7702325e47e9002222478ce1720f5aec67276e426ecdc25e957a25e242200bb0a7e1d5e63da8800fbd1aaa17930675
+DIST bro-2.4.1.tar.gz 15010455 SHA256 d8b99673a5024630f6bae820c4f8c3ca9029f1167f9e5729c914c66e1fc7c8f6 SHA512 4f7bf6c037fe7b16214830d2dba9f7abffd853f66030aa710fb9f174a475f8cd27d8de6bacf965f142f942a42093ceb78dcd8cbcedac6fbcfdd65ac07b3dd410 WHIRLPOOL 545450119846f28dcca38429d1ba8c21f3da9c3f4d5fac6e4797143a401b789f7b171980fec046d4333c820858e74d0a89ea3e614c9f2ceb4c3690b5582f1be7
+EBUILD bro-2.4.1-r2.ebuild 2229 SHA256 b420f238f15b971b5bc8078957d2e5dc8af990465c0eff75c985660657796a66 SHA512 9c06e2cf3dc695567a1c8eaae4aeffee36848945190f630d13d31f4ddfbf30f662d6d56ee36178a5f3b693bd5aec0c49f0ed104f19daf7687d6da29ed6347b08 WHIRLPOOL 12bffee58e5378b4e15046ca616aefd8145bfbb94992deaf7572ec9d5e42b7357a4a600804866690c6fa24873418e304d3744d07b2662bd8ca92e9ab5ca31a2a
+MISC ChangeLog 1624 SHA256 c5be37a289faa4cc5a6b082226ef061715b27771c9823f0772871e2aa3e200c0 SHA512 06bfd02ef0d50fef80eb6a8150a3f619efc182efacd61474ad7d984176a09f96bed48d8a09bb7331a91d5c0c56b84fdf2d3bb194401783cd2fb2f5976193f510 WHIRLPOOL aa119be9c2743097c8c2cb4d01404749354da29e95bea11adf6f2140899e8a30d563c0058d3e18e67e484ae56d4eab6dde59d7022d9e5f4e1dc70a19e088e819
+MISC metadata.xml 1363 SHA256 db4f548a4e3d102201caecb90f60a2a0543f935a56edd22be239628516280ac1 SHA512 bd47d3cda8757cde18b296de8c7717a545f40308d5f2d1fffc906eb01b7eee9a6ce0ef9c7e21fe19ff38a4dcd9b06b04eac798852d42c93c043492b82192284a WHIRLPOOL d58b13bb26fe8b703b15632959b6f5c2d11f94d6bc12fc0e8b4eb23efb218a1f912d82e73cc2841a26889779f9c52f1851a51ae1915ee92a1565ff4557198cd7
diff --git a/net-analyzer/bro/bro-2.4.1-r2.ebuild b/net-analyzer/bro/bro-2.4.1-r2.ebuild
new file mode 100644
index 000000000000..231ad94155e5
--- /dev/null
+++ b/net-analyzer/bro/bro-2.4.1-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="The Bro Network Security Monitor"
+HOMEPAGE="https://www.bro.org"
+SRC_URI="https://www.bro.org/downloads/release/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+broccoli +broctl -broker curl debug geoip ipv6 jemalloc +python -ruby tcmalloc static-libs +tools"
+
+RDEPEND="app-shells/bash:0
+	dev-libs/openssl:0
+	net-analyzer/ipsumdump
+	net-dns/bind-tools
+	net-libs/libpcap
+	sys-libs/zlib
+	broker? ( =dev-libs/actor-framework-0.13.2* )
+	broctl? ( virtual/mta )
+	curl? ( net-misc/curl )
+	geoip? ( dev-libs/geoip )
+	ipv6? ( net-analyzer/ipsumdump[ipv6] )
+	jemalloc? ( dev-libs/jemalloc )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( >=dev-lang/ruby-1.8:= )
+	tcmalloc? ( dev-util/google-perftools )"
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-3.0.3
+	dev-lang/perl"
+
+REQUIRED_USE="broker? ( python )
+	broctl? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+PATCHES=( "${FILESDIR}/bro-2.4.1-remove-unnecessary-remove.patch"
+	"${FILESDIR}/bro-2.4.1-fix-python-install-dir.patch" )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DEBUG=$(usex debug true false)
+		-DENABLE_JEMALLOC=$(usex jemalloc true false)
+		-DDISABLE_PERFTOOLS=$(usex tcmalloc false true)
+		-DENABLE_BROKER=$(usex broker true false)
+		-DENABLE_CXX11=$(usex broker true false)
+		-DBROKER_PYTHON_PREFIX="/usr"
+		-DLIBCAF_INCLUDE_DIR_CORE="/usr/include/"
+		-DLIBCAF_INCLUDE_DIR_IO="/usr/include/"
+		-DLIBCAF_ROOT_DIR="/usr"
+		-DENABLE_STATIC=$(usex static-libs true false)
+		-DINSTALL_BROCCOLI=$(usex broccoli true false)
+		-DINSTALL_BROCTL=$(usex broctl true false)
+		-DINSTALL_AUX_TOOLS=$(usex tools true false)
+		-DENABLE_MOBILE_IPV6=$(usex ipv6 true false)
+		-DDISABLE_RUBY_BINDINGS=$(usex ruby false true)
+		-DDISABLE_PYTHON_BINDINGS=$(usex python false true)
+		-DBRO_LOG_DIR="/var/log/bro/"
+		-DBRO_SPOOL_DIR="/var/spool/bro/"
+		-DBRO_ETC_INSTALL_DIR="/etc/bro/"
+		-DINSTALL_LIB_DIR="/usr/$(get_libdir)"
+		-DPY_MOD_INSTALL_DIR="$(python_get_sitedir)"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/net-analyzer/bro/files/bro-2.4.1-fix-python-install-dir.patch b/net-analyzer/bro/files/bro-2.4.1-fix-python-install-dir.patch
new file mode 100644
index 000000000000..66d41ed4f47e
--- /dev/null
+++ b/net-analyzer/bro/files/bro-2.4.1-fix-python-install-dir.patch
@@ -0,0 +1,37 @@
+--- a/aux/broker/bindings/python/CMakeLists.txt	2016-03-17 23:26:42.707456012 +0100
++++ b/aux/broker/bindings/python/CMakeLists.txt	2016-03-17 23:28:27.714453166 +0100
+@@ -52,19 +52,21 @@
+ swig_add_module(pybroker python pybroker.i)
+ swig_link_libraries(pybroker ${libbroker} ${PYTHON_LIBRARIES})
+ 
+-if ( BROKER_PYTHON_PREFIX )
+-    set(pyver ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
+-    set(PY_MOD_INSTALL_DIR
+-        ${BROKER_PYTHON_PREFIX}/lib/python${pyver}/site-packages)
+-elseif ( BROKER_PYTHON_HOME )
+-    set(PY_MOD_INSTALL_DIR ${BROKER_PYTHON_HOME}/lib/python)
+-else ()
+-    execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
+-        "from distutils.sysconfig import get_python_lib; print get_python_lib()"
+-                    OUTPUT_VARIABLE PYTHON_SITE_PACKAGES
+-                    OUTPUT_STRIP_TRAILING_WHITESPACE)
+-    set(PY_MOD_INSTALL_DIR ${PYTHON_SITE_PACKAGES})
+-endif ()
++if ( NOT PY_MOD_INSTALL_DIR )
++    if ( BROKER_PYTHON_PREFIX )
++        set(pyver ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
++        set(PY_MOD_INSTALL_DIR
++            ${BROKER_PYTHON_PREFIX}/lib/python${pyver}/site-packages)
++    elseif ( BROKER_PYTHON_HOME )
++        set(PY_MOD_INSTALL_DIR ${BROKER_PYTHON_HOME}/lib/python)
++    else ()
++        execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
++            "from distutils.sysconfig import get_python_lib; print get_python_lib()"
++                        OUTPUT_VARIABLE PYTHON_SITE_PACKAGES
++                        OUTPUT_STRIP_TRAILING_WHITESPACE)
++        set(PY_MOD_INSTALL_DIR ${PYTHON_SITE_PACKAGES})
++    endif ( BROKER_PYTHON_PREFIX )
++endif ( NOT PY_MOD_INSTALL_DIR )
+ 
+ message(STATUS "Python bindings will be built and installed to: "
+                ${PY_MOD_INSTALL_DIR})
diff --git a/net-analyzer/bro/files/bro-2.4.1-remove-unnecessary-remove.patch b/net-analyzer/bro/files/bro-2.4.1-remove-unnecessary-remove.patch
new file mode 100644
index 000000000000..e4803bc7db91
--- /dev/null
+++ b/net-analyzer/bro/files/bro-2.4.1-remove-unnecessary-remove.patch
@@ -0,0 +1,20 @@
+--- a/src/CMakeLists.txt.old	2016-03-11 20:47:44.652900344 +0100
++++ b/src/CMakeLists.txt	2016-03-11 20:48:11.665101378 +0100
+@@ -425,10 +425,10 @@
+ 
+ # Remove some stale files and scripts that previous Bro versions put in
+ # place, yet make confuse us now. This makes upgrading easier.
+-install(CODE "
+-   file(REMOVE_RECURSE
+-       ${BRO_SCRIPT_INSTALL_PATH}/base/frameworks/logging/writers/dataseries.bro
+-       ${BRO_SCRIPT_INSTALL_PATH}/base/frameworks/logging/writers/elasticsearch.bro
+-       ${BRO_SCRIPT_INSTALL_PATH}/policy/tuning/logs-to-elasticsearch.bro
+-   )
+-")
++#install(CODE "
++#   file(REMOVE_RECURSE
++#       ${BRO_SCRIPT_INSTALL_PATH}/base/frameworks/logging/writers/dataseries.bro
++#       ${BRO_SCRIPT_INSTALL_PATH}/base/frameworks/logging/writers/elasticsearch.bro
++#       ${BRO_SCRIPT_INSTALL_PATH}/policy/tuning/logs-to-elasticsearch.bro
++#   )
++#")
diff --git a/net-analyzer/bro/metadata.xml b/net-analyzer/bro/metadata.xml
new file mode 100644
index 000000000000..cb35341ee9f5
--- /dev/null
+++ b/net-analyzer/bro/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>tomboy64@sina.cn</email>
+        <name>M.B.</name>
+        <description>Maintainer, assign bugs to him</description>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <use>
+        <flag name="broccoli">Enable the Bro Client Communication Library</flag>
+        <flag name="broctl">An interactive shell for managing Bro installations</flag>
+        <flag name="broker">Bro's new Messaging Library (experimental)</flag>
+        <flag name="geoip">Enable support for Maxmind's GeoIP library</flag>
+        <flag name="ipv6">Support for mobile IPv6</flag>
+        <flag name="jemalloc">Support for the Jemalloc allocator</flag>
+        <flag name="python">Enable Python bindings</flag>
+        <flag name="ruby">Enable Ruby bindings (deprecated)</flag>
+        <flag name="tcmalloc">Enable Google's Performance Analysis Tools</flag>
+        <flag name="tools">Small auxiliary tools for Bro</flag>
+    </use>
+    <longdescription lang="en">
+        Bro is a powerful network analysis framework that is much different from the typical IDS you may know.
+    </longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/bsnmp/Manifest b/net-analyzer/bsnmp/Manifest
new file mode 100644
index 000000000000..bda369725dc3
--- /dev/null
+++ b/net-analyzer/bsnmp/Manifest
@@ -0,0 +1,13 @@
+AUX bsnmp-1.10-gcc34.patch 311 SHA256 fc9b78f0bbc30017363512305d5abf38086a459e90b04d88b3f3b76ffefdfada SHA512 59d032c9779b3ed0e94891955fa80468b9a156002dd7f2d0d617aef161c22d4925d877e71d7a3f7c5acd7886ee503158deb26189bc62c94e706904ed6ccbfa32 WHIRLPOOL 3497501b3d80b104f62352f49de1aa5f354c264a783ac0e4e8e0755b03b8ada20815b92e9a66c431f84e15c457727c5e730b54ee141e21f58fcbf8c19b66c371
+AUX bsnmp-1.12-mibII.patch 465 SHA256 f06e61404895729378d7c9af8e58b1dd5f418b53b4fffa4078d93a8e61c6f59a SHA512 d3d9950285864736ba606399724add0f033b718c7c707e65fa8e556dd81d86291d8755b9f8de12792c547f715d8c634e89a3ced94c1c8012804462bedca286e8 WHIRLPOOL 34e99e897e042db5d852954a70a1d630ff314fe0e61c3ac08516947dfc7938d6ea1e87d8af5cb56cfe448e43f0edace67bfff6b1b2414b2a51962349e72b2627
+AUX bsnmpd.init 239 SHA256 a7f1c4b5b41287da137eaa7503957ea9497346b710a103c23c3be26481dfa44f SHA512 c10f543c37a873a69e93d7362709208726eea98aae8fafd108040d9f4d1d4d4c22d40ab7bfbf115d6598471c8ad332766a844a7bd4ec1424215bf0decec15e00 WHIRLPOOL 37c98f805ed47f824cfff5dba9cb0d83a93a46a410dc523cdae7d2083d93efea9bf8dd761fbd5e2631a1228c582efe9ded6fcf756d81f1e34c5a11972d6c46cb
+AUX snmpd.config 2426 SHA256 56d6ece23cd8cb8814f7e4166cb9f577a1a956beb2ad554420e82d4e8b71db27 SHA512 3fb763b93ba4bc11d1a03ef147f7303294ca26073bc10b55f22a7eb5107fd58f819079a1af9d2d8827e4cb5d5b645b3c44636482ea0855db3235be07a5f2d80b WHIRLPOOL ef7957ef697a7032c5280c60981fa386e4d34987ed64d72d739630512c46a2c6b089248c0f19033f81aba7241cffc3bbf697a84833d064ddb3899e1cf174d92a
+AUX werror.patch 532 SHA256 b9ee3526665d6baee8833688eca094c1c5c3bc8163c34bdef60765620b75093d SHA512 2de595316841e7602b0950bcbe53c85af049c9474b12518119704df56663734616b64a16a8d1ccb34fbd240b0cd19afa6dc70289673ede9c8062f2becd0c98a3 WHIRLPOOL 8e6735c90aa1e804877838582ef1f50aa830e86c21fd56bfe815b61bd5d84c1aee3d4d7270e1a41b3ec3cb7429a3f21fb26b8ce34ddbf1ff563e34972e69d426
+DIST bsnmp-1.11a.tar.gz 408165 SHA256 72d74b12742b153ac9c0bb4deb86bda6fc982eb41c775cc6fd7f343924b887f8 SHA512 8b3695a147b5a3c012509f73c0627c8f7b66d99c54c53636d2add2d3427acf331bc4168ee88b8cad2536c1a15901fc38c4acd51e7630c48f4972504d94e8dc08 WHIRLPOOL 9f9d6c9ebe7c0f91e56a1eedf26b60d5d02586e1a63055d43e16cd4adc14bc633a733beccbeb182ac846f0f9e2b2e29d72fe779bd8c748f591b1c57127d9b677
+DIST bsnmp-1.12.tar.gz 418653 SHA256 986d02d71c55693ec0b90b24564cb43195ce03254e85a8cd70457b318eefbee0 SHA512 c2c292e21632ea475d30aafaf7f66566389bccabfd20886a27bc4af98dba24139568c0eaddd36710655abac9ca6a38525136e06f2cf7be8b9db8ca656b2021c9 WHIRLPOOL 13e2bf9ac986b28e1437bc3a22aa8ceb09810f72d061c145a4e97c350d3c9bbf60180e2716c0ca0ed5513efc595a84b771eff04d3b7b3480fdd0982273ce77aa
+EBUILD bsnmp-1.11a.ebuild 837 SHA256 c601a14ef19edade533930daebcd25aa4e393efcfd113967471d7dc1a70fb5a8 SHA512 ba8d6df952fde089711c1a3a0422667e8c8a4f2e018b2b41c1e09ff789479d973e5c7d7690dbcca6bd006e66533d711e2c50de2d70b67687bd5829137bc2a696 WHIRLPOOL 7bb7289f6c021b7b075b537dacaabbd00fd1b9310d343e8e1d1557ac348a7c1a38bced9ca729b6fd05b85078c6edfc8c3b51306c400c5f04d83ab312459080cb
+EBUILD bsnmp-1.12-r1.ebuild 1047 SHA256 22de1aee33a406505048bb7d728809b89f7a0e668dd4957cd8973171ada886aa SHA512 72f98319a937253d79795d8e2e7b7a63881739b27d9287d736fe81a0be2d8d6525e9a1326bc5c01cae70f6303cfe7c0266becbcdf2138cd2dbfdd339fb00bf95 WHIRLPOOL 39a1b9525998a1bc398bd237be4e542334d1ce3008fafd663ec2534754352b6c7f9764bc24b951fb214ef16709b42667e342cdf71d04990a50f4b7846cec0c98
+EBUILD bsnmp-1.12.ebuild 884 SHA256 98ca2bb306bb108530ea2f8b25b15aa1a638e1d2f71419d6698750681479425c SHA512 7e9b5ca820bdce0175a5f09a4331ce16f5f2a6a541350d61955f1eb7f2b26c903fd8520d5363586f72091cec2263ab4c1b42cdfe223941fc34c4fc2bf42b89c3 WHIRLPOOL d355dad26fe010c4ec0504bdb42ef64d237b04e2f46f11b9c7e682c1689e1108244dcf3bec6bbc2ca8e97327449be7d2d6683e7ba2a388a41f92856a2e5cf24e
+MISC ChangeLog 2779 SHA256 4201bf9297df2c730af4ff7d0c1d35a829360ce5b3b0f37029229c4cc0b424c3 SHA512 ab1888962f2e42677ce694cf7f2590daec9f25d3cf98a28dacaab69bd2151066090d669a14cf037896a6dfc1d5c76f7ce7945cf4fcb42879e993e65142ee20b0 WHIRLPOOL 39901660eae08c6cb595f01a846d48b42184da3bda3147e56827862b7ccdbc1e6b82bedaae37cd409ada9650740227ab7a3fdc41bad8ee8d3dcdf4db48353098
+MISC ChangeLog-2015 1253 SHA256 f7445a8b9393385ad659dbca5776e1c68e29879dabadc587ced6dd599c9cebab SHA512 a55fccc039dd93391fc363af279a2d62efc86192a31c6ad389ee8592cfc0bc731c6ed24ec76617669c53493c2ea28fb40de40cbff676177be500d2f9a7772a2c WHIRLPOOL ab1a30ef031bbf9617fe345c98e72dd9229725f2a8b71578b8c4875a88e5952c60cae5ee04b25efe0b4a1fc0c54f83d15289bb3c81b015026a128900de0e4573
+MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a
diff --git a/net-analyzer/bsnmp/bsnmp-1.11a.ebuild b/net-analyzer/bsnmp/bsnmp-1.11a.ebuild
new file mode 100644
index 000000000000..53220c31acd2
--- /dev/null
+++ b/net-analyzer/bsnmp/bsnmp-1.11a.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Mini-SNMP Daemon and Library"
+HOMEPAGE="http://people.freebsd.org/~harti/"
+SRC_URI="http://people.freebsd.org/~harti/bsnmp/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86-fbsd"
+IUSE="tcpd"
+
+DEPEND="dev-libs/libbegemot
+	tcpd? ( sys-apps/tcp-wrappers )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-1.10-gcc34.patch"
+}
+
+src_compile() {
+	if use elibc_glibc; then
+		# bsnmp is bsd-based, without this it will fail
+		append-flags "-D_BSD_SOURCE"
+	fi
+
+	filter-flags -fno-inline
+
+	econf \
+		--with-libbegemot=/usr \
+		$(use_with tcpd tcpwrappers) \
+		|| die "econf failed"
+
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	einstall || die "make install failed"
+}
diff --git a/net-analyzer/bsnmp/bsnmp-1.12-r1.ebuild b/net-analyzer/bsnmp/bsnmp-1.12-r1.ebuild
new file mode 100644
index 000000000000..cf14d402d591
--- /dev/null
+++ b/net-analyzer/bsnmp/bsnmp-1.12-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Mini-SNMP Daemon and Library"
+HOMEPAGE="http://people.freebsd.org/~harti/"
+SRC_URI="http://people.freebsd.org/~harti/bsnmp/${P}.tar.gz"
+
+LICENSE="BSD GPL-2" # GPL-2 init script
+SLOT="0"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
+IUSE="tcpd"
+
+DEPEND="dev-libs/libbegemot
+	tcpd? ( sys-apps/tcp-wrappers )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-1.10-gcc34.patch"
+	epatch "${FILESDIR}/werror.patch"
+	epatch "${FILESDIR}/${P}-mibII.patch"
+}
+
+src_compile() {
+	if use elibc_glibc; then
+		# bsnmp is bsd-based, without this it will fail
+		append-flags "-D_BSD_SOURCE"
+	fi
+
+	filter-flags -fno-inline
+
+	econf \
+		--with-libbegemot=/usr \
+		$(use_with tcpd tcpwrappers) \
+		|| die "econf failed"
+
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	einstall || die "make install failed"
+	newinitd "${FILESDIR}"/bsnmpd.init bsnmpd || die
+	insinto /etc
+	doins "${FILESDIR}"/snmpd.config
+}
diff --git a/net-analyzer/bsnmp/bsnmp-1.12.ebuild b/net-analyzer/bsnmp/bsnmp-1.12.ebuild
new file mode 100644
index 000000000000..5996c6281ae1
--- /dev/null
+++ b/net-analyzer/bsnmp/bsnmp-1.12.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Mini-SNMP Daemon and Library"
+HOMEPAGE="http://people.freebsd.org/~harti/"
+SRC_URI="http://people.freebsd.org/~harti/bsnmp/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
+IUSE="tcpd"
+
+DEPEND="dev-libs/libbegemot
+	tcpd? ( sys-apps/tcp-wrappers )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-1.10-gcc34.patch"
+	epatch "${FILESDIR}/werror.patch"
+}
+
+src_compile() {
+	if use elibc_glibc; then
+		# bsnmp is bsd-based, without this it will fail
+		append-flags "-D_BSD_SOURCE"
+	fi
+
+	filter-flags -fno-inline
+
+	econf \
+		--with-libbegemot=/usr \
+		$(use_with tcpd tcpwrappers) \
+		|| die "econf failed"
+
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	einstall || die "make install failed"
+}
diff --git a/net-analyzer/bsnmp/files/bsnmp-1.10-gcc34.patch b/net-analyzer/bsnmp/files/bsnmp-1.10-gcc34.patch
new file mode 100644
index 000000000000..f1220b83d521
--- /dev/null
+++ b/net-analyzer/bsnmp/files/bsnmp-1.10-gcc34.patch
@@ -0,0 +1,12 @@
+diff -ur -x '*~' bsnmp-1.10/snmp_ntp/snmp_ntp.c bsnmp-1.10-fix/snmp_ntp/snmp_ntp.c
+--- bsnmp-1.10/snmp_ntp/snmp_ntp.c	2005-05-23 11:03:48.000000000 +0200
++++ bsnmp-1.10-fix/snmp_ntp/snmp_ntp.c	2005-07-10 01:58:35.557888936 +0200
+@@ -360,6 +360,8 @@
+ 		free(rpkt);
+ 		return (-1);
+ 	}
++	
++	return (-1);
+ }
+ 
+ /*
diff --git a/net-analyzer/bsnmp/files/bsnmp-1.12-mibII.patch b/net-analyzer/bsnmp/files/bsnmp-1.12-mibII.patch
new file mode 100644
index 000000000000..c93191823d6e
--- /dev/null
+++ b/net-analyzer/bsnmp/files/bsnmp-1.12-mibII.patch
@@ -0,0 +1,13 @@
+diff --git a/snmp_mibII/Makefile.in b/snmp_mibII/Makefile.in
+index d14c179..3a99850 100755
+--- a/snmp_mibII/Makefile.in
++++ b/snmp_mibII/Makefile.in
+@@ -10,7 +10,7 @@ MOD=	mibII
+ SRCS=	${MOD}_tree.c mibII.c mibII_ifmib.c mibII_ip.c			\
+ 	mibII_interfaces.c mibII_ipaddr.c mibII_ifstack.c		\
+ 	mibII_rcvaddr.c mibII_nettomedia.c mibII_tcp.c mibII_udp.c	\
+-	mibII_route.c
++	mibII_route.c mibII_begemot.c
+ INCS=	snmp_${MOD}.h
+ DEFS=	mibII_tree.def
+ MAN3=	snmp_mibII.3
diff --git a/net-analyzer/bsnmp/files/bsnmpd.init b/net-analyzer/bsnmp/files/bsnmpd.init
new file mode 100644
index 000000000000..947e542a0437
--- /dev/null
+++ b/net-analyzer/bsnmp/files/bsnmpd.init
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Mini-SNMP Daemon"
+command="/usr/bin/bsnmpd"
+pidfile="/var/run/snmpd.pid"
+
+depend() {
+    use net
+}
diff --git a/net-analyzer/bsnmp/files/snmpd.config b/net-analyzer/bsnmp/files/snmpd.config
new file mode 100644
index 000000000000..26f9f1aeb163
--- /dev/null
+++ b/net-analyzer/bsnmp/files/snmpd.config
@@ -0,0 +1,98 @@
+# $FreeBSD: src/etc/snmpd.config,v 1.9.10.1.8.1 2012/03/03 06:15:13 kensmith Exp $
+#
+# Example configuration file for bsnmpd(1).
+#
+
+#
+# Set some common variables
+#
+location := "Room 200"
+contact := "sysmeister@example.com"
+system := 1	# FreeBSD
+traphost := localhost
+trapport := 162
+
+# Change this!
+read := "public"
+# Uncomment begemotSnmpdCommunityString.0.2 below that sets the community
+# string to enable write access.
+write := "geheim"
+trap := "mytrap"
+
+#
+# Configuration
+#
+%snmpd
+begemotSnmpdDebugDumpPdus	= 2
+begemotSnmpdDebugSyslogPri	= 7
+
+#
+# Set the read and write communities.
+#
+# The default value of the community strings is NULL (note, that this is
+# different from the empty string). This disables both read and write access.
+# To enable read access only the read community string must be set. Setting
+# the write community string enables both read and write access with that
+# string.
+#
+# Be sure to understand the security implications of SNMPv2 - the community
+# strings are readable on the wire!
+#
+begemotSnmpdCommunityString.0.1	= $(read)
+# begemotSnmpdCommunityString.0.2	= $(write)
+begemotSnmpdCommunityDisable	= 1
+
+# open standard SNMP ports
+begemotSnmpdPortStatus.0.0.0.0.161 = 1
+
+# open a unix domain socket
+begemotSnmpdLocalPortStatus."/var/run/snmpd.sock" = 1
+begemotSnmpdLocalPortType."/var/run/snmpd.sock" = 4
+
+# send traps to the traphost
+begemotTrapSinkStatus.[$(traphost)].$(trapport) = 4
+begemotTrapSinkVersion.[$(traphost)].$(trapport) = 2
+begemotTrapSinkComm.[$(traphost)].$(trapport) = $(trap)
+
+sysContact	= $(contact)
+sysLocation	= $(location)
+sysObjectId 	= 1.3.6.1.4.1.12325.1.1.2.1.$(system)
+
+snmpEnableAuthenTraps = 2
+
+#
+# Load MIB-2 module
+#
+begemotSnmpdModulePath."mibII"	= "/usr/lib/libsnmp_mibII.so.3.0"
+
+# Force a polling rate for the 64-bit interface counters in case
+# the automatic computation is wrong (which may be the case if an interface
+# announces the wrong bit rate via its MIB).
+#%mibII
+#begemotIfForcePoll = 2000
+
+#
+# Netgraph module
+#
+#begemotSnmpdModulePath."netgraph" = "/usr/lib/snmp_netgraph.so"
+#
+#%netgraph
+#begemotNgControlNodeName = "snmpd"
+
+#
+# pf(4) module
+#
+#begemotSnmpdModulePath."pf"	= "/usr/lib/snmp_pf.so"
+
+#
+# Host resources module
+#  This requires the mibII module.
+#
+#begemotSnmpdModulePath."hostres" = "/usr/lib/snmp_hostres.so"
+
+#
+# Bridge module
+#  This requires the mibII module.
+#
+#begemotSnmpdModulePath."bridge" = "/usr/lib/snmp_bridge.so"
+
diff --git a/net-analyzer/bsnmp/files/werror.patch b/net-analyzer/bsnmp/files/werror.patch
new file mode 100644
index 000000000000..7a0968e84441
--- /dev/null
+++ b/net-analyzer/bsnmp/files/werror.patch
@@ -0,0 +1,11 @@
+--- bsnmp-1.12/config/Makefile.pre.old	2012-04-26 10:45:58.000000000 -0400
++++ bsnmp-1.12/config/Makefile.pre	2012-04-26 10:46:11.000000000 -0400
+@@ -53,7 +53,7 @@
+ # Assume a Posix-ish make that passes MAKEFLAGS in the environment.
+ SUBMAKE= $(MAKE) --no-print-directory
+ 
+-WARNS=	-Wsystem-headers -Werror -Wall -Wno-format-y2k -W	\
++WARNS=	-Wsystem-headers -Wall -Wno-format-y2k -W		\
+ 	-Wstrict-prototypes -Wmissing-prototypes		\
+ 	-Wpointer-arith -Wreturn-type -Wcast-qual		\
+ 	-Wwrite-strings -Wswitch -Wshadow -Wcast-align		\
diff --git a/net-analyzer/bsnmp/metadata.xml b/net-analyzer/bsnmp/metadata.xml
new file mode 100644
index 000000000000..a00f3aeb1f81
--- /dev/null
+++ b/net-analyzer/bsnmp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/bwbar/Manifest b/net-analyzer/bwbar/Manifest
new file mode 100644
index 000000000000..97fd747d49a7
--- /dev/null
+++ b/net-analyzer/bwbar/Manifest
@@ -0,0 +1,6 @@
+AUX bwbar-1.2.3-libpng15.patch 345 SHA256 e83339277d20df6bbf295b3626ec9fdd9ab282099f8f452357a7ab0a0b81f7aa SHA512 14c07dc56320a748b864c8c3ad8b3c9408838db8630930409f2f16f6bcfbf6fab14e6eb1ae803e4f6b33127220c53a51d01a4b981f3ddd8bc8fb1be2952192f8 WHIRLPOOL 45d9102aa0bc4521cbe38fd9c93d1eb8734988e986e788d39f6d242c91b8942008b957afedfcbcd23712f9ada6061518ee1d95f7f4d9a96668ac12604b482aab
+DIST bwbar-1.2.3.tar.bz2 30202 SHA256 d82f8ba7defbdb9ae6671cbd7a064597a2a717ee6eeb32df6093403e8a86d1c1 SHA512 cb534f50007db6e39aa134d0d9a08ec6935c8a393f8dd5ab80f3c6ef94048821e065cd6c1be80657a2d6338fd16a73dcc0f89f5b15aba9e3bd38f0737a6d43c4 WHIRLPOOL acc5b09305f1d4f827bdf11098f23c8e3b2353343b83166b6168e9d39c5233acdd10fbfa9b302346f02c42073e0196dc8593bdfc03c25cabcc75264bf178e679
+EBUILD bwbar-1.2.3.ebuild 523 SHA256 8525bbb527e5c6d02546ec70ed6541d618a4911e6b16987e330539927c079022 SHA512 91de227764e7b854414649fb3616b355840c7601f29243a055621e4fdf9fbe37e6caf6e4b347c9d6f91a55bdb7bcda2bd86486375925ce6aa5caf12df056900c WHIRLPOOL b7e4f42d3d5469c7d5eb7d4491c5d5a43fd76cdb90cf52979cff62b18f1cc4bb029bcd258e961e7d020f11d41ce16117f321fc0b245f18d82d28deae480ca3ce
+MISC ChangeLog 2620 SHA256 afb25795d84e33b0efe736f36108ccb22ac995b397b0b96064f465c27f2b7474 SHA512 e8580a60e1e3f4e8a3ec3ad941a216e8b86f512945818d5f6b5cd586c9c71a05cb0c60facc92e02f84f87a985017dce48941379aa9f2ac6e879b362cf901cd0a WHIRLPOOL 6d64225bd938ac4eb361e584f4ea535ede0736f0e91d742c3645e83ddbde19f8a6bb56b64da4f29a62f9d4dc4bf86f50037f177f40edf4862a83aa827901b289
+MISC ChangeLog-2015 1467 SHA256 5f5689d130fb7dd7d23f1dcb9310fe454970a16403d195c27ca2b782413c3ac2 SHA512 b28c145d394d672edd31d81ddd5f551ca1077e05b56e9bc92ba43a9c744c859ab45ad9132ea0820a6951a6873930c54d5b369b58fb103da72deb57dbf2b693e1 WHIRLPOOL b4dd53a13802630d57f51af5287c798b0496c34a1ecfe4b791fc77bf8a24b20cb3af841834e10936543c6ed5dbbab2fed3f87c8a25d7ce764becf4a430e60421
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/bwbar/bwbar-1.2.3.ebuild b/net-analyzer/bwbar/bwbar-1.2.3.ebuild
new file mode 100644
index 000000000000..add43e56929f
--- /dev/null
+++ b/net-analyzer/bwbar/bwbar-1.2.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="The kernel.org \"Current bandwidth utilization\" bar"
+HOMEPAGE="https://www.kernel.org/pub/software/web/bwbar/"
+SRC_URI="mirror://kernel/software/web/bwbar/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND=">=media-libs/libpng-1.2"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng15.patch
+}
+
+src_install() {
+	dobin bwbar
+	dodoc README
+}
diff --git a/net-analyzer/bwbar/files/bwbar-1.2.3-libpng15.patch b/net-analyzer/bwbar/files/bwbar-1.2.3-libpng15.patch
new file mode 100644
index 000000000000..4d1bd67c6d34
--- /dev/null
+++ b/net-analyzer/bwbar/files/bwbar-1.2.3-libpng15.patch
@@ -0,0 +1,19 @@
+--- a/bwbar.c
++++ b/bwbar.c
+@@ -30,6 +30,7 @@
+ #include <alloca.h>
+ #include <getopt.h>
+ #include <png.h>
++#include <zlib.h>
+ 
+ void skipline(FILE *f)
+ {
+@@ -79,7 +80,7 @@
+   if ( !info_ptr )
+     goto barf;
+ 
+-  if ( setjmp(png_ptr->jmpbuf) ) {
++  if ( setjmp(png_jmpbuf(png_ptr)) ) {
+     status = 1;
+     goto barf;			/* libpng abort */
+   }
diff --git a/net-analyzer/bwbar/metadata.xml b/net-analyzer/bwbar/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/bwbar/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/bwm-ng/Manifest b/net-analyzer/bwm-ng/Manifest
new file mode 100644
index 000000000000..964f84923c5d
--- /dev/null
+++ b/net-analyzer/bwm-ng/Manifest
@@ -0,0 +1,7 @@
+AUX bwm-ng-0.6.1-fix-buildsystem.patch 3173 SHA256 c323c548c8f85cec507876576446d24634cefbf92984cb672f409eb72e7e846c SHA512 5d58ef94633a65629485a6742b70e8eb819435957604c7877bcdeb1a842f6ad0a6cd99cf1d90572c9254ea6d9aaf431a4328cfab32809fa2654194486084520e WHIRLPOOL 0429e0b12bcab42f9ddb520869c8c31384c5c7ae9eae1950abe34292c04ae756f8c95416e041b3d3cffa2249dd0efd1f7045567436cb47105b2ff84494f0b05a
+AUX bwm-ng-0.6.1-static-inline.patch 9852 SHA256 d856f68070189ed95beb62b13b1880f4243b9693641e322b0826ec1dfea8572d SHA512 75c7f52121c8f05737f59c96c99c8e9f4fd72209007ea2b9884ac2aeaa151431475d70f312b41100993d6bd4f16e430b2a79628b37c249344be8ab4ed5f2d2ba WHIRLPOOL 9f3f09d64bc74263b8013739b7f47b5cf782c51938293c694dcfa908398f66a3879c9cd2a6e3192718fddb4ef6a3863ba6bdd897f6f616961f036c86e4e8bc47
+DIST bwm-ng-0.6.1.tar.gz 162620 SHA256 027cf3c960cd96fc9ffacdf7713df62d0fc55eeef4a1388289f8a62ae5e50df0 SHA512 3f8d4a10f5cbf743d6aee9c6170f334c4274224a2f1886f04338c9a1bf0cf13af5be4aaea0445c9e5b5d361915cc3a93bbfe7c4abf69a0d24e42bc414d8056cd WHIRLPOOL a83569acf0f4f24f98e5b65733e0a02de2db4a4249ece24eaf457b20a4eed4a6f425256a13477e8d3844c251b4818fc8b1e34243a975cce7e20ec27b3af8e413
+EBUILD bwm-ng-0.6.1-r1.ebuild 741 SHA256 701b5a4d6ff84fde27c8a980e935a25bfc5255d9c1f5e8ded6a1e3ab5819d7bf SHA512 8d816d7b53c86f03170db7753cbd5ecaddf7bf1c2e794aaad963116fb7caac698fdc5acc5e5077b61d2f7c54316e15c08ed20d650366d18c9af461f94f3da19f WHIRLPOOL 642bf6293f55904d57d1eabf97678401f7e5786339cfa0c245fe4f4c82a3bd9602e287280773c480d4f9e9f9161a5003a106ac8519fd8469484df83c8130f661
+MISC ChangeLog 3604 SHA256 ab3cde0415ff32036709cc7ce800adc29868123ed07dcf8c7b2a01899d6c882c SHA512 72faaf09823eeab9e51bd83afa128e62e51b474cff9268891596fbbdf58efe85bb2cb98f7481f4b77e133fb60b99a27e1f5a315a3d3c0194f5d679ee93f0656b WHIRLPOOL 7ab816d74aad67fa5963718569e7c96873b977f499c4c58468ce274347c3726e529d413980c7ef158a2b5658b0351fc3949f43cc36661b150d3c1eeb31989147
+MISC ChangeLog-2015 2565 SHA256 3d3775d0f399591c5cdf96d781ea2f3ef020d31393b5e28c899bf2fc9d1ab287 SHA512 66ad9eb68d42592729cfa4aca5d2830f3afad31254bd35f2431772c886e0588f99e34b5c31ee5dd74fd13a4237516e3e794f019766452ea986634fc0c6dfe558 WHIRLPOOL 0cc035765f395806440588e1265ec94bc92819c2fd02c275972f039fa9c8d880d697864c2d6bbd524d5fdf38530529b99213d22c696b37f87f6d4d374740fac6
+MISC metadata.xml 373 SHA256 99ea959581c77c3dee72499e6d3505e28de5704d16edd086c658a0c54301fde9 SHA512 cab403ed79bc8eedcbff2160e8cc0af1c9ef4e8a4311a81b51e201537b22344d1d2ee8f18d96b9fcb23118ba60443f87461c1b471aae42119ae99eeb6d440bc0 WHIRLPOOL 30f46aebb73010f0bf3109a9b2e190c6843da872fcd0b56d3529cea56d9dc477288259a60c10745252da16f3b2850ddd82c41bc6bd2a9cbf64cc56ed83e78826
diff --git a/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..51311ad80550
--- /dev/null
+++ b/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Bandwidth Monitor NG is a small and simple console-based bandwidth monitor"
+SRC_URI="http://www.gropp.org/bwm-ng/${P}.tar.gz"
+HOMEPAGE="http://www.gropp.org/"
+
+KEYWORDS="amd64 ~arm ppc x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="csv html"
+
+RDEPEND="sys-libs/ncurses:0=
+	>=sys-apps/net-tools-1.60-r1"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-buildsystem.patch
+	"${FILESDIR}"/${P}-static-inline.patch
+)
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable csv) \
+		$(use_enable html) \
+		--enable-ncurses \
+		--with-procnetdev
+}
diff --git a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch
new file mode 100644
index 000000000000..04c14392d66a
--- /dev/null
+++ b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch
@@ -0,0 +1,93 @@
+* Fix broken buildsystem
+* Fix ncurses underlinking caused by missing "-ltinfo" in $LIBS
+https://bugs.gentoo.org/show_bug.cgi?id=561718
+
+--- a/configure.in
++++ b/configure.in
+@@ -3,7 +3,7 @@
+ 
+ AC_INIT([bwm-ng],[0.6.1],[bwmng@gropp.org],[bwm-ng])
+ AC_CONFIG_SRCDIR(src/bwm-ng.c)
+-AM_INIT_AUTOMAKE([gnu])
++AM_INIT_AUTOMAKE([gnu subdir-objects])
+ AC_CONFIG_HEADERS(config.h)
+ AC_CONFIG_MACRO_DIR(./)
+ AC_LANG([C])
+@@ -28,44 +28,12 @@
+ AC_CHECK_TYPES(unsigned long long)
+ 
+ # Checks for libraries.
+-CURSES_CHECKED="0"
++AC_ARG_ENABLE([ncurses],
++	AS_HELP_STRING([--enable-ncurses], [Enable feature ncurses]))
+ 
+-AC_ARG_WITH([curses],AS_HELP_STRING([--with-curses],[with curses (ARG=PATH)]),[
+-if [ test $withval != "no" ]; then
+-    OLD_CPPFLAGS=$CPPFLAGS
+-    if [ test $withval != "yes" ]; then
+-        CPPFLAGS="$CPPFLAGS -I$withval"
+-    fi
+-    AC_CHECK_LIB([curses],[newterm,timeout],,[ CPPFLAGS=$OLD_CPPFLAGS ])
+-    CURSES_CHECKED="1"
+-else
+-    CURSES_CHECKED="1"
+-fi  
+-])
+-
+-
+-if [ test $CURSES_CHECKED != "1" ]; then
+-AC_ARG_WITH([ncurses],AS_HELP_STRING([--with-ncurses],[prefer ncurses over curses (ARG=PATH)]),[
+-if [ test $withval != "no" ]; then
+-    OLD_CPPFLAGS=$CPPFLAGS
+-    if [ test $withval != "yes" ]; then
+-        CPPFLAGS="$CPPFLAGS -I$withval"
+-    fi
+-    AC_CHECK_LIB([ncurses],[newterm,timeout],,[ CPPFLAGS=$OLD_CPPFLAGS ])
+-    CURSES_CHECKED="1"
+-else
+-    CURSES_CHECKED="1"
+-fi
++AS_IF([test "x$enable_ncurses" != "xno"], [
++	PKG_CHECK_MODULES([NCURSES], [ncurses], [AC_DEFINE([HAVE_LIBNCURSES], [1], [Define to 1 if you have the `ncurses' library (-lncurses).])])
+ ])
+-fi
+-
+-
+-
+-if [ test $CURSES_CHECKED != "1" ]; then
+-AC_CHECK_LIB([curses],[initscr,timeout],,[
+-	AC_CHECK_LIB([ncurses],[newterm,timeout])
+-])
+-fi
+ 
+ AC_CHECK_FUNCS([wattron])
+ AC_CHECK_FUNCS([curs_set])
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -2,12 +2,10 @@
+ 
+ bin_PROGRAMS = bwm-ng
+ 
+-bwm_ng_SOURCES = bwm-ng.c process.c output.c options.c help.c curses_tools.c
++bwm_ng_SOURCES = bwm-ng.c process.c output.c options.c help.c curses_tools.c input/retrieve.c input/devstat.c input/libkstat.c input/netstat.c input/proc_net_dev.c input/sysctl.c input/ioservice.c input/libstatgrab.c input/proc_diskstats.c input/win32.c input/getifaddrs.c
+ 
+-EXTRA_bwm_ng_SOURCES = input/retrieve.c input/devstat.c input/libkstat.c input/netstat.c input/proc_net_dev.c input/sysctl.c input/ioservice.c input/libstatgrab.c input/proc_diskstats.c input/win32.c input/getifaddrs.c
+-
+-bwm_ng_LDADD = retrieve.$(OBJEXT) $(INPUT_SYSTEM)
+-bwm_ng_DEPENDENCIES = retrieve.$(OBJEXT) $(INPUT_SYSTEM)
++bwm_ng_CPPFLAGS = @NCURSES_CFLAGS@
++bwm_ng_LDADD = @NCURSES_LIBS@
+ 
+ noinst_HEADERS = bwm-ng.h process.h output.h options.h help.h curses_tools.h types.h defines.h global_vars.h input/devstat.h input/libkstat.h input/netstat.h input/proc_net_dev.h input/sysctl.h input/ioservice.h input/libstatgrab.h input/proc_diskstats.h input/retrieve.h input/win32.h input/getifaddrs.h
+ 
+--- a/src/defines.h
++++ b/src/defines.h
+@@ -48,7 +48,7 @@
+ #define LIBSTATGRAB
+ #endif
+ 
+-#if HAVE_LIBCURSES || HAVE_LIBNCURSES
++#if defined(HAVE_LIBCURSES) || defined(HAVE_LIBNCURSES)
+ #define HAVE_CURSES
+ #endif
+ 
diff --git a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-static-inline.patch b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-static-inline.patch
new file mode 100644
index 000000000000..88e15ecefe3f
--- /dev/null
+++ b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-static-inline.patch
@@ -0,0 +1,256 @@
+Make all 'inline' functions 'static inline' such that
+the compiler can emit definitions when needed.
+http://www.greenend.org.uk/rjk/tech/inline.html
+
+--- a/src/bwm-ng.c
++++ b/src/bwm-ng.c
+@@ -26,7 +26,7 @@
+ 
+ /* handle interrupt signal */
+ void sigint(int sig) FUNCATTR_NORETURN;
+-inline void init(void);
++static inline void init(void);
+ 
+ /* clear stuff and exit */
+ #ifdef __STDC__
+@@ -98,7 +98,7 @@
+ 	deinit(0, NULL);
+ }
+ 
+-inline void init(void) {
++static inline void init(void) {
+ 	if_count=0;
+ 	delay=500;
+ #if EXTENDED_STATS	
+--- a/src/help.c
++++ b/src/help.c
+@@ -24,9 +24,9 @@
+ #include "global_vars.h"
+ #include "help.h"
+ 
+-inline void print_help_line(const char *short_c,const char * long_c,const char *descr);
++static inline void print_help_line(const char *short_c,const char * long_c,const char *descr);
+ 
+-inline void print_help_line(const char *short_c,const char * long_c,const char *descr) {
++static inline void print_help_line(const char *short_c,const char * long_c,const char *descr) {
+ #ifdef LONG_OPTIONS
+     printf("  %-23s",long_c);
+ #else
+--- a/src/options.c
++++ b/src/options.c
+@@ -30,12 +30,12 @@
+ char *trim_whitespace(char *str);
+ int read_config(const char *config_file);
+ #endif
+-inline int str2output_unit(char *optarg);
++static inline int str2output_unit(char *optarg);
+ #if EXTENDED_STATS
+-inline int str2output_type(char *optarg);
++static inline int str2output_type(char *optarg);
+ #endif
+-inline int str2out_method(char *optarg);
+-inline int str2in_method(char *optarg);
++static inline int str2out_method(char *optarg);
++static inline int str2in_method(char *optarg);
+ 
+ #ifdef CONFIG_FILE
+  /******************************************************************************
+@@ -65,7 +65,7 @@
+ /******************************************************************************/
+ #endif
+ 
+-inline int str2output_unit(char *optarg) {
++static inline int str2output_unit(char *optarg) {
+     if (optarg) {
+         if (!strcasecmp(optarg,"bytes")) return BYTES_OUT;
+         if (!strcasecmp(optarg,"bits")) return BITS_OUT;
+@@ -76,7 +76,7 @@
+ }
+ 
+ #if EXTENDED_STATS
+-inline int str2output_type(char *optarg) {
++static inline int str2output_type(char *optarg) {
+     if (optarg) {
+         if (!strcasecmp(optarg,"rate")) return RATE_OUT;
+         if (!strcasecmp(optarg,"max")) return MAX_OUT;
+@@ -87,7 +87,7 @@
+ }
+ #endif  
+ 
+-inline int str2out_method(char *optarg) {
++static inline int str2out_method(char *optarg) {
+     if (optarg) {
+         if (!strcasecmp(optarg,"plain")) return PLAIN_OUT;
+ #ifdef HAVE_CURSES
+@@ -109,7 +109,7 @@
+ }
+ 
+ 
+-inline int str2in_method(char *optarg) {
++static inline int str2in_method(char *optarg) {
+     if (optarg) {
+ #ifdef PROC_NET_DEV
+         if (!strcasecmp(optarg,"proc")) return PROC_IN;
+--- a/src/output.c
++++ b/src/output.c
+@@ -25,13 +25,13 @@
+ #include "output.h"
+ 
+ inline static const char *output_type2str(void);
+-inline const char *input2str(void);
+-inline const char *show_all_if2str(void);
+-inline ullong direction2value(char mode,struct inout_long stats);
++static inline const char *input2str(void);
++static inline const char *show_all_if2str(void);
++static inline ullong direction2value(char mode,struct inout_long stats);
+ #if EXTENDED_STATS
+-inline double direction_max2value(char mode,struct inouttotal_double stats,int items);
++static inline double direction_max2value(char mode,struct inouttotal_double stats,int items);
+ #endif
+-inline char *dyn_byte_value2str(double value,char *str,int buf_size);
++static inline char *dyn_byte_value2str(double value,char *str,int buf_size);
+ char *values2str(char mode,t_iface_speed_stats stats,t_iface_stats full_stats,float multiplier,char *str,int buf_size);
+ 
+ inline static const char *output_type2str(void) {
+@@ -59,7 +59,7 @@
+ }
+ 
+ 
+-inline const char *input2str(void) {
++static inline const char *input2str(void) {
+     switch (input_method) {
+ #ifdef SYSCTL
+         case SYSCTL_IN:
+@@ -121,7 +121,7 @@
+     return "";
+ }
+ 
+-inline const char *show_all_if2str(void) {
++static inline const char *show_all_if2str(void) {
+     switch (show_all_if) {
+         case 1:
+ 				return " (all)";
+@@ -262,7 +262,7 @@
+ }
+ 
+ 
+-inline ullong direction2value(char mode,struct inout_long stats) {
++static inline ullong direction2value(char mode,struct inout_long stats) {
+     switch (mode) {
+         case 0:
+             return stats.in;
+@@ -275,7 +275,7 @@
+ }
+ 
+ #if EXTENDED_STATS
+-inline double direction_max2value(char mode,struct inouttotal_double stats,int items) {
++static inline double direction_max2value(char mode,struct inouttotal_double stats,int items) {
+     switch (mode) {
+         case 0:
+             return (double)(stats.in/items);
+@@ -288,7 +288,7 @@
+ }
+ #endif
+ 
+-inline char *dyn_byte_value2str(double value,char *str,int buf_size) {
++static inline char *dyn_byte_value2str(double value,char *str,int buf_size) {
+     if (dynamic) {
+         if (value<1024)
+             snprintf(str,buf_size,"%15.2f  ",value);
+@@ -306,7 +306,7 @@
+     return str;
+ }
+ 
+-inline char *dyn_bit_value2str(double value,char *str,int buf_size) {
++static inline char *dyn_bit_value2str(double value,char *str,int buf_size) {
+     if (dynamic) {
+         if (value<1000)
+             snprintf(str,buf_size,"%15.2f  ",value);
+--- a/src/process.c
++++ b/src/process.c
+@@ -26,19 +26,19 @@
+ 
+ short show_iface(char *instr, char *searchstr,char iface_is_up);
+ #if HAVE_GETTIMEOFDAY
+-inline long tvdiff(struct timeval newer, struct timeval older);
++static inline long tvdiff(struct timeval newer, struct timeval older);
+ float get_time_delay(int iface_num);
+ #endif
+-inline ullong calc_new_values(ullong new, ullong old);
++static inline ullong calc_new_values(ullong new, ullong old);
+ t_iface_speed_stats convert2calced_values(t_iface_speed_stats new, t_iface_speed_stats old);
+ t_iface_speed_stats convert2calced_disk_values(t_iface_speed_stats new, t_iface_speed_stats old);
+ #if EXTENDED_STATS
+-inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data);
+-inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data);
+-inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier);
++static inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data);
++static inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data);
++static inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier);
+ void save_avg(struct t_avg *avg,struct iface_speed_stats calced_stats,float multiplier);
+-inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values);
+-inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier);
++static inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values);
++static inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier);
+ #endif
+ 
+ /* returns the whether to show the iface or not
+@@ -74,7 +74,7 @@
+ 
+ #if HAVE_GETTIMEOFDAY
+ /* Returns: the time difference in milliseconds. */
+-inline long tvdiff(struct timeval newer, struct timeval older) {
++static inline long tvdiff(struct timeval newer, struct timeval older) {
+   return labs((newer.tv_sec-older.tv_sec)*1000+
+     (newer.tv_usec-older.tv_usec)/1000);
+ }
+@@ -92,7 +92,7 @@
+ #endif
+ 
+ /* basically new-old, but handles "overflow" of source aswell */
+-inline ullong calc_new_values(ullong new, ullong old) {
++static inline ullong calc_new_values(ullong new, ullong old) {
+     /* FIXME: WRAP_AROUND _might_ be wrong for libstatgrab, where the type is always long long */
+     return (new>=old) ? (ullong)(new-old) : (ullong)((
+ #ifdef HAVE_LIBKSTAT
+@@ -133,13 +133,13 @@
+ 
+ #if EXTENDED_STATS
+ /* sub old values from cached for avg stats */
+-inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data) {
++static inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data) {
+     values->in-=data.in;
+     values->out-=data.out;
+     values->total-=data.total;
+ }
+ 
+-inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data) {
++static inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data) {
+     values->in+=data.in;
+     values->out+=data.out;
+     values->total+=data.total;
+@@ -148,7 +148,7 @@
+ 
+ /* put new-old bytes in inout_long struct into a inouttotal_double struct 
+  * and add values to cached .value struct */
+-inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier) {
++static inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier) {
+     data->in=calced_stats.in*multiplier;
+     data->out=calced_stats.out*multiplier;
+     data->total=(calced_stats.in+calced_stats.out)*multiplier;
+@@ -198,13 +198,13 @@
+ }
+ 
+ /* add current in and out bytes to totals struct */
+-inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values) {
++static inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values) {
+     stats->in+=new_stats_values.in;
+     stats->out+=new_stats_values.out;
+ }
+ 
+ /* lookup old max values and save new if higher */
+-inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier) {
++static inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier) {
+     if (multiplier*calced_stats.in > stats->in)
+         stats->in=multiplier*calced_stats.in;
+     if (multiplier*calced_stats.out>stats->out)
diff --git a/net-analyzer/bwm-ng/metadata.xml b/net-analyzer/bwm-ng/metadata.xml
new file mode 100644
index 000000000000..7d30b17df0f1
--- /dev/null
+++ b/net-analyzer/bwm-ng/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<use>
+<flag name="csv">Enable csv output</flag>
+<flag name="html">Enable html output</flag>
+</use>
+</pkgmetadata>
diff --git a/net-analyzer/bwmon/Manifest b/net-analyzer/bwmon/Manifest
new file mode 100644
index 000000000000..5d47c0a9dc3f
--- /dev/null
+++ b/net-analyzer/bwmon/Manifest
@@ -0,0 +1,9 @@
+AUX bwmon-1.3-build.patch 490 SHA256 82a726a34c54e2c1e08a39a0b8ed6a6e5d54dfeae872a097dce35b3112d6fba7 SHA512 1d5901ff95563acfeb87a0da4863fc2878bb9d3112a4ce698b0e24683f630d8810d75500bb0edd4adea37c3d9ff9efd3bde6d3d91b7f861a4108fd1866aca6a1 WHIRLPOOL 3bc0ffc739ccc8ca91df0b80a25b2750bed84fa89cb915b13451d65971a9c0f5776f8fc361490399937e99068e81ccf508c63b5be96994a2896b7333adf6b59d
+AUX bwmon-1.3-overflow.patch 543 SHA256 25f566d99c247998ee040e11561bfdd24799ee43f4aee05cc49ec71136a3c911 SHA512 c8d4bb28606161d0f3e9bd151bcfcb63edcb3d0e0d44e3328f22a2295c28c9257e132b173b724b7e7cd0fdec9bb31e57219cdcddcd4f525b13ca736bbf7cb42e WHIRLPOOL 3fe55d70da3d34e24295ed9fee6ff7573c958f27f802c7d9ad626d0a4f3558dd10d1e870f263aed98bb73fda30cc84bcd2b203dd7e4d6886b3ea139f90e3b85f
+AUX bwmon-1.3-tinfo.patch 242 SHA256 6321ed2fbbd54096028b9017096f668e912115d293eec1516239640cdbc9ab87 SHA512 710f9cb4ff61b84f717603f5b814cfaed90af95c67cbc051eb9535084cb02c26711e3dd9f539165640ffb7bc770a15d77144de9c5ccb1235a6b11c3619b3d0ec WHIRLPOOL 5ef7bb42469f02e09c3d3ececd7e3fad796d688a5e3ae12ccf350299a7bb3ee52bd9b522dd26370de12a1d74c3e8add536403e66732a9b54a46ab3ffd7ba94eb
+AUX bwmon-1.3-typo-fix.patch 534 SHA256 1251e0907880415b9d404b9105281d755f0fe369d86154fa61b601e3253f9772 SHA512 4c0a23a7b49a86e35239e1b7e0273d3ffafa4ea1a43918557ed26e4680eb2563aa1635670868ab7f39157118d140844a0706828d9f09f938d21e90f3fa5d6854 WHIRLPOOL ea9494e3d190876e0476c50221e4af1bc3cea53d10406d0d10785e3fe5c69f44f2b601b9ed7e6613a2de2617be40dd5cdd26fdada092dc1e20787966d215dda0
+DIST bwmon-1.3.tar.gz 5668 SHA256 624381208d0faae6c123bc6198a59d6c4316cd4fffb1ba5aca206374f5a42df6 SHA512 6552ba03f0cfe7d2adebe7ae49379cc109b4f8da56dafec1264ac39c114809c7cde161f6321a67516b22b04abbad5d1ab3b4efb313479ad131fb20638c6871e8 WHIRLPOOL 1b05208fdae45881b3175f5f84fe5d816c1d0db182ccb34be1b61e3f2e14bde5cb627dda0ded10cb1f21490277eb6d5c3cd3456001854e0dd418cca6d63cb8d1
+EBUILD bwmon-1.3-r2.ebuild 733 SHA256 8e22e3ac749ced3a576a3f7c0948e1e09ea97649a8293483f2d3bdf96494210d SHA512 8199fb1a3541bca40d1173e2a5b44fda7f810199c4037899149c5b4207578799104996e50c79a1826f4f49428345d22d7c715ecd5d83f86cf2f3a004ebf738cf WHIRLPOOL 6e73d2b51108d0b673de2c79bc85ee14b3ebb907dabcd35de2113d101442e69a934105b2664fbec8d630fede7ee6d5f703a38a07017a45968968121f486a2762
+MISC ChangeLog 2557 SHA256 7ae88100efeaf94be4dac4ef99de0073bd84200abc1710064f38b42a9a12d1f0 SHA512 9251f264f101040093c9702396027a122843b11b86997515196cbad7806f66078c473711d8148b394650776bc6827cb6a9b7c92bfba9e9d8dac51ce3b6700fc0 WHIRLPOOL 6cf688d4c64cf6519c25f06cd55f72ee8eb7097c9813e16f48cf119357bf2dc21669e4ac2a33ec561e95f59451437512d51d9b3281edf54e28b03e3fc351d103
+MISC ChangeLog-2015 3746 SHA256 a9593daf487fc3581ca1a57bb4caedaf8760491bd7298f76f0bf284a41a0cea1 SHA512 d96f1a1e261607df1d494b3dc2c947a803e4a25a89334452c8e516f412717678d5fe60a0c7f4ede7629dc531f4229f9a3911debc44b6d5822c5d1480a4bc9ae9 WHIRLPOOL 141c9ece279212764c9db62731697d7de9cfcc322a11bec525a21eb3491740487822be107a150f79cb352024ddad760207d6bcaf0462299c65faea6a9f8f0df1
+MISC metadata.xml 424 SHA256 81b7a305f5253628794f1cd2114052a37e323a57f39a356014614ce207970692 SHA512 56c90d7c0ab1908d42982a62c42ae80a60f825adca80025fb87ae6cd21248501809b0cd639f47ef8edcf33abdffaf17cc0f8ede5a33b7eaee5bbb93c2f19885d WHIRLPOOL e029736ecd97bf1d20af12a50629908cd33ebe97378488eeceea18644410dfe2cba3ecb5e8617421ff89aa97b6ed4b016330a5cf11abe56bc7bad7d3dcf710ac
diff --git a/net-analyzer/bwmon/bwmon-1.3-r2.ebuild b/net-analyzer/bwmon/bwmon-1.3-r2.ebuild
new file mode 100644
index 000000000000..3b4912656104
--- /dev/null
+++ b/net-analyzer/bwmon/bwmon-1.3-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Simple ncurses bandwidth monitor"
+HOMEPAGE="http://bwmon.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+SLOT="0"
+LICENSE="GPL-2 public-domain"
+KEYWORDS="amd64 hppa ppc sparc x86"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-typo-fix.patch \
+		"${FILESDIR}"/${P}-overflow.patch \
+		"${FILESDIR}"/${P}-tinfo.patch
+}
+
+src_compile() {
+	emake -C src CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install () {
+	dobin ${PN}
+	dodoc README
+}
diff --git a/net-analyzer/bwmon/files/bwmon-1.3-build.patch b/net-analyzer/bwmon/files/bwmon-1.3-build.patch
new file mode 100644
index 000000000000..6d4eadf15551
--- /dev/null
+++ b/net-analyzer/bwmon/files/bwmon-1.3-build.patch
@@ -0,0 +1,22 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -10,8 +10,8 @@ CC = gcc
+ RM = /bin/rm
+ INSTALL = install
+ 
+-CFLAGS = -I../include -Wall -D__THREADS
+-LDFLAGS = -lpthread -lncurses 
++CFLAGS += -I../include -Wall -D__THREADS
++LIBS = -lpthread -lncurses 
+ 
+ SRC = bwmon.c
+ OBJS = $(SRC:.c=.o)
+@@ -19,7 +19,7 @@ OBJS = $(SRC:.c=.o)
+ all: bwmon
+ 
+ bwmon: $(OBJS)
+-	$(CC) $(LDFLAGS) -o ../$@ $(OBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o ../$@ $(OBJS) $(LIBS)
+ 
+ clean:
+ 	@for i in $(OBJS) *~ core bwmon; do \
diff --git a/net-analyzer/bwmon/files/bwmon-1.3-overflow.patch b/net-analyzer/bwmon/files/bwmon-1.3-overflow.patch
new file mode 100644
index 000000000000..052d1d766351
--- /dev/null
+++ b/net-analyzer/bwmon/files/bwmon-1.3-overflow.patch
@@ -0,0 +1,20 @@
+--- a/src/bwmon.c
++++ b/src/bwmon.c
+@@ -408,7 +408,7 @@ bool_t
+ print_uptime(float * uptime) 
+ {
+ 	unsigned int tmp = 0, hour = 0, min = 0, sec = 0;
+-	char hostname[30];
++	char hostname[50];
+ 
+ 	tmp = (uint)(*uptime);
+ 	sec = tmp % 60;
+@@ -418,7 +418,7 @@ print_uptime(float * uptime)
+ 	hour = tmp % 24;
+ 	tmp = (tmp - hour) / 24;
+ 
+-	if (gethostname(hostname, strlen(hostname)) != 0)
++	if (gethostname(hostname, sizeof(hostname)) != 0)
+ 		strcpy(hostname, "System");
+ 
+ 	printw("\n%s uptime: %u day%c %u hour%c %u minutes and %u seconds\n", 
diff --git a/net-analyzer/bwmon/files/bwmon-1.3-tinfo.patch b/net-analyzer/bwmon/files/bwmon-1.3-tinfo.patch
new file mode 100644
index 000000000000..df0bb06cb968
--- /dev/null
+++ b/net-analyzer/bwmon/files/bwmon-1.3-tinfo.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -11,7 +11,7 @@
+ INSTALL = install
+ 
+ CFLAGS += -I../include -Wall -D__THREADS
+-LIBS = -lpthread -lncurses 
++LIBS = -lpthread $(shell ${PKG_CONFIG} --libs ncurses)
+ 
+ SRC = bwmon.c
+ OBJS = $(SRC:.c=.o)
diff --git a/net-analyzer/bwmon/files/bwmon-1.3-typo-fix.patch b/net-analyzer/bwmon/files/bwmon-1.3-typo-fix.patch
new file mode 100644
index 000000000000..36f6af8e5ee6
--- /dev/null
+++ b/net-analyzer/bwmon/files/bwmon-1.3-typo-fix.patch
@@ -0,0 +1,11 @@
+--- a/src/bwmon.c
++++ b/src/bwmon.c
+@@ -36,7 +36,7 @@
+ 			"by Kimmo Nupponen (kimmoon@users.sourceforge.net)\n"
+ 			"$Date: 2014/07/10 19:51:24 $\n\n"
+ 			"usage: %s [-b] [-h] [-a] [-m] [-u seconds]\n"
+-			"\t-a Print bandwidth utiliasation in Kbytes rather than Kbits. The default\n"
++			"\t-b Print bandwidth utilisation in KBytes rather than Kbits. The default\n"
+ 			"\t   is to use Kbits\n"
+ 			"\t-a Print also average bandwidth since last boot per interface\n"
+ 			"\t-m Print maximum bandwidth since launch of this utility\n"
diff --git a/net-analyzer/bwmon/metadata.xml b/net-analyzer/bwmon/metadata.xml
new file mode 100644
index 000000000000..5d308982f242
--- /dev/null
+++ b/net-analyzer/bwmon/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>Simple ncurses bandwidth monitor</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">bwmon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/bwping/Manifest b/net-analyzer/bwping/Manifest
new file mode 100644
index 000000000000..f1dc17ca646c
--- /dev/null
+++ b/net-analyzer/bwping/Manifest
@@ -0,0 +1,9 @@
+DIST bwping-1.7.tar.gz 90441 SHA256 a73db87b47d363d722cd60473a546930a5e78df8d21437191ba4ca06d7197297 SHA512 74b695a80c2fa54693af1afab78417dc6ca35130bbd9367950681ddbbebe36b38166068532e8296f336c5cad8230339b4fb4fb975f4b066cdacba8a99179cac7 WHIRLPOOL 41567722306d0ee72bad2ba9802bf399f0b435848a11d075bb89f746487c06ab16484056f54223b5cbea26e2855f2273b52a1247743c7cc77ad89beb26c3da01
+DIST bwping-1.8.tar.gz 90751 SHA256 725cd3bcd1b5bf7a27da802ce370dd86689fecf7b302538e74b20986dc8ce536 SHA512 d6d5e4b347ad7fcccbc980fb2f10b2528c874af618263b54aae923dee7d334057c703d58a65c9225a158b0cc29f0a14396891dba784642531197fb3960743067 WHIRLPOOL 44321def1a47989c5c74f79775507916cd7eb7174bddf8272bf9357ac33c5246af9280b61f522f2cb0ac92aa3e033facc12a1730d43ae2c1bf572a42561f928a
+DIST bwping-1.9.tar.gz 90877 SHA256 3827f9256e9da5c22c62530d800438f0111986a8f1fad84c7bdb924d630f0090 SHA512 6d70fc7a1b7965b4859e05be088d11af8e92ab844903ea5303e9b9be4cc37deaf02a7ee40ecba5d0ebf1ba2f047d0d156be25f7c62fe136ec3f703a7ef940ccf WHIRLPOOL 1c7ef5d30612ae35f64d1c00bcd619beb1a7452cb95f02649a3cefacd831f898c6602a0bce213f566ddba6db0b5d5f22d7019f54e75dc9f2a961efbb6652d04d
+EBUILD bwping-1.7-r1.ebuild 413 SHA256 92277cd12d66ccff84a240ad3e72fc8a8c66cc8f6ab513236efb416148d40677 SHA512 28af947741c68432f9e6a9312cb74cef83aaaccb3dcd00d808a9b76dee3665ebe0d04d7a2c12b2eed06e78cd13e58a73f98102999e87147dbdaa5d175488874f WHIRLPOOL 810ecbf966a5c5bb02c7a2053e7166874e220da4f683e40133fb280d60c52aa1dcbdb51a68f7b608bb363cf3911a88fa0070d1b71275ebff7853858d53e4b41b
+EBUILD bwping-1.8.ebuild 415 SHA256 798231df964873ee652cf9f274046fbf3064155181eddd42f278e0226062383b SHA512 b920655976c17e7a73a3a7f7f7f444241bcc787fa94fead1ca7125f5a1a4b11930df5e50ac254044f80cbba5191ce29530c75f512d7753c4ca61ee9f9b108efb WHIRLPOOL 04b2ffe1a36f465d094431436762080136b7321adde4b91eef0b75dc2915a8ecab4f5fac81a044221ce11af47a87ce23187a82857d0492bd0f9e547327d2a604
+EBUILD bwping-1.9.ebuild 415 SHA256 5138d29c3a46e9ff30472e62e9fb97f5d6cd74bb2e4a15fd1656e99fb9b38d13 SHA512 147edbc346d231e9134e8052d5c252e43bf4351f48e424754f191098fd9ac3396ae1bf3b50f526ca84724273ba3808ac152c3c589dc996b65f1a4f1b15c05005 WHIRLPOOL 3427c63e12ac41222030cbf93a1772d781551a70d9ff94ac3ee351570ed11149b399da596814c181c6601398651667e1b814341ac32ec7ac39f9a5c61f428e29
+MISC ChangeLog 2857 SHA256 1c25ababc98926ce31663aa31e415b11e703680f3cf0f9dbfcf0ac9d70048ffc SHA512 9930d103e68158465dee12186baea604517c422e38047bb62b24be8ea4ef92a701e42e1ddbf6fcc24ed821f68bf0a6f7755dd851cfff39249c94cf01e4d225a6 WHIRLPOOL 506ebd42fe96c0a648aa6d370cee112e40db0ecd1c469af064a667c107389f9d0dff9b479d9bcaabe141d992c9a3b150a83c40c23763025c671f39d01e13153f
+MISC ChangeLog-2015 3284 SHA256 e1de6347aeb048ce6ab359a87f38257b3857ca4cdc7138506f1a54aff7cb66d6 SHA512 0d24dd00399ce9e72e673ce0867ad46fb703b13911a19c8bafb67abdef486a5041cca184c5f3ff06b080742f40d987ee392a8fbfc28b26c5bb0229f57323d497 WHIRLPOOL 0b440968434ad74a60546477c55911345c371d8fec05a571e7dde7f20c4a413376765485357a98caa81013001458182f8045d1d8ecda45407222c9d361059819
+MISC metadata.xml 762 SHA256 a8904fd8bfe68f65ca27c399e7d1703b7e89de29d7f7c7d737eeea4f0286ac34 SHA512 250abfb0ba5bab99ccad8b1494814339844b6e46ebb6d3af9fa3933d01964ce5a3c97e74e2ded0d5bea221c4eed20ffd7cc7bc9c1e8680feec907f390df27dd2 WHIRLPOOL ca4e4dce298321951f7904ac0b1227e9d834318f4112e194fde02b2281090b94672465f8ae8f96f3dd93ab713e9edabf5fc545d31bbdc4d0feaee5c3b5689f54
diff --git a/net-analyzer/bwping/bwping-1.7-r1.ebuild b/net-analyzer/bwping/bwping-1.7-r1.ebuild
new file mode 100644
index 000000000000..c6ddb2e09196
--- /dev/null
+++ b/net-analyzer/bwping/bwping-1.7-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A tool to measure bandwidth and RTT between two hosts using ICMP"
+HOMEPAGE="http://bwping.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~sparc x86 ~x86-fbsd"
+IUSE="ipv6"
+
+src_configure() {
+	econf $(use_enable ipv6)
+}
diff --git a/net-analyzer/bwping/bwping-1.8.ebuild b/net-analyzer/bwping/bwping-1.8.ebuild
new file mode 100644
index 000000000000..ab4b64b32645
--- /dev/null
+++ b/net-analyzer/bwping/bwping-1.8.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A tool to measure bandwidth and RTT between two hosts using ICMP"
+HOMEPAGE="http://bwping.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6"
+
+src_configure() {
+	econf $(use_enable ipv6)
+}
diff --git a/net-analyzer/bwping/bwping-1.9.ebuild b/net-analyzer/bwping/bwping-1.9.ebuild
new file mode 100644
index 000000000000..1f2bd02ad9eb
--- /dev/null
+++ b/net-analyzer/bwping/bwping-1.9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A tool to measure bandwidth and RTT between two hosts using ICMP"
+HOMEPAGE="http://bwping.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6"
+
+src_configure() {
+	econf $(use_enable ipv6)
+}
diff --git a/net-analyzer/bwping/metadata.xml b/net-analyzer/bwping/metadata.xml
new file mode 100644
index 000000000000..a3345073919a
--- /dev/null
+++ b/net-analyzer/bwping/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>oleg.derevenetz@gmail.com</email>
+			<name>Oleg Derevenetz</name>
+		</maintainer>
+		<remote-id type="sourceforge">bwping</remote-id>
+	</upstream>
+	<longdescription>
+	A tool to measure bandwidth and response times between two hosts using
+	Internet Control Message Protocol (ICMP) echo request/echo reply mechanism.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
new file mode 100644
index 000000000000..b0058ca64c5d
--- /dev/null
+++ b/net-analyzer/cacti-spine/Manifest
@@ -0,0 +1,13 @@
+AUX cacti-spine-0.8.8d-mysql.patch 283 SHA256 bd99d14dcab780ff4fa01d85107d69c879faf1bdf113e1b38f3c7f9509823f40 SHA512 0291015f09a9f74cb3e9132c3fe751105928217d6f9c8e4312501d161ef30b6277114a3600c160704af7e43a75cea6c06f75dd6a8777fedee4b8d0909ef67642 WHIRLPOOL 34c3d743eb12db7286c7b7905b8433507f34e68b2ecf3cd9fbb0bd7b2b604aa67faddf4fcc818af009c5422c69363e5f6e5a1602bcaf601e9b7fe4519eb11bc0
+AUX cacti-spine-0.8.8d-ping.patch 235 SHA256 be4b619c9a476759cd06f243641d6043a25345b6a2b3ac5dd16622d1463aff3d SHA512 93ea39cefbe20741a372c644f79bc2bde80e8ba81cbdfa4425523a642c0853aafe12a46bfd84a5d2161a9afed4ff8fd933cf72adbabcd54e936da8dd7d89d265 WHIRLPOOL 88b32e2229a5c8b1fd6c2a5c187af9a2372996b87ef4ef6837eee6f06b0de18a909d6d98dd521c2a762e76f8742e9d96f48a71efd3ad759db227e6da222be726
+AUX cacti-spine-0.8.8g-net-snmp.patch 673 SHA256 87bf39623adea226c8d7cecc85b3e2ce2f1a75dda1bca0dbe277528cf6e14543 SHA512 4eadde6b71eb20df4baf42241e7ec9b4e99af6d5f2023ea044ec27c379a8e7c4d3accced97091764ce1c946e30eebafb18c7f598be280e9b6b0b255c27f4ef57 WHIRLPOOL f7ad10d8e93e4cac98c8d120bd92535c3e2d5489709ccf5f588cfddb6099762ec14d7d8d779d905776c0666d85a280339034c091c11fdf9130561c10a282e031
+AUX cacti-spine-0.8.8h-fix-ac-macro.patch 217 SHA256 473634529cca89e1609219a40643140de47e5babf41a62c581f4b86a97e1b01b SHA512 f247fab6d074d9022f9b7f62d698ab8b293c4e90de883f8fc9bbe71ec147a886ce94f8b9d58e7d52f168ccbf4caf0a24029ca0594c151fec579efb540cf65d09 WHIRLPOOL 8a42ef693646c07a7ff411687f13f2ee4860e84d59bc759a465c70276d973225e8751e3eda952ababb77619fb6fc18832929e8c28c8f3ce6225db0f124d724a0
+DIST cacti-spine-0.8.8h.tar.gz 804951 SHA256 a693136839bd7d03cae5b3ff4614a4d21a2153ffb14d09fc061b843ab0b2bb30 SHA512 6a7147ab645be44de0d330c7801e569705817da10bf6cedba82c712e1701ada8aa8924a6b3b063ea680e6af24f815d6767e8773ad7b8da212abfa082b4211bd4 WHIRLPOOL 36daed4986ca84883e51ab6b02ebb2ade00205c30705cfc94e73835bc2fc427a60a2dba9c7ca3665d0c0b2fca21afab77d94cde63b740f3734f9279c929cccaf
+DIST cacti-spine-1.1.20.tar.gz 801877 SHA256 a8ccb24980099fbb6ee0a16f397f10fb9b3320db6a02c4e61b1483445d405f99 SHA512 df552157e64da04f57493351831a0602dea9ca3219ce3936884aec894e6698559d429ec62936a307b43fd49eff674c670d7e0a047924b5f03c30abeeec91491f WHIRLPOOL 1948229141f99fb04c799b46b323a047c47dc3c94303cb50f56018af8cbc1fe4d2c3a5b8c1683629802b3600e6e69b8ab5ce636e0d9c84ba61e9beadde11f2f1
+DIST cacti-spine-1.1.21.tar.gz 801907 SHA256 031c7eeea7e64b20754cccfcc65851443847a31765893ddcc528da4e384ca4bf SHA512 0dfdd3444639a471bc5c0d35ea3898532f2ebf16679677fee8ad291221ed607b54acc7fbf25e78da7c5597eeaed6b870ad7af66a95e20f95afce3270c8da5dd0 WHIRLPOOL 6521e622329c1a6e6ca5b8c97717380a4bc2fadde37af42fa6c1fd83f82a35ebc5cefce9788a360ff46abc62a9918e327404188f6c9b611b0064e1a86b41cab0
+EBUILD cacti-spine-0.8.8h.ebuild 999 SHA256 9dfc1173686e7bb7cdc44895735a91f77e0412436b90af2fada2670d74eeb827 SHA512 5b1226090b6cc63715b45e46a5d258b25ab67d596894212c755fc8c3602db4d8f96f9c26208b7bf4c3c27b11ef57cc3cda9913d709fc7d5f1ed9b44c5f52c241 WHIRLPOOL 3763b3ae6bc822edcc6e526bbb137be74766bdc105e58dd8e2d6a1969f352ed302508c6b09e2d34febf3fc1fb24e469edfec49f4db059167a1f47101b7843526
+EBUILD cacti-spine-1.1.20.ebuild 861 SHA256 1339a910525d2e15412e9b805c92877bdb49fdc9f462b6dc0abb6ac3d906d29d SHA512 4820e9d6245df29dfb6dd57cdc6a41dab158e177e4273895748612d2de9089f61dc3984fef204ac0ec0321d97c94258962edb14ac84a983ce34b7b2234dce2be WHIRLPOOL c671990e7c4c899be726dfab136ff50abc2cbc97440f88446e6f912f14b8f03c4e9a2fa884f909cccdcab1f5cfbee968923c93896c0a4871e703375b7f96c00e
+EBUILD cacti-spine-1.1.21.ebuild 863 SHA256 5e5f9ee85315aef7c3dbdbf8397d5afb857a4647a9ad7a553c87316c760b6eed SHA512 0520ba0fdaa6dee66803ac9567c2e49060e48dcad9d9eae868e3c063e601f45686cd1d46897e26a1843fbd2c854df05b3fa68659eda95b391a321777eefe59fa WHIRLPOOL 20561edecf53e00acbeb99a486f0b9df275fc95c795e92fb8c13e9c0f5f1059aa12b44eb108adcc62fdf685e2842f3aee0f0822af644fe41aedc4149aa59aeed
+MISC ChangeLog 5144 SHA256 f4109f6f6cc548a8d9390a072215bcc6f16fe7724494eb7e14c09093c7700160 SHA512 607568b0cbe9ee8d1bbddaf9d9dd01c9652a5cdf12d7d2e944ca73c4c4550af004ff59276bcb84ac90179b4c4349e33261929703922dbf9862bc32de3939eea9 WHIRLPOOL 8a2b8005b6230e5348bac05fe25c89b3afc862496d00e45333a762bf2563fddd0cc914c53fe433eb9636a61b941667d567c2753031c66e530295f21869fa2545
+MISC ChangeLog-2015 7652 SHA256 c66b026913004af1b3c3f9222527b2b6256a198df5a1846ce70562c33e08c837 SHA512 4867bbe6054bb287d4b6142b1a03f5709eab730764f40ad56e434edaa6c45f83e817d1118042a4fa6b28b881481f4b8911dbcb35aad0414459d9e0d82c2e888c WHIRLPOOL 3a0530ff8febf7c22f78a7e3a9e2cd98268bbfaadf218acafe223c1e2f10b15266c6a5a8ae3539b0f8460934a8569a222c9fce53adbefd55006941dda3e98306
+MISC metadata.xml 728 SHA256 e44c360dfac0f02ddf82d23b13b4e9f45aca436e872a9508753a8e450cd04069 SHA512 a8aef67f6761ecf0ac98771a82908e67fb9aead1a32f7ececb8c80ae46c1a431abcfc1165ed471dd428bd6c0a5d4bdc2ddbea1c86ae5c917ff9786bacd6d0f38 WHIRLPOOL c073071c896c3cd8b8e8f7a408cd38dddf9d8e74851874dc5a2b9516c9626cc58923070220f8b4fdbc9d9a9828160fbcf21c1b3f96c6ff4d797fdfce2803a404
diff --git a/net-analyzer/cacti-spine/cacti-spine-0.8.8h.ebuild b/net-analyzer/cacti-spine/cacti-spine-0.8.8h.ebuild
new file mode 100644
index 000000000000..c7738d6dba91
--- /dev/null
+++ b/net-analyzer/cacti-spine/cacti-spine-0.8.8h.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+MY_P=${PN}-${PV/_p/-}
+
+DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
+HOMEPAGE="http://cacti.net/spine_info.php"
+SRC_URI="http://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 hppa ~ppc ~ppc64 sparc x86"
+
+CDEPEND="
+	dev-libs/openssl:*
+	net-analyzer/net-snmp
+	virtual/mysql
+"
+DEPEND="
+	${CDEPEND}
+	sys-apps/help2man
+"
+RDEPEND="
+	${CDEPEND}
+	>net-analyzer/cacti-0.8.8
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.8.8h-fix-ac-macro.patch \
+		"${FILESDIR}"/${PN}-0.8.8d-mysql.patch \
+		"${FILESDIR}"/${PN}-0.8.8d-ping.patch \
+		"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
+
+	sed -i -e 's/^bin_PROGRAMS/sbin_PROGRAMS/' Makefile.am
+	AT_M4DIR="config" eautoreconf
+}
+
+src_install() {
+	dosbin spine
+	insinto /etc/
+	insopts -m0640 -o root
+	newins spine.conf{.dist,}
+	dodoc ChangeLog README
+}
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.1.20.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.1.20.ebuild
new file mode 100644
index 000000000000..278cc3ade74f
--- /dev/null
+++ b/net-analyzer/cacti-spine/cacti-spine-1.1.20.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils
+
+MY_P=${PN}-${PV/_p/-}
+
+DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
+HOMEPAGE="https://cacti.net/spine_info.php"
+SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
+
+CDEPEND="
+	dev-libs/openssl:*
+	net-analyzer/net-snmp
+	virtual/mysql
+"
+DEPEND="
+	${CDEPEND}
+	sys-apps/help2man
+"
+RDEPEND="
+	${CDEPEND}
+	>net-analyzer/cacti-0.8.8
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.8d-ping.patch
+	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
+)
+
+src_prepare() {
+	default
+
+	AT_M4DIR="config" eautoreconf
+}
+
+src_install() {
+	dosbin spine
+	insinto /etc/
+	insopts -m0640 -o root
+	newins spine.conf{.dist,}
+	dodoc ChangeLog
+}
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.1.21.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.1.21.ebuild
new file mode 100644
index 000000000000..d148f4544d01
--- /dev/null
+++ b/net-analyzer/cacti-spine/cacti-spine-1.1.21.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils
+
+MY_P=${PN}-${PV/_p/-}
+
+DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
+HOMEPAGE="https://cacti.net/spine_info.php"
+SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+CDEPEND="
+	dev-libs/openssl:*
+	net-analyzer/net-snmp
+	virtual/mysql
+"
+DEPEND="
+	${CDEPEND}
+	sys-apps/help2man
+"
+RDEPEND="
+	${CDEPEND}
+	>net-analyzer/cacti-0.8.8
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.8d-ping.patch
+	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
+)
+
+src_prepare() {
+	default
+
+	AT_M4DIR="config" eautoreconf
+}
+
+src_install() {
+	dosbin spine
+	insinto /etc/
+	insopts -m0640 -o root
+	newins spine.conf{.dist,}
+	dodoc ChangeLog
+}
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-mysql.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-mysql.patch
new file mode 100644
index 000000000000..d60653678a2c
--- /dev/null
+++ b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-mysql.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -239,7 +239,7 @@
+ fi
+ CFLAGS="-I$MYSQL_INC_DIR $CFLAGS"
+ 
+-AC_CHECK_LIB(mysqlclient_r,mysql_init, LIBS="-lmysqlclient_r",
++AC_CHECK_LIB(mysqlclient_r,mysql_init, LIBS="$LIBS -lmysqlclient_r",
+   AC_MSG_ERROR([MySQL libraries not found])
+ )
+ 
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-ping.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-ping.patch
new file mode 100644
index 000000000000..0d94674ce5a3
--- /dev/null
+++ b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-ping.patch
@@ -0,0 +1,11 @@
+--- a/ping.c
++++ b/ping.c
+@@ -813,7 +813,7 @@
+ 	int    rv;
+ 
+ 	buf = malloc(len*sizeof(char));
+-	memset(buf, 0, sizeof(buf));
++	memset(buf, 0, len*sizeof(char));
+ 
+ 	while (1) {
+ 		rv = gethostbyname_r(hostname, &result_buf, buf, len,
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-net-snmp.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-net-snmp.patch
new file mode 100644
index 000000000000..5ee62e2279a0
--- /dev/null
+++ b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-net-snmp.patch
@@ -0,0 +1,19 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -251,14 +251,14 @@
+ 
+ # Net-SNMP includes v3 support and insists on crypto unless compiled --without-openssl
+ AC_MSG_CHECKING([if Net-SNMP needs crypto support])
+-AC_TRY_COMPILE([#include <net-snmp-config.h>], [exit(NETSNMP_USE_OPENSSL != 1);],
++AC_TRY_COMPILE([#include <net-snmp/net-snmp-config.h>], [exit(NETSNMP_USE_OPENSSL != 1);],
+   [  AC_MSG_RESULT(yes)
+      SNMP_SSL=yes
+   ],
+   AC_MSG_RESULT(no)
+ )
+ 
+-AC_TRY_COMPILE([ #include <net-snmp-config.h> 
++AC_TRY_COMPILE([ #include <net-snmp/net-snmp-config.h> 
+   #include <net-snmp/utilities.h>
+   #include <net-snmp/net-snmp-includes.h>
+   #include <net-snmp/config_api.h>
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8h-fix-ac-macro.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8h-fix-ac-macro.patch
new file mode 100644
index 000000000000..3f497ac7bce5
--- /dev/null
+++ b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8h-fix-ac-macro.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -10,7 +10,7 @@
+ AC_LANG(C)
+ 
+ AM_INIT_AUTOMAKE(spine, 0.8.8h)
+-AM_CONFIG_HEADER(config/config.h)
++AC_CONFIG_HEADERS(config/config.h)
+ 
+ # static libraries
+ AC_ARG_WITH(static,
diff --git a/net-analyzer/cacti-spine/metadata.xml b/net-analyzer/cacti-spine/metadata.xml
new file mode 100644
index 000000000000..3c9260bb2907
--- /dev/null
+++ b/net-analyzer/cacti-spine/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Spine (formerly known as Cactid) is a poller for Cacti that primarily
+		strives to be as fast as possible. For this reason it is written in
+		native C, makes use of POSIX threads, and is linked directly against the
+		net-snmp library for minmumal SNMP polling overhead. Spine is a
+		replacement for the default cmd.php poller so you must decide if using
+		Spine makes sense for your installation.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
new file mode 100644
index 000000000000..484670756762
--- /dev/null
+++ b/net-analyzer/cacti/Manifest
@@ -0,0 +1,10 @@
+AUX postinstall-en.txt 2249 SHA256 7879329884e33f84108d5fbed732941c9fd8a53b56db499bfc0bd282bd61b10d SHA512 8df52b187b301b42382746f9dea43993f7963edf018bc80e94305a743ea5fbb024d670917c0200f4782c0a3bd47abfb879c755ad415581616ae5c6413cf00623 WHIRLPOOL 0739ae29e564e81b4a08a74685efe93ec5248048dd47555befb1e805a9dc3d1606adc9126b5959ccab39f7e30d2ed4d956d78b84efedd54545a1d998986477a2
+DIST cacti-0.8.8h.tar.gz 2585226 SHA256 0673bd9513dad381c8bbb9133c721a32bc6422dc91c5a81de16e3cd32e4d0600 SHA512 11bb0682a7220af5581f42579cf9c38d94aae202425ce15b824849684b1a6778d6f14e6a62ec94c608b7ba06562a825be7fd6d812d0800daa5eb56e640ac1c5f WHIRLPOOL 250ee38d969c9a7d9a71b15a25e48c2b9b22412c6c2394798d178172d9a1be056b009b328594559524adbd47ad05032992b13cb5a632af1a23f947fb55342402
+DIST cacti-1.1.20.tar.gz 8903728 SHA256 cbad90ef98d656bb10814e1444722dc00ff0c3a922b4591775984e890a81c942 SHA512 2d51c757916b366a188a3ab31771bafb6492aaa6ab2e778255945677bbb3f23f6fbfbb73ea9b05abf2f7cb26c0970bc208f68d5f1c016f8fe3b9da003dcd3b1b WHIRLPOOL a73b661f71e51b3f9be4413f211c735d1addad877020d7abc762043620869215177565a597a67dc40ff460784b00e8a765a9d348b39cdd2b2b15bccb3db70fb3
+DIST cacti-1.1.21.tar.gz 8905650 SHA256 e649fea4e8fc9900620af213218989e229aa25a1e1fb10dcde1844b1a2ae3bc0 SHA512 383bfc24c038154fd03d8997cba0fdf8d87ee69305f392b254102b6c279c0b7e53562a2d3d1f996315152a36da467821876e3834dd7b62bdc057a3b7838b94d2 WHIRLPOOL dea91e014e4b64a40bad4ab573a468fae0c6e1f7e380946cec5f5b270fe8abaacd3c73d71ad636e813e443117af0641269cfe2448f8c8487b1b7f7507e2a493e
+EBUILD cacti-0.8.8h.ebuild 1308 SHA256 42fb408c4c187c7733a7741701d94988734649097a6e76842d120fd5272ea1bc SHA512 6d48400c92aa9ef987ac43b5cbb6a4eeb9ad2235ffe1adc40cdadbe54ba0033090e0e4b8a9f48a6b85b0bf4e41c4f4f67da1869218344c59c777ecb173cd8784 WHIRLPOOL 9132c1a334e3426c7817893f212fbac3ffefbf8139e1f0e15b700d97c1cb2019391e420ba36fbc9e61bf992ecf2b567dcb0c838ddd361220435a934ff682f1ba
+EBUILD cacti-1.1.20.ebuild 1258 SHA256 8a90731cd9defdfdefb98d57868e37fc438eb8d16b303c92a33e571340585d5b SHA512 90246b8bbd88ac48ddd24df0dc32a43f8f387f2eb4215ed8280c59e2856f7060027cc4fa590446c2e7c3fce8c663da77ac5d169b9267ed8f04eb9c8207c6f517 WHIRLPOOL 50382cf522323d6c354322ee87c38ff1691049c718cf464a9bf6092cc770ff1a4be2286af3c15ca5773bad34ff25b2ef8ee40b0ab32a54cd8f9da452cdcce742
+EBUILD cacti-1.1.21.ebuild 1260 SHA256 9e1f68ebaee9e7229e139e3d95269863d6a4983a41b8de0e0d80dad0284819c5 SHA512 6a2811d73ba933ededc5b1157180f8cfd3aa64da392e34dd56cf8a1402720906b2d7169359fe3f079987cf50014d010f2ac6f6b39b0de379ffd57d6fb5317ad1 WHIRLPOOL c33e5d42e8ebc02465df235c4aaa379b95547537400c2c71aaf585e648855ba99c28c8b3b0db42efa592562c01d143131371e06c1e58d570565db357ded303ff
+MISC ChangeLog 6068 SHA256 b9a798f16089824899d4534b3047ea47bc4c3f5c961bb75939ede4394c939f09 SHA512 d289b3977cd4e2a6029cc976427dbd7258e5d31074ab63b2f0b26820d347b0b6a0a43d395bdf850851402ec36afc3e36d64f094d1e70d546177671276eba0cf2 WHIRLPOOL 36c0d2056e11d758c86a9b3458677ed1682c80a362949660c7a23ee1e3161f622ae80ba792c10e55aae943c0431fc4c373588b3e57ded9af7e131868b48f8367
+MISC ChangeLog-2015 30467 SHA256 36b345341f9a47ef2d54bd1272e9d54fade878bc9aa0a983f52e9739c58f4a97 SHA512 e0890043839852c1b0e41962ac38e6e881e1d1b9eba6055c969b276e8a3d878a9aa0291c0b01fc8053442ab3d722ded00736b20b59cf8135df7ee617502af542 WHIRLPOOL 8fae89c873c85a58a937879bf554c316096d744a3e86c809fcc02ff8c278f5c56603af8cedf841bce462c52ccfe24c1af9550d81484b6f81c399b7066c51bff5
+MISC metadata.xml 834 SHA256 f5fe19c82f443bc060d5035e3b96d494d79de2a29963090fcca821b4e3d3226e SHA512 f74b807c0629400ad06ee2b03650be38524268b2590d455ab4b672bc2c6c13856f881226a7c1d6e74e1acb6f85abc3d5bd311abaa6571216aca7698e8368e616 WHIRLPOOL 7f5ecdbe61e052c3430d54a1b8b8bb6435bf1bfa15f1014db7dc5b3dd74f38f2b18029855f1db387c645211fa5db84d20cee37937ab1e2e9ab25b5e023e6a59b
diff --git a/net-analyzer/cacti/cacti-0.8.8h.ebuild b/net-analyzer/cacti/cacti-0.8.8h.ebuild
new file mode 100644
index 000000000000..7593857b11bb
--- /dev/null
+++ b/net-analyzer/cacti/cacti-0.8.8h.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils webapp
+
+# Support for _p* in version.
+MY_P=${P/_p*/}
+
+DESCRIPTION="Cacti is a complete frontend to rrdtool"
+HOMEPAGE="http://www.cacti.net/"
+SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ~arm hppa ~ppc ~ppc64 sparc x86"
+IUSE="snmp doc"
+
+need_httpd
+
+RDEPEND="
+	dev-lang/php[cli,mysql,session,sockets,xml]
+	dev-php/adodb
+	net-analyzer/rrdtool[graph]
+	virtual/cron
+	virtual/mysql
+	snmp? ( >=net-analyzer/net-snmp-5.2.0 )
+"
+
+src_prepare() {
+	sed -i -e \
+		's:$config\["library_path"\] . "/adodb/adodb.inc.php":"adodb/adodb.inc.php":' \
+		"${S}"/include/global.php || die
+
+	rm -rf lib/adodb || die # don't use bundled adodb
+}
+
+src_compile() { :; }
+
+src_install() {
+	webapp_src_preinst
+
+	rm LICENSE README || die
+	dodoc docs/{CHANGELOG,CONTRIB,README,txt/manual.txt}
+	use doc && dohtml -r docs/html/
+	rm -rf docs
+
+	edos2unix `find -type f -name '*.php'`
+
+	dodir ${MY_HTDOCSDIR}
+	cp -r . "${D}"${MY_HTDOCSDIR}
+
+	webapp_serverowned ${MY_HTDOCSDIR}/rra
+	webapp_serverowned ${MY_HTDOCSDIR}/log/cacti.log
+	webapp_configfile ${MY_HTDOCSDIR}/include/config.php
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
diff --git a/net-analyzer/cacti/cacti-1.1.20.ebuild b/net-analyzer/cacti/cacti-1.1.20.ebuild
new file mode 100644
index 000000000000..7947fe008161
--- /dev/null
+++ b/net-analyzer/cacti/cacti-1.1.20.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils webapp
+
+# Support for _p* in version.
+MY_P=${P/_p*/}
+
+DESCRIPTION="Cacti is a complete frontend to rrdtool"
+HOMEPAGE="https://www.cacti.net/"
+SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
+IUSE="snmp doc"
+
+need_httpd
+
+RDEPEND="
+	dev-lang/php[cli,mysql,session,sockets,xml]
+	dev-php/adodb
+	net-analyzer/rrdtool[graph]
+	virtual/cron
+	virtual/mysql
+	snmp? ( >=net-analyzer/net-snmp-5.2.0 )
+"
+
+src_prepare() {
+	default
+	sed -i -e \
+		's:$config\["library_path"\] . "/adodb/adodb.inc.php":"adodb/adodb.inc.php":' \
+		"${S}"/include/global.php || die
+
+	rm -rf lib/adodb || die # don't use bundled adodb
+}
+
+src_compile() { :; }
+
+src_install() {
+	dodoc docs/{CHANGELOG,txt/manual.txt}
+	dodoc -r docs/html/
+	rm -rf docs
+
+	webapp_src_preinst
+
+	edos2unix `find -type f -name '*.php'`
+
+	dodir ${MY_HTDOCSDIR}
+	cp -r . "${D}"${MY_HTDOCSDIR}
+
+	webapp_serverowned ${MY_HTDOCSDIR}/rra
+	webapp_serverowned ${MY_HTDOCSDIR}/log
+	webapp_configfile ${MY_HTDOCSDIR}/include/config.php
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
diff --git a/net-analyzer/cacti/cacti-1.1.21.ebuild b/net-analyzer/cacti/cacti-1.1.21.ebuild
new file mode 100644
index 000000000000..08d211285f65
--- /dev/null
+++ b/net-analyzer/cacti/cacti-1.1.21.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils webapp
+
+# Support for _p* in version.
+MY_P=${P/_p*/}
+
+DESCRIPTION="Cacti is a complete frontend to rrdtool"
+HOMEPAGE="https://www.cacti.net/"
+SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="snmp doc"
+
+need_httpd
+
+RDEPEND="
+	dev-lang/php[cli,mysql,session,sockets,xml]
+	dev-php/adodb
+	net-analyzer/rrdtool[graph]
+	virtual/cron
+	virtual/mysql
+	snmp? ( >=net-analyzer/net-snmp-5.2.0 )
+"
+
+src_prepare() {
+	default
+	sed -i -e \
+		's:$config\["library_path"\] . "/adodb/adodb.inc.php":"adodb/adodb.inc.php":' \
+		"${S}"/include/global.php || die
+
+	rm -rf lib/adodb || die # don't use bundled adodb
+}
+
+src_compile() { :; }
+
+src_install() {
+	dodoc docs/{CHANGELOG,txt/manual.txt}
+	dodoc -r docs/html/
+	rm -rf docs
+
+	webapp_src_preinst
+
+	edos2unix `find -type f -name '*.php'`
+
+	dodir ${MY_HTDOCSDIR}
+	cp -r . "${D}"${MY_HTDOCSDIR}
+
+	webapp_serverowned ${MY_HTDOCSDIR}/rra
+	webapp_serverowned ${MY_HTDOCSDIR}/log
+	webapp_configfile ${MY_HTDOCSDIR}/include/config.php
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
diff --git a/net-analyzer/cacti/files/postinstall-en.txt b/net-analyzer/cacti/files/postinstall-en.txt
new file mode 100644
index 000000000000..732c718005cb
--- /dev/null
+++ b/net-analyzer/cacti/files/postinstall-en.txt
@@ -0,0 +1,62 @@
+
+New Install
+
+1. Create the new cacti database
+   shell> mysqladmin -p --user=root create cacti
+2. Import the default cacti database:
+   shell> mysql -p --user=root cacti < ${MY_INSTALLDIR}/cacti.sql
+3. Create a MySQL username and password for cacti.
+   shell> mysql -p --user=root mysql
+   mysql> GRANT ALL ON cacti.* TO cactiuser@localhost IDENTIFIED BY 'somepassword';
+   mysql> flush privileges;
+4. Edit ${MY_INSTALLDIR}/include/config.php and modify the MySQL user,
+   password and database for your cacti configuration.
+
+   Example:
+	\$database_default = "cacti";
+	\$database_hostname = "localhost";
+	\$database_username = "cactiuser";
+	\$database_password = "somepassword";
+
+5. Point your web browser to:  http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/
+   Make sure to fill in all of the path variables carefully and
+    correctly on the following screen.
+6. After you've gone through the setup wizard, go back to the main cacti page
+   and login as:
+	Username: admin
+	Password: admin
+
+Upgrading
+
+1. Backup DB in the case that something goes wrong.
+   shell> mysqldump -l --add-drop-table cacti > mysql.cacti
+2. Backup your rra/ directory and any custom scripts in your scripts/
+   directory.
+3. Edit ${MY_INSTALLDIR}/include/config.php, and confirm that the MySQL user,
+   password and database is correct for your cacti configuration.
+   
+   Example:
+        \$database_default = "cacti";
+        \$database_hostname = "localhost";
+        \$database_username = "cactiuser";
+        \$database_password = "somepassword";
+4. Point your web browser to: http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/
+   Select "Upgrade".
+   Make sure to fill in all of the path variables carefully and
+   correctly on the following screen.
+
+Cronjob
+
+Either new or upgrading, make sure you have a cron job - Add this line to 
+your /etc/crontab file:
+
+   */5 * * * * ${VHOST_SERVER_GID} /usr/bin/php ${MY_INSTALLDIR}/poller.php > /dev/null 2>&1
+
+Note that you should use poller.php as the cronjob instead of cmd.php (as it was with 
+earlier versions) to enable you to switch between cmd.php and cactid.
+
+Also make sure that the user poller.php runs as ( ${VHOST_SERVER_GID} ) has
+permission to create new files in Cacti's 'rra/' directory which is
+${MY_INSTALLDIR}/rra
+
+
diff --git a/net-analyzer/cacti/metadata.xml b/net-analyzer/cacti/metadata.xml
new file mode 100644
index 000000000000..8fae41374fe9
--- /dev/null
+++ b/net-analyzer/cacti/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Cacti is a complete network graphing solution designed to harness the
+		power of RRDTool's data storage and graphing functionality. Cacti
+		provides a fast poller, advanced graph templating, multiple data
+		acquisition methods, and user management features out of the box. All of
+		this is wrapped in an intuitive, easy to use interface that makes sense
+		for LAN-sized installations up to complex networks with hundreds of
+		devices.
+	</longdescription>
+	<use>
+		<flag name="doc">install html documentation</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-analyzer/calamaris/Manifest b/net-analyzer/calamaris/Manifest
new file mode 100644
index 000000000000..346d590bc58a
--- /dev/null
+++ b/net-analyzer/calamaris/Manifest
@@ -0,0 +1,7 @@
+DIST calamaris-2.59.tar.gz 56168 SHA256 60103bf6bfe0142bf2a0dfa7f7647ae7ed739b8b3082f11b8e55e21c2546d7ae SHA512 8c8ed820a1af6e21cfe9f03397c159b2261c8253b3395a8d6dbd21064151439406496132917d0ef087eed805c7945cf28f2d12dc1e52340991c18e6a27484ade WHIRLPOOL ff8bf09664d52a65629747431ed89955882c2ec7ee33e75cfeedcfc39cb776670b3ed874e063e4727157b17e212e5fbf08c311caa29967e7f0b3cdcea9118b63
+DIST calamaris-2.99.4.0.tar.gz 105860 SHA256 a28333ed770996397cc752e813586ac9177aab5c9dfee0104133d9c2c7dea42c SHA512 4127a3963fd0ea5baa1d5ce9a784f45658bb685f18e576c134fee1b4e8fdad535676974498119018e771924a8a622ed83b8aa095d3909b7bb3d009dd6024dbef WHIRLPOOL c5b9d9294937496d99abe7e1dd3eca7636f008847d55e5ab74c0d9a644a842ef88c9c11102fbb31a3c42d34d0fdcdff14f1740f9a3f0bed5f0479e655d6a601c
+EBUILD calamaris-2.59.ebuild 466 SHA256 586570d8fb86ddfc29ea17d9a48386e636eb95273a5114ff916d6a205cb76040 SHA512 17407d8479042ff1c88e38ebdbd937739fe3bb8c3b2c9b5fd623185702b5ee1f69e5e061ad70f4a023355e0719361f1ae7b58dd38772e15d9ef073adf65c972c WHIRLPOOL e1511a020d5dbed75f7157e104816a8102d5c630949a970c7d82e4666f70aaba4fbfbe6953b1beb5f02a1c32ae7d829dcc19beba6b1683f85c7b66078f55b179
+EBUILD calamaris-2.99.4.0.ebuild 690 SHA256 0a1f04784cebd66bd53eba352132fba713497d2840f8307c1275fd06c544f3cf SHA512 b3bca403f0fe47529918a7d0dd20a806638cc6883aca368d6d6c67cde2db1f0bb3b4adadbe87f3b48e9d06c81fd1e4ae5d56dba45e8093cab3bc1e784dc055ed WHIRLPOOL c5d74fa9ec9c25bffa27194ff0b90dafe9ed385d42ff21097a817bff2d8f0ef2924e12fb059d2f606d3a3d5735c3ad7e957910dc03ff7a5edd68d18de19f2dff
+MISC ChangeLog 2497 SHA256 6ffbb55b3fb6f96c8484cde0d098ed5b2a8b94c643e7e31638180c67c9ad43af SHA512 6f6adc6426dcec34d0ee3e6419edb9ad6ce969a6debdea1183bb9dae92305bf0b31360bc712fa0e1af66f8cb03f78752bfb5ed1eab82e1d1ddf9c645cae41d64 WHIRLPOOL a7e1ebc23cb160873b9fe6fb075c1de32dc673b867f4455eb73c06d265aac7e0fd2c8f0c59f2c3d7d30db266ae4f99ce5d8a1da57f6f2b3a49b10818aa0bc8eb
+MISC ChangeLog-2015 1934 SHA256 c1de7d467f4ce1af3df933b58d0eebe5e6da0f395ecf2a39f40ec79d6eca991f SHA512 f8a52c8eebd3f7a6765e8f707d4689d4645eafcb0f26fbbebf64a22736cfec440ae9360daf3320516a96aea858220e0fea6a8809fa93b791eac3e68b9202d76e WHIRLPOOL fadf4dbd75cedcef905c9835670b0db71ce5707431b2fb9f02ec5ca941a780b9c31739bb2ab2edf200eefa70b704ab55193a88d4d655fd49709d535da4d78a45
+MISC metadata.xml 402 SHA256 ee0703b153db1ba1efc8009b64550dd65cbf28e58d9156195bb9a6ffe8db0d97 SHA512 4e5dc9266b664dfa17c7bfc53f2773be0be94fd6c71ae626a2c8adc538bd2996866b571d20947890194286a6300851b9478218b61f8474e38d2963315b3fa910 WHIRLPOOL 5bb979fdef10df226f686853668d84ff5b41bfe596aace3a286d587798112d0ffbd7c9537908bf22f164992f04c6ee7745e9387fa824ea3c494550ff0b8472be
diff --git a/net-analyzer/calamaris/calamaris-2.59.ebuild b/net-analyzer/calamaris/calamaris-2.59.ebuild
new file mode 100644
index 000000000000..5829b5a2276d
--- /dev/null
+++ b/net-analyzer/calamaris/calamaris-2.59.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Calamaris parses the logfiles of a wide variety of Web proxy servers and generates reports"
+HOMEPAGE="http://cord.de/calamaris-home-page"
+SRC_URI="http://cord.de/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+DEPEND="dev-lang/perl"
+
+src_install () {
+	dobin calamaris
+	doman calamaris.1
+	dodoc CHANGES EXAMPLES README
+}
diff --git a/net-analyzer/calamaris/calamaris-2.99.4.0.ebuild b/net-analyzer/calamaris/calamaris-2.99.4.0.ebuild
new file mode 100644
index 000000000000..aed1057e0f8f
--- /dev/null
+++ b/net-analyzer/calamaris/calamaris-2.99.4.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Calamaris parses the logfiles of a wide variety of Web proxy servers and generates reports"
+HOMEPAGE="http://cord.de/calamaris-home-page"
+SRC_URI="http://cord.de/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/GDGraph
+"
+
+src_prepare() {
+	sed -i \
+		-e "s:\(use lib\).*$:\1 '/usr/share/';:" \
+		calamaris || die
+}
+
+src_install() {
+	dobin calamaris calamaris-cache-convert
+
+	insinto /usr/share/${PN}
+	doins *.pm
+
+	doman calamaris.1
+
+	dodoc BUGS CHANGES EXAMPLES EXAMPLES.v3 README TODO calamaris.conf
+}
diff --git a/net-analyzer/calamaris/metadata.xml b/net-analyzer/calamaris/metadata.xml
new file mode 100644
index 000000000000..1807f641fbf8
--- /dev/null
+++ b/net-analyzer/calamaris/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<longdescription>Calamaris parses the logfiles of a wide variety of Web proxy servers and generates reports</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/carl/Manifest b/net-analyzer/carl/Manifest
new file mode 100644
index 000000000000..50d4fed21304
--- /dev/null
+++ b/net-analyzer/carl/Manifest
@@ -0,0 +1,5 @@
+DIST carl-0.9.tar.gz 11096 SHA256 52f55f47ec216b97b4a819853f831a19875d145ef48f03245b9f52e463e09550 SHA512 9876e30d171bf00c4e53c6e90c98181ac25aeda004bdb8a03060c45a99c55fa087062076ff3964a222d2981ed682ae7b8f4cbade13c69154198200d35e1a577e WHIRLPOOL 3d9b1ca525be947fe12f8d98160e705e1eb6fb7e168e55687271a9a63724c5083cdbe9dc22c6567f90cb690e5c0818757fc549b84591da50971dae6b7d3b910a
+EBUILD carl-0.9-r2.ebuild 414 SHA256 f5604dd7a23c70e86239815d037a56a0be3e6498339351c52f876b6cae504ac8 SHA512 4e294581c340916a0ff568dc478f30a9e8258464fe7c3eec41296d4ce7006d6ec8a1a7e218ce0a2f8bc904b42d01044acc7c041a79a6bc7c7a9afaaf5caf051b WHIRLPOOL 5ad4a12e2755fb3cf620f51cb49beba57abdb6fa212827a3d0c471fa58c44adc8289358d427d58d0fb1930a9c7015005b766ab58d5d6931aee473c530cb0e2d6
+MISC ChangeLog 2550 SHA256 5f08dd1ddedb6766b8994372f212e5e5509616e2c19621da427d4688b5707351 SHA512 74831aa1347aaf7d0a849bbafa8ef05097a0212ffc4728ff93df3613ca7bcc9d01c3123b2c3125d42066c5552a63b490be79d2f5e10f440587b36c5844c02d87 WHIRLPOOL 8070e3959cae2f08f89d473fcdd970ff403c902281def51fd56e3ed7603c5d1b5f22ba7cf915de07669e4d788a49378b0a42a3dcd75a4ac62ae08def98211aed
+MISC ChangeLog-2015 2627 SHA256 efa5bcb7d78ae2c5cea29f3c42c3a19938541c218353523ddce7faab688bba9c SHA512 48d24cf2c6c607365c0b55e281c25e12f931fa59b5f5cb8d57e522ed0b7d7fe7a5628a64c3f5c6ae6010ec63c591e0647beea1e8c68f7e5b2231571d56bd10f9 WHIRLPOOL f8371ac35d732952f662a659f0586c3107a5365e3ec751a41c093d06864b0fa69371b00eb2684c998ababf4b4a8b08954ef632ed08ac1f3f01c99c0bc568fea9
+MISC metadata.xml 356 SHA256 1709cf2866ecab40f27f0370b0d66c6058520c998bbc4985e7856ffd939412b5 SHA512 e61b1bac117a325c4e96c7d8c594bd0de46379e573e8b89df72dfca572922807af29b2741c86be602d01856bed58bd369e72d65f0fef508d54001c00578d8637 WHIRLPOOL b9ac3a63341f87bd44adc2a78e69e36652e585c6bf77ccd4755d0a8735e0ec710281affc7ea7a541d82a4554fee9f5cff8f05f85bc21a320c95d15e06b43e4ca
diff --git a/net-analyzer/carl/carl-0.9-r2.ebuild b/net-analyzer/carl/carl-0.9-r2.ebuild
new file mode 100644
index 000000000000..f2118fd8ffd0
--- /dev/null
+++ b/net-analyzer/carl/carl-0.9-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy pypy3)
+
+inherit distutils-r1
+
+DESCRIPTION="An rsync logfile analyzer"
+HOMEPAGE="http://www.schwarzvogel.de/software-misc.shtml"
+SRC_URI="http://www.schwarzvogel.de/pkgs/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 x86"
+IUSE=""
+
+DOCS="README"
diff --git a/net-analyzer/carl/metadata.xml b/net-analyzer/carl/metadata.xml
new file mode 100644
index 000000000000..090046ba85ad
--- /dev/null
+++ b/net-analyzer/carl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>klausman@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+  <email>netmon@gentoo.org</email>
+  <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/cbm/Manifest b/net-analyzer/cbm/Manifest
new file mode 100644
index 000000000000..d2f6aa418577
--- /dev/null
+++ b/net-analyzer/cbm/Manifest
@@ -0,0 +1,9 @@
+AUX cbm-0.1-gcc-4.3.patch 159 SHA256 393e5c42d2692c0e3445a3f670d35f438fe1e8a00dd26ee97e1aaac9f2edcfff SHA512 9ba1cb68e4b48f3c5035254e88cebab7702b97739537d892f42a256635cfc692026c26b0325084b2fbbb15a865390c30167119c7bac9362076f18e416afef2be WHIRLPOOL 692f084f094248737583688261baf0724d7babc15cfac27f765dda328a47e5b3c2aa611bfaf5decd5d4e29bb595283129006dc90f9d944b27bdbe15d9f6b864d
+AUX cbm-0.1-gcc-4.7.patch 195 SHA256 1b885e7271ff3af92c3c6eb1f22f4b0b1dc5e39f77cf80a36494e5556e4e5d7d SHA512 e1d66c6122163509ea247692362230323039f642f6f8cbc06f0023044223875fc9567a20c7dbdf5651313dc76a0033aa14118c5abe8aa8196ab90991c90d348d WHIRLPOOL ced79a512d16da2e9effae2b23c10750a3f92ba158f2655e412dd3d5c2c319d7386b4aa3693249708453f77dd10fd4e8767ea2122f181dce4f62b48b748e2061
+AUX cbm-0.1-headers-status-line.patch 1724 SHA256 c1ebbab991648647e47e4e0bcd6be07e544c80bff240b397987e5875b6a3bc12 SHA512 06a4614ece7d265b5604e4021671012d0ec8cece3f77025f9866c6c4193f85a5b7cbea740952dfd7d16cae6798708428fe5be4c06f5684baf9493c30effb867e WHIRLPOOL 75a6a020bf21c705d3d156142f91d04ea633ddf3347d400503f22a414f7fa9a1755ea2788115ddfe818d85cd050f9f6dda84cf40fe3f8801ee1b4fd1eefd3487
+AUX cbm-0.1-tinfo.patch 463 SHA256 2209e38ff5c087cee1ead9df10d2a677ac25e5a0b6cba5420ffbeb52cb1b96a8 SHA512 51509006d183634a4322ace7de01fde57bbd0d18a991dfab43e7189227f88edc7201d47e3a38826a15ba67047357f39d7a1298788268bf2db6b27aa2a048d903 WHIRLPOOL e2ec1c4c876297a5f55ce2f0ceeb04110c594e3ecede25e10ba4f4b207d6962e994c4b76f2790679aa251ae91ee6bff0b3bc093b107422acef876296fe3a5e79
+DIST cbm-0.1.tar.gz 310247 SHA256 fa44b4b53218ddcfc0f3e7539a1a232485bdb0a574c4a07a084a262d938f3c7b SHA512 24bf6a4d68fed253977b965d7e5b6aff4fb9db502c47b4a2b3b36f8c2963c9648b78ae607e9753fe4792a73ddbc29b86b3a1acc3c431a9355b11ff348566add4 WHIRLPOOL 22779c8332d2729ebf138a504fd81fa1bebe1295aa7c0ff9806bb545f868e9622038a447a59610e04c62cbf99e473cbf0bb365517ae6c8c018881c8733294aed
+EBUILD cbm-0.1-r1.ebuild 700 SHA256 2b8123e807e92347d3947aa6ea0e7abbd15f57336252565ae7bcd3bf386904b3 SHA512 fc42b5a193f2e0ee6d2f172f172d5a6c3bbc6c02572785e1471fd8101e1e735480a31e8f06821e12dd5d1a7a8734e607920c6831b4bb93cdadab3d7e858f8e6a WHIRLPOOL cdca2e0c4b636e03b54953676b25ce365f9ca5a7953324224c3f68f3c910760203dcec5d36ba1e8b16fc38a4fdcf394f1f62fe5137ba1020c2ff75c19f715007
+MISC ChangeLog 2555 SHA256 41185e995a024040d6e581de87b94b4b8523dc566ba12371e2ee76970deb0e62 SHA512 3928cd674c8606fd878e3b9c9b5975ff861251bab6bbfa128828bbf04810c7cfa8fa855e7f1587b17cfa8adda2ab3c88904f8acb0cc06f6f4535e280db49a56c WHIRLPOOL 01cbdaab2913f14d8379478a7623c0d5d0a1b52f96806e219ed13204050648ca5fa11b4bd3872891c14acc8b97204f6e8dcfb773488a2968a34189e40611296e
+MISC ChangeLog-2015 1145 SHA256 816fd2caf525c38c0aff3d433baa58fc75ddb327d70522a1a5ef0adc5cc82201 SHA512 7168796a1b17cfbb6e9463b97f02ac265c0acf41b1e1f8e7f3d9e7793fef3a451968afee05744b82ed867cd53db2696ae86986d4952bf980ebd828e370ef28e0 WHIRLPOOL d9a988635dbeef0e626291f7be327f9eb5f39778cc41626765e448369b45d8c4af93062d43ddd85a414aecd8ef81854b2f245b6c1231f42efda4f7c020294d68
+MISC metadata.xml 387 SHA256 bd77d39e4c5a95fab582252527988a2d170c9e0fee10efe97b1756c83fa45b19 SHA512 8092aa19143ae23dec4bf31dafb786c6dbc40fce3fbe2bf144ccfaf82581bd9a44ac3bdbfa8d6d60ff6f9cbdbd29b2a77eb860385d3ea242d1e1c430eb8347c6 WHIRLPOOL 827507599128464c462ccc74f786398b161cbdfce1b9035d38f5228a7e1803bcb46f23e8ecf409e3d7bfa2fc9134d5dc2fd5e0d41ba74a7d8e89c8b2ac9a5606
diff --git a/net-analyzer/cbm/cbm-0.1-r1.ebuild b/net-analyzer/cbm/cbm-0.1-r1.ebuild
new file mode 100644
index 000000000000..3e3c60fb9e6b
--- /dev/null
+++ b/net-analyzer/cbm/cbm-0.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Display the current traffic on all network devices"
+HOMEPAGE="http://www.isotton.com/software/unix/cbm/"
+SRC_URI="http://www.isotton.com/software/unix/${PN}/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	sys-libs/ncurses
+"
+DEPEND="
+	${RDEPEND}
+	app-text/xmlto
+	app-text/docbook-xml-dtd:4.4
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gcc-4.3.patch \
+		"${FILESDIR}"/${P}-gcc-4.7.patch \
+		"${FILESDIR}"/${P}-tinfo.patch \
+		"${FILESDIR}"/${P}-headers-status-line.patch
+	eautoreconf
+}
diff --git a/net-analyzer/cbm/files/cbm-0.1-gcc-4.3.patch b/net-analyzer/cbm/files/cbm-0.1-gcc-4.3.patch
new file mode 100644
index 000000000000..ae9b58f6e99b
--- /dev/null
+++ b/net-analyzer/cbm/files/cbm-0.1-gcc-4.3.patch
@@ -0,0 +1,10 @@
+--- a/src/statistics.hpp
++++ b/src/statistics.hpp
+@@ -3,6 +3,7 @@
+ 
+ #include <list>
+ #include <string>
++#include <sys/time.h>
+ 
+ namespace statistics {
+     
diff --git a/net-analyzer/cbm/files/cbm-0.1-gcc-4.7.patch b/net-analyzer/cbm/files/cbm-0.1-gcc-4.7.patch
new file mode 100644
index 000000000000..94b50a6877f7
--- /dev/null
+++ b/net-analyzer/cbm/files/cbm-0.1-gcc-4.7.patch
@@ -0,0 +1,10 @@
+--- a/src/cbm.cpp
++++ b/src/cbm.cpp
+@@ -18,6 +18,7 @@
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+ #include <net/if.h>
++#include <unistd.h>
+ 
+ // Externs
+ extern int optind, opterr, optopt;
diff --git a/net-analyzer/cbm/files/cbm-0.1-headers-status-line.patch b/net-analyzer/cbm/files/cbm-0.1-headers-status-line.patch
new file mode 100644
index 000000000000..4b09bbb69793
--- /dev/null
+++ b/net-analyzer/cbm/files/cbm-0.1-headers-status-line.patch
@@ -0,0 +1,55 @@
+From bdc4f02a6d7fb1416f36aef89af4592c691576d8 Mon Sep 17 00:00:00 2001
+From: Jari Aalto <jari.aalto@cante.net>
+Date: Mon, 19 Sep 2011 14:27:04 +0300
+Subject: [PATCH] [fix] Headers and status line don't display by Paul Martin
+ <pm@debian.org>
+Organization: Private
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jari Aalto <jari.aalto@cante.net>
+---
+ src/cbm.cpp            |    9 ++++++++-
+ src/widgets/Window.cpp |    2 +-
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+index 74282e2..0197443 100644
+--- a/src/cbm.cpp
++++ b/src/cbm.cpp
+@@ -156,13 +156,20 @@ int main(int argc, char **argv) {
+ 	    interfaceTable.setColumns(4);
+ 	    interfaceTable.setActiveStyle(A_BOLD);
+ 	    interfaceTable.setActiveRow(1);
++	    // Position the interface table
++	    interfaceTable.setPosition(2, 2);
++	    interfaceTable.setSize(screen.getWidth() - 4, 
++					       8); // TODO
+ 
+ 	    // Create the detail table
+ 	    VerticalTable detailTable(screen);
+ 	    detailTable.setColumns(2);
+ 	    detailTable.setRows(2);
+ 	    detailTable.setActiveRow(-1);
+-	    
++	    // Position the detail table
++	    detailTable.setPosition(2, 12); // TODO
++	    detailTable.setSize(screen.getWidth() - 4, 10); // TODO
++
+ 	    // Populate the detail table
+ 	    detailTable.setText (0, 0, "Interface");
+ 	    detailTable.setStyle(0, 0, COLOR_PAIR(COLOR_HEADING) | A_BOLD);
+index 322cb9b..572eef7 100644
+--- a/src/widgets/Window.cpp
++++ b/src/widgets/Window.cpp
+@@ -14,7 +14,7 @@ Window::~Window() {
+ }
+ 	
+ void Window::setPosition(unsigned x, unsigned y) {
+-    mvwin((WINDOW*) win_, y, x);
++    mvderwin((WINDOW*) win_, y, x);
+ }
+ 
+ void Window::setSize(unsigned width, unsigned height) {
+-- 
+1.7.5.4
+
diff --git a/net-analyzer/cbm/files/cbm-0.1-tinfo.patch b/net-analyzer/cbm/files/cbm-0.1-tinfo.patch
new file mode 100644
index 000000000000..955d762214c4
--- /dev/null
+++ b/net-analyzer/cbm/files/cbm-0.1-tinfo.patch
@@ -0,0 +1,19 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -3,4 +3,4 @@
+ cbm_SOURCES = cbm.cpp \
+ 	      ErrnoError.hpp \
+ 	      statistics.cpp statistics.hpp
+-cbm_LDADD = -lncurses widgets/libwidgets.la
++cbm_LDADD = $(ncurses_LIBS) widgets/libwidgets.la
+--- a/configure.ac
++++ b/configure.ac
+@@ -18,6 +18,8 @@
+ 
+ # Checks for libraries.
+ 
++PKG_CHECK_MODULES(ncurses,ncurses)
++
+ # Checks for header files.
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
diff --git a/net-analyzer/cbm/metadata.xml b/net-analyzer/cbm/metadata.xml
new file mode 100644
index 000000000000..8377d38ed6dc
--- /dev/null
+++ b/net-analyzer/cbm/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/chaosreader/Manifest b/net-analyzer/chaosreader/Manifest
new file mode 100644
index 000000000000..80d668049eea
--- /dev/null
+++ b/net-analyzer/chaosreader/Manifest
@@ -0,0 +1,11 @@
+AUX chaosreader-0.94-chunkcheck.patch 1049 SHA256 b2b748b9036cdabf878bff477eeb1b804479f106955aed5ec33ea9efaf796904 SHA512 0adb728d87e9d0812d1f30c22d682d68040ee992b07c52a3452bbca8416fd8c6b4d51adf7b16441d5595f12066799029289bdd29e0cadd379980d187a0ff4f83 WHIRLPOOL e88d5a4e015bf7228d3f2fbd770044989b0c96d2c0be98c60b922cb8498484a77a25a6dd3aad9f79785aa3f4522d0a93963f27575d5402e24c7b62adeef80d53
+AUX chaosreader-0.94-darwin.patch 416 SHA256 662f47776c92b4345e10f80b105e424e92612ed8f543a7faace9e60a4c64a540 SHA512 8cd587715e6dc8b09ee93bea452d92b6570bcaca6601adb7f1e59842ed3ac42d3a6bb9621c29b0524b475a6953ac17be0082baadfbc1acfeb1e05c4175108a9f WHIRLPOOL 1e920f2ddf634787c6153c6e9a79b11841fea08eea93d1ac675669a5b5b90b6f5932f798b10352ed5cb06e43dbfdc2114c0fb6bf7fb5d3eb603d2e01e04ccf54
+AUX chaosreader-0.94-divisionbyzero.patch 640 SHA256 0f4746e5763e9c6cb9fc6a3f1c1a7e54344a596f9503a0529a72b4980d009200 SHA512 04afa8959847fc52ba8bc546b7f2f134efcc8283b5b99c2af24af27bae73922ea4df4ff5f55308f075e1c77a29718c63345bceca3da3014611cf8b1f06e48ed8 WHIRLPOOL f2c680abc67cc7bcdc44dfb9bb985fa1446c8dcdfaa055c274e2ec21c60d9c61eb18bd582cdc02d33b39b7328c21c37e5ad4b8b6d259c74a466c3619659e0d9b
+AUX chaosreader-0.94-oldmultiline.patch 487 SHA256 e9d34aed4170470fb02c646398f62bd54f013c96166c7c154ccb9c547432f1a1 SHA512 dcb98d8e5000fd0d130217e582ae21a519fd6e1554cd1e4902db632e7760c1708c9754f97f28f90d3371ccf76bb7b499b023d0985c27e799c27205f410515941 WHIRLPOOL fe4ec808dd11803ee0c79c998fdedc45356a35a7b2c148d8bbe3dd0171c340977ad67acf95add444e2f92634e0275d5bbb106b4abd6353f66b621465ba5c7aee
+AUX chaosreader-0.94-zombies.patch 349 SHA256 bbb03272d9d8970ab9c4c7a7f5b263142424f848c114b6108b6604887eb80421 SHA512 d3348cd6f29d01b1e94e4aa7f89b7f76fa9a4c8a557c437d0495ae32c6a6399019fe3affed5f1611a77a6b70fd1f30d011c87e00b614640c155f3afd8470a0f3 WHIRLPOOL d145b43563d6bea77ea0e4c8209614fa97fd3542289f0397f95aa3c494f013a56176e79c757e0cc8cefd5e6f6d77993fc8e15671a7b062b0dd39626a03479a46
+DIST chaosreader-0.94.bz2 41039 SHA256 523f2107502dda9a1a9c73d8bc14605046f7352ada442bfcafec39a81b41f35b SHA512 f2c2b31e6f7fc27c5cb59a43ce9cdea67de520c79f6354c9a0f627c098d73f4666461fb4f3c393a0a9ac36105979fe36b08035c4404371db2f573dd534e1adad WHIRLPOOL f636aa42bc1b2c3be7283e450525c7fddf2dd063b90beb36a42df03757b17409df32323728303700223e62054083b895302e0807ed8587b073e649fd1908283a
+EBUILD chaosreader-0.94-r1.ebuild 835 SHA256 7e4e87ee7ef7887d43facf2b0d41d59aa7bd56d4cb39210780413d5a108ef544 SHA512 bea69c2030aac85d3833c10cceac8ccf5c9b7d9235a0b98d30498f974f16e8d074dd3cbd071c627194fdffd917914d28196f4ffb3a4dce7f1573fbdea33cc0af WHIRLPOOL c246e572e78b1318014fd22d21d4384f3dd213e0767887446d542e4a64c72ba7aee7fce658fcd36301c1d2fa98d2a5aa17a581091e6dba0a27783d2a13122bd5
+EBUILD chaosreader-0.94.ebuild 627 SHA256 a08ef73588cded93f3f7cac27fc1164f9825b087d7c981a592460d6e3142613b SHA512 a3c02531f157406507f8d7185327993f3410a4744ebaad6eb396a14fa06c8bcae2f62a6ddf658a82440f6fb3a46ce4286d34c7a6de03439e1894464b3cd77bab WHIRLPOOL cbfcbc106f8aa7f3b876e1d9f0a7ea66046ae2bf7237ccfc8fa26b485d3723f961b79d1b874d8dc3fea01964f64c064aadb66721bf734c4a3364f8fda48ff5f6
+MISC ChangeLog 3503 SHA256 e70b4face4a7f724166cfaeb3a028f2b0056816c5f56bdc3ecc0cfc6de023ac4 SHA512 3e83201d421c2e632feaf63f01b4d5bbdc9d6a83d7ec2791712b132e7c48db96fae6d80f362f8bde174e6519446315b570485f1b3aa3ed14c15317fe9711d2c4 WHIRLPOOL 0b2e7ed69be79f7f33b6386b37d2b2cb440bd39daea7b6240df580197f58bd7c65fd0a01c85e5554ee3b2b9b64e728e3ffadb70e52223908fd55b5eece6be989
+MISC ChangeLog-2015 2515 SHA256 1ad76984993ec0e569360798cd6e178b1a50acb93fcd5ccabce4ef9f25de91e0 SHA512 8097ce402fcbcb00593ecc88f3e1798c03506502dde3d72e2ea493c539f65c516fcecac75f680348af922a7c25612ea4c2bac9d94a9aa09edb25d28d15b587f5 WHIRLPOOL 2f67df025d43c89dfcfd6240de5c2690593bcc41cc4f31053f4228ad1af4f10a083dafbc7ce6393852fb7d78bde2534bec321d25da2a53bfdd1984d90b9e8be7
+MISC metadata.xml 412 SHA256 d1c813ea0ecdb2d18f3c53e5611989e4bea973e82e1be369c4a6344fcffc042c SHA512 fe8a71cba4549b081b24d302c3b97cfbce59e5c338089fd12f706320fd9752fe2ca7f8875a768da68a9ef9c8e36a3e291a29b5a79e414586c38c21e6d54d340c WHIRLPOOL d8dd8e669437a81c08d1e67e20ddc2ead31abd76c8030047a20a221b44439fb7a0c736a8c316e4c6b61c9389c9e7460e7b753c8f5036891ad20bd4b5de5c6a55
diff --git a/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild b/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild
new file mode 100644
index 000000000000..4d703c86b826
--- /dev/null
+++ b/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="A tool to trace TCP/UDP/... sessions and fetch application data from snoop or tcpdump logs"
+HOMEPAGE="http://chaosreader.sourceforge.net"
+SRC_URI="https://dev.gentoo.org/~spock/portage/distfiles/${P}.bz2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+LICENSE="GPL-2"
+
+IUSE=""
+
+DEPEND=">=dev-lang/perl-5.8.0"
+S=${WORKDIR}
+
+src_prepare() {
+	epatch "${FILESDIR}"/chaosreader-0.94-zombies.patch
+	epatch "${FILESDIR}"/chaosreader-0.94-chunkcheck.patch
+	epatch "${FILESDIR}"/chaosreader-0.94-darwin.patch
+	epatch "${FILESDIR}"/chaosreader-0.94-divisionbyzero.patch
+	epatch "${FILESDIR}"/chaosreader-0.94-oldmultiline.patch
+}
+
+src_install() {
+	newbin ${P} chaosreader
+}
diff --git a/net-analyzer/chaosreader/chaosreader-0.94.ebuild b/net-analyzer/chaosreader/chaosreader-0.94.ebuild
new file mode 100644
index 000000000000..62cf4fe05999
--- /dev/null
+++ b/net-analyzer/chaosreader/chaosreader-0.94.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="A tool to trace TCP/UDP/... sessions and fetch application data from snoop or tcpdump logs"
+HOMEPAGE="http://users.tpg.com.au/bdgcvb/chaosreader.html"
+SRC_URI="https://dev.gentoo.org/~spock/portage/distfiles/${P}.bz2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+LICENSE="GPL-2"
+IUSE=""
+DEPEND=">=dev-lang/perl-5.8.0"
+S=${WORKDIR}
+
+src_prepare() {
+	epatch "${FILESDIR}"/chaosreader-0.94-zombies.patch
+}
+
+src_install() {
+	newbin ${P} chaosreader || die
+}
diff --git a/net-analyzer/chaosreader/files/chaosreader-0.94-chunkcheck.patch b/net-analyzer/chaosreader/files/chaosreader-0.94-chunkcheck.patch
new file mode 100644
index 000000000000..4d38eb17a2e6
--- /dev/null
+++ b/net-analyzer/chaosreader/files/chaosreader-0.94-chunkcheck.patch
@@ -0,0 +1,27 @@
+--- chaosreader	2011-11-10 19:17:50.000000000 +0100
++++ chaosreader-0.94	2012-03-09 18:15:21.096105305 +0100
+@@ -5350,6 +5353,24 @@
+ 		next if length($http_data) < 8;
+ 		$partnum++;
+ 		$parttext = sprintf("%02d",$partnum);
++		
++		## from https://sourceforge.net/tracker/?func=detail&aid=2019799&group_id=107384&atid=647491 
++		### Chunk Check
++		if ( $http_header =~ /Transfer-Encoding: chunked/ ) {
++                  my $new_http_data="";
++                  my $chunksize=-1;
++                  my $pos=0;
++                  until ($chunksize==0) {
++                    my $eolpos=index($http_data,"\r\n",$pos);
++                    $chunksize=hex(substr($http_data,$pos,$eolpos - $pos));
++                    $pos=($eolpos+2);
++                    if ($chunksize > 0) {
++                      $new_http_data.=substr($http_data,$pos,$chunksize);
++                    }
++                    $pos+=($chunksize+2);
++                  }
++                  $http_data=$new_http_data;
++		}
+ 
+ 		### Part - Checks
+ 		$http_type = &File_Type($http_data);
diff --git a/net-analyzer/chaosreader/files/chaosreader-0.94-darwin.patch b/net-analyzer/chaosreader/files/chaosreader-0.94-darwin.patch
new file mode 100644
index 000000000000..2eaca80909ae
--- /dev/null
+++ b/net-analyzer/chaosreader/files/chaosreader-0.94-darwin.patch
@@ -0,0 +1,11 @@
+--- chaosreader 2011-11-10 19:17:50.000000000 +0100
++++ chaosreader-0.94    2012-03-09 18:15:21.096105305 +0100
+@@ -6233,6 +6254,8 @@
+ 		$command = "tcpdump -s9999 -w";
+ 	} elsif ($^O eq "solaris") {
+ 		$command = "snoop -o";
++	} elsif ($^O eq "darwin") {
++		$command = "tcpdump -i en1 -s9999 -w";
+ 	} else {
+ 		die "ERROR54: Can't find the sniffer command for \"$^O\".\n" .
+ 		 "\t Please use log mode instead.\n";
diff --git a/net-analyzer/chaosreader/files/chaosreader-0.94-divisionbyzero.patch b/net-analyzer/chaosreader/files/chaosreader-0.94-divisionbyzero.patch
new file mode 100644
index 000000000000..db9d3c6fd158
--- /dev/null
+++ b/net-analyzer/chaosreader/files/chaosreader-0.94-divisionbyzero.patch
@@ -0,0 +1,18 @@
+--- chaosreader	2011-11-10 19:17:50.000000000 +0100
++++ chaosreader-0.94	2012-03-09 18:15:21.096105305 +0100
+@@ -4028,7 +4024,14 @@
+ 	   ### This causes the replay program to pause
+ 	   print REPLAY "ms($timediff1);\n";
+ 	}
+-	$speed = sprintf("%.2f",$bytes / (1024 * $duration));
++	# avoid division by zero
++	# from https://sourceforge.net/tracker/?func=detail&aid=2210488&group_id=107384&atid=647489
++	if ( $duration > 0 ) {
++		$speed = sprintf("%.2f",$bytes / (1024 * $duration));
++	}
++	else {
++		$speed = "unknown";
++	}
+ 	print REPLAY "print \"\n\n" .
+ 	 "Summary: $duration2 seconds, $bytes bytes, $speed Kb/sec\\n\";";
+ 	close REPLAY;
diff --git a/net-analyzer/chaosreader/files/chaosreader-0.94-oldmultiline.patch b/net-analyzer/chaosreader/files/chaosreader-0.94-oldmultiline.patch
new file mode 100644
index 000000000000..1fada077058e
--- /dev/null
+++ b/net-analyzer/chaosreader/files/chaosreader-0.94-oldmultiline.patch
@@ -0,0 +1,15 @@
+--- chaosreader	2012-01-18 21:47:02.000000000 +0100
++++ chaosreader-0.94	2012-03-13 12:10:44.740136742 +0100
+@@ -259,12 +259,6 @@
+ $| = 1;					# flush output
+ 
+ #
+-#  The following is needed for old perl5 multiline matching. New perl5 uses
+-#  a "/s" on the RE (which is used in this program as well).
+-#
+-$* = 1;					# old perl5
+-
+-#
+ #  These ports have been selected to be saved as coloured 2-way HTML files
+ #
+ @Save_As_HTML_TCP_Ports = (21,23,25,79,80,109,110,119,143,513,514,1080,
diff --git a/net-analyzer/chaosreader/files/chaosreader-0.94-zombies.patch b/net-analyzer/chaosreader/files/chaosreader-0.94-zombies.patch
new file mode 100644
index 000000000000..8f7dd04e50ed
--- /dev/null
+++ b/net-analyzer/chaosreader/files/chaosreader-0.94-zombies.patch
@@ -0,0 +1,11 @@
+--- chaosreader-orig	2006-12-24 15:12:23.000000000 +0100
++++ chaosreader-0.94	2006-12-24 15:11:56.000000000 +0100
+@@ -396,6 +395,8 @@ if ($Arg{normal}) {
+ 
+ elsif ($Arg{standalone}) {
+ 
++   $SIG{CHLD} = "IGNORE";
++
+    ############################################################
+    # --- STANDALONE - Create Packet Logs and Process them ---
+    #
diff --git a/net-analyzer/chaosreader/metadata.xml b/net-analyzer/chaosreader/metadata.xml
new file mode 100644
index 000000000000..cbd0ba6214ed
--- /dev/null
+++ b/net-analyzer/chaosreader/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rainbow@irh.it</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">chaosreader</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/check_mk/Manifest b/net-analyzer/check_mk/Manifest
new file mode 100644
index 000000000000..e2808bb3ae99
--- /dev/null
+++ b/net-analyzer/check_mk/Manifest
@@ -0,0 +1,9 @@
+AUX check_mk-1.2.4p5-setup.sh.patch 2123 SHA256 409281f0cdd727cd4bcd0097b548a39287f598857d0abae6516376e351acef3c SHA512 eda9c4345b8f5b03ba7e6bfc077036830b6f8f9ee701d8064eddb96e63f11c43ae2093f9206884e5dc864beeba4c0b332bf4e7de18880567626d941457cbab47 WHIRLPOOL 682ed50bbd99c6e97001b7a170bfb10bc806eebcf03450a14961dd5e75b392612d7bc55c68abf93cc7434f5f2b2caf717f083d63e6ef3b898c9521a7c549e17a
+AUX check_mk-1.2.8p16-setup.sh.patch 1277 SHA256 46632a45811e2eca947b3c1916975b6bf998a33258db059c69e3cc47c224bb95 SHA512 da912ec90555104007f5a94b4092fc25918eca319981592e5b38cb3ce8172a817bc01af8d64cc59b8f86d105ea06f8f0dc83965490ce326efb9e6572d9382e1d WHIRLPOOL 3dbb23f587a0ef39d702a8d74baa79ecfac1a9121aa3fe3b3d3f0de0c47f8f72a1e48dced014e9e3616ce7e28c67cba4d015fa101d8a2a12601e0543ab87a0fe
+DIST check_mk-1.2.4p5.tar.gz 6626768 SHA256 e71963542d9d79d98e69aadccb37d05552829acab14665207d6af10415179c21 SHA512 ca2c06288b91f44f017ebbc45bd6712ddcbebdc4e293598b793ae1ad19ad96814983a30bd66ee2f19940dc1d1439fba2ae2b171dcbe0e670ce1b7d0a8c18d890 WHIRLPOOL 7399706ac33246e46795c4c55737043782d8ca12b8e9d03bcd5b4f34f3335baf57d699b4f531e32e732bdb9cb3310a803e93cb5efd593f7986395b88af08939b
+DIST check_mk-1.2.8p16.tar.gz 16298683 SHA256 b161d4e37b4313696c93b9272626bcc367c90f4be1798bd283c3b581795e1747 SHA512 601c76b2b62de9176122c69b011b5f7ac6b71650d1b3e411c103f5e9c3e91256ce8d3db6fcd1edc2a11f86dcba4e8ea18ec5a1f9f3eae5b25a4bb3ba712341eb WHIRLPOOL 7ef193c4e9087866ae635e198b2028abb1c245914dcf81240b6939c76a83ab5a4389de7d0e363239bbf12467cd276790d9c85553354ad10a7da1612054438fea
+EBUILD check_mk-1.2.4_p5-r1.ebuild 10413 SHA256 467b97e4c94242c792c9f58f7cf739f0d3baa8b91b5ce62eeabfaeda7b773da6 SHA512 54e0855c1f6c80596d580db0dbd61478cc4ea5a15c1fbc3cd3764c5547a0eddf7d018a4e7345fff6c0f6f9960e1273552f16194d9221fed92d5e5a7c82f581c0 WHIRLPOOL fb270f73855f597c056faf2bbc8a28a2fca4fea4d15cb0bcbbbcdecc4fa98a99767a1655bcfc455eaf4d43634ac17aa549ffef026c7d5dba0eb9da635dd85ccb
+EBUILD check_mk-1.2.8_p16.ebuild 11335 SHA256 b3ee1db2a0d35b82ce11ff2ee84b5951a66cd29cb02d1fb255b601aaca3521f0 SHA512 af1945acdc4314ac018343b3d7323b9997f2a041de5db6cf6f6b9cbbea623c714b1f5f348f4fa098bbe183e701164ef6140dc1ec63db274bb16eda6b42acf0a0 WHIRLPOOL 1ddb23a5f28211209564002c6b4e36f2ea6795cd47a1e4935898e0bb1563f9cf71af35746527ebb2c7178075965e9cd476f657df0382e864b1d3a91cd2a49451
+MISC ChangeLog 3351 SHA256 4b7b3017e76e3c9cce18452613fc7bf762ff60813de468c602fcbffec7b08c11 SHA512 370ea7ef5e448ecf0bd53fd46b83a97876bc58e45c1a5816570959c965c49ed476d49cca2e0c8e1d63f80516e285d08883b13f9761d387d73aa7b2a6d02a04e3 WHIRLPOOL 54052ca6fc609d207d8bcb076355fced1ac39bb1b8a0253918fe27d960053ccb2f7138f85029a115ff129f4642898da70145bd795bf55ab8e0f6365fe964dbe8
+MISC ChangeLog-2015 436 SHA256 bc18644a94b3bbd64d5021b9136696962ec983a6065602856100dddc3ae12c9b SHA512 c8c99c3d4dcfc427de8cffb83fcb76414965d8fe3a379ff27b8207343b78f93e75aa77194bc0d0f7417fc5b02cf00a05bd396baf625096d884925c77a86acfd2 WHIRLPOOL 8cbe125e2091f28da12dc314897e16e7fc15a7be560ff1675211d7288add92590d88f7215c50e943e91f98d12fd3f139505623fbb11a0cea2317aadb4a445d42
+MISC metadata.xml 1700 SHA256 bcd9a792f6dea90cf4223bc79ae60b0eabd1f446ea54d11fca4ada0668d0b3a9 SHA512 eeeb2be92120196d1cb9834c4465707d43cdacc1ecc62d9a71e8c10e4b5aa14b7b7078193d0c093be3bb64ff4f92344a3e6f04cbb71db40ea4ce4eee446e0b38 WHIRLPOOL 3ed43508757a2536187fc9e38650ce355b5309c3b89c6215db015ef8a27bbe5d94fabcd44d281c0408e139b644e99c8ad9e4042221513e96ab073261b17c09c6
diff --git a/net-analyzer/check_mk/check_mk-1.2.4_p5-r1.ebuild b/net-analyzer/check_mk/check_mk-1.2.4_p5-r1.ebuild
new file mode 100644
index 000000000000..ef7a70f9a76a
--- /dev/null
+++ b/net-analyzer/check_mk/check_mk-1.2.4_p5-r1.ebuild
@@ -0,0 +1,323 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils toolchain-funcs python-r1
+
+DESCRIPTION="General purpose Nagios/Icinga plugin for retrieving data"
+HOMEPAGE="http://mathias-kettner.de/check_mk.html"
+
+MY_P="${P/_p/p}"
+MY_PV="${MY_P/check_mk-/}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="agent-only apache_status dmi_sysinfo livestatus logwatch mysql
+	nfsexports oracle postgres smart wato xinetd zypper"
+
+DEPEND="${PYTHON_DEPS}
+	wato? ( app-admin/sudo )
+	xinetd? ( sys-apps/xinetd )
+	!agent-only? ( || ( net-analyzer/nagios-core net-analyzer/icinga ) )
+	!agent-only? ( www-servers/apache www-apache/mod_python )
+	media-libs/libpng:0
+	!!net-analyzer/check_mk_agent"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	livestatus? ( !agent-only )
+	wato? ( !agent-only )"
+
+SRC_URI="http://mathias-kettner.de/download/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# modify setup.sh for gentoo
+	epatch "${FILESDIR}"/${PN}-1.2.4p5-setup.sh.patch
+}
+
+src_configure() {
+	if has_version net-analyzer/nagios-core; then
+		export mydaemon=nagios
+		export nagpipe=/var/nagios/rw/nagios.cmd
+		export check_result_path=/var/nagios/spool/checkresults
+		export nagios_status_file=/var/nagios/status.dat
+		export rrd_path=/var/nagios/perfdata
+	else
+		export mydaemon=icinga
+		export nagpipe=/var/lib/icinga/rw/icinga.cmd
+		export check_result_path=/var/lib/icinga/spool/checkresults
+		export nagios_status_file=/var/lib/icinga/status.dat
+		export rrd_path=/var/lib/icinga/perfdata
+	fi
+
+	export nagiosuser=${mydaemon}
+	export nagios_binary=/usr/sbin/${mydaemon}
+	export nagios_config_file=/etc/${mydaemon}/${mydaemon}.cfg
+	export nagconfdir=/etc/${mydaemon}/check_mk.d
+	export nagios_startscript=/etc/init.d/${mydaemon}
+	export htpasswd_file=/etc/${mydaemon}/htpasswd.users
+	export nagios_auth_name="${mydaemon} Access"
+	export docdir=/usr/share/doc/${PF}
+	export checkmandir=/usr/share/doc/${PF}/checks
+	export check_icmp_path=/usr/lib/nagios/plugins/check_icmp
+	export wwwuser=apache
+	export wwwgroup=apache
+	export apache_config_dir=/etc/apache2/modules.d/
+
+	if use livestatus; then
+		export enable_livestatus=yes
+	else
+		export enable_livestatus=no
+	fi
+
+	export STRIPPROG=/bin/true
+}
+
+src_compile() {
+	DESTDIR=${S} ./setup.sh --yes || die "Error while running setup.sh"
+
+	# compile waitmax
+	cd "${S}"/usr/share/check_mk/agents || die "Couldn't cd to ${S}/usr/share/check_mk/agents"
+	if [[ -f waitmax ]]; then
+		rm waitmax || die "Couldn't delete precompiled waitmax file"
+	fi
+	sed -i -e 's#gcc -s -o waitmax waitmax\.c#gcc -o waitmax waitmax.c#' "${S}"/usr/share/check_mk/agents/Makefile || die "Couldn't modify remove strip from waitmax Makefile"
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" || die "Couldn't compile waitmax"
+
+	# Fix broken png files
+	pngfix -q --out=out.png "${S}/usr/share/check_mk/web/htdocs/images/icons/bookcase.png"
+	mv -f out.png "${S}/usr/share/check_mk/web/htdocs/images/icons/bookcase.png" || die
+	pngfix -q --out=out.png "${S}/usr/share/check_mk/web/htdocs/images/icon_auditlog.png"
+	mv -f out.png "${S}/usr/share/check_mk/web/htdocs/images/icon_auditlog.png" || die
+	pngfix -q --out=out.png "${S}/usr/share/check_mk/web/htdocs/images/button_auditlog_lo.png"
+	mv -f out.png "${S}/usr/share/check_mk/web/htdocs/images/button_auditlog_lo.png" || die
+}
+
+src_install() {
+	if ! use agent-only; then
+		# Apache configuration
+		insinto /etc/apache2/modules.d
+		doins etc/apache2/modules.d/zzz_check_mk.conf
+
+		if use wato; then
+			# sudoers configuration
+			cat << EOF > "${T}"/check_mk || die
+# Needed for WATO - the Check_MK Web Administration Tool
+Defaults:apache !requiretty
+apache ALL = (root) NOPASSWD: /usr/bin/check_mk --automation *
+EOF
+			insinto /etc/sudoers.d
+			doins "${T}"/check_mk
+		fi
+
+		# check_mk configuration
+		keepdir /etc/check_mk
+		insinto /etc/check_mk
+		doins etc/check_mk/main.mk
+		doins etc/check_mk/main.mk-${MY_PV}
+		doins etc/check_mk/multisite.mk
+		doins etc/check_mk/multisite.mk-${MY_PV}
+		keepdir /etc/check_mk/conf.d
+		insinto /etc/check_mk/conf.d
+		doins etc/check_mk/conf.d/README
+		keepdir /etc/check_mk/conf.d/wato
+		touch "${D}"/etc/check_mk/conf.d/distributed_wato.mk
+		keepdir /etc/check_mk/multisite.d
+		keepdir /etc/check_mk/multisite.d/wato
+		touch "${D}"/etc/check_mk/multisite.d/sites.mk
+
+		insinto /etc/${mydaemon}
+		doins etc/${mydaemon}/auth.serials
+
+		# Nagios / Icinga check_mk templates
+		insinto /etc/${mydaemon}/check_mk.d
+		doins etc/${mydaemon}/check_mk.d/check_mk_templates.cfg
+
+		dobin usr/bin/check_mk
+		dobin usr/bin/mkp
+		insinto /usr/bin
+		doins usr/bin/cmk
+
+		# remove compiled agent_modbus
+		if [[ -f ${S}/usr/share/doc/${PF}/treasures/modbus/agent_modbus ]]; then
+			rm "${S}"/usr/share/doc/${PF}/treasures/modbus/agent_modbus || die "Couldn't remove precompiled agent_modbus"
+		fi
+
+		insinto /usr/share/check_mk
+		doins -r usr/share/check_mk/*
+
+		keepdir /var/lib/check_mk/autochecks
+		keepdir /var/lib/check_mk/cache
+		keepdir /var/lib/check_mk/counters
+		keepdir /var/lib/check_mk/logwatch
+		keepdir /var/lib/check_mk/notify
+		keepdir /var/lib/check_mk/packages
+		insinto /var/lib/check_mk/packages
+		doins var/lib/check_mk/packages/check_mk
+		keepdir /var/lib/check_mk/precompiled
+		keepdir /var/lib/check_mk/snmpwalks
+		keepdir /var/lib/check_mk/tmp
+		keepdir /var/lib/check_mk/wato
+		keepdir /var/lib/check_mk/web
+
+		# Update check_mk defaults
+		sed -i -e "s#^\(check_mk_automation\s*= 'sudo -u\) portage \(.*\)\$#\1 ${mydaemon} \2#" "${D}"/usr/share/check_mk/modules/defaults || die "Couldn't update check_mk defaults"
+		cp "${D}"/usr/share/check_mk/modules/defaults "${D}"/usr/share/check_mk/web/htdocs/defaults.py || die "Couldn't copy check_mk defaults"
+
+		# Change permissions
+		fowners -R ${mydaemon}:apache /etc/${mydaemon}/auth.serials
+		fperms -R 0660 /etc/${mydaemon}/auth.serials
+		fowners -R ${mydaemon}:${mydaemon} /etc/${mydaemon}/check_mk.d
+		fperms -R 0775 /etc/${mydaemon}/check_mk.d
+		fowners -R root:apache /etc/check_mk/conf.d/wato
+		fperms -R 0775 /etc/check_mk/conf.d/wato
+		fowners root:apache /etc/check_mk/conf.d/distributed_wato.mk
+		fperms 0664 /etc/check_mk/conf.d/distributed_wato.mk
+		fowners -R root:apache /etc/check_mk/multisite.d/wato
+		fperms -R 0775 /etc/check_mk/multisite.d/wato
+		fowners root:apache /etc/check_mk/multisite.d/sites.mk
+		fperms 0664 /etc/check_mk/multisite.d/sites.mk
+		fowners root:${mydaemon} /var/lib/check_mk/cache
+		fperms 0775 /var/lib/check_mk/counters
+		fowners -R root:${mydaemon} /var/lib/check_mk/counters
+		fperms 0775 /var/lib/check_mk/notify
+		fowners -R root:${mydaemon} /var/lib/check_mk/notify
+		fperms 0775 /var/lib/check_mk/logwatch
+		fowners -R root:${mydaemon} /var/lib/check_mk/logwatch
+		fperms 0775 /var/lib/check_mk/cache
+		fowners -R root:${mydaemon} /var/lib/check_mk/cache
+		fperms -R 0775 /var/lib/check_mk/tmp
+		fowners -R root:apache /var/lib/check_mk/tmp
+		fperms -R 0775 /var/lib/check_mk/web
+		fowners -R root:apache /var/lib/check_mk/web
+		fperms -R 0775 /var/lib/check_mk/wato
+		fowners -R root:apache /var/lib/check_mk/wato
+	fi
+
+	# Install agent related files
+	newbin usr/share/check_mk/agents/check_mk_agent.linux check_mk_agent
+	dobin usr/share/check_mk/agents/waitmax
+
+	if use xinetd; then
+		insinto /etc/xinetd.d
+		newins usr/share/check_mk/agents/xinetd.conf check_mk
+	fi
+
+	keepdir /usr/lib/check_mk_agent/local
+	keepdir /usr/lib/check_mk_agent/plugins
+
+	# Install Livestatus
+	if use livestatus; then
+		cat << EOF > "${T}"/livestatus.cfg || die
+define module{
+	module_name		mk-livestatus
+	module_type		neb
+	path			/usr/lib/check_mk/livestatus.o
+	args			/var/lib/${mydaemon}/rw/live
+	}
+EOF
+
+		insinto /etc/${mydaemon}/modules
+		doins "${T}"/livestatus.cfg
+		fowners ${mydaemon}:${mydaemon} /etc/${mydaemon}/modules/livestatus.cfg
+
+		insinto /usr/lib/check_mk
+		doins usr/lib/check_mk/livestatus.o
+
+		dobin usr/bin/unixcat
+
+		keepdir /usr/share/check_mk/livestatus
+	fi
+
+	# Documentation
+	if ! use agent-only; then
+		dodoc -r usr/share/doc/${PF}/*
+		docompress -x /usr/share/doc/${PF}/checks/
+	else
+		dodoc usr/share/doc/${PF}/AUTHORS usr/share/doc/${PF}/COPYING usr/share/doc/${PF}/ChangeLog
+		docompress
+	fi
+
+	# Install the check_mk_agent logwatch plugin
+	if use logwatch; then
+		insinto /etc/check_mk
+		doins usr/share/check_mk/agents/logwatch.cfg
+		exeinto /usr/lib/check_mk_agent/plugins
+		doexe usr/share/check_mk/agents/plugins/mk_logwatch
+	fi
+
+	# Install the check_mk_agent smart plugin
+	if use smart; then
+		exeinto /usr/lib/check_mk_agent/plugins
+		doexe usr/share/check_mk/agents/plugins/smart
+	fi
+
+	# Install the check_mk_agent mysql plugin
+	if use mysql; then
+		exeinto /usr/lib/check_mk_agent/plugins
+		doexe usr/share/check_mk/agents/plugins/mk_mysql
+	fi
+
+	# Install the check_mk_agent postgres plugin
+	if use postgres; then
+		exeinto /usr/lib/check_mk_agent/plugins
+		doexe usr/share/check_mk/agents/plugins/mk_postgres
+	fi
+
+	# Install the check_mk_agent apache_status plugin
+	if use apache_status; then
+		exeinto /usr/lib/check_mk_agent/plugins
+		doexe usr/share/check_mk/agents/plugins/apache_status
+	fi
+
+	# Install the check_mk_agent zypper plugin
+	if use zypper; then
+		exeinto /usr/lib/check_mk_agent/plugins
+		doexe usr/share/check_mk/agents/plugins/mk_zypper
+	fi
+
+	# Install the check_mk_agent oracle plugin
+	if use oracle; then
+		exeinto /usr/lib/check_mk_agent/plugins
+		doexe usr/share/check_mk/agents/plugins/mk_oracle
+	fi
+
+	# Install the check_mk_agent nfsexports plugin
+	if use nfsexports; then
+		exeinto /usr/lib/check_mk_agent/plugins
+		doexe usr/share/check_mk/agents/plugins/nfsexports
+	fi
+
+	# Install the check_mk_agent dmi_sysinfo plugin
+	if use dmi_sysinfo; then
+		exeinto /usr/lib/check_mk_agent/plugins
+		doexe usr/share/check_mk/agents/plugins/dmi_sysinfo
+	fi
+}
+
+pkg_postinst() {
+	if ! use agent-only; then
+		elog "IMPORTANT: Please add the following line to your"
+		elog "/etc/${mydaemon}/${mydaemon}.cfg, so that"
+		elog "${mydaemon} can load your check_mk configuration."
+		elog
+		elog "  cfg_dir=/etc/${mydaemon}/check_mk.d"
+		elog
+	fi
+	if use wato; then
+		elog "INFO: Your webserver needs write access to"
+		elog "/etc/${mydaemon}/htpasswd.users!"
+		elog "otherwise wato will not function correctly!"
+		elog
+		elog "chown ${mydaemon}: /etc/${mydaemon}/htpasswd.users"
+		elog "chmod 660 /etc/${mydaemon}/htpasswd.users"
+		elog
+	fi
+}
diff --git a/net-analyzer/check_mk/check_mk-1.2.8_p16.ebuild b/net-analyzer/check_mk/check_mk-1.2.8_p16.ebuild
new file mode 100644
index 000000000000..cd3279356bc9
--- /dev/null
+++ b/net-analyzer/check_mk/check_mk-1.2.8_p16.ebuild
@@ -0,0 +1,351 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit toolchain-funcs user systemd python-single-r1
+
+DESCRIPTION="General purpose Nagios/Icinga plugin for retrieving data"
+HOMEPAGE="http://mathias-kettner.de/check_mk.html"
+
+MY_P="${P/_p/p}"
+MY_PV="${MY_P/check_mk-/}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="agent-only apache_status livestatus logwatch mysql +nagios4
+	nfsexports oracle postgres smart wato xinetd zypper"
+
+RDEPEND="${PYTHON_DEPS}
+	wato? ( app-admin/sudo )
+	xinetd? ( || ( sys-apps/xinetd sys-apps/systemd ) )
+	!agent-only? (
+		www-servers/apache[apache2_modules_access_compat(+)]
+		www-apache/mod_python[${PYTHON_USEDEP}]
+		livestatus? ( net-analyzer/mk-livestatus[nagios4=] )
+		nagios4? ( >=net-analyzer/nagios-core-4 )
+		!nagios4? ( || ( <net-analyzer/nagios-core-4 net-analyzer/icinga ) )
+	)
+	media-libs/libpng:0
+	!!net-analyzer/check_mk_agent"
+DEPEND="${DEPEND}"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	livestatus? ( !agent-only )
+	wato? ( !agent-only )"
+
+SRC_URI="http://mathias-kettner.de/download/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# modify setup.sh for gentoo
+	eapply "${FILESDIR}"/${PN}-1.2.8p16-setup.sh.patch
+	eapply_user
+}
+
+src_configure() {
+	if has_version net-analyzer/nagios-core; then
+		einfo "Using nagios as net-analyzer/nagios-core found"
+		export mydaemon=nagios
+		export nagpipe=/var/nagios/rw/nagios.cmd
+		export check_result_path=/var/nagios/spool/checkresults
+		export nagios_status_file=/var/nagios/status.dat
+		export rrd_path=/var/nagios/perfdata
+		if use livestatus; then
+			export livesock=/var/nagios/rw/live
+		fi
+	else
+		einfo "Using icinga as net-analyzer/nagios-core not found"
+		export mydaemon=icinga
+		export nagpipe=/var/lib/icinga/rw/icinga.cmd
+		export check_result_path=/var/lib/icinga/spool/checkresults
+		export nagios_status_file=/var/lib/icinga/status.dat
+		export rrd_path=/var/lib/icinga/perfdata
+		if use livestatus; then
+			export livesock=/var/lib/icigna/rw/live
+		fi
+	fi
+
+	export nagiosuser=${mydaemon}
+	export nagios_binary=/usr/sbin/${mydaemon}
+	export nagios_config_file=/etc/${mydaemon}/${mydaemon}.cfg
+	export nagconfdir=/etc/${mydaemon}/check_mk.d
+	export nagios_startscript=/etc/init.d/${mydaemon}
+	export htpasswd_file=/etc/${mydaemon}/htpasswd.users
+	export nagios_auth_name="${mydaemon} Access"
+	export docdir=/usr/share/doc/${PF}
+	export checkmandir=/usr/share/doc/${PF}/checks
+	export check_icmp_path=/usr/lib/nagios/plugins/check_icmp
+	export wwwuser=apache
+	export wwwgroup=apache
+	export apache_config_dir=/etc/apache2/modules.d/
+	export enable_livestatus=no
+	export STRIPPROG=/bin/true
+
+	mkdir -p "${S}"/usr/share/check_mk/agents || die
+	cat <<EOF >"${S}"/usr/share/check_mk/agents/Makefile
+all: waitmax
+
+waitmax: waitmax.c
+	\$(CC) \$(CFLAGS) \$< -o \$@ \$(LDFLAGS)
+
+EOF
+}
+
+src_compile() {
+	DESTDIR=${S} ./setup.sh --yes || die "Error while running setup.sh"
+
+	# compile waitmax
+	pushd "${S}"/usr/share/check_mk/agents &>/dev/null || die
+	if [[ -f waitmax ]]; then
+		rm waitmax || die "Couldn't delete precompiled waitmax file"
+	fi
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
+	popd &>/dev/null || die
+
+	# Fix broken png files
+	einfo "Fixing broken png files."
+	local x=0;
+	for png in "${S}"/usr/share/check_mk/web/htdocs/images/icons/*.png ; do
+		echo ${png#${S}}
+		pngfix -q --out="${T}"/out.png "${png}" && \
+		mv -f "${T}"/out.png "${png}" || die
+		x=$((x+1))
+	done
+	einfo "$x png files processed."
+
+	# enforce the correct python in these wrapper scripts
+	sed -i -e "/exec/s/python /${EPYTHON} /" usr/bin/{check_mk,mkp} || die
+	sed -i -e "/command_line/s#python /var#${EPYTHON} /var#" \
+		usr/share/check_mk/check_mk_templates.cfg || die
+
+	# fix all shebangs
+	find usr -type f -name \*.py |while read py ; do
+		grep '^#!' ${py} &>/dev/null && \
+		python_fix_shebang ${py}
+	done
+}
+
+src_install() {
+	if ! use agent-only; then
+		# Apache configuration
+		insinto /etc/apache2/modules.d
+		doins etc/apache2/modules.d/zzz_check_mk.conf
+
+		if use wato; then
+			# sudoers configuration
+			cat << EOF > "${T}"/check_mk || die
+# Needed for WATO - the Check_MK Web Administration Tool
+Defaults:apache !requiretty
+apache ALL = (root) NOPASSWD: /usr/bin/check_mk --automation *
+EOF
+			insinto /etc/sudoers.d
+			doins "${T}"/check_mk
+		fi
+
+		# check_mk configuration
+		#keepdir /etc/check_mk
+		insinto /etc/check_mk
+		doins etc/check_mk/main.mk
+		doins etc/check_mk/main.mk-${MY_PV}
+		doins etc/check_mk/multisite.mk
+		doins etc/check_mk/multisite.mk-${MY_PV}
+		#keepdir /etc/check_mk/conf.d
+		insinto /etc/check_mk/conf.d
+		doins etc/check_mk/conf.d/README
+		dodir /etc/check_mk/conf.d/wato
+		touch "${D}"/etc/check_mk/conf.d/distributed_wato.mk
+		#keepdir /etc/check_mk/multisite.d
+		dodir /etc/check_mk/multisite.d/wato
+		touch "${D}"/etc/check_mk/multisite.d/sites.mk
+
+		insinto /etc/${mydaemon}
+		doins etc/${mydaemon}/auth.serials
+
+		# Nagios / Icinga check_mk templates
+		insinto /etc/${mydaemon}/check_mk.d
+		doins etc/${mydaemon}/check_mk.d/check_mk_templates.cfg
+
+		dobin usr/bin/check_mk
+		dobin usr/bin/mkp
+		dosym /usr/bin/check_mk /usr/bin/cmk
+
+		# remove compiled agent_modbus
+		if [[ -f ${S}/usr/share/doc/${PF}/treasures/modbus/agent_modbus ]]; then
+			rm "${S}"/usr/share/doc/${PF}/treasures/modbus/agent_modbus || die "Couldn't remove precompiled agent_modbus"
+		fi
+
+		insinto /usr/share/check_mk
+		doins -r usr/share/check_mk/*
+
+		keepdir /var/lib/check_mk/autochecks
+		keepdir /var/lib/check_mk/cache
+		keepdir /var/lib/check_mk/counters
+		keepdir /var/lib/check_mk/inventory
+		keepdir /var/lib/check_mk/log
+		keepdir /var/lib/check_mk/logwatch
+		keepdir /var/lib/check_mk/notify
+		keepdir /var/lib/check_mk/precompiled
+		keepdir /var/lib/check_mk/snmpwalks
+		keepdir /var/lib/check_mk/tmp
+		keepdir /var/lib/check_mk/wato
+		keepdir /var/lib/check_mk/web
+
+		insinto /var/lib/check_mk/packages
+		doins var/lib/check_mk/packages/check_mk
+
+		# Update check_mk defaults
+		sed -i -e "s#^\(check_mk_automation\s*= 'sudo -u\) portage \(.*\)\$#\1 ${mydaemon} \2#" "${D}"/usr/share/check_mk/modules/defaults || die "Couldn't update check_mk defaults"
+		cp "${D}"/usr/share/check_mk/modules/defaults "${D}"/usr/share/check_mk/web/htdocs/defaults.py || die "Couldn't copy check_mk defaults"
+
+		# Change permissions
+		fowners -R ${mydaemon}:apache /etc/${mydaemon}/auth.serials
+		fperms -R 0660 /etc/${mydaemon}/auth.serials
+		fowners -R ${mydaemon}:${mydaemon} /etc/${mydaemon}/check_mk.d
+		fperms -R 0775 /etc/${mydaemon}/check_mk.d
+		fowners -R root:apache /etc/check_mk/conf.d/wato
+		fperms -R 0775 /etc/check_mk/conf.d/wato
+		fowners root:apache /etc/check_mk/conf.d/distributed_wato.mk
+		fperms 0664 /etc/check_mk/conf.d/distributed_wato.mk
+		fowners -R root:apache /etc/check_mk/multisite.d/wato
+		fperms -R 0775 /etc/check_mk/multisite.d/wato
+		fowners root:apache /etc/check_mk/multisite.d/sites.mk
+		fperms 0664 /etc/check_mk/multisite.d/sites.mk
+		fowners root:${mydaemon} /var/lib/check_mk/cache
+		fperms 0775 /var/lib/check_mk/counters
+		fowners -R root:${mydaemon} /var/lib/check_mk/counters
+		fperms 0775 /var/lib/check_mk/notify
+		fowners -R root:${mydaemon} /var/lib/check_mk/notify
+		fperms 0775 /var/lib/check_mk/inventory
+		fowners -R root:${mydaemon} /var/lib/check_mk/inventory
+		fperms 0775 /var/lib/check_mk/log
+		fowners -R root:${mydaemon} /var/lib/check_mk/log
+		fperms 0775 /var/lib/check_mk/logwatch
+		fowners -R root:${mydaemon} /var/lib/check_mk/logwatch
+		fperms 0775 /var/lib/check_mk/cache
+		fowners -R root:${mydaemon} /var/lib/check_mk/cache
+		fperms -R 0775 /var/lib/check_mk/tmp
+		fowners -R root:apache /var/lib/check_mk/tmp
+		fperms -R 0775 /var/lib/check_mk/web
+		fowners -R root:apache /var/lib/check_mk/web
+		fperms -R 0775 /var/lib/check_mk/wato
+		fowners -R root:apache /var/lib/check_mk/wato
+		fperms -R 0775 /var/lib/check_mk/
+		fowners -R ${mydaeon}:apache /var/lib/check_mk/
+	fi
+
+	# Install agent related files
+	newbin usr/share/check_mk/agents/check_mk_agent.linux check_mk_agent
+	dobin usr/share/check_mk/agents/waitmax
+
+	if use xinetd; then
+		pushd "${S}"/usr/share/check_mk/agents/cfg_examples &>/dev/null || die
+		insinto /etc/xinetd.d
+		newins xinetd.conf check_mk
+		systemd_dounit systemd/check_mk@.service systemd/check_mk.socket
+		popd &>/dev/null || die
+	fi
+
+	keepdir /usr/lib/check_mk_agent/local
+	keepdir /usr/lib/check_mk_agent/plugins
+
+	# Documentation
+	if ! use agent-only; then
+		dodoc -r usr/share/doc/${PF}/*
+		docompress -x /usr/share/doc/${PF}/checks/
+	else
+		dodoc usr/share/doc/${PF}/AUTHORS usr/share/doc/${PF}/COPYING usr/share/doc/${PF}/ChangeLog
+		docompress
+	fi
+
+	# Install the check_mk_agent logwatch plugin
+	if use logwatch; then
+		insinto /etc/check_mk
+		doins usr/share/check_mk/agents/cfg_examples/logwatch.cfg
+		exeinto /usr/lib/check_mk_agent/plugins
+		doexe usr/share/check_mk/agents/plugins/mk_logwatch
+	fi
+
+	# Install the check_mk_agent smart plugin
+	if use smart; then
+		exeinto /usr/lib/check_mk_agent/plugins
+		doexe usr/share/check_mk/agents/plugins/smart
+	fi
+
+	# Install the check_mk_agent mysql plugin
+	if use mysql; then
+		exeinto /usr/lib/check_mk_agent/plugins
+		doexe usr/share/check_mk/agents/plugins/mk_mysql
+	fi
+
+	# Install the check_mk_agent postgres plugin
+	if use postgres; then
+		exeinto /usr/lib/check_mk_agent/plugins
+		doexe usr/share/check_mk/agents/plugins/mk_postgres
+	fi
+
+	# Install the check_mk_agent apache_status plugin
+	if use apache_status; then
+		exeinto /usr/lib/check_mk_agent/plugins
+		doexe usr/share/check_mk/agents/plugins/apache_status
+	fi
+
+	# Install the check_mk_agent zypper plugin
+	if use zypper; then
+		exeinto /usr/lib/check_mk_agent/plugins
+		doexe usr/share/check_mk/agents/plugins/mk_zypper
+	fi
+
+	# Install the check_mk_agent oracle plugin
+	if use oracle; then
+		exeinto /usr/lib/check_mk_agent/plugins
+		doexe usr/share/check_mk/agents/plugins/mk_oracle
+	fi
+
+	# Install the check_mk_agent nfsexports plugin
+	if use nfsexports; then
+		exeinto /usr/lib/check_mk_agent/plugins
+		doexe usr/share/check_mk/agents/plugins/nfsexports
+	fi
+}
+
+pkg_postinst() {
+	if ! use agent-only; then
+		elog "IMPORTANT: Please add the following line to your"
+		elog "/etc/${mydaemon}/${mydaemon}.cfg, so that"
+		elog "${mydaemon} can load your check_mk configuration."
+		elog
+		elog "  cfg_dir=/etc/${mydaemon}/check_mk.d"
+		elog
+	fi
+	if use wato; then
+		elog "INFO: Your webserver needs write access to"
+		elog "/etc/${mydaemon}/htpasswd.users!"
+		elog "otherwise wato will not function correctly!"
+		elog
+		elog "chown ${mydaemon}: /etc/${mydaemon}/htpasswd.users"
+		elog "chmod 660 /etc/${mydaemon}/htpasswd.users"
+		elog
+		elog "Alternatively with ACLs:"
+		elog "setfacl -m u:apache:rw /etc/${mydaemon}/htpasswd.users"
+		elog "setfacl -m g:apache:rw /etc/${mydaemon}/htpasswd.users"
+		elog
+	fi
+	if use livestatus; then
+		elog "In order for livestatus to work, you need to make sure that"
+		if has_version net-analyzer/nagios-core; then
+			elog "nagios is loading the livestatus broker module.  Please"
+			elog "ensure to add to your nagios.cfg the lines in"
+			elog "/usr/share/mk-livestatus/nagios.cfg"
+		else
+			elog "icigna is loading the livestatus broker module.  Please"
+			elog "include /usr/share/mk-livestatus/icigna.cfg in your"
+			elog "icigna configuration."
+		fi
+	fi
+}
diff --git a/net-analyzer/check_mk/files/check_mk-1.2.4p5-setup.sh.patch b/net-analyzer/check_mk/files/check_mk-1.2.4p5-setup.sh.patch
new file mode 100644
index 000000000000..07dffa35b2d9
--- /dev/null
+++ b/net-analyzer/check_mk/files/check_mk-1.2.4p5-setup.sh.patch
@@ -0,0 +1,39 @@
+--- check_mk-1.2.4p5.orig/setup.sh	2014-07-04 09:24:45.000000000 +0200
++++ check_mk-1.2.4p5/setup.sh	2015-08-28 13:22:19.986733809 +0200
+@@ -572,6 +572,11 @@
+            CONFIGURE_OPTS="--with-nagios4"
+         fi
+    fi
++   # disable stripping to get meaningful backtraces
++   sed -i -e 's/^INSTALL_STRIP_PROGRAM="\\\$(install_sh) -c -s"$/INSTALL_STRIP_PROGRAM="\\\$(install_sh) -c"/' configure
++   sed -i -e 's/install_sh_PROGRAM="\$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \\$/install_sh_PROGRAM="\$(INSTALL_STRIP_PROGRAM)" \\/' Makefile.in
++   sed -i -e 's/install_sh_PROGRAM="\$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \\$/install_sh_PROGRAM="\$(INSTALL_STRIP_PROGRAM)" \\/' src/Makefile.in
++   sed -i -e 's/\$(CXX) \$(LDFLAGS) -s -fPIC -shared \$(livestatus_so_OBJECTS) -o \$@ -lpthread -lstdc++/\$(CXX) \$(LDFLAGS) -fPIC -shared \$(livestatus_so_OBJECTS) -o \$@ -lpthread -lstdc++/' src/Makefile.in
+    ./configure --libdir=$libdir --bindir=$bindir $CONFIGURE_OPTS &&
+    make clean &&
+    cat <<EOF > src/livestatus.h &&
+@@ -581,7 +586,8 @@
+ #endif // livestatus_h
+ EOF
+    make -j 8  2>&1 &&
+-   strip src/livestatus.o &&
++   # disable stripping to get meaningful backtraces
++   #strip src/livestatus.o &&
+    mkdir -p $DESTDIR$libdir &&
+    install -m 755 src/livestatus.o $DESTDIR$libdir &&
+    mkdir -p $DESTDIR$bindir &&
+@@ -1018,9 +1024,11 @@
+            # WATO. Also create an empty and Apache-writable auth.serials
+            serials_file=$DESTDIR${htpasswd_file%/*}/auth.serials &&
+            touch "$serials_file" &&
+-           (chown $wwwuser "$serials_file" || true) &&
+-           (chown $wwwuser "$htpasswd_file" || true) &&
+-	   create_sudo_configuration &&
++           # Permissions will be set within src_install
++           #(chown $wwwuser "$serials_file" || true) &&
++           #(chown $wwwuser "$htpasswd_file" || true) &&
++	   # disable sudo configuration as this will be done within src_install
++	   #create_sudo_configuration &&
+            if [ "$enable_mkeventd" = yes ]
+            then
+ 	       if [ -z "$YES" ] ; then echo -n "(Compiling Event Console binaries..." ; fi
diff --git a/net-analyzer/check_mk/files/check_mk-1.2.8p16-setup.sh.patch b/net-analyzer/check_mk/files/check_mk-1.2.8p16-setup.sh.patch
new file mode 100644
index 000000000000..b30d1ad1dad1
--- /dev/null
+++ b/net-analyzer/check_mk/files/check_mk-1.2.8p16-setup.sh.patch
@@ -0,0 +1,35 @@
+--- a/setup.sh	2014-07-04 09:24:45.000000000 +0200
++++ b/setup.sh	2015-08-28 13:22:19.986733809 +0200
+@@ -564,6 +564,17 @@
+ 
+ compile_livestatus ()
+ {
++   echo "Skipping internal compile of livestatus, do it in ebuild instead"
++   cat <<EOF > $SRCDIR/livestatus.src/src/livestatus.h 
++#ifndef livestatus_h
++#define livestatus_h
++#define DEFAULT_SOCKET_PATH "$livesock"
++#endif // livestatus_h
++EOF
++}
++
++avoid_compile_livestatus ()
++{
+    local D=$SRCDIR/livestatus.src
+    rm -rf $D
+    mkdir -p $D
+@@ -1018,9 +1029,11 @@
+            # WATO. Also create an empty and Apache-writable auth.serials
+            serials_file=$DESTDIR${htpasswd_file%/*}/auth.serials &&
+            touch "$serials_file" &&
+-           (chown $wwwuser "$serials_file" || true) &&
+-           (chown $wwwuser "$htpasswd_file" || true) &&
+-	   create_sudo_configuration &&
++           # Permissions will be set within src_install
++           #(chown $wwwuser "$serials_file" || true) &&
++           #(chown $wwwuser "$htpasswd_file" || true) &&
++	   # disable sudo configuration as this will be done within src_install
++	   #create_sudo_configuration &&
+            if [ "$enable_mkeventd" = yes ]
+            then
+ 	       if [ -z "$YES" ] ; then echo -n "(Compiling Event Console binaries..." ; fi
diff --git a/net-analyzer/check_mk/metadata.xml b/net-analyzer/check_mk/metadata.xml
new file mode 100644
index 000000000000..2e0e199f3a40
--- /dev/null
+++ b/net-analyzer/check_mk/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>morlix@morlix.de</email>
+		<name>Timo Eissler</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		General purpose Nagios/Icinga plugin for retrieving data.
+		Check_MK is a collection of extensions for the IT-Monitoring-Kernel of Nagios/Icinga
+		and together with this, and ideally also with PNP4Nagios and NagVis constitutes
+		a complete IT-Monitoring-System.
+	</longdescription>
+	<use>
+		<flag name="agent-only">Install only the check_mk agent.</flag>
+		<flag name="logwatch">Install check_mk-agent logwatch plugin.</flag>
+		<flag name="smart">Install check_mk-agent S.M.A.R.T plugin.</flag>
+		<flag name="mysql">Install check_mk-agent mysql plugin.</flag>
+		<flag name="nagios4">Depend on <pkg>net-analyzer/nagios-core</pkg>-4</flag>
+		<flag name="postgres">Install check_mk-agent postgres plugin.</flag>
+		<flag name="apache_status">Install check_mk-agent apache-status plugin.</flag>
+		<flag name="nfsexports">Install check_mk-agent nfsexports plugin.</flag>
+		<flag name="dmi_sysinfo">Install check_mk-agent dmi_sysinfo plugin.</flag>
+		<flag name="zypper">Install check_mk-agent zypper plugin.</flag>
+		<flag name="livestatus">Enable livestatus.</flag>
+		<flag name="wato">Enable check_mk WATO - check_mk's Web Administration Tool.</flag>
+	</use>
+	<upstream>
+		<changelog>http://mathias-kettner.com/check_mk_download.html</changelog>
+		<doc>http://mathias-kettner.com/checkmk.html</doc>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/check_mk_agent/Manifest b/net-analyzer/check_mk_agent/Manifest
new file mode 100644
index 000000000000..abed54a2ed55
--- /dev/null
+++ b/net-analyzer/check_mk_agent/Manifest
@@ -0,0 +1,3 @@
+DIST check_mk-1.2.8p16.tar.gz 16298683 SHA256 b161d4e37b4313696c93b9272626bcc367c90f4be1798bd283c3b581795e1747 SHA512 601c76b2b62de9176122c69b011b5f7ac6b71650d1b3e411c103f5e9c3e91256ce8d3db6fcd1edc2a11f86dcba4e8ea18ec5a1f9f3eae5b25a4bb3ba712341eb WHIRLPOOL 7ef193c4e9087866ae635e198b2028abb1c245914dcf81240b6939c76a83ab5a4389de7d0e363239bbf12467cd276790d9c85553354ad10a7da1612054438fea
+EBUILD check_mk_agent-1.2.8_p16.ebuild 2193 SHA256 b4d7e547cae72d51f6c7971705f18e1f28db9357634a1048a3abada3d8535d8f SHA512 b62d188ec2825fa9bc983c75e92ac6e9d3a7bcdc0a244cf2b3e711c298c5f92731cb25d1a24913ba301a8b85c66fb7c515492ecfe7af7dadf6c820ba183ee9eb WHIRLPOOL 15be47940d207d27bac6b4e3f4b719ea0ea4ae1cde939464e5b48fd592633326a7533f597000248a542c683fea0a431b8a12c059cae7ca2092ca41f95a4fa5a5
+MISC metadata.xml 1105 SHA256 442f4ecb8e0597e174a66c189efb9dbf94969155afc5c7c653edaeb24718a411 SHA512 dee7505f21436e97d80242771f9f8f2347831cc4da163a1b9c873d1ee1d3dbdaaf1138f3e147fbb0e7ab4d124a386b71074a5c882e71952e13c3fb4af6a3e7d3 WHIRLPOOL bb2c52622e37133eb6d8386a94b2843f129249927a325bb2db599c1edae42b34fb483bfa3d3b9ded0d43f1268fecb6afe7476244cf90a0346403cc9335b3a99a
diff --git a/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p16.ebuild b/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p16.ebuild
new file mode 100644
index 000000000000..0bb80b3ddcd0
--- /dev/null
+++ b/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p16.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="Agent to report data to Check_MK for monitoring"
+HOMEPAGE="http://mathias-kettner.de/check_mk.html"
+
+MY_PV="${PV/_p/p}"
+MY_P="check_mk-${MY_PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="apache_status logwatch mysql nfsexports oracle postgres smart +xinetd zypper"
+
+RDEPEND="!!net-analyzer/check_mk
+	app-shells/bash:*
+	xinetd? ( || ( sys-apps/xinetd sys-apps/systemd ) )
+	"
+DEPEND="${RDEPEND}"
+
+SRC_URI="http://mathias-kettner.de/download/${MY_P}.tar.gz"
+
+src_unpack() {
+	# check_mk is a tarball containing tarballs
+	unpack ${A}
+	mkdir -p "${S}" || die
+	cd "${S}" || die
+	unpack "${WORKDIR}"/${MY_P}/agents.tar.gz
+	mkdir -p "${S}"/doc || die
+	cd "${S}"/doc || die
+	unpack "${WORKDIR}"/${MY_P}/doc.tar.gz
+}
+
+src_prepare() {
+	cat <<EOF >Makefile
+all: waitmax
+
+waitmax: waitmax.c
+	\$(CC) \$(CFLAGS) \$< -o \$@ \$(LDFLAGS)
+
+EOF
+
+	if [[ -f waitmax ]]; then
+		rm waitmax || die "Couldn't delete precompiled waitmax file"
+	fi
+
+	default
+}
+
+src_compile() {
+	# compile waitmax
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
+}
+
+src_install() {
+	# Install agent related files
+	newbin check_mk_agent.linux check_mk_agent
+	dobin waitmax
+
+	keepdir /usr/lib/check_mk_agent/local
+	dodir /usr/lib/check_mk_agent/plugins
+	dodir /etc/check_mk
+
+	dodoc doc/{AUTHORS,COPYING,ChangeLog}
+	docompress
+
+	if use xinetd; then
+		insinto /etc/xinetd.d
+		newins cfg_examples/xinetd.conf check_mk
+		systemd_dounit cfg_examples/systemd/check_mk{.socket,@.service}
+	fi
+
+	# Install the check_mk_agent logwatch plugin
+	if use logwatch; then
+		insinto /etc/check_mk
+		doins cfg_examples/logwatch.cfg
+		exeinto /usr/lib/check_mk_agent/plugins
+		doexe plugins/mk_logwatch
+	fi
+
+	# Install any other useflag-enabled agent plugins
+	exeinto /usr/lib/check_mk_agent/plugins
+	use smart && doexe plugins/smart
+	use mysql && doexe plugins/mk_mysql
+	use postgres && doexe plugins/mk_postgres
+	use apache_status && doexe plugins/apache_status
+	use zypper && doexe plugins/mk_zypper
+	use oracle && doexe plugins/mk_oracle
+	use nfsexports && doexe plugins/nfsexports
+}
diff --git a/net-analyzer/check_mk_agent/metadata.xml b/net-analyzer/check_mk_agent/metadata.xml
new file mode 100644
index 000000000000..8cdfbbe9f07a
--- /dev/null
+++ b/net-analyzer/check_mk_agent/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>axs@gentoo.org</email>
+		<name>Ian Stakenvicius (_AxS_)</name>
+	</maintainer>
+	<longdescription lang="en">
+		The agent, to gather and report system and other monitoring data to Check_MK enabled
+		Nagios/Icigna centralized monitoring servers.
+	</longdescription>
+	<use>
+		<flag name="logwatch">Install check_mk-agent logwatch plugin.</flag>
+		<flag name="smart">Install check_mk-agent S.M.A.R.T plugin.</flag>
+		<flag name="mysql">Install check_mk-agent mysql plugin.</flag>
+		<flag name="postgres">Install check_mk-agent postgres plugin.</flag>
+		<flag name="apache_status">Install check_mk-agent apache-status plugin.</flag>
+		<flag name="nfsexports">Install check_mk-agent nfsexports plugin.</flag>
+		<flag name="zypper">Install check_mk-agent zypper plugin.</flag>
+	</use>
+	<upstream>
+		<changelog>http://mathias-kettner.com/check_mk_download.html</changelog>
+		<doc>http://mathias-kettner.com/checkmk.html</doc>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/cloudshark/Manifest b/net-analyzer/cloudshark/Manifest
new file mode 100644
index 000000000000..f1eddc63ab73
--- /dev/null
+++ b/net-analyzer/cloudshark/Manifest
@@ -0,0 +1,10 @@
+AUX cs_log_dir.patch 402 SHA256 7f8e9bc482c4e83dadf617386b769e11d6a56428c4ba7c270bae63cc37f81dfa SHA512 2cd7fa2b25befeaa6ed2474ed8149e34e4115d7c0105501a9c27547a3dfff7fa4bb6dab60749b17b22f5d13bf247f3276d9217b4f2041db7ee9c0d734108d6a9 WHIRLPOOL 4547b19f333c143d9fae7c550ac1d6d057fb69e0e8ead6600c94dc5cd776815c0bd99f86097c3549ebf01ade5a1fa259bf8a5b576c580f6ab4163cd97e0dda6f
+DIST cloudshark-1.0.4.tar.gz 24947 SHA256 9b3c011c3cb6f08234754dbf8abf4e5e095d23b470262a07fe489c867bf60ea5 SHA512 5cb0e43e348d00c0ecc98f079a35f455865cbbe884e34101369b74429bb5bc14bb98acffa9749ce44a765e3653c0548e8b30cc658fb982b09dd61e2ec31b4f86 WHIRLPOOL 8f97d7aa0e88e5693994897abbcf6863b5e4cc4a414f0397130bd371e27436d22472a447d89d83f9870f5d8c0b93a0d54d083c6ea38e5e286965d5fee55b150e
+DIST cloudshark-plugin-1.0.2-174.tgz 143067 SHA256 d5918e9e3dc60059bdc40d436409c18197df428266863d90367a762f08c3623e SHA512 42445e67630b1bd2968f0836f625acb3792f22257de104ec0b90c59fa8d2096649eba2252cd6161ce57c8ff79095d52c5663d2fa018c650667896c9905e9dd7e WHIRLPOOL 01f3f6bc87b3f09645d2fef953d84b7ba3828f960d7e9bb952bf18cbeb8422beb63cee21355434f392727795b0462e59fd2b07549cce6048e689e5e02bcdd19d
+DIST cloudshark-plugin-1.0.3-180.tgz 143381 SHA256 0c0b204622107dcb29d302401688b62fa3b904eb0b5ccfa6bb42802084f5d102 SHA512 765144e6a2c7ce17eaa05f8170216e08ccac224ba6c11750893ae5caa8f40a2b6bee883fd9be91fa800ad3b45dc42d2ec81e564aa573015a91a8537be8384c73 WHIRLPOOL 818abb8dd904c72fe870336bb3702df04af7299c6e3bbed21510a0a4484997ec4eef68c14f0a556285f82a89ef57fd9768c6814cc3311c4abd28194d70159926
+EBUILD cloudshark-1.0.2.174.ebuild 1637 SHA256 043c37dd38b7d909773852018596f73eae5960edb2c0e5e7caa7e5d890d2fd7c SHA512 4602b794455e48c99edd96c84edb72630981e12e86ff73827d9a44336fda8514dca2f2c61b1ac02d237c1f6aa6a76dca6bf413f04e8c93fd4f2774d2731fbd91 WHIRLPOOL 4bfa4272e96ce45e7a6094cf8410ff04429aeae287ff2cad08477c5ec19a67e6946cef67ea628c8d7d30069705447460491699ce6f8a2d8609dcc5685ef37ae1
+EBUILD cloudshark-1.0.3.180.ebuild 1634 SHA256 792c31beff27a4545a212723f96ee865a0fef999bba47235064ccc454eda7aa8 SHA512 9983487c7d5a65de2d3a38392d22eb7e33a1f1be8429e984781f5b4289909baa861f0662d4fa7a0febd075c3ee88ea99366f73c6c3026f68464a2e2069c10655 WHIRLPOOL e88d6ec28ce61ec4590d16e48757f5bbd97bd8bbbbbf2b473057481c543cfcf63607f783b98355c8ed52706f19ccd258935916b012fa812b2daedd133cb35b74
+EBUILD cloudshark-1.0.4.ebuild 1225 SHA256 9c3228f8f295eb58d8cf800bd53e90ad34d7dec0432cdcaa7685a943dac95bda SHA512 1eeec680d1631a708185fcf64b3e1fe44ef60fc7f32ae51a1ac064e2af09c4505026e65ae5cff03f3cd52d11c361a6a0d2bf053009e38b80f573edff07ded47e WHIRLPOOL a6c3b12a482501a40cda4f635e1cd102f3376dbf9ea0903332b5e5bead86a390f2504a9980ddc9772466cbfb1cf7a676085d751677429a7fb37e9f221b7c201b
+MISC ChangeLog 2842 SHA256 e70d2b5294565e390384e98f4e131c116fccfa44433739bf65053cb1df916b25 SHA512 bef5f8ceb98958b2d5bf161bae64f45c88ef0a1ba45d17ddb654c1a2149ab7a4da605df3827d1a101d4782a4e50c12fe1663dd725d27b5f4ce9c97d214f40378 WHIRLPOOL f8b62156aff02e42fbe33a688bc96b732467ae0dd8380e08f81b7692a65defd5555b5e9c77a1ee5eb7c184e90fc9b6bac3541e6aea4a6dd8d29341db8f9669af
+MISC ChangeLog-2015 853 SHA256 40dcbea6618213cac2dd952c3610c3fd28dc1fac8090eda249d8925cf6a57dec SHA512 e4b3c9b2df149a9b126d82cd96108c6e59d4147468b558cb584af1aefacb8ea2185ae1368ee6aa20ff64cdc72c6f581383e5731a04de5cd8f2027a516a5bdb48 WHIRLPOOL 1313028e44b3da445511a5353f08ff8c898b801a4ed73fe45a1fc3222c75e9822ad4de6ebb6f4d11532efaa1932e5f1079918a801bb6977e95d249378c6cde36
+MISC metadata.xml 339 SHA256 62a455ead693e9166e2abe2606b8e591240858c59677d62f8ac769db2dc423f0 SHA512 6f455d12f82e69560c68af083929907b4ba2d5389bdd7acc08725609bde578d8081245185a2c4f1571cf89c7693cbd49ce713ed4f4cb529f58758bdfa8b08272 WHIRLPOOL ee843193ae8342337ff15830ed4e346deaa42c934b995e2ea0ca734941ba604e4f200b4a3d92c0c66df3acb10a5cbfc1f9b482af22ec99b7ad03044c1edfbe3e
diff --git a/net-analyzer/cloudshark/cloudshark-1.0.2.174.ebuild b/net-analyzer/cloudshark/cloudshark-1.0.2.174.ebuild
new file mode 100644
index 000000000000..81f442abebfe
--- /dev/null
+++ b/net-analyzer/cloudshark/cloudshark-1.0.2.174.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib
+
+SV="1.0.2-174"
+
+DESCRIPTION="Easily upload your wireshark captures to CloudShark"
+HOMEPAGE="http://appliance.cloudshark.org/plug-ins-wireshark.html"
+SRC_URI="http://appliance.cloudshark.org/downloads/${PN}-plugin-${SV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+PDEPEND="net-analyzer/wireshark:=[lua]
+	net-misc/curl"
+
+S="${WORKDIR}/${PN}-${SV}"
+
+get_PV() {
+	local pv=$(best_version $1)
+	pv=${pv#$1-}; pv=${pv%-r*}
+	pv=${pv//_}; echo ${pv}
+}
+
+src_prepare() {
+	#cloudshark isn't meant to be installed systemwide, we fix that
+	epatch "${FILESDIR}"/cs_log_dir.patch
+
+	sed -i "s#%s/cloudshark_init.lua#/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)/cloudshark_init.lua#" cloudshark.lua
+	#causes errors, looks like it expects windows paths only
+	#echo "CLOUDSHARK_CABUNDLE = /usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)/curl-ca-bundle.crt" >> cloudshark_init.default
+	sed -i "s#%s/curl-ca-bundle.crt#/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)/curl-ca-bundle.crt#" cloudshark.lua
+
+	#stuff to fix cloudshark_init.default to be more sane
+	#sed -i 's#CLOUDSHARK_TSHARK = "n"#CLOUDSHARK_TSHARK = "y"#' cloudshark_init.default (tshark support doesn't seem to work)
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)
+	doins cloudshark.lua json.lua version.lua curl-ca-bundle.crt
+	newins cloudshark_init.default cloudshark_init.lua
+	dodoc CLOUDSHARK_README.txt
+}
diff --git a/net-analyzer/cloudshark/cloudshark-1.0.3.180.ebuild b/net-analyzer/cloudshark/cloudshark-1.0.3.180.ebuild
new file mode 100644
index 000000000000..5ca1303bbd5f
--- /dev/null
+++ b/net-analyzer/cloudshark/cloudshark-1.0.3.180.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib
+
+SV="1.0.3-180"
+
+DESCRIPTION="Easily upload your wireshark captures to CloudShark"
+HOMEPAGE="http://appliance.cloudshark.org/plug-ins-wireshark.html"
+SRC_URI="http://appliance.cloudshark.org/plugin/${PN}-plugin-${SV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+PDEPEND="net-analyzer/wireshark:=[lua]
+	net-misc/curl"
+
+S="${WORKDIR}/${PN}-${SV}"
+
+get_PV() {
+	local pv=$(best_version $1)
+	pv=${pv#$1-}; pv=${pv%-r*}
+	pv=${pv//_}; echo ${pv}
+}
+
+src_prepare() {
+	#cloudshark isn't meant to be installed systemwide, we fix that
+	epatch "${FILESDIR}"/cs_log_dir.patch
+
+	sed -i "s#%s/cloudshark_init.lua#/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)/cloudshark_init.lua#" cloudshark.lua
+	#causes errors, looks like it expects windows paths only
+	#echo "CLOUDSHARK_CABUNDLE = /usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)/curl-ca-bundle.crt" >> cloudshark_init.default
+	sed -i "s#%s/curl-ca-bundle.crt#/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)/curl-ca-bundle.crt#" cloudshark.lua
+
+	#stuff to fix cloudshark_init.default to be more sane
+	#sed -i 's#CLOUDSHARK_TSHARK = "n"#CLOUDSHARK_TSHARK = "y"#' cloudshark_init.default (tshark support doesn't seem to work)
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)
+	doins cloudshark.lua json.lua version.lua curl-ca-bundle.crt
+	newins cloudshark_init.default cloudshark_init.lua
+	dodoc CLOUDSHARK_README.txt
+}
diff --git a/net-analyzer/cloudshark/cloudshark-1.0.4.ebuild b/net-analyzer/cloudshark/cloudshark-1.0.4.ebuild
new file mode 100644
index 000000000000..191d0601fc8a
--- /dev/null
+++ b/net-analyzer/cloudshark/cloudshark-1.0.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib
+
+DESCRIPTION="Easily upload your wireshark captures to CloudShark"
+HOMEPAGE="http://appliance.cloudshark.org/plug-ins-wireshark.html"
+SRC_URI="https://github.com/${PN}/wireshark-plugin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+PDEPEND="net-analyzer/wireshark:=[lua]
+	net-misc/curl"
+
+S="${WORKDIR}/wireshark-plugin-${PV}"
+
+get_PV() {
+	local pv=$(best_version $1)
+	pv=${pv#$1-}; pv=${pv%-r*}
+	pv=${pv//_}; echo ${pv}
+}
+
+src_prepare() {
+	#cloudshark isn't meant to be installed systemwide, we fix that
+	epatch "${FILESDIR}"/cs_log_dir.patch
+
+	sed -i "s#%s/cloudshark_init.lua#/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)/cloudshark_init.lua#" cloudshark.lua
+
+	#this enables cloudshark by DEFAULT on tshark, not desired
+	#sed -i 's#CLOUDSHARK_TSHARK = "n"#CLOUDSHARK_TSHARK = "y"#' cloudshark_init.default
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)
+	doins cloudshark.lua json.lua
+	newins cloudshark_init.default cloudshark_init.lua
+	dodoc README.md
+}
diff --git a/net-analyzer/cloudshark/files/cs_log_dir.patch b/net-analyzer/cloudshark/files/cs_log_dir.patch
new file mode 100644
index 000000000000..9b0424e3cd44
--- /dev/null
+++ b/net-analyzer/cloudshark/files/cs_log_dir.patch
@@ -0,0 +1,13 @@
+diff -Naur cloudshark-1.0.2-174-orig/cloudshark.lua cloudshark-1.0.2-174/cloudshark.lua
+--- cloudshark-1.0.2-174-orig/cloudshark.lua	2013-06-03 00:00:46.669223099 -0400
++++ cloudshark-1.0.2-174/cloudshark.lua	2013-06-03 00:01:31.493224300 -0400
+@@ -180,7 +180,8 @@
+ --
+ 
+ function cs_log_dir()
+-   return persconffile_path('plugins/cloudshark')
++   local log_dir = "/tmp"
++   return log_dir
+ end
+ 
+ --
diff --git a/net-analyzer/cloudshark/metadata.xml b/net-analyzer/cloudshark/metadata.xml
new file mode 100644
index 000000000000..bbafcdbcbb95
--- /dev/null
+++ b/net-analyzer/cloudshark/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">cloudshark/wireshark-plugin</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/cnet/Manifest b/net-analyzer/cnet/Manifest
new file mode 100644
index 000000000000..736bc807c8bd
--- /dev/null
+++ b/net-analyzer/cnet/Manifest
@@ -0,0 +1,10 @@
+AUX cnet-3.3.1-gentoo.patch 4936 SHA256 c0d22f1d8466c56af3a2f23b6feedcb207faea43d61c208a048011e4fa459038 SHA512 a0d8e35e998befa7c145ce79e92f8725b6343269a84f8b34a4787cedcf4df8e9f7723c4e44223f556df99892ac0fbd313dcdae1f8e88e2b000cd1eb393fd2753 WHIRLPOOL 5f57d3dc7e887601a7a2c345aa08bb4a75c09c37028d0537b4d645e991f6c0883dfb39479a1f55c2daaf9fcb8d744b810b5343344b1243384d8a67766dbaccfe
+AUX cnet-3.3.1-tcl.patch 350 SHA256 2ec00901cb0fdd8641181f552d206cee61d712b775c0c26f76b32be3380f6aa5 SHA512 c35ef7b83b161d258f75c61466aeccbb0ccfdadb839e6d7b9cd60cb4aaa6a5df9c5eb0a5067ee1e17fb46974b409220a4e5d35d3a490013eb270febdd0405fb1 WHIRLPOOL aca283448eb40e14006925ef5e8f2d1f7f6f981d337fef235cd549abd37700ce3fab6275f27a5bd283d3a69fa7773faedfe850a4764d6de833bc3221acd32523
+AUX cnet-3.3.4-gentoo.patch 4898 SHA256 7357eeb726ae46bde0315c2cdcfc618af72be70f14cab9cec7690325df516ce4 SHA512 58efef31fdb88ed401ba1aa26e8afce506ab77da47207cf2730c2f2efe47efa8dd916578eab34c6c2dc38f499073e14bf16d3c7d03b4412d1fb1fab0eb26614c WHIRLPOOL ff9613b86ef3b43359a4c719f1b55503f9842bbea0a426ddd06b3638fb3d0ffd3a92b453030f4b6afdd48876f38692e60037c42b30c8341b4d059358fac7a24d
+DIST cnet-3.3.1.tgz 2684531 SHA256 244091f3254534850d58675e2826962757f5aed2dc43ed567c520db43664df4e SHA512 9b86a077d48086036fbcfa86ba202b49610e1e1eac55fd3076b24a7ca622a6fc9b34156477bcb25af15d06cf0813f12a7b3f4cb21f1eeb00fd2e010610797ce8 WHIRLPOOL 6af1eab1819572c2b480ceca5b0315fcb5fdd087592945c2c59d34b7fd7b0848eecbcc29c8d11b82c895bd686bcd86f3fcaa68efa3b1da84271e6b68dc2a0543
+DIST cnet-3.3.4.tgz 2687235 SHA256 0d694de4c81c08ef960b21c925f7de81ee56979bb97164311e2a16b41abf00af SHA512 51457541d1023e49bdad4df3502c51d11ea6d62e3e6ae857becfb60229626ba777226b2b42d313d95b982b2790c6b1f80b39e344d9d4bcd4c38ccc31b055d8f9 WHIRLPOOL 23362f4fbd771e9084d67f06ef52942ccc3d0976b089507e2fa95cbd247a18a1f90716fa53ffd4cd4d6c99a3281c4250c2d78268540f682ed72cc96c340e43f9
+EBUILD cnet-3.3.1.ebuild 978 SHA256 9fb202a56d49c7077b4f812c2b19eccf4aacdc52455e2e0970f54d9f103ba9a8 SHA512 0516c7eee23318d2cb48b04f51d4a3d5c1a378528662714bbeb4608921bb562b3d6093df3ee9e80f2547a00784c8b38c305c654b92828241eff5c9e1d16f04a9 WHIRLPOOL f4879129bd0938a17923bd6955a0821b86ea615c347a29ff5f273e972d133888f1c0f2a24bb37f614b60268f9f08cf75c37b05be2cf50c7d72fb329ae4d2284a
+EBUILD cnet-3.3.4.ebuild 943 SHA256 5ab495165eeb7cb6a7d2e2909eca0fc0f61edc47e5a47a6320abada068ae3443 SHA512 05970fb9f411146ca58497a4b9db53706a1b4fd801c51b08851993d3357991b0d3620719974a93fb8edcd183e21e23a1e40d8cc0917cd2f66cddb640e1b545ee WHIRLPOOL 47a9abedc19bab0a836ae3f912544360f119f8f35fb750049f50b329ce94e696a99d3a27a9c4bce86fe6f5b143aa078b39e4c10db5fc7eaa53c19f5dc2f2c3ed
+MISC ChangeLog 2483 SHA256 b6dfec01e131a72b95dd9b6a3a67228e62b4f7d19c5cd69afb8112d6f92dcee2 SHA512 d8e524dc7a7284b1c33d8c28ead47114cbbd105697a97ce5943b9bd719491b7ce19abd78f79dcd70f7f995c7829f71c80cf20af343d75fe7088f4ef25e7724a4 WHIRLPOOL 7e4e82c44b1bc0c0e71a1928cd4a655a4651c2263cb270f01c933a6ac9b5023213f06d083587ed3127d1005ca9ec6f595ec6de53df737708f8a8b8ef12ab23e5
+MISC ChangeLog-2015 3452 SHA256 d0a64def2d653c60abe3ba2a75c6627c08a8588ee0177507a7bc839f8f84fa52 SHA512 5166cbfb5bfa776623fd836840a568bedb3f87e5b0d013dbcaaace8efaf32022ef577616cf98b6876975051bb6f8a952d8269d8de80e6f72180d95c6b1bd6c81 WHIRLPOOL 3a931a0266ff929580374cd1ddb34c0f4cfb0a784a137f0a74ae7b0168493fa71f3c4d9010f2025fda1ab93d7dbfe2d241b950e0a171b292f6c1d28223c9b6a6
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/cnet/cnet-3.3.1.ebuild b/net-analyzer/cnet/cnet-3.3.1.ebuild
new file mode 100644
index 000000000000..3bde2f1eb731
--- /dev/null
+++ b/net-analyzer/cnet/cnet-3.3.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Network simulation tool"
+HOMEPAGE="http://www.csse.uwa.edu.au/cnet3/"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-lang/tk-8.5
+	dev-libs/elfutils
+	x11-libs/libX11
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-3.3.1-gentoo.patch \
+		"${FILESDIR}"/${PN}-3.3.1-tcl.patch
+
+	# Set libdir properly
+	sed -i -e "/CNETPATH/s:local/lib:$(get_libdir):" src/preferences.h || die
+	sed -i -e "/^LIBDIR/s:lib:$(get_libdir):" Makefile || die
+
+	epatch_user
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ANNOUNCE
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${P}/examples
+	fi
+}
diff --git a/net-analyzer/cnet/cnet-3.3.4.ebuild b/net-analyzer/cnet/cnet-3.3.4.ebuild
new file mode 100644
index 000000000000..d0f7d21a3314
--- /dev/null
+++ b/net-analyzer/cnet/cnet-3.3.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Network simulation tool"
+HOMEPAGE="http://www.csse.uwa.edu.au/cnet3/"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-lang/tk-8.5
+	dev-libs/elfutils
+	x11-libs/libX11
+"
+DEPEND="
+	${RDEPEND}
+"
+
+DOCS=(
+	1st.README
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.4-gentoo.patch
+	"${FILESDIR}"/${PN}-3.3.1-tcl.patch
+)
+
+src_prepare() {
+	# Set libdir properly
+	sed -i -e "/CNETPATH/s:local/lib:$(get_libdir):" src/preferences.h || die
+	sed -i -e "/^LIBDIR/s:lib:$(get_libdir):" Makefile || die
+
+	default
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		C99="$(tc-getCC) -std=c99" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)"
+}
+
+src_install() {
+	default
+
+	if use examples; then
+		dodoc -r examples
+	fi
+}
diff --git a/net-analyzer/cnet/files/cnet-3.3.1-gentoo.patch b/net-analyzer/cnet/files/cnet-3.3.1-gentoo.patch
new file mode 100644
index 000000000000..9754fb4ebf84
--- /dev/null
+++ b/net-analyzer/cnet/files/cnet-3.3.1-gentoo.patch
@@ -0,0 +1,163 @@
+--- a/Makefile
++++ b/Makefile
+@@ -6,7 +6,7 @@
+ # Comment/uncomment the following 4 constants to suit your system:
+ #
+ # PREFIX defines the directory below which cnet will be installed.
+-PREFIX		= /usr/local
++PREFIX		= /usr
+ #PREFIX		= $(HOME)
+ #
+ # BINDIR defines the directory where the cnet binary will be installed.
+@@ -16,26 +16,24 @@
+ LIBDIR		= $(PREFIX)/lib64/cnet
+ #
+ # WWWDIR defines the directory to hold cnet's web-based documentation
+-WWWDIR		= /home/httpd/html/cnet
++#WWWDIR		= /home/httpd/html/cnet
+ #WWWDIR		= $(HOME)/WWW/cnet
+ #
+ # ---------------------------------------------------------------------
+ #
+ it:
+-	make -C src
+-	make -C support
++	$(MAKE) -C src
++	$(MAKE) -C support
+ 	@ls -l bin/$(NAME) lib/*.a
+ 
+ install:
+-	make
+-	@mkdir -p  $(BINDIR) $(LIBDIR)
+-	@chmod 755 $(BINDIR) $(LIBDIR)
+-	@cp bin/$(NAME) $(BINDIR)/$(NAME)
+-	@chmod 755 $(BINDIR)/$(NAME)
+-	@rm -rf $(LIBDIR)/*
+-	@cp lib/* $(LIBDIR)
+-	@chmod 644 $(LIBDIR)/*
+-	@ls -l $(BINDIR)/$(NAME) $(LIBDIR)/*.a
++	@mkdir -p  $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR)
++	@chmod 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR)
++	@cp bin/$(NAME) $(DESTDIR)$(BINDIR)/$(NAME)
++	@chmod 755 $(DESTDIR)$(BINDIR)/$(NAME)
++	@rm -rf $(DESTDIR)$(LIBDIR)/*
++	@cp lib/* $(DESTDIR)$(LIBDIR)
++	@chmod 644 $(DESTDIR)$(LIBDIR)/*
+ 
+ AND	= html/CLICK html/KEYBOARD html/STOPANDWAIT html/TICKTOCK
+ www:
+--- a/src/Makefile.linux
++++ b/src/Makefile.linux
+@@ -5,7 +5,7 @@
+ #	binutils 2.5.2, and
+ #	libelf (0.6.4 onwards)
+ #
+-WARNINGS =	-Wall -Werror -Wshadow -Wpointer-arith -Wcast-qual \
++WARNINGS =	-Wall -Wshadow -Wpointer-arith -Wcast-qual \
+ 		-Wcast-align -Wwrite-strings -Wconversion \
+ 		-Wstrict-prototypes -Wredundant-decls -Winline \
+ 		-Wcomments -Wtrigraphs -Wimport -Wundef
+@@ -20,8 +20,8 @@
+ XINCLUDES	= -I/usr/include/tcl8.5
+ XLIBS		= -ltcl8.5 -ltk8.5 -lX11
+ #
+-C99		= gcc -std=c99 -Wall -Werror -pedantic
+-CFLAGS		= -O3 -fPIC $(INCLUDES) $(XINCLUDES)
++C99		= $(CC) -std=c99 -Wall -pedantic
++CFLAGS		+= -fPIC $(INCLUDES) $(XINCLUDES)
+ #
+ LD		= gcc -rdynamic
+ LIBDIRS		= $(XLIBDIRS)
+--- a/support/Makefile
++++ b/support/Makefile
+@@ -7,21 +7,21 @@
+ 
+ it:
+ 	@if uname -s -r | grep -q "Linux" ; then \
+-		make -f Makefile.linux ; fi
++		$(MAKE) -f Makefile.linux ; fi
+ 	@if uname -s -r | grep -q "Darwin" ; then \
+-		make -f Makefile.macosx ; fi
++		$(MAKE) -f Makefile.macosx ; fi
+ 	@if uname -s -r | grep -q "SunOS 4" ; then \
+-		make -f Makefile.sunos ; fi
++		$(MAKE) -f Makefile.sunos ; fi
+ 	@if uname -s -r | grep -q "SunOS 5" ; then \
+-		make -f Makefile.solaris ; fi
++		$(MAKE) -f Makefile.solaris ; fi
+ 	@if uname -s -r | grep -q "OSF1" ; then \
+-		make -f Makefile.osf1 ; fi
++		$(MAKE) -f Makefile.osf1 ; fi
+ 	@if uname -s -r | grep -q "IRIX" ; then \
+-		make -f Makefile.irix5 ; fi
++		$(MAKE) -f Makefile.irix5 ; fi
+ 	@if uname -s -r | grep -q "FreeBSD" ; then \
+-		make -f Makefile.freebsd ; fi
++		$(MAKE) -f Makefile.freebsd ; fi
+ 	@if uname -s -r | grep -q "NetBSD" ; then \
+-		make -f Makefile.netbsd ; fi
++		$(MAKE) -f Makefile.netbsd ; fi
+ 	@cp -p cnetsupport.h ../lib
+ 
+ # ---------------------------------------------------------------------
+--- a/support/Makefile.common
++++ b/support/Makefile.common
+@@ -1,13 +1,13 @@
+ #
+-CC		= gcc
+-CFLAGS		= -std=c99 -pedantic -Wall -Werror -O3 -fPIC
++#CC		= gcc
++CFLAGS		+= -std=c99 -pedantic -Wall -fPIC
+ 
+ DOTH		= cnetsupport.h
+ OBJ		= hashtable.o haversine.o lexical.o md5.o queue.o vector.o
+ 
+ $(NAME):	$(OBJ)
+-		ar rc $(NAME) $(OBJ)
+-		ranlib $(NAME)
++		$(AR) rc $(NAME) $(OBJ)
++		$(RANLIB) $(NAME)
+ 		@cp -p $(NAME) ../lib
+ 
+ %.o : %.c $(DOTH)
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -8,21 +8,21 @@
+ 
+ it:
+ 	@if uname -s -r | grep -q "Linux" ; then \
+-		make -f Makefile.linux $(NAME) ; fi
++		$(MAKE) -f Makefile.linux $(NAME) ; fi
+ 	@if uname -s -r | grep -q "Darwin" ; then \
+-		make -f Makefile.macosx $(NAME) ; fi
++		$(MAKE) -f Makefile.macosx $(NAME) ; fi
+ 	@if uname -s -r | grep -q "SunOS 4" ; then \
+-		make -f Makefile.sunos $(NAME) ; fi
++		$(MAKE) -f Makefile.sunos $(NAME) ; fi
+ 	@if uname -s -r | grep -q "SunOS 5" ; then \
+-		make -f Makefile.solaris $(NAME) ; fi
++		$(MAKE) -f Makefile.solaris $(NAME) ; fi
+ 	@if uname -s -r | grep -q "OSF1" ; then \
+-		make -f Makefile.osf1 $(NAME) ; fi
++		$(MAKE) -f Makefile.osf1 $(NAME) ; fi
+ 	@if uname -s -r | grep -q "IRIX" ; then \
+-		make -f Makefile.irix5 $(NAME) ; fi
++		$(MAKE) -f Makefile.irix5 $(NAME) ; fi
+ 	@if uname -s -r | grep -q "FreeBSD" ; then \
+-		make -f Makefile.freebsd $(NAME) ; fi
++		$(MAKE) -f Makefile.freebsd $(NAME) ; fi
+ 	@if uname -s -r | grep -q "NetBSD" ; then \
+-		make -f Makefile.netbsd $(NAME) ; fi
++		$(MAKE) -f Makefile.netbsd $(NAME) ; fi
+ 	@cp -p $(NAME) ../bin
+ 	@cp -p cnet.h  ../lib
+ 
+@@ -33,7 +33,7 @@
+ 	@rm -rf HTML GPATH GRTAGS GSYMS GTAGS
+ 
+ hide:
+-	make clean
++	$(MAKE) clean
+ 	echo '#if	HIDE_GLOBAL_NAMES'		 > hidenames.h
+ 	sort < HIDENAMES | \
+ 	awk '{ if($$0 !~ /#/) printf("#define\t%-36s\t__CN%03d\n", $$0,++n);}'\
diff --git a/net-analyzer/cnet/files/cnet-3.3.1-tcl.patch b/net-analyzer/cnet/files/cnet-3.3.1-tcl.patch
new file mode 100644
index 000000000000..4c30673f2e67
--- /dev/null
+++ b/net-analyzer/cnet/files/cnet-3.3.1-tcl.patch
@@ -0,0 +1,13 @@
+--- a/src/Makefile.linux
++++ b/src/Makefile.linux
+@@ -17,8 +17,8 @@
+ #XLIBS		= -ltcl -ltk -lX11
+ #
+ # or you may need something like:
+-XINCLUDES	= -I/usr/include/tcl8.5
+-XLIBS		= -ltcl8.5 -ltk8.5 -lX11
++#XINCLUDES	= -I/usr/include/tcl8.5
++XLIBS		= -ltcl -ltk -lX11
+ #
+ C99		= $(CC) -std=c99 -Wall -pedantic
+ CFLAGS		+= -fPIC $(INCLUDES) $(XINCLUDES)
diff --git a/net-analyzer/cnet/files/cnet-3.3.4-gentoo.patch b/net-analyzer/cnet/files/cnet-3.3.4-gentoo.patch
new file mode 100644
index 000000000000..b68b6d1bc51d
--- /dev/null
+++ b/net-analyzer/cnet/files/cnet-3.3.4-gentoo.patch
@@ -0,0 +1,161 @@
+--- a/Makefile
++++ b/Makefile
+@@ -6,7 +6,7 @@
+ # Comment/uncomment the following 4 constants to suit your system:
+ #
+ # PREFIX defines the directory below which cnet will be installed.
+-PREFIX		= /usr/local
++PREFIX		= /usr
+ #PREFIX		= $(HOME)
+ #
+ # BINDIR defines the directory where the cnet binary will be installed.
+@@ -16,26 +16,24 @@
+ LIBDIR		= $(PREFIX)/lib64/cnet
+ #
+ # WWWDIR defines the directory to hold cnet's web-based documentation
+-WWWDIR		= /home/httpd/html/cnet
++#WWWDIR		= /home/httpd/html/cnet
+ #WWWDIR		= $(HOME)/WWW/cnet
+ #
+ # ---------------------------------------------------------------------
+ #
+ it:
+-	make -C src
+-	make -C support
++	$(MAKE) -C src
++	$(MAKE) -C support
+ 	@ls -l bin/$(NAME) lib/*.a
+ 
+ install:
+-	make
+-	@mkdir -p  $(BINDIR) $(LIBDIR)
+-	@chmod 755 $(BINDIR) $(LIBDIR)
+-	@cp bin/$(NAME) $(BINDIR)/$(NAME)
+-	@chmod 755 $(BINDIR)/$(NAME)
+-	@rm -rf $(LIBDIR)/*
+-	@cp lib/* $(LIBDIR)
+-	@chmod 644 $(LIBDIR)/*
+-	@ls -l $(BINDIR)/$(NAME) $(LIBDIR)/*.a
++	@mkdir -p  $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR)
++	@chmod 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR)
++	@cp bin/$(NAME) $(DESTDIR)$(BINDIR)/$(NAME)
++	@chmod 755 $(DESTDIR)$(BINDIR)/$(NAME)
++	@rm -rf $(DESTDIR)$(LIBDIR)/*
++	@cp lib/* $(DESTDIR)$(LIBDIR)
++	@chmod 644 $(DESTDIR)$(LIBDIR)/*
+ 
+ AND	= html/CLICK html/KEYBOARD html/STOPANDWAIT html/TICKTOCK
+ www:
+--- a/src/Makefile.linux
++++ b/src/Makefile.linux
+@@ -5,7 +5,7 @@
+ #	binutils 2.5.2, and
+ #	libelf (0.6.4 onwards)
+ #
+-WARNINGS =	-Wall -Werror -Wshadow -Wpointer-arith -Wcast-qual \
++WARNINGS =	-Wall -Wshadow -Wpointer-arith -Wcast-qual \
+ 		-Wcast-align -Wwrite-strings -Wconversion \
+ 		-Wstrict-prototypes -Wredundant-decls -Winline \
+ 		-Wcomments -Wtrigraphs -Wimport -Wundef
+@@ -20,8 +20,8 @@
+ XINCLUDES	= -I/usr/include/tcl8.5
+ XLIBS		= -ltcl8.5 -ltk8.5 -lX11
+ #
+-C99		= gcc -std=c99 -Wall -Werror -pedantic
+-CFLAGS		= -O3 -fPIC $(INCLUDES) $(XINCLUDES)
++C99		= $(CC) -std=c99 -Wall -pedantic
++CFLAGS		+= -fPIC $(INCLUDES) $(XINCLUDES)
+ #
+ LD		= gcc -rdynamic
+ LIBDIRS		= $(XLIBDIRS)
+--- a/support/Makefile
++++ b/support/Makefile
+@@ -7,21 +7,21 @@
+ 
+ it:
+ 	@if uname -s -r | grep -q "Linux" ; then \
+-		make -f Makefile.linux ; fi
++		$(MAKE) -f Makefile.linux ; fi
+ 	@if uname -s -r | grep -q "Darwin" ; then \
+-		make -f Makefile.macosx ; fi
++		$(MAKE) -f Makefile.macosx ; fi
+ 	@if uname -s -r | grep -q "SunOS 4" ; then \
+-		make -f Makefile.sunos ; fi
++		$(MAKE) -f Makefile.sunos ; fi
+ 	@if uname -s -r | grep -q "SunOS 5" ; then \
+-		make -f Makefile.solaris ; fi
++		$(MAKE) -f Makefile.solaris ; fi
+ 	@if uname -s -r | grep -q "OSF1" ; then \
+-		make -f Makefile.osf1 ; fi
++		$(MAKE) -f Makefile.osf1 ; fi
+ 	@if uname -s -r | grep -q "IRIX" ; then \
+-		make -f Makefile.irix5 ; fi
++		$(MAKE) -f Makefile.irix5 ; fi
+ 	@if uname -s -r | grep -q "FreeBSD" ; then \
+-		make -f Makefile.freebsd ; fi
++		$(MAKE) -f Makefile.freebsd ; fi
+ 	@if uname -s -r | grep -q "NetBSD" ; then \
+-		make -f Makefile.netbsd ; fi
++		$(MAKE) -f Makefile.netbsd ; fi
+ 	@cp -p cnetsupport.h ../lib
+ 
+ # ---------------------------------------------------------------------
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -8,21 +8,21 @@
+ 
+ it:
+ 	@if uname -s -r | grep -q "Linux" ; then \
+-		make -f Makefile.linux $(NAME) ; fi
++		$(MAKE) -f Makefile.linux $(NAME) ; fi
+ 	@if uname -s -r | grep -q "Darwin" ; then \
+-		make -f Makefile.macosx $(NAME) ; fi
++		$(MAKE) -f Makefile.macosx $(NAME) ; fi
+ 	@if uname -s -r | grep -q "SunOS 4" ; then \
+-		make -f Makefile.sunos $(NAME) ; fi
++		$(MAKE) -f Makefile.sunos $(NAME) ; fi
+ 	@if uname -s -r | grep -q "SunOS 5" ; then \
+-		make -f Makefile.solaris $(NAME) ; fi
++		$(MAKE) -f Makefile.solaris $(NAME) ; fi
+ 	@if uname -s -r | grep -q "OSF1" ; then \
+-		make -f Makefile.osf1 $(NAME) ; fi
++		$(MAKE) -f Makefile.osf1 $(NAME) ; fi
+ 	@if uname -s -r | grep -q "IRIX" ; then \
+-		make -f Makefile.irix5 $(NAME) ; fi
++		$(MAKE) -f Makefile.irix5 $(NAME) ; fi
+ 	@if uname -s -r | grep -q "FreeBSD" ; then \
+-		make -f Makefile.freebsd $(NAME) ; fi
++		$(MAKE) -f Makefile.freebsd $(NAME) ; fi
+ 	@if uname -s -r | grep -q "NetBSD" ; then \
+-		make -f Makefile.netbsd $(NAME) ; fi
++		$(MAKE) -f Makefile.netbsd $(NAME) ; fi
+ 	@cp -p $(NAME) ../bin
+ 	@cp -p cnet.h  ../lib
+ 
+@@ -33,7 +33,7 @@
+ 	@rm -rf HTML GPATH GRTAGS GSYMS GTAGS
+ 
+ hide:
+-	make clean
++	$(MAKE) clean
+ 	echo '#if	HIDE_GLOBAL_NAMES'		 > hidenames.h
+ 	sort < HIDENAMES | \
+ 	awk '{ if($$0 !~ /#/) printf("#define\t%-36s\t__CN%03d\n", $$0,++n);}'\
+--- a/support/Makefile.common
++++ b/support/Makefile.common
+@@ -1,13 +1,12 @@
+ #
+-C99		= gcc -std=c99 -Wall -Werror -pedantic -O3 -fPIC
+ 
+ DOTH		= cnetsupport.h
+ OBJ		= hashtable.o haversine.o lexical.o md5.o queue.o vector.o
+ 
+ $(NAME):	$(OBJ)
+ 		@echo linking $(NAME)
+-		@ar rc $(NAME) $(OBJ)
+-		@ranlib $(NAME)
++		$(AR) rc $(NAME) $(OBJ)
++		$(RANLIB) $(NAME)
+ 		@cp -p $(NAME) ../lib
+ 
+ %.o : %.c $(DOTH)
diff --git a/net-analyzer/cnet/metadata.xml b/net-analyzer/cnet/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/cnet/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/cryptcat/Manifest b/net-analyzer/cryptcat/Manifest
new file mode 100644
index 000000000000..ed804ded3a3a
--- /dev/null
+++ b/net-analyzer/cryptcat/Manifest
@@ -0,0 +1,8 @@
+AUX cryptcat-1.2.1-build.patch 1092 SHA256 81def1e5b3d232a263cfe6e08fae45858ee4d6c2a8f8aebd9134649ff8b69aa0 SHA512 2c591122844c76fd43b18468b11e268315c9173431eab1bc992bba3e175387aed38ad4d4135aeabe261d2625bacf2ba8061dd57c43b1bfe945cf93be43f5284a WHIRLPOOL 48b5c4833c4c047619b4ad65cf9790cdcc174ff4583b1fda82f39c5cc4575618da9ce653fa7869c2cdfcbbdd6cfd1911d5c163468bc92622eacd657eaf85991e
+AUX cryptcat-1.2.1-misc.patch 1596 SHA256 f1fff1dfdac02014122b40278321a93b02bcab9bacc1663ac374db4ebaa8b642 SHA512 e0a71361d5e8033f221402661310dfad18c9c040e78920db8376388dc41cb8d7e4bb0127b2575634628be80be8e604e089b41e729ae30ec983f9a17f38239a6b WHIRLPOOL 2fbda98ab553d75481f3e7326f08e10044832e63805359eb0547c85350cf247c0c49ad6e9c6bc125c9698a922319c421368d9b65e27bbb2af397e584e25bdbd5
+DIST cryptcat-unix-1.2.1.tar 190464 SHA256 5dc9a9c2beac3d9658cc3e082c00f1127981a2f995b4ec485f281bf1800840d0 SHA512 2de6521903e489bc6d4f242aaac7f35a3a7fb226e1812ef5f1c3554420fce4378427e94b3e90eca5476d1068f1a9b44d9c5dbd0362888ad893cf66be106deb17 WHIRLPOOL e88ad1c16d21eae9221d88e1b80e81570fd44c60856b279c5522d255dce4795b2880e91506ab767e327965481718c8766a148f8e5924902068c3f641576846e1
+EBUILD cryptcat-1.2.1-r1.ebuild 766 SHA256 13cad8efa84758795bcb355489a13ffbe2626cf5308d20961455ff1b975f2c93 SHA512 4cdc55268e5b7ff347fbb374a0931f882ae5277b26948685b1d83ccdac5680b8ec30d00f34e8aa04c28634c290527f6ef6d9eb2b43d601cb72771a52b6ee5fe8 WHIRLPOOL 181a7b9caf1fbed1493631bf7f47af5e47a862d41e1603452c50761b6ec9b001d1d3f786b8747287bee7ab246e21278766dd68f228611da3b72f8328ccdb2f98
+EBUILD cryptcat-1.2.1-r2.ebuild 605 SHA256 3fbcac2ef97462c1d057b7b6a7bfd97583e90651396a9fc0b01a8e67b4a0b6e0 SHA512 8b27ee24e02e8c30de8bcdccc0edd1775d11c5f5b37a4b5d97c2688dc1ab49fa21d10d23c84cc6e071f37da8e279bf1189a0fca0b4b46f7f2b88e29caeb5f3a2 WHIRLPOOL e7802daa61ede7ebfa3ede9fb3fd50db7e6c79218ac18dd25f60e572385a2b33f05caa6c10d19910dff0df499ab7903c2608b1cefa10e994ec37d2236464ed15
+MISC ChangeLog 2573 SHA256 7d3ef82833d328d69ac4fb83f59934981cb564d6a825a446770e6bfe20030e1b SHA512 375697b6b25b619fd818b9be21833940524006ad627a9affdee9d4cca128bcc1550c2a37c26b2bd43fb4deaa34a6ea923070a735fa2dff3d3081164f37c240ab WHIRLPOOL 436ac524826e8598611fb6da575acbc549eee356cb53b37bf09bb0714b67d77e5ebe748f1f640de23224bb60d673270f7b6a66956160d32ecddcefa6563e89ad
+MISC ChangeLog-2015 2772 SHA256 c5aff5156bc80f8117c1400fc9dbf62258b1d95a3a13350d20818f0d3cd1384d SHA512 376fee8dc8d548d29453898128adcf0869e6178d1e1f6b5611527f263915b4688ecf3199111b5424c8c5d6a8194bba7d69bf3856aba6b87551b1319ea47545a7 WHIRLPOOL 03ebc1979f023039ebca438dccc5f1334d772573e4b36a2c78dfe0d734a9274d5093a42dc0469b2e15444e03df59bd367e86487cb1bf2f203972520db9cc9db7
+MISC metadata.xml 358 SHA256 7a009ec8cae85f970d07c9370e66f2682481b808be07bbe5cedbcd4cbf9f30fb SHA512 0deed41b2d8d5f038f7d61622230e5db913303a5419790127e300c65aa6603b79f0c1ce7adcd560550a0cdef577b360da9c53ba1569c141d850c7f92b607c8f4 WHIRLPOOL 0977036da15900b4256d9a2d2ad5b180449f97008ab68dd38f7954624d77c7e08c7d0b3bf435907e684e79b1fc5e9517a518074266c83ad180ed413625417c9d
diff --git a/net-analyzer/cryptcat/cryptcat-1.2.1-r1.ebuild b/net-analyzer/cryptcat/cryptcat-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..b53c88f3c22f
--- /dev/null
+++ b/net-analyzer/cryptcat/cryptcat-1.2.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+DESCRIPTION="netcat clone extended with twofish encryption"
+HOMEPAGE="http://farm9.org/Cryptcat/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-unix-${PV}.tar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+S=${WORKDIR}/unix
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+	echo "#define arm arm_timer" >> generic.h
+	sed -i \
+		-e 's:#define HAVE_BIND:#undef HAVE_BIND:' \
+		-e '/^#define FD_SETSIZE 16/s:16:1024:' \
+		-e 's:\<LINUX\>:__linux__:' \
+		netcat.c generic.h
+	tc-export CC CXX
+}
+
+src_install() {
+	dobin cryptcat
+	dodoc Changelog README README.cryptcat netcat.blurb
+}
diff --git a/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild b/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild
new file mode 100644
index 000000000000..0c94c1940d9e
--- /dev/null
+++ b/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="netcat clone extended with twofish encryption"
+HOMEPAGE="http://cryptcat.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-unix-${PV}.tar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+
+S=${WORKDIR}/unix
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${P}-misc.patch
+	tc-export CC CXX
+}
+
+src_install() {
+	dobin cryptcat
+	dodoc Changelog README README.cryptcat netcat.blurb
+}
diff --git a/net-analyzer/cryptcat/files/cryptcat-1.2.1-build.patch b/net-analyzer/cryptcat/files/cryptcat-1.2.1-build.patch
new file mode 100644
index 000000000000..17ec33489c89
--- /dev/null
+++ b/net-analyzer/cryptcat/files/cryptcat-1.2.1-build.patch
@@ -0,0 +1,43 @@
+--- a/unix/Makefile
++++ b/unix/Makefile
+@@ -10,16 +10,14 @@
+ # debugging
+ # DFLAGS = -DTEST -DDEBUG
+ DFLAGS = -DGAPING_SECURITY_HOLE
+-CFLAGS = -O
++CFLAGS ?= -O
+ XFLAGS = 	# xtra cflags, set by systype targets
+ XLIBS =		# xtra libs if necessary?
+ # -Bstatic for sunos,  -static for gcc, etc.  You want this, trust me.
+ STATIC =
+-CC = cc $(CFLAGS)
+-LD = $(CC) -s	# linker; defaults to stripped executables
+ o = o		# object extension
+ 
+-ALL = cryptcat
++all: cryptcat
+ 
+ ### BOGON-CATCHERS
+ 
+@@ -28,8 +26,8 @@
+ 
+ ### HARD TARGETS
+ 
+-cryptcat:	netcat.c farm9crypt.o twofish2.o
+-	$(LD) $(DFLAGS) $(XFLAGS) $(STATIC) -o cryptcat netcat.c farm9crypt.o twofish2.o $(XLIBS)
++cryptcat:	netcat.o farm9crypt.o twofish2.o
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
+ 
+ nc-dos:
+ 	@echo "DOS?!  Maybe someday, but not now"
+@@ -115,10 +112,8 @@
+ 	make -e $(ALL) $(MFLAGS) XFLAGS='-DNEXT' STATIC=-Bstatic
+ 
+ farm9crypt.o: farm9crypt.cc farm9crypt.h
+-		${CC} -c farm9crypt.cc
+ 
+ twofish2.o: twofish2.cc twofish2.h
+-		${CC} -c twofish2.cc
+ 
+ # start with this for a new architecture, and see what breaks.
+ generic:
diff --git a/net-analyzer/cryptcat/files/cryptcat-1.2.1-misc.patch b/net-analyzer/cryptcat/files/cryptcat-1.2.1-misc.patch
new file mode 100644
index 000000000000..8a2f9394b4a6
--- /dev/null
+++ b/net-analyzer/cryptcat/files/cryptcat-1.2.1-misc.patch
@@ -0,0 +1,48 @@
+--- a/netcat.c
++++ b/netcat.c
+@@ -39,7 +39,7 @@
+ /* conditional includes -- a very messy section which you may have to dink
+    for your own architecture [and please send diffs...]: */
+ /* #undef _POSIX_SOURCE		/* might need this for something? */
+-#define HAVE_BIND		/* ASSUMPTION -- seems to work everywhere! */
++#undef HAVE_BIND		/* ASSUMPTION -- seems to work everywhere! */
+ #define HAVE_HELP		/* undefine if you dont want the help text */
+ /* #define ANAL			/* if you want case-sensitive DNS matching */
+ 
+@@ -56,7 +56,7 @@
+ #ifdef FD_SETSIZE		/* should be in types.h, butcha never know. */
+ #undef FD_SETSIZE		/* if we ever need more than 16 active */
+ #endif				/* fd's, something is horribly wrong! */
+-#define FD_SETSIZE 16		/* <-- this'll give us a long anyways, wtf */
++#define FD_SETSIZE 1024		/* <-- this'll give us a long anyways, wtf */
+ #include <sys/types.h>		/* *now* do it.  Sigh, this is broken */
+ 
+ #ifdef HAVE_RANDOM		/* aficionados of ?rand48() should realize */
+@@ -81,8 +81,10 @@
+ #include <errno.h>
+ #include <signal.h>
+ #include <fcntl.h>		/* O_WRONLY et al */
++#include <unistd.h>		/* alarm() close() sleep() */
++#include <time.h>		/* time() */
+ 
+-#ifdef LINUX
++#ifdef __linux__
+ #include <resolv.h>
+ #endif
+ 
+--- a/generic.h
++++ b/generic.h
+@@ -274,7 +274,7 @@
+ 
+ /* linux, which is trying as desperately as the gnu folks can to be
+    POSIXLY_CORRECT.  I think I'm gonna hurl... */
+-#ifdef LINUX
++#ifdef __linux__
+ #undef UTMPX
+ #undef HAVE_SYSINFO
+ #undef HAVE_SELECT_H
+@@ -373,3 +373,4 @@
+ /* ================ */
+ #endif /* GENERIC_H */
+ 
++#define arm arm_timer
diff --git a/net-analyzer/cryptcat/metadata.xml b/net-analyzer/cryptcat/metadata.xml
new file mode 100644
index 000000000000..12086277ff16
--- /dev/null
+++ b/net-analyzer/cryptcat/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">cryptcat</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/cutter/Manifest b/net-analyzer/cutter/Manifest
new file mode 100644
index 000000000000..765019647b02
--- /dev/null
+++ b/net-analyzer/cutter/Manifest
@@ -0,0 +1,8 @@
+AUX cutter-1.03-debian.patch 5160 SHA256 48fe2cb815b9c26f7307b001f4d213d899573a91567dee40f37d4a4be139acda SHA512 05eb0c5819687bbc6de4f4467013bae16b5faf470da062a847fe74cb0abf27fadf62dcf76760f43096db446a11f1b40107dd94c6003e24b50d5a3150a87327b6 WHIRLPOOL 2c4159d1fb7ca324c7c3c43e82153cbf4ce88334fe6252d65cec94d77866df0d649edd365d204b59fcfe0fe2e6c1b02c8c473ab92d2b4653c58ff3e15de0be6f
+DIST cutter-1.03.tgz 13176 SHA256 4df4fac7c2208afafb279abb443005bf77d3dcf01af05fe1f2898213b9109615 SHA512 821e8abf496e22b86bdd855fb1c9c51648a276ebb572edd2ccb172ae7025a38794df37dfe153c1807785ecec279c34b9df5e2bcc2de582b3a88ee3776cf46eea WHIRLPOOL f66ef5df14f51656505949596f6e98f8fc48c85bb200d2b54be3a71e165900e14b7c4ca1f25242fe7592054f6d5b358db13f714cf000c7e70a626961f906d425
+DIST cutter-1.04.tgz 13680 SHA256 1b336c69eb3393f6ca118a529773014c41126ac6dabd04b77151daa1c2f01180 SHA512 79c17ec8c17e696a79aa8b11fda347f2e6929eb35f9a37da450acf6aff7ab9471e13eaef24708f90f3f0c2791fade2eb944443b98df3d3ae4eef0c408abc7b3a WHIRLPOOL 6efab2b2af413600c7ff0f8d998860d635248ab81a584a5a769a723d4c5e3558d463a40d1ff2a10cd4b2344af5e8e11ab676ca866bee3efd10ebe4c2c7fe2a29
+EBUILD cutter-1.03-r1.ebuild 640 SHA256 17b3e63a0df1ac3f4fbc51b85658e8ecac1fef88c8f83d41eb1e3410dcb3577e SHA512 852a2a7eaf494ab58a29226aaf592626b0cca232583dff4995699a8ea3ad8aab074a5908da58ab0277f7647a70cf749d7712dd6bf2f5e0e65178a9833428ceca WHIRLPOOL e82362c0b839e23cbf6ab5e4591ecf2015061c671abe6588937c6b74f26b7a270fed85b906ff42a06919fde6e1826d4cdd7aac248fbbfa387ee0caf5f7f12708
+EBUILD cutter-1.04.ebuild 648 SHA256 b12a842b4a0bd1a1623a2550ff757fbe46340b653ff489e4cd423ca81d041932 SHA512 bcde52fb15a880c4f80fd2b2d8e6c5ae4a077681733d44fb98d026cecce257e665cc53810ff3d23c5591f985ae6713e5bde77cd7a5d09f053ab137557c8ae985 WHIRLPOOL 8a68fc650924c1f7fd2e773625a4c4ed0b0aa2cb5005764baa11088d7fda6e5f17c3e6ee846b5d6d3824678563d90a436ee57ce2115c0c2a97856d1be3cb9a57
+MISC ChangeLog 2513 SHA256 77c7dd1465174e67812e0d1fc38abc2c19bdfd6d8b185c4bb7b551621a99abe5 SHA512 329ceeaa1975e879670f6d327eb80e008cf5f60b16dcbe34dc0dcdeabbaebb33f123a7be81da55cf42a57e3cb4d253f82ba766663fd4072753001ab048fcf6df WHIRLPOOL c32e92cdc6398ca16752890a82609d1c99928c92c0021437f485676221d67a367d353df5e0cc11c8b042fdfb2537727f5c98a44aac5fa0f220b07233bb4060cc
+MISC ChangeLog-2015 1963 SHA256 3067a076b586dab413a436ede21f3801ed79f0a7eab4a2a56f460a809d5499ef SHA512 a00707c3826413c88b8adb43e86f712e36a98e8d62394761ce5472bb704e9824c460bac9ec524623d35dcf2f07efda2b3f2e7a162cf18a3d3b8d03a1b70b0187 WHIRLPOOL fc0d921141df7e380f112e5e29fd4cdd0cafebdc64a95600facb089dbe75f0d208c7cca45d0426626ef8f54a53a7e6d246e72b27d9738bfaa6039c95d0423c13
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/cutter/cutter-1.03-r1.ebuild b/net-analyzer/cutter/cutter-1.03-r1.ebuild
new file mode 100644
index 000000000000..7e3806ff08d3
--- /dev/null
+++ b/net-analyzer/cutter/cutter-1.03-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="TCP/IP Connection cutting on Linux Firewalls and Routers"
+HOMEPAGE="http://www.digitage.co.uk/digitage/software/linux-security/cutter"
+SRC_URI="http://www.digitage.co.uk/digitage/files/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-debian.patch
+	rm -f Makefile # implicit rules are better ;x
+}
+
+src_compile() {
+	emake cutter CC="$(tc-getCC)"
+}
+
+src_install() {
+	dosbin cutter
+	dodoc README
+	doman debian/cutter.8
+}
diff --git a/net-analyzer/cutter/cutter-1.04.ebuild b/net-analyzer/cutter/cutter-1.04.ebuild
new file mode 100644
index 000000000000..f11002ca418e
--- /dev/null
+++ b/net-analyzer/cutter/cutter-1.04.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="TCP/IP Connection cutting on Linux Firewalls and Routers"
+HOMEPAGE="http://www.digitage.co.uk/digitage/software/linux-security/cutter"
+SRC_URI="http://www.digitage.co.uk/digitage/files/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.03-debian.patch
+	rm -f Makefile # implicit rules are better ;x
+}
+
+src_compile() {
+	emake cutter CC="$(tc-getCC)"
+}
+
+src_install() {
+	dosbin cutter
+	dodoc README
+	doman debian/cutter.8
+}
diff --git a/net-analyzer/cutter/files/cutter-1.03-debian.patch b/net-analyzer/cutter/files/cutter-1.03-debian.patch
new file mode 100644
index 000000000000..607e06df744f
--- /dev/null
+++ b/net-analyzer/cutter/files/cutter-1.03-debian.patch
@@ -0,0 +1,182 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,5 @@
+ cutter: cutter.c
+-	cc cutter.c -o cutter
++	cc $(CFLAGS) cutter.c -o cutter
+ 
+ clean:
+ 	rm -f cutter.o cutter
+--- a/cutter.c
++++ b/cutter.c
+@@ -57,6 +57,7 @@
+ #include <arpa/inet.h>
+ #include <net/if.h>
+ #include <errno.h>
++#include <time.h>
+ 
+ #define ETHHDR	 sizeof(struct ethhdr)
+ #define TCPHDR	 sizeof(struct tcphdr)
+@@ -149,7 +150,6 @@
+ int getmac(in_addr_t ip, uchar *mac)
+ {
+ 	FILE *id = fopen( "/proc/net/arp", "r" );
+-	union { uchar c[4]; in_addr_t n; } ipu;
+ 	in_addr_t ipn;
+ 	int mac0, mac1, mac2, mac3, mac4, mac5;
+ 	int hwtype, flags;
+@@ -240,7 +240,7 @@
+ 	u_short toport
+ )
+ {
+-	int i_result, raw_sock, rtn;
++	int i_result, raw_sock;
+ 	in_addr_t gateway_ip;
+ 	struct sockaddr_ll myaddr, hisaddr;
+ 	struct tpack tpack;
+@@ -377,7 +377,7 @@
+ 
+ 	for ( ; time(0) < tstart + 15; ) {	// give the peer 15 seconds to respond
+ 		struct sockaddr_ll gotaddr;
+-		int addrlen = sizeof(gotaddr);
++		unsigned int addrlen = sizeof(gotaddr);
+ 		fd_set readfds;
+ 		struct timeval tv;
+ 
+@@ -478,8 +478,7 @@
+ {
+ 	FILE *id = fopen( "/proc/net/ip_conntrack", "r" );
+ 	char src1[32], dst1[32], src2[32], dst2[32];
+-	int sport1, dport1, sport2, dport2, i;
+-	int packets1, packets2, bytes1, bytes2;
++	int sport1, dport1, sport2, dport2;
+ 	in_addr_t src1n, src2n, dst1n, dst2n;
+ 	char buff[1024], *p;
+ 	int found = 0;
+--- a/debian/cutter.8
++++ b/debian/cutter.8
+@@ -0,0 +1,124 @@
++.\"                                      Hey, EMACS: -*- nroff -*-
++.TH CUTTER 8 "April, 2005"
++.SH NAME
++cutter \- cut tcp/ip connections
++.SH SYNOPSIS
++.B cutter
++.IR ipaddress1 \ [ \ port1 \ [ \ ipaddress2 \ [ \ port2 
++\ ] \ ] \ ]
++.br
++.SH DESCRIPTION
++.B Cutter
++is an open source program that allows Linux firewall
++administrators to abort TCP/IP connections routed over the firewall or
++router on which it is run.
++.br
++.SH WARNING
++.B Cutter 
++has been designed for use as a administrators tool for Linux
++firewalls. It's use (as is, or modified) for any other purpose is not
++sanctioned by the author. So - do not use this tool as a parachute, or
++to dry your cat, chill meat, answer your phone, drive you car, teach
++your kids to read or attack other people's computer systems or networks.
++.PP
++This software has been designed for 
++.I legal 
++and 
++.I appropriate 
++use
++by network security administrators and the like. It has been written as
++part of a larger Linux firewall project, targetting at controlling traffic
++from peer-to-peer software such as Kazaa, iMesh and others into and out of
++a private network. It is not designed as a tool for malicious use and the
++author in no way sanctions such use.
++.PP
++Users of the software should be aware that it's actions are easily detectable
++using a number of readily available network monitoring tools, and it makes no
++attempt to disguise it's actions. Malicious use of "cutter" could result in a
++jail sentance in a number of countries around the world.
++.PP
++The author is not responsible for the results of using this software. It
++is provided "as is" in the hope that it will be useful, but no garantees
++are made about it's use.
++.br
++.SH USAGE
++.B Cutter
++can be called using one of the following four syntaxes.
++
++.BI cutter \ ip-address
++
++.B Example: 
++.RS
++.br
++.BI cutter \ 10.10.0.45
++
++Cuts all connections
++passing through the firewall
++between any ports on the specified ip-address (either a "private" or
++"public" address) and any other hosts. This can be used to close down
++all incoming connections to a particular server, all outgoing
++connections from a particular client or all outgoing connections to a
++server.
++.RE
++
++.B cutter 
++.I ip-address port
++
++.B Example: 
++.RS
++.br
++.B cutter 
++.I 200.1.2.3 80
++
++Cuts all connections to or from the
++specified ip-address/port pair. This allows the user to be a little more
++specific than the previous example and allows targetting of specific
++services on specific hosts.
++.RE
++
++.B cutter 
++.I ip-address-1 port-1 ip-address-2
++
++.B Example: 
++.RS
++.br
++.B cutter 
++.I 200.1.2.3 22 10.10.0.45
++
++Cuts all connections between
++ip-address-2 and ip-address-1/port-1. This allows the user to cut
++connections between a specified "client" and a particular service on a
++specified host. Our example closes host 10.10.0.45's SSH connection to
++server 200.1.2.3.
++.RE
++
++.B cutter 
++.I ip-address-1 port-1 ip-address-2 port-2
++
++.B Example: 
++.RS
++.br
++.B cutter 
++.I 200.1.2.3 22 10.10.0.45 32451
++
++Cuts the specific connection between
++the two ip/port number pairs given.
++.RE
++.SH STATUS
++Cutter 1.03 should be considered 
++.B EXPERIMENTAL. 
++The author is releasing a
++tool that works on the systems he has access to (namely: IPCop and
++RedHat Linux), and he is seeking input on it's use on other systems,
++ideas for improvement, offers of sponsorship - etc.
++.PP
++.br
++.SH ADDITIONAL DOCUMENTATION
++This program is documented at
++.UR http://www.lowth.com/cutter/
++.I http://www.lowth.com/cutter/
++.UE
++.SH AUTHOR
++Blars Blarson addapted the README and web page written by Chris Lowth
++into this man page for debian package of cutter.  This man page may be
++distribuated under the terms of the Gnu GPL version 2.
diff --git a/net-analyzer/cutter/metadata.xml b/net-analyzer/cutter/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/cutter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/darkstat/Manifest b/net-analyzer/darkstat/Manifest
new file mode 100644
index 000000000000..d3ee26560ddc
--- /dev/null
+++ b/net-analyzer/darkstat/Manifest
@@ -0,0 +1,7 @@
+AUX darkstat-confd 906 SHA256 428e5570b02cd3515949a65bee4d92b22e492435e7833b108fd67aab218eaeed SHA512 7cde9c8637ba34688f6da846017ace8feb832b90264a07d5a9f232b8edd0006aec5cee1c609f3a3489a7942fe0ea5666070ea9827a0818bb15c705b865035377 WHIRLPOOL 1b2030bceb88ea6ed6c7e37fe76bd95b4e7cac71f6b5447b25d914f09607c969e65a928a2b9e0f9898aa60755489a2619cd61bb9e8d6e88e7462a627fcb5a050
+AUX darkstat-initd 1461 SHA256 f2a02312602a18d27f9f9e11844fc26b75bb23728dc3c0ffd7302cc171bf6bcc SHA512 2441b9c7dfa0c3ddb8a5ab6fd396d42a1ae4cb84ac15477c932f719ccfae53179ae5bd3ac947f6a98ee14728c7f31bbc176887c144ed4f5053632aad262d8226 WHIRLPOOL 22906d9edb5dc109b0975d6df61e228de48ebd730e57f84cb3a89c8663841616e910015fbf308cbc7059da9748117add7f58dad1ced6fe986a3f85fc3d937795
+DIST darkstat-3.0.719.tar.bz2 117695 SHA256 aeaf909585f7f43dc032a75328fdb62114e58405b06a92a13c0d3653236dedd7 SHA512 264f6c5f862745fbfb5d125aae5a319369f028fd7be96cfb12775147f528a36b7f5a42bcd6434f2d376933292364641f2ec9cd9bdb1fe105f5a905e331181f98 WHIRLPOOL 95fc7c383bd814bbf6ff022d97df839eeaeafffb75b2c9bdb5b833d9bc7abfabaded5a1c5d145f5f1c5a4f45566e442f060a91ee4366a20ac096ad6fb4e09520
+EBUILD darkstat-3.0.719.ebuild 1716 SHA256 c2f387356726b47686e3a41c259bc996a4c6442f1c3ab5d070749af1b2b62a1a SHA512 4d87e77b8970c3d1458278904fcae84ed4c350f077b18a7a4ccc341c52ada60a60728e68f426d30d796bfc533faca21ec7a00ef7aee38d0b9de75c215db5b1f1 WHIRLPOOL 6c7caf10c820fff5daef5f77abec7d02e3f65018df41e3f603e247d7e7dd00e856e89cfcd0f6e5410776a35d87d9d9c9f84bca347ffdab83779d773e00205258
+MISC ChangeLog 2675 SHA256 f95fe2b7f96b2208b0d4e6576b01d7e3649506e1d6c3b08aff403458072bff19 SHA512 9d4079de27fffd61f7be5079eef1e8d79c49be7f24cae98cbba8351c47ea5adfd7ea6a07ca8c29b775279469aa39638f2e6f8c1da7e0052753b8cf61c5a70aed WHIRLPOOL 9fdf338df44e90efd86287826f8acdd572a5abf56d0081f2b759fa8a6905e932380475284f3f6ce6fb0f38d5a2815bed53fed1ffa7d85c3a0c7d09b8d0a86998
+MISC ChangeLog-2015 9724 SHA256 da3bf063c83450d56976cd861b10c58283bd447ad6f105aa81711113537d43c7 SHA512 df8f6dde3d8dbf000e3c3bad867e709839d25117a7aa4862a50550bbb205e1e0adc97620986a02019aa68b4af0d95ceb6755342f4ae571c36367d41f147e74b2 WHIRLPOOL 1694b7c9904f11129cddab9d473dbe6d35cc61003114610684beae191ffe327fe8485ec5859582b4af760964d89c7a8961c1510363d4f4d41720bda4df34a154
+MISC metadata.xml 536 SHA256 942031dd73b55af835b0c44adea00eb267e5a762c39cb7c61da5750d8cd31b0f SHA512 5950789030e76ea0a95fbf8cd53e702ee8d55af96ed12aef4d6e6ae658ba01e949f875283a2f5c0c12f15fe7beec18704bf14bea1d89c5321df505cd2ae3d5bb WHIRLPOOL 32f5c29a5016dbc6542f53d5b99b69e91ee40f94b52b38b620c0c3165af6bff17dd3be7ee4fc859eae6acf233b4c6bf367e4f22025f1cb60e333180c8c09ea99
diff --git a/net-analyzer/darkstat/darkstat-3.0.719.ebuild b/net-analyzer/darkstat/darkstat-3.0.719.ebuild
new file mode 100644
index 000000000000..f5aeaed6f71a
--- /dev/null
+++ b/net-analyzer/darkstat/darkstat-3.0.719.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools user
+
+DESCRIPTION="Network traffic analyzer with cute web interface"
+HOMEPAGE="http://unix4lyfe.org/darkstat/"
+SRC_URI="http://unix4lyfe.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+DEPEND="
+	dev-libs/libbsd
+	net-libs/libpcap
+	sys-libs/zlib
+"
+RDEPEND="
+	${DEPEND}
+"
+
+DARKSTAT_CHROOT_DIR=${DARKSTAT_CHROOT_DIR:-/var/lib/darkstat}
+
+DOCS=( AUTHORS ChangeLog README NEWS )
+
+src_prepare() {
+	default
+
+	sed -i -e 's|-flto||g' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-debug --with-privdrop-user=darkstat
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/darkstat-initd darkstat
+	newconfd "${FILESDIR}"/darkstat-confd darkstat
+
+	sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/conf.d/darkstat || die
+	sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/init.d/darkstat || die
+
+	keepdir "${DARKSTAT_CHROOT_DIR}"
+	chown darkstat:0 "${D}${DARKSTAT_CHROOT_DIR}"
+}
+
+pkg_preinst() {
+	enewuser darkstat
+}
+
+pkg_postinst() {
+	# Workaround bug #141619
+	DARKSTAT_CHROOT_DIR=`sed -n 's/^#CHROOT=\(.*\)/\1/p' "${ROOT}"etc/conf.d/darkstat`
+	chown darkstat:0 "${ROOT}${DARKSTAT_CHROOT_DIR}"
+
+	elog "To start different darkstat instances which will listen on a different"
+	elog "interfaces create in /etc/init.d directory the 'darkstat.if' symlink to"
+	elog "darkstat script where 'if' is the name of the interface."
+	elog "Also in /etc/conf.d directory copy darkstat to darkstat.if"
+	elog "and edit it to change default values."
+	elog
+	elog "darkstat's default chroot directory is: \"${ROOT}${DARKSTAT_CHROOT_DIR}\""
+}
diff --git a/net-analyzer/darkstat/files/darkstat-confd b/net-analyzer/darkstat/files/darkstat-confd
new file mode 100644
index 000000000000..3d95a0461a06
--- /dev/null
+++ b/net-analyzer/darkstat/files/darkstat-confd
@@ -0,0 +1,27 @@
+# The interface to listen on
+# Use only with /etc/init.d/darkstat init script. If you use
+# /etc/init.d/darkstat.if init script, then this option should be ignored.
+#INTERFACE="eth0"
+
+# The port for the embedded webserver
+#PORT="667"
+
+# The address embedded webserver should bind to
+#ADDRESS="0.0.0.0"
+
+# Set the filter. See tcpdump documenation for details.
+#FILTER=""
+
+# Log  daily traffic statistics into the named file, relative to the
+# chroot directory (see, below).
+#DAYLOGFILE="darkstat.log"
+
+# Other options:
+DARKSTAT_OPTS="--no-promisc --no-dns --user darkstat"
+
+# The directory to which the program chroots after initialization.
+# If you change this, please note the variable below and adjust
+# the permissions accordingly. Note that if you want to use the
+# --daylog option in EXTRAOPTS, the files are logged relative
+# to the chroot-directory; see the man-page for details.
+#CHROOT=__CHROOT__
diff --git a/net-analyzer/darkstat/files/darkstat-initd b/net-analyzer/darkstat/files/darkstat-initd
new file mode 100644
index 000000000000..c362251dadc8
--- /dev/null
+++ b/net-analyzer/darkstat/files/darkstat-initd
@@ -0,0 +1,58 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2 
+
+IF=${SVCNAME##*.}
+
+if [ -n "${IF}" -a "${SVCNAME}" != "darkstat" ] ; then
+	PIDFILE=/run/darkstat.${IF}.pid
+else
+	PIDFILE=/run/darkstat.pid
+fi
+
+depend() {
+        need net
+}
+
+chkconfig() {
+	if [ -n "${IF}" -a "${SVCNAME}" != "darkstat" ] ; then
+		if [ ! -f "/etc/conf.d/darkstat.${IF}" ] ; then
+			einfo "It's possible to have distinct config in /etc/conf.d/darkstat.${IF}."
+		fi
+		INTERFACE=${IF}
+	else
+		if [ ! -f "/etc/conf.d/darkstat" ] ; then
+			ewarn "/etc/conf.d/darkstat does not exist. Falling on defaults."
+		fi
+	fi
+
+	if [ -z "${INTERFACE}" ]; then
+		ewarn "No interface specified. Trying to use eth0."
+		INTERFACE="eth0"
+	fi
+
+	DARK_OPTS="-i ${INTERFACE}"
+	[ -n "${PORT}" ] && DARK_OPTS="${DARK_OPTS} -p ${PORT}"
+	[ -n "${ADDRESS}" ] && DARK_OPTS="${DARK_OPTS} -b ${ADDRESS}"
+	[ -n "${DAYLOGFILE}" ] && DARK_OPTS="${DARK_OPTS} --daylog ${DAYLOGFILE}"
+
+	return 0
+}
+
+start() {
+	chkconfig || return 1
+
+	# If ${PIDFILE} exist darkstat fails to start
+	[ -f ${PIDFILE} ] && rm ${PIDFILE}
+	ebegin "Starting darkstat on ${INTERFACE}"
+	/sbin/start-stop-daemon --start --exec /usr/sbin/darkstat -- \
+		--chroot "${CHROOT:-__CHROOT__}" --pidfile ${PIDFILE} \
+		${DARKSTAT_OPTS} ${DARK_OPTS} -f "${FILTER}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping darkstat on ${INTERFACE}"
+	/sbin/start-stop-daemon --stop --pidfile ${PIDFILE}
+	eend $?
+}
diff --git a/net-analyzer/darkstat/metadata.xml b/net-analyzer/darkstat/metadata.xml
new file mode 100644
index 000000000000..c289cc9010db
--- /dev/null
+++ b/net-analyzer/darkstat/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription lang="en">
+		darkstat is a network statistics gatherer. It's a packet sniffer that
+		runs as a background process on a cable/DSL router, gathers all sorts of
+		statistics about network usage, and serves them over HTTP.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/dhcp_probe/Manifest b/net-analyzer/dhcp_probe/Manifest
new file mode 100644
index 000000000000..62e487765569
--- /dev/null
+++ b/net-analyzer/dhcp_probe/Manifest
@@ -0,0 +1,16 @@
+AUX 1.3.0/01_dhcp_probe.5.patch 2148 SHA256 7e6b1613ae8b258ae9dd1cec9b94f894f7c3516eb8cfef5cb3e72f9c925a5470 SHA512 490e9ad1e81e7e89133dfcd44d61806c0751c9b02616258d3037c03376a7277431d9e113aab4f1bc2aca4a9f0a2a93c83d2ebbff8ea3cfdeb3693f77711679e0 WHIRLPOOL 053cbd5e7b2940c687dfc9f64bd0ca821fecd183baa1f86166ae50882003f9e3a478c99ee1b9e97f3898b7d2c5d20350bf7a84559d7578da4fdb338ad70ae8fd
+AUX 1.3.0/02_dhcp_probe.8.patch 1467 SHA256 5d7aee753c80eb158eb2e24d5685c279aee38471d2865bd480f2e9d68e9dec54 SHA512 f5640eb6c81beb6e8060b6e8d76e4bdabf690e2b4f5c2ce230738cf1c3b59c068b15c61816cf903279d79f76c02e31a9ac98cc05ddbee0ce11c3936c0f502e8c WHIRLPOOL 055b94a675640e85a871bfa05b84b76fa45284977960685ff64f56765a024535c5c2bed6bb8c4d8af9ffff04b4aa79e72a8625b51fb369895ef313cddf86ec8f
+AUX 1.3.0/03_implicit_point_conv_bootp.c.patch 619 SHA256 2a6d89c8005a3ed83e53bd16f50fb3eef8a0a7ab47178f9f381935eaefb89334 SHA512 e42f3c97e867c21195875b87577cd3ae9e635da480c4fd7116a2fa2d3ae7a6b90ffd5977aa8a146e20684faa5f4745fb4b55fea6971a6b2661669a8972e1d4e3 WHIRLPOOL 0b42c625a241d9929e55111d68fa5ed66cea9c1f0e7380cda573a554a0dd2ab002192fbb865bbf9a24460ff06f75c5a4e2943d63e2b136ea0b68965213e3d37a
+AUX 1.3.0/04_linux_32_or_64bits.patch 1216 SHA256 15f51ff259ef8a9b92cda47f5d39e503a4763bba30c3462fbd2ee44d8c957ef0 SHA512 1a55059f60f56e8bca8a07a0afd4ae472ae81aaf09ba7a2df01654770c1785abc2353bcd06318a96739b523646b17a28eaabf7e4db620c91f18cc371f7045a6c WHIRLPOOL 9969bc315ce44b8df21be3a96a4501b691a5f541b05f54f072893d30bfbbfdde8e89812cd8cc8a57962b7eba7f92292c42717bde33b7bee14870aec5c1d5246d
+AUX 1.3.0/05-cleanup.patch 722 SHA256 f8dc06ccd4f600b4a6b59300431ec5ad7a3fb5201e9d9c10a0c6018146e50e50 SHA512 7cf04f916fdef88ae245d035b70a7081977f275b3fe8ddb4c43bb1106a82dc282f8caaac6e79d4ffa332ec4f548f90a381283503f09294ad889e0a197ed790be WHIRLPOOL f4c757d69fd703204cc71a802736b54b695a0bdf49a7c30e91831bdb4777fa54aed4a3b91975699b51c9d66bbead2698cbc6a3ba208b2bd7e56d9833bffddbf1
+AUX 1.3.0/06-return.patch 271 SHA256 8688939b4abf962c6da1d2610ed0a3ee5a35150f0855758a868a2d282e52e620 SHA512 608588d4b6ab9be136493b5bbfd44461525b3e8f767c0a834b502aebcb418ba620792a29b65568e951f38565a2972cac62d09c4c957ef90f2b11a7991cecb726 WHIRLPOOL 66f4b4d323064b58b77b2ca8270b7bd916b543ed30636d3b90880c292a5704c668a7482254499872c92ce5b8680a5bb4fe11df009940f8faaff8530da6130d5d
+AUX 1.3.0/07-comment.patch 747 SHA256 66129bcd66fe4cede6db6f9954b0d27a01d9a61060f4d3451cc52c6c8997f9b6 SHA512 1509363c088d7a30373d3a93dfb8d702154050de5adcd743f370174d113c54330f5728f970f297a4202ad2b1538cb316325adac267e1079ac3710b2c8dfb86d8 WHIRLPOOL 7f839957cad3818d4fd944b0fd2293744865aa32beaa314f9d211fb6116013b422339c9d81810e36a1585d1f88cc337bfefe679f5a49a782d2525dd18bc24bee
+AUX 1.3.0/08-man8.patch 612 SHA256 e4112e698ec27b19b7bd99f1a46523675e82fd4be5f3e40f7b6fd4925fe48db7 SHA512 5bdd6f26bc60624aaa529b57a6290a9c03ef7ebc3f25881025c4b0cd1a69424249920adaa3ec513c5475808744f49e683965a836eea5fea8321b441dfdc9e8b9 WHIRLPOOL e96c6747cf00e2bef3941b1ff5b980d4badc5207df56713ab939ae1129401425f0cb3cb9835b36cf0a2ffe75ff8b073c3af4eba25f0b0331c452ff8636008efc
+AUX dhcp_probe.confd 221 SHA256 302fac43247ae3c94f25b16784579d0e1ed09c875f6b3c1a3228f9d303b343fe SHA512 c12c574da59c4727470c4add4f1bad1a6787329218f2af5cfa17dac46de1bde546011b24e95c06900c173885eb9d152965d8edaed07117cc36f19755da157f47 WHIRLPOOL a6b268659ddbb606d75ef54093824b4e43085027f2dfb977bc3944edbb028df8e3cd75a7d3a03708e80c0670d9536ac0b8fa025d41128d2ab7be839ad8c45065
+AUX dhcp_probe.initd 1189 SHA256 2bb38467a6bee615b7b3de711dccefd68a5d34e7a1d9716326500634099701df SHA512 bca85a97c55625a7a72241edf738b61dc13b2c96b8ef53fef6d7594d744b0b65f0c0b0d3aad209b629906f13bb39591240a224bb0d59a2516a924ec921463742 WHIRLPOOL 8b7af281c222d3c562b42f55346a5215d2f27e4c958fbd6b1f2ee8a3ef8aebd08e85b52788cd798c226d4b746440c8d0248eb6e010d169b51a69cbe84b4259a4
+AUX dhcp_probe_mail 627 SHA256 13837b61cf7e29e311b5cf81fc7cad93d42ceecea76777e1a4e9ae8667d98341 SHA512 2a66c702d71835115a0a3b340d2c9e256ce2de6a983247dd4e2c3c0d908a5ac9f0cf7ffbbe45c1e441e906833c7091eb0c19b6c6034ca46edf1d635dfa15b0c0 WHIRLPOOL faf492e8a8b7583b6b65834e9d98276195271a001bea26ce78587b477b8c2d8b8a90c95471dfc49a344e6105eb468227fdcb11fb2d562bb298543cd064164918
+DIST dhcp_probe-1.3.0.tar.gz 211613 SHA256 227cd6a82a7fa4d989994cb076f18092bc2c82592ceaeb31c4fdd09294b9265f SHA512 d643012529ee5149adbc0c1f19f8e579c55201e86de2aec9b3313be9412db4e973162f864d1baaf79fa340b7bd9a7385f0f1406d1b616e801ced3c7bb387c854 WHIRLPOOL 86a48b10f4a843b95b1b0ec0a3938d831966c701f5d341902595fb0d0b6fede2d9d5ba03a3e3ebaab6a311a6536df02ace1f36613a177392302b6e523a5e98f6
+EBUILD dhcp_probe-1.3.0-r3.ebuild 933 SHA256 11eee424bea1382bb521aaba6ba6793b158cb6f3a73a4a41e057c39cc64c37e3 SHA512 3bd008e5a8299dc9a8799f03ad23032e10d85e390ab218a25609db1180a2083b7ce51b7773c2be6689c4ae42783350f6646272e90fa0e8d15cf62b9057b45f7c WHIRLPOOL 4b51cfcb0f494c04ce3d27c8fb705cd620c1067e06846d1d64d18e8aceb9f86883aa4f7c4587e525fd741ac10ea39e496e7f8c1da5aece8fa14c047f1171589b
+MISC ChangeLog 2950 SHA256 88c01d3b335ce44af838adfc6cea450d8e2195cf783b81d17f3dd50b5880e3e5 SHA512 ff184946a9ed3bb2aa3abd61bafdee8a07a90df3e4d4246199f4720576ca881d821832e4f452baffc6f22618916375db9fe45e7f24ee42759108b24805e5769a WHIRLPOOL 50aae39db80fffd1bfe263156360dffc9fe884d45a9cd13cb4a349ae717d61a0cd1395756f605eef01cb4564e4c1db7787f1331b8cacb290f0b02082170fae76
+MISC ChangeLog-2015 1810 SHA256 c6a2d4711d486b3401560a62db11efc98be6b483606765ff2e5b8a466ef5119d SHA512 7bebb084a5cde93c575a2fae30dd63cf6d9e655708d48931e75e4df121a2c594995e89ef3a049d02675d36d471b22252e47942ecb9c457ec2d452820033d7d95 WHIRLPOOL 3bf72dc7037ce4d8b355884304b58e38c5aff94f9054d677b7d2a5b0cc83bd0db53446f35bf416a95c01998b1b91f28302bae118b45504b886efd26d3c9e5e1a
+MISC metadata.xml 521 SHA256 2ad258e9ff1bb391fd69b67d553ee7b82e9822c9345c7e5a51370c9a3365dace SHA512 c04b196d9e86da49576a5300f10039f9d82df0684e626c1d0517ba70b4eccd5306f681821ba6e2539d557b1cc1b33680ac2137879ab11f247db1fd62c1626c9f WHIRLPOOL fae2f0bc00a7da4ebe0a0fbf2f0e7734e2a8d11cecb6b96e3e644555f8c867789135eba26059b0634c416427532adf2b9ac21c1354678dab875cc7ad28a779d5
diff --git a/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r3.ebuild b/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r3.ebuild
new file mode 100644
index 000000000000..83aad9792a35
--- /dev/null
+++ b/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="dhcp_probe attempts to discover DHCP and BootP servers on a directly-attached Ethernet network"
+HOMEPAGE="http://www.net.princeton.edu/software/dhcp_probe/"
+SRC_URI="http://www.net.princeton.edu/software/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND="
+	net-libs/libpcap
+	>=net-libs/libnet-1.1.2.1-r2
+	"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}/*.patch
+}
+
+src_configure() {
+	use amd64 && append-flags -D__ARCH__=64
+	STRIP=true econf || die "econf failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	dodoc \
+		extras/dhcp_probe.cf.sample \
+		NEWS \
+		README \
+		ChangeLog \
+		AUTHORS \
+		TODO \
+		|| die "dodoc failed"
+}
diff --git a/net-analyzer/dhcp_probe/files/1.3.0/01_dhcp_probe.5.patch b/net-analyzer/dhcp_probe/files/1.3.0/01_dhcp_probe.5.patch
new file mode 100644
index 000000000000..2d5599c06224
--- /dev/null
+++ b/net-analyzer/dhcp_probe/files/1.3.0/01_dhcp_probe.5.patch
@@ -0,0 +1,47 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_dhcp_probe.5.dpatch by Laurent Guignard <lguignard.debian@gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Change a syntax problem in groff file for hyphenation problem
+## Note:
+##   Submitted to upstream programmer Irwin Tillman<irwin@princeton.edu>.
+##       This patch will be applied in the next version of the upstream code.
+
+
+@DPATCH@
+diff -urNad trunk~/doc/dhcp_probe.cf.5 trunk/doc/dhcp_probe.cf.5
+--- trunk~/doc/dhcp_probe.cf.5	2009-03-30 14:53:40.000000000 +0200
++++ trunk/doc/dhcp_probe.cf.5	2009-03-30 14:57:05.000000000 +0200
+@@ -472,10 +472,10 @@
+ .PP
+ .RS
+ .nf
+--p the name of the calling program (e.g. dhcp_probe),
+--I the name of the interface on which the unexpected response packet was received
+--i the IP source address of the packet
+--m Ethernet source address of the packet
++\-p the name of the calling program (e.g. dhcp_probe),
++\-I the name of the interface on which the unexpected response packet was received
++\-i the IP source address of the packet
++\-m Ethernet source address of the packet
+ .fi
+ .RE
+ .PP
+@@ -483,7 +483,7 @@
+ .PP
+ .RS
+ .nf
+--y the non-zero yiaddr value from the packet, when it falls inside a "Lease Network of Concern"
++\-y the non-zero yiaddr value from the packet, when it falls inside a "Lease Network of Concern"
+ .fi
+ .RE
+ .PP
+@@ -723,7 +723,7 @@
+ #   alert_program_name2 /absolute/path/name
+ #
+ # The program specified via 'alert_program_name2' will be called as follows:
+-#   /absolute/path/name  -p name_of_calling_program  -I name_of_interface_on_which_the_response_was_received  -i IP_source_of_the_response  -m ether_src_of_the_response [-y yiaddr_when_in_lease_networks_of_concern]
++#   /absolute/path/name  \-p name_of_calling_program  \-I name_of_interface_on_which_the_response_was_received  \-i IP_source_of_the_response  \-m ether_src_of_the_response [\-y yiaddr_when_in_lease_networks_of_concern]
+ # The options may appear in any order.
+ # The program must silently ignore any options or arguments it does not recognize,
+ # so as to be forward-compatible with future enhancements to dhcp_probe.
diff --git a/net-analyzer/dhcp_probe/files/1.3.0/02_dhcp_probe.8.patch b/net-analyzer/dhcp_probe/files/1.3.0/02_dhcp_probe.8.patch
new file mode 100644
index 000000000000..d9d3d5aa898a
--- /dev/null
+++ b/net-analyzer/dhcp_probe/files/1.3.0/02_dhcp_probe.8.patch
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_dhcp_probe.8.dpatch by Laurent Guignard <lguignard.debian@gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Change a syntax problem in groff file for hyphenation problem
+## Note:
+##   Submitted to upstream programmer Irwin Tillman<irwin@princeton.edu>.
+##       This patch will be applied in the next version of the upstream code.
+
+
+@DPATCH@
+diff -urNad trunk~/doc/dhcp_probe.8 trunk/doc/dhcp_probe.8
+--- trunk~/doc/dhcp_probe.8	2009-03-30 14:53:40.000000000 +0200
++++ trunk/doc/dhcp_probe.8	2009-03-30 15:18:09.000000000 +0200
+@@ -380,15 +380,15 @@
+ file,
+ that program is executed, with the following required options:
+ .nf
+-   -p the name of the calling program (e.g. dhcp_probe)
+-   -I the name of the interface on which the unexpected response packet was received
+-   -i the IP source address of the packet
+-   -m and the Ethernet source address of the packet
++   \-p the name of the calling program (e.g. dhcp_probe)
++   \-I the name of the interface on which the unexpected response packet was received
++   \-i the IP source address of the packet
++   \-m and the Ethernet source address of the packet
+ .fi
+ If the response packet's yiaddr is non-zero and falls within a "Lease Networks of Concern",
+ the following optional options are also passed:
+ .nf
+-   -y the non-zero yiaddr value
++   \-y the non-zero yiaddr value
+ .fi
+ (We do not wait for the
+ .I alert_program_name2
diff --git a/net-analyzer/dhcp_probe/files/1.3.0/03_implicit_point_conv_bootp.c.patch b/net-analyzer/dhcp_probe/files/1.3.0/03_implicit_point_conv_bootp.c.patch
new file mode 100644
index 000000000000..41af750416bf
--- /dev/null
+++ b/net-analyzer/dhcp_probe/files/1.3.0/03_implicit_point_conv_bootp.c.patch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_implicit_point_conv_bootp.c.dpatch by Laurent Guignard <lguignard.debian@gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix implicit Pointer Converstion in bootp.c file.
+##     Fix bug #529635 discovered by Dann Frazier <dannf@debian.org>
+##
+
+@DPATCH@
+diff -urNad trunk~/src/bootp.c trunk/src/bootp.c
+--- trunk~/src/bootp.c	2009-03-31 14:19:06.000000000 +0200
++++ trunk/src/bootp.c	2009-05-21 09:51:26.000000000 +0200
+@@ -11,7 +11,7 @@
+ #include "bootp.h"
+ #include "configfile.h"
+ #include "report.h"
+-
++#include "utils.h"
+ 
+ 
+ 
diff --git a/net-analyzer/dhcp_probe/files/1.3.0/04_linux_32_or_64bits.patch b/net-analyzer/dhcp_probe/files/1.3.0/04_linux_32_or_64bits.patch
new file mode 100644
index 000000000000..dcd79ffc58b2
--- /dev/null
+++ b/net-analyzer/dhcp_probe/files/1.3.0/04_linux_32_or_64bits.patch
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_linux_32_or_64bits.dpatch by Laurent Guignard <lguignard.debian@gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: A solution to solve the bug #535361
+##     May be this will be a solution with the right method ???
+
+@DPATCH@
+diff -urNad trunk~/src/get_myipaddr.c trunk/src/get_myipaddr.c
+--- trunk~/src/get_myipaddr.c	2009-09-03 13:10:32.000000000 +0200
++++ trunk/src/get_myipaddr.c	2009-09-03 13:15:39.671451172 +0200
+@@ -118,7 +118,21 @@
+ #endif /* not STRUCT_SOCKADDR_HAS_SA_LEN */
+ 
+ 		/* increment ptr to next interface for next time through the loop */
++#ifdef __ARCH__	/* Debian GNU/Linux behavior for packaging goal */
++		switch(__ARCH__) {
++			case 32:	/* 32 bits architectures */
++				ptr += sizeof(ifr->ifr_name) + len;
++				break;
++			case 64:	/* 64 bits architectures */
++				ptr += sizeof(struct ifreq);
++				break;
++			default:	/* Default dhcp_probe behavior */
++				ptr += sizeof(ifr->ifr_name) + len;
++				break;
++		}
++#else	/* Default dhcp_probe behavior */
+ 		ptr += sizeof(ifr->ifr_name) + len;
++#endif
+ 
+ 		if (strcmp(ifname, ifr->ifr_name) != 0 )  /* is this the interface we're looking for? */
+ 			continue;
diff --git a/net-analyzer/dhcp_probe/files/1.3.0/05-cleanup.patch b/net-analyzer/dhcp_probe/files/1.3.0/05-cleanup.patch
new file mode 100644
index 000000000000..4151b461bbfd
--- /dev/null
+++ b/net-analyzer/dhcp_probe/files/1.3.0/05-cleanup.patch
@@ -0,0 +1,29 @@
+--- dhcp_probe-1.3.0/src/dhcp_probe.c.orig	2009-03-09 21:17:47.000000000 +0100
++++ dhcp_probe-1.3.0/src/dhcp_probe.c	2009-11-19 18:09:26.000000000 +0100
+@@ -84,7 +84,6 @@
+ 	struct sigaction sa;
+ 	FILE *pid_fp;
+ 	char *cwd = CWD;
+-	int i;
+ 
+ 	int write_packet_len;
+ 	int bytes_written;
+@@ -98,9 +97,6 @@
+ 	int linktype;
+ 	char pcap_errbuf[PCAP_ERRBUF_SIZE], pcap_errbuf2[PCAP_ERRBUF_SIZE];
+ 
+-	/* for libnet */
+-	char libnet_errbuf[LIBNET_ERRBUF_SIZE];
+-
+ 	/* get progname = last component of argv[0] */
+ 	prog = strrchr(argv[0], '/');
+ 	if (prog)
+@@ -987,8 +983,6 @@
+    Must not be called until after initial configuration is complete.
+ */
+    
+-	int i;
+-
+ 	if (! read_configfile(config_file)) {
+ 		my_exit(1, 1, 1);
+ 	}
diff --git a/net-analyzer/dhcp_probe/files/1.3.0/06-return.patch b/net-analyzer/dhcp_probe/files/1.3.0/06-return.patch
new file mode 100644
index 000000000000..c27ad646e6c9
--- /dev/null
+++ b/net-analyzer/dhcp_probe/files/1.3.0/06-return.patch
@@ -0,0 +1,11 @@
+--- dhcp_probe-1.3.0/src/dhcp_probe.c.orig	2009-11-19 18:13:31.000000000 +0100
++++ dhcp_probe-1.3.0/src/dhcp_probe.c	2009-11-19 18:13:59.000000000 +0100
+@@ -684,6 +684,8 @@
+ 		pcap_close(pd_template); 
+ 
+ 	my_exit(0, 1, 1);
++
++	return 0; /* will not be reached */
+ }
+ 
+ 
diff --git a/net-analyzer/dhcp_probe/files/1.3.0/07-comment.patch b/net-analyzer/dhcp_probe/files/1.3.0/07-comment.patch
new file mode 100644
index 000000000000..c8184144a597
--- /dev/null
+++ b/net-analyzer/dhcp_probe/files/1.3.0/07-comment.patch
@@ -0,0 +1,11 @@
+--- dhcp_probe-1.3.0/src/configfile.c.orig	2009-03-09 21:17:47.000000000 +0100
++++ dhcp_probe-1.3.0/src/configfile.c	2009-11-19 18:17:03.000000000 +0100
+@@ -55,7 +55,7 @@
+ 
+ /* parallel arrays of "lease networks of concern" (address & mask), and number of elems in arrays.
+    We also precompute a parallel array of 'addr & mask' to save computing these repeatedly later.
+-/* If a response already identified as being from a rogue DHCP server contains a yiaddr field field
++   If a response already identified as being from a rogue DHCP server contains a yiaddr field field
+    that falls into one of these networks, it is reported as a matter of special concern.
+ */
+ struct in_addr lease_networks_of_concern_addr[MAX_LEASE_NETWORKS_OF_CONCERN];
diff --git a/net-analyzer/dhcp_probe/files/1.3.0/08-man8.patch b/net-analyzer/dhcp_probe/files/1.3.0/08-man8.patch
new file mode 100644
index 000000000000..56f8686eaebd
--- /dev/null
+++ b/net-analyzer/dhcp_probe/files/1.3.0/08-man8.patch
@@ -0,0 +1,20 @@
+--- dhcp_probe-1.3.0/doc/dhcp_probe.8.orig	2009-11-19 18:27:47.000000000 +0100
++++ dhcp_probe-1.3.0/doc/dhcp_probe.8	2009-11-19 18:28:50.000000000 +0100
+@@ -141,7 +141,7 @@
+ libraries.
+ .SH OPTIONS
+ .TP
+-.IB \-c \ config_file
++.BI \-c \ config_file
+ Specifies the configuration file.
+ If not specified, this defaults to
+ .BR /etc/dhcp_probe.cf .
+@@ -253,7 +253,7 @@
+ .B \-v
+ Display the program's version number, then exit.
+ .TP
+-.IB \-w \ cwd
++.BI \-w \ cwd
+ Specifies the working directory; shortly after starting the
+ program changes its current working directory to this.
+ If not specified, this defaults to
diff --git a/net-analyzer/dhcp_probe/files/dhcp_probe.confd b/net-analyzer/dhcp_probe/files/dhcp_probe.confd
new file mode 100644
index 000000000000..62652eac45d3
--- /dev/null
+++ b/net-analyzer/dhcp_probe/files/dhcp_probe.confd
@@ -0,0 +1,9 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Config file for /etc/init.d/dhcp_probe
+
+# For more information, see dhcp_probe(8).
+
+DHCP_PROBE_OPTIONS="-d 1"
+
diff --git a/net-analyzer/dhcp_probe/files/dhcp_probe.initd b/net-analyzer/dhcp_probe/files/dhcp_probe.initd
new file mode 100644
index 000000000000..24d09fbc7116
--- /dev/null
+++ b/net-analyzer/dhcp_probe/files/dhcp_probe.initd
@@ -0,0 +1,47 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="reload"
+
+DHCP_PROBE_BINARY="/usr/sbin/dhcp_probe"
+DHCP_PROBE_CONFIG="/etc/dhcp_probe.cf"
+DHCP_PROBE_PIDFILE="/var/run/${SVCNAME}.pid"
+DHCP_PROBE_INTERFACE="${SVCNAME#*.}"
+
+depend() {
+	use logger
+	need net
+}
+
+checkconfig() {
+	if [ ! -e ${DHCP_PROBE_CONFIG} ]; then
+		eerror "You need an ${DHCP_PROBE_CONFIG} to run dhcp_probe."
+		eerror "A sample file is available in /usr/share/doc/dhcp_probe*"
+		return 1
+	elif [ ${SVCNAME} = dhcp_probe ]; then
+		eerror "Do not run this script directly! Instead, create symbolic links like so:"
+		eerror " # cd /etc/init.d"
+		eerror " # ln -s dhcp_probe dhcp_probe.[INTERFACE_NAME]"
+		eerror "for each interface that should be monitored"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig
+	ebegin "Starting ${SVCNAME}"
+	${DHCP_PROBE_BINARY} ${DHCP_PROBE_OPTIONS} -p ${DHCP_PROBE_PIDFILE} ${DHCP_PROBE_INTERFACE}
+	eend ${?}
+}
+
+stop() {
+	if [ "${RC_CMD}" = "restart" ] ; then
+		checkconfig || return 1
+	fi
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --signal 9 \
+		--pidfile ${DHCP_PROBE_PIDFILE}
+	eend ${?}
+}
+
diff --git a/net-analyzer/dhcp_probe/files/dhcp_probe_mail b/net-analyzer/dhcp_probe/files/dhcp_probe_mail
new file mode 100644
index 000000000000..58b07766bbb3
--- /dev/null
+++ b/net-analyzer/dhcp_probe/files/dhcp_probe_mail
@@ -0,0 +1,23 @@
+#!/bin/bash
+# Old style alert program:
+#
+# Syntax:
+#   alert_program_name /absolute/path/name
+#
+# The program specified via 'alert_program_name' will be called as follows:
+#   /absolute/path/name  name_of_calling_program  name_of_interface_on_which_the
+#_response_was_received  IP_source_of_the_response  ether_src_of_the_response
+
+DHCP_PROBE_DOMAIN=$(dnsdomainname)
+
+sendmail root <<EOF
+From: root@${DHCP_PROBE_DOMAIN} 
+Subject: $1 ALERT - $3 is acting as a DHCP server
+
+Called program: $0
+Calling program: $1
+Interface on which response was received: $2
+IP source of the response: $3
+Ethernet source of the response: $4
+
+EOF
diff --git a/net-analyzer/dhcp_probe/metadata.xml b/net-analyzer/dhcp_probe/metadata.xml
new file mode 100644
index 000000000000..c880ff99c6fe
--- /dev/null
+++ b/net-analyzer/dhcp_probe/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jer@gentoo.org</email>
+		<name>Jeroen Roovers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>
+	dchp_probe attempts to discover DHCP and BootP servers on a
+	directly-attached Ethernet network
+	</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/dhcpdump/Manifest b/net-analyzer/dhcpdump/Manifest
new file mode 100644
index 000000000000..ab0e714a2d0b
--- /dev/null
+++ b/net-analyzer/dhcpdump/Manifest
@@ -0,0 +1,8 @@
+AUX dhcpdump-1.8-Makefile.patch 483 SHA256 d1b9bc187dc73ab23f101f5d7f6d67ef292fba20e92b6e52960735fc02ddb0e1 SHA512 88c6931f1520eea0638fd9b2b25ea7b5701e642adc34cbb7cde66c6c771bc6b7482687a09e7e65f1f0d467565a352397035ac7355748292673bebafadbe73ef5 WHIRLPOOL 8ae45b27fcddf6fb100cb71c64cbdedd1375f99f379cccc942b5a1a01f7c57abdac8e7d98bf39ee9757daf560c08828fe09d35f4d35f885a8c9fca10eacb3045
+AUX dhcpdump-1.8-debian.patch 2850 SHA256 4931e78ff5fded4f88f99a8335a7cb57b0c3530e7ce12e228551e5bf78d724eb SHA512 ccc97bb8c8f6dfa09d22407c8a9dec249860118ff9fc09af9488f1d4c8679f94ef6850040535048ba0bdde273a2a8c7759f02742ece0e409a020277349bedbac WHIRLPOOL 13d24d7ecd15dccfadfa92c79554c905c3de0858a622cc6b24fea0276c5b00b37f901322edbe893418678af6174b94983f4a124ead55a4e16e13c082794d0295
+AUX dhcpdump-1.8-endianness.patch 259 SHA256 56e88b6adf1c0782d9ef3aa38391fd3415dc998a1c98b17143a6a92471d5a197 SHA512 7a04bb0933fe6d54f696f18d7d1cbc1090a6f2bb92061bca0e52311264e35ec3884a2ddbdef2b31de7f81a652189fa9617de754d02aaaf17c1212c92106f07d2 WHIRLPOOL 3e3650148a986a8d20ded47db7ccd82673dc39feadeb0880285ab36b633cbe046a0c6f5b0b40ec787266cb54d4652f100465acb280bca4c3e20fe870c60c78e8
+DIST dhcpdump-1.8.tar.gz 10740 SHA256 6d5eb9418162fb738bc56e4c1682ce7f7392dd96e568cc996e44c28de7f77190 SHA512 52cd63d581a3c530c2f5baa66808d5b0241853651c720bd513b769b8301b4dff9c87243787014aea98a5b3ebed86ec317b58d262bf5031015141a4da50fb76e6 WHIRLPOOL 4741d6242a16c45beb84c5d5e29d0245954703d40a688cc35af41c42bfc09d8977f01a7e1c96879004ab7b230097457d251ed1c2bb6b15c506cf5fe913e75ccf
+EBUILD dhcpdump-1.8.ebuild 689 SHA256 323e5eee720e78583f6de4c2bbe089c721c4431dc31c9a157ae329061bdf2247 SHA512 9abf80278a31c479401bb62455be9fb5a75bfc9cc0a0f256bba30c608beb809a77a2e1548c118369ca390519535948a244960cf91cb118be4d0961630dc189e5 WHIRLPOOL 48907fce0ddd77b999cf0063204ce74f10419093e35c2a7773ae98aa5c5afd4224c74b27fa44f0e10ec206099808f9d69f10ac84232faf9af640b3792b218966
+MISC ChangeLog 2826 SHA256 6347054433af2974482b09fd81ce01f0813b86f6b83b0a0994a7670a0e218eb4 SHA512 5968ba45937fb8554b4646cfd42e76a0f1fbdf5da9cc61c7422c393b03c4ca603c420a00a9891c458c2191ad232f19e041f34d07ae05caf013d9a1a063dff755 WHIRLPOOL ceaa51acbbb574749c436a38bec6cbc2352488127946dfef51258c3745657c6eff92fa4836c3c4d773df264081a5bdb4ac98b2bceba48eef0b6095204c7415eb
+MISC ChangeLog-2015 1454 SHA256 e499943342f006a9218acacc4d16f4fd30ce6eaefb38a9e61c04829478491909 SHA512 3f07f5d1d0b4689b06e98d9288ce9763cc0c3a6b2e5273c3ab4a452e848aff02ad4c6a7aa6c236a01c3028c46a6b984ad867abc9242e082fa13ee600c94a775f WHIRLPOOL ad30d58504271fad6b1035453edda1d2e77acb5be41808cd9040718ae75b5884914048909562c57cd0718e8514a09d100f2e2c14d7cbfae0a0796a6696364e7b
+MISC metadata.xml 418 SHA256 8c29b767acb85d40acb22bb8aa5521647165f7f457b79d1585a45d45d601785a SHA512 776319938dbf31831e5b8655726ee04d2c8cbd3d43163c2ba9d3d9126608de9ca6e49df2c0f9fedfffacdbd2149f792b592d5d5e1881c226f0cb2eaba00a1fa4 WHIRLPOOL a08ac0cae1c37a1894c8cb84016c3c74c1d00852c7fcd51a6c77c2fd9ec793e5174e52927117fa67a21230b370cf86dd063012693c76fafcd7f205a6d9124d03
diff --git a/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild b/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild
new file mode 100644
index 000000000000..2973a6344152
--- /dev/null
+++ b/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="DHCP Packet Analyzer/tcpdump postprocessor"
+HOMEPAGE="http://www.mavetju.org/unix/general.php"
+SRC_URI="http://www.mavetju.org/download/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~mips x86 arm"
+
+RDEPEND="net-libs/libpcap"
+DEPEND="
+	${RDEPEND}
+	dev-lang/perl
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	epatch "${FILESDIR}"/${P}-debian.patch
+	epatch "${FILESDIR}"/${P}-endianness.patch
+}
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+src_install () {
+	dobin ${PN}
+	doman ${PN}.8
+	dodoc CHANGES CONTACT
+}
diff --git a/net-analyzer/dhcpdump/files/dhcpdump-1.8-Makefile.patch b/net-analyzer/dhcpdump/files/dhcpdump-1.8-Makefile.patch
new file mode 100644
index 000000000000..690f60779b87
--- /dev/null
+++ b/net-analyzer/dhcpdump/files/dhcpdump-1.8-Makefile.patch
@@ -0,0 +1,22 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,6 @@
+-CFLAGS=	 -Wall -g
+-LDFLAGS= -g
+-LIBS=	-lpcap
++#CFLAGS = -Wall -g
++#LDFLAGS = -g
++LIBS = -lpcap
+ 
+ all: dhcpdump dhcpdump.8
+ 
+@@ -15,7 +15,7 @@
+ 		dhcpdump.pod dhcpdump.8
+ 
+ dhcpdump: dhcpdump.o
+-	${CC} ${LDFLAGS} -o $@ dhcpdump.o ${LIBS}
++	$(CC) -DHAVE_STRSEP $(LDFLAGS) -o $@ dhcpdump.o $(LIBS)
+ 
+ dhcpdump.o: dhcpdump.c dhcp_options.h Makefile
+-	${CC} ${CFLAGS} -c -o $@ dhcpdump.c
++	$(CC) -DHAVE_STRSEP $(CFLAGS) -c -o $@ dhcpdump.c
diff --git a/net-analyzer/dhcpdump/files/dhcpdump-1.8-debian.patch b/net-analyzer/dhcpdump/files/dhcpdump-1.8-debian.patch
new file mode 100644
index 000000000000..7c5304bb0bca
--- /dev/null
+++ b/net-analyzer/dhcpdump/files/dhcpdump-1.8-debian.patch
@@ -0,0 +1,103 @@
+--- a/dhcpdump.c
++++ b/dhcpdump.c
+@@ -16,11 +16,13 @@
+ #include <netinet/in.h>
+ #include <netinet/ip.h>
+ #include <netinet/udp.h>
++#include <netinet/ether.h>
+ #include <arpa/inet.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
++#include <time.h>
+ #include <pcap.h>
+ #include <err.h>
+ #include <regex.h>
+@@ -38,11 +40,11 @@
+ #define LARGESTRING 1024
+ 
+ // header variables
+-u_char	timestamp[40];			// timestamp on header
+-u_char	mac_origin[40];			// mac address of origin
+-u_char	mac_destination[40];		// mac address of destination
+-u_char	ip_origin[40];			// ip address of origin
+-u_char	ip_destination[40];		// ip address of destination
++char	timestamp[40];			// timestamp on header
++char	mac_origin[40];			// mac address of origin
++char	mac_destination[40];		// mac address of destination
++char	ip_origin[40];			// ip address of origin
++char	ip_destination[40];		// ip address of destination
+ int	max_data_len;			// maximum size of a packet
+ 
+ int	tcpdump_style = -1;
+@@ -160,13 +162,21 @@
+ 	strcpy(mac_destination,
+ 	    ether_ntoa((struct ether_addr *)eh->ether_dhost));
+ 
+-	strcpy(ip_origin, (u_char *)inet_ntoa(ip->ip_src));
+-	strcpy(ip_destination, (u_char *)inet_ntoa(ip->ip_dst));
++	strcpy(ip_origin, (char *)inet_ntoa(ip->ip_src));
++	strcpy(ip_destination, (char *)inet_ntoa(ip->ip_dst));
+ 
++#ifdef __linux__
++	if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->len)))
++		return;
++
++	printdata((u_char *)(sp + offset), ntohs(udp->len));
++#else
+ 	if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->uh_ulen)))
+ 		return;
+ 
+ 	printdata((u_char *)(sp + offset), ntohs(udp->uh_ulen));
++#endif
++
+ }
+ 
+ // check for matching CHADDR (Peter Apian-Bennewitz <apian@ise.fhg.de>)
+@@ -301,7 +311,7 @@
+ // print the header and the options.
+ int printdata(u_char *data, int data_len) {
+ 	int	j, i;
+-	u_char	buf[LARGESTRING];
++	char	buf[LARGESTRING];
+ 
+ 	if (data_len == 0)
+ 		return 0;
+@@ -364,7 +374,7 @@
+ 	case 60:	// Domain name
+ 	case 86:	// NDS Tree name
+ 	case 87:	// NDS context
+-		strncpy(buf, &data[j + 2], data[j + 1]);
++		strncpy(buf, (char *)&data[j + 2], data[j + 1]);
+ 		buf[data[j + 1]] = 0;
+ 		printf("%s", buf);
+ 		break;
+@@ -510,7 +520,7 @@
+ 		printf("-");
+ 		print8bits(data + j + 4);
+ 		printf(" ");
+-		strncpy(buf, &data[j + 5], data[j + 1] - 3);
++		strncpy(buf, (char *)&data[j + 5], data[j + 1] - 3);
+ 		buf[data[j + 1] - 3]=0;
+ 		printf("%s", buf);
+ 		break;
+@@ -518,6 +528,9 @@
+ 	case 82:	// Relay Agent Information
+ 		printf("\n");
+ 		for (i = j + 2; i < j + data[j + 1]; ) {
++			if (i != j+2) {
++				printf("\n");
++			}
+ 			printf("%-17s %-13s ", " ",
+ 			    data[i] > sizeof(relayagent_suboptions) ?
+ 			    "*wrong value*" :
+@@ -527,7 +540,7 @@
+ 				break;
+ 			}
+ 			printHexColon(data + i + 2, data[i + 1]);
+-			i += data[i + 1];
++			i += data[i + 1] + 2;
+ 		}
+ 		break;
+ 
diff --git a/net-analyzer/dhcpdump/files/dhcpdump-1.8-endianness.patch b/net-analyzer/dhcpdump/files/dhcpdump-1.8-endianness.patch
new file mode 100644
index 000000000000..2a6f7822c2b3
--- /dev/null
+++ b/net-analyzer/dhcpdump/files/dhcpdump-1.8-endianness.patch
@@ -0,0 +1,12 @@
+--- a/dhcpdump.c
++++ b/dhcpdump.c
+@@ -130,7 +130,7 @@
+ 	offset += ETHER_HDR_LEN;
+ 
+ 	// Check for IPv4 packets
+-	if (eh->ether_type != 8) { 
++	if (eh->ether_type != htons(0x0800)) { 
+ 		printf("Ignored non IPv4 packet: %d\n", eh->ether_type);
+ 		return;
+ 	}
+
diff --git a/net-analyzer/dhcpdump/metadata.xml b/net-analyzer/dhcpdump/metadata.xml
new file mode 100644
index 000000000000..f34967c0f990
--- /dev/null
+++ b/net-analyzer/dhcpdump/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<longdescription>
+This command parses the output of tcpdump to display the
+dhcp-packets for easier checking and debugging.
+</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/dietsniff/Manifest b/net-analyzer/dietsniff/Manifest
new file mode 100644
index 000000000000..46da6c35be88
--- /dev/null
+++ b/net-analyzer/dietsniff/Manifest
@@ -0,0 +1,5 @@
+DIST dietsniff-0.4.tar.gz 14375 SHA256 e8c38570b7c51080fcc8b274ffd1a423dca42793a4d304fd2ead96cde327c798 SHA512 fb6a1578f7c0554f51f2035449bbde3d810d0ec67c397ebcdf7d43bd704928dd304e2f519372f5b5d9e4168a2a9e5b4f3ccc46341862276d9c3bf3da0132f1fa WHIRLPOOL ca3ab6a76871d5809ac864341f339e315f8a3001759ce7e300f42dd5d689090c8f9cddd4f684c149da8d236a40722ccd94b6f49093a14fde3c3cbe4652fa299d
+EBUILD dietsniff-0.4.ebuild 846 SHA256 ad318a2e7675e5b8acd9241e5508cc88379f956ef9f004284bee0f4a008179a9 SHA512 38c5e4a15c9bfb25aaee90a655f5e88ee88d922dc731bb411d4593d58c7b844491d39598d49be08fbfe028b26d3cdfce019ee38bbb7ef995dc1c618e5a23b7c1 WHIRLPOOL d63f16fa18126a296540d36cddee99776e81b3a01a197c36e4f6c1ac21e557f602d9d3791cbdab1f8495936dedb32a61d2ce6ca2618bd4e1ac5f2cee0260e060
+MISC ChangeLog 2182 SHA256 2b047b71eb7409869832453b3ccdcfd940e6f8e30bb0e7fc472ae6f1008e8b93 SHA512 1d2b2ef73647d918bb02fe9b468cd3b18bf730851a3f48dc613023cf6174201921c6aed50f8c27fd0314290605b1665644360dfde41bab88af7097517a911d37 WHIRLPOOL 5c5e81093d47e7142e51c045307e1591905d05913e0176fd82d94945f7cf5fba75ee1763add30076f654a0e891558e31000851f03b354cb8efe2273eb3bdc0ec
+MISC ChangeLog-2015 452 SHA256 abdd9bab9e70433490cfc9907e68cc07d688c4e8f14e910172b1ab782c293a24 SHA512 5f54f1a72f9c8c139c932902a7a2ce808abe2ab0f1fd7bfc7daebc1cfffd42b9f46d6037ddbde675ffb6e1867c3b678d2aa5a7eccc35e5ffb0061f071adab142 WHIRLPOOL 0a3f265066832d74b23f8630ef7266b3010bb52ff92072f3ae693215b9abde2efd12a2cbd46ab8be19d11ea06234c3346115f8c6ad5f25ec209576aa7b520d9a
+MISC metadata.xml 934 SHA256 76d9cf5457423513e88e8e5468c03deb38336df054abdf819c22a3799dc0a8be SHA512 70ef292e2319c318caedeb622c4f3780341cdc55b2ee08b306a864b1ae9c85b8af28c8b366ff125f68abe8bc97c79439efc599205085d57a1a2f38034ae4f1be WHIRLPOOL f10f9aa039a040628c7a5c6f93ca5de4495f88b6790af7d801d5293b606285af8f878acb92c8a41a6fb2747eb737f23227af9af599745c2c491530a9bf8721a8
diff --git a/net-analyzer/dietsniff/dietsniff-0.4.ebuild b/net-analyzer/dietsniff/dietsniff-0.4.ebuild
new file mode 100644
index 000000000000..525ed6964dc3
--- /dev/null
+++ b/net-analyzer/dietsniff/dietsniff-0.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit toolchain-funcs vcs-snapshot
+
+DESCRIPTION="small and static packet sniffer based on dietlibc and libowfat"
+HOMEPAGE="https://github.com/hynek/dietsniff"
+SRC_URI="https://github.com/hynek/dietsniff/tarball/a80c0e64b3 -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-libs/libowfat
+	dev-libs/dietlibc"
+
+src_prepare() {
+	sed -e '/^prefix=/s:=.*:=/usr:' \
+		-e '/^MAN1DIR=/s:man/man1:share/man/man1:' \
+		-e '/^CC/s:=:?=:' \
+		-e '/^CFLAGS/s:=:+=:' \
+		-e '/^LDFLAGS/s:=-s:+=:' \
+		-e '/^dietsniff/,+3s: -o : $(LDFLAGS) -o :' \
+		-e '/^dietsniff/,+3s:strip:#strip:' \
+		-i Makefile
+	export CC="diet -Os $(tc-getCC)"
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS ChangeLog README
+}
diff --git a/net-analyzer/dietsniff/metadata.xml b/net-analyzer/dietsniff/metadata.xml
new file mode 100644
index 000000000000..87b0150feae6
--- /dev/null
+++ b/net-analyzer/dietsniff/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/hynek/dietsniff/issues</bugs-to>
+		<maintainer status="active">
+			<email>hs@ox.cx</email>
+			<name>Hynek Schlawack</name>
+		</maintainer>
+		<remote-id type="github">hynek/dietsniff</remote-id>
+	</upstream>
+	<longdescription>
+dietsniff is a network-debugging tool like tcpdump or ethereal. The
+difference to those powerful tools however is that dietsniff is linked
+against Felix von Leitner's dietlibc and doesn't require libpcap.
+Therefore it's really small while being static. dietsniff's most
+useful scenario is probably to sniff the packets into a pcap-logfile which
+can be later viewed using more user friendly applications.
+</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/dnsenum/Manifest b/net-analyzer/dnsenum/Manifest
new file mode 100644
index 000000000000..602f87dca528
--- /dev/null
+++ b/net-analyzer/dnsenum/Manifest
@@ -0,0 +1,5 @@
+DIST dnsenum-1.2.2.tar.gz 902708 SHA256 74485238f0cb143e003c8f1d4b30dfe32cef508bdaaa228f063ead48312be56d SHA512 3915be8e3ddf1102520594fcb1a41506401c662175455414226165e473844fa94f8577e68395586bfbf7e97b7c5a29e20e1ad63bb40a214c53e141afe66eddd6 WHIRLPOOL e85ed0a0e20686cd5dfcd91447f7a5e91cecdb1b1c91b37c2c5a85f789e85399de219fb04da9712508bbe7ee52c8f2f6e15219686f0473fc1830416df3324901
+EBUILD dnsenum-1.2.2.ebuild 649 SHA256 b073a78acd3f97dd069035b7f974b6d43b90c8dccc427ac8fb5fb975ca75f9fc SHA512 c3f7a5fdd6e38035f21299acb2dfdd397d5068ef4922c773270984820636535bc90ab14e996b5c913dde769d0a27fc8fdc4068dac306403f06d4860219c064e8 WHIRLPOOL 1c39da7be2050996f70a0881c8901458de6fa1726aed7b8dc3e18027ef492e1a260aaaa3a9b0aeb463fa689af8e2808a03f49efa3e69e6e648e4fb1535911a95
+MISC ChangeLog 2811 SHA256 b9603c4162ad7c235a7f9bfb266ca41cc1f290a4eba156e0384de7550823f180 SHA512 bae12f8b0f1f22480501b830c829b47ec624e4acdfac59635fddd58a950be2a47b81513a72fb7aac20efd77ca8d3e18fed8c7f70ac72f2721c2904a183b90c08 WHIRLPOOL 15391036bc4c4fb6c1a5feda4f65c985fafc41a944c5a79f8586a973074afd76da2a37911173096709602748b8fb5d5f75b891714430b6067ef2e4b0d083ce4a
+MISC ChangeLog-2015 389 SHA256 5c637e2b308b21d2c9ba64ed7023832fa6485618dc359ff24008333039c27531 SHA512 fa2f6a26282b050e868f7abbdd01ab3215a506ab916a1a7ea36381ca93058c4464ddc3bb85590ee045f46d9495c53adf6a727dbdace1f21675dd1e8f018c9fff WHIRLPOOL b57e8c2cf7399b1e712645e87237861ea84fc8b4e1fb92cecaddbeced9460a5b75ff9492a34b752025ea4302e7f32aed67362a40033856b0715ab78d3a62dfd9
+MISC metadata.xml 329 SHA256 87ac19fdac92303aa51f0342e2b934af82c894e82768a96a181758d1a45fa6b3 SHA512 e8b9f19561e78a4337a22ca88ba7829ad12062ff2b648272134a30888cae43df4ad618987a6be873c0998dda53b58c2de1a4d794a522bcc5d933800e185ca586 WHIRLPOOL de369fd1e5e7ae122300b55c48f07e04be4868def687483ba22a102c6ff751137d520f570de3e690ad4381676d128335a1065a12bbf935b3a5f75f5649e9d462
diff --git a/net-analyzer/dnsenum/dnsenum-1.2.2.ebuild b/net-analyzer/dnsenum/dnsenum-1.2.2.ebuild
new file mode 100644
index 000000000000..166ae344f4ec
--- /dev/null
+++ b/net-analyzer/dnsenum/dnsenum-1.2.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="A perl script to enumerate DNS from a server"
+HOMEPAGE="https://github.com/fwaeytens/dnsenum"
+SRC_URI="https://dnsenum.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-perl/Net-DNS
+	dev-perl/Net-IP
+	dev-perl/Net-Netmask
+	dev-perl/Net-Whois-IP
+	dev-perl/HTML-Parser
+	dev-perl/WWW-Mechanize
+	dev-perl/XML-Writer"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	sed -i 's|dnsenum.pl|dnsenum|g' dnsenum.pl || die
+}
+
+src_install () {
+	dodoc *.txt
+	newbin ${PN}.pl ${PN}
+}
diff --git a/net-analyzer/dnsenum/metadata.xml b/net-analyzer/dnsenum/metadata.xml
new file mode 100644
index 000000000000..376c468e9d5c
--- /dev/null
+++ b/net-analyzer/dnsenum/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">fwaeytens/dnsenum</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/dnstracer/Manifest b/net-analyzer/dnstracer/Manifest
new file mode 100644
index 000000000000..f1f58a57cb5f
--- /dev/null
+++ b/net-analyzer/dnstracer/Manifest
@@ -0,0 +1,5 @@
+DIST dnstracer-1.9.tar.gz 130884 SHA256 2ebc08af9693ba2d9fa0628416f2d8319ca1627e41d64553875d605b352afe9c SHA512 e69fe772062ff315ff3148c26df78bd41c75d11dcfa6431f1e9374e6069182bd80826b22dc116011d975838d9527913d46edd78de049edd25e3ac9247d5f3473 WHIRLPOOL 4654c6a2ecacd8529097b114b8d0b3300800c85a241239a8fae54d4e46048e54617bb6109280b1ad0f2126cc7528c29292bbadae4a9332d5fcb6aaf4aded993e
+EBUILD dnstracer-1.9-r1.ebuild 477 SHA256 6da74c870ef118ef9acfd68fc11b0500efa6a134599b88c7221325c802c993aa SHA512 d4eb0a6b6ed57a8325ba5d98d524888052d729d2b06e117de4ccad1bd66049fe35ef95886e049ac6723c3cf57276cd33939d589f8063f91b54e8bf3b7bd50565 WHIRLPOOL 7bd67256d01acc6326ec72e999a506421aa0a77177f758d95a372e06d1d8d6581ebad1fe8cf2facb4bdd2a11c56a9305a95bd81d7e3436f144ecb4577a3fba31
+MISC ChangeLog 2439 SHA256 a95c94944506f92e181105ec5119ad4e1ea94fa45edc2b7ff6b5a1772d38daff SHA512 4cfbf4d8ac39d9575d66761929569ed523a16c7ea4a43e7923fedbf06c663f36d153b014db82bb00dcfea359c10ed01e0ebde79e48ab45318c548a2a7f008ad2 WHIRLPOOL 65c0475d4555fbff912e9255808d466b124d4c3ccedd2f6b6ff407a5ce16315ab423f239d9994b5c2f61a9ae26897f01989733c068a22b727d01893b319d26d6
+MISC ChangeLog-2015 3372 SHA256 740538b59c975875a044d4936b3916953c1f35e73487d66b3fbc0da1b5e95ffc SHA512 9dc4a8573ea9b4f260525beb98180dd88a84ba21d36b9e501d12513d3f3cd12754185973eef9c50b2315ec5ddca03aa4ad3a05ebfc63998e5ed302a300ee067d WHIRLPOOL c98d186e7ba721223c643e8b557fbb2ee57d6a7e5fdbbe25606ad85b2882510e57f4cca15ccb92eaf89ffed502026486336821ad3076b4c1621cb64efe091d3f
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/dnstracer/dnstracer-1.9-r1.ebuild b/net-analyzer/dnstracer/dnstracer-1.9-r1.ebuild
new file mode 100644
index 000000000000..8f535fd427d6
--- /dev/null
+++ b/net-analyzer/dnstracer/dnstracer-1.9-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Determines where a given nameserver gets its information from"
+HOMEPAGE="http://www.mavetju.org/unix/general.php"
+SRC_URI="http://www.mavetju.org/download/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ia64 ~ppc ppc64 s390 sparc x86 ~amd64-linux"
+IUSE="ipv6"
+
+DOCS=( CHANGES README )
+
+src_configure() {
+	econf $(use_enable ipv6)
+}
diff --git a/net-analyzer/dnstracer/metadata.xml b/net-analyzer/dnstracer/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/dnstracer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/dosdetector/Manifest b/net-analyzer/dosdetector/Manifest
new file mode 100644
index 000000000000..b6e27a449ddc
--- /dev/null
+++ b/net-analyzer/dosdetector/Manifest
@@ -0,0 +1,8 @@
+AUX dosdetector-20060621-isdigit.patch 192 SHA256 f1bccd6cacff9865966675a53e85e83886536e39ec976f963cfee69331cfd119 SHA512 20647b069c8503281fe5a982744c0a526f755e59963da21a0eacfa4963baaedf5f74e19aacf35eccb1d0286ed3a1f55af377fe52cb3eb4ec648b8d2e49fea2d3 WHIRLPOOL a372be37f71c430a72233605175ddb8405381c27811ddeca11e29d2d9e82d3d7ce87746f82d5c98d23c2e0c10af8311f88be067235cd5877c1c3a6dbbf94996b
+AUX dosdetector-20060621-sizeof.patch 301 SHA256 a6cee6211729e1e00d06c1aad70eca7a32b349ad91ff9316cc16c6215117afb0 SHA512 4263a0a3d3b9c10e18eeaab96e19beb700286af10d438667ed00f2640e6dfe4db7ec4daac35c033a52ca08afad966337bd4c8ba84ae4ce9d56e3da71a8b130d3 WHIRLPOOL 96c0ad51750349ba5b692092b5f31bab032feb184061aa317f4a118f32ddd79627e5559b52c2c17879ba64a2a45ba5159dea30a60ca76994100bf5438c3cfa68
+DIST dosdetector-20060621.tar.gz 164768 SHA256 664b9c94dc225e1e604c2791ed5fa2f3e1924908f81e92a3a16578db0b4aa77f SHA512 30b6980920920a05668165a1c3dcbd07a94f964367d5f48ca443e017806cfcce85a11ad57183d3cc29ac06e8a1ef122227187f6cacd237fe327db4a768b992f6 WHIRLPOOL 0626779c2e1c3a2fccaf2ad12a2ca9d0a267dc456c3acc426623fd7cb5e9ef09f771c554f754eeaf81638664316c8b1024655de310da32c9a029a0b4b4b4e930
+EBUILD dosdetector-20060621-r1.ebuild 534 SHA256 5332b5ebc70bf6c32c6a777b82c7f03d006e0e33e3d3d1e8cc01cb0a9281cd70 SHA512 7b90561e8e9cc1575b39b2120d947fb5766aa8d8ac6942ebb63ccb31411de1614e79592e1e394b683aa48b6ce929fc57772a824432dac646a51124a8fb377ed6 WHIRLPOOL bfe404e7680cf835b0562c8f40b76b802d2a68ea5d2807e9653ee8f76894069b7175a3a8b0b4895d3906a5129c53b0046e9f9a024687908f69a6f6a2abae1cb9
+EBUILD dosdetector-20060621.ebuild 493 SHA256 e5c1ae4d77c371f11d853b08c7e233ce523fbeb248557955c6e51d9eca940d31 SHA512 8b253d5e691d780a48a04eda6b6a1c79cdd41bcd654ab996ea4faa3618b9af21b4bd82d5f9c6da3bf605a45fb77e5b9a4a526ba88a8216cd684578c2c8dd895a WHIRLPOOL bded347b10db581cb4171c8e02335f67205b58723116f8dab0b5196fe16cbac88cab885ed564e264648f5a8172b6499d15aa0b0841f2732713a987286e076879
+MISC ChangeLog 2781 SHA256 1297a411f834e7d505ca94776b3963f51bc5206a9edf5d4e6b859680f0bd2d50 SHA512 9f604a6c5177bba1f5e7a018deba1387fcaa101737d59f19ec4a800ba3c7cceb26b179c81e8fa08b9c3d8d3db580758334be90c25f9e31431fb42d94300a0a47 WHIRLPOOL b109036cf43cb71dac1aa328b41ba4799f449ee830bc95abd179221b6f62553de22a6395e1794fa2db325c5235a361f74552e688c48851206ff01ab64da39205
+MISC ChangeLog-2015 980 SHA256 1ce37c25db062819a15737f55362884faa53eaa18b64c1b3bbf20ed75a8eba68 SHA512 a54b79584807ee31cd889549bc5294a05d68ee7d547cfb89c7205870cf95570a49e63561ace233d43169a63bd5a7c06142c68d579e7323e8e30859947b2cbede WHIRLPOOL 79218ffca5f6b9a3d17de317c684405b6699fb3d609b9d47450a10a83ce5abec7d1b05275d174b33a9580a617661efd6e292338710cc5a5b25076f407f5391f0
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/dosdetector/dosdetector-20060621-r1.ebuild b/net-analyzer/dosdetector/dosdetector-20060621-r1.ebuild
new file mode 100644
index 000000000000..81aecb194510
--- /dev/null
+++ b/net-analyzer/dosdetector/dosdetector-20060621-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Tool to analyze and detect suspicious traffic from IP and alert about it"
+HOMEPAGE="http://dark-zone.eu/resources/unix/dosdetector/"
+SRC_URI="http://dark-zone.eu/resources/unix/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-isdigit.patch \
+		"${FILESDIR}"/${P}-sizeof.patch
+}
diff --git a/net-analyzer/dosdetector/dosdetector-20060621.ebuild b/net-analyzer/dosdetector/dosdetector-20060621.ebuild
new file mode 100644
index 000000000000..c7d8681ca3b5
--- /dev/null
+++ b/net-analyzer/dosdetector/dosdetector-20060621.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Tool to analyze and detect suspicious traffic from IP and alert about it"
+HOMEPAGE="http://dark-zone.eu/resources/unix/dosdetector/"
+SRC_URI="http://dark-zone.eu/resources/unix/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-isdigit.patch
+}
diff --git a/net-analyzer/dosdetector/files/dosdetector-20060621-isdigit.patch b/net-analyzer/dosdetector/files/dosdetector-20060621-isdigit.patch
new file mode 100644
index 000000000000..11cd3170ded9
--- /dev/null
+++ b/net-analyzer/dosdetector/files/dosdetector-20060621-isdigit.patch
@@ -0,0 +1,10 @@
+--- a/include/dos.h
++++ b/include/dos.h
+@@ -26,6 +26,7 @@
+ #include <net/ppp_defs.h>
+ #include <sys/ioctl.h>
+ #include <time.h>
++#include <ctype.h> /* isdigit() */
+ 
+ /*
+ #define DEBUG_TREE	1
diff --git a/net-analyzer/dosdetector/files/dosdetector-20060621-sizeof.patch b/net-analyzer/dosdetector/files/dosdetector-20060621-sizeof.patch
new file mode 100644
index 000000000000..aea9cfba19ee
--- /dev/null
+++ b/net-analyzer/dosdetector/files/dosdetector-20060621-sizeof.patch
@@ -0,0 +1,11 @@
+--- a/src/main.c
++++ b/src/main.c
+@@ -306,8 +306,6 @@
+     hosts = calloc(2, sizeof(struct host));
+     rules = calloc(1, sizeof(struct rule));
+     rules_num = 0;
+-    bzero(hosts, sizeof(hosts));
+-    bzero(rules, sizeof(rules));
+ 
+     /* Init rules table */
+     if (init_rules(opt.rules) != 0) {
diff --git a/net-analyzer/dosdetector/metadata.xml b/net-analyzer/dosdetector/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/dosdetector/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/driftnet/Manifest b/net-analyzer/driftnet/Manifest
new file mode 100644
index 000000000000..1432250fc487
--- /dev/null
+++ b/net-analyzer/driftnet/Manifest
@@ -0,0 +1,7 @@
+AUX driftnet-0.1.6-giflib-5.patch 1060 SHA256 7da1ccc9ebdd9ad616950890b68cbc8fb860bcfde9558de733d56c8340599298 SHA512 80dc8c0696f022e9034b01e48017f884f57e0044388cdc4d08c87fbd33bfdc7d3cad0bee332a3b7486cb06b9127469a0c6f088cde6e484d7873f3f59cfb5e97c WHIRLPOOL 2cd9b6741e6633c48b365b59360a7c3bd84e25c9929c071ce598f9990beb192fca2bb316e75671f39732d780bdcbf18ae573db6e0da6b930d10e024422012733
+DIST driftnet-0.1.6_p20090401.tar.gz 43683 SHA256 6ed5d66ddc219a9e98a3879aa1317a9437dc7fc97b7a2bf538a0cb8bb32f4dca SHA512 93b2f7b644603bf2fea09163c3c8cc6eed7ed61f3ad7f6770a754e1a31afde5a75e27464c399261bfdafbe37729f201e6bbcb06bb6c59bf52ac0ede4393a15fa WHIRLPOOL 2523114d08ee789cf0194fafb3cf1886b1173d1106091cd73973f9a213656a94fa721ef08c1037d1f5efa488caa79c936df527e9463414445ea8c0c4a87333a7
+EBUILD driftnet-0.1.6_p20090401-r1.ebuild 1822 SHA256 b77ac556a3ad21e0ec976335a462467ae190fb82749f3b9e8893cbd184dce5fd SHA512 51d05ea045ef4456792fc9785d2c6272f66bc1fd00523a9a857d3bd43f02ff94543f73062cb0f19aa7b849c5ab19abc50deefd601bc200e3fea40bcba99be3d0 WHIRLPOOL 4b72a3ad4701ea09a9bff9c2b614dec0f1583ab69fd229d31c171def8a55f38aa56554ff456b060e965490ebae958a3018cfdcc87e0ef5a52c486bf459925257
+EBUILD driftnet-0.1.6_p20090401.ebuild 1495 SHA256 eb4ef00a6f24f141a8de40c3cf1f8e69a1efcc9fc6b3d5c6c2259e44dba01187 SHA512 a5d5b9fe7749b2f98182290866a4c7c7de981547ea93f2d93fc3ece2f9b50233aa4290cf1263be85180f4247b1d010d43217d74f236cbd4b29f84fafaddf1736 WHIRLPOOL c0d907ada25ed68c8d811a1b3d2db43f5e3533891f5aa721d49deb7d20f55ca5f32f4b3c342998ef846f4c8bf50136f060778d566f6e6ec3a53beb27b487b18b
+MISC ChangeLog 2879 SHA256 a031703b7ff3169f9f44eb7b8a2b1c1692dc0b3921518b6ab3b12d3fec43805b SHA512 71f7f25aafb7e129db8c8b7b8653e6224839b02fa7e79d6bddb7276b43d784c2e1f94a57397bb1d476e8116171d9cccf17728fab7b62b79bfd6de320a5bb9b3f WHIRLPOOL 6cb1d2908383c3eef91dfb9094910100afc46236a238ec4fe44e2b3fa889047786db260053c1249162f16a70d4d78b05b8085bd8232ee2d24b75c39750953766
+MISC ChangeLog-2015 6582 SHA256 fecba7f2c6f2b44e60d68ac0c56a8503a80bcc689f12dbce7c83f3b7fa40206c SHA512 cb1c20a79f127f11d523193808836e6ac0082208b43d1447fe7b21c513a4fe68d6a6d302147143ef0481f3a3bd2e255640991ca4ce8b46521a5c65a7eddbb298 WHIRLPOOL d415825fc4a59903eefb0bc319447080caae55d53bfd172d2adff19f40f8d5dc2dce267ec1b8523ec27ecdb11baff724f73f0e5e6a279e328a318d743fd88b74
+MISC metadata.xml 404 SHA256 2ad02e3010e586bc9d9e10a1b99baf40b899964bcfe615bb131d53d4d7c10af8 SHA512 e83bea4ca337cbe95398c6310932535246a00ceedf696574624408a5f783c9f5cc3c519216cc16bc9dd44ad2b4b62050707621814a9b2a26a23c6c0272bcfdfc WHIRLPOOL 019be4b57d48dcabce74c3d1021a18cd0598b5097e94222e478e6efe2f73789e32dc68093d86a5c6bf468213a06a3a140840d75b95d39dd7bdf44bcb5ffb8472
diff --git a/net-analyzer/driftnet/driftnet-0.1.6_p20090401-r1.ebuild b/net-analyzer/driftnet/driftnet-0.1.6_p20090401-r1.ebuild
new file mode 100644
index 000000000000..8479e85a6794
--- /dev/null
+++ b/net-analyzer/driftnet/driftnet-0.1.6_p20090401-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils fcaps flag-o-matic toolchain-funcs
+
+DESCRIPTION="A program which listens to network traffic and picks out images from TCP streams it observes"
+HOMEPAGE="http://www.ex-parrot.com/~chris/driftnet/"
+SRC_URI="mirror://github/rbu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc -sparc x86"
+SLOT="0"
+IUSE="gtk mp3 suid"
+
+CDEPEND="
+	net-libs/libpcap
+	gtk? (
+		x11-libs/gtk+:2
+		virtual/jpeg:0
+		media-libs/giflib:=
+		media-libs/libpng:=
+	)
+"
+
+DEPEND="
+	${CDEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	mp3? ( media-sound/mpg123 )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.1.6-giflib-5.patch
+
+	sed -i \
+		-e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
+		png.c || die
+
+	# With newer libpng, --cflags causes build failures.
+	sed -i \
+		-e 's:pkg-config --cflags libpng:$(PKG_CONFIG) --libs libpng:' \
+		-e 's:_BSD_SOURCE:_DEFAULT_SOURCE:g' \
+		Makefile || die
+}
+
+src_compile() {
+	tc-export CC PKG_CONFIG
+
+	if use gtk; then
+		emake
+		mv driftnet driftnet-gtk || die
+		emake clean
+	fi
+
+	# build a non-gtk version for all users
+	sed -i 's:^\(.*gtk.*\)$:#\1:g' Makefile || die "sed disable gtk failed"
+	append-flags -DNO_DISPLAY_WINDOW
+	emake
+}
+
+src_install() {
+	dosbin driftnet
+	doman driftnet.1
+
+	use gtk && dosbin driftnet-gtk
+
+	dodoc CHANGES CREDITS README TODO
+
+	if use suid ; then
+		elog "marking the no-display driftnet as setuid root."
+		fowners root:wheel "/usr/sbin/driftnet"
+		fperms 710 "/usr/sbin/driftnet"
+		fperms u+s "/usr/sbin/driftnet"
+	fi
+}
+
+pkg_postinst() {
+	fcaps cap_dac_read_search,cap_net_raw,cap_net_admin \
+		"${EROOT}"/usr/sbin/driftnet
+	use gtk && fcaps cap_dac_read_search,cap_net_raw,cap_net_admin \
+		"${EROOT}"/usr/sbin/driftnet-gtk
+}
diff --git a/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild b/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild
new file mode 100644
index 000000000000..609df1bb04e0
--- /dev/null
+++ b/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A program which listens to network traffic and picks out images from TCP streams it observes"
+HOMEPAGE="http://www.ex-parrot.com/~chris/driftnet/"
+SRC_URI="mirror://github/rbu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ppc -sparc x86"
+SLOT="0"
+IUSE="gtk mp3 suid"
+
+CDEPEND="net-libs/libpcap
+	gtk? ( x11-libs/gtk+:2
+		virtual/jpeg
+		media-libs/giflib
+		media-libs/libpng )"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	mp3? ( media-sound/mpg123 )"
+
+src_prepare() {
+	sed -i \
+		-e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
+		png.c || die
+	# With newer libpng, --cflags causes build failures.
+	sed -i \
+		-e 's:pkg-config --cflags libpng:pkg-config --libs libpng:' \
+		Makefile || die
+}
+
+src_compile() {
+	export CC=$(tc-getCC)
+	if use gtk; then
+		emake
+		mv driftnet driftnet-gtk || die
+		emake clean
+	fi
+
+	# build a non-gtk version for all users
+	sed -i 's:^\(.*gtk.*\)$:#\1:g' Makefile || die "sed disable gtk failed"
+	append-flags -DNO_DISPLAY_WINDOW
+	emake
+}
+
+src_install () {
+	dosbin driftnet
+	doman driftnet.1
+
+	use gtk && dosbin driftnet-gtk
+
+	dodoc CHANGES CREDITS README TODO
+
+	if use suid ; then
+		elog "marking the no-display driftnet as setuid root."
+		fowners root:wheel "/usr/sbin/driftnet"
+		fperms 710 "/usr/sbin/driftnet"
+		fperms u+s "/usr/sbin/driftnet"
+	fi
+}
diff --git a/net-analyzer/driftnet/files/driftnet-0.1.6-giflib-5.patch b/net-analyzer/driftnet/files/driftnet-0.1.6-giflib-5.patch
new file mode 100644
index 000000000000..30ad62c38f47
--- /dev/null
+++ b/net-analyzer/driftnet/files/driftnet-0.1.6-giflib-5.patch
@@ -0,0 +1,50 @@
+--- a/gif.c
++++ b/gif.c
+@@ -20,7 +20,12 @@
+  */
+ int gif_load_hdr(img I) {
+     GifFileType *g;
++#if GIFLIB_MAJOR > 4
++	int *GifError = NULL;
++    g = I->us = DGifOpenFileHandle(fileno(I->fp), GifError);
++#else
+     g = I->us = DGifOpenFileHandle(fileno(I->fp));
++#endif /* GIFLIB_MAJOR */
+     if (!I->us) {
+         I->err = IE_HDRFORMAT;
+         return 0;
+@@ -36,7 +41,12 @@
+  * Abort loading a GIF file after the header is done.
+  */
+ int gif_abort_load(img I) {
++#if GIFLIB_MAJOR > 4
++	int *GifError = NULL;
++    DGifCloseFile((GifFileType*)I->us, GifError);
++#else
+     DGifCloseFile((GifFileType*)I->us);
++#endif /* GIFLIB_MAJOR */
+     return 1;
+ }
+ 
+@@ -44,6 +54,9 @@
+  * Load GIF image.
+  */
+ int gif_load_img(img I) {
++#if GIFLIB_MAJOR > 4
++	int *GifError = NULL;
++#endif /* GIFLIB_MAJOR */
+     GifFileType *g = I->us;
+     struct SavedImage *si;
+     int ret = 0;
+@@ -114,7 +127,11 @@
+     ret = 1;
+ fail:
+ 
++#if GIFLIB_MAJOR > 4
++    DGifCloseFile(g, GifError);
++#else
+     DGifCloseFile(g);
++#endif /* GIFLIB_MAJOR */
+     
+     return ret;
+ }
diff --git a/net-analyzer/driftnet/metadata.xml b/net-analyzer/driftnet/metadata.xml
new file mode 100644
index 000000000000..56038b1c27ca
--- /dev/null
+++ b/net-analyzer/driftnet/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<longdescription>A program which listens to network traffic and picks out images from TCP streams it observes</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/dsniff/Manifest b/net-analyzer/dsniff/Manifest
new file mode 100644
index 000000000000..f75bad73d183
--- /dev/null
+++ b/net-analyzer/dsniff/Manifest
@@ -0,0 +1,15 @@
+AUX 2.3-makefile.patch 1530 SHA256 e9a8f061a87d07be0ce8958c5695d1bfc05cd5f0f4f55df080c3de752372315c SHA512 4f5721b34f5df8b2c3553ed7fbaab3ecb05763a7124f00f0c5f77afbd542e0eaaf1cd951c566b63ea9fa910521ffb9d1c7516c681175100125a16197f0beb846 WHIRLPOOL bc95f5e36b96f1c0952ab3510b304123d9a1f1763fc61c0dd0f3bbd2e9ed8842ffed6fd4d3b9ff2aac3970ee1833971fbc092c4e6c16d4466fc04f8e3d54fb96
+AUX 2.4_beta1-httppostfix.patch 674 SHA256 3efd6ca2267540016e843af3e8d7720d888fd17a73cba410e2c68022fd3a7baf SHA512 2d47d4efa576203240d94b739cafb982833d52673f42b381cc109e7b44acbf173528a4c5d4dfa1b9b95a21c9e9296db5016946e0b5202f4fcbc67e28152c1068 WHIRLPOOL 865ce69d1774a6a5fcb5f7e3c475e676fe9559fc8dd8a45190d0433b1a573061abb387a41a46a977e63a68c1b66936872e4d32204cd405a4dde777c82559ff32
+AUX 2.4_beta1-libtirpc.patch 590 SHA256 5d6290105d2211279653b274dd574db41107bfe6da6eaed4fa10eb3d0890050b SHA512 c794ba7d43d7fac77a4d427f164efed1514a9caf93af8c11d6e094448b8b5c26be2d3da85e3ad62611a4bf337a3cca68ba27d3813c51d0692e9a793788c31f9d WHIRLPOOL 72ad69a7f1cbf6d3084e7f12c8fb8d4cdea831af9d0c0a6e57e502ec59b4a43145b22a59441962b1db929ad1a44aeeef4443e6d873ceac9bf79fbfd397e5ef9c
+AUX 2.4_beta1-macof-size-calculation.patch 369 SHA256 d8f5cc5d14a614410a84a8eaba5a4212ee03466c4fe2fd4a634f5d7c3f688ec7 SHA512 070695aae4a0374f6d073e71f4e9362387b3b6a444058c9371564779b22c2218f32e830c7a1e39879860e956f8c826199ba90a0cb67423379358c1d0dd857ff1 WHIRLPOOL fe7ff614884d0cddd01288ff9abf8beca4076b6e11c6c62ec06073c79686aa226866196a3f75259051d9b19d4f1aa45238b4e99eaafd0cbedc36f6aee337c61f
+AUX 2.4_beta1-make.patch 2158 SHA256 6cf844425aba6884875c0f8b9031b867f6b36e2636a29624115ad56fd0e34cea SHA512 348ef5c4d62efb9f204c67275e3b3d09d32cdd89575b758df1e37d103d6fd7ea9185755389c297b5f8fc545537e3203d488d8f8fb1e38bc6abdd74047b720c5b WHIRLPOOL 7dcf294e796482cdb3b9466c56ca2e4097e7fa1c0181cdca0855c1991e29f022db54545f0e3262237477ca755c9b8cc99c41c30c8b95c401ddc622d316810cb1
+AUX 2.4_beta1-urlsnarf-pcap_timestamps.patch 463 SHA256 07b039f56512e7f78d751ba7bf3f48f62dd2db64d5794ead3a597b7c26dc75e5 SHA512 57a7e9e50b76ae260617f3c66036de41329c744ac1f08d70993a2bf724e22828320107776ca726b3c0bf20d921134368087dedeae19f287770cee6dca7d6e3e1 WHIRLPOOL d3b42bf1786bbb1eb605e13d08c7b405a6fffaeb7927e062eabbb65e0b81a5b3e26ef790dff589bc45d98c72c3b7b91525f2694e776e64c21b81e23202dfc362
+DIST dsniff-2.4b1.tar.gz 131666 SHA256 a9803a7a02ddfe5fb9704ce86f0ffc48453c321e88db85810db411ba0841152a SHA512 62dafab293de6dc3e9b01561b3627d63ca334467c01c3550a6318d8bcbe99d5a301ec16967af34065a14e8bca1c4b6a41da766cbd51ebd8338615b950c4f642f WHIRLPOOL 10e5187314fe63058a015a3bef159e21a1ff7e0080ea72c8f804621d2b6254b6c05aa7fe2952bec568641a4a8d93eedf5f5407f127ee3464f73931bfe865d100
+DIST dsniff_2.4b1+debian-18.diff.gz 44819 SHA256 a65142b8d2206d3eae5db35d9972f8eac1110d45893d7f2182ca240ecd9b9d25 SHA512 9f219dfa7fd68399126cd2b373a7054168638606c03e8297af46a89c242f81e45f99857922e6782cab608b8cafab528bcfaeb37acd3cca85f5b4a8efd91e71d5 WHIRLPOOL 9c6ab2938e139ea5b43319000297d6bdfdd4ab234058baeccc7eccbee0f5a7a5824860b4397421402e1ff1cd5c446ef1d17de6ce7b5ec9244e5770662b2c6f9a
+DIST dsniff_2.4b1+debian-22.1.debian.tar.gz 29657 SHA256 28ddb8514c6a7a17f51f428b6fada299baf5a3efa153f77f081ac6c1e6466633 SHA512 11c6a3c04b5a8b3afb78901003132186964e88019011bea69b43a000c31d23f15c1a1c343c2ad1b03bf0a09664aebfa6f99e335fdfa1496bb020db6541eab6e3 WHIRLPOOL a1236e7452e3442a1ac0d7a6bbf71d0d0ef22bf508aa47838d220ed18e8c16aba4a822a343c9922de71f6f77c6b10d58d6a56a631488e71ca3307d9a9132bee5
+EBUILD dsniff-2.4_beta1-r4.ebuild 1418 SHA256 6f2be728d1ccf0d264f8200d4788164ad3c98250f2c01547c425530c809da9e8 SHA512 6dfbc3a94e4c9361dcb5875097c15547b61d8754f282b9b71c223be033712c8d2e0fe83ebf45017ad00c26f2646320077c7c102053f452ca5f60e0297cadcb32 WHIRLPOOL c159b0bdbad69a2c39b7b89b411b9ab5c91e3cb1221540db38bafbc28af5d3c1e004e08f8e14f7a0fd6e660cf4acb1720af9e964731a109ff61bc68af5e66fe9
+EBUILD dsniff-2.4_beta1-r7.ebuild 1563 SHA256 04463768252b73f95efc74cdd16fc3f9ac5beab7a89d3bfe1916bf5809c2d229 SHA512 941d3954e19d99513298fc8c18a2c9bc257efb2611311aeb1d0e9a079c4e2f4439f95389e8e3f103e97a7c8dc87860c1b45b29c6a43f579ce7a001a0c4d4e8fe WHIRLPOOL 7f03b13b750c56c34056f7e6db18989832e286c87264e82f0ca205553aafe9d2c4665222dbdee908b18509a8d62145b77118d84f6ab33d8e31bf1f8cf6037bf8
+EBUILD dsniff-2.4_beta1-r9.ebuild 2081 SHA256 ba254584367b6b98512ba944a42116a1bcf2e0fd08b63dfe1113ba195ad7cb80 SHA512 88e1f8daa373ab4296d06e71a5a4471cca2c3494d9ee8891ffbc560a157538b98e183ea29c68547ad18b01a930c54957996409deb90e78c1164d5e5ce2d9fc4d WHIRLPOOL 31c3ca5b9081d9ab87075b0a86388eda90da82d2c06e1897658799114d0caa9fcd64f5fe48c82295a0bc3b0c7636f7321397b65622a1cbbeaf8635bf9a0be8c5
+MISC ChangeLog 2938 SHA256 dbc1f35f443ea04b4aff8f41a60a1b9bf0f3a237549c6e9072b8e4ab9f0f5653 SHA512 32c55a03208d65419ec1ad3f6b1e7fe1fe7b08ee572b439a6b5af3be10798dd4a57f61447f1275b7b4932a8d7016f58967d6df12c8c78a70822dfe58bb1f8855 WHIRLPOOL 693cb97d79994e798e6971dce933b01465a57ac400e57a10e6d68a3ee133ff169c042c1093b3b1678ca0d07263fa616598d79204399018410ef3ac8b37d98f2a
+MISC ChangeLog-2015 8971 SHA256 8d8d46117d34223bac70fc28cc20c3402e31382a5bb3713ddfa608cd3bd735c2 SHA512 88c9f799b54e3a79df52416b92680ff4d37fb5aed78ab6685d56833f38310114ac3cac258906be27879548511baa2cfb499ca87883bed1e2c82a02ecb10b4cee WHIRLPOOL ba0b863a14424c111fe20438bd9d4558bb1eb7e935248cb7145aff24237f3516a5b19ff2d30d50db680423a2a2a43097a4ce50a8e9e4858057f5ad63154875cc
+MISC metadata.xml 832 SHA256 9ccfd52757644e218266ff90b4ea9ab35203531bbc36f44ab67f214bc5ca448a SHA512 0209f1adfd521cabc7b37a69d3ba8842a8d612487cb414d7aa16eccf461e78c4ab96c1387606badb896acd6a7a495697c30773c8eb5c74e949e22910212a9d44 WHIRLPOOL 5cf73605832e04c08442d3f4b990074403dffead964cc3f70325583ca6bdec171da125a0fe6613e83f49fc5d244287f58996f43b8fc8ae4c60d496fd093a2c4f
diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1-r4.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1-r4.ebuild
new file mode 100644
index 000000000000..88d59bffe3fa
--- /dev/null
+++ b/net-analyzer/dsniff/dsniff-2.4_beta1-r4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit autotools eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A collection of tools for network auditing and penetration testing"
+HOMEPAGE="http://monkey.org/~dugsong/dsniff/"
+SRC_URI="http://monkey.org/~dugsong/${PN}/beta/${P/_beta/b}.tar.gz
+	mirror://debian/pool/main/d/${PN}/${PN}_2.4b1+debian-18.diff.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="X"
+
+DEPEND="net-libs/libpcap
+	>=net-libs/libnet-1.1.2.1-r1
+	>=net-libs/libnids-1.21
+	>=dev-libs/openssl-0.9.6e
+	>=sys-libs/db-4.2.52_p4
+	sys-apps/sed
+	X? ( x11-libs/libXmu )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P/_beta1/}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Debian's patchset
+	epatch "${DISTDIR}"/${PN}_2.4b1+debian-18.diff.gz
+	epatch "${S}"/dsniff-2.4b1+debian/debian/patches/*.dpatch
+
+	sed -i 's:-DDSNIFF_LIBDIR=\\\"$(libdir)/\\\"::' Makefile.in || die "sed makefile"
+	epatch "${FILESDIR}"/2.3-makefile.patch
+
+	# Bug 125084
+	epatch "${FILESDIR}"/${PV}-httppostfix.patch
+
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_with X x) \
+		|| die "econf failed"
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	emake install install_prefix="${D}" || die "emake install failed"
+	dodir /etc/dsniff
+	cp "${D}"/usr/share/dsniff/{dnsspoof.hosts,dsniff.{magic,services}} \
+		"${D}"/etc/dsniff/
+	dodoc CHANGES README TODO
+}
diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1-r7.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1-r7.ebuild
new file mode 100644
index 000000000000..076b0aa2199e
--- /dev/null
+++ b/net-analyzer/dsniff/dsniff-2.4_beta1-r7.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A collection of tools for network auditing and penetration testing"
+HOMEPAGE="http://monkey.org/~dugsong/dsniff/"
+SRC_URI="
+	http://monkey.org/~dugsong/${PN}/beta/${P/_beta/b}.tar.gz
+	mirror://debian/pool/main/d/${PN}/${PN}_2.4b1+debian-22.1.debian.tar.gz
+"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="libressl X"
+
+DEPEND="net-libs/libpcap
+	>=net-libs/libnet-1.1.2.1-r1
+	>=net-libs/libnids-1.21
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=sys-libs/db-4:*
+	X? ( x11-libs/libXmu )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P/_beta1/}"
+
+src_prepare() {
+	# Debian patchset, needs to be applied in the exact order that "series"
+	# lists or patching will fail.
+	# Bug #479882
+	epatch $(
+		for file in $(< "${WORKDIR}"/debian/patches/series ); do
+			printf "%s/debian/patches/%s " "${WORKDIR}" "${file}"
+		done
+	)
+
+	# Bug 125084
+	epatch "${FILESDIR}"/${PV}-httppostfix.patch
+
+	# various Makefile.in patches
+	epatch "${FILESDIR}"/${PV}-make.patch
+
+	# bug #538462
+	epatch "${FILESDIR}"/${PV}-macof-size-calculation.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with X x) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake install install_prefix="${D}"
+	dodir /etc/dsniff
+	cp "${D}"/usr/share/dsniff/{dnsspoof.hosts,dsniff.{magic,services}} \
+		"${D}"/etc/dsniff/
+	dodoc CHANGES README TODO
+}
diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1-r9.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1-r9.ebuild
new file mode 100644
index 000000000000..0ea1f57476ba
--- /dev/null
+++ b/net-analyzer/dsniff/dsniff-2.4_beta1-r9.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A collection of tools for network auditing and penetration testing"
+HOMEPAGE="http://monkey.org/~dugsong/dsniff/"
+SRC_URI="
+	http://monkey.org/~dugsong/${PN}/beta/${P/_beta/b}.tar.gz
+	mirror://debian/pool/main/d/${PN}/${PN}_2.4b1+debian-22.1.debian.tar.gz
+"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="libressl X"
+
+DEPEND="net-libs/libpcap
+	>=net-libs/libnet-1.1.2.1-r1
+	>=net-libs/libnids-1.21
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=sys-libs/db-4:*
+	|| (	<sys-libs/glibc-2.26[rpc]
+		(
+			>=sys-libs/glibc-2.26
+			net-libs/rpcsvc-proto
+			net-libs/libtirpc
+			net-libs/libnsl
+		)
+	)
+	X? ( x11-libs/libXmu )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P/_beta1/}"
+
+src_prepare() {
+	# replace Debian patch 23 with a simpler one (bug #506076)
+	mv -v \
+		"${WORKDIR}"/debian/patches/23_urlsnarf_timestamp.patch{,.old} || die
+	cp -v \
+		"${FILESDIR}"/${PV}-urlsnarf-pcap_timestamps.patch \
+		"${WORKDIR}"/debian/patches/23_urlsnarf_timestamp.patch || die
+
+	# Debian patchset, needs to be applied in the exact order that "series"
+	# lists or patching will fail.
+	# Bug #479882
+	epatch $(
+		for file in $(< "${WORKDIR}"/debian/patches/series ); do
+			printf "%s/debian/patches/%s " "${WORKDIR}" "${file}"
+		done
+	)
+
+	# Bug 125084
+	epatch "${FILESDIR}"/${PV}-httppostfix.patch
+
+	# various Makefile.in patches
+	epatch "${FILESDIR}"/${PV}-make.patch
+
+	# bug #538462
+	epatch "${FILESDIR}"/${PV}-macof-size-calculation.patch
+
+	# allow building against libtirpc, needed for glibc-2.26, bug 381391
+	epatch "${FILESDIR}"/${PV}-libtirpc.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with X x) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake install install_prefix="${D}"
+	dodir /etc/dsniff
+	cp "${D}"/usr/share/dsniff/{dnsspoof.hosts,dsniff.{magic,services}} \
+		"${D}"/etc/dsniff/
+	dodoc CHANGES README TODO
+}
diff --git a/net-analyzer/dsniff/files/2.3-makefile.patch b/net-analyzer/dsniff/files/2.3-makefile.patch
new file mode 100644
index 000000000000..6225ec2f4473
--- /dev/null
+++ b/net-analyzer/dsniff/files/2.3-makefile.patch
@@ -0,0 +1,29 @@
+--- a/Makefile.in	2003-08-25 18:07:17.000000000 +1200
++++ b/Makefile.in	2003-08-25 18:29:13.000000000 +1200
+@@ -94,7 +94,7 @@
+ 	$(RANLIB) $@
+ 
+ dsniff: $(HDRS) $(SRCS) $(OBJS)
+-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(DBLIB) $(SSLLIB)
++	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(DBLIB) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(SSLLIB)
+ 
+ arpspoof: arpspoof.o arp.o
+ 	$(CC) $(LDFLAGS) -o $@ arpspoof.o arp.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+@@ -115,7 +115,7 @@
+ 	$(CC) $(LDFLAGS) -o $@ msgsnarf.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+ 
+ sshmitm: sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o
+-	$(CC) $(LDFLAGS) -o $@ sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB)
++	$(CC) $(LDFLAGS) -o $@ sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o $(LIBS) $(DBLIB) $(LNETLIB) $(SSLLIB)
+ 
+ tcpkill: tcpkill.o pcaputil.o
+ 	$(CC) $(LDFLAGS) -o $@ tcpkill.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+@@ -130,7 +130,7 @@
+ 	$(CC) $(LDFLAGS) -o $@ urlsnarf.o base64.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+ 
+ webmitm: webmitm.o base64.o buf.o decode_http.o record.o
+-	$(CC) $(LDFLAGS) -o $@ webmitm.o base64.o buf.o decode_http.o record.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB)
++	$(CC) $(LDFLAGS) -o $@ webmitm.o base64.o buf.o decode_http.o record.o $(LIBS) $(DBLIB) $(LNETLIB) $(SSLLIB)
+ 
+ webspy: webspy.o base64.o buf.o remote.o
+ 	$(CC) $(LDFLAGS) -o $@ webspy.o base64.o buf.o remote.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(X11LIB)
diff --git a/net-analyzer/dsniff/files/2.4_beta1-httppostfix.patch b/net-analyzer/dsniff/files/2.4_beta1-httppostfix.patch
new file mode 100644
index 000000000000..62c9a90fe8e3
--- /dev/null
+++ b/net-analyzer/dsniff/files/2.4_beta1-httppostfix.patch
@@ -0,0 +1,20 @@
+--- a/decode_http.c	2000-12-19 07:38:05.000000000 +0800
++++ b/decode_http.c	2006-03-05 22:32:14.000000000 +0800
+@@ -139,14 +139,14 @@
+ 				host = p;
+ 			}
+ 			else if (req[0] == 'P') {
+-				if (strncmp(p, "Content-type: ", 14) == 0) {
+-					if (strncmp(p + 14, "application/"
++				if (strncasecmp(p, "Content-type: ", 14) == 0) {
++					if (strncasecmp(p + 14, "application/"
+ 						    "x-www-form-urlencoded",
+ 						    33) != 0) {
+ 						query = NULL;
+ 					}
+ 				}
+-				else if (strncmp(p, "Content-length: ", 16) == 0) {
++				else if (strncasecmp(p, "Content-length: ", 16) == 0) {
+ 					p += 16;
+ 					i = atoi(p);
+ 					if ((msg = buf_tok(&inbuf, NULL, i)) == NULL)
diff --git a/net-analyzer/dsniff/files/2.4_beta1-libtirpc.patch b/net-analyzer/dsniff/files/2.4_beta1-libtirpc.patch
new file mode 100644
index 000000000000..00c271ab9f93
--- /dev/null
+++ b/net-analyzer/dsniff/files/2.4_beta1-libtirpc.patch
@@ -0,0 +1,22 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -37,8 +37,8 @@
+ X11INC	= @X_CFLAGS@
+ X11LIB	= @X_LIBS@ @X_PRE_LIBS@ -lXmu -lX11 @X_EXTRA_LIBS@
+ 
+-INCS	= -I. $(X11INC) -I$(srcdir)/missing 
+-LIBS	= @LIBS@ -L$(srcdir) -lmissing
++INCS	= -I. $(X11INC) -I$(srcdir)/missing @TIRPC_CFLAGS@
++LIBS	= @LIBS@ -L$(srcdir) -lmissing @TIRPC_LIBS@
+ 
+ INSTALL	= @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+--- a/configure.in
++++ b/configure.in
+@@ -338,4 +338,6 @@
+ AC_SUBST(SSLINC)
+ AC_SUBST(SSLLIB)
+ 
++PKG_CHECK_MODULES([TIRPC], [libtirpc], [], [AC_MSG_NOTICE([Using glibc rpc support])])
++
+ AC_OUTPUT(Makefile)
diff --git a/net-analyzer/dsniff/files/2.4_beta1-macof-size-calculation.patch b/net-analyzer/dsniff/files/2.4_beta1-macof-size-calculation.patch
new file mode 100644
index 000000000000..068133de2e4d
--- /dev/null
+++ b/net-analyzer/dsniff/files/2.4_beta1-macof-size-calculation.patch
@@ -0,0 +1,11 @@
+--- a/macof.c
++++ b/macof.c
+@@ -134,7 +134,7 @@ main(int argc, char *argv[])
+ 		libnet_build_tcp(sport, dport, seq, 0, TH_SYN, 512,
+ 				 0, 0, LIBNET_TCP_H, NULL, 0, l, 0);
+ 		
+-		libnet_build_ipv4(LIBNET_TCP_H, 0,
++		libnet_build_ipv4(LIBNET_IPV4_H + LIBNET_TCP_H, 0,
+ 				  libnet_get_prand(LIBNET_PRu16), 0, 64,
+ 				  IPPROTO_TCP, 0, src, dst, NULL, 0, l, 0);
+ 		
diff --git a/net-analyzer/dsniff/files/2.4_beta1-make.patch b/net-analyzer/dsniff/files/2.4_beta1-make.patch
new file mode 100644
index 000000000000..a8dc2b627ad6
--- /dev/null
+++ b/net-analyzer/dsniff/files/2.4_beta1-make.patch
@@ -0,0 +1,62 @@
+--- a/Makefile.in	2010-09-20 12:12:25.000000000 +0200
++++ b/Makefile.in	2010-09-20 12:12:26.000000000 +0200
+@@ -16,7 +16,7 @@
+ mandir		= @mandir@
+ 
+ CC	= @CC@
+-CFLAGS	= @CFLAGS@ -DDSNIFF_LIBDIR=\"$(libdir)/\"
++CFLAGS	= @CFLAGS@ 
+ LDFLAGS	= @LDFLAGS@
+ 
+ PCAPINC = @PCAPINC@
+@@ -75,12 +75,20 @@
+ .c.o:
+ 	$(CC) $(CFLAGS) $(INCS) -c $(srcdir)/$*.c
+ 
+-all: libmissing.a $(PROGS)
++all: $(PROGS)
++
++$(PROGS): libmissing.a
++
++$(OBJS): $(GEN)
+ 
++mount.h: mount.x
++	rpcgen -h mount.x -o mount.h
++
+ mount.c: mount.x
+-	rpcgen -h mount.x -o mount.h
+ 	rpcgen -c mount.x -o mount.c
+ 
++nfs_prot.h: nfs_prot.x	
++	rpcgen -h nfs_prot.x -o nfs_prot.h
++
+ nfs_prot.c: nfs_prot.x
+-	rpcgen -h nfs_prot.x -o nfs_prot.h
+ 	rpcgen -c nfs_prot.x -o nfs_prot.c
+@@ -93,7 +97,7 @@
+ 	$(RANLIB) $@
+ 
+ dsniff: $(HDRS) $(SRCS) $(OBJS)
+-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(DBLIB) $(SSLLIB)
++	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(DBLIB) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(SSLLIB)
+ 
+ arpspoof: arpspoof.o arp.o
+ 	$(CC) $(LDFLAGS) -o $@ arpspoof.o arp.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+@@ -114,7 +118,7 @@
+ 	$(CC) $(LDFLAGS) -o $@ msgsnarf.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+ 
+ sshmitm: sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o
+-	$(CC) $(LDFLAGS) -o $@ sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB)
++	$(CC) $(LDFLAGS) -o $@ sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o $(LIBS) $(DBLIB) $(LNETLIB) $(SSLLIB)
+ 
+ sshow: sshow.o pcaputil.o
+ 	$(CC) $(LDFLAGS) -o $@ sshow.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+@@ -132,7 +136,7 @@
+ 	$(CC) $(LDFLAGS) -o $@ urlsnarf.o base64.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+ 
+ webmitm: webmitm.o base64.o buf.o decode_http.o record.o
+-	$(CC) $(LDFLAGS) -o $@ webmitm.o base64.o buf.o decode_http.o record.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB)
++	$(CC) $(LDFLAGS) -o $@ webmitm.o base64.o buf.o decode_http.o record.o $(LIBS) $(DBLIB) $(LNETLIB) $(SSLLIB)
+ 
+ webspy: webspy.o base64.o buf.o remote.o
+ 	$(CC) $(LDFLAGS) -o $@ webspy.o base64.o buf.o remote.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(X11LIB)
diff --git a/net-analyzer/dsniff/files/2.4_beta1-urlsnarf-pcap_timestamps.patch b/net-analyzer/dsniff/files/2.4_beta1-urlsnarf-pcap_timestamps.patch
new file mode 100644
index 000000000000..a2a7a36966ac
--- /dev/null
+++ b/net-analyzer/dsniff/files/2.4_beta1-urlsnarf-pcap_timestamps.patch
@@ -0,0 +1,15 @@
+Author: Hilko Bengen <bengen@debian.org>
+Description: urlsnarf: use timestamps from pcap file if available. Closes: #573365
+Index: dsniff-2.4b1+debian/urlsnarf.c
+===================================================================
+--- a/urlsnarf.c
++++ b/urlsnarf.c
+@@ -57,7 +57,7 @@
+ {
+ 	static char tstr[32], sign;
+ 	struct tm *t, gmt;
+-	time_t tt = time(NULL);
++	time_t tt = nids_last_pcap_header->ts.tv_sec;
+ 	int days, hours, tz, len;
+ 	
+ 	gmt = *gmtime(&tt);
diff --git a/net-analyzer/dsniff/metadata.xml b/net-analyzer/dsniff/metadata.xml
new file mode 100644
index 000000000000..87cd1022ae11
--- /dev/null
+++ b/net-analyzer/dsniff/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<longdescription>
+dsniff is a collection of tools for network auditing and penetration testing.
+dsniff, filesnarf, mailsnarf, msgsnarf, urlsnarf, and webspy passively monitor a
+network for interesting data (passwords, e-mail, files, etc.). arpspoof,
+dnsspoof, and macof facilitate the interception of network traffic normally
+unavailable to an attacker (e.g, due to layer-2 switching). sshmitm and webmitm
+implement active monkey-in-the-middle attacks against redirected SSH and HTTPS
+sessions by exploiting weak bindings in ad-hoc PKI.
+</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/echoping/Manifest b/net-analyzer/echoping/Manifest
new file mode 100644
index 000000000000..b46367e8d8e8
--- /dev/null
+++ b/net-analyzer/echoping/Manifest
@@ -0,0 +1,9 @@
+AUX echoping-6.0.2_p434-fix_implicit_declarations.patch 422 SHA256 67c033800beba27e74e842fa8b55d080ccdd950eecaae05aa23d6d2334ecf96d SHA512 533a7da90d5ba39d4d4137d5e00e74b010cdf3ec957a46fdf39588e8b87e2d75382d14cc53f4b0b7c0aea029d5327353cd79975011c637390872bab8a3846be2 WHIRLPOOL c32b814acef08cd1633932547a58959fd0ed9dacce9bbdeceac5d5d4864939b690332fe0f0a3f126b58355b9f1e6771cbd29dcff969c97903a153cb42aa13fb8
+AUX echoping-6.0.2_p434-gnutls_certificate_type_set_priority.patch 595 SHA256 388f5dfa10225aef8390ef6e1ac7934041081391e815c4538a426d45af148c7f SHA512 4bec1c8a77f17a163437dca9ce2ef49a355db041b08df7eb087352e03eede069f869e271d9414fc62d88a5e36687787e4719e7405f4b5ba96bbf8534af06ca52 WHIRLPOOL b642814bd91337752aceb15eb41d388a45bd411566d7205ce05d258ce92108c07eaf7a5469f91ea038227322c52ee6c753a4e805ae6b31ead7a57898650ee4e3
+AUX echoping-6.0.2_p434-gnutls_session.patch 492 SHA256 6223043e4dab8a6c5367b83168678dcd6c8984ffb8ef3ff2d812c8ee2b35c211 SHA512 99362748feb0ab02172ee4f21c9630c505b899c78483077ef4f056e136854037ea165dd57d2637bed791ff3e8407b08733efab864d68e726b0d31d31a4c17525 WHIRLPOOL edb67cbffc7ad3784bbf90c332e6d0927580f375c5fe6e586b699685a9aee17dcdd93e5f2d0c50a83fbe2b7bf6a5e4362074bbf552c236fbde1d74dcc3c1a033
+DIST echoping-6.0.2_p434.tar.gz 74568 SHA256 152a4a9d2a3962fa8cb95eeb29b5d22a7039d4408f5ba22286259856f095baf7 SHA512 1b4f5f1ea6ba000c558cab3b8e86758d6c539d8cd237620000d837b468861a177ac733441c885eb8ec1c35b49baa33a82e34e3f8b14b05429a075b72233d5799 WHIRLPOOL cae10459766311ded4f6459e519461fb91de7dd9429679927c3955a5a9b09b9b9a9706947b3a5c1495805367c91cf2035d3154a3ff180241782deec304eb8aaf
+EBUILD echoping-6.0.2_p434-r2.ebuild 1333 SHA256 4e29d137d5ebd5b61fb6852ce04945170ea5a5409cc91860f43f80b2124d47e9 SHA512 9f308e6a3766a8f7d7dc98d6abb70904931f8894c01b6a1e54198ca1205ebd53ebbf7184664bee1e4130ff639bd0dd1790d7d4a01f9dbc6d9041a28f1d69a667 WHIRLPOOL d2e206813fd8f66b79405ab6a3aab8228f6b2eb910beadcdbc30fa5a24e901fa4eeddfaab114beda98b6a8fdfd39f8e6e206c0642092457f15eac2887a77d3be
+EBUILD echoping-6.0.2_p434-r3.ebuild 1394 SHA256 e9c1a79ec8ebbe51c66c66aa1dc1020c857f2349d26e53692262fdc9d1c6d66f SHA512 78b79c0238264d0b26c816a622016141624d4d316174f44d200cd39782a793f0bd13cf6cb88395194288ae6021186dcbb2a19b5cd1157f42059880dea019aac0 WHIRLPOOL ccc1f5289a0e955fb3d0a08215290b0a5792107e07ca1f393a96b527b5fc1757a669fca3e05879ef72d4f58123333bb00cdff2adbe97d1410d8d3e513d28c8d0
+MISC ChangeLog 4369 SHA256 92980be9bdb227396c7d1fd8f87184ef1c8558cf173c6810a4771d7ae841b8b5 SHA512 2f9013f59a64ec6a2aa137d3aad856915002c0234a4a3fb528d26a34d9da42b0ddc38b4ae1096f6f5724ec85db592028522604903e6cea409a68a173c496ee1f WHIRLPOOL 982926483ef537092c4772d6c9454e5a8e80798703ea07678d59df19b1f34472df68997b6972e210ebb6c443dc608d768a9150f7aef186f10d71008a40438874
+MISC ChangeLog-2015 5461 SHA256 a52bc6d106a5a9cf775dd882b5fd5a85c07a6d87c7252ab99fb829895d9c7067 SHA512 809507d83704d65b96a6b735ccbc583bdac56481b980f919ac4c674326e732dcc68b08c1d464f818563b0b86953dacc5eecfebfc1859344a5788fd3117f3cfd3 WHIRLPOOL b357db1a6be67c4891745ed459ed47b554c138b02ef3bbcfbca634bbbc7b46ba9b5460a6697157b838bc91eaa6139ef1005220951fe1c874553b80ca8202a3ed
+MISC metadata.xml 702 SHA256 8d039d0c2f5b51dec82f8ca0220c8bfed464d447385f68f0a06bfe72fb8ecbe9 SHA512 db906d89ac30011c740e44f73fad23a4f9b8d8c318b6a0b9240e17dc31c897850ed2f22890b8516633c6a10f44154b77a4c198e851eb8793a55c36497ebb702f WHIRLPOOL 8d85ec7a1eb3a1b8135573c31e63a02ddc544ee2cb2d4ead2ba0f2e2e26182f6fc54ac7b11b323753c07440f280a0de665393611c8736edd841cf4fec8e8e054
diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r2.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434-r2.ebuild
new file mode 100644
index 000000000000..1b004aa80cfb
--- /dev/null
+++ b/net-analyzer/echoping/echoping-6.0.2_p434-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Small program to test performances of remote servers"
+HOMEPAGE="http://echoping.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="amd64 ~hppa x86"
+IUSE="gnutls http icp idn priority smtp ssl tos postgres ldap"
+RESTRICT="test"
+
+RDEPEND="idn? ( net-dns/libidn )
+	postgres? ( dev-db/postgresql:* )
+	ldap? ( net-nds/openldap )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-3.3:= )
+		!gnutls? ( >=dev-libs/openssl-0.9.7d:= )
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2"
+
+REQUIRED_USE="gnutls? ( ssl )"
+
+DOCS=( README AUTHORS ChangeLog DETAILS NEWS TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-6.0.2_p434-fix_implicit_declarations.patch
+	epatch "${FILESDIR}"/${PN}-6.0.2_p434-gnutls_certificate_type_set_priority.patch
+	epatch "${FILESDIR}"/${PN}-6.0.2_p434-gnutls_session.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable http)  \
+		$(use_enable icp) \
+		$(use_enable priority) \
+		$(use_enable smtp) \
+		$(use_enable tos) \
+		$(use_with idn libidn) \
+		$(usex gnutls $(use_with gnutls) $(use_with ssl)) \
+		--config-cache \
+		--disable-static \
+		--disable-ttcp
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r3.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434-r3.ebuild
new file mode 100644
index 000000000000..0a565e6bf158
--- /dev/null
+++ b/net-analyzer/echoping/echoping-6.0.2_p434-r3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Small program to test performances of remote servers"
+HOMEPAGE="http://echoping.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="libressl gnutls http icp idn priority smtp ssl tos postgres ldap"
+RESTRICT="test"
+
+RDEPEND="idn? ( net-dns/libidn )
+	postgres? ( dev-db/postgresql:* )
+	ldap? ( net-nds/openldap )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-3.3:= )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2"
+
+REQUIRED_USE="gnutls? ( ssl )"
+
+DOCS=( README AUTHORS ChangeLog DETAILS NEWS TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-6.0.2_p434-fix_implicit_declarations.patch
+	epatch "${FILESDIR}"/${PN}-6.0.2_p434-gnutls_certificate_type_set_priority.patch
+	epatch "${FILESDIR}"/${PN}-6.0.2_p434-gnutls_session.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable http)  \
+		$(use_enable icp) \
+		$(use_enable priority) \
+		$(use_enable smtp) \
+		$(use_enable tos) \
+		$(use_with idn libidn) \
+		$(usex gnutls $(use_with gnutls) $(use_with ssl)) \
+		--config-cache \
+		--disable-static \
+		--disable-ttcp
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/net-analyzer/echoping/files/echoping-6.0.2_p434-fix_implicit_declarations.patch b/net-analyzer/echoping/files/echoping-6.0.2_p434-fix_implicit_declarations.patch
new file mode 100644
index 000000000000..c2fd2f6886cb
--- /dev/null
+++ b/net-analyzer/echoping/files/echoping-6.0.2_p434-fix_implicit_declarations.patch
@@ -0,0 +1,20 @@
+--- a/echoping.h
++++ b/echoping.h
+@@ -194,6 +194,7 @@
+ #endif
+ /* util.c */
+ char           *random_string();
++char           *to_upper();
+ void            tvsub();
+ void            tvadd();
+ void            tvavg();
+--- a/plugins/ldap/ldap.c
++++ b/plugins/ldap/ldap.c
+@@ -9,6 +9,7 @@
+ #include "../../config.h"
+ #include "config.h"
+ #endif
++#define LDAP_DEPRECATED 1
+ #include <ldap.h>
+ 
+ const char     *request = NULL;
diff --git a/net-analyzer/echoping/files/echoping-6.0.2_p434-gnutls_certificate_type_set_priority.patch b/net-analyzer/echoping/files/echoping-6.0.2_p434-gnutls_certificate_type_set_priority.patch
new file mode 100644
index 000000000000..0cb219f254cb
--- /dev/null
+++ b/net-analyzer/echoping/files/echoping-6.0.2_p434-gnutls_certificate_type_set_priority.patch
@@ -0,0 +1,11 @@
+--- a/echoping.c
++++ b/echoping.c
+@@ -981,8 +981,6 @@
+                     if (tls_result != 0)
+                         err_sys("Cannot create a new TLS session");
+                     gnutls_set_default_priority(session);
+-                    gnutls_certificate_type_set_priority(session,
+-                                                         cert_type_priority);
+                     gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
+                     gnutls_transport_set_ptr(session, (gnutls_transport_ptr)
+                                              (long) sockfd);
diff --git a/net-analyzer/echoping/files/echoping-6.0.2_p434-gnutls_session.patch b/net-analyzer/echoping/files/echoping-6.0.2_p434-gnutls_session.patch
new file mode 100644
index 000000000000..8b87c47c7892
--- /dev/null
+++ b/net-analyzer/echoping/files/echoping-6.0.2_p434-gnutls_session.patch
@@ -0,0 +1,22 @@
+--- a/echoping.c
++++ b/echoping.c
+@@ -134,7 +134,7 @@
+     SSL            *sslh = NULL;
+ #endif
+ #ifdef GNUTLS
+-    gnutls_session  session;
++    gnutls_session_t  session;
+     gnutls_certificate_credentials xcred;
+     int             tls_result;
+     const int       cert_type_priority[3] = { GNUTLS_CRT_X509,
+--- a/echoping.h
++++ b/echoping.h
+@@ -103,7 +103,7 @@
+     SSL            *ssl;
+ #endif
+ #ifdef GNUTLS
+-    gnutls_session  tls;
++    gnutls_session_t  tls;
+ #endif
+ } CHANNEL;
+ 
diff --git a/net-analyzer/echoping/metadata.xml b/net-analyzer/echoping/metadata.xml
new file mode 100644
index 000000000000..723d8a307977
--- /dev/null
+++ b/net-analyzer/echoping/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<use>
+		<flag name="http">enable support for http protocol.</flag>
+		<flag name="icp">enable support for ICP (used to monitor proxies).</flag>
+		<flag name="priority">enable socket priority support.</flag>
+		<flag name="smtp">enable support for SMTP protocol.</flag>
+		<flag name="tos">enable support for TOS (TYpe Of Service).</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">echoping</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/egressor/Manifest b/net-analyzer/egressor/Manifest
new file mode 100644
index 000000000000..25685a596308
--- /dev/null
+++ b/net-analyzer/egressor/Manifest
@@ -0,0 +1,7 @@
+AUX 1.0-flags.patch 578 SHA256 6e59c00d844e8516ff6a78e05ed83baa93af7b72796a23e5f4f1e985ba9c77a7 SHA512 aecc7970d9a9e877adf750e29813ad6a685370dc9ea72f34b86a5ddbafcf616db0636b4173e4ba445ac9c3d6a21e2aae26cce1889ba901ac9dea6af79243657a WHIRLPOOL 614866709ccd5aed8f80a5f013e25c4c3bd6fa6c9e4382e92abb1dd061e1ef238fa3f57e2474b59e4f14d6cc2bce7603274d98a3964f011646b96f48654a5bed
+AUX 1.0-libnet-1.0.patch 250 SHA256 ea009e63b6d418d16d172118f0d7fd12f6513c66077bb799527110749151d36b SHA512 eff978e5c4a9a99073b1280aa5369ecbb6100364332cb810bacb3bc4ddd316638ff6a8968923b51e4f72a79ddd994646d03000b3fa3f576ad8d898eea493e089 WHIRLPOOL 90e2fd7e3b0d65e5b44c5f454e08116e91787df6ff6afe3b1fa9904d551de62deaeb3b504a7752c1134e26066d124507fc641f6ecbc2fc998cb90d389474bfc2
+DIST egressor_release1.0.tar.gz 28746 SHA256 3608ae0d76f76513318ce57fe986936ec890650cb311762b374f463ffd898fba SHA512 dfb1ee553ccfb92429fe68df06db031e5cbca41fe4fda36961ba8121d79de03a7dc36febc5a58561c3de9b1412cc90811f5ddc8b156aab8282b0dc3c14cd7aec WHIRLPOOL e2307f897e6b0c0f813577f6c367285b61ee8204acc51db4bccf3f4133bdc0044c27e6b3057cdc9d7f93d271c22d0251e3fdd1dd780d9811c344dbde75320fe6
+EBUILD egressor-1.0-r2.ebuild 779 SHA256 36e0e7c5aa36f7a95cbb086e49bd0b7a8be812320efd9290bb4f6a143f273d21 SHA512 39c24de70760c687789ba9ef67b1aa362c3e602a3df6b9b8afcda7c4b78637d88752292e92bff8fdf590242b70c7c2a19d532f6faa3f88f7a53a9e894587df41 WHIRLPOOL 8353f3ae4b50a5ea44c24ba660144470a2cbf55bb0b33cb2166d329db106d5c40d1bd3013aca5f6dfc9e9cff9ef44855e4bb534b151615321bf4270f7bd5f56a
+MISC ChangeLog 2489 SHA256 0d31986c9998124d1782badc3db26cd1e53278a2ec8c2eba0b0fa97855eb049b SHA512 835c0829a65f38b18e809ff89a65031ce117b443b9520973a5e26e3efde97cf2ef8256092315150d0d6ce8763da2eb18ef64a5a5c027249b58d1398ea6f9eab3 WHIRLPOOL 3d277d9fdbebd06303df0128985fcd9b8dda0075c83abac4e426dc0452c751cd1e724c95fdc283ebce9393b56100666736367f9caf05d30c2f18a85c2912b98f
+MISC ChangeLog-2015 2385 SHA256 c7a378b69fc0a39a4f492cef900541469ec32ea38f0e75f2f4caf4d2d6e8b22f SHA512 c9744a66f1439873380f8a84008a9bcf86caf5041617bd2fc11357b2ec9fe517278acb2a4b29a0688e82513545c20a0cf1ec85ebc89bb5c2d8eaec77f97cd361 WHIRLPOOL b651b751ebb65356b08f7f5dec18ad281fa8bfb9cb2f6a32ee0f9995e38cdfa310d3ce2fd31ff34b5bc019053f8ace6c32b40b6a88ea51381cb9fb2cae847d88
+MISC metadata.xml 350 SHA256 1856a1e6caeb2a782fcee68adc8c8c52e471460619e1fb06967b72fefc1bb1b5 SHA512 fee212446254d141db6165f5e1da517976f7bda7e972e8a4984002bc164a02faddf242da8cfaf7b2c9d31e22c1387e71b3779fd572c544abd8b297365f1f2162 WHIRLPOOL 64ac028d08e09be2516c93f3be16f6f7e0cd277dc8bbdb023bb940000f45fcb4c297ee3576013f9759d3343563a424a118ecce565f3acca839dfae03c5e3894c
diff --git a/net-analyzer/egressor/egressor-1.0-r2.ebuild b/net-analyzer/egressor/egressor-1.0-r2.ebuild
new file mode 100644
index 000000000000..bac30f82bf2b
--- /dev/null
+++ b/net-analyzer/egressor/egressor-1.0-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="tool for checking router configuration"
+HOMEPAGE="http://packetfactory.openwall.net/projects/egressor/"
+SRC_URI="${HOMEPAGE}${PN}_release${PV}.tar.gz"
+
+LICENSE="egressor"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+DEPEND="<net-libs/libnet-1.1
+	>=net-libs/libnet-1.0.2a-r3"
+RDEPEND="net-libs/libpcap
+	dev-perl/Net-RawIP
+	dev-lang/perl"
+
+S=${WORKDIR}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PV}-libnet-1.0.patch \
+		"${FILESDIR}"/${PV}-flags.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake -C client
+}
+
+src_install() {
+	dobin client/egressor server/egressor_server.pl
+	dodoc README client/README-CLIENT server/README-SERVER
+}
diff --git a/net-analyzer/egressor/files/1.0-flags.patch b/net-analyzer/egressor/files/1.0-flags.patch
new file mode 100644
index 000000000000..03368b05dbaa
--- /dev/null
+++ b/net-analyzer/egressor/files/1.0-flags.patch
@@ -0,0 +1,22 @@
+--- a/client/Makefile
++++ b/client/Makefile
+@@ -5,8 +5,8 @@
+ #----------------------------------------------------------------------
+ 
+ 
+-CC          =   gcc
+-CFLAGS      =   -O3 -funroll-loops -fomit-frame-pointer -Wall -DMD=5
++CC          ?=   gcc
++CFLAGS      +=   -Wall -DMD=5
+ #CFLAGS2	    =   -O -DMD=5
+ OBJECTS     =   egressor.o md5c.o      \
+                 
+@@ -21,7 +21,7 @@
+ 
+ 
+ egressor:  egressor.o md5c.o
+-	$(CC) egressor.o $(LIBS) -o ./egressor
++	$(CC) $(CFLAGS) $(LDFLAGS) egressor.o $(LIBS) -o ./egressor
+ 
+ md5c.o: global.h md5.h
+ 	$(CC) -c $(CFLAGS) md5c.c
diff --git a/net-analyzer/egressor/files/1.0-libnet-1.0.patch b/net-analyzer/egressor/files/1.0-libnet-1.0.patch
new file mode 100644
index 000000000000..be7cb4f15c6f
--- /dev/null
+++ b/net-analyzer/egressor/files/1.0-libnet-1.0.patch
@@ -0,0 +1,10 @@
+--- a/client/Makefile
++++ b/client/Makefile
+@@ -15 +15 @@
+-LIBS        =   -L../../lib/ -lnet 
++LIBS        =   -L../../lib/ -lnet-1.0 
+--- a/client/libnet_test.h
++++ b/client/libnet_test.h
+@@ -36 +36 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
diff --git a/net-analyzer/egressor/metadata.xml b/net-analyzer/egressor/metadata.xml
new file mode 100644
index 000000000000..1bb807b42b3a
--- /dev/null
+++ b/net-analyzer/egressor/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<longdescription>tool for checking router configuration</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/etherape/Manifest b/net-analyzer/etherape/Manifest
new file mode 100644
index 000000000000..ba52dde79fa0
--- /dev/null
+++ b/net-analyzer/etherape/Manifest
@@ -0,0 +1,7 @@
+DIST etherape-0.9.14.tar.gz 1438255 SHA256 7447435ef64e569d8e10b6a0525806c01f527e76ae9eed5c84821f545f357ade SHA512 26e018e49bbea9baf8b4056798e2acab1ad1aba51022ab1258d31499d612a7b12567c4d671da45f79785fbe3c1eda6698b4fe201b055e71e13c9f9b0275c91e3 WHIRLPOOL a03dde443caf1258acefa8270636070ca814f4e9bb45a63a3dfff223e3dac0c4efd67f4c0eaebf28160ced65563021801d5aeb16db9d49095b6ff12fe338c60f
+DIST etherape-0.9.15.tar.gz 1449612 SHA256 f8ed6e847f6f34c801a2ceb9d7781edda1d3a270ebc9874a3dd8a37eabd3fa7f SHA512 5a469b5994fa39a76c3966028f513db0a716cf5c447b73048e9d70c3e21824f9ed3f25b82e6d9ed7a88b7be49603311d81f567adfddc2776a44e809de5e0674a WHIRLPOOL ee002d8fad3afc73a9b1cf36cfe73a8168e087ec1e6e9377b728e17a7cb4f9dc4245e1288e50ed17f73f6d6a82b5f93cbacc980353fb8eecb3a084b98f89680e
+EBUILD etherape-0.9.14.ebuild 611 SHA256 895081a8f8d0dddd0cff9cea29b6deadf4503d6975017a907829270d594f4ecc SHA512 2aff3a594f3e24192554249bb6ebcc5002f47a76cd1c74b4913f33cc08bd824c78e89038d8d7a52a241a382479f8057102689be565544c1e96a0c880ef332ed5 WHIRLPOOL f92b522df88b8939e6acde1f5c29f11856ab7d2ee2c476d9da92b0dc1a2f5f9883ff85a9c78ffa7c9397b7160f171e4a832dca5556251cf98000ce409d5cb060
+EBUILD etherape-0.9.15.ebuild 616 SHA256 5d28d94d31718e367676ff1d9d204887f07c2e5efcd44a7db8316dac880dcb94 SHA512 2ab7802a907950422c7c6a475b22620634d51925f05d9f0301393ce5d0a179bfbfc6803daa46296cf386005f96b881cc7a1c96add60b574eb90fb128892b2dbb WHIRLPOOL 5ac63b395f3127cbcbde1f4e9447ea5e463b2b991a67ba6a0b50243631453f4f98f1c931759ccf288371e6cda6cc2e3e43d5a61cb08cc84501d23160867078df
+MISC ChangeLog 2755 SHA256 f1e521af8ddd98af7cfbe208cad75b02c090b1562a2590ad2d487603e02e75d5 SHA512 3cb0bb39c8b8f9d25d95c4a4113b57f06613a15ab3c159416bc6496397617f7481df4f8077f3610cdad4274716b757b8851f4805d313294e832d42e1e08f6c0f WHIRLPOOL 9b6a06dc2e2746196155dbf305fbb8f234bc41796f88a3fd40ad721a38662f3c46e3fff864008787450e490f8b9b0470231b0c07b2e7d21e37f04446357f3641
+MISC ChangeLog-2015 10697 SHA256 5c2ebe410def00003480d59f56b4d6b2756614819a4b30b549df3ca9bcb5840a SHA512 61412c8ae7211d09945653f63eff73c31509b65b2d37542454d36e18eb42890adac8d222ba131d06cbede014ff2c967c4ab2635fa1eb900f206a86fc45aa44f8 WHIRLPOOL 498cd0f8591459c3b6c0514e6067ecb6f81b4cc049d4fd7382767ad28c33fafcb84e7734d99d5c77b01b554db51060e0736fddd1bae38e0d10d6776297224b9e
+MISC metadata.xml 820 SHA256 588147041e5fc479e4e78fcc1a95dda0da65c7565607ff599473996cace5d44c SHA512 8e7b8953034f14069d5d2aad3c0a1b180ec182c9ae8be46bf2b837629e40f0122b4402c0adfeccb1967844c38b241a122a2735df0d63ad475c2355eb4b454e9b WHIRLPOOL 18021ba9eca4810678bd461a41f6341ce24224605db3f98ca527ed33108988e58ff73bf8f2a24691bf2da21700221302864fadd9984d1bc1416478230e910843
diff --git a/net-analyzer/etherape/etherape-0.9.14.ebuild b/net-analyzer/etherape/etherape-0.9.14.ebuild
new file mode 100644
index 000000000000..bc2c11074e7a
--- /dev/null
+++ b/net-analyzer/etherape/etherape-0.9.14.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="A graphical network monitor for Unix modeled after etherman"
+HOMEPAGE="http://etherape.sourceforge.net/"
+SRC_URI="mirror://sourceforge/etherape/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+
+RDEPEND="
+	>=gnome-base/libglade-2.0
+	>=gnome-base/libgnomeui-2.0
+	gnome-base/libgnomecanvas[glade]
+	net-libs/libpcap
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.11.5
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/gnome-doc-utils
+	virtual/pkgconfig
+"
diff --git a/net-analyzer/etherape/etherape-0.9.15.ebuild b/net-analyzer/etherape/etherape-0.9.15.ebuild
new file mode 100644
index 000000000000..725b922c8868
--- /dev/null
+++ b/net-analyzer/etherape/etherape-0.9.15.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="A graphical network monitor for Unix modeled after etherman"
+HOMEPAGE="http://etherape.sourceforge.net/"
+SRC_URI="mirror://sourceforge/etherape/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=gnome-base/libglade-2.0
+	>=gnome-base/libgnomeui-2.0
+	gnome-base/libgnomecanvas[glade]
+	net-libs/libpcap
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.11.5
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/gnome-doc-utils
+	virtual/pkgconfig
+"
diff --git a/net-analyzer/etherape/metadata.xml b/net-analyzer/etherape/metadata.xml
new file mode 100644
index 000000000000..81f2ca0b0fae
--- /dev/null
+++ b/net-analyzer/etherape/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription lang="en">
+		EtherApe is a graphical network monitor for Unix modeled after etherman.
+		Featuring link layer, ip and TCP modes, it displays network activity
+		graphically. Hosts and links change in size with traffic. Color coded
+		protocols display. It supports Ethernet, FDDI, Token Ring, ISDN, PPP
+		and SLIP devices. It can filter traffic to be shown, and can read
+		traffic from a file as well as live from the network.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">etherape</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/ethloop/Manifest b/net-analyzer/ethloop/Manifest
new file mode 100644
index 000000000000..fd2f848b4d94
--- /dev/null
+++ b/net-analyzer/ethloop/Manifest
@@ -0,0 +1,6 @@
+AUX ethloop-10-gcc45.patch 784 SHA256 e9bae29f4073831786ef9ddcef5a75e542ae1fe9319e97e269332723582cf44e SHA512 213978c89fca49f82c47322e91a4ba6a72b92b711b9386de9833b7330e6fa9fb5668d658968669c1eeeddae96a74c32a086ad630410b9c3b8e153a19e720c036 WHIRLPOOL 381102c20a1e8cd393942b75ae6228639fc45dcb02acac93ff15bb80a2bd10999d50da041d2adb1920df376d37ea53498313019973f62724e1b9a0fdccfcf6f9
+DIST ethloop10.tgz 3912 SHA256 d1f7b4500946dc6c0e6fe031fcebc789d9e061645cd775fe4005820a75039b86 SHA512 82ac0114d0d539f5c057101e1e1f0e2eac32e0bd482bd62e6305f7c4863d0776dcff7bc85167dbcfb136d0b430c9008241c2c0250713beb2703cb052b9b71e63 WHIRLPOOL aa0af08ce518c38bf44ea639f5a4466a4d68e1dd1cc2c2b28283f6e8b4fd27f00a157f5ce80a45a6e46f8c0d916f44f675889e0253509639be36bf1d451a4336
+EBUILD ethloop-10-r3.ebuild 592 SHA256 1180299a89b9cdce6127fab8a5bbd616ad339ec85d8c1447f9ca56ba5b4c922a SHA512 5e5761dc8ccb7bbe860372ec80ce9c5eb94775a9f4ea62ad7395276e5878d21ccb85b1c990d9a7d1baf4d2e4389532a81e9e0f5ec7204d0264ab73229fef8e34 WHIRLPOOL 5132bec0c7651a39b63b555897cb185fdd1bf5ea7be190b485a79c5e5fe96808b95a2db7b1025e22b42235c6545e2839b4f5af8a29fc46cddc03f5930dc77173
+MISC ChangeLog 2462 SHA256 6877dab07c455ff1d99d38a6723d84f2bb2a1e32281f79771167bf6984fc82ee SHA512 9ee96cbfa2c331aea0ba5011cf650229f0e8357657bf3a5aec92285eb12c73cf296f7126553570c9cb9413aa37f2137b898c6fb4e5191f975b9d0c126906e8e5 WHIRLPOOL 61ef80a0e3e9577b4e8e973d47a0df66fc082de31f8e3c1abf8f25d2f96a32a18aafc7f57807e46c10615d4827cd07c07d96317156ac31b82ea740f34173eef3
+MISC ChangeLog-2015 1919 SHA256 77420a42880576ec005fa9765c3fbd990b1739beb9a8dfe5cce393afa846a2e0 SHA512 7a6af5d97bf8f5c4ddc16e3f08a11735be7671f2e4dce4025c8e637fe267966acbea5a039c4b7d6a2b17977d2e12d735b1ffaeb8e8ef98ade94ea9cdc41963fe WHIRLPOOL 9ba8491d98fa458c1b17d844e32f52665b68823d81232154ee5b82eafe136a9fdaf188274e1ca8b1c28ff156068ae2089dcb66a1067168464962671f94523402
+MISC metadata.xml 361 SHA256 6e78ff41b493d746ee5bc4378b97687318d4a9aaa2404118aae6f6d30190f0fd SHA512 a4572b46f20688c9d75c5aa555bf051f3416b8992e0c2358f4594be215571f356575441d4e45b2785af0c6c5c5c2d8862f2fd48202cc528ccda3a9e8ba69c214 WHIRLPOOL 2f49391248c1e1c8d0668d1498b414db0ea0e49acda7022c7fb1c39840c3092a6afebd387d3b53fa62b19b911ae779a4accb8f91d8121df3915e548973803dcd
diff --git a/net-analyzer/ethloop/ethloop-10-r3.ebuild b/net-analyzer/ethloop/ethloop-10-r3.ebuild
new file mode 100644
index 000000000000..d49ae392f80f
--- /dev/null
+++ b/net-analyzer/ethloop/ethloop-10-r3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Local simulator for testing Linux QoS disciplines"
+HOMEPAGE="http://luxik.cdi.cz/~devik/qos/ethloop/"
+SRC_URI="http://luxik.cdi.cz/~devik/qos/ethloop/ethloop10.tgz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+RESTRICT="mirror bindist"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc45.patch
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dosbin ethloop
+}
diff --git a/net-analyzer/ethloop/files/ethloop-10-gcc45.patch b/net-analyzer/ethloop/files/ethloop-10-gcc45.patch
new file mode 100644
index 000000000000..75b951102245
--- /dev/null
+++ b/net-analyzer/ethloop/files/ethloop-10-gcc45.patch
@@ -0,0 +1,32 @@
+Fix recv call (bug #336755), add some more includes.
+
+--- a/ethloop.c	2002-05-03 15:13:20.000000000 +0200
++++ b/ethloop.c	2010-12-27 18:21:24.000000000 +0100
+@@ -1,5 +1,7 @@
+ /* vim: cin sw=4 ts=4
+ */
++#include <arpa/inet.h> /* htons() */
++#include <sys/types.h> /* recv() */
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #include <sys/poll.h>
+@@ -13,6 +15,7 @@
+ #include <stdlib.h>
+ #include <sys/time.h>
+ #include <signal.h>
++#include <string.h>
+ 
+ int sock;
+ 
+@@ -133,9 +136,9 @@
+ int recv_raw(int tmo)
+ {
+ 	struct pollfd pf = {sock,POLLIN,0};
+-	int r; unsigned short proto;
++	ssize_t r; unsigned short proto;
+ 	if(poll(&pf,1,tmo) <= 0) return 0;
+-	r = recv(sock,&buf,1550,0);
++	r = recv(sock,&buf,sizeof(buf),0);
+ 	if (r <= 0) {
+ 		printf("error recv (%d)\n",r);
+ 		return 0;
diff --git a/net-analyzer/ethloop/metadata.xml b/net-analyzer/ethloop/metadata.xml
new file mode 100644
index 000000000000..497a26fb249e
--- /dev/null
+++ b/net-analyzer/ethloop/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<longdescription>Local simulator for testing Linux QoS disciplines</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest
new file mode 100644
index 000000000000..4fa872acef7f
--- /dev/null
+++ b/net-analyzer/ettercap/Manifest
@@ -0,0 +1,6 @@
+DIST ettercap-0.8.2.tar.gz 8082561 SHA256 f38514f35bea58bfe6ef1902bfd4761de0379942a9aa3e175fc9348f4eef2c81 SHA512 18137b1cc518c9db3c9650157a5cbf09dbb665b79876a24875d6c5125e8923ebde543464adb61cf1d1244101242f4d66b80d94ef3b36aa265cefca7646aa6415 WHIRLPOOL 3acc250a8c8929cf3f5533edf0e4657b8670525542f1f727c0ecd2af560db9de9004c16e880f05577fffa5cedd5535b448d4e675e3adbd4ae11675ee8f229bfd
+EBUILD ettercap-0.8.2.ebuild 1635 SHA256 309b330402a61105b667d3c25e5191c6ed191640a96a6fbceaad33515cbe4d9a SHA512 898efe8f5940791be61dda3406628bb9d4b857148fe3cc7d8a879fd0eeb2d1407887bff50f3fa7722fec0f2c34f5d3cb938dbd88f60c71fd7fc0d115e1bf5632 WHIRLPOOL d53134759daebcb17095faa4fa2ab23e2602c7424779823d32d703412406859505f954fba60b7a9e0dae389de21c11ab8e44175e593ce96606fef0a3aee94a54
+EBUILD ettercap-9999.ebuild 1944 SHA256 f3ecb944900ba35d84ee88f3bc6d9bde3f344d3c31d356f000c5a3b03977be87 SHA512 1651bd8444ab6decf9f0284f99b6924e318e80a04edf8acc6061e3698d10a35e6eb91d24b0cb906e3b9dd07471654e6887a57a24c206b748dd0e84d1520d5e0f WHIRLPOOL 9e3ba242c075e365ac180aa2400208056e7e6f2171c1a1913ad02bc8d08b6f43157db09c35788a3a4e5a457b8ac2da3ef1fcfef3aba5578d843ae649b3d5e94d
+MISC ChangeLog 2622 SHA256 c47011a5aa62600858d363d96e9e215cd94417988b6950b147414f767c19f8bd SHA512 d2e4a950ed58c817e3f37e6b82bdf03cc94d88a61d0bc9c8db3d9d64f11b54456571e4071549ab1e337b7b0e20097143a9b890185f5dec019642ac7776101fec WHIRLPOOL 5187f295c1a5371512c7f76ac7880a244589483a3b7b5ee28fe9e76dbfd542b4670d5a88d4fabf0a2fdf3eace5f11445a0cb6186696985ba1b72a9584020a56a
+MISC ChangeLog-2015 22295 SHA256 ac8da1367d3f7b72f8a2621f2880416422009247cd51675a7a2a05d99b324e1f SHA512 9edad2e9cdf22c2dc7a289b4518db2e7a3219e9584404f922e6c7a31cbf4dbb1a6091de2b4599faf1aebbf5f3844b3a01cedb018a3142f6cc285efc5082a4518 WHIRLPOOL ce858740ffe5c912721948cb682d31e2b1fdfe85845dfb752d68d35dce864ff6884da5d458cf62ea93a25ce2843458e0295af3ae5cd0adaa4d8457838be25f46
+MISC metadata.xml 657 SHA256 6371ec1d11cb1075012628eb33eb6f7f10396c19f7314e1771a5edb76703a784 SHA512 0b682cb596f905882f2c0682c163d31410b94ca873a468db93e155103aeb1e943bff1c55bde1c9537478ce324d368f468bcb91c98f0aefb9dfa2a2239d7f73d5 WHIRLPOOL ff1a15b34ead7dddfab2af34b98872c5e9450ce661dc87bffe12ec8ef91622da9287267a074e403ff91129d7df1e4e36c80c4a967d96c94d57e805a620e4f0b5
diff --git a/net-analyzer/ettercap/ettercap-0.8.2.ebuild b/net-analyzer/ettercap/ettercap-0.8.2.ebuild
new file mode 100644
index 000000000000..f2f9af225aa5
--- /dev/null
+++ b/net-analyzer/ettercap/ettercap-0.8.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="A suite for man in the middle attacks"
+HOMEPAGE="https://github.com/Ettercap/ettercap"
+SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" #mirror does not work
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="gtk ipv6 ncurses +plugins"
+
+RDEPEND="dev-libs/libbsd
+	dev-libs/libpcre
+	dev-libs/openssl
+	net-libs/libnet:1.1
+	>=net-libs/libpcap-0.8.1
+	sys-libs/zlib
+	gtk? (
+		>=dev-libs/atk-1.2.4
+		>=dev-libs/glib-2.2.2:2
+		media-libs/freetype
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.2.2:2
+		>=x11-libs/pango-1.2.3
+	)
+	ncurses? ( >=sys-libs/ncurses-5.3 )
+	plugins? ( >=net-misc/curl-7.26.0 )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/yacc"
+
+src_prepare() {
+	sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_enable ncurses CURSES)
+		$(cmake-utils_use_enable gtk)
+		$(cmake-utils_use_enable plugins)
+		$(cmake-utils_use_enable ipv6)
+		-DBUNDLED_LIBS=OFF
+		-DSYSTEM_LIBS=ON
+		-DINSTALL_SYSCONFDIR="${EROOT}"etc
+	)
+		#right now we only support gtk2, but ettercap also supports gtk3
+		#do we care? do we want to support both?
+
+		#we want to enable testing but it fails right now
+		#we want to disable the bundled crap, but we are missing at least "libcheck"
+		#if we want to enable tests, we need to fix it, and either package libcheck or allow bundled version
+		#$(cmake-utils_use_enable test TESTS)
+	cmake-utils_src_configure
+}
diff --git a/net-analyzer/ettercap/ettercap-9999.ebuild b/net-analyzer/ettercap/ettercap-9999.ebuild
new file mode 100644
index 000000000000..548bda336349
--- /dev/null
+++ b/net-analyzer/ettercap/ettercap-9999.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="A suite for man in the middle attacks"
+HOMEPAGE="https://github.com/Ettercap/ettercap"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Ettercap/${PN}.git"
+else
+	SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" #mirror does not work
+	KEYWORDS="~alpha ~amd64 ~arm ~sparc ~x86 ~x86-fbsd"
+fi
+#IUSE="doc gtk ipv6 ncurses +plugins test"
+IUSE="doc gtk ipv6 libressl ncurses +plugins"
+
+RDEPEND="dev-libs/libbsd
+	dev-libs/libpcre
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-libs/libnet:1.1
+	>=net-libs/libpcap-0.8.1
+	sys-libs/zlib
+	gtk? (
+		>=dev-libs/atk-1.2.4
+		>=dev-libs/glib-2.2.2:2
+		media-libs/freetype
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.2.2:2
+		>=x11-libs/pango-1.2.3
+	)
+	ncurses? ( sys-libs/ncurses:0= )
+	plugins? ( >=net-misc/curl-7.26.0 )"
+DEPEND="${RDEPEND}
+	doc? ( app-text/ghostscript-gpl
+		sys-apps/groff )
+	sys-devel/flex
+	virtual/yacc"
+
+src_prepare() {
+	sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_enable ncurses CURSES)
+		$(cmake-utils_use_enable gtk)
+		$(cmake-utils_use_enable plugins)
+		$(cmake-utils_use_enable ipv6)
+		$(cmake-utils_use_enable doc PDF_DOCS)
+		-DBUNDLED_LIBS=OFF
+		-DSYSTEM_LIBS=ON
+		-DINSTALL_SYSCONFDIR="${EROOT}"etc
+	)
+		#right now we only support gtk2, but ettercap also supports gtk3
+		#do we care? do we want to support both?
+
+		#we want to enable testing but it fails right now
+		#we want to disable the bundled crap, but we are missing at least "libcheck"
+		#if we want to enable tests, we need to fix it, and either package libcheck or allow bundled version
+		#$(cmake-utils_use_enable test TESTS)
+	cmake-utils_src_configure
+}
diff --git a/net-analyzer/ettercap/metadata.xml b/net-analyzer/ettercap/metadata.xml
new file mode 100644
index 000000000000..a98ad417c5f9
--- /dev/null
+++ b/net-analyzer/ettercap/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>ago@gentoo.org</email>
+		<name>Agostino Sarubbo</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<use>
+		<flag name="plugins">Install ettercap plugins (et_*.so)</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">Ettercap/ettercap</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
new file mode 100644
index 000000000000..bb188346eb48
--- /dev/null
+++ b/net-analyzer/fail2ban/Manifest
@@ -0,0 +1,8 @@
+DIST fail2ban-0.9.6.tar.gz 352145 SHA256 c6758b43f9d673ec014fc2f2d3497476d5396f9f85e37724a638b43dfdde7a97 SHA512 c09778d39741dc38d1073495a9f491012717d5ed04d28722f2ae6755104bdcc472baf06d33f500fed592b04c05277ba5cf74e527f1c0ed751108f4f1be22fa7e WHIRLPOOL a18b4d2905d8c2d4bbb8121bf4a7f69ce1d95ecb9fa521d753fd5f103bf463ada09d04e4e60b9191dce56cfced09426f74397c09df87bffeaf13dc7358a570b4
+DIST fail2ban-0.9.7.tar.gz 356410 SHA256 629882f3401a706a6223fb19aa64950082f4dca463fe8a4242101ca3f3ee0e50 SHA512 117b2cad742636c84ddd1f7de04abb603a74893eae062bd19edcde70a7246bc02157b644ee7192e5bcbd4c45ff6c541d5c598846bdd2dcbab21b884c6402f94d WHIRLPOOL 994144828d829333a8ac55337383ab743f2069661613d8f90e6f553df9619133c4aaf287198b7e2c9432dd87942af7ff0b972ee08ee5934a66463caf1d9b03e8
+EBUILD fail2ban-0.9.6.ebuild 3177 SHA256 5938c7ca0b898159794926e75f2175a63666a18aef5df0d507636f38058d9af9 SHA512 b0f25b9e4401d981ff757bf0784b957d5731e4bfd3c434a876569848d3c4b84a96f748d195d79c68f1a94b3eedc577454ede6d4d7c5479dfe233daf2631c2bbe WHIRLPOOL 5d168f28beb5cfbc9f7fed6af5304f1d6a5f1dbe5cdfa5bea41c0bb917dc1fefd3f654dfd4b1b6591746bebb93ed75f598d013aa370c3d623c12c0d729973162
+EBUILD fail2ban-0.9.7.ebuild 3200 SHA256 c8130a1f0f5adc0830594ee5c6673777e95ef0986eb686e6c6145a8f4cf4740f SHA512 ad0ccc5f4354379987d9839b7eaf408a21fedd8012644db841f941ceca2429933bc1208f576fd365a5d9f2f2cd8d77da8d6ee38a86ccb3cd1776c4fe979ad554 WHIRLPOOL a2e400ce07672f86afdd574a06174b7b2a18bc5491f35ad80271ad7bc5d50f0317d57ffa79746f7d89586e271ad57634160cd14666fd6d6c7514881f21aa997a
+EBUILD fail2ban-99999999.ebuild 3113 SHA256 9c58db21635a6337427fe44a58eb7ca94689003c60a61ea8a5cc65f3d620c258 SHA512 e3c0497979913ba3db3ac34a5edc143a32ddacfc317bf9531a46fd656f0f5618aeb4ed8874ef7bd0e5ab1e30d7e0f50187b7ebef47b7c52d38bcac7ebd923340 WHIRLPOOL efeec92f3a314117881b44234e8e756b2f96115d9b580c2adca710ccf42e646ee9b5a35357bf979e0732930921a88af508eff439c585fb6e9f0f178ad188d255
+MISC ChangeLog 7464 SHA256 c4f4c1fc3257a719f803b0aeb73377b8149b3bd010854d8557a4815e066d7c2f SHA512 e39d473e802d8ba80edb1fc776e566d046dc02ae4978e1065e3e2fe1efa66cec67d765b32486eddc8d231bc8745983daaff589d9ed393e14e1786d0d9e6b3c9b WHIRLPOOL aa210ad81e704c1fafa2be9df2247a6e6c6afa0d7d6baa1d5abd4b99a64494a199f8245922973400c783d7e63d6e21c33d8ff7716847f0cd11d58f0f9ef499f5
+MISC ChangeLog-2015 24589 SHA256 d834d6933a87c4e3f6413a314a7601fc2ca3295390257e90ea1963e1ba6665e4 SHA512 d11549e943e5f1f0169cce3cde7c00eba21ae76b85b029b26048d7fdf1273c2134629e38fba387c7f53966e1aa5268473c0778bf1a41b7696e854fc52f12c8fa WHIRLPOOL 0186ec85856c47f575982bdb1df8a121ea349e6bacc5df811676eecb936f390145fd32d18198242c7a4aac5891dc3225ce2e638568eb7a2c54559ee92aee4415
+MISC metadata.xml 372 SHA256 746d170f99e2455a543c83a3cf014d6f9a773f28fc6085e7a45f1027db52a157 SHA512 4d5710e2fb4a7c353ca6bd3203bceef57d4d004367993dc1044800ee8713a3f4697fe8ba3472a73ecd015503656dfb7cd68d674c99188ce5702769cfeaf06b25 WHIRLPOOL a07677d213d65611156795231fdc0e15d15e7d57d0bcb72fb2b102ebf9c42f43a22f025eace591242e8b824736a169909a9fa79480aa6c5997712b7324e89df4
diff --git a/net-analyzer/fail2ban/fail2ban-0.9.6.ebuild b/net-analyzer/fail2ban/fail2ban-0.9.6.ebuild
new file mode 100644
index 000000000000..416c743d3f1f
--- /dev/null
+++ b/net-analyzer/fail2ban/fail2ban-0.9.6.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 eutils systemd vcs-snapshot
+
+DESCRIPTION="scans log files and bans IPs that show malicious signs"
+HOMEPAGE="http://www.fail2ban.org/"
+SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="selinux systemd"
+
+# TODO support ipfw and ipfilter
+RDEPEND="
+	kernel_linux? ( net-firewall/iptables )
+	kernel_FreeBSD? ( sys-freebsd/freebsd-pf )
+	net-misc/whois
+	virtual/logger
+	virtual/mta
+	selinux? ( sec-policy/selinux-fail2ban )
+	systemd? ( $(python_gen_cond_dep '|| (
+		dev-python/python-systemd[${PYTHON_USEDEP}]
+		sys-apps/systemd[python(-),${PYTHON_USEDEP}]
+	)' 'python*' ) )
+"
+
+REQUIRED_USE="systemd? ( !python_single_target_pypy )"
+
+DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
+
+python_prepare_all() {
+	# Replace /var/run with /run, but not in the top source directory
+	find . -mindepth 2 -type f -exec \
+		sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
+
+	sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" "bin/${PN}-testcases" || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die
+
+	# not FILESDIR
+	newconfd files/gentoo-confd ${PN}
+	newinitd files/gentoo-initd ${PN}
+	systemd_dounit files/${PN}.service
+	systemd_dotmpfilesd files/${PN}-tmpfiles.conf
+	doman man/*.{1,5}
+
+	# Use INSTALL_MASK  if you do not want to touch /etc/logrotate.d.
+	# See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
+	insinto /etc/logrotate.d
+	newins files/${PN}-logrotate ${PN}
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.7"
+	previous_less_than_0_7=$?
+}
+
+pkg_postinst() {
+	if [[ $previous_less_than_0_7 = 0 ]] ; then
+		elog
+		elog "Configuration files are now in /etc/fail2ban/"
+		elog "You probably have to manually update your configuration"
+		elog "files before restarting Fail2ban!"
+		elog
+		elog "Fail2ban is not installed under /usr/lib anymore. The"
+		elog "new location is under /usr/share."
+		elog
+		elog "You are upgrading from version 0.6.x, please see:"
+		elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
+	fi
+	if ! has_version ${CATEGORY}/${PN}; then
+		if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then
+			elog "For most jail.conf configurations, it is recommended you install either"
+			elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
+			elog "to control how log file modifications are detected"
+		fi
+
+		if ! has_version dev-lang/python[sqlite]; then
+			elog "If you want to use ${PN}'s persistent database, then reinstall"
+			elog "dev-lang/python with USE=sqlite"
+		fi
+
+		if has_version sys-apps/systemd[-python]; then
+			elog "If you want to track logins through sys-apps/systemd's"
+			elog "journal backend, then reinstall sys-apps/systemd with USE=python"
+		fi
+	fi
+}
diff --git a/net-analyzer/fail2ban/fail2ban-0.9.7.ebuild b/net-analyzer/fail2ban/fail2ban-0.9.7.ebuild
new file mode 100644
index 000000000000..f51e3cf37b7b
--- /dev/null
+++ b/net-analyzer/fail2ban/fail2ban-0.9.7.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 eutils systemd vcs-snapshot
+
+DESCRIPTION="scans log files and bans IPs that show malicious signs"
+HOMEPAGE="http://www.fail2ban.org/"
+SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="selinux systemd"
+
+# TODO support ipfw and ipfilter
+RDEPEND="
+	kernel_linux? ( net-firewall/iptables )
+	kernel_FreeBSD? ( sys-freebsd/freebsd-pf )
+	net-misc/whois
+	virtual/logger
+	virtual/mta
+	selinux? ( sec-policy/selinux-fail2ban )
+	systemd? ( $(python_gen_cond_dep '|| (
+		dev-python/python-systemd[${PYTHON_USEDEP}]
+		sys-apps/systemd[python(-),${PYTHON_USEDEP}]
+	)' 'python*' ) )
+"
+
+REQUIRED_USE="systemd? ( !python_single_target_pypy )"
+
+DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
+
+python_prepare_all() {
+	eapply_user
+
+	# Replace /var/run with /run, but not in the top source directory
+	find . -mindepth 2 -type f -exec \
+		sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
+
+	sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" "bin/${PN}-testcases" || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die
+
+	# not FILESDIR
+	newconfd files/gentoo-confd ${PN}
+	newinitd files/gentoo-initd ${PN}
+	systemd_dounit files/${PN}.service
+	systemd_dotmpfilesd files/${PN}-tmpfiles.conf
+	doman man/*.{1,5}
+
+	# Use INSTALL_MASK  if you do not want to touch /etc/logrotate.d.
+	# See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
+	insinto /etc/logrotate.d
+	newins files/${PN}-logrotate ${PN}
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.7"
+	previous_less_than_0_7=$?
+}
+
+pkg_postinst() {
+	if [[ $previous_less_than_0_7 = 0 ]] ; then
+		elog
+		elog "Configuration files are now in /etc/fail2ban/"
+		elog "You probably have to manually update your configuration"
+		elog "files before restarting Fail2ban!"
+		elog
+		elog "Fail2ban is not installed under /usr/lib anymore. The"
+		elog "new location is under /usr/share."
+		elog
+		elog "You are upgrading from version 0.6.x, please see:"
+		elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
+	fi
+
+	if ! has_version ${CATEGORY}/${PN}; then
+		if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then
+			elog "For most jail.conf configurations, it is recommended you install either"
+			elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
+			elog "to control how log file modifications are detected"
+		fi
+
+		if ! has_version dev-lang/python[sqlite]; then
+			elog "If you want to use ${PN}'s persistent database, then reinstall"
+			elog "dev-lang/python with USE=sqlite"
+		fi
+
+		if has_version sys-apps/systemd[-python]; then
+			elog "If you want to track logins through sys-apps/systemd's"
+			elog "journal backend, then reinstall sys-apps/systemd with USE=python"
+		fi
+	fi
+}
diff --git a/net-analyzer/fail2ban/fail2ban-99999999.ebuild b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
new file mode 100644
index 000000000000..b642ecf3d5b3
--- /dev/null
+++ b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 eutils systemd git-r3
+
+DESCRIPTION="scans log files and bans IPs that show malicious signs"
+HOMEPAGE="http://www.fail2ban.org/"
+EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="selinux systemd"
+
+# TODO support ipfw and ipfilter
+RDEPEND="
+	kernel_linux? ( net-firewall/iptables )
+	kernel_FreeBSD? ( sys-freebsd/freebsd-pf )
+	net-misc/whois
+	virtual/logger
+	virtual/mta
+	selinux? ( sec-policy/selinux-fail2ban )
+	systemd? ( $(python_gen_cond_dep '|| (
+		dev-python/python-systemd[${PYTHON_USEDEP}]
+		sys-apps/systemd[python(-),${PYTHON_USEDEP}]
+	)' 'python*' ) )
+"
+
+REQUIRED_USE="systemd? ( !python_single_target_pypy )"
+
+DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
+
+python_prepare_all() {
+	eapply_user
+
+	# Replace /var/run with /run, but not in the top source directory
+	find . -mindepth 2 -type f -exec \
+		sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
+
+	sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" "bin/${PN}-testcases" || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die
+
+	# not FILESDIR
+	newconfd files/gentoo-confd ${PN}
+	newinitd files/gentoo-initd ${PN}
+	systemd_dounit files/${PN}.service
+	systemd_dotmpfilesd files/${PN}-tmpfiles.conf
+	doman man/*.{1,5}
+
+	# Use INSTALL_MASK  if you do not want to touch /etc/logrotate.d.
+	# See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
+	insinto /etc/logrotate.d
+	newins files/${PN}-logrotate ${PN}
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.7"
+	previous_less_than_0_7=$?
+}
+
+pkg_postinst() {
+	if [[ $previous_less_than_0_7 = 0 ]] ; then
+		elog
+		elog "Configuration files are now in /etc/fail2ban/"
+		elog "You probably have to manually update your configuration"
+		elog "files before restarting Fail2ban!"
+		elog
+		elog "Fail2ban is not installed under /usr/lib anymore. The"
+		elog "new location is under /usr/share."
+		elog
+		elog "You are upgrading from version 0.6.x, please see:"
+		elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
+	fi
+
+	if ! has_version ${CATEGORY}/${PN}; then
+		if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then
+			elog "For most jail.conf configurations, it is recommended you install either"
+			elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
+			elog "to control how log file modifications are detected"
+		fi
+
+		if ! has_version dev-lang/python[sqlite]; then
+			elog "If you want to use ${PN}'s persistent database, then reinstall"
+			elog "dev-lang/python with USE=sqlite"
+		fi
+
+		if has_version sys-apps/systemd[-python]; then
+			elog "If you want to track logins through sys-apps/systemd's"
+			elog "journal backend, then reinstall sys-apps/systemd with USE=python"
+		fi
+	fi
+}
diff --git a/net-analyzer/fail2ban/metadata.xml b/net-analyzer/fail2ban/metadata.xml
new file mode 100644
index 000000000000..ece130a93bd2
--- /dev/null
+++ b/net-analyzer/fail2ban/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">fail2ban/fail2ban</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/ffp/Manifest b/net-analyzer/ffp/Manifest
new file mode 100644
index 000000000000..8157204b1fc0
--- /dev/null
+++ b/net-analyzer/ffp/Manifest
@@ -0,0 +1,5 @@
+DIST ffp-0.0.8.tar.gz 201602 SHA256 0bbf525b9074c1a249717730258175979ecece5f8b5c43551b5f4d3541a8b933 SHA512 b2e844905dd08a5c6180ac8e3988effb13b9a8dd8fa1432e65c61a3d4ea2c30c75fb560d392fd3d5b7df2ab364c82f769b57d93d88d4b0f6d52772ef1c3d71bc WHIRLPOOL 64de54a589f8496449e450cba6cbf1fb8f06f853c9edf1b37ee4a256098febb5079e18c702194e63d07645a789fad0f665bbfc5e4b0bc2a2180beff526cad0ea
+EBUILD ffp-0.0.8-r1.ebuild 596 SHA256 4443d1426debfb0bc3a660ef851c6de255ac8cd5342123740fd9f47ea4a1ec4e SHA512 35a910a632eb6eb0c1da74abe7d7c45ba2e66b79da74710e4f57567214cdf4c53fc4dd8cad1d41da82f75bdb9438b19accb92948a57cad367624d72a833b0400 WHIRLPOOL 713f4460cdbc482e0f7ea216d3e4b9c045dba0ea4376166a18f322604705f5acd71216afd6ee1f98461d4c9b0afd5ff0d2b34514a06b123eb31c419b947df1e2
+MISC ChangeLog 2560 SHA256 1b44c7a65a97cf0d117db48f31b6301a7ed69fb7f5848ca551d9deef59dc5f00 SHA512 cfe884c565626f4a7101eae9e05de7804275ec8988d7aeb5e54cef51bce164fa304f788fdf497716b5388f1ead0d939cace3482ff63b110063552ae5f52c5173 WHIRLPOOL 7b897644ce3fb7fc4e51b6f4c51d6c76d2b123f146f2615a0430230f65612b38072a50ce7c6264df3915fb17cd822de9b031669bcf71ea71fbed1d06ebf5d4c1
+MISC ChangeLog-2015 777 SHA256 5c7fde626ff35f3796efb18da3bbcb1c4d5236b0d8907dae6b9b567928cef3c2 SHA512 5094dd4ded1ede0a787fc2d8084f29009954f5bc29a3eaa5a8f0b4fd261ca7cbee4582757638ddbb665e8c3ddba17352fab0b620391cdf93b4194bb4d619d610 WHIRLPOOL e17fb32b546caab89f52a71d5781c0a5910d1d8a431721971e6dcec60feb5e08c5ef84b120eda324af35a2075a23974ca4737b9bc973203a0f67bf77f16cf768
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/ffp/ffp-0.0.8-r1.ebuild b/net-analyzer/ffp/ffp-0.0.8-r1.ebuild
new file mode 100644
index 000000000000..cbc60fb821f7
--- /dev/null
+++ b/net-analyzer/ffp/ffp-0.0.8-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="a tool to do fuzzy fingerprinting for man-in-the-middle attacks"
+HOMEPAGE="http://www.thc.org/thc-ffp/"
+SRC_URI="http://www.thc.org/releases/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="libressl"
+
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README TODO doc/ffp.pdf )
+
+src_prepare() {
+	tc-export CC
+}
+src_install() {
+	default
+	dohtml doc/ffp.html
+}
diff --git a/net-analyzer/ffp/metadata.xml b/net-analyzer/ffp/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/ffp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/firewalk/Manifest b/net-analyzer/firewalk/Manifest
new file mode 100644
index 000000000000..8afe932ce47d
--- /dev/null
+++ b/net-analyzer/firewalk/Manifest
@@ -0,0 +1,6 @@
+AUX firewalk-5.0-gcc3.4.diff 336 SHA256 ac476eb9b918bf08a50871e88089755a0864255d7870ae5aa6871ceb08e73fc2 SHA512 7e6868951f4de1be0572ce1328fb8dd0d787cbd21198cdd84233db80aec40ad17d2748ff2afd98986fc4687357e0c7c411b80c0557aabcb73369ff1d1495cb5c WHIRLPOOL e6f4624c985de003730e8804ed447f873360a07c29720313e88788d754c90906694dd153fbf19c225cc4aadc34099d7c3dc1a1d946a257ef057c46bfa329cb6b
+DIST firewalk-5.0.tgz 80446 SHA256 b39fae47ca85753493cf714ed8099d99652d6cebb880a5ae4f682b3e9be5f6a4 SHA512 919aa6e464dac72a02f8967ccf7109de7d0b3a574f0a396bcf69bacc988ab8e13e8e25932d749eadc898cae2546f8f81014d53ef51429e6c784a16d40da90ff2 WHIRLPOOL 1387ef2c5e7a476068d7bd77a56f34692aef357a997553a8f94c325c537b03354d6c2ca7acd1eafa60253842e30fd71713cf8e0ff6174b94affab8fc221f6eec
+EBUILD firewalk-5.0-r1.ebuild 588 SHA256 2536b3582db2c64e56fd065e793bbe88e999b7ba9e01d357b6f9ced0163d7b4a SHA512 c8d5152dab5ca3b1f28f3314eb32dba2cd6e529e2bda0a4dfd33442b6a052579ef4590487d3a4d9e60c57dd5e3f8f733fec655142a835963cdc7994049614c46 WHIRLPOOL 08a5defe05006e4c68b1e04f5f6b486342d433b63e003d63fb1783e0585e4ecd8c092121128e38ae6797271c97359138ed2dc11149d8018df2b6c2fad2b2bb32
+MISC ChangeLog 2469 SHA256 a8f92c918fdc3e849979a75576f3f82db32d27fb8475966d9f7aece3583ab7ec SHA512 0e206037c54f72587742b219573df302ff9fb39ed845d08a7e5e98bd1ac175a7bb3d62672fa362eca967ea19e3d2d0ace7251c3952193ea48bba6a65e6f629b9 WHIRLPOOL 1f4f90713365a34958e4931a5386399f156b58b1561bdbad41a751b27f26086b7c44d08accc9279eb057a4320126e6543829d3b78d939a0151c276e54d153c8d
+MISC ChangeLog-2015 2662 SHA256 a0fb3123eae7b151926a35df766464c87189c1c0364690fd6c094a3f17032587 SHA512 ce41bf40cd58442f878c9a97230d725ecdf7cdf18a45f461242001c5a426f508b055f866e4f8c1e39554e95c573f47e5155e2ba091d3d634d3524c79f33b2676 WHIRLPOOL 924c6cd2636a84f92ee1e11677409f47a2e7c3bcdd79fa4730dc715e4e5a5093f84b9a799c3bda5f479699a77f7be488d289d57a6c602eb4290b47baf886e95a
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/firewalk/files/firewalk-5.0-gcc3.4.diff b/net-analyzer/firewalk/files/firewalk-5.0-gcc3.4.diff
new file mode 100644
index 000000000000..925bde7b75f3
--- /dev/null
+++ b/net-analyzer/firewalk/files/firewalk-5.0-gcc3.4.diff
@@ -0,0 +1,11 @@
+--- a/src/firewalk.c
++++ b/src/firewalk.c
+@@ -188,8 +188,6 @@
+                     case FW_SERIOUS_ERROR:
+                         /* err msg set in fw_packet_capture() */
+                         return (FW_SERIOUS_ERROR);
+-                    default:
+-                        /* empty */
+                 }
+             }
+         }
diff --git a/net-analyzer/firewalk/firewalk-5.0-r1.ebuild b/net-analyzer/firewalk/firewalk-5.0-r1.ebuild
new file mode 100644
index 000000000000..e43aa7500b1c
--- /dev/null
+++ b/net-analyzer/firewalk/firewalk-5.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A tool for determining a firewall's rule set"
+HOMEPAGE="http://packetfactory.openwall.net/projects/firewalk/"
+SRC_URI="mirror://gentoo/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+DEPEND="
+	dev-libs/libdnet
+	net-libs/libnet:1.1
+	net-libs/libpcap
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/Firewalk"
+
+DOCS=( README TODO BUGS )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc3.4.diff
+}
+
+src_install() {
+	default
+	doman man/firewalk.8
+}
diff --git a/net-analyzer/firewalk/metadata.xml b/net-analyzer/firewalk/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/firewalk/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/flent/Manifest b/net-analyzer/flent/Manifest
new file mode 100644
index 000000000000..1c0ea8d053f8
--- /dev/null
+++ b/net-analyzer/flent/Manifest
@@ -0,0 +1,4 @@
+DIST flent-1.0.1.tar.gz 2285619 SHA256 1bd2ecfc3e731ff3df161716604aaccb5d945c5040c2c6e512692e373224498c SHA512 868b83a52805cfdb0dc49379aea25e07135a949cea0e6c2388b026099723c20aa7b0146e19110786e763c7f22e1663c42a8bc21bdae2199d00ac85438a3fdf74 WHIRLPOOL 258566fb9130778912e052465651870bf53e722bc341a3dc815a843c5a8f5493de5efb946bf5a363013d85aa58e96d8fc2f466f17eb83ba8089851a3dd98f64a
+EBUILD flent-1.0.1.ebuild 676 SHA256 0f19c8287e58b89901e16671650c231d8b09ab35963843b2d9d36fc1ff3da7fe SHA512 7a66698df50a2a909ae7be714d7f1e9092cba48b369909c4c0c4f8185261975e7769f2986bc7c5bef91ab4f23300326cda20f05fe14c76cda53fb8e5de4a2ac9 WHIRLPOOL 53bbcef92367480e8f9b931ae209f46031347a81eb9635b57a6fb272f9f54843d947d0a87545ab31fae728017f6258e58b1dfe7532b60ca24dadfe0f4998ae06
+MISC ChangeLog 726 SHA256 f7bb2eefe85cd518b2a1d0a8fcb4a60a058565d6e9d59b5043038195cf69f4fa SHA512 dbe3dd252aef89e7a2630cb7514f369dc922603b056687d1cccbd352c540cc49426c7b154c623cb75b96ed6f2ae5dced5cdc31af2d8a87d426e62addd6260776 WHIRLPOOL 4f7cda81464918348ffc0a36d2d86b635668ae82d4084afb3a6fa2b7ac4b6e5960583510f30ab58df33fc693a6afe05a8013624fa2e8c412c4419fc6485503e5
+MISC metadata.xml 391 SHA256 8d4cabc8537aef69c6dd1edcbb8b4426ad3735784ca0a073207314b293cf550c SHA512 f659fc94acbe2d182b842fe2ef9a5a6f2cdbf43fc229e200586ee3a3d0a89f49eeddede26efc370b2a7710a739b50d8d83f219248628581da795b9e80a25baf7 WHIRLPOOL 79f84eb915746c21de438809873accda657ab8a4713f17da6d946210fb22119ee1f53773403909dfc251143d80a09feecedde515c0860d148699385fb7117f1c
diff --git a/net-analyzer/flent/flent-1.0.1.ebuild b/net-analyzer/flent/flent-1.0.1.ebuild
new file mode 100644
index 000000000000..8582f7c7e512
--- /dev/null
+++ b/net-analyzer/flent/flent-1.0.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python{3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="The FLExible Network Tester"
+HOMEPAGE="https://flent.org/"
+SRC_URI="https://github.com/tohojo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+qt5 qt4 +plots"
+
+RDEPEND="qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )
+		qt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
+		plots? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+		net-analyzer/netperf[demo]
+		net-misc/iperf
+		net-analyzer/fping"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/net-analyzer/flent/metadata.xml b/net-analyzer/flent/metadata.xml
new file mode 100644
index 000000000000..d33bba3bd96b
--- /dev/null
+++ b/net-analyzer/flent/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+		<name>Jason A. Donenfeld</name>
+	</maintainer>
+	<use>
+		<flag name="plots">Enable drawing plots</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">tohojo/flent</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest
new file mode 100644
index 000000000000..30bee1e47325
--- /dev/null
+++ b/net-analyzer/flow-tools/Manifest
@@ -0,0 +1,11 @@
+AUX flow-tools-0.68.5.1-run.patch 493 SHA256 8879df3fb76ed6459a7932a471a7360adb195d26fa88f3797b1a25ccdc4a81e5 SHA512 90c9f8bc6aba4c31315294ba80ebc3f7a8b86796d6fc108ef9ebf7619df73474e1a97524b709964ba899f4569a0158d0cc0a2d5bb00e8b185186cf765b87ce9d WHIRLPOOL d58315e44f7886fcc3b944c2c6595d94b15ba7bb46a09ff1608d9876e3db46ce99c3a063b06ad80b470fc01e6caedd8e71137ca1000c11c2e032abbeed5c0417
+AUX flow-tools-0.68.5.1-syslog.patch 979 SHA256 15eab977271205917b303f79b2caf69e48f5a1a575be704ffbdbdf07e812d525 SHA512 d2d37816f437c5546916ca53bd460707366b3675ac9e9105a9611ed436d322afd6ee56fa29b1d6e68f3a02c97a62ca009d392fdb63fca411ace851dc29419537 WHIRLPOOL 31d185f356f842103c3e7f10652c1438132f3f49fbcb9c2ee37ab76adaf60386d74865292d11b22708cbb59bdca903096ace198d864c20e04397dddf80be75b0
+AUX flowcapture.confd 1928 SHA256 bcb31f5f0879300e9dca1daca792bcdfef6bab613f9c87e0c480c2f2e9acbb94 SHA512 e9dcc5d66833e9bf2905273efcb6b7cab69050da50425256629bf12203c7bd9fed87ac33a772903d78f5fbab69045bc4e0f09d26ea1442cdc5c5bd0102a09c05 WHIRLPOOL b670fb253952467cd7eef012b9ca422c3865c3fa9ea86b6b5daa1b4701f0a2623c92b6597f65d0555764a10af6c2232b52109aeccec420d5df91fbe1f64a3992
+AUX flowcapture.initd 816 SHA256 0fa880ab9f840dd8564a8381879c4322f96c81b3656a926a8752c257a6c1df00 SHA512 c3f62821efc94fb6305ba3c54415319c42a624a3c604c96497af0fdd7b4076e618a070006146346eb3de0549bc2bc36e3e3ffd9f7aba832dd18c29da0370463a WHIRLPOOL 7b43e381854b602796faea06cd26dccb76fbf8577e3027dd4408efcbcd03ad86a7dc23c39d0de9f4fb36ce615b6a760f4dcdcd6b85f25ada717713ae285e1656
+AUX linkme 283 SHA256 93cef6b11cb25a9e91b529030e66cd4c709f382993335f2c7252de89c36735da SHA512 a9db8dec8b6f2a83b8896951bf1711ec7c58dd18d2da7db7015c0a000114b3d1da9bee4dd64842c074b332a06a890b2eea1b8ffc0399ce0efa39bf6527466359 WHIRLPOOL 94af50de39a8350d194917c129fdd5cdb542e07834340db0453a897185ccd4f4da6fd6584ecf144b79c5f8981c3dbfdd7e87894fa66bc230c530d2985828dba7
+DIST flow-tools-0.68.5.1.tar.bz2 914062 SHA256 80bbd3791b59198f0d20184761d96ba500386b0a71ea613c214a50aa017a1f67 SHA512 ae17ba39854daa8ef3deecd3a554bb6d1fa47648cb791d8225a40bec13f65bf0692871660b2c3490d133b1251875c323d066bb0c0483eceb0707cec9b7714c57 WHIRLPOOL 2e7b98abab82ec07639356c07c89bb480276fec945c48ef86188a70a28ff54ab5dd1f1c7b69945d7b4e2687aafee06bef81dceea655b15aa735c50455723be83
+EBUILD flow-tools-0.68.5.1-r2.ebuild 1687 SHA256 1c3232980d47b841f308f49575e73564eb5f9b9ecd66ac425a915e5134807223 SHA512 19fab6d40f16607410ab530c2624e36a40e806bab2bcd9e336bbb03164020e9a84b376adaa9a3cabaca6441982b1effe4c4f5ccfa4f9c134888990aba6600293 WHIRLPOOL a825b46f080ea3fbc655b117bd9aa48ec865068286a7fdc948bcef26be16bbf98ed62ca911ce69ec5de2f33ce7c1f3c5b035626ea55a01ff3609b4f2f9160cd7
+EBUILD flow-tools-0.68.5.1-r9.ebuild 1615 SHA256 4abcf66b4a4bd6dd29f296753d420c7835d3ae026de7aecbe9895a833e7fcb43 SHA512 c7d85fc7c617008977f8e9d151eb1765a416d8ad7edc011b870b9b1f6727dbc80b26f1a3ce527b661d5f4da68047c4910e007e467d006796523a6135689003d8 WHIRLPOOL 620eb0adae07a2bb6f7f371fa84de47eda72c9762687d1274f6e53c92254c548dbd1da89341ef7dd7e370685321f72373153f3b69b6e5c7b125f459869df2ab0
+MISC ChangeLog 4755 SHA256 778cd6c61e54a2affa3434fdbbe4722f65915a565c9abe8c1366ea22013fb7d1 SHA512 6ebaadc39ea95d776e515b3ec3371bfc506c10078030e5781118a067af75681279683d9e9ea945c80250a9ae903a512df1f959de59aa9f9293e78683c4caf0d6 WHIRLPOOL c89c1ddcdf3ed9bc4c6634ac5ba12f8d280c9b454d4cf3945477a74a96e83aeed64c28ad2d1512957d1f2754915805058d2f502e3a5e304c06ae64c1804139aa
+MISC ChangeLog-2015 13821 SHA256 6c2437fd0fae1ac63f09d3c52d2e6a21b20492146ac8e273e8f2656c8b49a6bc SHA512 16d8e6a2976c8978bdf382fca0014d23f7c86210a2a159c77b6f75f27636cb531ec201557f68c06a28580c99e45451541bde187a1e054f7925eb8c60fc236a32 WHIRLPOOL 5651bf53123f4f064ab3e8a25710023ca2e3b0a005a70cb0ffd11542b9f869398f31d6072bafa652b592a385414d395aee165c0653cfc7ae6a3128691aeaf821
+MISC metadata.xml 902 SHA256 ac8059f3d85b3dd3ac6024768d653720c53ea3647141a5d7b6724c6c522e4894 SHA512 45f900d25bc2b968ce9a04fd143106962c1a242b776840eb2c1b51f0e02d71000f9a2fdf19286f7873e07c25aa9d528597f1b1fe0e7e083c29de5304b87aeab3 WHIRLPOOL 93afbe43db6220919a11fe5f532c0e9677968df9e8c05c4b9eb9e7d7814b1513c684b9f990a926d46e17a874fd8ef209d8d32ab6ad5d1c4ab2be26a16c3f9b84
diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-run.patch b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-run.patch
new file mode 100644
index 000000000000..e1b06eee7e00
--- /dev/null
+++ b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-run.patch
@@ -0,0 +1,22 @@
+--- a/src/flow-fanout.c
++++ b/src/flow-fanout.c
+@@ -57,7 +57,7 @@
+ #endif
+ 
+ 
+-#define FANOUT_PIDFILE    "/var/run/flow-fanout.pid"
++#define FANOUT_PIDFILE    "/run/flow-fanout.pid"
+ 
+ #define SELECT_TIMEOUT 5   /* 5 seconds */
+ 
+--- a/src/flow-capture.c
++++ b/src/flow-capture.c
+@@ -61,7 +61,7 @@
+ 
+ void fterr_exit_handler(int code);
+ 
+-#define CAPTURE_PIDFILE    "/var/run/flow-capture.pid"
++#define CAPTURE_PIDFILE    "/run/flow-capture.pid"
+ 
+ #define SELECT_TIMEOUT 1   /* 1 second */
+ 
diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch
new file mode 100644
index 000000000000..cb17471072bc
--- /dev/null
+++ b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch
@@ -0,0 +1,47 @@
+--- a/lib/fterr.c
++++ b/lib/fterr.c
+@@ -112,7 +112,7 @@
+     fprintf(((fterr_file) ? fterr_file : stderr), "%s\n", buf2);
+ 
+   if (fterr_flags & FTERR_SYSLOG)
+-    syslog(LOG_INFO, buf);
++    syslog(LOG_INFO, "%s", buf);
+ 
+ } /* fterr_info */
+ 
+@@ -134,7 +134,7 @@
+ 
+   if (fterr_flags & FTERR_SYSLOG) {
+     snprintf(buf2, 1024, "%s: %s", buf, strerror(errno));
+-    syslog(LOG_INFO, buf2);
++    syslog(LOG_INFO, "%s", buf2);
+   }
+ 
+   if (fterr_exit)
+@@ -159,7 +159,7 @@
+   }
+ 
+   if (fterr_flags & FTERR_SYSLOG)
+-    syslog(LOG_INFO, buf);
++    syslog(LOG_INFO, "%s", buf);
+ 
+   if (fterr_exit)
+     fterr_exit(code);
+@@ -183,7 +183,7 @@
+   }
+ 
+   if (fterr_flags & FTERR_SYSLOG)
+-    syslog(LOG_INFO, buf);
++    syslog(LOG_INFO, "%s", buf);
+ 
+ } /* fterr_warnx */
+ 
+@@ -205,7 +205,7 @@
+ 
+   if (fterr_flags & FTERR_SYSLOG) {
+     snprintf(buf2, 1024, "%s: %s", buf, strerror(errno));
+-    syslog(LOG_INFO, buf2);
++    syslog(LOG_INFO, "%s", buf2);
+   }
+ 
+ } /* fterr_warn */
diff --git a/net-analyzer/flow-tools/files/flowcapture.confd b/net-analyzer/flow-tools/files/flowcapture.confd
new file mode 100644
index 000000000000..e926d64a8eec
--- /dev/null
+++ b/net-analyzer/flow-tools/files/flowcapture.confd
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Config file for /etc/init.d/flowcap
+
+# This is the default and should be left unless you know what you are doing
+FLOW_VER=5
+
+# local ip. if configured flow-capture will only ps flows sent to this ip.
+LOCALIP=0
+
+# You probably don't want to change this, but in case you do - nest level
+NEST=0
+
+# port to listen on
+PORT=2055
+
+# remote ip. If this is configured only flows from this exporter will be accepted
+# by default we will accept any flows sent to us
+REMOTEIP=0
+
+# program used to rotate 
+ROTATE_PROG="/var/lib/flows/bin/linkme"
+
+# number of rotations per day
+ROTATIONS=287
+
+# Retain the maximum number of files so that the total storage is less than SIZE
+# The letters b,K,M,G can be used as multipliers, ie 16 Megabytes is 16M.
+SIZE=1G
+
+# interval in mins at which flowscan will print out stats in logs
+#STAT_INT=5
+# NOTE: with versions of flow-tools >=0.67 there is a bug that will cause a loop if you specify the STAT_INT
+# Only use that variable if you using an older flow-tools (and consequently a custom built ebuild as this config file is not in our older ebuilds)
+
+# dir we will be saving flows and working in
+WORKDIR=/var/lib/flows/ft
+
+# user to run as
+USER=flows
+
+# Pidfile base
+# The daemon takes the pidfile argument and APPENDS .$PORT itself in writing.
+# It may have multiple children by original design, but this is not recommended
+# for Gentoo at this time.
+PIDFILE_BASE=${PIDFILE_BASE:=/run/flows/flowcapture.pid}
+
+# This pulls in the options above
+FLOW_OPTS="-p $PIDFILE_BASE -w $WORKDIR $LOCALIP/$REMOTEIP/$PORT -V $FLOW_VER -E $SIZE -n $ROTATIONS -N $NEST -R $ROTATE_PROG"
+# Use below only if you have sorted out the STAT_INT problem
+#FLOW_OPTS="-p /run/flows/flowcapture.pid.$PORT -w $WORKDIR $LOCALIP/$REMOTEIP/$PORT -S $STAT_INT -V $FLOW_VER -E $SIZE -n $ROTATIONS -N $NEST -R $ROTATE_PROG"
diff --git a/net-analyzer/flow-tools/files/flowcapture.initd b/net-analyzer/flow-tools/files/flowcapture.initd
new file mode 100644
index 000000000000..c6fc34728799
--- /dev/null
+++ b/net-analyzer/flow-tools/files/flowcapture.initd
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PORT=${PORT:=2055}
+# The daemon takes the pidfile argument and APPENDS .$PORT itself in writing.
+# It may have multiple children by original design, but this is not recommended
+# for Gentoo at this time.
+PIDFILE_BASE=${PIDFILE_BASE:=/run/flows/flowcapture.pid}
+PIDFILE=${PIDFILE:=${PIDFILE_BASE}.${PORT}}
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting flow-capture"
+	checkpath -d -o flows /run/flows
+	start-stop-daemon --start --user ${USER} --exec /usr/bin/flow-capture \
+		--pidfile ${PIDFILE} \
+		-- ${FLOW_OPTS} >/dev/null 2>&1
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping flow-capture"
+	start-stop-daemon --stop --quiet --exec /usr/bin/flow-capture \
+		--pidfile ${PIDFILE}
+	eend $?
+}
diff --git a/net-analyzer/flow-tools/files/linkme b/net-analyzer/flow-tools/files/linkme
new file mode 100644
index 000000000000..4f666d903d42
--- /dev/null
+++ b/net-analyzer/flow-tools/files/linkme
@@ -0,0 +1,15 @@
+#!/usr/bin/perl
+
+$base = "/var/lib/flows";
+if ($ARGV[0] =~ /.*[\/]*(ft-v05[^\/]*$)/) {
+$fileName = $1;
+} else {
+print "Must specify file\n";
+exit 1;
+}
+
+unless ( symlink("$base/ft/$fileName","$base/$fileName") ) {
+print "Unable to create symbolic link: $base/$fileName\n";
+exit 1;
+}
+
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild
new file mode 100644
index 000000000000..e6447657ab54
--- /dev/null
+++ b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils user
+
+DESCRIPTION="library and programs to collect, send, process, and generate reports from NetFlow data"
+HOMEPAGE="https://code.google.com/p/flow-tools/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="debug mysql postgres ssl static-libs"
+
+RDEPEND="sys-apps/tcp-wrappers
+	sys-libs/zlib
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+	ssl? ( dev-libs/openssl )"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison"
+
+DOCS=( ChangeLog README SECURITY TODO )
+
+pkg_setup() {
+	enewgroup flows
+	enewuser flows -1 -1 /var/lib/flows flows
+}
+
+src_prepare() {
+	sed -i \
+		-e 's|/var/run/|/run/|g' \
+		src/flow-capture.c \
+		src/flow-fanout.c \
+		|| die
+}
+
+src_configure() {
+	local myconf="--sysconfdir=/etc/flow-tools"
+	use mysql && myconf="${myconf} --with-mysql"
+	if use postgres; then
+		myconf="${myconf} --with-postgresql=yes"
+	else
+		myconf="${myconf} --with-postgresql=no"
+	fi
+	use ssl && myconf="${myconf} --with-openssl"
+	econf ${myconf} $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+
+	exeinto /var/lib/flows/bin
+	doexe "${FILESDIR}"/linkme
+
+	keepdir /var/lib/flows/ft
+
+	newinitd "${FILESDIR}/flowcapture.initd" flowcapture
+	newconfd "${FILESDIR}/flowcapture.confd" flowcapture
+
+	fowners flows:flows /var/lib/flows
+	fowners flows:flows /var/lib/flows/bin
+	fowners flows:flows /var/lib/flows/ft
+
+	fperms 0755 /var/lib/flows
+	fperms 0755 /var/lib/flows/bin
+}
+
+pkg_preinst() {
+	enewgroup flows
+	enewuser flows -1 -1 /var/lib/flows flows
+}
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r9.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r9.ebuild
new file mode 100644
index 000000000000..2245db8cff37
--- /dev/null
+++ b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r9.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils user
+
+DESCRIPTION="library and programs to process reports from NetFlow data"
+HOMEPAGE="https://code.google.com/p/flow-tools/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="debug libressl mysql postgres ssl static-libs"
+
+RDEPEND="sys-apps/tcp-wrappers
+	sys-libs/zlib
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:* )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison"
+
+DOCS=( ChangeLog README SECURITY TODO )
+
+pkg_setup() {
+	enewgroup flows
+	enewuser flows -1 -1 /var/lib/flows flows
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-run.patch
+	epatch "${FILESDIR}"/${P}-syslog.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(usex mysql --with-mysql '') \
+		$(usex postgres --with-postgresql=yes --with-postgresql=no) \
+		$(usex ssl --with-openssl '') \
+		--sysconfdir=/etc/flow-tools
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+
+	exeinto /var/lib/flows/bin
+	doexe "${FILESDIR}"/linkme
+
+	keepdir /var/lib/flows/ft
+
+	newinitd "${FILESDIR}/flowcapture.initd" flowcapture
+	newconfd "${FILESDIR}/flowcapture.confd" flowcapture
+
+	fowners flows:flows /var/lib/flows
+	fowners flows:flows /var/lib/flows/bin
+	fowners flows:flows /var/lib/flows/ft
+
+	fperms 0755 /var/lib/flows
+	fperms 0755 /var/lib/flows/bin
+}
+
+pkg_preinst() {
+	enewgroup flows
+	enewuser flows -1 -1 /var/lib/flows flows
+}
diff --git a/net-analyzer/flow-tools/metadata.xml b/net-analyzer/flow-tools/metadata.xml
new file mode 100644
index 000000000000..e2ec7efaf9f5
--- /dev/null
+++ b/net-analyzer/flow-tools/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription lang="en">Flow-tools is library and a collection of programs used to collect,
+		send, process, and generate reports from NetFlow data. The tools can be
+		used together on a single server or distributed to multiple servers for
+		large deployments. The flow-toools library provides an API for
+		development of custom applications for NetFlow export versions 1,5,6 and
+		the 14 currently defined version 8 subversions. A Perl and Python
+		interface have been contributed and are included in the distribution.</longdescription>
+	<upstream>
+		<remote-id type="google-code">flow-tools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/flowgrind/Manifest b/net-analyzer/flowgrind/Manifest
new file mode 100644
index 000000000000..4c19922e1596
--- /dev/null
+++ b/net-analyzer/flowgrind/Manifest
@@ -0,0 +1,7 @@
+DIST flowgrind-0.7.1.tar.bz2 224678 SHA256 8356eab1e5acb7c72fad4a92fc0f7d28b20ff014ece4bae2f18e9aac19bdf003 SHA512 fe1bc82d8b1b5bbe37989c0d8f24ba87bca73522983b855e249a3fa5e5fc96d9a63190aa94627db2b1bfea63304e453b4bc1c5fd18260fad9bda38313ad912b8 WHIRLPOOL 691a3125a209b86f33443978f5dce50b39a12425b18116491e56428c60db1ca6ae2f552f005953274895fbe95a42ca66630f93026a0a36d2662bcc2d185ceb39
+DIST flowgrind-0.8.0.tar.bz2 298730 SHA256 2e8b58fc919bb1dae8f79535e21931336355b4831d8b5bf75cf43eacd1921d04 SHA512 2af250da696c4d0f613191e7a2e3084b2aa1dc995665a4164324cdb2cc56af7b000b8a2f5d5e7ac8ebbad3ae0ba4fc8eb641afe65c1a842a633c19e95ba3e65a WHIRLPOOL 29b90336cc34bd6ed12817075203acc3aba8b558f6d58dae7f1390eba4d2ec16d29cb563183eb01164b077a4d20dc8be46c50398e439ca9e0b451c62f5449415
+EBUILD flowgrind-0.7.1.ebuild 597 SHA256 58044e156aa4f4cabce45527f9a5d385de638a0965906aa0f36c5ed0bca88020 SHA512 726e2858f0869f1022957e48feef2fe2f4b7ae6fc2f366791c73e3ceddca03f715b3882688a288d872e2d7a1f9c99d04ec68bc943f7bcda0718a802e6cb4c5f9 WHIRLPOOL 20e79b2011a8055993c72e98684ce72d9ab4177d5de0cfc82877f8b535b8d68e4e68d67c7aafd5f7a3ad2a918f573426532bb3246a8fa9edf27e6ab6b5e31246
+EBUILD flowgrind-0.8.0.ebuild 789 SHA256 7ecffc67a80ffc3574b9a532362d36b0009ae9521cb3d97e3123b61e28c276e8 SHA512 b4ec07d9ac0b46f139c92d0e18d5ea74c13f2adef5050ddb236d956788e4abc92329d2ffc2f3c700dbb34cf1d2672306a4e5ac8ee2fbe5c51b271e347836b996 WHIRLPOOL 0f5ca090d7ed3e47602b41fab43742e9af0620844b27da08ce69626b0341be473636aa9dbe663b2f6266072e7974a3822677820d6c535a8ff3d1a41660705083
+MISC ChangeLog 2765 SHA256 dea4aaa0db2238926ade51fda86a60737a9a9927bc6f565952e90726e6795716 SHA512 1c10db636efeba420a5779b022846b65b46e7131a669eae22d0fd179fa2b647db9179b5ae37d048d53f76816ec2717e79924bb8b1cb26da9cab796ab17228230 WHIRLPOOL 80612d1cf202a3ba8ba803ab7fd12ed6d4deeff40f91add77c567e16a5c60ebd592fab98436233e23947942d3d74b92796da90b731250d947973dd2ed4fa1c3a
+MISC ChangeLog-2015 1776 SHA256 5afbe8afa1018beef79666ee6533802fc43c9e442c899a0037e9607049d8c3fa SHA512 a00370b1cc2dd228d5c13dc55b64904df1affb75940c7d04b8be2ab28023edb88e4f78eb7e9eb24fa0679530840b806bebacecc6c8df44f67e0a2fbf953fb8c0 WHIRLPOOL 40ccabe105892feeb17a48cb3a98ed7c2cadf6c10e60b6061b8299d56fc6e9a6d620bf4277b13764b677777f9135f5bb6aace795a3945e33baff2caa925a74a5
+MISC metadata.xml 472 SHA256 b9cb0d129dfc60526a7c04b0ce7096c53ba4d686d5d4a3b0a4942587eae6a83a SHA512 03d9245e17f1411d2c1e45edf41bc7c5fdee8388bfb0f7db01f3ebb91330d80a4055cfac84ce10e7be1090a44320ce7ead685a7420bb96edba6e094d183c9b7e WHIRLPOOL bf730cb507c07c77e836d2fac8328e5b4689933a742129731faabca947f6ee1c2c98a9f02a964346f671d896ac9f09b371cfed1b77fb3f4bcfb0208dd6d85827
diff --git a/net-analyzer/flowgrind/flowgrind-0.7.1.ebuild b/net-analyzer/flowgrind/flowgrind-0.7.1.ebuild
new file mode 100644
index 000000000000..4acc5ca2d459
--- /dev/null
+++ b/net-analyzer/flowgrind/flowgrind-0.7.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Network performance measurement tool"
+HOMEPAGE="http://flowgrind.net/ https://github.com/flowgrind/flowgrind/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gsl pcap"
+
+RDEPEND="dev-libs/xmlrpc-c[abyss,curl]
+	gsl? ( sci-libs/gsl )
+	pcap? ( net-libs/libpcap )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable gsl) \
+		$(use_enable pcap)
+}
diff --git a/net-analyzer/flowgrind/flowgrind-0.8.0.ebuild b/net-analyzer/flowgrind/flowgrind-0.8.0.ebuild
new file mode 100644
index 000000000000..22232ba540d3
--- /dev/null
+++ b/net-analyzer/flowgrind/flowgrind-0.8.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Network performance measurement tool"
+HOMEPAGE="http://flowgrind.net/ https://github.com/flowgrind/flowgrind/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc gsl pcap"
+
+RDEPEND="
+	sys-apps/util-linux
+	dev-libs/xmlrpc-c[abyss,curl]
+	gsl? ( sci-libs/gsl )
+	pcap? ( net-libs/libpcap )
+"
+DEPEND="
+	${RDEPEND}
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_with doc doxygen) \
+		$(use_with gsl) \
+		$(use_with pcap)
+}
+
+src_compile() {
+	default
+
+	use doc && emake html
+}
+
+src_install() {
+	default
+
+	use doc && dodoc -r doc/html
+}
diff --git a/net-analyzer/flowgrind/metadata.xml b/net-analyzer/flowgrind/metadata.xml
new file mode 100644
index 000000000000..c16842bb234d
--- /dev/null
+++ b/net-analyzer/flowgrind/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<use>
+		<flag name="pcap">Enable packet capturing support using <pkg>net-libs/libpcap</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">flowgrind/flowgrind</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/fping/Manifest b/net-analyzer/fping/Manifest
new file mode 100644
index 000000000000..05ff9f1b87a6
--- /dev/null
+++ b/net-analyzer/fping/Manifest
@@ -0,0 +1,12 @@
+AUX fping-2.4_beta2_p161-err.h.patch 191 SHA256 0b9d3b49621feadbd22c997757ff19309d3c59c020578ed0aa2d9dbedc2e1e04 SHA512 f716398d2615e3f5707b3c4bad3ad84088f2acb06b90efcc25af87c54bbc4228326213c2b58b1703a4490a909a3ad59249361a55d9e36a59afc019a25d48d08d WHIRLPOOL 3088d839206ab86216b9f29592f455c4e8ccc94825360165330d2cc60eeeb4045015576edc93c6dc5bc0709b743195d7488a7c34fe0e9de94af982008541685d
+AUX fping-2.4_beta2_p161-min-time.patch 1653 SHA256 659937e1236f0f9881cfc22bf0e1f64f3c3a2b405458b08df5224690ae2f8400 SHA512 46f34c26de425c96193b5d9e2182cfae38899bd5e63538d508b7d6c713f5518dd56bfb84bfda1e1b81b48aaaf3f4a09cfd0c5e2e2c83e01dbd04a5f7213d2793 WHIRLPOOL 40492eac39ce1d1242172148e8195099f1f14ae453f1c1020f045768ce3f67dc8be68fa183141532a5ef2d85d77eb34affd3f7334ff71e217eda538b1a07585d
+DIST fping-3.13.tar.gz 155976 SHA256 4bb28efd1cb3d1240ae551dadc20daa852b1ba71bafe32e49ca629c1848e5720 SHA512 d6c1c5b9edb97ef59cfb6d22f74f6a055e52465d3ba0f93be35b6fc9615ee08490ee927f3cf9efd087e18279519292f353abe6152061985ee166ba5f7e95e29d WHIRLPOOL 53fa2a877ea74168d0ad22e2d508b6313bfd1750d1d810f3cf13053d6c945530cc18c06734a14b9fb76e6948653b4187e7af3c2d8c2c3cf05c430e149023005c
+DIST fping-4.0.tar.gz 170060 SHA256 67eb4152b98ad34f99d2eec4e1098a0bb52caf13c0c89cd147349d08190fe8ce SHA512 5dca650e9c34dd2e1bdbb981df61cf092230f07a15c4ccef105b9f58aaaa43e0d85dc9665db89631feded503ecc6f6be86446719de18e59349adb7c2f3e9757e WHIRLPOOL b541c7527393ce791a9760f7b9bfd7de76c402dabbd0f62aa9a56b7941214a21738911dc2534e2d3f4bec4c2906afa5b433e3dfa1a651b0ec094338b3c320284
+DIST fping_2.4b2-to-ipv6-16.1.diff.gz 8488 SHA256 de0021aba41ba6b1b98d34fb98f99bfd55455d332ed6aece83690e2d93159e6e SHA512 6af25324d159df4ddd7dd909e2e1a0d85e08c2f51c31469960c2dbc7a9eb4967fd114eb87361f8c6b1691de60e7f753d371e6c902bec706f3fed3d205fbe49f0 WHIRLPOOL 5bb9fdf9fba3769985d34d2e06b2e28540e997a00eb84d7b5a6d71e4cfe4f7a3b50933981df291df5141b8f43729375c95ceb9009cafbcf234c1f50cb89cf232
+DIST fping_2.4b2-to-ipv6.orig.tar.gz 63333 SHA256 77e1a90af4fff4a5ffc4b70542c6ff44130558357e7d549f99a9eff23108d172 SHA512 3d1a76680d3a7cd361481d6e6de49797fbaf01422a73c784c8b667131afd56de2bfbbeb17014047cd2dea903f87d9f19e38ed7b0a5c2e8f2faf82759bf064ff9 WHIRLPOOL a1b0ce998004aea349a04a67a1430b2331292f1c4cb03fdee4d1b579e36c93c9852ed676f450fecdeb22690b2aee18b0319b0c193d794684d195cb73fa62697b
+EBUILD fping-2.4_beta2_p161-r2.ebuild 1201 SHA256 6ca5b044f02e3022492e58b0aa870d9cda440a6d700a5a95625f6aaffcba987f SHA512 75275a41e6f5963fec3345a979a4a810e44e3fd21e2a49c23008211107fd0170a255107da3354819e1f20ba274f6cc9a9f74e613191a353ba201da920726921f WHIRLPOOL df6be58118d1eb9dd857b2f7fe92901fd5c9c6825758ddfba40ec9083fb1f08d830202aba837c1dce74af2b6961eb57666c4e9aca489aea4a073b137638c461d
+EBUILD fping-3.13.ebuild 561 SHA256 5f13e90acb4820da96445b457d4fff6a2e322b1c7ebe3e2a5b3b9a09cc9d7e04 SHA512 62d2b19a07b5aca14a813d3a8d1c131080c6526ee21cca3b3b398da0d2f96f04e4a791aa729fc993b31e0ca4e6ce8e97d5cb820b2f637b987a6b3c768ba2ac19 WHIRLPOOL 57fbe10fa455e1e63177dde70577751630111555ea6ad01d2885aab0fd94b4bc5d80dcbc11933e3c6355c8af831168f5e0d2054ef3ddb8c4d0533d0ac199efcc
+EBUILD fping-4.0.ebuild 534 SHA256 5b239f52a5f8de77dd976c9463c514166503ee17e3254f0c1feac870d39728f3 SHA512 86b6820adeadbf780e787e7be66ed13b5c23ed7b35265ba49610bad17710aabce0be693847cebb04ad008b847fb71a2a10c2edfc4b21abe3b59d52c92ade3910 WHIRLPOOL 977d0887f4721465383114784ba134322f08be6960b39896fb4c35ffdda49c08ebe5de2bc730b81de777a3fc888e0dd7120669d7f6b54f296e629d07234439fc
+MISC ChangeLog 4370 SHA256 346715262028a149eae9cf83dac46f18bfd45cf681fe1a66b3ff42576ce4223c SHA512 da605e06ae6cc1cee27259a25013966a03f0befaacbbd9d6418099463bc61d4c1ba9351bc89abc43f99cfa1519c2b29d9dfa78d06dfb8901d51037577be1d80c WHIRLPOOL 07bfc3872906adad2390cb4805f6c7d4633a8cdaf1f34a262bd1ca3e8b72c3c75ed1aa7c50ff8d1bdc3822b1ef70d8cd4a93299baf93098fdd38fe8abe14d700
+MISC ChangeLog-2015 9900 SHA256 ee1fa2459cad1c2773e910f8b7eaeffe062601a829c92a462bd06161b88ae622 SHA512 b3e8ee63a58dd886353cd6ba0eec0923666f39b5a011b504104e769da652dcc45a33f3358bc45f444fc6c1380d8b1aa945d0d09cbf0686210065c43abb677380 WHIRLPOOL 30996516a9e820646b2680505b1924c70f67fed1531a67d930218b05bb04cde995f5edaeac916336a88a0d4d7eff6b81280bd1695bd9be6fb80eca546e47d0a3
+MISC metadata.xml 432 SHA256 c9f8733a294c2b3207231fed7a69f6628436ea6ef00d3bf7bfd94bccfe6d15be SHA512 16121fbc4071e437cac8d026dd418f9e6efd1110424de9e08c32dd27c55d204c566faf3a790f7e301795d19ceb427c565752583ef20e8a1828d3cb3474fb218f WHIRLPOOL 3a6926a8571ed93155f9850afdd00ee553697fedac79fa911acea911356cadad0f3b98fffd5b305863d92ab96aab0fdfd26cd046fdc1f03657576c699b931961
diff --git a/net-analyzer/fping/files/fping-2.4_beta2_p161-err.h.patch b/net-analyzer/fping/files/fping-2.4_beta2_p161-err.h.patch
new file mode 100644
index 000000000000..38946ac38524
--- /dev/null
+++ b/net-analyzer/fping/files/fping-2.4_beta2_p161-err.h.patch
@@ -0,0 +1,10 @@
+--- a/fping.c
++++ b/fping.c
+@@ -106,6 +106,7 @@
+ 
+ #include <arpa/inet.h>
+ #include <netdb.h>
++#include <err.h> /* err() warnx() */
+ 
+ /* RS6000 has sys/select.h */
+ #ifdef HAVE_SYS_SELECT_H
diff --git a/net-analyzer/fping/files/fping-2.4_beta2_p161-min-time.patch b/net-analyzer/fping/files/fping-2.4_beta2_p161-min-time.patch
new file mode 100644
index 000000000000..a101fd4ae0e1
--- /dev/null
+++ b/net-analyzer/fping/files/fping-2.4_beta2_p161-min-time.patch
@@ -0,0 +1,47 @@
+--- a/fping.c
++++ b/fping.c
+@@ -25,6 +25,7 @@
+  * Original author:  Roland Schemers  <schemers@stanford.edu>
+  * IPv6 Support:     Jeroen Massar    <jeroen@unfix.org / jeroen@ipng.nl>
+  * Bugfixes, byte order & senseful seq.-numbers: Stephan Fuhrmann (stephan.fuhrmann AT 1und1.de)
++ * Fixes: min_reply_i in splits and compiler warning. Alex Ghoth (alex AT ghoth.net)
+  *
+  *
+  * RCS header information no longer used.  It has been moved to the
+@@ -743,7 +744,7 @@
+ 	
+ 	if( ( ping_data_size > MAX_PING_DATA ) || ( ping_data_size < MIN_PING_DATA ) )
+ 	{
+-		fprintf( stderr, "%s: data size %u not valid, must be between %u and %u\n",
++		fprintf( stderr, "%s: data size %u not valid, must be between %lu and %u\n",
+ 			prog, ping_data_size, MIN_PING_DATA, MAX_PING_DATA );
+ 		usage();
+ 	
+@@ -1112,7 +1113,7 @@
+ 		ht = timeval_diff( &current_time, &cursor->last_send_time );
+ 
+ 		if( report_interval && ( loop_flag || count_flag ) &&
+-			( timeval_diff ( &current_time, &last_report_time )	> report_interval ) )
++			( timeval_diff ( &current_time, &last_report_time )	>= report_interval ) )
+ 		{
+ 			print_per_system_splits();
+ 			gettimeofday( &current_time, &tz );
+@@ -1487,8 +1488,8 @@
+ 		}/* IF */
+ 		
+ 		fprintf( stderr, "\n" );
+-		h->num_sent_i = h->num_recv_i = h->max_reply_i =
+-			h->min_reply_i = h->total_time_i = 0;
++		h->num_sent_i = h->num_recv_i = h->max_reply_i = h->total_time_i = 0;
++		h->min_reply_i = 10000000;
+ 	
+ 	}/* FOR */
+ 
+@@ -2377,6 +2378,7 @@
+ 	p->timeout = timeout;
+ 	p->running = 1;
+ 	p->min_reply = 10000000;
++	p->min_reply_i = 10000000;
+ 
+ 	if( strlen( p->host ) > max_hostname_len )
+ 		max_hostname_len = strlen( p->host );
diff --git a/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild b/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild
new file mode 100644
index 000000000000..8181eccc2c64
--- /dev/null
+++ b/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="A utility to ping multiple hosts at once"
+SRC_URI="
+	mirror://debian/pool/main/f/${PN}/${PN}_2.4b2-to-ipv6.orig.tar.gz
+	mirror://debian/pool/main/f/${PN}/${PN}_2.4b2-to-ipv6-16.1.diff.gz
+	"
+HOMEPAGE="http://fping.sourceforge.net/ https://packages.qa.debian.org/f/fping.html"
+
+SLOT="0"
+LICENSE="fping"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="ipv6"
+
+S="${WORKDIR}/fping-2.4b2_to-ipv6"
+
+src_prepare() {
+	epatch \
+		"${WORKDIR}"/fping_2.4b2-to-ipv6-16.1.diff \
+		"${FILESDIR}"/${P}-err.h.patch \
+		"${FILESDIR}"/${P}-min-time.patch
+	eautoreconf
+
+	if use ipv6; then
+		cp -a "${S}" "${S}-6"
+	fi
+}
+
+src_configure() {
+	econf
+	if use ipv6; then
+		cd "${S}-6"
+		append-flags -DIPV6
+		econf
+	fi
+}
+
+src_compile() {
+	emake
+	if use ipv6; then
+		cd "${S}-6"
+		emake
+	fi
+}
+
+src_install () {
+	dosbin "${S}"/${PN}
+	if use ipv6; then
+		newsbin "${S}"-6/fping fping6
+		fperms 4555 /usr/sbin/fping6 #241930
+	fi
+	fperms 4555 /usr/sbin/fping  #241930
+	doman fping.8
+	dodoc ChangeLog README
+}
diff --git a/net-analyzer/fping/fping-3.13.ebuild b/net-analyzer/fping/fping-3.13.ebuild
new file mode 100644
index 000000000000..ec38bab42ded
--- /dev/null
+++ b/net-analyzer/fping/fping-3.13.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A utility to ping multiple hosts at once"
+HOMEPAGE="http://fping.org/"
+SRC_URI="http://fping.org/dist/${P}.tar.gz"
+
+LICENSE="fping"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="ipv6 suid"
+
+src_configure() {
+	econf $(use_enable ipv6)
+}
+
+src_install() {
+	default
+
+	if use suid ; then
+		fperms u+s /usr/sbin/fping
+		use ipv6 && fperms u+s /usr/sbin/fping6
+	fi
+}
diff --git a/net-analyzer/fping/fping-4.0.ebuild b/net-analyzer/fping/fping-4.0.ebuild
new file mode 100644
index 000000000000..da1204b92028
--- /dev/null
+++ b/net-analyzer/fping/fping-4.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A utility to ping multiple hosts at once"
+HOMEPAGE="http://fping.org/"
+SRC_URI="http://fping.org/dist/${P}.tar.gz"
+
+LICENSE="fping"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="ipv6 suid"
+
+src_configure() {
+	econf $(use_enable ipv6)
+}
+
+src_install() {
+	default
+
+	if use suid ; then
+		fperms u+s /usr/sbin/fping
+	fi
+}
diff --git a/net-analyzer/fping/metadata.xml b/net-analyzer/fping/metadata.xml
new file mode 100644
index 000000000000..1801de2b7670
--- /dev/null
+++ b/net-analyzer/fping/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>A utility to ping multiple hosts at once</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">fping</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/fprobe/Manifest b/net-analyzer/fprobe/Manifest
new file mode 100644
index 000000000000..7495c024119d
--- /dev/null
+++ b/net-analyzer/fprobe/Manifest
@@ -0,0 +1,10 @@
+AUX conf.d-fprobe 1620 SHA256 d6c2c010afb8298a19e5817a04c25620d1860e5f93b79880adb1403f0c1197f4 SHA512 82bc02f7538b6fade9deb6fc01d788089bcd3fac30f718f63c8ad6565414f1adc95cf57336d2d8e11dfc4622bcae9c185c322390977204e7f78730c87c7cdf7c WHIRLPOOL c1a4c9ad7b65cb59280fe16b8dc2abb83ed14d403661b056928d16d3bcb7a66019ab76c0606d39be1bdc0c4c056b0b9b781473775440fb2a44236a84e69fdfd5
+AUX fprobe-1.1-pidfile-sanity.patch 1319 SHA256 22ebee8359c2a0d134cb4f8f6e4e28a880a4886b8618f4fff59583962fd271d6 SHA512 c33d4f0f14c5b5523ffddc8ad43cd11d6d21c96a18cfbca72551426ea1fcec4bfbc86af23a63732129ee6b905f44fb0d05f045d692eb2e1406c400a9d4994c49 WHIRLPOOL 161ff246d1d4f7679ffbadbbdaec94f1726f66232584eb374c10e18e40002bcda2445726856a90df1a6a8cc3da678fb12d821bf0334c42576e51d58cc0e44955
+AUX fprobe-1.1-setgroups.patch 454 SHA256 9ae08a29ad08ee6697837a30fcc3866ea4909971cab4061f088e28113d67446b SHA512 a5248f5962f2ccb9e9235ae772d72b74db40504894e2ce40644af740849a98cfdaaa74beb151ca0e852f2df1419ee2366ed5850a15a23a54ebd3aab7569060fc WHIRLPOOL 039f4d42c88fae9dfb2e5c3853e937796267d25d8ab715f0157dfc7432b583b03cf779f6d08c4bf2d42f8fd33461089e993eecbfac90e217416a750dd0747b1d
+AUX init.d-fprobe 1099 SHA256 bf7ac8f9ce9ddd56963a03f220675a3a9f38fff691ffb3088b8347aec694d6ae SHA512 60823b35f809ada8de94f6427e2371681f646545b227974c4d5c94ae5153d48ad3815c848702606dc2ee18622787f1d04c499a241d60475c00303c6b652b9e51 WHIRLPOOL 19d5e074576a9d1f52001047939757c73c4bb12dcbf59ae9c74a935817edc023d1e441b9e3122abf129b270eac034908043659a02f91a19261097cb58b703675
+DIST fprobe-1.1.tar.bz2 104358 SHA256 3a1cedf5e7b0d36c648aa90914fa71a158c6743ecf74a38f4850afbac57d22a0 SHA512 35fa4bedf2c615093b6637630322115e12f005bc43186b86c55c6bdc76ae5308dd31e1d05632e26e07a30fba88d76b9acc98632bee4f372edcf9df5da3e32210 WHIRLPOOL 5069edf9a62d2da3d34192ad881d41e2d6c2fb7d10c6f70ebc717bde691cd926f73236319abec66847d9114c068c9ca7e5d00633a1eb05e8ae9f570a09cfda82
+EBUILD fprobe-1.1-r3.ebuild 805 SHA256 e43c408dbfdf904fe581742501992b08538bbbe468a66040dbd9dcb096a6d6b8 SHA512 0e04cd9b9d0691c1a5c3bf36c6e66cf48ffcf0ee7f798f569f6ad090db2fdf7a56af3dd9d1a5d81007677dc343cc45f04c956160817f0ab39e2f3310fa246ee3 WHIRLPOOL a7c97899ee6fbfd073237dc529ebef753b6a46707fddfcc2b3cea1c0c7f0bf9f6633b92b80420a6af9feed272e81e43a4aa9e0c5e70e94ab0371806bf113e4dc
+EBUILD fprobe-1.1.ebuild 702 SHA256 9adf4942d562228476d6786b05c71f6390a8203cf3336a7f8c734b910f7fc36e SHA512 264c6a71608e2580a9bde579ba524c429902c16405083758d5832cb24546709cbc629302ca358c87171ae166033bbcdc4ceb038c85cbec33cb852d61a8047523 WHIRLPOOL 7e2c4c514717e680de92a0a510cb6c1b25eadcfb64321dd105b7c0ccc65ebbe533087c76ff5f18a564090bda6f742db61581a693d29625897a49141bdf45cc24
+MISC ChangeLog 2729 SHA256 4c15cd2c270b9f727058c70d41cc6b581d3e64b6178b0dfa859edc50f6f6490d SHA512 fa9e217c049c089aaa6daf7f721fc42391838304a3ee153eb63c6589761bde1ca1ebff71ddf6978cb6256876a45a2e19fe4986e4e4de027710d21e658d022454 WHIRLPOOL 05214ce43f133a1673fd36721c764e8f4edb2f8cf5cc7368811a2ff5470c0cceae657924e59437589c108cc9e156bf98f3bd67a39834def3fb34ed628acd5573
+MISC ChangeLog-2015 2621 SHA256 3ec674d3444a6a97d5e6e041d7f450622cba04cc5d2486b6459a6f7a0dcc1292 SHA512 ac084d394e396a5c6e4fc57ce3471d12e4cc5eb89732835a926b858ccd311f3f09539ecb4e596397e97b431563c472689640a39a5cf9f92441b75836aa6a0dd0 WHIRLPOOL 552adc39bf788a1adde43c8aaffee78134e938c6ee2ecbc1bdce507078b7e0792d0633013ff767ae849495b4b47b938b03458281ecca953a684bf21962568b8c
+MISC metadata.xml 426 SHA256 fca6d7350e83150dafa45264de693426a704494113baf12769abe07b1bf25222 SHA512 2b9247d129021a3e25d3d4196a48ec2d204d2e91307231d372cc1bde255553785c9e413ba3dcd6a62ad28e54ba46e732212aeff4bcb03e796f2ba87325dd80bc WHIRLPOOL 6befc7fabc178533678599bcc15af97e810c85df1f1b380162daa46a375df66ad02c57a83cd5845a3550216a07fdfbcfdf8f4ea87f05e0b7350571eecf0814f5
diff --git a/net-analyzer/fprobe/files/conf.d-fprobe b/net-analyzer/fprobe/files/conf.d-fprobe
new file mode 100644
index 000000000000..a93c5c10b207
--- /dev/null
+++ b/net-analyzer/fprobe/files/conf.d-fprobe
@@ -0,0 +1,71 @@
+# Config file for /etc/init.d/fprobe
+
+# Do we want the interface in promiscous mode [yes/no]
+#PROMISC=no
+
+# Interface
+IFACE=eth0
+
+# If configured, only capture packets matching this tcpdump expression
+#FILTER=""
+
+# Flow state timers
+#TIMER_EXPIRED=5
+#TIMER_FRAGMENTED=30
+#TIMER_IDLE=60
+#TIMER_ACTIVE=300
+
+# This is the default and should be left unless you know what you are doing
+#FLOW_VER=5
+
+# local ip. if configured fprobe will use this as the source IP for sending ALL flow data
+# If you want to specify a specific source address per collecter, customize it below
+#LOCALIP=
+
+# SNMP iface id
+SNMP_IFACE="${IFACE#eth}"
+
+# Maximum number of concurrent flows to track
+# using a specified amount of memory
+#MEMBULK=10000
+#MEMLIMIT=
+
+# Pending queue
+#PENDING=100
+
+# Kernel capture buffer size (kB)
+#KERNBUF=1024
+
+# Realtime priority [0=disabled, 1..99]
+#RTPRIO=0
+
+# Delay N nanoseconds after each B bytes
+#DELAY="0:0"
+
+# How much of the start of each packet to grab
+#SNAPLEN=256
+
+# chroot() to this location after startup
+CHROOT="/var/empty"
+
+# User to run as. must have perms to the pidfile directory /var/run/fprobe/
+USER=nobody
+
+# logging level for syslog (0=EMERG, ..., 6=INFO, 7=DEBUG)
+#LOGLEVEL=6
+
+# If you want to run multiple instances of fprobe,
+# You MUST set this variable to a unique INTEGER for each one!
+PIDFILE_ID=''
+
+# remote ip. this is where we send flows
+REMOTEIP=127.0.0.1
+# port to listen on
+PORT=2055
+# Collector type, see the manpage for valid types
+TYPE=''
+
+# If you want multiple collectors, just specify each one here
+COLLECTORS="${REMOTEIP}:${PORT}/${LOCALIP}/${TYPE}"
+
+# vim:ft=gentoo-conf-d:
diff --git a/net-analyzer/fprobe/files/fprobe-1.1-pidfile-sanity.patch b/net-analyzer/fprobe/files/fprobe-1.1-pidfile-sanity.patch
new file mode 100644
index 000000000000..c58c2a97c002
--- /dev/null
+++ b/net-analyzer/fprobe/files/fprobe-1.1-pidfile-sanity.patch
@@ -0,0 +1,47 @@
+If we are using the chroot() option or the setuid options, we must create the
+pidfile before doing the chroot OR the setreuid. It's actually best for
+start-stop-daemon if we create the pidfile from the master side of the fork()
+before it exits, since most of the startup checks happen after the chroot()
+unfortunetly.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+--- a/src/fprobe.c
++++ b/src/fprobe.c
+@@ -1379,7 +1379,8 @@
+ 
+ 	my_log_open(ident, verbosity, log_dest);
+ 	if (!(log_dest & 2)) {
+-		switch (fork()) {
++		pid_t childpid = fork();
++		switch (childpid) {
+ 			case -1:
+ 				fprintf(stderr, "fork(): %s", strerror(errno));
+ 				exit(1);
+@@ -1392,6 +1393,12 @@
+ 				break;
+ 
+ 			default:
++				if (!(pidfile = fopen(pidfilepath, "w")))
++					my_log(LOG_ERR, "Can't create pid file. fopen(): %s", strerror(errno));
++				else {
++					fprintf(pidfile, "%ld\n", (long) childpid);
++					fclose(pidfile);
++				}
+ 				exit(0);
+ 		}
+ 	} else {
+@@ -1548,13 +1555,6 @@
+ 		}
+ 	}
+ 
+-	if (!(pidfile = fopen(pidfilepath, "w")))
+-		my_log(LOG_ERR, "Can't create pid file. fopen(): %s", strerror(errno));
+-	else {
+-		fprintf(pidfile, "%ld\n", (long) pid);
+-		fclose(pidfile);
+-	}
+-
+ 	my_log(LOG_INFO, "pid: %d", pid);
+ 	my_log(LOG_INFO, "interface: %s, datalink: %s (%d)",
+ 		dev, dlt[link_type_idx].descr, link_type);
diff --git a/net-analyzer/fprobe/files/fprobe-1.1-setgroups.patch b/net-analyzer/fprobe/files/fprobe-1.1-setgroups.patch
new file mode 100644
index 000000000000..803a2a9ce43a
--- /dev/null
+++ b/net-analyzer/fprobe/files/fprobe-1.1-setgroups.patch
@@ -0,0 +1,18 @@
+This seems to fail after the chroot(), so just squelch the exit for now.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+--- a/src/fprobe.c
++++ b/src/fprobe.c
+@@ -1541,10 +1541,10 @@
+ 	}
+ 
+ 	if (pw) {
+		if (setgroups(0, NULL) < 0) {
+			my_log(LOG_CRIT, "setgroups: %s", strerror(errno));
+-			exit(1);
++			//exit(1);
+		}
+ 		if (setregid(pw->pw_gid, pw->pw_gid)) {
+ 			my_log(LOG_CRIT, "setregid(%u): %s", pw->pw_gid, strerror(errno));
+ 			exit(1);
diff --git a/net-analyzer/fprobe/files/init.d-fprobe b/net-analyzer/fprobe/files/init.d-fprobe
new file mode 100644
index 000000000000..c470af432c9c
--- /dev/null
+++ b/net-analyzer/fprobe/files/init.d-fprobe
@@ -0,0 +1,41 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+BIN=/usr/sbin/fprobe
+PIDFILE_EXTRA=""
+[ -n "$PIDFILE_ID" ] && PIDFILE_EXTRA="[$PIDFILE_ID]"
+PIDFILE="/var/run/fprobe$PIDFILE_EXTRA.pid"
+
+start() {
+	ebegin "Starting fprobe"
+	local OPTS=""
+	[ "${PROMISC}" = "yes" ] || OPTS="${OPTS} -p"
+	[ -n "${FILTER}" ] && OPTS="${OPTS} -f '${FILTER}'"
+	for optname in i:IFACE s:TIMER_EXPIRED g:TIME_FRAGMENTED d:TIMER_IDLE \
+		e:TIMER_ACTIVE n:FLOW_VER a:LOCALIP x:SNMP_IFACE b:MEMBULK \
+		m:MEMLIMIT q:PENDING B:KERNBUF r:RTPRIO t:DELAY S:SNAPLEN \
+		c:CHROOT u:USER v:LOGLEVEL ; do
+	    opt="${optname%:*}"	optvar="${optname#*:}"
+	    eval optvalue='$'$optvar
+	    [ -n "$optvalue" ] && OPTS="${OPTS} -${opt} ${optvalue}"
+	done
+	OPTS="${OPTS} -l 1:${PIDFILE_ID} ${COLLECTORS}"
+	start-stop-daemon --start --exec $BIN \
+		--pidfile ${PIDFILE} \
+		-- ${OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping fprobe"
+	start-stop-daemon --stop --quiet --exec $BIN \
+		--pidfile ${PIDFILE}
+	eend $?
+}
+
+# vim:ft=gentoo-init-d:
diff --git a/net-analyzer/fprobe/fprobe-1.1-r3.ebuild b/net-analyzer/fprobe/fprobe-1.1-r3.ebuild
new file mode 100644
index 000000000000..c9f12cb15c7d
--- /dev/null
+++ b/net-analyzer/fprobe/fprobe-1.1-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="libpcap-based tool to collect network traffic data and emit it as NetFlow flows"
+HOMEPAGE="http://fprobe.sourceforge.net"
+LICENSE="GPL-2"
+
+SRC_URI="mirror://sourceforge/fprobe/${P}.tar.bz2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="debug messages"
+
+DEPEND="
+	net-libs/libpcap
+"
+RDEPEND="
+	${DEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/fprobe-1.1-pidfile-sanity.patch
+	"${FILESDIR}"/fprobe-1.1-setgroups.patch
+)
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable messages)
+}
+
+DOCS=( AUTHORS NEWS README TODO )
+
+src_install() {
+	default
+
+	docinto contrib
+	dodoc contrib/tg.sh
+
+	newinitd "${FILESDIR}"/init.d-fprobe fprobe
+	newconfd "${FILESDIR}"/conf.d-fprobe fprobe
+}
diff --git a/net-analyzer/fprobe/fprobe-1.1.ebuild b/net-analyzer/fprobe/fprobe-1.1.ebuild
new file mode 100644
index 000000000000..97dcfe72a52f
--- /dev/null
+++ b/net-analyzer/fprobe/fprobe-1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="A libpcap-based tool to collect network traffic data and emit it as NetFlow flows"
+HOMEPAGE="http://fprobe.sourceforge.net"
+LICENSE="GPL-2"
+
+SRC_URI="mirror://sourceforge/fprobe/${P}.tar.bz2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+
+IUSE="debug messages"
+
+DEPEND="net-libs/libpcap"
+
+src_compile() {
+	local myconf
+	myconf="`use_enable debug`
+		`use_enable messages`"
+
+	econf ${myconf} || die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "install failed"
+
+	dodoc AUTHORS NEWS README TODO
+	docinto contrib ; dodoc contrib/tg.sh
+}
diff --git a/net-analyzer/fprobe/metadata.xml b/net-analyzer/fprobe/metadata.xml
new file mode 100644
index 000000000000..0fd136315cb2
--- /dev/null
+++ b/net-analyzer/fprobe/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<use>
+		<flag name="messages">enable console messages</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">fprobe</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/fragroute/Manifest b/net-analyzer/fragroute/Manifest
new file mode 100644
index 000000000000..142c54683408
--- /dev/null
+++ b/net-analyzer/fragroute/Manifest
@@ -0,0 +1,5 @@
+DIST fragroute-1.2.6-ipv6.tar.gz 163309 SHA256 f1e4217120a1c557408182a64033892a6ab7515abd1b46d8b10d6de76431f53d SHA512 76c6fbe37100a43df477f0ba455a2bed6ac53c1f369e147d220562a34eca0eb273171e4b9ff4f3fc473c3f99a8344f6d49963c20d7cfaf6879200322a491ffc3 WHIRLPOOL 9d321c54d9100530fc93420d764b88adc037ee99c15d0f93f9d557faabf1d5ea929a184139962b55aff922684e04a7139c313c8eedf6e882880897b9b660967f
+EBUILD fragroute-1.2.6.ebuild 1101 SHA256 309e4e5bf65f899e6f5f9cfb7677fea6d33cb3ded587d3c71dde5e2ff56118c0 SHA512 7b7f40e9bffe3e94fe8c8ae24d8bfde92af603de773500d90f9dfa3707140b2c5f27c57fe75945fd81d9596ac51c85dd66c9d1315a4d91729c22ffaa437f29e9 WHIRLPOOL fadd1b996866b1387dcde357b99a9caeb84537c7ad231cb80f5e4c0043b5259fcc9a10d8781b4680b011b6d73d8d1ef56a788102c4f89eb1bc13f2f955fd5a38
+MISC ChangeLog 3074 SHA256 000f15e850b4c32c0ecc2aa9042fd24f90a8facc4a58e3ce470153405e60088f SHA512 acd3b491527089f519c6a122176fff8fc57acb1f4cc996d489e1f4618ee053500b4b944bc356c2510cdd41927589278c6ae1b4f068a542ac648f56a9aead3428 WHIRLPOOL 3b33656c7438fe752c8e9d438c81e2e9820f3ac0b82973c01fc519fe867cafe551c8507f93d47dc6299eee9f5391d04255f7971818ad128a4753ec82efc7976c
+MISC ChangeLog-2015 4217 SHA256 e23c5a435e8346398fec2ed7b95752ae50ca18934ad8ff00bdf29acd3abe0954 SHA512 76ac7daa5b2914bd0f9fbc266711a5aeea7c85e4266dd2d9c32e61cbcfda17ee854ea6588bb3ef7a5373df08217fcac26c0cc2097b288140b0abb0a820e81273 WHIRLPOOL 4a440e63668a56a352061a50f8f778c56adb554f4622ac3093eff5589ce945354153a4be12227d996478f154b828f35a791af7c440e793f5bc356c4ea73b93d5
+MISC metadata.xml 364 SHA256 40d0919b64f5cc7f7988697d00dada910778ddb70cb7981a08fc0cdd031a90f7 SHA512 3b38ee5be21d5a6957e39fea01461187f01f5b34a0538df8b6f6c217e0832a5d6cb5dbd9b6508cb5a977618dd9f8ffb0d0feefb0ec6c050efcfb4fa68a00ed78 WHIRLPOOL 74b8927d2518dd526ebef1944c34523589d73639ecc034d05841c6e68b32cd09832dc3da2f1259c9d371c5f168bcd65f55157695c6dedbc16f9de89140977e21
diff --git a/net-analyzer/fragroute/fragroute-1.2.6.ebuild b/net-analyzer/fragroute/fragroute-1.2.6.ebuild
new file mode 100644
index 000000000000..480dc836096d
--- /dev/null
+++ b/net-analyzer/fragroute/fragroute-1.2.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+MY_P="${P}-ipv6"
+
+inherit autotools-utils
+
+DESCRIPTION="Testing of network intrusion detection systems, firewalls and TCP/IP stacks"
+HOMEPAGE="https://github.com/stsi/fragroute-ipv6"
+SRC_URI="https://fragroute-ipv6.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+
+RDEPEND="
+	dev-libs/libevent
+	net-libs/libpcap
+	>=dev-libs/libdnet-1.12[ipv6]
+"
+DEPEND="${RDEPEND}
+	virtual/awk"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( INSTALL README TODO )
+
+src_prepare() {
+	# Remove broken and old files, autotools will regen needed files
+	rm *.m4 acconfig.h missing Makefile.in || die
+	# Add missing includes
+	sed -i -e "/#define IPUTIL_H/a#include <stdio.h>\n#include <stdint.h>" iputil.h || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-libevent="${EPREFIX}"/usr \
+		--with-libdnet="${EPREFIX}"/usr \
+		--with-libpcap="${EPREFIX}"/usr
+	)
+	autotools-utils_src_configure
+}
diff --git a/net-analyzer/fragroute/metadata.xml b/net-analyzer/fragroute/metadata.xml
new file mode 100644
index 000000000000..f8f153715435
--- /dev/null
+++ b/net-analyzer/fragroute/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">stsi/fragroute-ipv6</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/ftester/Manifest b/net-analyzer/ftester/Manifest
new file mode 100644
index 000000000000..2bcb155394a2
--- /dev/null
+++ b/net-analyzer/ftester/Manifest
@@ -0,0 +1,5 @@
+DIST ftester-1.0.tar.gz 30821 SHA256 7bb10d10913187e33af8be3d17c0d4ad5d0b8aa5af18242332787150eabd2f6f SHA512 413929178489c755fb5c876a88510bea28c59f1942a279c332fcd008ecbf4b0fd47e6b15abe1068c134d14c9ab2bdb841ffa280f95f77a819779e7e9626e9cfb WHIRLPOOL 19ca3b259e7301fea7c2399c6d51b948bd2802fc3170333cb25c6cb43306267e6c959989984c0530ebd9c28c367241e7b77cfe26d74f063a47a44dc9a2802b24
+EBUILD ftester-1.0.ebuild 560 SHA256 36c0b43b37011dee1164ae95c7091463aa9d7242b9cbc5d57fcd45ae2ce85b10 SHA512 2839db5da77f20b1ef92fa22d44f7d275596e6ece5e2da7cec53ceaae04f8a5b986cd46ed68d4ef985233c20433821ae0e4596bdc390a326a6e634f0615af7c4 WHIRLPOOL c9fb54d08b689ef855494d2472bc69be936b6f676d882cfd5b6ec939afd457dccedd8e4a12d2140b37046bf21574b171834703fdab212d80b988b9c4ed9eb926
+MISC ChangeLog 2427 SHA256 a978498d2d3c77dfa83967f5f8c38ae0232caf251ea9ca43f776dbb0da0ffe9b SHA512 d9fd4af1a4ecd4521b77b214ad2fa7ae18be91333722727eb8b53e6715bc57604efbf353abd6426e862be9bedfcb13e8f5a72d1bf161422a0a380bb08c597611 WHIRLPOOL 94e5375cfe24cd1a02fc643251a7332194ae4edcc9c59e7f1d64d73499f7340fd4058d426b1e5844e827ec506e71e5a50ddfe27e1feeec9a430a255a67c97fd1
+MISC ChangeLog-2015 2409 SHA256 d3aa53f4e1c76d596689c4e29a2becee4ccb8069b3b2a5c4f766415375608768 SHA512 b82e0fd8a0638c5331ea56820829840459b8b17b707357d7e3d2c832d483c310fc8563d0832b082b91feab00078a2f45a919e54129931f25ef606a2300ce8f5e WHIRLPOOL a341a7ae6e9dab38eaebb7b135ec481f425160a7472542c82c70f44d6355686121d3bffbd6e7a6f9156ad7742510dbf9e9be2d7861822a361a0a67864fc81685
+MISC metadata.xml 384 SHA256 07c418f8fb0e1214a263df2ad8829836c549a358752da3d251f0ee02e2229fb2 SHA512 1e474f26f45f79f4c841ef87835debec1a76d6e8cb5cfcd3d3f98990e0a7939ae895ace963ba29414b33192e4da2eeed4865a6d6d1ddbd831599b48167881641 WHIRLPOOL 00636416442d878f8c9b10622319bb455722379b548f007db08e65967567ac8992318204fda74cbbf5222883b29019ee3491350b82af3c60d1aa5bc62a79ed7d
diff --git a/net-analyzer/ftester/ftester-1.0.ebuild b/net-analyzer/ftester/ftester-1.0.ebuild
new file mode 100644
index 000000000000..aabe8017d39e
--- /dev/null
+++ b/net-analyzer/ftester/ftester-1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Firewall and Intrusion Detection System testing tool"
+HOMEPAGE="http://dev.inversepath.com/trac/ftester"
+SRC_URI="http://dev.inversepath.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+RDEPEND="
+	dev-perl/List-MoreUtils
+	dev-perl/Net-Pcap
+	dev-perl/Net-PcapUtils
+	dev-perl/Net-RawIP
+	dev-perl/NetPacket
+"
+
+src_install() {
+	dodoc CREDITS Changelog ftest.conf
+	doman ${PN}.8
+	dosbin ftestd ftest freport
+}
diff --git a/net-analyzer/ftester/metadata.xml b/net-analyzer/ftester/metadata.xml
new file mode 100644
index 000000000000..f7f593381e2c
--- /dev/null
+++ b/net-analyzer/ftester/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>
+		Ftester - Firewall and Intrusion Detection System testing tool
+	</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/fwlogwatch/Manifest b/net-analyzer/fwlogwatch/Manifest
new file mode 100644
index 000000000000..5643987d8710
--- /dev/null
+++ b/net-analyzer/fwlogwatch/Manifest
@@ -0,0 +1,7 @@
+DIST fwlogwatch-1.4.tar.bz2 92652 SHA256 0ca67b2f2a36e4f79ac202018d5440809d50a1cb7203e2a02818f2aade112e9a SHA512 0a67c0ae8b096fdf7a06e279a11b0bc71f2d514790c1669f60606b17a7f3f3ec97dedc2005438ce0ec82efcd66a822b62dbb36603f4b02e010f469fb885b87e6 WHIRLPOOL 7dc01a46be44733cab6f69525f704f4ed86802112bfff284480df4d9151174e6d0bb03a6cc7349a77b7c32b6d312dea582627c0e7b71cad4e36073fda46057f9
+DIST fwlogwatch-1.5.tar.bz2 94451 SHA256 0c8c9465b9d6c653b26492028bb040f60987804dfc53e480cb8cfde62cb72b1d SHA512 d4890596859929ddc6adfd7f9e735e0c414bad40eff6732120a522a8bd4fb8d1442c7d1026f0f3c6ac5c4d51b76a2bac486d04f0fbceae67395c585098afef85 WHIRLPOOL 6dd21c08158c2fd99c13ea46e8cbd9ebd7ec7e0612cf21f6cef07efcbe134aec900bae33ecd74f61fa1ddbc799bfd22d37f5c42927a72f02b8298c7851f2e2b0
+EBUILD fwlogwatch-1.4.ebuild 1597 SHA256 159d8eeac514e073e277c310aab5b66a618d87d1ac25be9b9875eb29550ae0f3 SHA512 650be48814c7f7602431a95a006252f4928107003c030d06fe5a1cefee5ab0ddd2b97af10b93e5a9742fceb40cb9ed0eca921e936e1028973c64406768dec333 WHIRLPOOL 9b88a2bb92c897ce51aad2c4991e742957d01ba828705d51642f5242693eb402023a686c5306c4e4f80f0e074862c45d53b530dcbdce87b1330941aabdeeb41a
+EBUILD fwlogwatch-1.5.ebuild 1743 SHA256 4c80330a51005b8d3fda57f3bbc7ec6a5d446cee6c2e3b431d3636751e7c9b81 SHA512 5ea5973fe13e703cff5defdd295e126b52efb7e7816f05b75aaaeb4d4ab77454b36700215d491d3b8d2a771fb510740fd44d1a36512cd521c9ddd26b9f74da30 WHIRLPOOL b8ae3a591e618481fca25398c5c01ae021ef8ceaea4a5f46cec7ecb186ba1e0040d4d8fb8c91826406cae045c5e4f209698ad8856a9eeceded0cec8e3446d3c1
+MISC ChangeLog 2713 SHA256 cc68785a06893b1d2e851c7dd2e16eb6f903f1ba5960bf0ef649ad23c3fda570 SHA512 187afd1fd6da762db1ca02ba3b5653965b6ac528980b2e0981556c8cd4c906a2fc5e9787afb4b88e92eb2dbfa15bc5f970dce804104e5bcaa419354d3de2a88c WHIRLPOOL 292dc330092db92247fb62f17c8dff4f2969049dc166e331790c3ff37ff8e0af2111992454f9ea213addc7113a4f00b19808e89455ff345f568aba10b0558564
+MISC ChangeLog-2015 4638 SHA256 e790dddbf123c614fcb82324d17236af85cbaaa5a903127cb6944b7bf17b0f77 SHA512 de4872d8304b483b4561150f0284319363a29f3785a1a6ceff773f460ab1007d9bc951cfb7cc92a1a1130883daefcd166a48c2b0627a69d093654f8504725fe6 WHIRLPOOL ec71f2e6864070b7c41f574c311305a4c7c20746e418d0eead702759c4676a798de01933f9e0f9791caa7035a5aa44ca23467e16bfcbde7a39fff761629e67fe
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild
new file mode 100644
index 000000000000..d511245fa473
--- /dev/null
+++ b/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A packet filter and firewall log analyzer"
+HOMEPAGE="http://fwlogwatch.inside-security.de/"
+SRC_URI="${HOMEPAGE}sw/${P}.tar.bz2"
+
+KEYWORDS="amd64 ~ppc sparc x86"
+LICENSE="GPL-1"
+SLOT="0"
+IUSE="nls zlib"
+
+RDEPEND="
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/flex
+	nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+	if use nls; then
+		strip-linguas -i po/
+		local lingua pofile
+		for pofile in po/*.po; do
+			lingua=${pofile/po\/}
+			lingua=${lingua/.po}
+			if ! has ${lingua} ${LINGUAS}; then
+				sed -i \
+					-e "/${lingua}.[mp]o/d" \
+					Makefile po/Makefile || die
+			fi
+		done
+	fi
+
+	sed -i \
+		-e '/^INSTALL_/s|$| -D|g' \
+		-e 's|make|$(MAKE)|g ' \
+		Makefile || die
+}
+
+src_configure() {
+	if ! use zlib; then
+		sed -i Makefile -e '/^LIBS/ s|-lz||g' || die
+	else
+		append-cflags -DHAVE_ZLIB
+	fi
+
+	use nls && append-cflags -DHAVE_GETTEXT
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+	use nls && emake -C po
+}
+
+src_install() {
+	emake \
+		LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \
+		install
+	use nls && emake \
+		LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \
+		install-i18n
+
+	dosbin contrib/fwlw_notify
+	dosbin contrib/fwlw_respond
+
+	dodoc AUTHORS ChangeLog CREDITS README
+
+	insinto /usr/share/fwlogwatch/contrib
+
+	doins contrib/fwlogsummary.cgi
+	doins contrib/fwlogsummary_small.cgi
+	doins contrib/fwlogwatch.php
+
+	insinto /etc
+	doins fwlogwatch.config
+}
diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
new file mode 100644
index 000000000000..000c335caa62
--- /dev/null
+++ b/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A packet filter and firewall log analyzer"
+HOMEPAGE="http://fwlogwatch.inside-security.de/"
+SRC_URI="${HOMEPAGE}sw/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+LICENSE="GPL-1"
+SLOT="0"
+IUSE="geoip nls zlib"
+
+RDEPEND="
+	geoip? ( dev-libs/geoip )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/flex
+	nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+	if use nls; then
+		strip-linguas -i po/
+		local lingua pofile
+		for pofile in po/*.po; do
+			lingua=${pofile/po\/}
+			lingua=${lingua/.po}
+			if ! has ${lingua} ${LINGUAS}; then
+				sed -i \
+					-e "/${lingua}.[mp]o/d" \
+					Makefile po/Makefile || die
+			fi
+		done
+	fi
+
+	sed -i \
+		-e '/^INSTALL_/s|$| -D|g' \
+		-e 's|make|$(MAKE)|g ' \
+		Makefile || die
+}
+
+src_configure() {
+	if ! use zlib; then
+		sed -i Makefile -e '/^LIBS/ s|-lz||g' || die
+	else
+		append-cflags -DHAVE_ZLIB
+	fi
+
+	if use geoip; then
+		append-cflags -DHAVE_GEOIP
+		sed -i Makefile -e '/^LIBS/ s| #| -lGeoIP #|g' || die
+	fi
+
+	use nls && append-cflags -DHAVE_GETTEXT
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+	use nls && emake -C po
+}
+
+src_install() {
+	emake \
+		LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \
+		install
+	use nls && emake \
+		LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \
+		install-i18n
+
+	dosbin contrib/fwlw_notify
+	dosbin contrib/fwlw_respond
+
+	dodoc AUTHORS ChangeLog CREDITS README
+
+	insinto /usr/share/fwlogwatch/contrib
+
+	doins contrib/fwlogsummary.cgi
+	doins contrib/fwlogsummary_small.cgi
+	doins contrib/fwlogwatch.php
+
+	insinto /etc
+	doins fwlogwatch.config
+}
diff --git a/net-analyzer/fwlogwatch/metadata.xml b/net-analyzer/fwlogwatch/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/fwlogwatch/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/gensink/Manifest b/net-analyzer/gensink/Manifest
new file mode 100644
index 000000000000..527084095c93
--- /dev/null
+++ b/net-analyzer/gensink/Manifest
@@ -0,0 +1,6 @@
+AUX gensink-4.1-make.patch 140 SHA256 dc9211e4a04b3c12759964d4b107c93e5d68a4103c23bae7ae4841d73938823a SHA512 c8871a2a1cecf9cb8c2c1d4d6905bc6a4df29d5741e1c4f0691d38c68619f159739b2e0c9a0fa1535cf195fd97bd0dc9ed2accc71ea92edd5ca9be2ff12d025d WHIRLPOOL 261bca2c4e091622815b319183d235efb97a4e9ab2074b2f7f9dda44742ddbab3bd3fc0272a3fb7df552627b5a5e28b0d5268b4798b02288b714ed9907fea4f8
+DIST gensink-4.1.tar.gz 12352 SHA256 daacdb8f2a609c910eb7eac86dd0fe56e0a97105749b73f2850e44982d2200a4 SHA512 5572c4df9b3c688f6a0f33c539bcdbd3c7b2a0992ba560907e0d22440176380cb6888732ab11ef4d6ced0c2d906ab494895a65c00a64db8603cbd1245d9c0d27 WHIRLPOOL e5dedca136818d006267c56d72cf145a7911ee486c42afc1131f9526f8d3b9c23d2e0004b4e0f9056b803fbcb35d6dc1c4b54efc33eaa2c68080d39a8ba0f417
+EBUILD gensink-4.1-r2.ebuild 473 SHA256 e424a2fef47833f6177d01dcda122b5bdb970cbb2ab1ccc935f38b04aca08d1c SHA512 5c5f764567f5cbcb95a2876d662c1f23812115eee8216cbf2b7c5dd3aa32f23f6e962f794fda2cb855a35c2be118c8d4d062091e4c48f90049a0bc0bf1c3498c WHIRLPOOL d3c1143000d701e3ff7b82e2dc6758ffd0c481f142a76c6129da4ef54be6e788fff5f669a4fa02f0332c1049d1d8c56b60d402dab6c6fabac21ce7f0ca7c213a
+MISC ChangeLog 2464 SHA256 405b5a95d650e7ad675dc5a6820757a4b2113f2563bfff8c022a4d2a92a0cfcc SHA512 e7493af946c2db6d20a0f2dc7aeb698dddd8eb70708804a3cccfd9dfe11c378286dc8314fca0fc7245a559361f5f7437cfeececb982f296195ee0160f98843e5 WHIRLPOOL cfe95d69a5b0bc8eac5555ecbc6f84439a2577b5425554bea875cbfe40bc890aefa7f729f6d496d270c25493194f71bc2d380354ba4fc9e2a96787b5793c5569
+MISC ChangeLog-2015 2039 SHA256 9241fd0366b938b231b43fd796ccc739b73978bfb9028e3182a6482e78df24eb SHA512 77ed757fadcb7c3b6ec1e4075cd2b6df3b54f9b35de5cb1740ba3cec9757cd7f85f5888f36fd1b92428a1ec33d8dfdc20c2141aa01aaa0db084a42773d20276c WHIRLPOOL 7f1abedcc9d9f90a008f1952624e105ca9d3aca558f87332dfb54d4de1a8ab12277ad9db2b574a6f4c8d80a2b0f7189f0a10dde787da37a9966b852cfaea7aee
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/gensink/files/gensink-4.1-make.patch b/net-analyzer/gensink/files/gensink-4.1-make.patch
new file mode 100644
index 000000000000..103043f79ae1
--- /dev/null
+++ b/net-analyzer/gensink/files/gensink-4.1-make.patch
@@ -0,0 +1,10 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,4 @@
+ PROGS = gen4 sink4 tub4
+-CC = gcc
+-CFLAGS = -O2 -g -Wall
+-LDFLAGS = -O -g
+ 
+ all: $(PROGS)
+ 
diff --git a/net-analyzer/gensink/gensink-4.1-r2.ebuild b/net-analyzer/gensink/gensink-4.1-r2.ebuild
new file mode 100644
index 000000000000..5a99e658ec60
--- /dev/null
+++ b/net-analyzer/gensink/gensink-4.1-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit base toolchain-funcs
+
+DESCRIPTION="A simple TCP benchmark suite"
+HOMEPAGE="http://jes.home.cern.ch/jes/gensink/"
+SRC_URI="http://jes.home.cern.ch/jes/gensink/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+
+PATCHES=( "${FILESDIR}/${P}-make.patch" )
+
+src_compile() {
+	tc-export CC
+	default
+}
+src_install() {
+	dobin sink4 tub4 gen4
+}
diff --git a/net-analyzer/gensink/metadata.xml b/net-analyzer/gensink/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/gensink/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/gnome-nettool/Manifest b/net-analyzer/gnome-nettool/Manifest
new file mode 100644
index 000000000000..466ce68e0b3c
--- /dev/null
+++ b/net-analyzer/gnome-nettool/Manifest
@@ -0,0 +1,5 @@
+DIST gnome-nettool-3.8.1.tar.xz 589024 SHA256 f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1 SHA512 c1c90fa727ebbf21442c4d0f5f4e98acf91fdd68a476f5f378167f92c3d7938ef33598525b62b838dc9b485abeb40171bdffb0fe3cb060fd3982db013a30bbed WHIRLPOOL fe63ac5972b04046b97bdc33a31461f939dff5bd71d1f3b9b76bbd0bc2925a6622b0a938de28b7769f1877a69ccfb77b17c71df12b86edf669e8b32dd9125560
+EBUILD gnome-nettool-3.8.1.ebuild 988 SHA256 da255c5605ed638665bc22153eb88d90c1796822e9419f8cdf7926a778885f3c SHA512 ba21742382c329f7a01669f644244df569b2d52ebc2ac75b7d893b119b0bc1828405e6b49078c5e985e2711d917f1be899038c66964290a98aa1495609918eda WHIRLPOOL cece828391079c1e396fc552ed1df613ac4b0c3c8bd5c3bc585936ab07ab1647113ea30619074716cfdacfe65c980a4e000d9cf6dddc0315aa54f4a9d4498dd6
+MISC ChangeLog 2449 SHA256 a5c3daf0574b4216dfa65f6a1e7c2a6ddede97fc46adb548fd5226fa8bbf4882 SHA512 da3006d32cb30fed3b73769d563c3a76a55d6fbba5eaaa1e829174d2653ef2bba9a6b50db6da829bcf64cc69dc59749723954450c518fa9d6dfb7375016c0e06 WHIRLPOOL 2aa68aeaccac40cef58ce43b07e3e7e37730f9fc3e2860b698a20f574a6a552ab15f6c18cfada4e523a86386b47439e9e5d7c109c182417f0c9753afe6097faf
+MISC ChangeLog-2015 17219 SHA256 a3661a0a0f0ae5692eee1070a7837bdb6e862b0908fa19959a754c902c2517d8 SHA512 7c6a6cec271323843000fbf028a15549635710ff6483ed6f22970effdc23aab35d846a09e651f79fcb19e2aec626e0dee596d59544b1ee21569101d4a435d33a WHIRLPOOL 90dbf8025e7d1a706794576f456f12608bae7592df3465fbb310237a44e856ac25b5076d8e68d3ec199a1246c739b100d821e4a902e949cfba19c5c8b3dc15ef
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild
new file mode 100644
index 000000000000..a7f4719ea2d9
--- /dev/null
+++ b/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="Graphical front-ends to various networking command-line"
+HOMEPAGE="https://git.gnome.org/browse/gnome-nettool/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.25.10:2
+	gnome-base/libgtop:2=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.90.4:3
+	x11-libs/pango
+"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		net-misc/iputils
+		net-analyzer/tcptraceroute
+		net-analyzer/traceroute
+		sys-freebsd/freebsd-usbin )
+	net-analyzer/nmap
+	net-dns/bind-tools
+	userland_GNU? ( net-misc/netkit-fingerd net-misc/whois )
+	userland_BSD? ( net-misc/bsdwhois )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+src_configure() {
+	gnome2_src_configure $(use_enable debug)
+}
diff --git a/net-analyzer/gnome-nettool/metadata.xml b/net-analyzer/gnome-nettool/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/net-analyzer/gnome-nettool/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/gnu-netcat/Manifest b/net-analyzer/gnu-netcat/Manifest
new file mode 100644
index 000000000000..b9919998108b
--- /dev/null
+++ b/net-analyzer/gnu-netcat/Manifest
@@ -0,0 +1,8 @@
+AUX gnu-netcat-LC_CTYPE.patch 479 SHA256 d23dc965eaf9564e04fe2c03b51053945265b77504d92f343a3c0f0280afd299 SHA512 9ec66fe94fe5d6b76d94959d1e26a3b5ae7f1b09b9d863c73867a1325a14b3691e475ce7db54612f16ef4cc954815d268fb19a16cf5bfce4b0d585e40b690293 WHIRLPOOL 4ee8a3f19af7a3e25ee3d43cd63b574020dc3310ae59312b13eb6d5a1eda656e305bf53b5e45893475cb59096461e693749a11d7fbb0d4b5910aacafc3617e71
+AUX gnu-netcat-close.patch 342 SHA256 578232e6e2c8d10a5813841bd9e7a0e7bc51ed9654407ffc7690e76cb0330cde SHA512 920153a3c65f2a8c54ec1bfe3c2588a300c507fb3e88f80d69c2f816a802c72843a4c34900fd5a2e5bd03ab952f25796a6b601a105e01fa9097b19cff9bf0f11 WHIRLPOOL 4dc7731caccbba985979025b5f03514601df8805621140a51058f04ff16f465193a4283c6bd41ddd3d81adc50f11166abb2404c957d2af4858c00486c804e2c4
+AUX gnu-netcat-flagcount.patch 479 SHA256 63ffd690c586b164ec2f80723f5bcc46d009ffd5e0dd78bbe56fd1b770fd0788 SHA512 cc8cefad31422eec8fc549e02c3cac5a725f6d0232d2a6e4383324530f5bdb771ec5e9221f2455b2f4b3d636eeda73a346a9cfb74856977b10136685420199d2 WHIRLPOOL 152a1abfd9684e84271d30b4ed5aecb86661d0f2501a3c92c1b4c3c5d9248549d7b2b15b82f3cda98f91f93a227854d091719b7c1db1f8b8ddfc97804166926b
+DIST netcat-0.7.1.tar.bz2 325687 SHA256 b55af0bbdf5acc02d1eb6ab18da2acd77a400bafd074489003f3df09676332bb SHA512 283c02f849c3bb62615a5ccb7796192804dafcecb34f3c6b553cbc12c715654963b81e253762923c6069be9768b93dde576a392b89b167912c323354f1376e83 WHIRLPOOL bef83a28f1b8a09e9e167b98c91a163b9977245650749f583563a3864f820d498169618558f6d75b60db81e3dee512f2b51bdc561aaa3ca170e8f87616cd4057
+EBUILD gnu-netcat-0.7.1-r3.ebuild 836 SHA256 873742e431b93663ac690c7414d53c0ebd5bdfcafbadb60e2b06335490ee04d0 SHA512 c714f489e809d3d6d8084cfee67c181f004915e1b5d6497417fc2d58546d28df3d479ae3f37bbf520c8fc735784ad95843e6719bbbde37a8e2a2bf1d3c7f482b WHIRLPOOL caa34219713924ca3a6e717fa0d7ad498454a17aefe915733b8b82b6d080391cf8182ca9801c83889e8ad40243444de311d352d4c29202ffa21bd22e64b121dd
+MISC ChangeLog 2550 SHA256 8fe92aec368f78434ee9f199772dc766ffcde7c60e8641229463c99566cc0d43 SHA512 168337f87362b93a91c5949ae1108a78986787063cfa3e159f76b8f034100eb9b9ba6ac903f7ac3f6c28e622ff7ed723bc14fe3bbe4f7873465cb9c494c8423c WHIRLPOOL 85171e6d207545c4bc9b5ad44d8bb1d39e925a6dbcd49d6ea50f92da82ebfae4d5ea061e10bc870e0933ad3f482436641e6770f005172adc89f4ecd1c557f6ba
+MISC ChangeLog-2015 3828 SHA256 12bd0013512f19909870853d8b8077a5ae5d782c0c9110a6ad678caee905160a SHA512 0fbd0a40e4afaba652c89910e6b227b255b409f6115b85192389d36297567c5434c465fe7046a2e0e6457d350d513138938f3be50d165e132c83afb9383a6d4a WHIRLPOOL 166e939f9e2b007daa108e2e1e9345404819ea219edf62e9bad5ac06be6e310a328037155327b6a08f730cdfeb2c6a872707912cc110ca2246451298d907d551
+MISC metadata.xml 425 SHA256 312c1e0180b59c0b0582cf430de7a66292787f884b34ad4217668235cecb0616 SHA512 a2cbcf2da6524c0ce77c0961511555cbcc36adea879aeb0aae82e973827b34e2b3d9f6d78317262bd4b0e07726316fd36055024dd36cd228edb384fe27d84a85 WHIRLPOOL 4858482f3e5bb9691f3e1ddadd3e24709e86e4ff736f0393466a00d0625ee349d45f1f7378ff813897dc1678cddfd126c0a9e8325d3f8b0e11edfc0b242c5890
diff --git a/net-analyzer/gnu-netcat/files/gnu-netcat-LC_CTYPE.patch b/net-analyzer/gnu-netcat/files/gnu-netcat-LC_CTYPE.patch
new file mode 100644
index 000000000000..1c67f92e6c2a
--- /dev/null
+++ b/net-analyzer/gnu-netcat/files/gnu-netcat-LC_CTYPE.patch
@@ -0,0 +1,19 @@
+In russian locale, netcat error messages display as '???????'
+
+Need to set LC_CTYPE along with LC_MESSAGES to correctly display messages in
+locales other then C/POSIX
+Required for correct i18n support in glibc.
+
+(bug #200875 by Михаил)
+
+
+--- a/src/netcat.c
++++ b/src/netcat.c
+@@ -157,6 +157,7 @@
+   connect_sock.domain = PF_INET;
+ 
+ #ifdef ENABLE_NLS
++  setlocale(LC_CTYPE, "");
+   setlocale(LC_MESSAGES, "");
+   bindtextdomain(PACKAGE, LOCALEDIR);
+   textdomain(PACKAGE);
diff --git a/net-analyzer/gnu-netcat/files/gnu-netcat-close.patch b/net-analyzer/gnu-netcat/files/gnu-netcat-close.patch
new file mode 100644
index 000000000000..eb1862d1fd52
--- /dev/null
+++ b/net-analyzer/gnu-netcat/files/gnu-netcat-close.patch
@@ -0,0 +1,16 @@
+--- a/doc/netcat.1
++++ b/doc/netcat.1
+@@ -256,6 +256,13 @@
+ source address for the connecting socket.
+ .Sh "Advanced Options"
+ .IX Subsection "Advanced Options"
++.IP "\fB\-c" 4
++.IX Item "-c"
++.PD 0
++.IP "\fB\-\-close" 4
++.IX Item "--close"
++.PD
++closes connection on EOF from stdin.
+ .IP "\fB\-i \s-1SECS\s0\fR" 4
+ .IX Item "-i SECS"
+ .PD 0
diff --git a/net-analyzer/gnu-netcat/files/gnu-netcat-flagcount.patch b/net-analyzer/gnu-netcat/files/gnu-netcat-flagcount.patch
new file mode 100644
index 000000000000..765212cb0e99
--- /dev/null
+++ b/net-analyzer/gnu-netcat/files/gnu-netcat-flagcount.patch
@@ -0,0 +1,22 @@
+--- a/src/flagset.c
++++ b/src/flagset.c
+@@ -134,7 +134,7 @@
+ 
+ int netcat_flag_count(void)
+ {
+-  register char c;
++  register unsigned char c;
+   register int i;
+   int ret = 0;
+ 
+@@ -154,8 +154,8 @@
+ 	Assumed that the bit number 1 is the sign, and that we will shift the
+ 	bit 1 (or the bit that takes its place later) until the the most right,
+ 	WHY it has to keep the wrong sign? */
+-      ret -= (c >> 7);
+-      c <<= 1;
++      ret += (c & 1);
++      c >>= 1;
+     }
+   }
+ 
diff --git a/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild b/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild
new file mode 100644
index 000000000000..475dabd261a7
--- /dev/null
+++ b/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="the GNU network swiss army knife"
+HOMEPAGE="http://netcat.sourceforge.net/"
+SRC_URI="mirror://sourceforge/netcat/netcat-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~hppa ppc sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug nls"
+
+S=${WORKDIR}/netcat-${PV}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-flagcount.patch \
+		"${FILESDIR}"/${PN}-close.patch \
+		"${FILESDIR}"/${PN}-LC_CTYPE.patch
+}
+
+src_configure() {
+	use debug && append-flags -DDEBUG
+	econf $(use_enable nls)
+}
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_install() {
+	default
+	rm "${ED}"usr/bin/nc
+}
diff --git a/net-analyzer/gnu-netcat/metadata.xml b/net-analyzer/gnu-netcat/metadata.xml
new file mode 100644
index 000000000000..cc4e9c9f18c3
--- /dev/null
+++ b/net-analyzer/gnu-netcat/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>the GNU network swiss army knife</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">netcat</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest
new file mode 100644
index 000000000000..b0ceda310a6f
--- /dev/null
+++ b/net-analyzer/goaccess/Manifest
@@ -0,0 +1,15 @@
+AUX goaccess-0.6.1-CFLAGS.patch 436 SHA256 915dd990cd363b87d4f4450f58c90641ddf164ff0b45e1ac045ec8fee0c82ba1 SHA512 f2cb3f242e4f4bea568d0fdf3baf9a7895144d9135c0a85e96ab123f7202ae27797f777f5786c6339bf9d38e737b1398ef72024ed8e3140c7ec43eab3abe833e WHIRLPOOL 2a8da9cbb2198ba4e149737919329167477b2f848e12e97d28c7af5b9eeb6cfa34047c6111b2498e86fc3d7011fe3576c988c7bd6ddbddcd3897a3fc0d0ca1da
+AUX goaccess-0.6.1-tinfo.patch 1412 SHA256 b5d457a065ea5daaf29da7f7665b18e20527e927a9b881f4afd79c69c9771695 SHA512 da2c113eccd0e011dbed740c77c80101375b6ab8b0545d733e4bb2c78a3abb71f1546333ca74140c2fdf65cd05b7c15be1298f0b9530bf0523f0d4478c2179ce WHIRLPOOL 1edbe2d17127510e7be3ab62cc25ccf67efd8260345c810d2a791b2564d6e0cb73952f1c8c3207139e26cecf4968a1f4d71ec0fefc1f214c749fc0cac975e288
+DIST goaccess-0.5.tar.gz 127068 SHA256 beabad8267099d693cf2f0a6f533ecf5b5bdcc829b4536ec56b4a68b2c7d5e0e SHA512 24c59efca896e24f89aae5f12391398b8649822a5e07ee035a1c265a8987d1ba493155db12b7189c9d637891c81da6414919c9f9f6795831234810f021bb3999 WHIRLPOOL 0f49750053c64ec3395a5e56dadd27a271a45709a45dbe6051182d5153a820edf0548d6b21d05636dd96a0df5769b45dc0e55f007a5bdbe7485ce49940b3a941
+DIST goaccess-0.6.1.tar.gz 150264 SHA256 f414664769c884cdda33c92e6df1069fb8a1750d19955122b3f030614d414afa SHA512 67712e4af16c6e039ca46f6f8d8302a58be1e0cfd0c76930068c03a9989c35b58b61f7b1e6a9e79cbb978c8f492b80782b8c7b894abc2e067f0a520e2981f98b WHIRLPOOL efa017b3951a7cbb80a041a63eef8cf13035be62d92be7da3df55a5ee7bc4d4b10e570023d488fad993a96c0da9c7bdb122009cf1e52e9c9e6a112e6e10c3420
+DIST goaccess-0.8.5.tar.gz 189006 SHA256 a4c6b6b98875059409b2a7528d5e7662536591b1949461cb03d88ea1360c3a88 SHA512 736ae69d0c3bbbaf1d06b287c2d600aae1a72255361c9bb40d1c74986932a771c2b401126e75f22ad4be72f6dc053efd262c40ad40cd62efc57c4461d5481c63 WHIRLPOOL fc2328e558135ca277f8ab52a922a726b3994c47f41fdff2a3110197c4430cb2fd928928d2fba124825a8a127b03ac8551799b0d16b9b2d655ec8a324af56216
+DIST goaccess-0.9.tar.gz 213119 SHA256 49d8ec4ca2b2ff2e848f278c6eed4a541082cfbf781540140ca16d58735f27fa SHA512 c25703fa31dd673bdb3463e3c5055ba3452f1fdb452c63114663d9dfb28b95ddb4cd89b03fd4a9fdbabd0efebc2e3ab35238fd15bc46727f794d04ba77fc072c WHIRLPOOL 58b95d5b8a60b49afb423b85040acb2a163452cd21c65a7f44f2c35e53017b28461089fea7edf5f45dc8169f4d92b21bc62d958d9b66d518d2739a5f7d867855
+DIST goaccess-1.1.1.tar.gz 412635 SHA256 4c73147037b350081d66e912a07fb2f0a60484fad1090a76fb6fc24ee086b6d3 SHA512 5ceb21754721603fa6422436fcac158bf3ea0ec54680851ceb6616a3385a2ad1ce38670b3cea62e14178e71c32999260fefbc29a82b115b1a1a30010879184d2 WHIRLPOOL 8b2d7177ae242bd4cc19d9672d819b6e60316ba0932164254bf21a2c297f7bfb77669d9c289d47d9bd3d854dd440391877bbab956aecd271e5fc8e83cfcd3a27
+EBUILD goaccess-0.5-r1.ebuild 993 SHA256 6242807d76d4f3fd4e9602d8b4b6b20436ce7024922f1a99094080124c49c5d7 SHA512 86244e84b7fe24fd199499ec9fcff2daae13d9d440e507dd1f5e554a63fc1fe747ee38dee5aa8993fad8d31c25ddbecb4050a364bfbcdc7b8591ce4a056211d1 WHIRLPOOL 74a92794bde82b26539fa21a38cc83763fb36f3bc6d9c809e697f6bc38526b1a8524d0bfd632205af18d7bcf24c176ba11893008a559b7204b8bc7c2b3c1aa8f
+EBUILD goaccess-0.6.1.ebuild 929 SHA256 ca4c02589345877bc092d8ba292047d17e419bc315ff74fc1a2199baa51f400e SHA512 96a818290e67fc1a3c1f6833ed2a8f6abaf57cd9c2738fce5931d40e09c02fdcabbf128240921f9873491ec9c0b33bfb307a80645341f1e9931c7ea96a666829 WHIRLPOOL ddb2d931aa49494fe05551f6890e9056586862b3c436ba9e4bbdc3c6989708c27c77d9a776383ea74eec73082146b126eafd399b3c0d2a8a65d4e0292449dfa3
+EBUILD goaccess-0.8.5.ebuild 1079 SHA256 9de337c985cdcdd60aac7b93b9fd917054478b93c8372cc01d52d0398771bb4b SHA512 8d82dca54efa9b5759a095d4106f4e93db633238b653ee65f665e2002c009e9111b37762a15a9f3f6eaa9439a9e1aa76b175a61bfc3c90d7cab936108450e801 WHIRLPOOL a6717f552240a33148aef3b9fd6f224923ce30fcd12dba2049d7bf49829dcc7fd98ec7d78a052fae25688a3d9a4db554bb11b140869526221dcfd6c6484dc712
+EBUILD goaccess-0.9.ebuild 1088 SHA256 21cd6a4eafb8bf18e37a25ad62e76aa26ae4d208e460a6c411bc576dc34fe3e7 SHA512 0b0c77a68152711e06e30b3a34492a3d095648213c84586c885a5fd69f4c61600ea47c3dfc9ce3ede7fd6f43a929d1de69b68fd60c9d0d32fa8ae0fb12f65ab5 WHIRLPOOL af8603399ecdb9874dbd3f77fa05a55fb20f88302d26e475c85e4bed86720b93910631d643e7ac668994d65425988739926114e3c855b69fd7de9632f8db36ca
+EBUILD goaccess-1.1.1.ebuild 1280 SHA256 58bbfa239bbc303ef0876b2d561ba2a3767b82d454b59f8cf12a366c5814266f SHA512 2b0784d5f6138c0582f502d37fa82a88c730d3a9589041189ffb54ee1172534c00f8ecf71ffc221e117e583f0b23318fcbd611ab768c65f3d3ded465d06fe012 WHIRLPOOL 7e43972da5803c6af6368e61f899d87ddbd6d3430baf35fa1678b3b619f40c0b39b40924b19d52bfb5fcd4ded52a2217c8fa87d426b160ce098a2b70c53b3d18
+MISC ChangeLog 3215 SHA256 680b2130239c52031fd26a40fae69a41ee8c995c14d7f889b30f6ffe6d27abcc SHA512 3c3b227dbd37aa883ba31f59bcd1f303db5b0a0d6b1a0312c021a84d7319d625ca14c78300f2300ce80df26b215c1957b511ed7edcfa72c1812f7adb739ba42b WHIRLPOOL 68b69ed472aeaab5574487e66bb75308b97f93a27c9ca248a7e071914b12c31a64717b8ae8666b77a312a13f0ecca0e0f06c6eb2c64df5a536447cd79b190125
+MISC ChangeLog-2015 1856 SHA256 0ab8b3aa3beead809bfdb11f8961715576d82a6cc3afa8afab69afad37dc6337 SHA512 9d6fd1bae575336c647b43e9fb9d7ba0579247e3a8330eefb44877d4904ce3c278954230024fd6303d4e9c75a34a1f30c642830f4f1f5cc11cc6d9b948fa4eb7 WHIRLPOOL 17d267a62a328522d6bfb2edce5c2517e710ffb6d4b2bf5494fa3db5ad54962c227e8672478852b703af51f90069453153d0e6cf332df8c11dd1f51e51939a30
+MISC metadata.xml 1241 SHA256 40382963ad58d31a776c65c30b9bea6764eb2009bb2e6280240fa496a621e366 SHA512 57c94633b42e29c362a29aa665207db35adcb9017c9f30eefdea4b31fba2698b37230e00b08682fc718f548c45ee3ab9e244d2f8a4226e45a1d4df83f4533263 WHIRLPOOL 6dde172071f5586a1b87f1013ee1c5ffb30b32a53eb32130327122e43fe782aae87ed96368f18229c1716893a13d1d0a49b436d2d31ab827f737784af530d5f0
diff --git a/net-analyzer/goaccess/files/goaccess-0.6.1-CFLAGS.patch b/net-analyzer/goaccess/files/goaccess-0.6.1-CFLAGS.patch
new file mode 100644
index 000000000000..909b38f5730b
--- /dev/null
+++ b/net-analyzer/goaccess/files/goaccess-0.6.1-CFLAGS.patch
@@ -0,0 +1,10 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,6 +2,6 @@
+ bin_PROGRAMS = goaccess
+ goaccess_SOURCES = output.c output.h settings.c settings.h error.c error.h xmalloc.c xmalloc.h commons.c commons.h goaccess.c parser.c parser.h ui.c ui.h util.c util.h gdashboard.c gdashboard.h gdns.c gdns.h gmenu.c gmenu.h goaccess.h
+ 
+-AM_CFLAGS = -g -Wall @GLIB2_CFLAGS@
++AM_CFLAGS = -Wall @GLIB2_CFLAGS@
+ goaccess_LDADD = -lm
+ dist_man_MANS = goaccess.1
diff --git a/net-analyzer/goaccess/files/goaccess-0.6.1-tinfo.patch b/net-analyzer/goaccess/files/goaccess-0.6.1-tinfo.patch
new file mode 100644
index 000000000000..76d6cbcbcf71
--- /dev/null
+++ b/net-analyzer/goaccess/files/goaccess-0.6.1-tinfo.patch
@@ -0,0 +1,32 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,22 +19,20 @@
+ AC_ARG_ENABLE(geoip,--enable-geoip Enable GeoIP country lookup, USE_GEOIP="yes")
+ AC_ARG_ENABLE(utf8,--enable-utf8 Enable UTF-8 support for wide characters, USE_UTF8="yes")
+ 
+-if test "$USE_GEOIP" = "yes"; then
+-   AC_CHECK_LIB([GeoIP], [GeoIP_new], [], [AC_MSG_ERROR([libgeoip-dev is missing])])
+-   CFLAGS="-lGeoIP"
++if test x"$USE_GEOIP" = "xyes"; then
++   AC_CHECK_LIB([GeoIP], [GeoIP_new], , [AC_MSG_ERROR([libgeoip-dev is missing])])
+ fi
+ 
+-if test "$USE_UTF8" = "yes"; then
+-   AC_CHECK_LIB([ncursesw], [mvaddwstr], [], [AC_MSG_ERROR([libncursesw5-dev is missing])])
+-   CFLAGS="-lncursesw"
++if test x"$USE_UTF8" = "xyes"; then
++   AC_CHECK_LIB([ncursesw], [mvaddwstr], , [AC_MSG_ERROR([libncursesw5-dev is missing])])
++   AC_SEARCH_LIBS([stdscr], [tinfow], ,[AC_MSG_ERROR([Cannot find a library providing stdscr])])
+ else
+-   AC_CHECK_LIB([ncurses], [refresh], [], [AC_MSG_ERROR([libncurses5-dev is missing])])
+-   CFLAGS="-lncurses"
++   AC_CHECK_LIB([ncurses], [refresh], , [AC_MSG_ERROR([libncurses5-dev is missing])])
++   AC_SEARCH_LIBS([stdscr], [tinfo], ,[AC_MSG_ERROR([Cannot find a library providing stdscr])])
+ fi
+ 
+ # pthread
+ AC_CHECK_LIB([pthread], [pthread_create], [], [AC_MSG_ERROR([pthread is missing])])
+-CFLAGS="-pthread"
+ 
+ # Checks for libraries.
+ AC_CHECK_LIB([glib-2.0], [g_free], [], [AC_MSG_ERROR([glib-2.x is missing])])
diff --git a/net-analyzer/goaccess/goaccess-0.5-r1.ebuild b/net-analyzer/goaccess/goaccess-0.5-r1.ebuild
new file mode 100644
index 000000000000..efe48d4f17d3
--- /dev/null
+++ b/net-analyzer/goaccess/goaccess-0.5-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils
+
+DESCRIPTION="A real-time Apache log analyzer and interactive viewer that runs in a terminal"
+HOMEPAGE="http://goaccess.prosoftcorp.com"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="geoip unicode"
+
+RDEPEND="
+	dev-libs/glib:2
+	sys-libs/ncurses:0=[unicode?]
+	geoip? ( dev-libs/geoip )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# respect CFLAGS, bug #451806
+	sed -i -e '/AM_CFLAGS/s/-g//' Makefile.am || die 'sed failed'
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	# configure does not properly recognise '--disable-something'
+	local myeconfargs=(
+		$(usex geoip '--enable-geoip' '' '' '')
+		$(usex unicode '--enable-utf8' '' '' '')
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile CFLAGS="${CFLAGS}"
+}
diff --git a/net-analyzer/goaccess/goaccess-0.6.1.ebuild b/net-analyzer/goaccess/goaccess-0.6.1.ebuild
new file mode 100644
index 000000000000..76e6117c2e5a
--- /dev/null
+++ b/net-analyzer/goaccess/goaccess-0.6.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils
+
+DESCRIPTION="A real-time Apache log analyzer and interactive viewer that runs in a terminal"
+HOMEPAGE="http://goaccess.prosoftcorp.com"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="geoip unicode"
+
+RDEPEND="
+	dev-libs/glib:2
+	sys-libs/ncurses:0=[unicode?]
+	geoip? ( dev-libs/geoip )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-CFLAGS.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+)
+
+src_configure() {
+	# configure does not properly recognise '--disable-something'
+	local myeconfargs=(
+		$(usex geoip '--enable-geoip' '' '' '')
+		$(usex unicode '--enable-utf8' '' '' '')
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile CFLAGS="${CFLAGS}"
+}
diff --git a/net-analyzer/goaccess/goaccess-0.8.5.ebuild b/net-analyzer/goaccess/goaccess-0.8.5.ebuild
new file mode 100644
index 000000000000..6e14a77788ec
--- /dev/null
+++ b/net-analyzer/goaccess/goaccess-0.8.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="A real-time web log analyzer and interactive viewer that runs in a terminal"
+HOMEPAGE="http://goaccess.io"
+SRC_URI="http://tar.goaccess.io/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+
+IUSE="btree debug geoip bzip2 memhash unicode zlib"
+
+REQUIRED_USE="btree? ( !memhash )"
+
+RDEPEND="
+	dev-libs/glib:2
+	sys-libs/ncurses:0=[unicode?]
+	geoip? ( dev-libs/geoip )
+	btree? ( dev-db/tokyocabinet )
+	memhash? ( dev-db/tokyocabinet )
+	zlib? ( sys-libs/zlib )
+	bzip2? ( app-arch/bzip2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Fix path to GeoIP bases in config
+	sed -e s':/usr/local:/usr:' -i config/goaccess.conf || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable geoip) \
+		$(use_enable bzip2 bzip) \
+		$(use_enable unicode utf8) \
+		$(use_enable zlib) \
+		$(use memhash && echo "--enable-tcb=memhash") \
+		$(use btree && echo "--enable-tcb=btree")
+
+	epatch_user
+}
diff --git a/net-analyzer/goaccess/goaccess-0.9.ebuild b/net-analyzer/goaccess/goaccess-0.9.ebuild
new file mode 100644
index 000000000000..06d537e9023c
--- /dev/null
+++ b/net-analyzer/goaccess/goaccess-0.9.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="A real-time web log analyzer and interactive viewer that runs in a terminal"
+HOMEPAGE="http://goaccess.io"
+SRC_URI="http://tar.goaccess.io/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+
+IUSE="btree debug geoip tokyocabinet unicode"
+
+REQUIRED_USE="btree? ( tokyocabinet )"
+
+RDEPEND="
+	sys-libs/ncurses:0=[unicode?]
+	geoip? ( dev-libs/geoip )
+	!tokyocabinet? ( dev-libs/glib:2 )
+	tokyocabinet? (
+		dev-db/tokyocabinet
+		btree? (
+			app-arch/bzip2
+			sys-libs/zlib
+		)
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch_user
+
+	# Fix path to GeoIP bases in config
+	sed -e s':/usr/local:/usr:' -i config/goaccess.conf || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable geoip) \
+		$(use_enable unicode utf8) \
+		$(use_enable tokyocabinet tcb) \
+		$(use_enable btree bzip) \
+		$(use_enable btree zlib) \
+		$(usex tokyocabinet "--enable-tcb=$(usex btree btree memhash)" '')
+}
diff --git a/net-analyzer/goaccess/goaccess-1.1.1.ebuild b/net-analyzer/goaccess/goaccess-1.1.1.ebuild
new file mode 100644
index 000000000000..a1184f2bb1ae
--- /dev/null
+++ b/net-analyzer/goaccess/goaccess-1.1.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A real-time web log analyzer and interactive viewer that runs in a terminal"
+HOMEPAGE="http://goaccess.io"
+SRC_URI="http://tar.goaccess.io/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="btree bzip2 debug geoip getline libressl ssl tokyocabinet unicode zlib"
+
+RDEPEND="
+	sys-libs/ncurses:0=[unicode?]
+	geoip? ( dev-libs/geoip )
+	!tokyocabinet? ( dev-libs/glib:2 )
+	tokyocabinet? (
+		dev-db/tokyocabinet[bzip2?,zlib?]
+		btree? (
+			bzip2? ( app-arch/bzip2 )
+			zlib? ( sys-libs/zlib )
+		)
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="btree? ( tokyocabinet ) bzip2? ( btree ) zlib? ( btree )"
+
+src_configure() {
+	econf \
+		$(use_enable bzip2 bzip) \
+		$(use_enable zlib) \
+		$(use_enable debug) \
+		$(use_enable geoip) \
+		$(use_enable tokyocabinet tcb $(usex btree btree memhash)) \
+		$(use_enable unicode utf8) \
+		$(use_with getline) \
+		$(use_with ssl openssl)
+}
+
+pkg_preinst() {
+	# Change path to GeoIP bases in config
+	sed -e s':/usr/local:/usr:' -i "${ED%/}"/etc/goaccess.conf || die "sed failed for goaccess.conf"
+}
diff --git a/net-analyzer/goaccess/metadata.xml b/net-analyzer/goaccess/metadata.xml
new file mode 100644
index 000000000000..d71ec4559820
--- /dev/null
+++ b/net-analyzer/goaccess/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>spiderx@spiderx.dp.ua</email>
+		<name>Vladimir Pavljuchenkov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+	GoAccess is an open source real-time web log
+	analyzer and interactive viewer that runs in a terminal in *nix systems.
+	It provides fast and valuable HTTP statistics for system administrators
+	that require a visual server report on the fly.
+	</longdescription>
+	<use>
+		<flag name="btree">Enable Tokyo Cabinet's on-disk B+ Tree database backend</flag>
+		<flag name="getline">Use GNU getline() to parse full line requests</flag>
+		<flag name="memhash">Enable Tokyo Cabinet's on-memory hash database backend</flag>
+		<flag name="tokyocabinet">Enable Tokyo Cabinet's on-memory hash database backend</flag>
+	</use>
+	<upstream>
+		<doc>http://goaccess.io/faq</doc>
+		<bugs-to>mailto:goaccess@prosoftcorp.com</bugs-to>
+		<remote-id type="github">allinurl/goaccess</remote-id>
+		<remote-id type="sourceforge">goaccess</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/gr-fosphor/Manifest b/net-analyzer/gr-fosphor/Manifest
new file mode 100644
index 000000000000..d4081682776a
--- /dev/null
+++ b/net-analyzer/gr-fosphor/Manifest
@@ -0,0 +1,4 @@
+EBUILD gr-fosphor-9999.ebuild 1190 SHA256 b05a42145a2d950c44c2eb989085d7cb24a5238163feb1cb8a4c3dd9d4d15aa4 SHA512 7474b07e0dd4bfd65ed5e594924d60454746668fad49a7f8c2434f0673636599e4d563dacf2db7870a7c60a47fbb5549e3b6f9d4f6923c2314c508a408a5336b WHIRLPOOL f55e0276d3bd390edca84fa4ec103ad88f7508145fe1f457b63a5922ec2d0a43ebb85c0500b6f0844481754529b08f9eb09bae4ee2e4ddb3477ca0c22d1bc93f
+MISC ChangeLog 2969 SHA256 5d2f57817c48b69248ad35517859e6cc7f187ca8c423ad32abe93edeab4b7028 SHA512 33c031d639095f6f30c99a298c997408b5422cd7c24c92eee23c5e784a642911756147db91f3fda9486ea1380d848587a73534054fb068da24abebc5eb10ef03 WHIRLPOOL fa6a98244cf66cb1daef07baa107b3240468c4e9e35d7ceb3f34b3236fd9bb6c23f64c4f482b9d05530fa95f345c903bbaadb51a0afb91d74454da8596c9344e
+MISC ChangeLog-2015 1034 SHA256 a08a42bf95f95c44462362d63c9df032bf3505c3ba1b581acec86e0008e977ed SHA512 faa20af7e048bc4ab2799e711283be96f91566fda9c9e091e3d404f91d19c4d825a02933d6c88d961245c2377a1fa61422d3582ddf5e0ee7c07ced6adf97bf6c WHIRLPOOL cd5421fd1e54bc38398fc72418d3eb13a11ef8f4982d21f695c0a82dfea14d6cec8fff39a9ba8507a006e449244924e87cff4ca999b6f423217ecdeee18147b8
+MISC metadata.xml 308 SHA256 ba72f4336d5185e558a94d263f90f69803546319cd3bee81ecd5a121c4cae964 SHA512 cca3e1ffd2ee31e64dbea0f66093f3295b9e1ce2161b9b71dbd1d518a6a0ff83843c684c1c958bffb80b4f4fda9d5a272be8d6ab2ecf6f0fe57202a65a218df9 WHIRLPOOL 0f259c9e57aea1e6ec0f565725ac460c2b93696529ce1b310ca08c965b1e2edec1f52768695b7308a046e1c47f2bf4b6fb845990886304661041af5f9edc0dff
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
new file mode 100644
index 000000000000..e31c44e5a78a
--- /dev/null
+++ b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="gnuradio fosphor block (GPU spectrum display)"
+HOMEPAGE="https://sdr.osmocom.org/trac/wiki/fosphor"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-2
+	SRC_URI=""
+	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+glfw qt4"
+
+RDEPEND="qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtopengl:4
+	)
+	>=net-wireless/gnuradio-3.7_rc:0=[qt4?,${PYTHON_USEDEP}]
+	media-libs/freetype
+	dev-libs/boost:=
+	glfw? ( >=media-libs/glfw-3 )
+	virtual/opencl
+	virtual/opengl
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+	dev-lang/swig:0
+	dev-util/cppunit
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	# tries to run OpenCL test program, but failing doesn't hurt
+	addpredict /dev/dri
+
+	local mycmakeargs="
+		$(cmake-utils_use_enable glfw GLFW)
+		$(cmake-utils_use_enable qt4 QT)
+		-DENABLE_PYTHON=ON
+		-DENABLE_WX=OFF
+	"
+	cmake-utils_src_configure
+}
diff --git a/net-analyzer/gr-fosphor/metadata.xml b/net-analyzer/gr-fosphor/metadata.xml
new file mode 100644
index 000000000000..ccd32e8fbac8
--- /dev/null
+++ b/net-analyzer/gr-fosphor/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
+	<use>
+		<flag name="glfw">enable GLFW based interface</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest
new file mode 100644
index 000000000000..6da972c3c175
--- /dev/null
+++ b/net-analyzer/graphite-web/Manifest
@@ -0,0 +1,8 @@
+AUX graphite-web-0.9.13-fhs-paths.patch 3183 SHA256 f9b04ed5630db24aae233efdee72d373428b2827f27e2a912c98c4c2ce15ed3f SHA512 18ec1ef401c2e3d1209ed3a2a796dfc94088ea7324ae28c3afddd8c857a83ff00afcb5ef0673b838eedae433893b12b57283c9d4a0e53f90b5063ae4f36abcf2 WHIRLPOOL fd2da4ae377f69b20fc7dccfdf64d39cf856656591d6c5947eb9843456ccff290c8e3c0018218b607f8709632e1f90ccf7a62b9b1517953277e9ff3e7cb28af9
+AUX graphite-web-0.9.13-system-libs.patch 3379 SHA256 e9b68c6b5ae8d83927bdda78d3c1bf1ccae54177661156ce75e936eab6bf3972 SHA512 df4b95dfa6f6a58ba2e8aeb7b3d3e26e5d122718b88e2ec747676fcbb0539190ebc9e7938b3d34a73f0018e121ce297faa50af839f138ce5b21116777fcb7748 WHIRLPOOL 04d62f94dc5164ec3799e3ab5807a4c0e03a123899e764ce4ba8aebae4f52f878a757e68c8ec46f05bb8dd42b2ac68912abd546039497efb5c6ce580415964d1
+DIST graphite-web-0.9.13-share.png 325 SHA256 cbd268fc44900f6f25a79000a799a9653eb170f6cb1450322a748edf1532680d SHA512 19dc9139e97a99bf06fded2958bc52bc856fa11d0dc50f57e6c54214373795534cb74883ab5da7a05e2ddb69a2870d3b02dcf2ab0628bdf289f1ffd925e044e2 WHIRLPOOL 93f49283e42b35464e2b51d765e2bab23884506734a48d4e4aec9744ceaf649c6d342f37b75aeba030b38e4f4ae4030bb7bfbdfc771928b69b70ea7aae9b5a81
+DIST graphite-web-0.9.13.tar.gz 2182781 SHA256 745ee8cd4c16735df1f7c0a7211dbfdd1234678262a1453aef14d04438260851 SHA512 5e2cc84ec57e1fa0ecff8c9671d8753655a8ce2c07ce2f446451ceaad7679b0cefe932de45315be360b8f13eb25cd25ef179814f340c2c42b0e7048a3d4f4a96 WHIRLPOOL d13f111aaaadb91c5da62a1fd62d36e623501822e5faf3cdea78a7b165a4c111717b2d8d007af29e9bd54e1f5f0b5b648d10908b4721360ae00229aca145623f
+EBUILD graphite-web-0.9.13-r3.ebuild 3418 SHA256 6083cddb5245adeb8836eb234f167a764d368ba5950a6e6b8931ff41c2d1869f SHA512 6ec67b34b46994ab4e9761bcf72b58ec5f62609353ef1349a26ef2580a9bff16c1737423c9073add748a141002f235a019ee5f6f36d98f8e43f2b7eafa00675a WHIRLPOOL 48530ab086cbde1b49993e0cc54e18d1391f62f9c5a5fcb5381c3b0bf82a7c0884e8ee94c0a3724b97da9a8fa60de87353c30a72d6d027614a6a97c3e3aceb37
+MISC ChangeLog 3103 SHA256 915bcb8e2ad2b4f3a9f51e569f1d0f8b454d1e6e82d2c3a1bc332eb6244c4276 SHA512 f7fa591eb12bfff8c90f8c1c0f319f445b15b149a50ffad8cde482d00684f377a6f6ddd79380be9587a977e6679aee6dc83de6139812e3d7e532cbf4fff0fba1 WHIRLPOOL 34937650c648f10d6d656e3a880b430f57dbd2257387f79216f55db48ecf4029b2ac6f29e9806da66c9434e2e95ea76ccd2ee180703e8f23903d78229d1b4412
+MISC ChangeLog-2015 1077 SHA256 53000ff696798c8d17bc8cfcc28e2b1cdb34ad6b6644f5616f3a94362fd3a287 SHA512 dde7712d3f660a2e37fb9e4e85851e24a01f612cfa5689b26bfe6f805a564606139fc011c054abf734882ca3022b63ec6170bf4452f07a130bb037a17ec294b7 WHIRLPOOL 3bc778e326fa586d8925a7e1f73f35910a4f55666fb705728b99a1a4f04bd729a037054a1b7a339e47eb88b716324b909d4b1f97a46c51fc7024048cc217bf06
+MISC metadata.xml 460 SHA256 7553f4d9c7122a2aa971eb1b8ba824239b346efd056bcca8921bb78678a433e1 SHA512 ef9a9d13235f8f393cba7eb33c2e86ff1ef965a13283c7ab46a5b0bd5ce23d4b6fc2dabe5ef36166eeb4076ef8f1e578b8cde2c223139306dfc562ab5016fc4a WHIRLPOOL b529a484d0e3ee1d2c2e894741292057cc853dbfae4ccd98eac11749ee8879fb4259cc3a8a783250296ef9340a0c3263242cb56fb30e97f4608be76278e1f53f
diff --git a/net-analyzer/graphite-web/files/graphite-web-0.9.13-fhs-paths.patch b/net-analyzer/graphite-web/files/graphite-web-0.9.13-fhs-paths.patch
new file mode 100644
index 000000000000..ecfce96e0536
--- /dev/null
+++ b/net-analyzer/graphite-web/files/graphite-web-0.9.13-fhs-paths.patch
@@ -0,0 +1,76 @@
+Install FHS-style paths
+
+--- graphite-web-0.9.13/conf/graphite.wsgi.example
++++ graphite-web-0.9.13/conf/graphite.wsgi.example
+@@ -1,5 +1,5 @@
+ import os, sys
+-sys.path.append('/opt/graphite/webapp')
++sys.path.append('@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp')
+ os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'graphite.settings')
+ 
+ import django
+--- graphite-web-0.9.13/setup.py
++++ graphite-web-0.9.13/setup.py
+@@ -59,7 +59,6 @@
+   ],
+   package_data={'graphite' :
+     ['templates/*', 'local_settings.py.example']},
+-  scripts=glob('bin/*'),
+-  data_files=webapp_content.items() + storage_dirs + conf_files + examples,
++  data_files=webapp_content.items(),
+   **setup_kwargs
+ )
+--- graphite-web-0.9.13/webapp/graphite/local_settings.py.example
++++ graphite-web-0.9.13/webapp/graphite/local_settings.py.example
+@@ -54,14 +54,14 @@
+ #####################################
+ # Change only GRAPHITE_ROOT if your install is merely shifted from /opt/graphite
+ # to somewhere else
+-#GRAPHITE_ROOT = '/opt/graphite'
++GRAPHITE_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web'
+ 
+ # Most installs done outside of a separate tree such as /opt/graphite will only
+ # need to change these three settings. Note that the default settings for each
+ # of these is relative to GRAPHITE_ROOT
+-#CONF_DIR = '/opt/graphite/conf'
+-#STORAGE_DIR = '/opt/graphite/storage'
+-#CONTENT_DIR = '/opt/graphite/webapp/content'
++CONF_DIR = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web'
++STORAGE_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon'
++CONTENT_DIR = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp/content'
+ 
+ # To further or fully customize the paths, modify the following. Note that the
+ # default settings for each of these are relative to CONF_DIR and STORAGE_DIR
+@@ -69,6 +69,8 @@
+ ## Webapp config files
+ #DASHBOARD_CONF = '/opt/graphite/conf/dashboard.conf'
+ #GRAPHTEMPLATES_CONF = '/opt/graphite/conf/graphTemplates.conf'
++DASHBOARD_CONF = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web/dashboard.conf'
++GRAPHTEMPLATES_CONF = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web/graphTemplates.conf'
+ 
+ ## Data directories
+ # NOTE: If any directory is unreadable in DATA_DIRS it will break metric browsing
+@@ -77,7 +79,11 @@
+ #DATA_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above variables
+ #LOG_DIR = '/opt/graphite/storage/log/webapp'
+ #INDEX_FILE = '/opt/graphite/storage/index'  # Search index file
+-
++WHISPER_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/whisper'
++RRD_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/rrd'
++DATA_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above variables
++LOG_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/log/graphite-web/'
++INDEX_FILE = '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/index'  # Search index file
+ 
+ #####################################
+ # Email Configuration #
+--- graphite-web-0.9.13/webapp/graphite/manage.py
++++ graphite-web-0.9.13/webapp/graphite/manage.py
+@@ -6,7 +6,7 @@
+ 
+ 
+ if __name__ == "__main__":
+-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
++    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "graphite.settings")
+ 
+     from django.core.management import execute_from_command_line
+ 
diff --git a/net-analyzer/graphite-web/files/graphite-web-0.9.13-system-libs.patch b/net-analyzer/graphite-web/files/graphite-web-0.9.13-system-libs.patch
new file mode 100644
index 000000000000..be5bbb9ab761
--- /dev/null
+++ b/net-analyzer/graphite-web/files/graphite-web-0.9.13-system-libs.patch
@@ -0,0 +1,100 @@
+From 1ca73dd4ec442d6ada765e5375efee84bbc7522b Mon Sep 17 00:00:00 2001
+From: Jamie Nguyen &lt;j@jamielinux.com&gt;
+Date: Mon, 29 Sep 2014 09:53:22 +0100
+Subject: [PATCH] Force use of system libraries
+
+---
+ setup.py                          | 2 --
+ webapp/graphite/cli/parser.py     | 2 +-
+ webapp/graphite/render/attime.py  | 5 +----
+ webapp/graphite/render/glyph.py   | 5 +----
+ webapp/graphite/render/grammar.py | 2 +-
+ webapp/graphite/render/views.py   | 5 +----
+ 6 files changed, 5 insertions(+), 16 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 4dc0ce0..1b910d1 100644
+--- a/setup.py
++++ b/setup.py
+@@ -54,8 +54,6 @@ setup(
+     'graphite.graphlot',
+     'graphite.events',
+     'graphite.version',
+-    'graphite.thirdparty',
+-    'graphite.thirdparty.pytz',
+   ],
+   package_data={'graphite' :
+     ['templates/*', 'local_settings.py.example']},
+diff --git a/webapp/graphite/cli/parser.py b/webapp/graphite/cli/parser.py
+index ec1a435..7d7d48d 100644
+--- a/webapp/graphite/cli/parser.py
++++ b/webapp/graphite/cli/parser.py
+@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License."""
+ 
+-from graphite.thirdparty.pyparsing import *
++from pyparsing import *
+ 
+ grammar = Forward()
+ 
+diff --git a/webapp/graphite/render/attime.py b/webapp/graphite/render/attime.py
+index 55a644c..8adde3f 100644
+--- a/webapp/graphite/render/attime.py
++++ b/webapp/graphite/render/attime.py
+@@ -16,10 +16,7 @@ from datetime import datetime,timedelta
+ from time import daylight
+ from django.conf import settings
+ 
+-try: # See if there is a system installation of pytz first
+-  import pytz
+-except ImportError: # Otherwise we fall back to Graphite's bundled version
+-  from graphite.thirdparty import pytz
++import pytz
+ 
+ 
+ months = ['jan','feb','mar','apr','may','jun','jul','aug','sep','oct','nov','dec']
+diff --git a/webapp/graphite/render/glyph.py b/webapp/graphite/render/glyph.py
+index a2cc893..c6f31f1 100644
+--- a/webapp/graphite/render/glyph.py
++++ b/webapp/graphite/render/glyph.py
+@@ -22,10 +22,7 @@ from graphite.render.datalib import TimeSeries
+ from graphite.util import json
+ 
+ 
+-try: # See if there is a system installation of pytz first
+-  import pytz
+-except ImportError: # Otherwise we fall back to Graphite's bundled version
+-  from graphite.thirdparty import pytz
++import pytz
+ 
+ INFINITY = float('inf')
+ 
+diff --git a/webapp/graphite/render/grammar.py b/webapp/graphite/render/grammar.py
+index 07e3e4b..2b0ba41 100644
+--- a/webapp/graphite/render/grammar.py
++++ b/webapp/graphite/render/grammar.py
+@@ -1,4 +1,4 @@
+-from graphite.thirdparty.pyparsing import *
++from pyparsing import *
+ 
+ ParserElement.enablePackrat()
+ grammar = Forward()
+diff --git a/webapp/graphite/render/views.py b/webapp/graphite/render/views.py
+index 186232e..cd747a7 100644
+--- a/webapp/graphite/render/views.py
++++ b/webapp/graphite/render/views.py
+@@ -25,10 +25,7 @@ try:
+ except ImportError:
+   import pickle
+ 
+-try:  # See if there is a system installation of pytz first
+-  import pytz
+-except ImportError:  # Otherwise we fall back to Graphite's bundled version
+-  from graphite.thirdparty import pytz
++import pytz
+ 
+ from graphite.util import getProfileByUsername, json, unpickle
+ from graphite.remote_storage import HTTPConnectionWithTimeout
+-- 
+1.9.3
diff --git a/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild b/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild
new file mode 100644
index 000000000000..437a290d1014
--- /dev/null
+++ b/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 python-utils-r1 prefix
+
+DESCRIPTION="Enterprise scalable realtime graphing"
+HOMEPAGE="http://graphite.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://raw.githubusercontent.com/graphite-project/graphite-web/522d84fed687bd946878e48d85982d59f7bd1267/webapp/content/img/share.png -> ${P}-share.png"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+carbon ldap mysql memcached postgres +sqlite"
+
+DEPEND=""
+RDEPEND="
+	dev-lang/python[sqlite?]
+	sqlite? ( >=dev-python/django-1.4[sqlite?,${PYTHON_USEDEP}] )
+	mysql? ( >=dev-python/django-1.4[${PYTHON_USEDEP}]
+		|| (
+			dev-python/mysql-python[${PYTHON_USEDEP}]
+			dev-python/mysqlclient[${PYTHON_USEDEP}]
+		)
+	)
+	postgres? (
+		>=dev-python/django-1.4[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+	)
+	>=dev-python/twisted-core-10.0[${PYTHON_USEDEP}]
+	>=dev-python/django-tagging-0.3.1[${PYTHON_USEDEP}]
+	<dev-python/django-1.9[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/txAMQP[${PYTHON_USEDEP}]
+	carbon? ( dev-python/carbon[${PYTHON_USEDEP}] )
+	dev-python/whisper[${PYTHON_USEDEP}]
+	media-libs/fontconfig
+	memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	# Do not install the configuration and data files. We install them
+	# somewhere sensible by hand.
+	"${FILESDIR}"/${P}-fhs-paths.patch
+	"${FILESDIR}"/${P}-system-libs.patch
+)
+
+EXAMPLES=(
+	examples/example-graphite-vhost.conf
+	conf/dashboard.conf.example
+	conf/graphite.wsgi.example
+)
+
+src_prepare() {
+	# use FHS-style paths
+	rm setup.cfg || die
+	# make sure we don't use bundled stuff
+	rm -Rf webapp/graphite/thirdparty
+	distutils-r1_src_prepare
+	eprefixify \
+		conf/graphite.wsgi.example \
+		webapp/graphite/local_settings.py.example
+}
+
+python_install() {
+	distutils-r1_python_install \
+		--install-data="${EPREFIX}"/usr/share/${PN}
+
+	# make manage.py available from an easier location/name
+	dodir /usr/bin
+	mv "${D}"/$(python_get_sitedir)/graphite/manage.py \
+		"${ED}"/usr/bin/${PN}-manage || die
+	chmod 0755 "${ED}"/usr/bin/${PN}-manage || die
+	python_fix_shebang "${ED}"/usr/bin/${PN}-manage
+
+	# shortener image isn't included for some reason
+	cp "${DISTDIR}"/"${P}"-share.png "${ED}"/usr/share/${PN}/webapp/content/img/
+
+	insinto /etc/${PN}
+	newins webapp/graphite/local_settings.py.example local_settings.py
+	pushd "${D}"/$(python_get_sitedir)/graphite > /dev/null || die
+	ln -s ../../../../../etc/${PN}/local_settings.py local_settings.py
+	popd > /dev/null || die
+}
+
+pkg_config() {
+	"${ROOT}"/usr/bin/${PN}-manage syncdb --noinput
+	local idx=$(grep 'INDEX_FILE =' "${EROOT}"/etc/graphite-web/local_settings.py 2>/dev/null)
+	if [[ -n ${idx} ]] ; then
+		idx=${idx##*=}
+		idx=$(echo ${idx})
+		eval "idx=${idx}"
+		touch "${ROOT}"/"${idx}"/index
+	fi
+}
+
+pkg_postinst() {
+	einfo "You need to configure ${PN} to run with a WSGI server of your choice."
+	einfo "Don't forget to edit local_settings.py in ${EPREFIX}/etc/${PN}"
+	einfo "See http://graphite.readthedocs.org/en/latest/config-local-settings.html"
+	einfo "Run emerge --config =${PN}-${PVR} if this is a fresh install."
+}
diff --git a/net-analyzer/graphite-web/metadata.xml b/net-analyzer/graphite-web/metadata.xml
new file mode 100644
index 000000000000..51189851a341
--- /dev/null
+++ b/net-analyzer/graphite-web/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grobian@gentoo.org</email>
+    <name>Fabian Groffen</name>
+  </maintainer>
+  <use>
+    <flag name="memcached">Enable memcached support</flag>
+		<flag name="carbon">Enable carbon support</flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">graphite-web</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/greenbone-security-assistant/Manifest b/net-analyzer/greenbone-security-assistant/Manifest
new file mode 100644
index 000000000000..4ab3bc41b649
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/Manifest
@@ -0,0 +1,12 @@
+AUX greenbone-security-assistant-5.0.3-run.patch 504 SHA256 2f29a58b6d5807b7437bfe6dc82415e62d31a246d2e6b13fc79ebabcd643cc44 SHA512 fead69c99f8cfb376d19c684495ed4cec7a90672fed378f3ae9ea245393ab3d52c34a2c8e5dd84ce7c5b844f1aa01d70b7a143f417e93f320a240bf1f683bb5d WHIRLPOOL a5b92f0889803751309ea9bbdab73f8918ea36bcb717186bfcbfa274bc173472cb87e96740e0d1193b79f867ff7fea08bf7a3c958fe4aff76c6050f48d6951aa
+AUX gsad 440 SHA256 3e52acb0f5347bd6c2b49f8767351e5cdb5dfe17570e5b5e0a65384103b3c5a7 SHA512 4fd03f00530253e824905a79b7f482b2307d181c8a182096d9fa694d0efce78bba12147961d35ed2616bbc5e5ea3adb0621b5bbacf8401db6d323a266c50ca76 WHIRLPOOL eb1c592cea45089c5e8c763773ffb613be0ad46aee45d20bf3a814866c7c0707fc1d0bbca5ccf0e837702a12098e8cd11b993313c028cee6cf1e654ee073b152
+AUX gsad-daemon.conf 378 SHA256 7da83b3cbf69bd8393896672833727da4245b10f786ac24aabd5ad25ac5bfb67 SHA512 a4802e41391b4ac51a88924dd3246390fe13c7119eac1130f34e8ff0f7b7df9096c9176569ac63fc2cc7ad8dae9e1bfa762f4853d2c3f7845208bdee0e8072e8 WHIRLPOOL 856fdf5187239dfa2ddaf39c4c943fb3d55d47e588297791812cd41b39a17d115a2e4b92ad6d3ef7cb07f9cb008fad3655f61c70ba157169addf945dba6e3b48
+AUX gsad.init 391 SHA256 7db541e7d2fb31d8646ea959be294c4ebac6d0f51f227390055005000f110bf5 SHA512 3955aae20e32ceb61bef9a937ac6e63ec16e33994f88f0daa21cb4160feebabeefdec27dbd0451eabd07ee50d10ff02c1dedb8a37e69e6d5b93dd053d13925ba WHIRLPOOL 1e462b7ab21477ce9ce6301877ebfbd4c035d664ec58d8e1c18c10a9600fe159061146eac9778b844356ac8dce77fa0ee127045217ed3e197bfa90a10a8dd266
+AUX gsad.logrotate 199 SHA256 520799df540fc9d665d03095c368d3f7b61badd28fc9e4d1dbd095e374e7eff2 SHA512 0d459084f95e00dfb06912b9d89af011fac117a32687ffd3da3887c24e80c074b681c0d87532a4a7511e42c540f8d8b2ceaa04208fff531b94047a08decddd0f WHIRLPOOL 580c49a0c35dec2f198a00445c6cb52fef9be969c20e5e399307edef7265fc03a814d6e846b0d9e381f05ba24a4b2878b61e6ec2f3c404f6dcfff062c744d58a
+AUX gsad.service 386 SHA256 497f1d62efe57e7e6278f00d3e11ec82e2fb61809e109c842796defc2632e80c SHA512 6a706bb3d9fe474818aad419ad50f315a144ac489af5e8225deee773439d12b1296d026ae38bcc3f7fa5b826e2fdcf902b1f072024dda40d9431e12026627a32 WHIRLPOOL d081f4215f646f7c7ed494acd28bca6ee51499268ddc129a1b9604da3bd13b42f024c3939e3b51d949abdef9c7bb0f16518ab04afe8ab18739d3aed1bcee4c1d
+AUX gsad.tmpfiles.d 28 SHA256 7a0bd6c5fe5ddaa05f65a1be880474a541aece839b3ccf631781d081fe437a22 SHA512 b5d98625495353d32bdcaecf5499e2cbe3a8b1a84b067018b61f2ce6e110b0e3a14a061e8791c08891a7058976555a2c7971b48c90f690605129deb457b7b754 WHIRLPOOL 0039e8292a1678fb3fe05e38df312b8cc5d1349bbed9ccee893e59688ccef9e6a874efc3ec7baeab844b6cece6e1bb3f95c023eb71dd5d6d24f0bb3b312cf4d3
+DIST greenbone-security-assistant-6.0.9.tar.gz 1476238 SHA256 bc3dead8e3c24ad906466c208aad1c48262dc912a941b255427f72b0932595e2 SHA512 4afb50f044b6853181c3c3e6466e7329915356bbcccecf98b89d9dc39a193392f45850f9073ac055ec826753af78e8a6368e7f9ac52734a3b5e254d124180d68 WHIRLPOOL d53d8b7e9cfccf5309d300e7ae806cca7586a1056644d582c4da1afa3cc04a6cb87426aa89005c5ef536b764868a5d0febb67d90042e1cc800ae892fcaeb2cca
+EBUILD greenbone-security-assistant-6.0.9.ebuild 1308 SHA256 80ea7c051c9b40fcd60e7ab38d274d23af484408a2f6b47c1498a582674e037e SHA512 c44a805020ed43474435946aa514a5cd712b7e0872d30600bbf4d875f8f9f8837bb43efab5104c263bf4bf05d10de89cdcf82ff0ad21e8e3f7b9b50b56c69905 WHIRLPOOL b60eac0f067774db0a4bba9fd85fe4051c00482ce0ff75203a6c5ca74020459e9b786876accd929e0fc456421fa5f217e28cb6ef5bfa801d64d131f74990da21
+MISC ChangeLog 4829 SHA256 2a26335e03fe6c7fb53c08d1b2c6c8f84c9f8b1b9111ff9b49577143a9105e19 SHA512 ebb9dc2f363b5de7ebbbabbb62b828ef09ac61586b4b19c9bb11cf99107fcf546a5fb618ea32a07d70d3fe7b9f83abf604a7ee351d655202608e72cbe19aa8ec WHIRLPOOL 9c9f9336c3bfbf22c292e97195758e979251f8a59d94bd7c7a22c63cc95f17ab170f43ebe5fc4356304e05c1cb5c9d5314de7146080c1bebd6a3e36c7fc20c2e
+MISC ChangeLog-2015 4860 SHA256 8493690aa48e456c98ae4c015a9394d6abe5183356b052342e95f45ecf44477b SHA512 148ed9f6ed4c4bc54ea9a40364194cacbf1d447ea3509a0f332f5ba628108fcb866a2fd748809f1c1839c5638ca2e354141d1998351358cf0cbc667463629666 WHIRLPOOL 08eaee0b0bff05d5fe6474899dd30a4dce7ce32a63c1bf123e6982de22435d75c63989673e629301e27d18c659dff3964a4e5eb52f6f85f90880a3a7bc104636
+MISC metadata.xml 220 SHA256 49e2069f4751ed7f79a433d3b76bc345fcb099ac35f7b1b87b5d6764003c9586 SHA512 d9edbf422ea6f698d0b8de45ce3855e0d0f410d0f346ee85da825ad9f720fdaa367b7790027de2c7cc7ea70d51074eec76ca72ff6528be1ef490e0dcef2c640c WHIRLPOOL 4323fd2e46066082a73ed45401225ec2eba26ac29054bb573afa55f1b5753b020fc280453b03becf0a63dc3c0f9904e4d5c559a1afa68eb0d85b05fcf62174c2
diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-5.0.3-run.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-5.0.3-run.patch
new file mode 100644
index 000000000000..ec5ee92fd73b
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-5.0.3-run.patch
@@ -0,0 +1,16 @@
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 67cf344..c15f785 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -272,7 +272,7 @@ endif (NOT DATADIR)
+ 
+ set (OPENVAS_STATE_DIR "${LOCALSTATEDIR}/lib/openvas")
+ set (OPENVAS_LOG_DIR   "${LOCALSTATEDIR}/log/openvas")
+-set (GSAD_PID_DIR   "${LOCALSTATEDIR}/run")
++set (GSAD_PID_DIR   "/run")
+ set (GSA_DATA_DIR "${DATADIR}/openvas/gsa")
+ 
+ # TODO: Eventually use own certificates
diff --git a/net-analyzer/greenbone-security-assistant/files/gsad b/net-analyzer/greenbone-security-assistant/files/gsad
new file mode 100644
index 000000000000..f5d76179a55b
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/files/gsad
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting Greenbone Security Assistant Daemon"
+	start-stop-daemon --start --name gsad \
+		--exec /usr/sbin/gsad \
+		--pidfile /var/run/gsad.pid
+	eend $?
+}
+
+stop() {
+	ebegin "Stop openvassd"
+	start-stop-daemon --stop --name gsad \
+		--pidfile /var/run/gsad.pid
+	eend $?
+}
diff --git a/net-analyzer/greenbone-security-assistant/files/gsad-daemon.conf b/net-analyzer/greenbone-security-assistant/files/gsad-daemon.conf
new file mode 100644
index 000000000000..0de530635122
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/files/gsad-daemon.conf
@@ -0,0 +1,14 @@
+#Listen on given address - by default assistant listens on all addresses
+# ASSISTANT_LISTEN=--listen=127.0.0.1
+
+#Listen on given port - by default 9391
+#ASSISTANT_PORT=--port=9392
+
+#Contact manager on given address
+#MANAGER_LISTEN=--mlisten=127.0.0.1
+
+#Manager listens on given port - by default 9390
+#MANAGER_PORT=--mport=9390
+
+# Additional arguments
+# ASSISTANT_EXTRA_ARGS=""
diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.init b/net-analyzer/greenbone-security-assistant/files/gsad.init
new file mode 100644
index 000000000000..df69f2fb7f88
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/files/gsad.init
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+name="Greenbone Security Assistant Daemon"
+command="/usr/sbin/gsad"
+command_args="${ASSISTANT_LISTEN} ${ASSISTANT_PORT} ${MANAGER_LISTEN} ${MANAGER_PORT} ${ASSISTANT_EXTRA_ARGS}"
+pidfile="/run/gsad.pid"
+
+depend() {
+	after bootmisc
+	need localmount net openvasmd
+}
diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.logrotate b/net-analyzer/greenbone-security-assistant/files/gsad.logrotate
new file mode 100644
index 000000000000..f0948cbea1f5
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/files/gsad.logrotate
@@ -0,0 +1,11 @@
+# logrotate for openvas
+/var/log/openvas/gsad.log {
+        rotate 4
+        weekly
+        compress
+        delaycompress
+        missingok
+	postrotate
+	    /bin/kill -HUP `pidof gsad`
+	endscript
+}
diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.service b/net-analyzer/greenbone-security-assistant/files/gsad.service
new file mode 100644
index 000000000000..8825f52f0949
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/files/gsad.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Greenbone Security Assistant Daemon
+After=network.target
+Before=openvasmd.service
+
+[Service]
+EnvironmentFile=-/etc/openvas/gsad-daemon.conf
+ExecStart=/usr/sbin/gsad -f ${ASSISTANT_LISTEN} ${ASSISTANT_PORT} ${MANAGER_LISTEN} ${MANAGER_PORT} ${ASSISTANT_EXTRA_ARGS}
+Restart=always
+RestartSec=1
+User=root
+Group=root
+TimeoutSec=1200
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.tmpfiles.d b/net-analyzer/greenbone-security-assistant/files/gsad.tmpfiles.d
new file mode 100644
index 000000000000..18e820caec1b
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/files/gsad.tmpfiles.d
@@ -0,0 +1 @@
+d	/var/cache/openvassd 0775
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.9.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.9.ebuild
new file mode 100644
index 000000000000..e65316ebf6f1
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.9.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils systemd
+
+MY_PN=gsad
+
+DL_ID=2287
+
+DESCRIPTION="Greenbone Security Assistant for openvas"
+HOMEPAGE="http://www.openvas.org/"
+SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+ BSD MIT"
+KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libgcrypt:0
+	dev-libs/libxslt
+	>=net-analyzer/openvas-libraries-8.0.3
+	net-libs/libmicrohttpd[messages]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.3-run.patch
+	)
+
+S="${WORKDIR}"/${P}
+
+src_prepare() {
+	sed \
+		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
+		-i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLOCALSTATEDIR="${EPREFIX}/var"
+		-DSYSCONFDIR="${EPREFIX}/etc"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
+
+	insinto /etc/openvas
+	doins "${FILESDIR}"/${MY_PN}-daemon.conf
+	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${MY_PN}
+
+	insinto /etc/logrotate.d
+	doins "${FILESDIR}"/${MY_PN}.logrotate
+
+	systemd_newtmpfilesd "${FILESDIR}"/${MY_PN}.tmpfiles.d ${MY_PN}.conf
+	systemd_dounit "${FILESDIR}"/${MY_PN}.service
+}
diff --git a/net-analyzer/greenbone-security-assistant/metadata.xml b/net-analyzer/greenbone-security-assistant/metadata.xml
new file mode 100644
index 000000000000..38ce6c17a3f2
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hanno@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/gsm-receiver/Manifest b/net-analyzer/gsm-receiver/Manifest
new file mode 100644
index 000000000000..4a733b32f0e4
--- /dev/null
+++ b/net-analyzer/gsm-receiver/Manifest
@@ -0,0 +1,5 @@
+AUX 0001-gsm-receiver-build-against-gnuradio-3.7.patch 13458 SHA256 334b4531676148e172aaf20f8a34b9465d103813a04b773d9233e2444dba7941 SHA512 29d7ec1845ec7b5d126cb2844b8704410c37031ffd267b170e3d5a80971dc95c9c1ad38038b66feec3a01ce67fb25dba292d12972cea3d94dccf3b119498ecd4 WHIRLPOOL 74e5a035a3ec912e4e987fcaaf21ba0b16a97245e444b44f300eb8c184c102b2c1c4443680656fa4a2d944cce073109fff09ca187240dc76449badc9251ebe1a
+EBUILD gsm-receiver-9999.ebuild 961 SHA256 58485c9d6b7d49154d3387b767b8093654dd4d926784a65af3909c04aac526f2 SHA512 5345f3ebec1b587a7dc48bcad1200baaa112c950f79b5ed12bb2669e40991b773f2b56a1079b71a5a721769c7d844632a06ed9991cc2b3f03ad4fb75d521cc41 WHIRLPOOL f31de63fdba56c7b38e997efb64797ac59982638552b759052dec09d17ef478c1362d876089c48b2d6e557114117ac702374bcb285b0590b85b6bed52126c4aa
+MISC ChangeLog 2898 SHA256 b6ad846ad6c12a95f91a4232531006644d21f17f138c2757bff50f0b52d44d83 SHA512 68b1b80d0653f200feca3c67b2b94cfa651b587c1e17ba1d78129b89aa38614e8341c136a076012e509290ba8b11c4d50ffce59baeafbf87e9c308ff687ab57e WHIRLPOOL 8c16532c3b88c21ba877db97214e71d2af156f116bc78c61e59275a5b72c46727e55d9cfaf950790445d13d7bea10264b73e174aad2d75fd34366581a5d4d3f2
+MISC ChangeLog-2015 1189 SHA256 a2a0772bd19995b7eca9bc0cd51a2b464eab9fc632610a3385520e559b9c5689 SHA512 56273120dcff231329aee953d8e9f85bbc240e1ed2077681964bf049878d281c1cdf2505b61d2baee8a260ce0adf7287b2ee1090fda9fbb08bcbf2e567746ad7 WHIRLPOOL 476497181efe8cef0849c068708b54d3744068428e19f100e52e855904f5698cf6c4e36c8e65fbda688c6bb07d8727c84390dfabcea7259f5875d4c4fec19a87
+MISC metadata.xml 238 SHA256 fb3f3758a51e2214d17a7ee3860535abef87230f8ebee7ddd0c1c8b64a9bec1b SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f WHIRLPOOL 1645c553345ed030e8d8fdb0c826c7e1e24178e472b1c1f3001a601719e09d4768ad6fd9e35f0b0c56a53f257cdc5593726114acd8e5c89d3c13436c6b2185a2
diff --git a/net-analyzer/gsm-receiver/files/0001-gsm-receiver-build-against-gnuradio-3.7.patch b/net-analyzer/gsm-receiver/files/0001-gsm-receiver-build-against-gnuradio-3.7.patch
new file mode 100644
index 000000000000..b7683f38b683
--- /dev/null
+++ b/net-analyzer/gsm-receiver/files/0001-gsm-receiver-build-against-gnuradio-3.7.patch
@@ -0,0 +1,323 @@
+From c9809ac05224ccf3a7fce1dda8c7eddedbbf3a56 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ch=C3=AD-Thanh=20Christopher=20Nguy=E1=BB=85n?=
+ <chithanh@gentoo.org>
+Date: Wed, 5 Feb 2014 03:21:37 +0100
+Subject: [PATCH] gsm-receiver: build against gnuradio-3.7
+
+This is the result of blindly following
+http://gnuradio.org/redmine/projects/gnuradio/wiki/Move_3-6_to_3-7
+The result builds, but it may or may not work.
+---
+ gsm-receiver/Makefile.common                       |  7 ++--
+ gsm-receiver/config/Makefile.am                    |  2 +-
+ .../config/gr_libgnuradio_core_extra_ldflags.m4    | 40 ----------------------
+ .../config/gr_libgnuradio_runtime_extra_ldflags.m4 | 40 ++++++++++++++++++++++
+ gsm-receiver/config/gr_standalone.m4               |  5 ++-
+ gsm-receiver/gsm-receiver.pc.in                    |  2 +-
+ gsm-receiver/src/lib/gsm.i                         | 15 ++++++--
+ gsm-receiver/src/lib/gsm_receiver_cf.cc            | 16 ++++-----
+ gsm-receiver/src/lib/gsm_receiver_cf.h             | 18 +++++-----
+ 9 files changed, 76 insertions(+), 69 deletions(-)
+ delete mode 100644 gsm-receiver/config/gr_libgnuradio_core_extra_ldflags.m4
+ create mode 100644 gsm-receiver/config/gr_libgnuradio_runtime_extra_ldflags.m4
+
+diff --git a/gsm-receiver/Makefile.common b/gsm-receiver/Makefile.common
+index b5dcb2e..0592f70 100644
+--- a/gsm-receiver/Makefile.common
++++ b/gsm-receiver/Makefile.common
+@@ -28,7 +28,7 @@ AM_CPPFLAGS = \
+ 	$(STD_DEFINES_AND_INCLUDES) \
+ 	$(PYTHON_CPPFLAGS) \
+ 	$(CPPUNIT_INCLUDES) \
+-	$(GNURADIO_CORE_CPPFLAGS)
++	$(GNURADIO_RUNTIME_CPPFLAGS)
+ 
+ #!! remove this
+ TCH_DECODER_INCLUDEDIR = $(top_srcdir)/src/lib/decoder/openbtsstuff
+@@ -36,9 +36,8 @@ TCH_DECODER_INCLUDEDIR = $(top_srcdir)/src/lib/decoder/openbtsstuff
+ STD_DEFINES_AND_INCLUDES = \
+ 	-I$(DECODER_INCLUDEDIR) \
+ 	-I$(MAIN_INCLUDEDIR) \
+-	-I$(GNURADIO_CORE_INCLUDEDIR) \
+-	-I$(GNURADIO_CORE_INCLUDEDIR)/swig \
+-	-I$(GRUEL_INCLUDEDIR)/gruel/swig \
++	-I$(GNURADIO_RUNTIME_INCLUDEDIR) \
++	-I$(GNURADIO_RUNTIME_INCLUDEDIR)/gnuradio/swig \
+ 	$(LIBOSMOCORE_CFLAGS)  \
+ 	-I$(TCH_DECODER_INCLUDEDIR)
+ 
+diff --git a/gsm-receiver/config/Makefile.am b/gsm-receiver/config/Makefile.am
+index 5858d22..1fdc0e5 100644
+--- a/gsm-receiver/config/Makefile.am
++++ b/gsm-receiver/config/Makefile.am
+@@ -51,7 +51,7 @@ m4macros = \
+ 	gr_fortran.m4 \
+ 	gr_gprof.m4 \
+ 	gr_lib64.m4 \
+-	gr_libgnuradio_core_extra_ldflags.m4 \
++	gr_libgnuradio_runtime_extra_ldflags.m4 \
+ 	gr_no_undefined.m4 \
+ 	gr_omnithread.m4 \
+ 	gr_pwin32.m4 \
+diff --git a/gsm-receiver/config/gr_libgnuradio_core_extra_ldflags.m4 b/gsm-receiver/config/gr_libgnuradio_core_extra_ldflags.m4
+deleted file mode 100644
+index 43f872c..0000000
+--- a/gsm-receiver/config/gr_libgnuradio_core_extra_ldflags.m4
++++ /dev/null
+@@ -1,40 +0,0 @@
+-# Check for (MinGW)win32 extra ld options.             -*- Autoconf -*-
+-
+-# Copyright 2003,2004,2005 Free Software Foundation, Inc.
+-#
+-# This file is part of GNU Radio
+-#
+-# GNU Radio is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 3, or (at your option)
+-# any later version.
+-#
+-# GNU Radio is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with GNU Radio; see the file COPYING.  If not, write to
+-# the Free Software Foundation, Inc., 51 Franklin Street,
+-# Boston, MA 02110-1301, USA.
+-
+-dnl
+-AC_DEFUN([GR_LIBGNURADIO_CORE_EXTRA_LDFLAGS], [
+-AC_REQUIRE([AC_PROG_LD])
+-# on Mingw32 extra LDFLAGS are required to ease global variable linking
+-LIBGNURADIO_CORE_EXTRA_LDFLAGS=""
+-
+-AC_MSG_CHECKING([whether $LD accepts --enable-runtime-pseudo-reloc])
+-if ${LD} --enable-runtime-pseudo-reloc --version >/dev/null 2>&1
+-then
+-        # libtool requires the quotes
+-        LIBGNURADIO_CORE_EXTRA_LDFLAGS="\"-Wl,--enable-runtime-pseudo-reloc\""
+-        AC_MSG_RESULT(yes)
+-else
+-        AC_MSG_RESULT(no)
+-fi
+-
+-AC_SUBST(LIBGNURADIO_CORE_EXTRA_LDFLAGS)
+-
+-])
+diff --git a/gsm-receiver/config/gr_libgnuradio_runtime_extra_ldflags.m4 b/gsm-receiver/config/gr_libgnuradio_runtime_extra_ldflags.m4
+new file mode 100644
+index 0000000..92e8c97
+--- /dev/null
++++ b/gsm-receiver/config/gr_libgnuradio_runtime_extra_ldflags.m4
+@@ -0,0 +1,40 @@
++# Check for (MinGW)win32 extra ld options.             -*- Autoconf -*-
++
++# Copyright 2003,2004,2005 Free Software Foundation, Inc.
++#
++# This file is part of GNU Radio
++#
++# GNU Radio is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3, or (at your option)
++# any later version.
++#
++# GNU Radio is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with GNU Radio; see the file COPYING.  If not, write to
++# the Free Software Foundation, Inc., 51 Franklin Street,
++# Boston, MA 02110-1301, USA.
++
++dnl
++AC_DEFUN([GR_LIBGNURADIO_RUNTIME_EXTRA_LDFLAGS], [
++AC_REQUIRE([AC_PROG_LD])
++# on Mingw32 extra LDFLAGS are required to ease global variable linking
++LIBGNURADIO_RUNTIME_EXTRA_LDFLAGS=""
++
++AC_MSG_CHECKING([whether $LD accepts --enable-runtime-pseudo-reloc])
++if ${LD} --enable-runtime-pseudo-reloc --version >/dev/null 2>&1
++then
++        # libtool requires the quotes
++        LIBGNURADIO_RUNTIME_EXTRA_LDFLAGS="\"-Wl,--enable-runtime-pseudo-reloc\""
++        AC_MSG_RESULT(yes)
++else
++        AC_MSG_RESULT(no)
++fi
++
++AC_SUBST(LIBGNURADIO_RUNTIME_EXTRA_LDFLAGS)
++
++])
+diff --git a/gsm-receiver/config/gr_standalone.m4 b/gsm-receiver/config/gr_standalone.m4
+index 4e097d2..14f286c 100644
+--- a/gsm-receiver/config/gr_standalone.m4
++++ b/gsm-receiver/config/gr_standalone.m4
+@@ -114,7 +114,6 @@ m4_define([GR_STANDALONE],
+   AC_CHECK_PROG([XMLTO],[xmlto],[yes],[])
+   AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes])
+ 
+-  PKG_CHECK_MODULES(GNURADIO_CORE, gnuradio-core >= 3)
+-  LIBS="$LIBS $GNURADIO_CORE_LIBS"
+-  PKG_CHECK_MODULES(GRUEL, gruel >= 3)
++  PKG_CHECK_MODULES(GNURADIO_RUNTIME, gnuradio-runtime >= 3)
++  LIBS="$LIBS $GNURADIO_RUNTIME_LIBS"
+ ])
+diff --git a/gsm-receiver/gsm-receiver.pc.in b/gsm-receiver/gsm-receiver.pc.in
+index 0a18d4b..9ceca56 100644
+--- a/gsm-receiver/gsm-receiver.pc.in
++++ b/gsm-receiver/gsm-receiver.pc.in
+@@ -5,7 +5,7 @@ includedir=@includedir@
+ 
+ Name: gsm-receiver
+ Description: The GSM receiver block which does FCCH burst search, sch decoding and normal burst demodulation
+-Requires: gnuradio-core
++Requires: gnuradio-runtime
+ Version: @VERSION@
+ Libs: -L${libdir} -lgsm-receiver
+ Cflags: -I${includedir}
+diff --git a/gsm-receiver/src/lib/gsm.i b/gsm-receiver/src/lib/gsm.i
+index b3c1d81..3f58e16 100644
+--- a/gsm-receiver/src/lib/gsm.i
++++ b/gsm-receiver/src/lib/gsm.i
+@@ -37,18 +37,27 @@
+ #include "gsm_receiver_cf.h"
+ #include <stdexcept>
+ /* #include "gsm_constants.h" */
++#include <gnuradio/block.h>
++#include <gnuradio/sync_block.h>
++#include <gnuradio/sync_decimator.h>
++#include <gnuradio/sync_interpolator.h>
++#include <gnuradio/tagged_stream_block.h>
++#include <gnuradio/block_gateway.h>
++#include <gnuradio/feval.h>
++#include <gnuradio/py_feval.h>
++#include <gnuradio/high_res_timer.h>
+ %}
+ 
+ // ----------------------------------------------------------------
+ 
+ GR_SWIG_BLOCK_MAGIC(gsm,receiver_cf);
+ 
+-gsm_receiver_cf_sptr gsm_make_receiver_cf ( gr_feval_dd *tuner, gr_feval_dd *synchronizer, int osr, std::string key, std::string configuration);
++gsm_receiver_cf_sptr gsm_make_receiver_cf ( gr::feval_dd *tuner, gr::feval_dd *synchronizer, int osr, std::string key, std::string configuration);
+ 
+-class gsm_receiver_cf : public gr_block
++class gsm_receiver_cf : public gr::block
+ {
+ private:
+-  gsm_receiver_cf ( gr_feval_dd *tuner, gr_feval_dd *synchronizer, int osr);
++  gsm_receiver_cf ( gr::feval_dd *tuner, gr::feval_dd *synchronizer, int osr);
+ };
+ 
+ // ----------------------------------------------------------------
+diff --git a/gsm-receiver/src/lib/gsm_receiver_cf.cc b/gsm-receiver/src/lib/gsm_receiver_cf.cc
+index b4e7a69..6bfdf5d 100644
+--- a/gsm-receiver/src/lib/gsm_receiver_cf.cc
++++ b/gsm-receiver/src/lib/gsm_receiver_cf.cc
+@@ -24,8 +24,8 @@
+ #include "config.h"
+ #endif
+ 
+-#include <gr_io_signature.h>
+-#include <gr_math.h>
++#include <gnuradio/io_signature.h>
++#include <gnuradio/math.h>
+ #include <math.h>
+ #include <Assert.h>
+ #include <boost/circular_buffer.hpp>
+@@ -289,7 +289,7 @@ typedef std::vector<float> vector_float;
+ typedef boost::circular_buffer<float> circular_buffer_float;
+ 
+ gsm_receiver_cf_sptr
+-gsm_make_receiver_cf(gr_feval_dd *tuner, gr_feval_dd *synchronizer, int osr, std::string key, std::string configuration)
++gsm_make_receiver_cf(gr::feval_dd *tuner, gr::feval_dd *synchronizer, int osr, std::string key, std::string configuration)
+ {
+   return gsm_receiver_cf_sptr(new gsm_receiver_cf(tuner, synchronizer, osr, key, configuration));
+ }
+@@ -302,10 +302,10 @@ static const int MAX_OUT = 1; // maximum number of output streams
+ /*
+  * The private constructor
+  */
+-gsm_receiver_cf::gsm_receiver_cf(gr_feval_dd *tuner, gr_feval_dd *synchronizer, int osr, std::string key, std::string configuration)
+-    : gr_block("gsm_receiver",
+-               gr_make_io_signature(MIN_IN, MAX_IN, sizeof(gr_complex)),
+-               gr_make_io_signature(MIN_OUT, MAX_OUT, 142 * sizeof(float))),
++gsm_receiver_cf::gsm_receiver_cf(gr::feval_dd *tuner, gr::feval_dd *synchronizer, int osr, std::string key, std::string configuration)
++    : gr::block("gsm_receiver",
++               gr::io_signature::make(MIN_IN, MAX_IN, sizeof(gr_complex)),
++               gr::io_signature::make(MIN_OUT, MAX_OUT, 142 * sizeof(float))),
+     d_OSR(osr),
+     d_chan_imp_length(CHAN_IMP_RESP_LENGTH),
+     d_tuner(tuner),
+@@ -751,7 +751,7 @@ void gsm_receiver_cf::set_frequency(double freq_offset)
+ inline float gsm_receiver_cf::compute_phase_diff(gr_complex val1, gr_complex val2)
+ {
+   gr_complex conjprod = val1 * conj(val2);
+-  return gr_fast_atan2f(imag(conjprod), real(conjprod));
++  return gr::fast_atan2f(imag(conjprod), real(conjprod));
+ }
+ 
+ bool gsm_receiver_cf::reach_sch_burst(const int nitems)
+diff --git a/gsm-receiver/src/lib/gsm_receiver_cf.h b/gsm-receiver/src/lib/gsm_receiver_cf.h
+index 039a774..3478585 100644
+--- a/gsm-receiver/src/lib/gsm_receiver_cf.h
++++ b/gsm-receiver/src/lib/gsm_receiver_cf.h
+@@ -24,9 +24,9 @@
+ 
+ #include <vector>
+ #include <list>
+-#include <gr_block.h>
+-#include <gr_complex.h>
+-#include <gr_feval.h>
++#include <gnuradio/block.h>
++#include <gnuradio/gr_complex.h>
++#include <gnuradio/feval.h>
+ #include <gsm_constants.h>
+ #include <gsm_receiver_config.h>
+ 
+@@ -42,7 +42,7 @@ class gsm_receiver_cf;
+ typedef boost::shared_ptr<gsm_receiver_cf> gsm_receiver_cf_sptr;
+ typedef std::vector<gr_complex> vector_complex;
+ 
+-gsm_receiver_cf_sptr gsm_make_receiver_cf(gr_feval_dd *tuner, gr_feval_dd *synchronizer, int osr, std::string key, std::string configuration);
++gsm_receiver_cf_sptr gsm_make_receiver_cf(gr::feval_dd *tuner, gr::feval_dd *synchronizer, int osr, std::string key, std::string configuration);
+ 
+ /** GSM Receiver GNU Radio block
+  *
+@@ -52,7 +52,7 @@ gsm_receiver_cf_sptr gsm_make_receiver_cf(gr_feval_dd *tuner, gr_feval_dd *synch
+  * \ingroup block
+  */
+ 
+-class gsm_receiver_cf : public gr_block
++class gsm_receiver_cf : public gr::block
+ {
+   private:
+     std::map<char,int> d_hex_to_int;
+@@ -76,8 +76,8 @@ class gsm_receiver_cf : public gr_block
+     gr_complex d_sch_training_seq[N_SYNC_BITS]; ///<encoded training sequence of a SCH burst
+     gr_complex d_norm_training_seq[TRAIN_SEQ_NUM][N_TRAIN_BITS]; ///<encoded training sequences of a normal bursts and dummy bursts
+ 
+-    gr_feval_dd *d_tuner; ///<callback to a python object which is used for frequency tunning
+-    gr_feval_dd *d_synchronizer; ///<callback to a python object which is used to correct offset of USRP's internal clock
++    gr::feval_dd *d_tuner; ///<callback to a python object which is used for frequency tunning
++    gr::feval_dd *d_synchronizer; ///<callback to a python object which is used to correct offset of USRP's internal clock
+ 
+     /** Countes samples consumed by the receiver
+      *
+@@ -120,8 +120,8 @@ class gsm_receiver_cf : public gr_block
+     // GSM Stack
+     GS_CTX d_gs_ctx;//TODO: remove it! it'a not right place for a decoder
+ 
+-    friend gsm_receiver_cf_sptr gsm_make_receiver_cf(gr_feval_dd *tuner, gr_feval_dd *synchronizer, int osr, std::string key, std::string configuration);
+-    gsm_receiver_cf(gr_feval_dd *tuner, gr_feval_dd *synchronizer, int osr, std::string key, std::string configuration);
++    friend gsm_receiver_cf_sptr gsm_make_receiver_cf(gr::feval_dd *tuner, gr::feval_dd *synchronizer, int osr, std::string key, std::string configuration);
++    gsm_receiver_cf(gr::feval_dd *tuner, gr::feval_dd *synchronizer, int osr, std::string key, std::string configuration);
+ 
+     /** Function whis is used to search a FCCH burst and to compute frequency offset before
+      * "synchronized" state of the receiver
+-- 
+1.8.3.2
+
diff --git a/net-analyzer/gsm-receiver/gsm-receiver-9999.ebuild b/net-analyzer/gsm-receiver/gsm-receiver-9999.ebuild
new file mode 100644
index 000000000000..36a54f59e1e6
--- /dev/null
+++ b/net-analyzer/gsm-receiver/gsm-receiver-9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools git-2 python-single-r1
+
+DESCRIPTION="GSM receiver block from the airprobe suite"
+HOMEPAGE="https://svn.berlin.ccc.de/projects/airprobe/"
+SRC_URI=""
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	net-libs/libosmocore
+	>=net-wireless/gnuradio-3.7_rc:0="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+EGIT_REPO_URI="git://git.gnumonks.org/airprobe.git"
+EGIT_SOURCEDIR="${S}"
+S+=/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/0001-${PN}-build-against-gnuradio-3.7.patch
+	python_fix_shebang "${S}"
+	eautoreconf
+}
+
+src_configure() {
+	# fails to create .deps directory without dependency tracking
+	econf --enable-dependency-tracking
+}
+
+src_install() {
+	default
+
+	dobin src/python/*.py
+	insinto /usr/share/doc/${PF}/examples
+	doins src/python/*.sh
+}
diff --git a/net-analyzer/gsm-receiver/metadata.xml b/net-analyzer/gsm-receiver/metadata.xml
new file mode 100644
index 000000000000..1570f891c6a3
--- /dev/null
+++ b/net-analyzer/gsm-receiver/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/gspoof/Manifest b/net-analyzer/gspoof/Manifest
new file mode 100644
index 000000000000..962c942b33a5
--- /dev/null
+++ b/net-analyzer/gspoof/Manifest
@@ -0,0 +1,7 @@
+AUX gspoof-3.2-icon.patch 2943 SHA256 cfde70028b46a0392e036cb4b2f3ea4d2ac4c5ada9a3d5f16b0db8de7e82c339 SHA512 b3ad70e8a50d4a735a5c09c0b6ea749f7cd3029f77408cd4cfd0546111b95d6a1e9e93944ca3fa66ba1ce807b38548be2b894ac68f0fa7fca1af996054658c03 WHIRLPOOL 07593d50aed5cba430a879cfc3b2f15ea9a95feff08a04beb417171b9b758985b3065a041f156d95dc141610d5b1c92bf72db0f1f4d7263bb1dacd7dbd636454
+AUX gspoof-def-values.patch 903 SHA256 5ebd86d3f290c356e94fced05784ba0fa03ae1299f30fbd8c84f985546c9cc59 SHA512 92b4a1b682669acd13b4fbf77083b633b881f4933445910976492fd093e1c4db3ef0b9d45f487ef8c3df9f252ca239d5411026f527ed3e0ab2972bbfbeea8666 WHIRLPOOL 354ad3c858c899cc7bd6e1342b897ebf6a6b8f11f7ce8d87d002d5f3cc58e654efcef491b7c334bcbaf4cddbf62852e20fb406bcfa1b67a47172717d3da0eadc
+DIST gspoof-3.2.tar.gz 69340 SHA256 65f12bf8ca23d3fa6af0cedda4fb6c28c955a909e1787bd5dda14404a0280019 SHA512 be90aeeb9ac93b5c4a190564ecfedd05ee077afed67696b773cb79949043975807dabed8f49597dcd3b08b9b0ee53c598caa9dced6f97bd9d6170f8e82b8f0f9 WHIRLPOOL 89b756423a78c7196cdbe1d25a116231547f7502db2410dba7870c1258331777991b3d4bcddb9b3051d3aca213c0211d62d4da6c56deffccd78c813e50670ff7
+EBUILD gspoof-3.2-r2.ebuild 781 SHA256 de49f573233cfb054bba70313c0a0499463c3dee298309a38b56da20e73bdf64 SHA512 4ae31501fa1ade40bc50c2ff6e52ac15d6bc110eb5e81a312830541b4aa381bc6792bb3804ee292c671d0670475798b84b2aae71bf7810b756278e3c3abf7498 WHIRLPOOL 711b43d5a0272f6eb58daa117d0ae215a79c131019a60d9d6d54696f1e2eedcac7ac8450c4224249ab535e74624fa3ba02fbc35be3ca39d33fed0c5d584f4571
+MISC ChangeLog 3135 SHA256 99d6eab4e91b207bf3a6664094e6d632fcc9f5bbea963e058a6791af95d16d60 SHA512 bac2b32ba8ec266fbe48eef7b20aea98d7b55d035a68100e351a9a77b6a06fd37fd0d29ba87d4e1d2338ad99713b8b175c32d4303d0881766abde070e6313753 WHIRLPOOL f9ec170ec7c0a192dae58e2be4d2de3cd0229a8eb37a2bb6d6f1061f72ec853e570e4345d177c37cbb684eaafee1371fcfaca3c12ddb7b2b7b7c96e42f837bd8
+MISC ChangeLog-2015 2128 SHA256 a23a223df3a52d7415704c83b6cbb7d31d970556bc2152ad18de20eeb202fc94 SHA512 2f2150b19f1b07cf767bbb668866d7dc7a3237fdebf8ccf6e6cbc4809ee2f09e016ca84ce968db873c64d38566ed70c81a5449a9e68d84e57047b52def329d88 WHIRLPOOL 6c67bcc81cde6df1982986aa2d0aad6171d6aea222a334751e8b30efa530e8032dce2f524c0b627df8393d12c01c2f55040a0f4ebaf32cfdf7681bdacf262c75
+MISC metadata.xml 248 SHA256 6f55643511992161a574f0494a3e592a2ce8940fd8b3d66e95bf089ceaef7cec SHA512 d037f260b0d638df2bf9356b7d50974b341eefecd9e45a07b392d7180233299584f4911df4fd427122afd7e49e5f32417e0f2a3a92996450233e58eb51c34026 WHIRLPOOL 8a2398635f3f512237a07c9f8f33e096a1b0bebcf7acae1aac8c5c995f918b805dccb2d16e17ed915df949c03fafb9a37309d6492e8ef2639bba3d4bac92db14
diff --git a/net-analyzer/gspoof/files/gspoof-3.2-icon.patch b/net-analyzer/gspoof/files/gspoof-3.2-icon.patch
new file mode 100644
index 000000000000..df13a08677db
--- /dev/null
+++ b/net-analyzer/gspoof/files/gspoof-3.2-icon.patch
@@ -0,0 +1,71 @@
+Fix icon path and name.
+
+--- gtk.c
++++ gtk.c
+@@ -24,9 +24,7 @@
+    gtk_set_locale ();
+    gtk_init (&_argc, &_argv);
+ 
+-   add_pixmap_directory ("pixmap");
+-   add_pixmap_directory ("/usr/local/share/gspoof/pixmap");
+-   add_pixmap_directory ("/usr/share/gspoof/pixmap");
++   add_pixmap_directory ("/usr/share/pixmaps");
+ 
+    MainWin = create_MainWin();
+ 
+--- interface.c
++++ interface.c
+@@ -102,7 +102,7 @@
+    gtk_widget_set_size_request (MainWin, 640, 480);
+    gtk_window_set_title (GTK_WINDOW (MainWin), BANNER);
+    gtk_window_set_position (GTK_WINDOW (MainWin), GTK_WIN_POS_CENTER);
+-   MainWin_icon_pixbuf = create_pixbuf ("icon.png");
++   MainWin_icon_pixbuf = create_pixbuf ("gspoof.png");
+    if (MainWin_icon_pixbuf)
+      {
+ 	gtk_window_set_icon (GTK_WINDOW (MainWin), MainWin_icon_pixbuf);
+@@ -663,7 +663,7 @@
+    gtk_widget_set_extension_events (DataWin, GDK_EXTENSION_EVENTS_CURSOR);
+    gtk_window_set_title (GTK_WINDOW (DataWin), _("Payload options"));
+    gtk_window_set_position (GTK_WINDOW (DataWin), GTK_WIN_POS_CENTER);
+-   DataWin_icon_pixbuf = create_pixbuf ("icon.png");
++   DataWin_icon_pixbuf = create_pixbuf ("gspoof.png");
+    if (DataWin_icon_pixbuf)
+      {
+ 	gtk_window_set_icon (GTK_WINDOW (DataWin), DataWin_icon_pixbuf);
+@@ -754,7 +754,7 @@
+    gtk_window_set_title (GTK_WINDOW (MultiPackets), _("Pseudo-flood options"));
+    gtk_window_set_position (GTK_WINDOW (MultiPackets), GTK_WIN_POS_CENTER);
+    gtk_window_set_resizable (GTK_WINDOW (MultiPackets), FALSE);
+-   MultiPackets_icon_pixbuf = create_pixbuf ("icon.png");
++   MultiPackets_icon_pixbuf = create_pixbuf ("gspoof.png");
+    if (MultiPackets_icon_pixbuf)
+      {
+ 	gtk_window_set_icon (GTK_WINDOW (MultiPackets), MultiPackets_icon_pixbuf);
+@@ -884,7 +884,7 @@
+    gtk_window_set_position (GTK_WINDOW (AboutWin), GTK_WIN_POS_CENTER);
+    gtk_window_set_default_size (GTK_WINDOW (AboutWin), 350, 200);
+    gtk_window_set_resizable (GTK_WINDOW (AboutWin), FALSE);
+-   AboutWin_icon_pixbuf = create_pixbuf ("icon.png");
++   AboutWin_icon_pixbuf = create_pixbuf ("gspoof.png");
+    if (AboutWin_icon_pixbuf)
+      {
+ 	gtk_window_set_icon (GTK_WINDOW (AboutWin), AboutWin_icon_pixbuf);
+@@ -896,7 +896,7 @@
+    gtk_container_add (GTK_CONTAINER (AboutWin), hbox1);
+    gtk_container_set_border_width (GTK_CONTAINER (hbox1), 2);
+ 
+-   image16 = create_pixmap (AboutWin, "icon.png");
++   image16 = create_pixmap (AboutWin, "gspoof.png");
+    gtk_widget_show (image16);
+    gtk_box_pack_start (GTK_BOX (hbox1), image16, TRUE, TRUE, 0);
+ 
+@@ -936,7 +936,7 @@
+    gtk_widget_set_size_request (ECNWin, -1, 90);
+    gtk_window_set_title (GTK_WINDOW (ECNWin), _("ECN options"));
+    gtk_window_set_position (GTK_WINDOW (ECNWin), GTK_WIN_POS_CENTER);
+-   ECNWin_icon_pixbuf = create_pixbuf ("icon.png");
++   ECNWin_icon_pixbuf = create_pixbuf ("gspoof.png");
+    if (ECNWin_icon_pixbuf)
+      {
+ 	gtk_window_set_icon (GTK_WINDOW (ECNWin), ECNWin_icon_pixbuf);
diff --git a/net-analyzer/gspoof/files/gspoof-def-values.patch b/net-analyzer/gspoof/files/gspoof-def-values.patch
new file mode 100644
index 000000000000..442f8e821b01
--- /dev/null
+++ b/net-analyzer/gspoof/files/gspoof-def-values.patch
@@ -0,0 +1,29 @@
+diff -Naurp gspoof-3.2-orig/gfuncts.c gspoof-3.2/gfuncts.c
+--- gspoof-3.2-orig/gfuncts.c	2006-09-15 16:39:59.000000000 +0200
++++ gspoof-3.2/gfuncts.c	2006-09-15 17:20:49.000000000 +0200
+@@ -47,12 +47,6 @@ int RestoreDefault()
+    struct libnet_ether_addr *ethaddr; /* eth address */
+    libnet_t *l;
+ 
+-   /* put default value */
+-   bzero (&f, 6);
+-   bzero (&ck, 2);
+-   memset (data, '\0', 128);
+-   memset (device, '\0', 10);
+-
+    /* loading libnet core */
+    if ((l=libnet_init(LIBNET_LINK, NULL, ebuf))==NULL)
+      {
+@@ -126,6 +120,12 @@ int RestoreDefault()
+    gtk_entry_set_text (GTK_ENTRY (win_entry), "32767");
+    gtk_entry_set_text(GTK_ENTRY (urg_entry), ltostr(urgp));
+ 
++   /* put default value */
++   bzero (&f, sizeof(f));
++   bzero (&ck, sizeof(ck));
++   memset (data, '\0', 128);
++   memset (device, '\0', 10);
++
+    /* Set default variable values */
+    f.syn=1;
+    m.number=10;
diff --git a/net-analyzer/gspoof/gspoof-3.2-r2.ebuild b/net-analyzer/gspoof/gspoof-3.2-r2.ebuild
new file mode 100644
index 000000000000..618d875e8c41
--- /dev/null
+++ b/net-analyzer/gspoof/gspoof-3.2-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools eutils
+
+DESCRIPTION="A simple GTK/command line TCP/IP packet generator"
+HOMEPAGE="http://gspoof.sourceforge.net/"
+SRC_URI="http://gspoof.sourceforge.net/src/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+IUSE=""
+
+DEPEND="
+	x11-libs/gtk+:2
+	dev-libs/glib:2
+	net-libs/libnet:1.1
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-def-values.patch \
+		"${FILESDIR}"/${P}-icon.patch
+	sed -i configure.ac -e 's|libnet.a|libnet.so|g' || die
+	eautoreconf
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin gspoof
+	newicon pixmap/icon.png ${PN}.png
+	dodoc README CHANGELOG TODO
+}
diff --git a/net-analyzer/gspoof/metadata.xml b/net-analyzer/gspoof/metadata.xml
new file mode 100644
index 000000000000..c08e67a93e3e
--- /dev/null
+++ b/net-analyzer/gspoof/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="sourceforge">gspoof</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/hexinject/Manifest b/net-analyzer/hexinject/Manifest
new file mode 100644
index 000000000000..85baff35eabe
--- /dev/null
+++ b/net-analyzer/hexinject/Manifest
@@ -0,0 +1,4 @@
+AUX hexinject-1.5-fix-build-system.patch 433 SHA256 87a83bb89c834aba9f6fdf5e9c56de6473660278834ee67bfeeeabc64423f89c SHA512 db17bbb6d1ac936b5eedadd9460bacb1f59c21556fcc8c60e135920383d6990b0498a1f74182352b8061629934e728a865e2cba922abec4c7c7035bbc346e2e1 WHIRLPOOL cf691c1ff0c7c7d44abd85a2f6153fe99dce19319dcc009c9259c1a095deac79444ec47bb97b48fcf94b63fd2a6923997332f5b65327d5e8136af147d75b37dd
+DIST hexinject-1.5.tar.gz 14449 SHA256 329f0686069988ac0dae4a00082b205ac9669bc8e202d4b112c600bcbc198ce9 SHA512 cd145b6f2ae9d739effca03959fb474df11d28ff015c0e5bd1e30c341f60085154795f3c8a601b7241623944b3868b6fc9a3e1530a3aa4e7aaa2b3794a5aa34a WHIRLPOOL 96e065ca7135f12db6e5949fb8fd537e0981f5b0cc1d57d40eb59003aabc87ae2459872cb11108727c0032b6c5282d385512678859da081d783bc692f8044c93
+EBUILD hexinject-1.5.ebuild 756 SHA256 09565bedd7830e8f0d97ffdd8a51d4fe2da4ea8909b8e99465849c801184c513 SHA512 2d17be0ac7931ac94d94924681f8f6f7ed0ed4b2072f2e5e46a5bf1277b4a67b62cdcabdad61d3db5fc7eb216258135d4ce389e4cae4a5ab476a209a62878a92 WHIRLPOOL 8fd175a1aeaca97833912647e1e8414ee268c19a7bb229a7ed8fa227346e076036e319451037b8a39b75e342e21e9f4969680dc9f2c161f8b4d6f45e2d81152e
+MISC metadata.xml 893 SHA256 32347e309dbb0477991d4eafb310fdb1118fb88a40215d883b2978841c0e4d2f SHA512 6ef4476679512d3e08baf37a3c27c304613b281d1da242a675c3da4c907100fb98c594a8b03970e3b8a9571e441f4e6b40b4cd971199bcc62db6713161128367 WHIRLPOOL cb086d0d2c6d925621e4dd6a1d8d4008796b9672c6ff103bb893f6910fcf6e10928450fa30ec80af2d00c28f5858163feb2c230680c66d0860be47e190d1b340
diff --git a/net-analyzer/hexinject/files/hexinject-1.5-fix-build-system.patch b/net-analyzer/hexinject/files/hexinject-1.5-fix-build-system.patch
new file mode 100644
index 000000000000..046d083710df
--- /dev/null
+++ b/net-analyzer/hexinject/files/hexinject-1.5-fix-build-system.patch
@@ -0,0 +1,15 @@
+Respect user flags
+
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ all:
+-	gcc -o hexinject hexinject.c -lpcap
+-	gcc -o prettypacket prettypacket.c
+-	gcc -o hex2raw hex2raw.c
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o hexinject hexinject.c -lpcap
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o prettypacket prettypacket.c
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o hex2raw hex2raw.c
+ 
+ clean:
+ 	rm -f hexinject prettypacket hex2raw *~
diff --git a/net-analyzer/hexinject/hexinject-1.5.ebuild b/net-analyzer/hexinject/hexinject-1.5.ebuild
new file mode 100644
index 000000000000..b33f5f0bda0c
--- /dev/null
+++ b/net-analyzer/hexinject/hexinject-1.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Network packet sniffer and injector"
+HOMEPAGE="http://hexinject.sourceforge.net/"
+SRC_URI="http://downloads.sourceforge.net/project/${PN}/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+tools experimental"
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}
+	experimental? ( dev-lang/tcl )"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.5-fix-build-system.patch )
+
+src_prepare() {
+	default
+	append-cflags -std=gnu89
+	tc-export CC
+}
+
+src_install() {
+	dobin hexinject
+	use tools && dobin hex2raw prettypacket
+	use experimental && dobin packets.tcl
+	einstalldocs
+}
diff --git a/net-analyzer/hexinject/metadata.xml b/net-analyzer/hexinject/metadata.xml
new file mode 100644
index 000000000000..b4d8ef8ab509
--- /dev/null
+++ b/net-analyzer/hexinject/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		HexInject is a very versatile packet injector and sniffer, that provide
+		a command-line framework for raw network access. It's designed to work
+		together with others command-line utilities, and for this reason it
+		facilitates the creation of powerful shell scripts capable of reading,
+		intercepting and modifying network traffic in a transparent manner.
+	</longdescription>
+	<use>
+		<flag name="tools">Install hex2raw and prettypacket tools</flag>
+		<flag name="experimental">Install experimental packets.tcl</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">downloads</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/hping/Manifest b/net-analyzer/hping/Manifest
new file mode 100644
index 000000000000..3b86c8a2c2a4
--- /dev/null
+++ b/net-analyzer/hping/Manifest
@@ -0,0 +1,14 @@
+AUX bytesex.h.patch 520 SHA256 b455caf16a65d8b213b997e03860e58eff94839c184a3725a146f22a8537504f SHA512 f5bf7e1d303824340f667eb0f7335beda354923311b9f65f1b0250d5acdb85a7c6ec15f98c1dc75447e1e0fabeffe51149e99738775845869e099b1409f2b48c WHIRLPOOL a028aa45fcec21b16c76defbb1e6cf7015a320d83d676b999ed5b732298b29735f895843bbf3c5932a2ffe72d2db973b319a46d61b305e72636fd670f0abb0c2
+AUX hping-3_pre20051105-ldflags.patch 602 SHA256 a1877a57023d64e1b13836b4d37510bf5f3f1c61ce7b6cf9eb2daae7d8fb19ed SHA512 b62df43e88724a168e35c21a394ee128d5b7a1870836be18d6327af850d5025bd3c35464c2b8fc0715c3df692996fc41e95023cbc4a778e6e881e9475d25d058 WHIRLPOOL 9466cfab207088d213ce015845896db995feac30c5b567f014101b85f7991fd67f90b4907de45d8adfd5e7079fc23b9f9f50bc54367f057df0782c65636bdbaf
+AUX hping-3_pre20051105-libtcl.patch 507 SHA256 5e501e0b87142c2b7ba1f978d71df5b494971dd5892cff82838a55fd42bb626e SHA512 282f8934a74ea155596ecdf6f92be5f0c25d535e9b711c32fb015beea746652a7c40444cd1cd03f94b12aeacb0352df304c24153dd11290591143ad7e85ade5a WHIRLPOOL 6e40238d0223eb06ea70dd8e7c2eececab33d88036e599632da9b9e7c729a7cfee27d134ec85cf2907715b1a08bdf9cae0cd8cbef13f944513fbd0d4fa152eac
+AUX hping-3_pre20051105-scan-overflow.patch 299 SHA256 e3f32eaec721ba49a9ac77a42cf6e78cd9b9921c286ac3f5b6e52e4a32915022 SHA512 632fdc5e48b1ef0924f58c5cf463ceaee26692cedab50869e9d58704948f38b9168a9d88b1c2f89e9d4a562d0454fcaeb6ab3480cb1c76a16bbd0f73ac09af98 WHIRLPOOL c957998f544873f1c21190d7000cb961415c31a9363117cd9f60fa50ea8e4610927a94b991c9dd5e6cd6b878b8448a4ed1d0a4fb34f6b0d5693053fffd934e7a
+AUX hping-3_pre20051105-strlen.patch 218 SHA256 abe85c2dfafc4cf1e0349117f6ec33be420009d9906a163223d564e1a207e126 SHA512 3029cddbcfa384a551875a5d597bd75763963b08bd86b923637aa6a329ad7a2e73eec8a534a3fa3aa27586b8fda0945c53db455826ee45c067389bd6ff0c39c1 WHIRLPOOL ecb241d051a6210a4d40ca7f5c4713e5c92fecab1f906d827ef5ab73aff0fcc1ba07759af13cde9b2845f9a7e4fe5537f8c79fb687c55dfa6bc7581f765a5352
+AUX hping-3_pre20051105-tcl.patch 260 SHA256 2f11c02ad7d0a28359e80269b641494721d554a644a7c92379090ee38aabdbf4 SHA512 67da303e4c4b225607c76cee7cb2b2655b0dce9f2e151dc64f078cc719fcee974566967b1b294c0bab347a58bbfb6f08e3dad91c692dd1c56878c691ef5b7294 WHIRLPOOL 3d01010418027fecb2c80543daeec05cef117e54febf4bb73f6dc7dbbbde3bda9ad5c61b8e2012c05d01911cc714f21cca1625eff6e50ab7b38a4442242d5210
+AUX hping-3_pre20051105-tclsh-proper-escaping.patch 550 SHA256 fae6070e3476215697af80ee8b8cbf7f0757e55f80bb862a1894d97acfc5885c SHA512 349286fe6e22f491debe399bdf68d99f27c1baaf27bc9fd976691fc8bcb6fcfb03dae09b3796c1e181a0deca279c6e8a0721d39862a302d02bb05d7557b505ab WHIRLPOOL 0efb86043cb3bb3b7bebf41a22d7860f321806c520771d2cc3d9c962880270b0abe6d27f9d45e8bd4eb182a3e9ac58fdd4266651362348813013c1fac1ef808c
+AUX hping-3_pre20051105.patch 1036 SHA256 1ed8dc0b7b3b3c5336457dfce557f6b82b66b4d49df018f3d934b379fa1ef7e7 SHA512 ab1a6f85d8ba6e91097260b2044502f69033dd7466869cac19d50a1830a9eeea105617ec62e14cebe953b49992a3548c08f243638171de3524cb0058cf6d713e WHIRLPOOL 9ddaea90840c221d272fadffbc1b3d349dd426093f73f37927612e612eff911a148df19316e8f98e590764ba4d9f4a09e9a3e205113fea2c21923b6433c36a3e
+DIST hping3-20051105.tar.gz 584001 SHA256 f5a671a62a11dc8114fa98eade19542ed1c3aa3c832b0e572ca0eb1a5a4faee8 SHA512 3b3faa836e70054c8f9f004d876b7eb5f668b64826a6aaf8ca3685619111d9df4eb494a7d38b83cea6cb5f0bd164956461039bf4f73f7c7e90d80cede639b2b3 WHIRLPOOL 2043ac3d71d795a34abe0fc58f525b54e25ca0b8fadb7b2e88d8a6f5d6f4744bda4471f74c96212a78f58510572c1079683ca57650428924eb6223ee110ea6c1
+EBUILD hping-3_pre20051105-r3.ebuild 1613 SHA256 846b4748feedf300d822edb30b2e9965f6ec488fb9ecd2d655af6c927d402177 SHA512 8046381313f3f33d05a7d47fb37141f9a8b396915825994c4c05ee7a07834b68b4a3633218d0dbbc92d0ed18db6eafa60c45c18de92709c5dd644fb87b5a5ee2 WHIRLPOOL 41fe02813f4a8122ff0382582d6db7ee23404a5b9a6c57bbb6c3cbb17cb7b37f9b49a051ca2edbcc1069069a6ef58d9b2d1251c28f119c38dccf4a41590194e1
+EBUILD hping-3_pre20051105-r6.ebuild 1598 SHA256 2f410a7bba090670dbeb03d2722da2277082a61453bc8f74ace6ab02850c3cfe SHA512 2e8027bd262664ae3fd8e0c4efb67ea52b7606f8b38635ed83205ba631e41c5ef31234108db146db208e764360c3aa370b91e30c1d3dbe8e407810e357fece90 WHIRLPOOL f84607efbf318e9e63fbd7b2ff0e9df109bbfe861bc0e1efa6648172554c95740889e35da7c151bbffbd7a15927318ee7f2545b0138fabc64e84de28e1e241aa
+MISC ChangeLog 3205 SHA256 c6d8fe8b1c9b98c97f4756718f326856f45d4340f1fd771510c7c8d7ac785b31 SHA512 0344a0c44f9204c9accd9bb9ce5528533a89631b78097e4d05de8e98d1e17ee1f28a981fd5184ba9350dc31e4811234ccd807ed8691fc08b3971b8a1ca3339d0 WHIRLPOOL 9dedae73bc4fdf287e144547918794d3c7801049f6a0568b3a61b63f2ae3e2e92438450db105ceaf82c1bc9c7bbae79507b137581bafce45115656c157bcab45
+MISC ChangeLog-2015 9905 SHA256 43fe0c3f7c4fdfb62a5af70bc46a08b3ec91b2f678b921a3d8f634eb797f168e SHA512 35d3d0255c98c547ee63bf2e0145247ed0480271a4d3ba21e11ed26ba39241422ab6793d43c65f5f5ccdce3bdb32f28ad0c25d7ffe2dda8c2f670ff19b988878 WHIRLPOOL 4b22508c121909b9c905930ed0e5525830f3f8772507d7a5777294a6049cff012d5b50a66673274b8b11a67786fd33225fe732fe96524077505653e1d94aecfc
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/hping/files/bytesex.h.patch b/net-analyzer/hping/files/bytesex.h.patch
new file mode 100644
index 000000000000..872321d41bfd
--- /dev/null
+++ b/net-analyzer/hping/files/bytesex.h.patch
@@ -0,0 +1,18 @@
+--- a/bytesex.h
++++ b/bytesex.h
+@@ -9,11 +9,15 @@
+ 
+ #if 	defined(__i386__) \
+ 	|| defined(__alpha__) \
++	|| defined(__arm__) \
++	|| defined(__x86_64__) \
++	|| defined(__ia64__) \
+ 	|| (defined(__mips__) && (defined(MIPSEL) || defined (__MIPSEL__)))
+ #define BYTE_ORDER_LITTLE_ENDIAN
+ #elif 	defined(__mc68000__) \
+ 	|| defined (__sparc__) \
+ 	|| defined (__sparc) \
++	|| defined (__hppa__) \
+ 	|| defined (__PPC__) \
+ 	|| defined (__BIG_ENDIAN__) \
+ 	|| (defined(__mips__) && (defined(MIPSEB) || defined (__MIPSEB__)))
diff --git a/net-analyzer/hping/files/hping-3_pre20051105-ldflags.patch b/net-analyzer/hping/files/hping-3_pre20051105-ldflags.patch
new file mode 100644
index 000000000000..39814bff0d8c
--- /dev/null
+++ b/net-analyzer/hping/files/hping-3_pre20051105-ldflags.patch
@@ -0,0 +1,16 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -50,11 +50,11 @@
+ 	$(RANLIB) $@
+ 
+ hping3: byteorder.h $(OBJ)
+-	$(CC) -o hping3 $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@
++	$(CC) -o hping3 $(CCOPT) $(LDFLAGS) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@
+ 	@echo
+ 
+ hping3-static: byteorder.h $(OBJ)
+-	$(CC) -static -o hping3-static $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ -ldl
++	$(CC) -static -o hping3-static $(CCOPT) $(LDFLAGS) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ -ldl
+ 
+ byteorder.h:
+ 	./configure
diff --git a/net-analyzer/hping/files/hping-3_pre20051105-libtcl.patch b/net-analyzer/hping/files/hping-3_pre20051105-libtcl.patch
new file mode 100644
index 000000000000..807399cb553c
--- /dev/null
+++ b/net-analyzer/hping/files/hping-3_pre20051105-libtcl.patch
@@ -0,0 +1,16 @@
+When anything libtcl (bug #247282) this will fail, and we're only finding out
+the version of the library anyway, so why not use TCL_VER, which is found using
+a slightly less fishy method. -JeR
+
+--- a/configure
++++ b/configure
+@@ -98,8 +98,7 @@
+ fi
+ if [ -n $USE_TCL ]
+ then
+-	LIBPOSTFIX=`ls -1 /usr/local/lib/ /usr/lib | grep 'libtcl[0-9]' | grep so | sed -e 's/\.so.*//g' -e 's/libtcl//g' | sort -r | head -1`
+-	TCL_LIB="-ltcl${LIBPOSTFIX} -lm -lpthread"
++	TCL_LIB="-ltcl${TCL_VER} -lm -lpthread"
+ fi
+ 
+ #
diff --git a/net-analyzer/hping/files/hping-3_pre20051105-scan-overflow.patch b/net-analyzer/hping/files/hping-3_pre20051105-scan-overflow.patch
new file mode 100644
index 000000000000..2c3e01bf697a
--- /dev/null
+++ b/net-analyzer/hping/files/hping-3_pre20051105-scan-overflow.patch
@@ -0,0 +1,11 @@
+--- a/scan.c
++++ b/scan.c
+@@ -456,7 +456,7 @@
+ 				continue;
+ 			/* time to copy headers in a safe place */
+ 			p = packet+linkhdr_size+iphdrlen;
+-			memcpy(&icmp, p, sizeof(subtcp));
++			memcpy(&icmp, p, sizeof(icmp));
+ 			p += sizeof(icmp);
+ 			memcpy(&subip, p, sizeof(ip));
+ 			p += sizeof(ip);
diff --git a/net-analyzer/hping/files/hping-3_pre20051105-strlen.patch b/net-analyzer/hping/files/hping-3_pre20051105-strlen.patch
new file mode 100644
index 000000000000..692cd93102fb
--- /dev/null
+++ b/net-analyzer/hping/files/hping-3_pre20051105-strlen.patch
@@ -0,0 +1,11 @@
+--- a/ip_opt_build.c
++++ b/ip_opt_build.c
+@@ -25,7 +25,7 @@
+ 	unsigned char optlen = 0;
+ 	unsigned long ip;
+ 
+-    memset(ip_opt, 1, sizeof(ip_opt));
++    memset(ip_opt, 1, strlen(ip_opt));
+ 
+     if (opt_lsrr)
+     {
diff --git a/net-analyzer/hping/files/hping-3_pre20051105-tcl.patch b/net-analyzer/hping/files/hping-3_pre20051105-tcl.patch
new file mode 100644
index 000000000000..1fb734e349b4
--- /dev/null
+++ b/net-analyzer/hping/files/hping-3_pre20051105-tcl.patch
@@ -0,0 +1,11 @@
+--- a/configure
++++ b/configure
+@@ -63,7 +63,7 @@
+ #
+ for TCLPATH_TRY in "/usr/bin/" "/usr/local/bin/" "/bin/"
+ do
+-	for TCLVER_TRY in "8.4" "8.3" "8.2" "8.1" "8.0"
++	for TCLVER_TRY in "8.6" "8.5" "8.4" "8.3" "8.2" "8.1" "8.0"
+ 	do
+ 		if [ -z $TCLSH ]
+ 		then
diff --git a/net-analyzer/hping/files/hping-3_pre20051105-tclsh-proper-escaping.patch b/net-analyzer/hping/files/hping-3_pre20051105-tclsh-proper-escaping.patch
new file mode 100644
index 000000000000..8cd7065c8393
--- /dev/null
+++ b/net-analyzer/hping/files/hping-3_pre20051105-tclsh-proper-escaping.patch
@@ -0,0 +1,26 @@
+Fix for https://bugs.gentoo.org/show_bug.cgi?id=486664
+
+--- a/configure
++++ b/configure
+@@ -65,10 +65,10 @@
+ do
+ 	for TCLVER_TRY in "8.6" "8.5" "8.4" "8.3" "8.2" "8.1" "8.0"
+ 	do
+-		if [ -z $TCLSH ]
++		if [ -z "$TCLSH" ]
+ 		then
+ 			TCLSH_TRY=${TCLPATH_TRY}tclsh${TCLVER_TRY}
+-			if [ -f $TCLSH_TRY ]
++			if [ -f "$TCLSH_TRY" ]
+ 			then
+ 				TCLSH=$TCLSH_TRY
+ 				echo "===> Found Tclsh in: $TCLSH"
+@@ -76,7 +76,7 @@
+ 		fi
+ 	done
+ done
+-if [ -f $TCLSH ]
++if [ -f "$TCLSH" ]
+ then
+ 	TCL_VER=`echo puts \\$tcl_version | $TCLSH -`
+ 	USE_TCL='-DUSE_TCL'
diff --git a/net-analyzer/hping/files/hping-3_pre20051105.patch b/net-analyzer/hping/files/hping-3_pre20051105.patch
new file mode 100644
index 000000000000..e3133f2b6b42
--- /dev/null
+++ b/net-analyzer/hping/files/hping-3_pre20051105.patch
@@ -0,0 +1,45 @@
+--- a/libpcap_stuff.c
++++ b/libpcap_stuff.c
+@@ -17,7 +17,7 @@
+ #include <stdlib.h>
+ #include <sys/ioctl.h>
+ #include <pcap.h>
+-#include <net/bpf.h>
++#include <pcap-bpf.h>
+ 
+ #include "globals.h"
+ 
+--- a/script.c
++++ b/script.c
+@@ -24,7 +24,7 @@
+ 
+ #include <sys/ioctl.h>
+ #include <pcap.h>
+-#include <net/bpf.h>
++#include <pcap-bpf.h>
+ 
+ #include "release.h"
+ #include "hping2.h"
+--- a/configure
++++ b/configure
+@@ -93,7 +93,7 @@
+ 	else
+ 		USE_TCL=""
+ 		TCL_LIB=""
+-		echo "==> WARNING: no Tcl header files found!"
++		echo "==> WARNING: no Tcl header files found."
+ 	fi
+ fi
+ if [ -n $USE_TCL ]
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -52,9 +52,6 @@
+ hping3: byteorder.h $(OBJ)
+ 	$(CC) -o hping3 $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@
+ 	@echo
+-	./hping3 -v
+-	@echo "use \`make strip' to strip hping3 binary"
+-	@echo "use \`make install' to install hping3"
+ 
+ hping3-static: byteorder.h $(OBJ)
+ 	$(CC) -static -o hping3-static $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ -ldl
diff --git a/net-analyzer/hping/hping-3_pre20051105-r3.ebuild b/net-analyzer/hping/hping-3_pre20051105-r3.ebuild
new file mode 100644
index 000000000000..38dfcc336db8
--- /dev/null
+++ b/net-analyzer/hping/hping-3_pre20051105-r3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils multilib toolchain-funcs
+
+MY_P="${PN}${PV//_pre/-}"
+DESCRIPTION="A ping-like TCP/IP packet assembler/analyzer"
+HOMEPAGE="http://www.hping.org"
+SRC_URI="http://www.hping.org/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc sparc x86"
+IUSE="tcl"
+
+S="${WORKDIR}/${MY_P}"
+
+DEPEND="net-libs/libpcap
+	tcl? ( dev-lang/tcl:0 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}.patch \
+		"${FILESDIR}"/bytesex.h.patch \
+		"${FILESDIR}"/${P}-tcl.patch \
+		"${FILESDIR}"/${P}-ldflags.patch \
+		"${FILESDIR}"/${P}-libtcl.patch \
+		"${FILESDIR}"/${P}-scan-overflow.patch
+
+	# Correct hard coded values
+	sed -i Makefile.in \
+		-e '/^CC=/d' \
+		-e '/^AR=/d' \
+		-e '/^RANLIB=/d' \
+		-e 's:/usr/local/lib:/usr/$(LIBDIR):g' \
+		-e 's:-O2:$(CFLAGS):' \
+		|| die "sed Makefile.in failed"
+
+	# Change name from hping2 to hping3
+	sed -i docs/hping3.8 \
+		-e 's|HPING2|HPING|g' \
+		-e 's|hping2|hping|g' \
+		|| die "sed hping3.8 failed"
+}
+
+src_configure() {
+	tc-export CC
+
+	# Not an autotools type configure:
+	sh configure $(use tcl || echo --no-tcl) || die "configure failed"
+}
+
+src_compile() {
+	emake \
+		DEBUG="" \
+		"CFLAGS=${CFLAGS}" \
+		"AR=$(tc-getAR)" \
+		"RANLIB=$(tc-getRANLIB)" \
+		"LIBDIR=$(get_libdir)" \
+		|| die "emake failed"
+}
+
+src_install () {
+	dosbin hping3
+	dosym /usr/sbin/hping3 /usr/sbin/hping
+	dosym /usr/sbin/hping3 /usr/sbin/hping2
+
+	newman docs/hping3.8 hping.8
+
+	dodoc INSTALL NEWS README TODO AUTHORS BUGS CHANGES
+}
diff --git a/net-analyzer/hping/hping-3_pre20051105-r6.ebuild b/net-analyzer/hping/hping-3_pre20051105-r6.ebuild
new file mode 100644
index 000000000000..f0e2878019ef
--- /dev/null
+++ b/net-analyzer/hping/hping-3_pre20051105-r6.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils multilib toolchain-funcs
+
+MY_P="${PN}${PV//_pre/-}"
+DESCRIPTION="A ping-like TCP/IP packet assembler/analyzer"
+HOMEPAGE="http://www.hping.org"
+SRC_URI="http://www.hping.org/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~sparc x86"
+IUSE="tcl"
+
+S="${WORKDIR}/${MY_P}"
+
+DEPEND="
+	net-libs/libpcap
+	tcl? ( dev-lang/tcl:0= )
+"
+RDEPEND="
+	${DEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${P}.patch
+	"${FILESDIR}"/bytesex.h.patch
+	"${FILESDIR}"/${P}-tcl.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-libtcl.patch
+	"${FILESDIR}"/${P}-scan-overflow.patch
+	"${FILESDIR}"/${P}-tclsh-proper-escaping.patch
+	"${FILESDIR}"/${P}-strlen.patch
+)
+
+src_prepare() {
+	default
+
+	# Correct hard coded values
+	sed -i Makefile.in \
+		-e '/^CC=/d' \
+		-e '/^AR=/d' \
+		-e '/^RANLIB=/d' \
+		-e 's:/usr/local/lib:/usr/$(LIBDIR):g' \
+		-e 's:-O2:$(CFLAGS):' \
+		|| die
+
+	# Change name from hping2 to hping3
+	sed -i docs/hping3.8 \
+		-e 's|HPING2|HPING|g' \
+		-e 's|hping2|hping|g' \
+		|| die
+}
+
+src_configure() {
+	tc-export CC
+
+	# Not an autotools type configure:
+	sh configure $(usex tcl '' --no-tcl) || die
+}
+
+src_compile() {
+	emake \
+		DEBUG="" \
+		"CFLAGS=${CFLAGS}" \
+		"AR=$(tc-getAR)" \
+		"RANLIB=$(tc-getRANLIB)" \
+		"LIBDIR=$(get_libdir)"
+}
+
+src_install () {
+	dosbin hping3
+	dosym /usr/sbin/hping3 /usr/sbin/hping
+	dosym /usr/sbin/hping3 /usr/sbin/hping2
+
+	newman docs/hping3.8 hping.8
+
+	dodoc AUTHORS BUGS CHANGES INSTALL NEWS README TODO
+}
diff --git a/net-analyzer/hping/metadata.xml b/net-analyzer/hping/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/hping/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/httping/Manifest b/net-analyzer/httping/Manifest
new file mode 100644
index 000000000000..e388de36b4cd
--- /dev/null
+++ b/net-analyzer/httping/Manifest
@@ -0,0 +1,6 @@
+AUX httping-2.2.1-flags.patch 161 SHA256 de8e10b5a001ae56bdaeb9137d45bf963346e6de564cfc32eb88022a4b45d845 SHA512 037f53e3f23247ddc5f33ef846bafe32e3f818242b92375d7145fa244c9a8aeeac2d3b1138cbffa792a9564a5e4e96274ff457a13be0c4b228033d47b21748d6 WHIRLPOOL 51224ecbe3f1e7c55ab89d0a4973270bb97dd51ad816156c084ddb8bfdb1dd2f61f96b9830d61f7150a47854eb30ce695d7ef24ad781e01301172bd44b148128
+DIST httping-2.5.tgz 71400 SHA256 3e895a0a6d7bd79de25a255a1376d4da88eb09c34efdd0476ab5a907e75bfaf8 SHA512 397ce2eac91c9aede0eb19823bfca4e7f98c263937f5954c8a48d5248a251d2030e31f18decb7f7f8b0118ec0e16ec0a84ea4c943ccde7056b80de162954c355 WHIRLPOOL e392fbbedd7a55ebc76aca562471e3a8b1cbbcacaf5773558ef12767425e9ed95b59835539cf1142b675a683ff11646526a90556e737cf410ab0c750f5d3a841
+EBUILD httping-2.5.ebuild 1422 SHA256 fed61d02c24cd15b9953c3e98ae59604dba6c5cf05b3dfcf0869f7cbed1822a2 SHA512 b4f488d91476fd1c5f82816918855260fe3532e714dec974eea28279e984074327fbbe6d1f371a36284c68113f952901263020b22e9b1ec05d4de2322f190cbc WHIRLPOOL 97099496486148389aeaa97e4eb67aa2c484c3a9612412eae8cfd3b7db7d52487324d8af35a1663803b9237c1e77ab46785740bf984aa7e10cc2042814d8c48f
+MISC ChangeLog 3494 SHA256 f2e07c50ad4932e085ea308cb40565bdbdfc568a4d55a6fda5b4cd7b624a3035 SHA512 9ac9a7fe83edb54c82bf7dee257c0ebd95d1ccc4cfaded2b92a56ae5ea6ef2499f70f6c65c2e27a202d1180245347b6649a5df7ec82e18e43926c25f92dfa1e7 WHIRLPOOL 3462560900d3af71ecd04ee8a10bb3e275e61d8ac6ca7aa954c2dc072abcf9208bedb96f1031e3b59d519181d2b094184fe17ff4ad8b4c833c7e45c9b57c6c11
+MISC ChangeLog-2015 15854 SHA256 bf982debdac75f8673e4042d2bfa6be1382ec4270f5a230ba3686d5d92008a88 SHA512 8da2662b0eaca14347956031ceec97a27ca77825926801c4c8ed2ac9fff79cd60c997d563ccd92971829aecf96ff364ff5bb64303d38fece4d296a5000c12f2f WHIRLPOOL 8bd0dd82f57e30a73817221c2061c01b59b716e52b3ac5e04ece50348799b66481f15288118b09d656c99f3dfb35d666b85a889ea206ba3da42433a209e66c81
+MISC metadata.xml 344 SHA256 28d70331f93653ef4c0778dcc4a600fc7526fecf000131ec96844c9afdabaaf7 SHA512 3a2c114ecfba2e62b28c1a2ddb96bf57d73dda9c9dc50070c07beabbee711b37a560a71230b5a3ec8726b4d394674dcbb5943b33a62daed0c267e774b5ccbce7 WHIRLPOOL caf376482bcefe747b4977c59cb93261cbe3af37bdea8273cebc2f791a41afe33d86d2602140e4aac2d386d613a348e07aff41c59de9c782f1ae6ac0a1eb0d00
diff --git a/net-analyzer/httping/files/httping-2.2.1-flags.patch b/net-analyzer/httping/files/httping-2.2.1-flags.patch
new file mode 100644
index 000000000000..194eb473577c
--- /dev/null
+++ b/net-analyzer/httping/files/httping-2.2.1-flags.patch
@@ -0,0 +1,12 @@
+--- a/Makefile
++++ b/Makefile
+@@ -84,8 +84,7 @@
+ endif
+ 
+ ifeq ($(DEBUG),yes)
+-CFLAGS+=-D_DEBUG -ggdb
+-LDFLAGS+=-g
++CFLAGS+=-D_DEBUG
+ endif
+ 
+ ifeq ($(ARM),yes)
diff --git a/net-analyzer/httping/httping-2.5.ebuild b/net-analyzer/httping/httping-2.5.ebuild
new file mode 100644
index 000000000000..646d60b84450
--- /dev/null
+++ b/net-analyzer/httping/httping-2.5.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils toolchain-funcs
+
+DESCRIPTION="http protocol ping-like program"
+HOMEPAGE="http://www.vanheusden.com/httping/"
+SRC_URI="http://www.vanheusden.com/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ~mips ~ppc ppc64 ~sparc x86"
+IUSE="debug fftw libressl l10n_nl ncurses ssl tfo"
+
+RDEPEND="
+	fftw? ( sci-libs/fftw:3.0 )
+	ncurses? ( sys-libs/ncurses:0= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	ncurses? ( virtual/pkgconfig )
+"
+
+# This would bring in test? ( dev-util/cppcheck ) but unlike
+# upstream we should only care about compile/run time testing
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.1-flags.patch
+)
+
+src_prepare() {
+	default
+
+	# doman does not get PN-LANG.CAT so we move things around and then point at
+	# it later
+	if use l10n_nl; then
+		mkdir nl || die
+		mv httping-nl.1 nl/httping.1 || die
+	fi
+}
+
+src_configure() {
+	# not an autotools script
+	echo > makefile.inc || die
+
+	use ncurses && LDFLAGS+=" $( $( tc-getPKG_CONFIG ) --libs ncurses )"
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		FW=$(usex fftw) \
+		DEBUG=$(usex debug) \
+		NC=$(usex ncurses) \
+		SSL=$(usex ssl) \
+		TFO=$(usex tfo)
+}
+
+src_install() {
+	dobin httping
+	doman httping.1
+
+	use l10n_nl && doman -i18n=nl nl/httping.1
+}
diff --git a/net-analyzer/httping/metadata.xml b/net-analyzer/httping/metadata.xml
new file mode 100644
index 000000000000..b3a969016433
--- /dev/null
+++ b/net-analyzer/httping/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<use>
+<flag name="tfo">Enable support for TCP Fast Open</flag>
+</use>
+</pkgmetadata>
diff --git a/net-analyzer/hunt/Manifest b/net-analyzer/hunt/Manifest
new file mode 100644
index 000000000000..f962e93fd8b2
--- /dev/null
+++ b/net-analyzer/hunt/Manifest
@@ -0,0 +1,9 @@
+AUX hunt-1.5-exit.patch 208 SHA256 fcc6e917aebb727c60fd072b6cbd0fc1e73842044a19d24468402d9b1840a0af SHA512 f268d172d1280bf1f05cb61da7295c74f0c60ba2c648058491cda7e89702f740648f9fc90c764867d6bb490a24ab318db95de594c1111b7c2b4d099dd113bae8 WHIRLPOOL b0023948fbcaa74c8c9d52a917e3613cf1d6f3c95f9021d3e26d02c7b8752a9a66dfe043946bbc9617813b9f1e0bdf2f8b8d20ea7a33ddb0219c121dccc913d7
+AUX hunt-1.5-flags.patch 507 SHA256 59c62e8b5a9a37b5f1304ecd6d50d583ee9ef65e8f61eedda8faefe0b6a5dec4 SHA512 2d354317438a387220089635aeda449a922746ce0b38b14b57bc0daf30f5216691a7c5098d569143e2b70bd7e8d7156b2a42423bca13c5e77c635f64d1804546 WHIRLPOOL 9144a5b86e4bf5e433fcca70aff6c93b9ca59d0fd4fb5344c7fad900b95a42a9e77227314bcab6a7b1f97243d75fbd6f227655b235296009eaf9d1422efd11e6
+AUX hunt-1.5-log2.patch 387 SHA256 8735c57e9224a20ee540b71fc709608a2614957565c3ecdd9de0c67c6c398c64 SHA512 efb910e3149a97195323ddf35ab1a3e4ed075d7dcc0a1972e727b0107266b183bc09f7bd12f8dcf2735be1f6f76a5201caa1b7d1b50bce5464ef8f70a00f4bff WHIRLPOOL 2103e209ed0f81da71b06893af04bd39c883e82accb9ce1a1b83abe3018bc6b680248b4b0aa440bff84446175ed484bcdfc0eed84485705af5407229ea9d0a1b
+DIST hunt-1.5.tgz 99241 SHA256 a8a1978f3bd05ca3f01c168c13c9a09b1e1e9038c14fdfe43694c07fe3a0e328 SHA512 b016f7ae0ac7568b4a5006b7c5e6f3e80df71a67d94a1e62afc46fb0f10cb661df7e3bff1f0229836a2247ef368dc2681ad955821e97cb6a91fcfe489b871a61 WHIRLPOOL 01b354797c83828899d5b957428f04e731e9edf12d601615d89bf70b55447cef9f65c4c9e5a5d6f7fcb5edb5fd49ad6942a88a5988866003b8e5a83045001b9c
+EBUILD hunt-1.5-r1.ebuild 673 SHA256 8da729dc454aaad5c5fd63a721bf40543768a0eda1d30063f6ca74e7660d06c2 SHA512 a9efe3c17f62afd6b7cec5f468f60494da5bce16dc2ef3a2af2cc93c27245ea5f67f1456ef3e3a76c21a894a65611b2640151c437aed8103cbb6c6a6f0e7f757 WHIRLPOOL 788ab59ec9b266def02b20e36b9a2b30f72c55b5690111919573aea7c524bb408bf140287eec5df425272feda795281f17d63ab96d0f9c32c25d70e2ace84528
+EBUILD hunt-1.5-r3.ebuild 689 SHA256 6439453e1d9b901fc682562e84a349e04a5ad12d5662ed09593b5ed9b3403fcc SHA512 4e459769df7a4c42d1b2a269b01ca5ce51a47666ce73a4a983e62b27df284b9950e568a8b95c2c3ecd274ea3021499b37f8ba3673cc7a0134ce17a995c98a9f6 WHIRLPOOL 302f27e9203dce66167c6d19e0281a0f22b84d4b9274f8fa5e93adffc1f65e218aa55818be6835cb65b93b9a172a54c0e0c05b23b54d65c24eab1c146caa80f5
+MISC ChangeLog 2863 SHA256 7db0b3261c1ecc2e4570b61b2d08ca0f6df1db960a9b03a55957777bbdfd9cd7 SHA512 1a33439964e0d813c3b0b2455c47e630cef3d5ae8520df72d3977ae0ad0785125caaf99733e1d15f6de4d20da66e4ca46e7e892c21c61275aca5887f7aae332f WHIRLPOOL 99c675cc67ef19263f2a9131361032b6b4829e556128c98232439fe8df692550368ee2ae5e376563d6f6864e289020d3fba916f728713e3b01db27d5f3ec3c8c
+MISC ChangeLog-2015 1764 SHA256 f84441b386ad60699e01a2743dbced43c309eea7b5dfb9bbeb413374f1e479c2 SHA512 722148da0c4572f8910391bfe3e6f90203a79ce311e659e584f361d1c0aef5b80fd50170e060f9223493b162ea4ca1ef5dac4d8de936b8391fcabd2f0ee2128c WHIRLPOOL 8b56984c8e692e7d72cea1f2c9f58c2c705538a340f11a5dd5c7accb8c7e1d6e16f20943d3e67cebdab490865854c13241d331fc3e228fe07425984413dde375
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/hunt/files/hunt-1.5-exit.patch b/net-analyzer/hunt/files/hunt-1.5-exit.patch
new file mode 100644
index 000000000000..226093e1795a
--- /dev/null
+++ b/net-analyzer/hunt/files/hunt-1.5-exit.patch
@@ -0,0 +1,10 @@
+--- a/timer.c
++++ b/timer.c
+@@ -8,6 +8,7 @@
+  */
+ #include <stdio.h>
+ #include <unistd.h>
++#include <stdlib.h> /* exit() */
+ #include "hunt.h"
+ 
+ struct list timejob_list = LIST_INIT(struct timejob, j_next);
diff --git a/net-analyzer/hunt/files/hunt-1.5-flags.patch b/net-analyzer/hunt/files/hunt-1.5-flags.patch
new file mode 100644
index 000000000000..2ffcd823847e
--- /dev/null
+++ b/net-analyzer/hunt/files/hunt-1.5-flags.patch
@@ -0,0 +1,21 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,7 @@
+-CFLAGS=-Wall -O2 -g -D_REENTRANT
++CFLAGS += -I. -Wall -D_REENTRANT
+ #CFLAGS+=-DSYNC_FAST
+ #CFLAGS+=-D_WITH_LINUX_KERNEL_HDR
+ 
+-LDFLAGS=
+ #LDFLAGS=-static
+ 
+ OBJ=hunt.o main.o c/list.o c/hash.o c/array.o util.o net.o \
+@@ -11,7 +10,7 @@
+ 	addpolicy.o options.o resolv.o timer.o pktrelay.o
+ 	
+ hunt: $(OBJ)
+-	$(CC) ${LDFLAGS} -o $@ $^ -lpthread
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lpthread
+ 
+ hunt_static: $(OBJ)
+ 	$(CC) ${LDFLAGS} -static -o $@ $^ -lpthread
diff --git a/net-analyzer/hunt/files/hunt-1.5-log2.patch b/net-analyzer/hunt/files/hunt-1.5-log2.patch
new file mode 100644
index 000000000000..fc36eaea1f3b
--- /dev/null
+++ b/net-analyzer/hunt/files/hunt-1.5-log2.patch
@@ -0,0 +1,22 @@
+--- a/hunt.h
++++ b/hunt.h
+@@ -401,7 +401,7 @@
+ void set_tty_color_bg(enum TTY_COLOR fg, enum TTY_COLOR bg);
+ 
+ int is_power2(unsigned int i);
+-int log2(unsigned int i);
++int _hunt_log2(unsigned int i);
+ int count_mask(unsigned int mask);
+ 
+ 
+--- a/util.c
++++ b/util.c
+@@ -70,7 +70,7 @@
+ 	return i ? 0 : 1;
+ }
+ 
+-int log2(unsigned int i)
++int _hunt_log2(unsigned int i)
+ {
+ 	int l = 0;
+ 
diff --git a/net-analyzer/hunt/hunt-1.5-r1.ebuild b/net-analyzer/hunt/hunt-1.5-r1.ebuild
new file mode 100644
index 000000000000..299342dba80e
--- /dev/null
+++ b/net-analyzer/hunt/hunt-1.5-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="tool for checking well known weaknesses in the TCP/IP protocol"
+HOMEPAGE="http://lin.fsid.cvut.cz/~kra/index.html"
+SRC_URI="http://lin.fsid.cvut.cz/~kra/hunt/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+
+src_prepare() {
+	sed -i Makefile \
+		-e 's:^CFLAGS=:CFLAGS += -I. :g' \
+		-e '/^LDFLAGS=/d' \
+		-e 's:${LDFLAGS}:$(LDFLAGS):g' \
+		-e 's:-O2 -g::' \
+		|| die
+}
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	dobin hunt
+	doman man/hunt.1
+	dodoc CHANGES README* TODO tpsetup/transproxy
+}
diff --git a/net-analyzer/hunt/hunt-1.5-r3.ebuild b/net-analyzer/hunt/hunt-1.5-r3.ebuild
new file mode 100644
index 000000000000..7e824be3caa3
--- /dev/null
+++ b/net-analyzer/hunt/hunt-1.5-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="tool for checking well known weaknesses in the TCP/IP protocol"
+HOMEPAGE="http://lin.fsid.cvut.cz/~kra/index.html"
+SRC_URI="http://lin.fsid.cvut.cz/~kra/hunt/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-exit.patch \
+		"${FILESDIR}"/${P}-flags.patch \
+		"${FILESDIR}"/${P}-log2.patch
+}
+
+src_compile() {
+	append-cflags -std=gnu89
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	dobin hunt
+	doman man/hunt.1
+	dodoc CHANGES README* TODO tpsetup/transproxy
+}
diff --git a/net-analyzer/hunt/metadata.xml b/net-analyzer/hunt/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/hunt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
new file mode 100644
index 000000000000..009a774dd4bf
--- /dev/null
+++ b/net-analyzer/hydra/Manifest
@@ -0,0 +1,11 @@
+AUX hydra-8.0-configure.patch 1089 SHA256 21e813cb4428c8e858086a3abe282cf95ea3d43afb3a5dfa53f634946a923e25 SHA512 d7fbc56b9d0fd6cc89ca689a07c0dcf618827bfaafb332217b695b38cc6382c32aedfec4c046575dc34c0946c9b0212a22d82554a296697d1b922ad45084a0bd WHIRLPOOL 57eded4d78362449f25bb314fa3107f2d20c4b42e689af42c7f4798ff342281d5ea41cfeebdd1b371bd8b5af64c947a1a41fdda5b5fefee0d76791795d4c5976
+AUX hydra-8.4-configure.patch 1217 SHA256 fa8819a0294ffdfdf5f76d673d5fde3f2ce1875122cd615d09a4e2b3c50410e5 SHA512 18d76ac35660955a07ba435bf00ceebcd62423fd08c97237f7aa3be4187532f454997008be5395b2d8ae9d66e10204f76905481034c3e5cb1761aec2b02e32c3 WHIRLPOOL 4719f9ddc703b16f16f7f2ccc665f47188dd72a09cf3293cb26d1f803f2cc1f7d505d519fad3b6873ea613b81f860c1bf5db862b84d4f66e98fe8133226ed2ea
+DIST hydra-8.1.tar.gz 559031 SHA256 e4bc2fd11f97a8d985a38a31785c86d38cc60383e47a8f4a5c436351e5135f19 SHA512 7608dd365865e5976bea446faedaad9f0334e7572fd0ee47a601c471471fc7c8a922c7114f4df08705b34b29144d3a6552e66148adf6b0f92c67301119c94959 WHIRLPOOL b1555fe1a8257c88f8f5c110fce1d06834eb6dadad394b61e2a90c3289b8fdd117944da160871003b1583aefb81a02d5c49a653e8de7d3adcd07917ae760c83c
+DIST hydra-8.5.tar.gz 1193694 SHA256 69b69d16ce9499f3a941836b4d8a1c8a3ff9b905c921cc8c588a3af7f65a3b4b SHA512 67fd92bd5983a94314334471c526b71ca77dec6e359e55f4fb2fc78160e2065957b6c9af1ff694bcc5334893a8b5e0fe1b39d984248bde4e55dc2a9f9a8b1271 WHIRLPOOL a71e1cb94986ead4eb114f19738cc1e3ed7288220a79d67ef4e6d93bc5c59910ecee1207fd7a10da9300cba9c3b92d5c6f4cdc3bb1a30bde8db523d7d4cce998
+DIST hydra-8.6.tar.gz 1200238 SHA256 05a87eb018507b24afca970081f067e64441460319fb75ca1e64c4a1f322b80b SHA512 d5d70b5df54fbc556c6db9e9e44b869f29e54aca03dc3cc9e1777d310fcf604b9602ba08250c5bb0d009963dc0ca5c169e61d3f64d7ec2383760fc819d6b6c61 WHIRLPOOL 898f605d556dcb6efe4f4c4b3114c4a2c53dd6baef4956cbf413ef98074ce30b4153f05ff4f69103407fd1a753b2530074293f03d13e83e93c88891821b06ee2
+EBUILD hydra-8.1.ebuild 2233 SHA256 4fd20fdd2aa2787c2eb103b4c885213fcfc5f54b9635701e8f0d21266680493e SHA512 ec97e4046bba01f8bb5e42c2524e88ede9dbb92d92d13cf02218ccabb8cbf94372af4b55e87cb64c73b745138f16cd63b2fef552304289db6761d5f1568ebd3c WHIRLPOOL 3d9172c231d4d824b6211fc47613e31bfebea09bf9848c7e4fd82f8e97608b233701d8a6e0ccff769c2c8218a6d09179c2d632506f65d84c13a1732a720aa3a1
+EBUILD hydra-8.5.ebuild 2377 SHA256 f604451e27f7b71fc957b68c61d130c8015a86b37c1f16c8aa3d471bb3faeb6b SHA512 fa623c7e18cdf7db4c699d8ca56caf19b5da3c87f3e1711c3f47630ba441a695f466d71a439af40ffa455abdd74f95b583f97bca8182050c27b8f34a758fc817 WHIRLPOOL 868dcf89438f754b121cf205582fc0eeb46a116abefae595baef2d257c08f7650d8e20de92885b4d6ee417f9b8929e6015cfb382cd9d3a6ebb604eb924d7f534
+EBUILD hydra-8.6.ebuild 2376 SHA256 d99269750431ce5dc874ec357d57797738aa66a54bbe3f1598640b161567cd33 SHA512 4a8bfabd386b802a5e8dd425f91526bc2217111953460221eef39a09964554de2f5692c8a3018150b3a467274e6008d69dab8041b11664f00ab579d932c49c31 WHIRLPOOL 642a34511ad606332a4b95f3e3e94d465fecf99f0bd8093aa1b8769e7b3e579f01615236c2f317c67fbde208cf3d6d1d383b5b6bb9376100c74b84333f768200
+MISC ChangeLog 2620 SHA256 853a015db7de564aad93bed944684c81c305026cd478c2b1c142529e88fef259 SHA512 2f8087b24e6c3dc8365a6a5369a81f315365035ac6e996e76df299bdc393f40a15b417f08c9f31721e002d4286a1a4a08f2607dbdba8f95e10ed8d4f8914b2be WHIRLPOOL b3dfe949ee908af7556bb542f547d1a5b63850d32bcd686aa28062e8a0327e1f1fc6faf46b31b015bd97dc71a0e41d3460c7ce11e66c83ddcbae508d22edfce3
+MISC ChangeLog-2015 12577 SHA256 2168d253e7716ed146f28e413c2877a9f7d02fdf42fc072084b13caad913d167 SHA512 5c8bc0be1dc981ae4d56672a6b68dca5fc50d7c9ee88b30e94fb07fc53b2f7516b8b656ed4db66b5400ecede5acdc273fe876c37657fc6a02cb792d636fa8282 WHIRLPOOL dd59315ceb156fe19bfd6fd9bf7241c60285e8768e2936de6dceaeeda1ffe9d2c6b97687d26bc24ca79e2d6987717ae0585b83fdddf4a85715880eee5809a4fb
+MISC metadata.xml 440 SHA256 a2fd22d7bb1c9f5bf2f0bc6c5100a831e6ae79f4cbd22439929c0ebc1ca30a43 SHA512 7ea011416c0de77c47fb7d8276cdcbefe0a11a9f9bb9b9a1d763f7f0c1bae705aea7db6252ba3284e3141c257216c845b8353c4a944c67ba3c8881467d827afa WHIRLPOOL b5c1dadbca7dc4a9a3b9eb9f55b10090f868af48f1b45fb70f47b44eead1849816f53f6456a1e1dcbc30f15984453d3fd0d28fb5e343a0811595ee53f671cd11
diff --git a/net-analyzer/hydra/files/hydra-8.0-configure.patch b/net-analyzer/hydra/files/hydra-8.0-configure.patch
new file mode 100644
index 000000000000..3ab9989b6384
--- /dev/null
+++ b/net-analyzer/hydra/files/hydra-8.0-configure.patch
@@ -0,0 +1,44 @@
+--- a/configure
++++ b/configure
+@@ -66,8 +66,6 @@
+ MYSQL_IPATH=""
+ AFP_PATH=""
+ AFP_IPATH=""
+-NCP_PATH=""
+-NCP_IPATH=""
+ SVN_PATH=""
+ SVN_IPATH=""
+ APR_IPATH=""
+@@ -508,32 +506,6 @@
+ fi
+ 
+ echo "Checking for NCP (libncp.so / nwcalls.h) ..."
+-for i in $LIBDIRS ; do
+-    if [ "X" = "X$NCP_PATH" ]; then
+-        if [ -f "$i/libncp.so" -o -f "$i/libncp.dylib" -o -f "$i/libncp.a"  ]; then
+-            NCP_PATH="$i"
+-        fi
+-    fi
+-    if [ "X" = "X$NCP_PATH" ]; then
+-        TMP_LIB=`/bin/ls $i/libncp.so.* 2> /dev/null | grep ncp.`
+-        if [ -n "$TMP_LIB" ]; then
+-            NCP_PATH="$i"
+-        fi
+-    fi
+-    if [ "X" = "X$NCP_PATH" ]; then
+-        TMP_LIB=`/bin/ls $i/libncp.dll* 2> /dev/null | grep ncp.`
+-        if [ -n "$TMP_LIB" ]; then
+-            NCP_PATH="$i"
+-        fi
+-    fi
+-done
+-for i in $INCDIRS ; do
+-    if [ "X" != "X$NCP_PATH" ]; then
+-        if [ -f "$i/ncp/nwcalls.h" ]; then
+-            NCP_IPATH="$i"
+-        fi
+-    fi
+-done
+ if [ -n "$NCP_PATH" -a -n "$NCP_IPATH" ]; then
+     echo "                                         ... found"
+ fi
diff --git a/net-analyzer/hydra/files/hydra-8.4-configure.patch b/net-analyzer/hydra/files/hydra-8.4-configure.patch
new file mode 100644
index 000000000000..ba99ff2acda4
--- /dev/null
+++ b/net-analyzer/hydra/files/hydra-8.4-configure.patch
@@ -0,0 +1,48 @@
+--- a/configure
++++ b/configure
+@@ -46,8 +46,6 @@
+ MYSQL_IPATH=""
+ AFP_PATH=""
+ AFP_IPATH=""
+-NCP_PATH=""
+-NCP_IPATH=""
+ SVN_PATH=""
+ SVN_IPATH=""
+ APR_IPATH=""
+@@ -679,36 +677,6 @@
+ fi
+ 
+ echo "Checking for NCP (libncp.so / nwcalls.h) ..."
+-for i in $LIBDIRS ; do
+-    if [ "X" = "X$NCP_PATH" ]; then
+-        if [ -f "$i/libncp.so" -o -f "$i/libncp.dylib" -o -f "$i/libncp.a"  ]; then
+-            NCP_PATH="$i"
+-        fi
+-    fi
+-    if [ "X" = "X$NCP_PATH" ]; then
+-        TMP_LIB=`/bin/ls $i/libncp.so.* 2> /dev/null | grep ncp.`
+-        if [ -n "$TMP_LIB" ]; then
+-            NCP_PATH="$i"
+-        fi
+-    fi
+-    if [ "X" = "X$NCP_PATH" ]; then
+-        TMP_LIB=`/bin/ls $i/libncp.dll* 2> /dev/null | grep ncp.`
+-        if [ -n "$TMP_LIB" ]; then
+-            NCP_PATH="$i"
+-        fi
+-    fi
+-done
+-for i in $INCDIRS ; do
+-    if [ "X" != "X$NCP_PATH" ]; then
+-        if [ -f "$i/ncp/nwcalls.h" ]; then
+-            NCP_IPATH="$i"
+-        fi
+-    fi
+-done
+-if [ "X" != "X$DEBUG" ]; then
+-   echo DEBUG: NCP_PATH=$NCP_PATH/libncp
+-   echo DEBUG: NCP_IPATH=$NCP_IPATH/ncp/nwcalls.h
+-fi
+ if [ -n "$NCP_PATH" -a -n "$NCP_IPATH" ]; then
+     echo "                                         ... found"
+ fi
diff --git a/net-analyzer/hydra/hydra-8.1.ebuild b/net-analyzer/hydra/hydra-8.1.ebuild
new file mode 100644
index 000000000000..64a4453dc1f3
--- /dev/null
+++ b/net-analyzer/hydra/hydra-8.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Advanced parallized login hacker"
+HOMEPAGE="http://www.thc.org/thc-hydra/"
+SRC_URI="http://freeworld.thc.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="firebird gtk idn mysql ncp oracle pcre postgres ssl subversion"
+
+RDEPEND="
+	dev-libs/openssl
+	sys-libs/ncurses
+	firebird? ( dev-db/firebird )
+	gtk? (
+		dev-libs/atk
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+	)
+	idn? ( net-dns/libidn )
+	mysql? ( virtual/mysql )
+	ncp? ( net-fs/ncpfs )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( dev-db/postgresql )
+	ssl? ( >=net-libs/libssh-0.4.0 )
+	subversion? ( dev-vcs/subversion )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# None of the settings in Makefile.unix are useful to us
+	: > Makefile.unix
+
+	sed -i \
+		-e 's:|| echo.*$::' \
+		-e '/\t-$(CC)/s:-::' \
+		-e '/^OPTS/{s|=|+=|;s| -O3||}' \
+		-e '/ -o /s:$(OPTS):& $(LDFLAGS):g' \
+		Makefile.am || die
+
+	epatch "${FILESDIR}"/${PN}-8.0-configure.patch
+}
+
+src_configure() {
+	export OPTS="${CFLAGS}"
+
+	if ! use subversion; then
+		sed -i 's/-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1//;s/-DLIBSVN//' configure || die
+	fi
+
+	if ! use mysql; then
+		sed -i 's/-lmysqlclient//;s/-DLIBMYSQLCLIENT//' configure || die
+	fi
+
+	# Linking against libtinfo might be enough here but pkg-config --libs tinfo
+	# would require a USE=tinfo flag and recent linkers should drop libcurses
+	# as needed
+	sed -i \
+		-e 's|-lcurses|'"$( $(tc-getPKG_CONFIG) --libs ncurses)"'|g' \
+		configure || die
+
+	# Note: despite the naming convention, the top level script is not an
+	# autoconf-based script.
+	export NCP_PATH=$(usex ncp /usr/$(get_libdir) '')
+	export NCP_IPATH=$(usex ncp /usr/include '')
+	sh configure \
+		--prefix=/usr \
+		--nostrip \
+		$(use gtk && echo --disable-xhydra) \
+			|| die
+
+	if use gtk ; then
+		cd hydra-gtk && \
+		econf
+	fi
+}
+
+src_compile() {
+	tc-export CC
+	emake XLIBPATHS=''
+	use gtk && emake -C hydra-gtk
+}
+
+src_install() {
+	dobin hydra pw-inspector
+	use gtk && dobin hydra-gtk/src/xhydra
+	dodoc CHANGES README
+}
diff --git a/net-analyzer/hydra/hydra-8.5.ebuild b/net-analyzer/hydra/hydra-8.5.ebuild
new file mode 100644
index 000000000000..70d970dfe574
--- /dev/null
+++ b/net-analyzer/hydra/hydra-8.5.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Advanced parallized login hacker"
+HOMEPAGE="https://www.thc.org/thc-hydra/"
+SRC_URI="
+	https://github.com/vanhauser-thc/thc-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="firebird gtk idn libressl mysql ncp oracle pcre postgres ssl subversion"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/ncurses:=
+	firebird? ( dev-db/firebird )
+	gtk? (
+		dev-libs/atk
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+	)
+	idn? ( net-dns/libidn )
+	mysql? ( virtual/mysql )
+	ncp? ( net-fs/ncpfs )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( dev-db/postgresql:* )
+	ssl? ( >=net-libs/libssh-0.4.0 )
+	subversion? ( dev-vcs/subversion )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.4-configure.patch
+)
+S=${WORKDIR}/thc-${P}
+
+src_prepare() {
+	default
+
+	# None of the settings in Makefile.unix are useful to us
+	: > Makefile.unix
+
+	sed -i \
+		-e 's:|| echo.*$::' \
+		-e '/\t-$(CC)/s:-::' \
+		-e '/^OPTS/{s|=|+=|;s| -O3||}' \
+		-e '/ -o /s:$(OPTS):& $(LDFLAGS):g' \
+		Makefile.am || die
+}
+
+src_configure() {
+	export OPTS="${CFLAGS}"
+
+	if ! use subversion; then
+		sed -i 's/-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1//;s/-DLIBSVN//' configure || die
+	fi
+
+	if ! use mysql; then
+		sed -i 's/-lmysqlclient//;s/-DLIBMYSQLCLIENT//' configure || die
+	fi
+
+	# Linking against libtinfo might be enough here but pkg-config --libs tinfo
+	# would require a USE=tinfo flag and recent linkers should drop libcurses
+	# as needed
+	sed -i \
+		-e 's|-lcurses|'"$( $(tc-getPKG_CONFIG) --libs ncurses)"'|g' \
+		configure || die
+
+	# Note: despite the naming convention, the top level script is not an
+	# autoconf-based script.
+	export NCP_PATH=$(usex ncp /usr/$(get_libdir) '')
+	export NCP_IPATH=$(usex ncp /usr/include '')
+	sh configure \
+		--prefix=/usr \
+		--nostrip \
+		$(use gtk && echo --disable-xhydra) \
+			|| die
+
+	if use gtk ; then
+		cd hydra-gtk && \
+		econf
+	fi
+}
+
+src_compile() {
+	tc-export CC
+	emake XLIBPATHS=''
+	use gtk && emake -C hydra-gtk
+}
+
+src_install() {
+	dobin hydra pw-inspector
+	use gtk && dobin hydra-gtk/src/xhydra
+	dodoc CHANGES README
+}
diff --git a/net-analyzer/hydra/hydra-8.6.ebuild b/net-analyzer/hydra/hydra-8.6.ebuild
new file mode 100644
index 000000000000..bed5fc36e987
--- /dev/null
+++ b/net-analyzer/hydra/hydra-8.6.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Advanced parallized login hacker"
+HOMEPAGE="https://www.thc.org/thc-hydra/"
+SRC_URI="
+	https://github.com/vanhauser-thc/thc-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="firebird gtk idn libressl mysql ncp oracle pcre postgres ssl subversion"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/ncurses:=
+	firebird? ( dev-db/firebird )
+	gtk? (
+		dev-libs/atk
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+	)
+	idn? ( net-dns/libidn )
+	mysql? ( virtual/mysql )
+	ncp? ( net-fs/ncpfs )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( dev-db/postgresql:* )
+	ssl? ( >=net-libs/libssh-0.4.0 )
+	subversion? ( dev-vcs/subversion )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.4-configure.patch
+)
+S=${WORKDIR}/thc-${P}
+
+src_prepare() {
+	default
+
+	# None of the settings in Makefile.unix are useful to us
+	: > Makefile.unix
+
+	sed -i \
+		-e 's:|| echo.*$::' \
+		-e '/\t-$(CC)/s:-::' \
+		-e '/^OPTS/{s|=|+=|;s| -O3||}' \
+		-e '/ -o /s:$(OPTS):& $(LDFLAGS):g' \
+		Makefile.am || die
+}
+
+src_configure() {
+	export OPTS="${CFLAGS}"
+
+	if ! use subversion; then
+		sed -i 's/-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1//;s/-DLIBSVN//' configure || die
+	fi
+
+	if ! use mysql; then
+		sed -i 's/-lmysqlclient//;s/-DLIBMYSQLCLIENT//' configure || die
+	fi
+
+	# Linking against libtinfo might be enough here but pkg-config --libs tinfo
+	# would require a USE=tinfo flag and recent linkers should drop libcurses
+	# as needed
+	sed -i \
+		-e 's|-lcurses|'"$( $(tc-getPKG_CONFIG) --libs ncurses)"'|g' \
+		configure || die
+
+	# Note: despite the naming convention, the top level script is not an
+	# autoconf-based script.
+	export NCP_PATH=$(usex ncp /usr/$(get_libdir) '')
+	export NCP_IPATH=$(usex ncp /usr/include '')
+	sh configure \
+		--prefix=/usr \
+		--nostrip \
+		$(use gtk && echo --disable-xhydra) \
+			|| die
+
+	if use gtk ; then
+		cd hydra-gtk && \
+		econf
+	fi
+}
+
+src_compile() {
+	tc-export CC
+	emake XLIBPATHS=''
+	use gtk && emake -C hydra-gtk
+}
+
+src_install() {
+	dobin hydra pw-inspector
+	use gtk && dobin hydra-gtk/src/xhydra
+	dodoc CHANGES README
+}
diff --git a/net-analyzer/hydra/metadata.xml b/net-analyzer/hydra/metadata.xml
new file mode 100644
index 000000000000..40f7b4bb57bc
--- /dev/null
+++ b/net-analyzer/hydra/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<longdescription>Advanced parallized login hacker</longdescription>
+<use><flag name="ncp">NCP protocol (NetWare) support through <pkg>net-fs/ncpfs</pkg></flag></use>
+</pkgmetadata>
diff --git a/net-analyzer/ibmonitor/Manifest b/net-analyzer/ibmonitor/Manifest
new file mode 100644
index 000000000000..6f7c2a9e4d5d
--- /dev/null
+++ b/net-analyzer/ibmonitor/Manifest
@@ -0,0 +1,5 @@
+DIST ibmonitor-1.4.tar.gz 17025 SHA256 331dac4553b5c336d1db3d35176ecebeaf15b39ad0432372cba583324a222e28 SHA512 ef74dee22dbb88d07c37af9aaa0a0a49b6c49ff1b45a1637d06acbe32e4bc4e84d79cfe06ee7ba2b04d62fa3cfa0a10605eccde549d2fe04890dfa179adf20db WHIRLPOOL 29ded2cdf18b4d027caf8738bfed2e0e7d66f6a1546980bb30799332028f57517b59fb22c0201e91050e2495a495e678e86273859bc2c5ce33730f6b3e620e4e
+EBUILD ibmonitor-1.4.ebuild 439 SHA256 341e9065890553eb89c3290dc0b8ca3c0cef5c4b5a033ce4e3eb23e2073e30ca SHA512 53f8da152024f2eb3db29855ddce44365c213e931901d7b567484d1977cb8ee8475447e9fb50c12ddfbc0ffb9383024b6285e5da3fc95b9785e302515c84196c WHIRLPOOL 9ee42a1c267df772b53e0a29df41915b59c4a930e524e5569ba2a85dea2f791062beceac55f8b673d62be8e79464c6de8c1880a0d0e8c70759f2e142d4a6d93a
+MISC ChangeLog 2433 SHA256 2af3603a3ab047a5b8d613fbe9c933ad0b0a882c0d405dfbe8b311f56250e892 SHA512 502f03f71f9584e142022ca5b5090485a701caa01d81a8f836b338a75cad386893177a971efdaec7fd60faba5948f43d74c9ef1a18e298c656545d16e484a0ed WHIRLPOOL b7096f9832d08392ea8b4d58215ed4a9c989fc5341123f93272c49f6dd362a983bd99971c91bc67d1fdfb4e2231016f9490599fec8a893e912368226aeb93be4
+MISC ChangeLog-2015 2117 SHA256 d836f24c65e1d6fe9f35ae1063bcda5f8c9ce1d7f915a879d7d01408ecd9bc58 SHA512 0cc12eab579c9c755f6666ec58007d416fdf5fe18e69270481cc4cce358c974744fcb7c8f740595e5dc003e02cb62eb2004bfbcfe9d111f728c013439cb2dac1 WHIRLPOOL d1f8f3c8267c3cd199488a0a62b9ed2b3b34b90f35fb14dde9bafb4de1e0f869732d0596b3fc1492f476d2dccbb1588f7092906ad74449338741370ee1465081
+MISC metadata.xml 359 SHA256 dbf8d0864516ca9e69003a336872572da2c78a1b48e6b2f75b760a073234601e SHA512 a86cf3607c903fcc1ce55ab441ddc138653d40eb196e175d211998e11bc850427789d00ad466a3d2ddf990e9a61876938914499992b5a1b56595e7b220a8a31d WHIRLPOOL 9b1e26d0006c01e39e6072a5d936573f212d8362997a3110cf9f003342326cba2f8c2c8ed76c03ed529413388db8ad9c07f8d32daf46df6c7fab646865797cfa
diff --git a/net-analyzer/ibmonitor/ibmonitor-1.4.ebuild b/net-analyzer/ibmonitor/ibmonitor-1.4.ebuild
new file mode 100644
index 000000000000..6e388ee87fa9
--- /dev/null
+++ b/net-analyzer/ibmonitor/ibmonitor-1.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Interactive bandwidth monitor"
+HOMEPAGE="http://ibmonitor.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~hppa ~ppc x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+S="${WORKDIR}/${PN}"
+
+RDEPEND="dev-perl/TermReadKey"
+
+src_install() {
+	dobin ibmonitor
+	dodoc AUTHORS ChangeLog README TODO
+}
diff --git a/net-analyzer/ibmonitor/metadata.xml b/net-analyzer/ibmonitor/metadata.xml
new file mode 100644
index 000000000000..2488b71436bd
--- /dev/null
+++ b/net-analyzer/ibmonitor/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ibmonitor</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
new file mode 100644
index 000000000000..9bd3c86ea8f1
--- /dev/null
+++ b/net-analyzer/icinga-web/Manifest
@@ -0,0 +1,5 @@
+DIST icinga-web-1.14.0.tar.gz 14523746 SHA256 ee57e53417d54ee65b4cabe6c18f15c57cf49750f9fb73691deb9f28b11a740e SHA512 9e429ffaf84efb08e0ad009af2dd90179366d4de5720bc09574228d3a6dec967eddc04402f5fac220e7af14761afec4b9021f70255102829e21880591d702d3b WHIRLPOOL 628a606e9c9e927258875dc3529e575ccd9c1da7e358bc5cf96b55068741380a36c89935217dc8b3319942c396f26f50dedb428226f9f99dfa003c7ad3809631
+EBUILD icinga-web-1.14.0.ebuild 6360 SHA256 1fc3ce905f811f6b7b708c16afdc6075bc6315df422c151ae3fe480105413b4f SHA512 2f0e86345412a2af5541fe9dfb949abef6f7fd53018c65b876ef9d1a64b3c7cac015f49f8f4f8716f28fe2a6d4136dff3da448ce8f92e7816d86ce2c80e1fc2b WHIRLPOOL fbc99a81538743ed979f46ee132bb12d1665fd18d8d4e23bde56bbcce65a941e50aa0a54b35ca570f3f7f2bd1caecb8dbdc612cb5a7adaca902c4df0b9d6518c
+MISC ChangeLog 3350 SHA256 7be61e490ab18b9bc5f7c5b461775f1f8a755820251976c57b753ed70c7bcd00 SHA512 dc28b84430551868618acf72ef266ce0635c81a96a2006a5702f0e235c46dba946b7ac586b9f1f69a8527e3f2df552403ef53c90b2803adf953f381ef7c0172e WHIRLPOOL 4ebe1b95f5b98d2b61fcb3840c4685444c3dec22faddbca7d43d7aa680a88364136c736f0766e4336d3956b7d77f2a2dc149213317954816eceef7e1a4b83313
+MISC ChangeLog-2015 3720 SHA256 feee007ad00caaa97b20ca3ab52e4bacc9d2aee9785ef95c858bc17e05620ac8 SHA512 135974c33d8d0269a09eea005e64eda5bc2a2201ab2a01ba669351fd631a3d02f52bfc41920fd60207b3fc6c8b087358aa816fbd589cff3e608b3e7450fd75f7 WHIRLPOOL 80b65f29e84a17d0fb0980d866311a108c8464a28280bea0a647daeec1560684b939a19a4b295a94a1c85599cfe8e9be05a7091621fd06b3d6beedce519fb50c
+MISC metadata.xml 565 SHA256 53a0d14ba773a981b4be3b7ce20c864afb9f21e190c7186b0a737c93aac95a85 SHA512 534f181a73fff13650cd97081c748cf0d75424bab7826ac83eda2a09e6cd3737fd447db3ad9a0207b2cdb24cc84f0515ad5282de2024ec6eddae2a85be41a084 WHIRLPOOL 308eaadc02f27235de1662809ba64f34792f78f492ac35857a6091d7eea0ef9ac26a136e4323b798b07f75bd875ef1ff741cd63223dac6e266d090234994bafb
diff --git a/net-analyzer/icinga-web/icinga-web-1.14.0.ebuild b/net-analyzer/icinga-web/icinga-web-1.14.0.ebuild
new file mode 100644
index 000000000000..215958015581
--- /dev/null
+++ b/net-analyzer/icinga-web/icinga-web-1.14.0.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit depend.apache eutils user multilib
+
+DESCRIPTION="Icinga Web - new Web Interface"
+HOMEPAGE="http://www.icinga.org/"
+SRC_URI="https://github.com/icinga/${PN}/archive/v${PV}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="apache2 mysql pnp postgres"
+DEPEND="dev-php/phing
+		dev-db/libdbi-drivers[mysql?,postgres?]
+		|| ( >=net-analyzer/icinga-1.10.0 >=net-analyzer/icinga2-2.1.1 )
+		dev-lang/php:=[apache2?,cli,json,mysql?,pdo,postgres?,sockets,xslt,xml]
+		pnp? ( net-analyzer/pnp4nagios )"
+RDEPEND="${DEPEND}"
+
+want_apache2
+
+pkg_setup() {
+	if use apache2 ; then
+		depend.apache_pkg_setup
+	fi
+	enewgroup icinga
+	enewgroup nagios
+	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
+}
+
+src_prepare() {
+	#removed checks for some php stuff since we have these things called use flags
+	sed -i 's/ACICINGA_CHECK_PHP_MODULE/\#ACICINGA_CHECK_PHP_MODULE/g' configure.ac
+	sed -i 's/make\ /make\ \-j1\ /g' lib/Makefile.in
+	autoreconf
+}
+
+src_configure() {
+	local myconf
+
+	myconf="--prefix=/usr/share/icinga/icinga-web
+	--bindir=/usr/sbin
+	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
+	--datarootdir=/usr/share/icinga/htdocs
+	--localstatedir=/var/lib/icinga
+	--sysconfdir=/etc/icinga
+	--libexecdir=/usr/$(get_libdir)/icinga/plugins
+	--with-bin-user=icinga
+	--with-bin-group=nagios
+	--with-api-cmd-file=/var/lib/icinga/rw/icinga.cmd
+	--with-conf-dir=/etc/icinga-web
+	--with-log-dir=/var/log/icinga-web
+	--with-icinga-objects-dir=/etc/icinga/objects
+	--with-icinga-bin=/usr/sbin/icinga
+	--with-icinga-cfg=/etc/icinga/icinga.cfg"
+
+	if use apache2 ; then
+		myconf+=" --with-web-user=apache
+		--with-web-group=apache
+		--with-web-apache-path=${APACHE_MODULES_CONFDIR}"
+	else
+		myconf+=" --with-web-user=root
+		--with-web-group=root"
+	fi
+
+	if use postgres ; then
+		myconf+=" --with-db-type=pgsql
+		--with-db-port=5432
+		--with-api-subtype=pgsql
+		--with-api-port=5432"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	dodoc README
+	rm -f README
+
+	emake -j1 DESTDIR="${D}" install
+
+	emake DESTDIR="${D}" install-javascript
+
+	if use apache2 ; then
+		dodir ${APACHE_MODULES_CONFDIR}
+		emake DESTDIR="${D}" install-apache-config
+		echo '<IfDefine ICINGA_WEB>' > "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
+		cat "${WORKDIR}/${P}/etc/apache2/icinga-web.conf" >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
+		rm "${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf" || die "rm failed"
+		echo '</IfDefine>' >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
+	fi
+
+	insinto /usr/share/icinga/icinga-web/contrib
+	doins -r etc/schema/*
+
+	if use apache2 ; then
+		sed -i 's/%%USER%%/apache/g'  etc/scheduler/icingaCron
+	else
+		sed -i 's/%%USER%%/root/g'  etc/scheduler/icingaCron
+	fi
+	sed -i 's/%%PATH%%/\/usr\/share\/icinga\/icinga-web/g' etc/scheduler/icingaCron
+
+	dodir /usr/share/icinga/icinga-web/cron/
+	cat - >> "${D}"/usr/share/icinga/icinga-web/cron/crontab <<EOF
+# Force the shell to bash
+SHELL=/bin/bash
+#mail to root
+MAILTO=root
+
+#runs every minute
+* * * * * /usr/bin/php /usr/share/icinga/icinga-web/lib/icingaScheduler/icingaCron.php --useAgavi --exec >> /var/log/icinga-web/cron_error.log
+EOF
+
+	cat - >> "${D}"/usr/share/icinga/icinga-web/cron/fcrontab <<EOF
+# Mail reports to root
+!mailto(root)
+
+#runs every minute
+@ 1		/usr/bin/php /usr/share/icinga/icinga-web/lib/icingaScheduler/icingaCron.php --useAgavi --exec >> /var/log/icinga-web/cron_error.log
+EOF
+
+	if use apache2 ; then
+		diropts -o apache -g apache
+	else
+		diropts -o root -g root
+	fi
+	dodir /var/log/icinga-web
+
+	if use apache2 ; then
+		fowners apache:apache /usr/share/icinga/icinga-web/lib/icingaScheduler/res/storage.dat
+	else
+		fowners root:root /usr/share/icinga/icinga-web/lib/icingaScheduler/res/storage.dat
+	fi
+
+	if use pnp ; then
+		insinto /usr/share/icinga/icinga-web/app/modules/Cronks/data/xml/extensions/
+		doins contrib/PNP_Integration/templateExtensions/pnp-host-extension.xml
+		doins contrib/PNP_Integration/templateExtensions/pnp-service-extension.xml
+	fi
+}
+
+pkg_config() {
+	einfo "press enter to install the icinga-web crontab"
+	einfo "installation from /usr/share/icinga/icinga-web/cron/icingaCron"
+	einfo
+	read
+
+	if has_version sys-process/fcron; then
+		fcrontab - -u root < /usr/share/icinga/icinga-web/cron/fcrontab
+	else
+		crontab - -u root < /usr/share/icinga/icinga-web/cron/crontab
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	einfo "If this is a new install, you must create a new database for it, e.g. icinga_web."
+	einfo "You can find the database scripts in /usr/share/icinga/icinga-web/contrib/."
+	einfo
+	einfo "Additionally, you need to setup a database user."
+	einfo "The user must have default data privileges like SELECT, UPDATE, INSERT, DELETE."
+	einfo
+	einfo "Example for a MySQL database:"
+	einfo "  echo \"CREATE DATABASE icinga_web;\" | mysql"
+	einfo "  echo \"GRANT SELECT,UPDATE,INSERT,DELETE ON icinga_web.* TO 'icinga_web'@'localhost' IDENTIFIED BY 'xxxxxx';\" | mysql"
+	einfo "  echo \"FLUSH PRIVILEGES;\" | mysql"
+	einfo
+	einfo "  cat /usr/share/icinga/icinga-web/contrib/mysql.sql | mysql icinga_web"
+	einfo
+
+	ewarn
+	ewarn "If you're upgrading from a previous release, you must upgrade your database schema."
+	ewarn "You can find upgrade scripts in /usr/share/icinga/icinga-web/contrib/updates/."
+	ewarn
+	ewarn "IMPORTANT: If you are upgrading from an older version and there are other versions in between,"
+	ewarn "           be advised that you need to apply those upgrade files with incremental steps!"
+	ewarn
+	ewarn "Example to upgrade a MySQL database:"
+	ewarn "  cat  /usr/share/icinga/icinga-web/contrib/updates/mysql_<oldversion>_to_<newversion>.sql | mysql icinga_web"
+	ewarn
+	ewarn "Don't forget to clear the config cache."
+	ewarn "  /usr/share/icinga/icinga-web/bin/clearcache.sh"
+	ewarn
+
+	einfo
+	einfo "Please note that the magic_quotes_gpc setting must be disabled (in both apache and cli php.ini)."
+	einfo
+
+	if use apache2 ; then
+		einfo
+		einfo "apache config was installed into"
+		einfo "/etc/apache2/modules.d/99_icinga-web.conf"
+		einfo
+		einfo "The apache config value for \'ServerTokens\' must be set to at"
+		einfo "least \'Min\'."
+		einfo
+	else
+		einfo
+		einfo "If you are not using apache you may need to change some"
+		einfo "permissions, so that your web server can access files and logs"
+		einfo
+	fi
+}
diff --git a/net-analyzer/icinga-web/metadata.xml b/net-analyzer/icinga-web/metadata.xml
new file mode 100644
index 000000000000..224b578f16c1
--- /dev/null
+++ b/net-analyzer/icinga-web/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+	Icinga-web is a database backed web frontend to icinga.
+	</longdescription>
+	<use>
+		<flag name="pnp">Enables pnp4nagios integration</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">icinga</remote-id>
+		<remote-id type="github">icinga/icinga-web</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
new file mode 100644
index 000000000000..b13d09575abd
--- /dev/null
+++ b/net-analyzer/icinga/Manifest
@@ -0,0 +1,15 @@
+AUX fix-prestripped-binaries-1.7.0.patch 857 SHA256 dba024fff1934a44e7f3e20e93c121aa251ef1286c8971247e45509c31aaf3ad SHA512 4a01ff3cf8569cfeadad283d1085b7af4f5703f6ad066aa5eb61f06f79ca54a4fd29375dd9a120a1a649c7e76019298e9e99ee1360717db227ff63c0a9cc021c WHIRLPOOL 5029ccefc5e66ca363dbed33ce8df99c6993a0f82942143e9c8ada45481f6bcaecfa62380bb69802fb0d0b3910e4501ec2378423d8b72b5cd93822e60a993e22
+AUX icinga-apache.conf 465 SHA256 aefcc8b674d2fdd0a721247d2a3156811af6b2fbe6a91642ff19eb13ee2f0a65 SHA512 8f08f6938f2c233e230b45afdc634653cd971bf26fab60252f8633f2b1609f724575f256b018b6016852279ff3ddd12341825f0489be3266c3c096fe983e5841 WHIRLPOOL a692969be97751fc7f1a98d786e7070b450b6f1d66b6947f7834763550519af72cc5a5ce6a614c556ae861625e80a886b2a4143df6f0a4bab74ed9c355fddb33
+AUX icinga-conf.d 178 SHA256 68dde656424fc57e66babceb3c6623a235fac8bf1f9cd885138e31878db740db SHA512 96411175c488423c61f45fc9c76131a9807a36f08c9f73c6a6fb50e432d951d3e4ab42b456732b48cb009944faff4af472eb76fbefd75fd61978dfc6d199e9cd WHIRLPOOL acf6b66165c227515099f25b6db38c5cce86a50844983123a136f6cf63ce744f49fde1d243c2dcadbceaf62154e3fbc8eadca8933c80fc0501aaaf52c5e0266a
+AUX icinga-init.d 1353 SHA256 168e65b609a192c48b0596b50ad259b8ee8dac5131fefe6fc20dc551ca73235f SHA512 f5afbbf6675bb2acb367a3c8c08492ce0ea4b2da7691d6a83833ba417922af7d0e7efff2d78688b270a461dae39f3e3514cd3218495e860ad2698c67baac4a6c WHIRLPOOL ed221e769fc1f9519d11be1ce2a332a5496df36ef60ff5539d1e8ba79ffb491748f49f16d80a3d6ba0b28c0b71c825df8592db736f5ee098ff97ee13a6cf4752
+AUX icinga-lighty.conf 465 SHA256 f4059bc54959fb2544f23c2fc6a86f0ab2467025ce1f468317a0079b55116b44 SHA512 2a8783945330c54eaa331587f2e7291bdddb8c6717c659ac8dfec7c14ab762a01a870f5fb35d91bb54f36c867eb56c13dce11b5ab13d6e5b6fc9049ce5f57372 WHIRLPOOL 3634d30b9e4841f4424ce36983a88e56ccf3385ab5c9f8e27f322a0ebc59985cb618dbe70d8f67ab641e8a6151721f70cc0f104c905b4da0c35af6ceb899eca1
+AUX ido2db-conf.d 35 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372 SHA512 c2988f205ce29daaacd2daa20ceb285da2b76e2a68bb5dd695874e73b275714eaea5e0b6bb0afaf7e5d875a9e89ee35c7dfcdb5c77513b2f1a59fbbd28f49f4f WHIRLPOOL 7816a44592582b65bb05b7c568af29885ab547b0164582d939e37b937ddc0cfa3dfc503b8673042b5ce60e0b19ba96dcfe08e13882c8bbae80d9750411945966
+AUX ido2db-init.d 822 SHA256 c730fd6ff73f9877950be4c9b09eb6a531aafd57e18eac8d224b664eedb098fa SHA512 8593a676389aae540a4fa3e4c7c6f558254da018b13b8dda7a932307645029775659b1258c68fa2178086978c59250be4820b0cc1a3d3c7ded276aa17a3b9b6e WHIRLPOOL 80b1c5f1bc74f099183d1d7bb424751b75f419e49cb38e878d52a759031587c01ec32d13b58f5def034cbafe9b50d101cc5e82ac1d5b0b20e4eb0320a2abdccf
+DIST CVE-2015-8010_1.13.3.patch 177807 SHA256 8ccd8cdf221b8f2aa90ae1e4c76ccc61e7cf7519eadc9482c671502c2138c2a7 SHA512 bc82e588db33fbb955002cf51ae7b0e40109d4ec3fa6199b046ffbf23b649d74fbdd04c8fb4a5af4cd44301e26f30aa295a9574281c14bc45eec2b9149a6339a WHIRLPOOL 90f3eb3a6ad79337cf9d7fe63e201e313769fea6e3fdf2f2de0b2072b1b21e66d650b632794dcb39b458e7c17449f7fb2d45d678a3b628a467496284f238231d
+DIST icinga-1.13.4.tar.gz 18741576 SHA256 5690f6b3f3340d341a265fe61598ff3f64cb7d135a0059e791b51c77bcd4833b SHA512 245f94facfcbb125ed6be26a2544292b7ce6d59a6d38374b7ef1b24b2ca3deaaff56720542c3747d36ab4998b88b367ca40bbd061491e0770e21505bd7c0a1d6 WHIRLPOOL 92c444ae98139c570b420cef83182401ee7756328a4edd89b52187c1844526aea0e374839395df082fff4504e2ace14366488a2d1d0864998890add32cd08c40
+DIST icinga-1.14.0.tar.gz 20779347 SHA256 440d6b0596804cdfb21ed93b4f74592a144e7d9ee15cc88b3079276cb0370851 SHA512 f02c60c2bd1d3dff4a5a42f9d3c3362ada421f2cd83362b3cdd05f59b0aafe4f61255b621afed1fbf959415545a94ce6b3124bf2ffac22f0f2bdb8a67e75ad7a WHIRLPOOL 165c32d53d328de53822bae6cc0b68f4529c4a9ebb1aab5ccd97fa6e42256025f788dda6d09326578907c7b4a0ce2e72f50f95b923a378401fcc4dbd7f415522
+EBUILD icinga-1.13.4.ebuild 7956 SHA256 18fcbddbb8e7f641731fd686a33e524c28eafed83b288b6582a3c4f461fb9e1a SHA512 ec0b90e102cc5f0b282731f923c15b259c4581f35eaed8eafd13678f9455754f808004b38c0f03eb723ff61fcffb51750f90163e6c4b2b5c887a286e029c429f WHIRLPOOL 87e7a7a6f07e75f770eaf517a95ae6ca12e4b3038f928b776689b64b351c0a4d395c186aed8c54c9432467ae65c2b932af45e9d508e7ed513caf8192382bb75d
+EBUILD icinga-1.14.0.ebuild 7920 SHA256 7446e4d0f4fd5d9ebcd0675d75bd6ab3aa030a1480490da0cbaddf6a798563c0 SHA512 ef73833c299d5dba38c489e77a8faf22356949bc7599f5e6da2d3540921015507410062227d7330a42155b32e3d84cca252b4366fc43e735d39f3c6a3d1111cd WHIRLPOOL 59e2ab7f7505bb7d43fa04c9c8548022e2f9f88b76d53eef4244e616e093be0e0ecfe87ebd3685c689fd0cbd37b58cc28e48d6052478aba3836219aaec877c89
+MISC ChangeLog 5544 SHA256 873fb07b738a68ba5763775fa02f19e278367f44ae03d94f250234b123a1b39b SHA512 91ceef40cee6fee4e2162b290c3f325a4ce17379d95246010d2d04cc441ad4f966e9246174288186d52cd1fd3dcda3dcf10b8e7843423543eef1ad1b10d78f2a WHIRLPOOL 1559908f5ea50b8fcd7050673aabc21b0410ce809c9c7856d749951d217ca7593be9588dda444ffef237358987c927fa57fc6a474ab8203f7530f8702139a901
+MISC ChangeLog-2015 9282 SHA256 d7d9b1c7903a80d27804f409837d49ae86afb10a346dfb9eaf01a37520a7930e SHA512 6f1fcc57ccaa8517e21336250afc563b7e1423c0a4f886f26da20e6064c4cb33a6c427f2755475cc260c864c97fd5bb6f06b13e5850d2d95798039d1385fa1f5 WHIRLPOOL 3b8cf54bd8488d6de64bfc29d3dd79d7019efee0f9c22c83d1192754034b480d292794f98fc8c5a4fa77526e97a32b310ddd4ae549082f91f315ae23eab1d32e
+MISC metadata.xml 853 SHA256 b9dafc7f14e90242f3e416043178e3815b8413427904cc45a2a13adce95ba0d3 SHA512 1aad02d84c0e90f4f0f5ed54e326d9a14e77f5146b3ba9293279e009f45900a69e1b2fcc9f54cb02111f05bb2aef0370cda1b4bc4fffa4fc4dd0c2a073e0a92b WHIRLPOOL e35f38dab1d8b749d53d933ea2846d0d316a73f3af47e97723977ef559d20193562a8445b29c249c7af4fc0969cba03d1c90ea488a3d3cdb1dc19e5100dc3b23
diff --git a/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch b/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch
new file mode 100644
index 000000000000..256cfc83232f
--- /dev/null
+++ b/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch
@@ -0,0 +1,23 @@
+diff -rupN icinga-1.7.0beta1-orig//base/Makefile.in icinga-1.7.0beta1//base/Makefile.in
+--- icinga-1.7.0beta1-orig//base/Makefile.in	2012-05-09 07:10:21.000000000 -0500
++++ icinga-1.7.0beta1//base/Makefile.in	2012-05-14 14:00:29.666346315 -0500
+@@ -41,7 +41,7 @@ HTMLDIR=@datarootdir@
+ INSTALL=@INSTALL@
+ INSTALL_OPTS=@INSTALL_OPTS@
+ COMMAND_OPTS=@COMMAND_OPTS@
+-STRIP=@STRIP@
++STRIP=/bin/true
+
+ CGIURL=@cgiurl@
+ HTMURL=@htmurl@
+diff -rupN icinga-1.7.0beta1-orig//cgi/Makefile.in icinga-1.7.0beta1//cgi/Makefile.in
+--- icinga-1.7.0beta1-orig//cgi/Makefile.in	2012-05-09 07:10:21.000000000 -0500
++++ icinga-1.7.0beta1//cgi/Makefile.in	2012-05-14 14:00:43.285346614 -0500
+@@ -21,7 +21,7 @@ INSTALL=@INSTALL@
+ INSTALL_OPTS=@INSTALL_OPTS@
+ INSTALL_OPTS_WEB=@INSTALL_OPTS_WEB@
+ COMMAND_OPTS=@COMMAND_OPTS@
+-STRIP=@STRIP@
++STRIP=/bin/true
+
+ CGIEXTRAS=@CGIEXTRAS@
diff --git a/net-analyzer/icinga/files/icinga-apache.conf b/net-analyzer/icinga/files/icinga-apache.conf
new file mode 100644
index 000000000000..7c768b4eb317
--- /dev/null
+++ b/net-analyzer/icinga/files/icinga-apache.conf
@@ -0,0 +1,17 @@
+<IfDefine ICINGA>
+	ScriptAlias /icinga/cgi-bin/ /usr/lib/icinga/cgi-bin/
+	<Directory "/usr/lib/icinga/cgi-bin/">
+		Options ExecCGI
+		AuthName "Icinga Access"
+		AuthType Basic
+		AuthUserFile /etc/icinga/htpasswd.users
+		Require valid-user
+	</Directory>
+	Alias /icinga /usr/share/icinga/htdocs
+	<Directory "/usr/share/icinga/htdocs">
+		AuthName "Icinga Access"
+		AuthType Basic
+		AuthUserFile /etc/icinga/htpasswd.users
+		Require valid-user
+	</Directory>
+</IfDefine>
diff --git a/net-analyzer/icinga/files/icinga-conf.d b/net-analyzer/icinga/files/icinga-conf.d
new file mode 100644
index 000000000000..da5b324b31b7
--- /dev/null
+++ b/net-analyzer/icinga/files/icinga-conf.d
@@ -0,0 +1,3 @@
+# Distributed monitoring users will want to configure here the ip/hostname of the central server.
+# It will be used by submit_check_result_via_nsca.
+NAGIOS_NSCA_HOST="localhost"
diff --git a/net-analyzer/icinga/files/icinga-init.d b/net-analyzer/icinga/files/icinga-init.d
new file mode 100644
index 000000000000..af1f3c5d29e4
--- /dev/null
+++ b/net-analyzer/icinga/files/icinga-init.d
@@ -0,0 +1,61 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+: ${ICINGACFG:=/etc/icinga/icinga.cfg}
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+command=/usr/sbin/icinga
+command_args="-d ${ICINGACFG}"
+
+get_config() {
+    if [ -e "${ICINGACFG}" ]; then
+	    sed -n -e 's:^[ \t]*'$1'=\([^#]\+\).*:\1:p' "${ICINGACFG}"
+	fi
+}
+
+pidfile=$(get_config lock_file)
+start_stop_daemon_args="-e HOME=/var/lib/icinga"
+
+depend() {
+	need net
+	use dns logger firewall mysql postgresql
+}
+
+checkconfig() {
+	# Silent Check
+	${command} -v ${ICINGACFG} &>/dev/null && return 0
+	# Now we know there's problem - run again and display errors
+	${command} -v ${ICINGACFG}
+	eend $? "Configuration Error. Please fix your configfile"
+}
+
+reload()
+{
+	checkconfig || return 1
+	ebegin "Reloading configuration"
+	kill -HUP $(cat ${pidfile}) &>/dev/null
+	eend $?
+}
+
+start_pre() {
+	checkpath -d -o icinga:icinga $(get_config temp_path)  $(dirname $(get_config lock_file)) $(dirname $(get_config log_file)) $(dirname $(get_config status_file))
+	checkpath -f -o icinga:icinga $(get_config log_file)
+	rm -f $(get_config command_file)
+}
+
+stop_post() {
+	rm -f $(get_config command_file)
+	rm -r /tmp/icinga
+}
+
+svc_restart() {
+	checkconfig || return 1
+	ebegin "Restarting icinga"
+	svc_stop
+	svc_start
+	eend $?
+}
+
diff --git a/net-analyzer/icinga/files/icinga-lighty.conf b/net-analyzer/icinga/files/icinga-lighty.conf
new file mode 100644
index 000000000000..678f2331e4ed
--- /dev/null
+++ b/net-analyzer/icinga/files/icinga-lighty.conf
@@ -0,0 +1,24 @@
+server.modules += ("mod_cgi")
+server.modules += ("mod_auth")
+server.modules += ("mod_alias")
+
+auth.require += ( "/icinga" =>
+	(
+		"method"  => "digest",
+		"realm"   => "icinga",
+		"require" => "valid-user"
+	)
+)
+
+$HTTP["url"] =~ "^/icinga/cgi-bin/" {
+	dir-listing.activate = "disable"
+	cgi.assign = (
+		".pl"  => "/usr/bin/perl",
+		".cgi" => ""
+	)
+}
+
+alias.url += (
+	"/icinga/cgi-bin" => "/usr/lib/icinga/cgi-bin",
+	"/icinga"         => "/usr/share/icinga/htdocs"
+)
diff --git a/net-analyzer/icinga/files/ido2db-conf.d b/net-analyzer/icinga/files/ido2db-conf.d
new file mode 100644
index 000000000000..5429fa9a5268
--- /dev/null
+++ b/net-analyzer/icinga/files/ido2db-conf.d
@@ -0,0 +1 @@
+IDO2DBCFG="/etc/icinga/ido2db.cfg"
diff --git a/net-analyzer/icinga/files/ido2db-init.d b/net-analyzer/icinga/files/ido2db-init.d
new file mode 100644
index 000000000000..2b827fa87535
--- /dev/null
+++ b/net-analyzer/icinga/files/ido2db-init.d
@@ -0,0 +1,39 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+get_config() {
+    if [ -e "${IDO2DBCFG}" ]; then
+        sed -n -e 's:^[ \t]*'$1'=\([^#]\+\).*:\1:p' "${IDO2DBCFG}"
+    fi
+}
+
+command=/usr/sbin/ido2db
+command_args="-c ${IDO2DBCFG}"
+pidfile="$(get_config lock_file)"
+
+depend() {
+	config "${IDO2DBCFG}"
+
+	need net icinga
+	use dns logger firewall
+
+	case $(get_config db_servertype) in
+	    mysql)
+		use mysql ;;
+	    pgsql)
+		use postgresql ;;
+	esac
+}
+
+IDO2DBSOCKET="$(get_config socket_name)"
+
+
+start_pre() {
+	if [ -S "${IDO2DBSOCKET}" ] ; then
+		ewarn "Strange, the socket file already exist in \"${IDO2DBSOCKET}\""
+		ewarn "it will be removed now and re-created by ido2db"
+		ewarn "BUT please make your checks."
+		rm -f "${IDO2DBSOCKET}"
+	fi
+}
diff --git a/net-analyzer/icinga/icinga-1.13.4.ebuild b/net-analyzer/icinga/icinga-1.13.4.ebuild
new file mode 100644
index 000000000000..4f6eef1f43e4
--- /dev/null
+++ b/net-analyzer/icinga/icinga-1.13.4.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit depend.apache eutils multilib pax-utils toolchain-funcs user versionator
+
+DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
+HOMEPAGE="http://www.icinga.org/"
+#MY_PV=$(delete_version_separator 3)
+#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
+#S=${WORKDIR}/${PN}-${MY_PV}
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}-core/archive/v${PV}/${P}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/patches/CVEs/CVE-2015-8010_1.13.3.patch"
+S="${WORKDIR}/${PN}-core-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa x86"
+IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
+DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
+	perl? ( dev-lang/perl:= )
+	virtual/mailx
+	web? (
+		media-libs/gd[jpeg,png]
+		lighttpd? ( www-servers/lighttpd )
+	)
+	!net-analyzer/nagios-core"
+RDEPEND="${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )"
+RESTRICT="test"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	enewgroup icinga
+	enewgroup nagios
+	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
+	epatch "${DISTDIR}/CVE-2015-8010_1.13.3.patch"
+}
+
+src_configure() {
+	local myconf
+
+	myconf="$(use_enable perl embedded-perl)
+	$(use_with perl perlcache)
+	$(use_enable idoutils)
+	$(use_enable ssl)
+	--with-cgiurl=/icinga/cgi-bin
+	--with-log-dir=/var/log/icinga
+	--libdir=/usr/$(get_libdir)
+	--bindir=/usr/sbin
+	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
+	--datarootdir=/usr/share/icinga/htdocs
+	--localstatedir=/var/lib/icinga
+	--sysconfdir=/etc/icinga
+	--with-lockfile=/var/run/icinga/icinga.lock
+	--with-temp-dir=/tmp/icinga
+	--with-temp-file=/tmp/icinga/icinga.tmp"
+
+	if use idoutils ; then
+		myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
+		--with-icinga-chkfile=/var/lib/icinga/icinga.chk
+		--with-ido-sockfile=/var/lib/icinga/ido.sock
+		--with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
+	fi
+
+	if use eventhandler ; then
+		myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
+	fi
+
+	if use plugins ; then
+		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
+	else
+		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
+	fi
+
+	if use !apache2 && use !lighttpd ; then
+		myconf+=" --with-command-group=icinga"
+	else
+		if use apache2 ; then
+			myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
+			myconf+=" --with-command-group=apache"
+		elif use lighttpd ; then
+			myconf+=" --with-command-group=lighttpd"
+		fi
+	fi
+
+	econf ${myconf}
+}
+
+src_compile() {
+	tc-export CC
+
+	emake icinga || die "make failed"
+
+	if use web ; then
+		emake DESTDIR="${D}" cgis || die
+	fi
+
+	if use contrib ; then
+		emake DESTDIR="${D}" -C contrib || die
+	fi
+
+	if use idoutils ; then
+		emake DESTDIR="${D}" idoutils || die
+	fi
+}
+
+src_install() {
+	dodoc Changelog README UPGRADING || die
+
+	if ! use web ; then
+		sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
+	fi
+
+	emake DESTDIR="${D}" install{,-config,-commandmode} || die
+
+	if use idoutils ; then
+		 emake DESTDIR="${D}" install-idoutils || die
+	fi
+
+	if use contrib ; then
+		emake DESTDIR="${D}" -C contrib install || die
+	fi
+
+	if use eventhandler ; then
+		emake DESTDIR="${D}" install-eventhandlers || die
+	fi
+
+	newinitd "${FILESDIR}"/icinga-init.d icinga || die
+	newconfd "${FILESDIR}"/icinga-conf.d icinga || die
+	if use idoutils ; then
+		newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
+		newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die
+		insinto /usr/share/icinga/contrib/db
+		doins -r module/idoutils/db/* || die
+	fi
+	# Apache Module
+	if use web ; then
+		if use apache2 ; then
+			insinto "${APACHE_MODULES_CONFDIR}"
+			newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die
+		elif use lighttpd ; then
+			insinto /etc/lighttpd
+			newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die
+		else
+			ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
+			ewarn "out-of-the-box. Since you are not using one of them, you"
+			ewarn "have to configure your webserver accordingly yourself."
+		fi
+		fowners -R root:root /usr/$(get_libdir)/icinga || die
+		cd "${D}" || die
+		find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
+		find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
+	fi
+
+	if use eventhandler ; then
+		dodir /etc/icinga/eventhandlers || die
+		fowners icinga:icinga /etc/icinga/eventhandlers || die
+	fi
+
+	keepdir /etc/icinga
+	keepdir /var/lib/icinga
+	keepdir /var/lib/icinga/archives
+	keepdir /var/lib/icinga/rw
+	keepdir /var/lib/icinga/spool/checkresults
+
+	if use apache2 ; then
+		webserver=apache
+	elif use lighttpd ; then
+		webserver=lighttpd
+	else
+		webserver=icinga
+	fi
+
+	fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
+	fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw"
+
+	fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw"
+	fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga"
+
+	# paxmarks
+	if use idoutils ; then
+		pax-mark m usr/sbin/ido2db
+	fi
+}
+
+pkg_postinst() {
+	if use web ; then
+		elog "This does not include cgis that are perl-dependent"
+		elog "Currently traceroute.cgi is perl-dependent"
+		elog "Note that the user your webserver is running as needs"
+		elog "read-access to /etc/icinga."
+		elog
+		if use apache2 || use lighttpd ; then
+			elog "There are several possible solutions to accomplish this,"
+			elog "choose the one you are most comfortable with:"
+			elog
+			if use apache2 ; then
+				elog "	usermod -G icinga apache"
+				elog "or"
+				elog "	chown icinga:apache /etc/icinga"
+				elog
+				elog "Also edit /etc/conf.d/apache2 and add a line like"
+				elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\""
+				elog
+				elog "Icinga web service needs user authentication. If you"
+				elog "use the base configuration, you need a password file"
+				elog "with a password for user \"icingaadmin\""
+				elog "You can create this file by executing:"
+				elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin"
+				elog
+				elog "you may want to also add apache to the icinga group"
+				elog "to allow it access to the AuthUserFile"
+				elog
+			elif use lighttpd ; then
+				elog "  usermod -G icinga lighttpd "
+				elog "or"
+				elog "  chown icinga:lighttpd /etc/icinga"
+				elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
+			fi
+			elog
+			elog "That will make icinga's web front end visable via"
+			elog "http://localhost/icinga/"
+			elog
+		else
+			elog "IMPORTANT: Do not forget to add the user your webserver"
+			elog "is running as to the icinga group!"
+		fi
+	else
+		ewarn "Please note that you have installed Icinga without web interface."
+		ewarn "Please don't file any bugs about having no web interface when you do this."
+		ewarn "Thank you!"
+	fi
+	elog
+	elog "If you want icinga to start at boot time"
+	elog "remember to execute:"
+	elog "  rc-update add icinga default"
+	elog
+	elog "If your kernel has /proc protection, icinga"
+	elog "will not be happy as it relies on accessing the proc"
+	elog "filesystem. You can fix this by adding icinga into"
+	elog "the group wheel, but this is not recomended."
+	elog
+	if [ -d "${ROOT}"/var/icinga ] ; then
+		ewarn
+		ewarn "/var/icinga was moved to /var/lib/icinga"
+		ewarn "please move the files if this was an upgrade"
+		if use idoutils ; then
+			ewarn "and edit /etc/ido2db.cfg to change the location of the files"
+			ewarn "it accesses"
+			ewarn "update your db with the scripts under the directory"
+			ewarn "/usr/share/icinga/contrib/db/"
+		fi
+		ewarn
+		ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files"
+		ewarn "remove /var/icinga afterwards to make this warning disappear"
+	fi
+}
diff --git a/net-analyzer/icinga/icinga-1.14.0.ebuild b/net-analyzer/icinga/icinga-1.14.0.ebuild
new file mode 100644
index 000000000000..f05bc0bec4ac
--- /dev/null
+++ b/net-analyzer/icinga/icinga-1.14.0.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit depend.apache eutils multilib pax-utils toolchain-funcs user versionator
+
+DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
+HOMEPAGE="http://www.icinga.org/"
+#MY_PV=$(delete_version_separator 3)
+#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
+#S=${WORKDIR}/${PN}-${MY_PV}
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}-core/archive/v${PV}/${P}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/patches/CVEs/CVE-2015-8010_1.13.3.patch"
+S="${WORKDIR}/${PN}-core-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
+DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
+	perl? ( dev-lang/perl:= )
+	virtual/mailx
+	web? (
+		media-libs/gd[jpeg,png]
+		lighttpd? ( www-servers/lighttpd )
+	)
+	!net-analyzer/nagios-core"
+RDEPEND="${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )"
+RESTRICT="test"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	enewgroup icinga
+	enewgroup nagios
+	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
+}
+
+src_configure() {
+	local myconf
+
+	myconf="$(use_enable perl embedded-perl)
+	$(use_with perl perlcache)
+	$(use_enable idoutils)
+	$(use_enable ssl)
+	--with-cgiurl=/icinga/cgi-bin
+	--with-log-dir=/var/log/icinga
+	--libdir=/usr/$(get_libdir)
+	--bindir=/usr/sbin
+	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
+	--datarootdir=/usr/share/icinga/htdocs
+	--localstatedir=/var/lib/icinga
+	--sysconfdir=/etc/icinga
+	--with-lockfile=/var/run/icinga/icinga.lock
+	--with-temp-dir=/tmp/icinga
+	--with-temp-file=/tmp/icinga/icinga.tmp"
+
+	if use idoutils ; then
+		myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
+		--with-icinga-chkfile=/var/lib/icinga/icinga.chk
+		--with-ido-sockfile=/var/lib/icinga/ido.sock
+		--with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
+	fi
+
+	if use eventhandler ; then
+		myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
+	fi
+
+	if use plugins ; then
+		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
+	else
+		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
+	fi
+
+	if use !apache2 && use !lighttpd ; then
+		myconf+=" --with-command-group=icinga"
+	else
+		if use apache2 ; then
+			myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
+			myconf+=" --with-command-group=apache"
+		elif use lighttpd ; then
+			myconf+=" --with-command-group=lighttpd"
+		fi
+	fi
+
+	econf ${myconf}
+}
+
+src_compile() {
+	tc-export CC
+
+	emake icinga || die "make failed"
+
+	if use web ; then
+		emake DESTDIR="${D}" cgis || die
+	fi
+
+	if use contrib ; then
+		emake DESTDIR="${D}" -C contrib || die
+	fi
+
+	if use idoutils ; then
+		emake DESTDIR="${D}" idoutils || die
+	fi
+}
+
+src_install() {
+	dodoc Changelog README UPGRADING || die
+
+	if ! use web ; then
+		sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
+	fi
+
+	emake DESTDIR="${D}" install{,-config,-commandmode} || die
+
+	if use idoutils ; then
+		 emake DESTDIR="${D}" install-idoutils || die
+	fi
+
+	if use contrib ; then
+		emake DESTDIR="${D}" -C contrib install || die
+	fi
+
+	if use eventhandler ; then
+		emake DESTDIR="${D}" install-eventhandlers || die
+	fi
+
+	newinitd "${FILESDIR}"/icinga-init.d icinga || die
+	newconfd "${FILESDIR}"/icinga-conf.d icinga || die
+	if use idoutils ; then
+		newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
+		newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die
+		insinto /usr/share/icinga/contrib/db
+		doins -r module/idoutils/db/* || die
+	fi
+	# Apache Module
+	if use web ; then
+		if use apache2 ; then
+			insinto "${APACHE_MODULES_CONFDIR}"
+			newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die
+		elif use lighttpd ; then
+			insinto /etc/lighttpd
+			newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die
+		else
+			ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
+			ewarn "out-of-the-box. Since you are not using one of them, you"
+			ewarn "have to configure your webserver accordingly yourself."
+		fi
+		fowners -R root:root /usr/$(get_libdir)/icinga || die
+		cd "${D}" || die
+		find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
+		find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
+	fi
+
+	if use eventhandler ; then
+		dodir /etc/icinga/eventhandlers || die
+		fowners icinga:icinga /etc/icinga/eventhandlers || die
+	fi
+
+	keepdir /etc/icinga
+	keepdir /var/lib/icinga
+	keepdir /var/lib/icinga/archives
+	keepdir /var/lib/icinga/rw
+	keepdir /var/lib/icinga/spool/checkresults
+
+	if use apache2 ; then
+		webserver=apache
+	elif use lighttpd ; then
+		webserver=lighttpd
+	else
+		webserver=icinga
+	fi
+
+	fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
+	fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw"
+
+	fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw"
+	fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga"
+
+	# paxmarks
+	if use idoutils ; then
+		pax-mark m usr/sbin/ido2db
+	fi
+}
+
+pkg_postinst() {
+	if use web ; then
+		elog "This does not include cgis that are perl-dependent"
+		elog "Currently traceroute.cgi is perl-dependent"
+		elog "Note that the user your webserver is running as needs"
+		elog "read-access to /etc/icinga."
+		elog
+		if use apache2 || use lighttpd ; then
+			elog "There are several possible solutions to accomplish this,"
+			elog "choose the one you are most comfortable with:"
+			elog
+			if use apache2 ; then
+				elog "	usermod -G icinga apache"
+				elog "or"
+				elog "	chown icinga:apache /etc/icinga"
+				elog
+				elog "Also edit /etc/conf.d/apache2 and add a line like"
+				elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\""
+				elog
+				elog "Icinga web service needs user authentication. If you"
+				elog "use the base configuration, you need a password file"
+				elog "with a password for user \"icingaadmin\""
+				elog "You can create this file by executing:"
+				elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin"
+				elog
+				elog "you may want to also add apache to the icinga group"
+				elog "to allow it access to the AuthUserFile"
+				elog
+			elif use lighttpd ; then
+				elog "  usermod -G icinga lighttpd "
+				elog "or"
+				elog "  chown icinga:lighttpd /etc/icinga"
+				elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
+			fi
+			elog
+			elog "That will make icinga's web front end visable via"
+			elog "http://localhost/icinga/"
+			elog
+		else
+			elog "IMPORTANT: Do not forget to add the user your webserver"
+			elog "is running as to the icinga group!"
+		fi
+	else
+		ewarn "Please note that you have installed Icinga without web interface."
+		ewarn "Please don't file any bugs about having no web interface when you do this."
+		ewarn "Thank you!"
+	fi
+	elog
+	elog "If you want icinga to start at boot time"
+	elog "remember to execute:"
+	elog "  rc-update add icinga default"
+	elog
+	elog "If your kernel has /proc protection, icinga"
+	elog "will not be happy as it relies on accessing the proc"
+	elog "filesystem. You can fix this by adding icinga into"
+	elog "the group wheel, but this is not recomended."
+	elog
+	if [ -d "${ROOT}"/var/icinga ] ; then
+		ewarn
+		ewarn "/var/icinga was moved to /var/lib/icinga"
+		ewarn "please move the files if this was an upgrade"
+		if use idoutils ; then
+			ewarn "and edit /etc/ido2db.cfg to change the location of the files"
+			ewarn "it accesses"
+			ewarn "update your db with the scripts under the directory"
+			ewarn "/usr/share/icinga/contrib/db/"
+		fi
+		ewarn
+		ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files"
+		ewarn "remove /var/icinga afterwards to make this warning disappear"
+	fi
+}
diff --git a/net-analyzer/icinga/metadata.xml b/net-analyzer/icinga/metadata.xml
new file mode 100644
index 000000000000..958f95e0f18f
--- /dev/null
+++ b/net-analyzer/icinga/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription lang="en">A rebuild of nagios from the ground up</longdescription>
+	<use>
+		<flag name="contrib">additional scripts</flag>
+		<flag name="idoutils">Adds DB support</flag>
+		<flag name="lighttpd">Adds Lighttpd support</flag>
+		<flag name="plugins">Adds support for nagios plugins</flag>
+		<flag name="web">Adds generic web interface support</flag>
+		<flag name="eventhandler">Adds support for running custom scripts whenever a host or service state change occurs</flag>
+	</use>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">icinga/icinga-core</remote-id>
+		<remote-id type="sourceforge">icinga</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
new file mode 100644
index 000000000000..7328cef9934d
--- /dev/null
+++ b/net-analyzer/icinga2/Manifest
@@ -0,0 +1,11 @@
+AUX fix-missing-include-2.7.1-2.patch 680 SHA256 5aec7b797e39561fa523e069ed6225b28a40e5b7e3afc4cee0d1afbeb2d4288b SHA512 4d1fc39182029c4eb191298dcf4a39b0c5f2f806f8f2e0c6a1f98c64dd76d9181ca3b7090a73e63e66787c71cb337c76be3eae365d784903e79929ff0e644556 WHIRLPOOL 20aa072103e0f5b27d135897796bbbc3063fe3b7167fb830658bd2f6e51799ff0aa5aa4e2ed89e1668c91942c0e0bbef4a022b9836489b0e63efc612217fdb09
+AUX fix-missing-include-2.7.1.patch 597 SHA256 9616dc5c074379b5dbb4aabdb96a1b1e989ea360233ef4268b060d9e704d5dc2 SHA512 8d889b62d058cdbf318b47252abbb6a7a17e4463376868b94efb9fe875f386093dfa39026226c46a280486520c2e2fe136828810aad5fa2f7aebedc6ca8ee466 WHIRLPOOL 6b9fa0faa7d74d6bb796f3ff1c45738bfb49d0857b3d6e23b880a190b359f719c1d00aac7221d732cd0863f1c7cedcd8f4944548fb6929c5cd8b1f6786253bdc
+AUX icinga2.initd 2276 SHA256 13a2603c0ba54aa095e17cb31489b9e30a4c9d0262c6b053d8dfd710b6784d8b SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082 WHIRLPOOL a78ca106fab9e3f9689abc6723656e49368ff499021f5fbdbede04a6933e54a252567c615d40c007f7311c9dd464632af2a6503866303fe45ad619d0479d8968
+DIST icinga2-2.7.0.tar.gz 2435398 SHA256 8f06d23e5d922ba7a74f92dbb9af792be063d06d3aea9011aba39370935c6980 SHA512 470dd4ffa4ef608a018ede5c25b41f16213bf18c679eed8aaeed155fe6adc74a70abcc2e8be42ca20bf60f9b4b620c971ebbc96d608de2a90e480d72b93111bb WHIRLPOOL c926086c296affaafc7d55471ea5c1414b2d2cb8545657215a53bb9744c3147c32f8398317ad670e0d12fb95c83b54f0712f061e5e93bab868c4f04d833c3b47
+DIST icinga2-2.7.1.tar.gz 2475348 SHA256 79f2cd2cba66b2d2a785d37cccd4a47611f7b0b7d52b9a625a22f0c7ff12f7f0 SHA512 8233c33b7191706569a236d583fff689b35eba750fca01a06cfd14ef636b01314b6b142d78777987bd08a9df1cc53f42652fd1c900532b73f0a0363aa220c6cd WHIRLPOOL be07801033b8e10d3a4aaa26e9cd6b75663aed4cf513f8d592b05ea13e0626ab3021d5a52ebeedfa754752057a1d3378fd54c1f8fd1ec5dc72338c891d6b9785
+EBUILD icinga2-2.7.0-r1.ebuild 4648 SHA256 33c144d265f50ac1e01216c28558a2cb45b8a14436d1af1d5e55b397ef40194f SHA512 aa2c2ac86a697c75a4ef4c14a8ae1f57164d7614e06082aadbed2b43bcd8762938ac8afd9beb64c982bfb4e29dc5d08b530987248132e218247b8c930195837f WHIRLPOOL a9d22e681fe0163b4e31cdf19a899f5915b87a296ffa5efbdbb3aba4d4fdbea7f97ee101eb757b91cd2d53ed6a517539295901750cf6f3c294b0e6535d113ffc
+EBUILD icinga2-2.7.1-r1.ebuild 4760 SHA256 358c5155e922cd954ebbd4c14af4af549c6fe919f857db05dc62170b917111e6 SHA512 87fa97f3731c5c5c4e6801fd40d2a235fd43039ecf2ab78f969cea26c8115a20dc42d4499a9bfe987335131ceb053e6f7994db806466d932a9fe54119e34c734 WHIRLPOOL 94317744d6fd00389d7c4f7b10607f58114a8f6e6e0aef7d538c14cc7bc8de90cd439b5c9476bc285a020c6b9627130864090d08c053d1078d916fb2a384f3d0
+EBUILD icinga2-9999.ebuild 4628 SHA256 94fc1cc4ed70df5bb57236104943f875060c81f365da3fdf03ff64db90566e91 SHA512 45ba99e9812faf3859a9c7ec4e48c60a25536874d0e9e767fc68f66b70eba7cf5abb2119fd95bb452c11aa40c23ea390d1921700499671924c6b605d18351ee1 WHIRLPOOL 7028d665f67c1c5d107af412d6a6d52710939a1299cbd48c02c698e530c82d3791da7db529758aad6af20ebe0e015f4a055f1bbbcffc5da9b788c9be4a0736ad
+MISC ChangeLog 12523 SHA256 6b33c1cd3ef131f9444c216ae86700732bf8d9c571ab558db1157b4d21c5abdf SHA512 5bd2ff47e0bf2714f6bdaf4339a3a7ed95a59b528bf25680831236be63d753603cc8e60de6ff7826c69e20154ba650c7c2b27a0775ac7f118b833a1d048c56f9 WHIRLPOOL 8858e1686faa46a57c300161254950d2332a632bf857e6394e3818ada73e40802a458a2ad61acd5715df35c94f8cd54df054486d1482b432eb798f0a41bf8d4f
+MISC ChangeLog-2015 6716 SHA256 319e8121e497e7d44d8f115750f68283a6605b9a6ff1f0ade569b8b660a21e67 SHA512 e1618c3469eba79ff34786b5e357add06044f61154070cc726951eed6609f3e458656f61a1daed11caf42b13aaf7a91eced1924a1ad7491c4a12e91e50e39d10 WHIRLPOOL b715c79bc75d0613a864a7338e869bbd7fa6cab0e65e36e5c32e8124f2f4159ec45837195c5e2ca285249fd518ff04db10063065353a30ae49b4868a04f2d8c0
+MISC metadata.xml 816 SHA256 1936f6fa03ebee51be39b5ab1499db12128d6d161b66c217886bd0ac0beb3e0e SHA512 0d3ac2d9233f7ce53a8105caed0231cefa402861e26c760de3fb23163ea68c21b97f5ec0de65bc6953aaf2dd8fa90a9edc045a2fea8b622efdd1336959e9e60b WHIRLPOOL 118b4a5b65cd2fe6794f2e3ac5e052f4e4077bdb08a796d31a4b4dc5a3683b36429611ab1ce5941aeba36fd838b51b0e88d38523c9d32e7f49e060d8fb3f7211
diff --git a/net-analyzer/icinga2/files/fix-missing-include-2.7.1-2.patch b/net-analyzer/icinga2/files/fix-missing-include-2.7.1-2.patch
new file mode 100644
index 000000000000..21779d140a4e
--- /dev/null
+++ b/net-analyzer/icinga2/files/fix-missing-include-2.7.1-2.patch
@@ -0,0 +1,24 @@
+From 2d036e6886fb68707e861a6e5f75a6088d149832 Mon Sep 17 00:00:00 2001
+From: Michael <mcktr55@gmail.com>
+Date: Tue, 26 Sep 2017 22:01:07 +0200
+Subject: [PATCH] Fixed missing include statement in unit test
+
+This adds the missing iostream include to the notification unit test.
+
+refs #5613
+---
+ test/icinga-notification.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/icinga-notification.cpp b/test/icinga-notification.cpp
+index 8db93fa50..97f7838a1 100644
+--- a/test/icinga-notification.cpp
++++ b/test/icinga-notification.cpp
+@@ -19,6 +19,7 @@
+ 
+ #include "icinga/notification.hpp"
+ #include <BoostTestTargetConfig.h>
++#include <iostream>
+ 
+ using namespace icinga;
+ 
diff --git a/net-analyzer/icinga2/files/fix-missing-include-2.7.1.patch b/net-analyzer/icinga2/files/fix-missing-include-2.7.1.patch
new file mode 100644
index 000000000000..d170db478db9
--- /dev/null
+++ b/net-analyzer/icinga2/files/fix-missing-include-2.7.1.patch
@@ -0,0 +1,22 @@
+From 631d1e85fc2575a26c700a15f309fccd9fb9ee4d Mon Sep 17 00:00:00 2001
+From: Michael <mcktr55@gmail.com>
+Date: Mon, 25 Sep 2017 01:07:50 +0200
+Subject: [PATCH] Fixed missing include statement in unit tests
+
+refs #5613
+---
+ test/icinga-checkresult.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/icinga-checkresult.cpp b/test/icinga-checkresult.cpp
+index 7f14dd365..a128e9519 100644
+--- a/test/icinga-checkresult.cpp
++++ b/test/icinga-checkresult.cpp
+@@ -19,6 +19,7 @@
+ 
+ #include "icinga/host.hpp"
+ #include <BoostTestTargetConfig.h>
++#include <iostream>
+ 
+ using namespace icinga;
+ 
diff --git a/net-analyzer/icinga2/files/icinga2.initd b/net-analyzer/icinga2/files/icinga2.initd
new file mode 100644
index 000000000000..7faff11137d4
--- /dev/null
+++ b/net-analyzer/icinga2/files/icinga2.initd
@@ -0,0 +1,81 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+
+DAEMON="/usr/sbin/icinga2"
+ICINGA2_CONFIG_FILE="/etc/icinga2/icinga2.conf"
+ICINGA2_RUN_DIR="/run/icinga2"
+ICINGA2_STATE_DIR="/var/cache/icinga2"
+ICINGA2_CMD_DIR="${ICINGA2_RUN_DIR}/cmd"
+ICINGA2_PID_FILE="${ICINGA2_RUN_DIR}/icinga2.pid"
+ICINGA2_DAEMON_ARGS="daemon -c $ICINGA2_CONFIG_FILE -e $ICINGA2_ERROR_LOG -d"
+
+depend() {
+    need net
+}
+
+checkconfig() {
+    if [ ! -e "$ICINGA2_CONFIG_FILE" ]; then
+       ewarn "Config file '$ICINGA2_CONFIG_FILE' does not exist."
+       eend 1
+    fi
+
+    ICINGA2_USER=$($DAEMON variable get --current RunAsUser)
+    if [ $? != 0 ]; then
+        eerror "Could not fetch RunAsUser variable: '$ICINGA2_USER'."
+        return 1
+    fi
+    ICINGA2_GROUP=$($DAEMON variable get --current RunAsGroup)
+    if [ $? != 0 ]; then
+        eerror "Could not fetch RunAsGroup variable: '$ICINGA2_GROUP'."
+        return 1
+    fi
+
+    checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_RUN_DIR
+    checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_STATE_DIR
+    checkpath -d -m 2750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_CMD_DIR
+
+    if ! $DAEMON daemon -c $ICINGA2_CONFIG_FILE -C > $ICINGA2_STARTUP_LOG 2>&1; then
+        eerror "Icinga2 detected configuration errors. Check '$ICINGA2_STARTUP_LOG' for details."
+        return 1
+    fi
+}
+
+start() {
+    checkconfig || return 1
+
+    ebegin "Starting icinga2"
+    start-stop-daemon --start --exec "${DAEMON}" \
+        --pidfile "${ICINGA2_PID_FILE}" \
+        -- $ICINGA2_DAEMON_ARGS > $ICINGA2_STARTUP_LOG 2>&1
+    local retval=$?
+    if [ $retval -ne 0 ]; then
+        ewarn "Error starting icinga2. '$ICINGA2_STARTUP_LOG' for details."
+    fi
+    eend $retval
+}
+
+stop() {
+    ebegin "Stopping icinga2"
+    start-stop-daemon \
+        --stop \
+        --pidfile $ICINGA2_PID_FILE \
+        --retry "SIGTERM/15 SIGKILL/30" \
+        --progress
+    eend $?
+}
+
+reload() {
+    checkconfig || return 1
+
+    ebegin "Reloading icinga2"
+    start-stop-daemon --signal HUP --pidfile "$ICINGA2_PID_FILE"
+
+    local retval=$?
+    if [ $retval -ne 0 ]; then
+        ewarn "Error reloading icinga2."
+    fi
+    eend $retval
+}
diff --git a/net-analyzer/icinga2/icinga2-2.7.0-r1.ebuild b/net-analyzer/icinga2/icinga2-2.7.0-r1.ebuild
new file mode 100644
index 000000000000..8e9f5f4f36c8
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.7.0-r1.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} != 9999 ]]; then
+	inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets
+	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+else
+	inherit cmake-utils depend.apache eutils git-2 systemd toolchain-funcs user wxwidgets
+	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
+	EGIT_BRANCH="master"
+	KEYWORDS="~ppc ~ppc64"
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax"
+WX_GTK_VER="3.0"
+
+CDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=dev-libs/boost-1.58-r1
+	console? ( dev-libs/libedit )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+DEPEND="
+	${CDEPEND}
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35"
+
+RDEPEND="
+	${CDEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	mail? ( virtual/mailx )
+	classicui? ( net-analyzer/icinga[web] )
+	studio? ( x11-libs/wxGTK:3.0 )"
+
+REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	if use studio ; then
+		setup-wxwidgets
+	fi
+	enewgroup icinga
+	enewgroup icingacmd
+	enewgroup nagios  # for plugins
+	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_configure() {
+	sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
+	local mycmakeargs=(
+		-DICINGA2_UNITY_BUILD=FALSE
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+		-DICINGA2_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+		-DLOGROTATE_HAS_SU=ON
+	)
+	# default to off if minimal, allow the flags to be set otherwise
+	if use minimal; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
+			-DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
+		)
+	fi
+	# LTO
+	if use lto; then
+		mycmakeargs+=(
+			-DICINGA2_LTO_BUILD=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_LTO_BUILD=OFF
+		)
+	fi
+	# STUDIO
+	if use studio; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=OFF
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+	cd "${BUILDDIR}" || die
+
+	emake DESTDIR="${D}" install
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/icinga2.initd icinga2
+
+	if use mysql ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	elif use postgres ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+	fi
+
+	keepdir /etc/icinga2
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	keepdir /var/lib/icinga2/api/log
+	keepdir /var/spool/icinga2/perfdata
+
+	rm -r "${D}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners root:icinga /etc/icinga2
+	fperms 0750 /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners icinga:icinga /var/spool/icinga2
+	fowners -R icinga:icingacmd /var/lib/icinga2/api
+	fowners icinga:icinga /var/spool/icinga2/perfdata
+	fowners icinga:icingacmd /var/log/icinga2
+
+	fperms ug+rwX,o-rwx /etc/icinga2
+	fperms ug+rwX,o-rwx /var/lib/icinga2
+	fperms ug+rwX,o-rwx /var/spool/icinga2
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
+	fi
+}
diff --git a/net-analyzer/icinga2/icinga2-2.7.1-r1.ebuild b/net-analyzer/icinga2/icinga2-2.7.1-r1.ebuild
new file mode 100644
index 000000000000..2f4dc84145d7
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.7.1-r1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} != 9999 ]]; then
+	inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets
+	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+else
+	inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets
+	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
+	EGIT_BRANCH="master"
+	KEYWORDS="~ppc ~ppc64"
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax"
+WX_GTK_VER="3.0"
+
+CDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=dev-libs/boost-1.58-r1
+	console? ( dev-libs/libedit )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+DEPEND="
+	${CDEPEND}
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35"
+
+RDEPEND="
+	${CDEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	mail? ( virtual/mailx )
+	classicui? ( net-analyzer/icinga[web] )
+	studio? ( x11-libs/wxGTK:3.0 )"
+
+REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
+
+PATCHES=(
+	"${FILESDIR}/fix-missing-include-2.7.1.patch"
+	"${FILESDIR}/fix-missing-include-2.7.1-2.patch"
+)
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	if use studio ; then
+		setup-wxwidgets
+	fi
+	enewgroup icinga
+	enewgroup icingacmd
+	enewgroup nagios  # for plugins
+	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_configure() {
+	sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
+	local mycmakeargs=(
+		-DICINGA2_UNITY_BUILD=FALSE
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+		-DICINGA2_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+		-DLOGROTATE_HAS_SU=ON
+	)
+	# default to off if minimal, allow the flags to be set otherwise
+	if use minimal; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
+			-DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
+		)
+	fi
+	# LTO
+	if use lto; then
+		mycmakeargs+=(
+			-DICINGA2_LTO_BUILD=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_LTO_BUILD=OFF
+		)
+	fi
+	# STUDIO
+	if use studio; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=OFF
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+	cd "${BUILDDIR}" || die
+
+	emake DESTDIR="${D}" install
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/icinga2.initd icinga2
+
+	if use mysql ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	elif use postgres ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+	fi
+
+	keepdir /etc/icinga2
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	keepdir /var/lib/icinga2/api/log
+	keepdir /var/spool/icinga2/perfdata
+
+	rm -r "${D}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners root:icinga /etc/icinga2
+	fperms 0750 /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners icinga:icinga /var/spool/icinga2
+	fowners -R icinga:icingacmd /var/lib/icinga2/api
+	fowners icinga:icinga /var/spool/icinga2/perfdata
+	fowners icinga:icingacmd /var/log/icinga2
+
+	fperms ug+rwX,o-rwx /etc/icinga2
+	fperms ug+rwX,o-rwx /var/lib/icinga2
+	fperms ug+rwX,o-rwx /var/spool/icinga2
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
+	fi
+}
diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
new file mode 100644
index 000000000000..32561101621d
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+if [[ ${PV} != 9999 ]]; then
+	inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets
+	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+else
+	inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets
+	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
+	EGIT_BRANCH="master"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax"
+WX_GTK_VER="3.0"
+
+CDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=dev-libs/boost-1.58-r1
+	console? ( dev-libs/libedit )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+DEPEND="
+	${CDEPEND}
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35"
+
+RDEPEND="
+	${CDEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	mail? ( virtual/mailx )
+	classicui? ( net-analyzer/icinga[web] )
+	studio? ( x11-libs/wxGTK:3.0 )"
+
+REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	if use studio ; then
+		setup-wxwidgets
+	fi
+	enewgroup icinga
+	enewgroup icingacmd
+	enewgroup nagios  # for plugins
+	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_configure() {
+	sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
+	local mycmakeargs=(
+		-DICINGA2_UNITY_BUILD=FALSE
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+		-DICINGA2_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+		-DLOGROTATE_HAS_SU=ON
+	)
+	# default to off if minimal, allow the flags to be set otherwise
+	if use minimal; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
+			-DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
+		)
+	fi
+	# LTO
+	if use lto; then
+		mycmakeargs+=(
+			-DICINGA2_LTO_BUILD=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_LTO_BUILD=OFF
+		)
+	fi
+	# STUDIO
+	if use studio; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_STUDIO=OFF
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+	cd "${BUILDDIR}" || die
+
+	emake DESTDIR="${D}" install
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/icinga2.initd icinga2
+
+	if use mysql ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	elif use postgres ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+	fi
+
+	keepdir /etc/icinga2
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	keepdir /var/lib/icinga2/api/log
+	keepdir /var/spool/icinga2/perfdata
+
+	rm -r "${D}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners root:icinga /etc/icinga2
+	fperms 0750 /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners icinga:icinga /var/spool/icinga2
+	fowners -R icinga:icingacmd /var/lib/icinga2/api
+	fowners icinga:icinga /var/spool/icinga2/perfdata
+	fowners icinga:icingacmd /var/log/icinga2
+
+	fperms ug+rwX,o-rwx /etc/icinga2
+	fperms ug+rwX,o-rwx /var/lib/icinga2
+	fperms ug+rwX,o-rwx /var/spool/icinga2
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
+	fi
+}
diff --git a/net-analyzer/icinga2/metadata.xml b/net-analyzer/icinga2/metadata.xml
new file mode 100644
index 000000000000..b03390bc2e50
--- /dev/null
+++ b/net-analyzer/icinga2/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<use>
+		<flag name="classicui">Adds support for the old interface</flag>
+		<flag name="console">Adds support for line-editing in the console</flag>
+		<flag name="lto">Adds support for link time optimization</flag>
+		<flag name="mail">Allows for mailing of alerts</flag>
+		<flag name="studio">Adds support for Icinga-studio</flag>
+		<flag name="nano-syntax">Adds support for syntax used in the nano editor</flag>
+		<flag name="plugins">Adds support for nagios plugins</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">Icinga/icinga2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/ifmetric/Manifest b/net-analyzer/ifmetric/Manifest
new file mode 100644
index 000000000000..8ae1d0273a39
--- /dev/null
+++ b/net-analyzer/ifmetric/Manifest
@@ -0,0 +1,7 @@
+AUX ifmetric-0.3-replybuf.patch 300 SHA256 e5c9d6cb94bedce4f76f05e3cb4d5d0a2e23f05633b072b8ea22db3b2bc254b0 SHA512 9f7695db98234418b3479bee84f04d27dbcc054d96c5f1689a0e321fca25df970113a62a8922a796a333adab769665ab962573cfa9e49b6f999d74918c27900b WHIRLPOOL d88b3c7122c7ea2f2d69e603ac879eb16aec753fb8b9d54252e84fe0c30ba732b5f04f4ce2f3b068b123283f5c21c6a94b62631142ae27e86477c650c87ab5af
+AUX ifmetric-0.3-ul.patch 515 SHA256 3d53ff30e55930915623b04ee48e4bbd1caeb91483c2fde92a8ef4f1f6dd5345 SHA512 1129d0131dcdf33e01c624ec40349be024f27ecab0bcba184325bac3f8be3023e8a0cbcaaf999080277df050af0f7c4953505573a9054b7b3eb29161bc506847 WHIRLPOOL 12ba4ee4d84d44ae00aaad2ad61b611b552516a261b29c476c6aa07dc298bb9ccc9afd0b39c923b792ead351a8a5a5b233dd38c3f7bc1494bcf319ebee9cc800
+DIST ifmetric-0.3.tar.gz 81502 SHA256 0fa8510a4e34e555f136f9df81d26618313f2d69a4880c0fb5967f19502f1aec SHA512 301d6bc1c97a59597fe55d81a04c1b654aee24d12ac10201ab56cf23b5164808270f15c142cc49142787db70b400cc18b96561aefcf212111ba47df28f07aa95 WHIRLPOOL 66e79bed3ed472d4fddd46a96d4fa60c4cb733481a610fa442aa686fbd9c5d1f3726e3bff9aafed7e5617007e829d096c5a001740c0cb687e4231a46a8854adf
+EBUILD ifmetric-0.3-r2.ebuild 610 SHA256 bb12bfc5e69d072d9ca0475dece69c2b973e88f550c4ba94b8a20b1f8bc07484 SHA512 429a3c19b607c9163cfb5252ff84631f8e6465d3a5bd90065eb47770eb14b950efbd464c9f9f1cc2ca428879bf55744381cb48e316f7fd49c4e1192c8151187d WHIRLPOOL 4dbb6c618629d60dd33a47a6f047f3f00d75f2c4964f6ade58f54a4a1ac54856c519bb5385103c1b9b0366ec62f05451c39a67799aa51f16f1310471f61658ef
+MISC ChangeLog 3033 SHA256 501315e7f092cb5cb28216a45c6bf6218cd8fb3674bc5fcc41e3d52586cf28ca SHA512 98c46ac52b79446be9c7badfdf9757d32b7278f8a33e9028419883da66b624903015d5c3aa5c6e748e04119ebca93abebd459c1d59741488a6f966ef7451cabb WHIRLPOOL b18d59ccf2f9339f2e59d6a2623ec8e27706a36100b90fe5c68f1e562fbbc75b9d74cf62c1bd9a3f05f2dc7d3fcc2cd80b6dcf864c7567aa696be4c06710daba
+MISC ChangeLog-2015 1411 SHA256 4f679ccaed3e70d96d55e01683c82dcc9f1ed150ab4ddcbba69a410f636ab942 SHA512 b74131a1693aec6419cf8d8a01c2160948f4f7ad0e8ecb209413c17050df5739bcc15565db51642bdeb41338e1b36746a446f3a77ce21665e4da239b1f244be1 WHIRLPOOL f6f8b2dc9a6f38a27a09658f6ec6cc4af9f9e0a45b9c97eb754efe268d3a69f3ba060a30ec8e9487f9e350f0576dce8d6219ad84bd24cb456857dc112fdcf098
+MISC metadata.xml 280 SHA256 b04c5b9d91f6c4d6e36583488fd032751034d1e035085609c9bdf7677cf1e83f SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef WHIRLPOOL 6f3756b9ac748acccb6ac5a4de133cf93988e8c904f606376fecbb6a21ce038e86437fecca43b2521538da2570d33ff1a6a1e0cab290a3d71a9b4f2734f16328
diff --git a/net-analyzer/ifmetric/files/ifmetric-0.3-replybuf.patch b/net-analyzer/ifmetric/files/ifmetric-0.3-replybuf.patch
new file mode 100644
index 000000000000..883ce2b31215
--- /dev/null
+++ b/net-analyzer/ifmetric/files/ifmetric-0.3-replybuf.patch
@@ -0,0 +1,11 @@
+--- a/src/nlrequest.c
++++ b/src/nlrequest.c
+@@ -44,7 +44,7 @@
+ 
+     for (;;) {
+         int bytes;
+-        char replybuf[2048];
++        char replybuf[4096];
+         struct nlmsghdr *p = (struct nlmsghdr *) replybuf;
+         
+         if ((bytes = recv(s, &replybuf, sizeof(replybuf), 0)) < 0) {
diff --git a/net-analyzer/ifmetric/files/ifmetric-0.3-ul.patch b/net-analyzer/ifmetric/files/ifmetric-0.3-ul.patch
new file mode 100644
index 000000000000..eb432dc29c0e
--- /dev/null
+++ b/net-analyzer/ifmetric/files/ifmetric-0.3-ul.patch
@@ -0,0 +1,11 @@
+--- a/src/nlrequest.c
++++ b/src/nlrequest.c
+@@ -56,7 +56,7 @@
+             int ret;
+             
+             if (!NLMSG_OK(p, bytes) || bytes < sizeof(struct nlmsghdr) || bytes < p->nlmsg_len) {
+-                fprintf(stderr, "NETLINK: Packet too small or truncated! %u!=%u!=%u\n", bytes, sizeof(struct nlmsghdr), p->nlmsg_len);
++                fprintf(stderr, "NETLINK: Packet too small or truncated! %u!=%lu!=%u\n", bytes, sizeof(struct nlmsghdr), p->nlmsg_len);
+                 return -1;
+             }
+ 
diff --git a/net-analyzer/ifmetric/ifmetric-0.3-r2.ebuild b/net-analyzer/ifmetric/ifmetric-0.3-r2.ebuild
new file mode 100644
index 000000000000..ade8bba29931
--- /dev/null
+++ b/net-analyzer/ifmetric/ifmetric-0.3-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Set metrics of all IPv4 routes attached to a given network interface at once"
+HOMEPAGE="http://0pointer.de/lennart/projects/ifmetric/"
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+
+DEPEND="sys-kernel/linux-headers"
+
+DOCS=(
+	README
+	doc/README.html
+)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-ul.patch
+	"${FILESDIR}"/${P}-replybuf.patch
+)
+
+src_configure() {
+	# man page and HTML are already generated
+	econf \
+		--disable-xmltoman \
+		--disable-lynx
+}
diff --git a/net-analyzer/ifmetric/metadata.xml b/net-analyzer/ifmetric/metadata.xml
new file mode 100644
index 000000000000..2c2a7923cfc8
--- /dev/null
+++ b/net-analyzer/ifmetric/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/ifstat/Manifest b/net-analyzer/ifstat/Manifest
new file mode 100644
index 000000000000..3ef83e89c4e8
--- /dev/null
+++ b/net-analyzer/ifstat/Manifest
@@ -0,0 +1,7 @@
+AUX ifstat-1.1-hardened.patch 416 SHA256 22b1bdf05e08fdb5eef02cadb7a24cb6151b51a81c79e23e0185f47004c397e4 SHA512 64ff9119a6c492f0d011fcc0868425479b4b9bb8520b4f5e8323b106b9be555e763a9e73ef1e6833f652ebb51d048611d3504b26a94adebf5e21cd695c4417fc WHIRLPOOL c38c62cd68d53f454d6a2eea45b6be2c7428b4f41a6421910075b9a2041a444a33953f56d5ce06527abc16249ca1e7372d71d08a32bdedcdc5deaa762c5ddce4
+AUX ifstat-1.1-make.patch 4110 SHA256 39f9ed8be68feb08c62ca9f8aa435db1fa464b769b527f55b7d038cea4779cee SHA512 28b292b00b465a44344556c8f96bb237a0185ac176f0bea2374a0d6c03bc834997450c0c152a00a469f2a6837c3f60aa66cc85615d50cb5aeec1a379e155775a WHIRLPOOL 095572614e353fa647cf2f532f7c784f4241e2c307f3852e6ee7d443b79e06f56f2c619d67f68d0b2d2bc21a25a1121e26741529649b4bdb81d74ed2805dce23
+DIST ifstat-1.1.tar.gz 67920 SHA256 8599063b7c398f9cfef7a9ec699659b25b1c14d2bc0f535aed05ce32b7d9f507 SHA512 b1aef8e7b14cbf265e2d42277478fd12a565287f90f37b0a826ba3e7d29640df757c7d56f149e406bf5890663ed734b2c658c4f1e2b258ded3649f2fc3e9ac64 WHIRLPOOL 9db65eafd8306e0059dd08c34db4eb17dfcef1b32dd7b3bbad21501afc8aedf40a694367fde98d5204d4dcae4f915bb1f2f4301bc3eec3326c80e031097492ba
+EBUILD ifstat-1.1-r2.ebuild 678 SHA256 2a69c264a5368b3992925a6d0daf230f89b87f6e999ddecb5195541926ebd40c SHA512 e9ce902a81a8f5d713f698578affa6afae32597b909111565dc4d4ab0536b53aac6960180f1f8154323551d988b3744c1819a5a3d67f9ec9e0d0358412146935 WHIRLPOOL bf89f4c0a620f4c62ce1b7c811d10cd9afbfa9d7b9bb263d2038c5777631b79186d7de309234d40c831906afd612959e982451aad4e531f1cf6cfb4a215559a7
+MISC ChangeLog 2496 SHA256 84740446b41dd04c248213d1513da224d764649978052c1b3568a7248fe18206 SHA512 8edd06919c754d0304878f418cbc226e15663edf3ceb59c9ae7000b80550e70be681bbb5a7366511e5913d577e8eb8b1e4dfa5057b10cc9bb390f4855dc6767f WHIRLPOOL c8cef553cd00e1743a6da6775bbc3688647281cad3b38290f7fab587a15b8864474ee3014405bdff08295cde8de452a7504f620f68c5bfb716fc2e67889df719
+MISC ChangeLog-2015 4168 SHA256 de045499cec921fbe2a951ecbcc89b4f27946c44c564e7254107bf33e67de4f9 SHA512 ab64dfa069cf8e624606b03d349ce3864a0ee636ce278e6dbfc91b0e30806d3ae188c2ad63255fa75cbbea9f087aec292da616cfd2e5dbbc663e8b3a58a47d42 WHIRLPOOL 9d8d21b4c7c7d357d880b66d445b61f30f5881426e17dd8d1aa23811110a4610d4a7afddbf1068cda1c4657734948c54512605c0520ae0b8d582e10e826f30af
+MISC metadata.xml 491 SHA256 6d8332e02c852cbf52096a4d0137d1ebebdf1c78f8c4dd76934fe2901974a35d SHA512 8635cf579260c356913a3905758c92a7ae05edb211add2031311f2a2b1970da2bf02657c7071960ed7a5162124937a9f727050a609120847c88b5392a4a7a3e7 WHIRLPOOL 5a666a6c13afc4c1e848e0adf8850457b9e78fdd2501db40b85d36c8e6eceb70a6056e8c61309f4d62fc1fd287e048d5ff80ab55749771e685f191553cfbfca8
diff --git a/net-analyzer/ifstat/files/ifstat-1.1-hardened.patch b/net-analyzer/ifstat/files/ifstat-1.1-hardened.patch
new file mode 100644
index 000000000000..10c377ac7678
--- /dev/null
+++ b/net-analyzer/ifstat/files/ifstat-1.1-hardened.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -58,7 +58,7 @@
+      /*) file=$with_proc; with_proc=yes ;;
+      *) file=/proc/net/dev
+   AC_MSG_CHECKING([for proc interface in $file])
+-  if grep -q Inter- $file 2>/dev/null; then
++  if true; then
+     AC_DEFINE([USE_PROC], 1, [Define if you want to use /proc to get stats])
+     AC_DEFINE_UNQUOTED([PROC_FILE], ["$file"], [Proc file to poll for stats])
+     with_proc=yes
diff --git a/net-analyzer/ifstat/files/ifstat-1.1-make.patch b/net-analyzer/ifstat/files/ifstat-1.1-make.patch
new file mode 100644
index 000000000000..62feb8b0005a
--- /dev/null
+++ b/net-analyzer/ifstat/files/ifstat-1.1-make.patch
@@ -0,0 +1,122 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -65,14 +65,14 @@
+ install: install-$(TARGET) install-@LIBTARGET@
+ 
+ install-$(TARGET): $(TARGET)
+-	$(INSTALL) -d -m 755 $(bindir)
+-	$(INSTALL) -s -m 755 $(TARGET) $(bindir)/$(TARGET)
+-	$(INSTALL) -d -m 755 $(mandir)/man1
+-	$(INSTALL) -m 644 ifstat.1 $(mandir)/man1/ifstat.1
++	$(INSTALL) -d -m 755 $(DESTDIR)/$(bindir)
++	$(INSTALL) -m 755 $(TARGET) $(DESTDIR)/$(bindir)/$(TARGET)
++	$(INSTALL) -d -m 755 $(DESTDIR)/$(mandir)/man1
++	$(INSTALL) -m 644 ifstat.1 $(DESTDIR)/$(mandir)/man1/ifstat.1
+ 
+ install-$(LIBTARGET): $(LIBTARGET) libifstat-config
+-	$(INSTALL) -d -m 755 $(bindir)
+-	$(INSTALL) -m 755 libifstat-config $(bindir)/libifstat-config
++	$(INSTALL) -d -m 755 $(DESTDIR)/$(bindir)
++	$(INSTALL) -m 755 libifstat-config $(DESTDIR)/$(bindir)/libifstat-config
+ 	$(INSTALL) -d -m 755 $(includedir)
+ 	$(INSTALL) -m 644 ifstat.h $(includedir)/ifstat.h
+ 	$(INSTALL) -d -m 755 $(libdir)
+--- a/configure.in
++++ b/configure.in
+@@ -55,9 +55,8 @@
+ # checking for proc (Linux)
+ if test "x$with_proc" != "xno"; then
+   case "$with_proc" in
+-     /*) file=$with_proc ;;
+-     *) file=/proc/net/dev ;;
+-  esac
++     /*) file=$with_proc; with_proc=yes ;;
++     *) file=/proc/net/dev
+   AC_MSG_CHECKING([for proc interface in $file])
+   if grep -q Inter- $file 2>/dev/null; then
+     AC_DEFINE([USE_PROC], 1, [Define if you want to use /proc to get stats])
+@@ -69,6 +68,8 @@
+     with_proc=no
+   fi
+   AC_MSG_RESULT([$with_proc])
++        ;;
++  esac
+ fi
+ 
+ # checking for kstat (Solaris)
+@@ -393,7 +394,7 @@
+                 [snmp_ok=yes], [snmp_ok=no])
+     AC_MSG_RESULT([$snmp_ok])
+     if test "x$snmp_ok" = "xyes"; then
+-      with_snmp=yes
++      use_snmp=yes
+       snmp_type=net
+     else
+       CPPFLAGS="$OCPPFLAGS"
+@@ -402,22 +403,22 @@
+   fi
+ 
+   if test "x$snmp_ok" != "xyes"; then
+-    if test "x$with_snmp" != "xyes" ; then
++    if test "x$use_snmp" != "xyes" ; then
+       CPPFLAGS="$CPPFLAGS -I$with_snmp/include"
+       LDFLAGS="$LDFLAGS -L$with_snmp/lib"
+     fi
+     AC_CHECK_HEADER(net-snmp/net-snmp-config.h, snmp_type=net,
+ 	  	    [AC_CHECK_HEADER(ucd-snmp/ucd-snmp-config.h,
+-                                     snmp_type=ucd, with_snmp=no)])
++                                     snmp_type=ucd, use_snmp=no)])
+ 
+-    if test "x$with_snmp" != "xno"; then
++    if test "x$use_snmp" != "xno"; then
+       if test "x$snmp_type" = "xnet"; then
+          libsnmp="-lnetsnmp"
+       else
+          libsnmp="-lsnmp"
+       fi
+ 
+-      with_snmp=no
++      use_snmp=no
+       SNMPLIBALONE="$libsnmp"
+       # Setting to be able to force linking with -lcrypto....
+       # This is needed on OpenBSD (at least) where the snmplib port links without -lcrypto,
+@@ -429,18 +430,18 @@
+         SNMPLIBALONE=""
+       fi
+       for lib in $SNMPLIBALONE "$libsnmp -lcrypto" ; do
+-        if test "x$with_snmp" != "xyes" ; then
++        if test "x$use_snmp" != "xyes" ; then
+           AC_MSG_CHECKING([for snmp support in $lib])
+           OLIBS="$LIBS"
+           LIBS="$LIBS $lib"
+           AC_TRY_LINK([], [snmp_sess_init();],
+-                      [with_snmp=yes], [LIBS="$OLIBS"])
+-          AC_MSG_RESULT([$with_snmp])
++                      [use_snmp=yes], [LIBS="$OLIBS"])
++          AC_MSG_RESULT([$use_snmp])
+         fi
+       done
+     fi
+   fi
+-  if test "x$with_snmp" = "xyes" ; then
++  if test "x$use_snmp" = "xyes" ; then
+     AC_DEFINE([USE_SNMP], 1, [Define if you have SNMP support])
+     if test "x$snmp_type" = "xnet"; then
+        AC_DEFINE([HAVE_NET_SNMP], 1,
+@@ -464,10 +465,13 @@
+ 
+ # checking that we do have at least one driver
+ if test "x$local" != "xyes"; then
++  AC_MSG_WARN([no native stats gathering mechanism found; will use SNMP.])
+   if test "x$with_snmp" = "xyes"; then
+-    AC_MSG_WARN([no native stats gathering mechanism found; will use SNMP.])
+-  else
+-    AC_MSG_ERROR([no statistics gathering methods found, porting needed.])
++    if test "x$use_snmp" = "xno"; then
++      AC_MSG_ERROR([net-snmp requested but not found.])
++    else
++      AC_MSG_ERROR([no statistics gathering methods found, porting needed.])
++    fi
+   fi
+ fi
+ 
diff --git a/net-analyzer/ifstat/ifstat-1.1-r2.ebuild b/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
new file mode 100644
index 000000000000..98a8a89c5741
--- /dev/null
+++ b/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit autotools eutils
+
+IUSE="snmp"
+
+DESCRIPTION="Network interface bandwidth usage, with support for snmp targets"
+SRC_URI="http://gael.roualland.free.fr/ifstat/${P}.tar.gz"
+HOMEPAGE="http://gael.roualland.free.fr/ifstat/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 hppa ~mips ppc ppc64 sparc x86"
+
+DEPEND="snmp? ( >=net-analyzer/net-snmp-5.0 )"
+RDEPEND="${DEPEND}"
+
+DOCS=( HISTORY README TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-make.patch
+	epatch "${FILESDIR}"/${P}-hardened.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with snmp)
+}
diff --git a/net-analyzer/ifstat/metadata.xml b/net-analyzer/ifstat/metadata.xml
new file mode 100644
index 000000000000..eb3a67f58626
--- /dev/null
+++ b/net-analyzer/ifstat/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jer@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>
+		ifstat is a utility to monitor network interface bandwidth usage, with
+		vmstat look and feel.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/ifstatus/Manifest b/net-analyzer/ifstatus/Manifest
new file mode 100644
index 000000000000..8f8aead801f0
--- /dev/null
+++ b/net-analyzer/ifstatus/Manifest
@@ -0,0 +1,9 @@
+AUX ifstatus-1.1.0-gcc43.patch 177 SHA256 8abb075a151643d38cc1241d0037e5039c107bcca25cdfd4e8d314bc9500a243 SHA512 9241cfcceef902ee52ca6ee1fec4e84823b4c75fd2e8329b2644f6c776d77d298c0f5943aac4b901409117720021d595abb79ac8473a3dca18f2cf78e1ecf769 WHIRLPOOL 4189eb7b31801ff2aca44e7c57f649294bbf7d02d84a5c0204b8e6ee25b734d2bb18966f547a4677e19af2ae8ce988ebe81a6f4c5034ea19de61d78c340f6570
+AUX ifstatus-1.1.0-gcc6.patch 397 SHA256 d27ccad23815b517d1bd56a5b97ad2a0b71efccf72f90bdc34a6e5277006ec21 SHA512 f90abee913b3e16c44015e3f61a0b1dc120043293cdf439640443409d1b862e9881f5599a481db32b557a04e7f161cfbd378307e611a2499dbafd857ec00c47b WHIRLPOOL ab2a6b3beb6c895accb878a0c47fcc4f62a76aee847a8add29ba53207501dcdd2a81829fb6296b84e68d7dd2f8e21038e5c2671cec7cc9e33daa120c5ae00104
+AUX ifstatus-1.1.0-tinfo.patch 472 SHA256 3206a39f60b2174c38bc96bb3e942549fb579bdee074a42e49637b55a83bce80 SHA512 0b30c07113d2bd8012438bdefcc494d8a80e14143af9e2099d511f934d50995e3f9cf3fcbafce947c139753f118dbee484742241a1ee3ea85593012a4835b56c WHIRLPOOL eea8ce897de8efcfe90cc28ad1b71f9800fd9536b562592b164639d793a7f9a7ce923e8fefb86c136590db3bb640fbe036cf61e31fe398407c36067876dda95a
+DIST ifstatus-v1.1.0.tar.gz 25233 SHA256 0ca8a8655a1edf07698efbd5e1d4adc962dbb1bfb078b4899062e89bb05eac10 SHA512 2660310be7186067315414218e3d3d269499e391c7ffa12022ac53a0456ddbe0f7d5562b788fe6b2569b7d0eba7acf5699e0386769a91606a3e14b51239a2766 WHIRLPOOL 7aebc62d229160a07a28e876d2d7daa6847ed16d6c6b0f457de70d85584afce36f6e4903befb383720426f6ee20def4d1d02245fabf8671a6df367517d2a648b
+EBUILD ifstatus-1.1.0-r1.ebuild 897 SHA256 2f1ced83f8dc72cbb326abbb4de97aa3b01f97a3ded12134c14c6cd2d842cf69 SHA512 71e51872bfb0653fa56446ee7be7c5e09f4dd88ebd41d670c7ef1ac769b480a66437ab739a84418b1a86dce9beec9fac822b96e2fe0456b58c5e00d5e47d7b6b WHIRLPOOL 0ea24e6583a26380487a89bf9fdcd44940a27b1ac2ac3ae5cc5cdf9f7c566d9ac30670a4ee10803f090c619ab1b35271d0bd9f06bfb75bc755ee8c24b7646baa
+EBUILD ifstatus-1.1.0-r2.ebuild 931 SHA256 bb30b3789bccabdb1752ccd4ebed58f1b4844e0d7a3c63023c08a6fd3ed418fb SHA512 8176f35ded4077fea63ebe1a599182bb21f0fcb31d156c61cc475908c2998aca1c16cdb20e1e2f67a7c049bbc0296e7d65784cc958537a968c9f5016b7c9813a WHIRLPOOL 3a57618022eb7e7570daeb5886bcf9c67c4f4514c9c7fbaed2e2c84fe195733974ec649a0ae9f169ce7fc0260d0d77fa86bc3ddb0fcfdbbee679e88102127774
+MISC ChangeLog 2512 SHA256 0c2cc57a849fd2b11e60ba40aa1b6defa0f5f228bba97c3b7ab40e115c766275 SHA512 02a80f476fffbc87d25c4aeb2d3af82d719afc923559c10f92e72799eb83166900678b6eec059d484c41f4e2accf772a887be79db1ddd16100d768cd42f7e5e9 WHIRLPOOL 8ec55abf53e17de826029fedc6dfb319181fe9d422eea8300849a0e042da50bc388b50347509846d4b2c4a1c61f9cb0e2f1870dee78c347be70134645836b287
+MISC ChangeLog-2015 2829 SHA256 800ae990ab28b0396c1ca27625925756348ba1fb1e75f2f89e8c7f8e6b26e953 SHA512 1ad26b9846faea01376f3f7195ffea9a41db1e654870113d5f254866003fd92d86156e71a594e0e0ce9b1d4d2e19556508b4b7c51f9e7bc5e7e164085113bbd3 WHIRLPOOL 9d9944020146238167408284645b9d6275f5736348f359dd27321421cf46aba351c63db90990e802052575027aad17f53207aeb1fdff842b074aa225c14c282a
+MISC metadata.xml 358 SHA256 702bea6dc122b1e98b1408004c4a30767a184c15119451fe9984e9e2f406a682 SHA512 b23a7f0e009c71d86cd145b033b4bc7f77e7a316f048d8236e9bb2bf9cd34671ec24af37b11ef934791c6f046e1a761087c7f5e570bac80b09e30862e162d005 WHIRLPOOL 40cba310ce594df402e63c6ce5967f6a18bce005b90d6d8473b7902d49428d3eda01268c4909b49dcaab6fcde7202bdb2ccc1f7bcf678b944ce8398eb66175b4
diff --git a/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc43.patch b/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc43.patch
new file mode 100644
index 000000000000..27111d7576f4
--- /dev/null
+++ b/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc43.patch
@@ -0,0 +1,10 @@
+--- a/Main.h
++++ b/Main.h
+@@ -38,6 +38,7 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <curses.h>
++#include <stdlib.h>
+ 
+ #include <sys/time.h>
+ #include <sys/types.h>
diff --git a/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc6.patch b/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc6.patch
new file mode 100644
index 000000000000..760a09fbf2c6
--- /dev/null
+++ b/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc6.patch
@@ -0,0 +1,14 @@
+--- a/Interface.h
++++ b/Interface.h
+@@ -57,7 +57,11 @@
+ 
+ 	InterfaceData & operator=(InterfaceData & rInterfaceData);
+ 	InterfaceData operator-(InterfaceData & rInterfaceData);
+	
++#if __cplusplus >= 201103L
++	InterfaceData & operator=(InterfaceData && rInterfaceData) = default;
++	InterfaceData(const InterfaceData&) = default;
++#endif
+ private:
+ 
+ 	unsigned long long m_ullReceived[eTotalTypes];
diff --git a/net-analyzer/ifstatus/files/ifstatus-1.1.0-tinfo.patch b/net-analyzer/ifstatus/files/ifstatus-1.1.0-tinfo.patch
new file mode 100644
index 000000000000..e2c14e6add71
--- /dev/null
+++ b/net-analyzer/ifstatus/files/ifstatus-1.1.0-tinfo.patch
@@ -0,0 +1,22 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,9 +1,7 @@
+ # Makefile for IFStatus
+ # Gabriel Montenegro 
+ 
+-GCC = g++
+-LDFLAGS = -lncurses
+-CFLAGS = -O2 -Wall
++LDLIBS = $(shell $(PKG_CONFIG) --libs ncurses)
+ 
+ BIN = ifstatus
+ OBJ = BorderDecorator.o\
+@@ -30,7 +28,7 @@
+ all : ifstatus printdone
+ 
+ ifstatus : $(OBJ)
+-	$(GCC) $(CFLAGS) $(LDFLAGS) $^ -o $@
++	$(LINK.cc) $^ $(LDLIBS) -o $@
+ 
+ printdone:
+ 	@if [ -e "./${BIN}" ]; then echo "Compiled.."; else echo "Error compiling!"; fi
diff --git a/net-analyzer/ifstatus/ifstatus-1.1.0-r1.ebuild b/net-analyzer/ifstatus/ifstatus-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..219bdaa49c5d
--- /dev/null
+++ b/net-analyzer/ifstatus/ifstatus-1.1.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils toolchain-funcs
+
+KEYWORDS="amd64 arm ~ppc x86"
+
+DESCRIPTION="A simple CLI program for displaying network statistics in real time"
+HOMEPAGE="http://ifstatus.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-v${PV}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND=">=sys-libs/ncurses-4.2:0="
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc43.patch"
+	"${FILESDIR}/${P}-tinfo.patch"
+)
+
+src_prepare() {
+	default
+	tc-export CXX PKG_CONFIG
+}
+
+src_install() {
+	dobin ifstatus
+	dodoc AUTHORS README
+}
+
+pkg_postinst() {
+	elog	"You may want to configure ~/.ifstatus/ifstatus.cfg"
+	elog 	"before running ifstatus. For example, you may add"
+	elog	"Interfaces = eth0 there. Read the README file for"
+	elog	"more information."
+}
diff --git a/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild b/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild
new file mode 100644
index 000000000000..cc2baff02f50
--- /dev/null
+++ b/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils toolchain-funcs
+
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+DESCRIPTION="A simple CLI program for displaying network statistics in real time"
+HOMEPAGE="http://ifstatus.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-v${PV}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND=">=sys-libs/ncurses-4.2:0="
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc43.patch"
+	"${FILESDIR}/${P}-tinfo.patch"
+	"${FILESDIR}/${P}-gcc6.patch"
+)
+
+src_prepare() {
+	default
+	tc-export CXX PKG_CONFIG
+}
+
+src_install() {
+	dobin ifstatus
+	dodoc AUTHORS README
+}
+
+pkg_postinst() {
+	elog	"You may want to configure ~/.ifstatus/ifstatus.cfg"
+	elog 	"before running ifstatus. For example, you may add"
+	elog	"Interfaces = eth0 there. Read the README file for"
+	elog	"more information."
+}
diff --git a/net-analyzer/ifstatus/metadata.xml b/net-analyzer/ifstatus/metadata.xml
new file mode 100644
index 000000000000..2a57e972be89
--- /dev/null
+++ b/net-analyzer/ifstatus/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ifstatus</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/iftop/Manifest b/net-analyzer/iftop/Manifest
new file mode 100644
index 000000000000..c687b06d8c92
--- /dev/null
+++ b/net-analyzer/iftop/Manifest
@@ -0,0 +1,13 @@
+AUX ax_pthread.m4 12983 SHA256 8cab55885c9839deded96f0afedb7f20f9833d3a51c148f01049820d81211516 SHA512 93c7ba3bb00712308de95273563f41814d05a6650ae2eec25f2b198f757b7f0206ae2e5679ff436da939be9bd962f37317978759ac08c1d14df0beb03440f84a WHIRLPOOL 73219045ad2e38027e104e2734e3df773f67263e3f570d47cb0ea7d7c0662ed746119b5e550406b8a7fc59bbdb0a27d8da975f24b330379f992d543b638fd162
+AUX iftop-1.0_pre4-Makefile.am.patch 378 SHA256 919b949c4bf57347c91f376e49f4974c31435c60c860e6c12410604345259825 SHA512 c7a81669de83701054493ee0f9979da8bfa481bd0769a501364598889cfb5aa762473e5099904ee13dad9052bfdd27913306df8ad4a91132532ac874504321fa WHIRLPOOL 90ad054bd4c6d4b32ec103706eab765530c80a4e406eab8e5f7ad1028a6fe318e73223b1809ef3261d4b3de996df4d0368433332438d7fce2114466c0fbbcf40
+AUX iftop-1.0_pre4-configure.ac.patch 9916 SHA256 2a2e0566eb87f061f4d3291f1376f95b9c8cc97cf4b3da5136272396e0b30078 SHA512 5b83cdb69805d3ed8b188b1390d1d536dc99732312fa49951fad38810c7eb9c931d04daaaea7152d5289352dd3d167907ac5a25a994e4b1584b7b5a578fc0698 WHIRLPOOL 795a043cacc551ddcfa21c172d72fd5bab53fe845b1f13dde227b79b005ca5f4f69592e4b18c1a7d661d7ef41c40cb5e8e9d59febf51f5a132b5e765450aab15
+AUX iftop-1.0_pre4-pthread.patch 1462 SHA256 ad36fa74aaf72c2e79775fae8f26386c0436a39ac032d3ffd72f4ef72cd4f6b7 SHA512 0befb38a673d826f25319517d64e4aecea641cdc8626ab51bd468dc0e2f23c779854fbfd9e7cfe51e30ecdf04e3c831fc793ab5e402df3c8153044c679add2b8 WHIRLPOOL 4e486cfd9a55313c872857a3e04bc76ce0e4c9817b53411135c3c54f50ecf535ca11201f9a33537f69922abb775a2c74c617f844ebd2f61e013879cc1b9776ea
+AUX iftop-1.0_pre4-tinfo.patch 1560 SHA256 1040d38d427c1be3c92683d22d4eab025b553f3379a440e31989b9ab23a1b0c6 SHA512 d47095fdc65f0dea60471d0c927ab7bf4d51129826bfbf1cc95233054a8d17d36de7e86042c7d2ac0faa0b27f3ced169b5063cc8d36dcf78c548a920ae59f4e2 WHIRLPOOL f629c47a83fcb7971841b37a0cab9e3d1c79b874be4a3780da1684dfabba3c6f22e9a64918579874c47d84ffa5a06e26b89febaaafd27a3c211ff50dcb40b112
+AUX iftop-1.0_pre4-tsent-set-but-not-used.patch 229 SHA256 d59b0674109223781758f47a28aca6d3c7a8b22c51da0adef40fd8925a12a015 SHA512 06d26d9497c6afc6b7eb5db508def08c8945408e89127f3938667973f8a8b7884dc0e7b005c115a7acd66d62107de5d47d49a869b89f25f24dd999161b0fb0bf WHIRLPOOL 708e4d01e378e6928abfff6c506229e9a220e3f89f9526ec57bd4405f8654abdaf092a40d417cd04644371ed385d59d09b3a435538565415f02625a2849aa4e7
+AUX iftoprc 1391 SHA256 f21c0324774c4b6635359e4de76d13ad6bafdebdcbb29df9f986cc47d3569fa2 SHA512 01373add0177399e7cf4ae0ecba893fdd9c73bad5243478b4ac9ac5e936647738a22906ee1e8b22b51d541cc4150d0e0619f134666a1e3d0cb78a59a5c04b95b WHIRLPOOL 6dfc9099bf5d906844fce63b8aac8326535e0684cf5c26f13a39b9a7df8120dbd1f3bd246e81990f11cc4af2a3e0434958b072f4a63db66f6ae22fff65003eea
+DIST iftop-1.0pre4.tar.gz 204665 SHA256 f733eeea371a7577f8fe353d86dd88d16f5b2a2e702bd96f5ffb2c197d9b4f97 SHA512 abd74e8025bb82fef9ebab4997b1d018201a523d47c0128128ca37797490046538d74758dc4471735c22b890e5bd238ad6b2a30776d465138ede367cdd263d22 WHIRLPOOL 5c02d8d23fe3d73ced4c0e8626226323f2266ef16ef00dc2b00059f4a213066c22c366f9458fe516da05a59830acd581ee23f17dc92e097ca720b220e88103cb
+EBUILD iftop-1.0_pre4-r2.ebuild 943 SHA256 789638117cce265ff59a951f8aafd1bdc87e7f93bd5053e327c85b8505f78571 SHA512 1893bee7314377599cb210dbda81fae8b81b6e0518833926b78cdf2045c88ef1c5b1bccb8d189d8281b71497c64c1b8f225850b68607cd9df88e4e6f497a0989 WHIRLPOOL c1378bf6f522c0dbef654315c47ebfe50b36821967cc6c220f93f75bf030622e99a3b603ca13f3f4a665f018d047f25eac6f509f2b7e7408757f28a950f61228
+EBUILD iftop-1.0_pre4.ebuild 878 SHA256 58378d5f109cbedeebea803d5e85ed5c8de658e6a863c70b35e1c88e7bee5f84 SHA512 343e55b2ce782d9c7e15d9c0e12620c16ae222a5666258215eac083f6a87721fa64ecadfaa83b39bf691b65925ed11f82c6044421f751da5fc2bf7a3bff8705c WHIRLPOOL 34475732003a44e2c1a484990281dbd26875c2dc13ae7bc43951919e8b611ec0b2a60440511639399821be75fea9c406c7c3f4709d93934b3ccb84fcb974bbd7
+MISC ChangeLog 3258 SHA256 04ccb32842470adcac63bcba948137df2f0b782639e542f161ccc2b5dd404652 SHA512 e53e5f2566604a979b4edfe5cc41e22940bfdfe172545e6096b0129e272702b0b4bb8ba704ecb2798c5256c393ffde9a6412c1106fb0fdae8f9b2c44f371c0d4 WHIRLPOOL 54609ee797acd3a7b807d46866b43c374c949e5edb08f6d8359cc507c1fd9726df7838ea88f54ab450dfd95a74774cdc09514c9c723e90e912fe549b4f2f7343
+MISC ChangeLog-2015 10127 SHA256 9fe81554c18a310b194c6e780f805903545e811adeb88287ded62680a0d9070f SHA512 c29bd935ec5a2ae353af752cf9309109e5b5375e5bac18013eb7f975b9524218534c434073f1f8f89c96e271b4c4fa1649a4a90d25f9f0dbc47e8161fe018e9b WHIRLPOOL 2bc88b3bfb9ea190e323e5a12712b29a7f7a8cca367b95f674e393f79b83ebc232d9488f4a921d6660fe61c7edd1003a618389e6957106a2bd5ed093fd6bfdec
+MISC metadata.xml 286 SHA256 61b7f36c3fb4ce2345ee3017334a6013dd52429ba107768abc2c146629e84dcd SHA512 cfd1ca7999686b831b0b459f5b06ea80fd28b4f24d3404a8ad90bb4d6461a011f6a2b338ebbf45c2eac621ec828dcc397b26c2ae82068e5b703271a85c76e760 WHIRLPOOL bb6b105c081b12e37fbf26bc041e829ef7ab8ba855b96f040479ca85ad9633b8e83c7be4afa686838991ebf358ad8cf78c1a79fd54ad51f7928aaa7a63f0e5bb
diff --git a/net-analyzer/iftop/files/ax_pthread.m4 b/net-analyzer/iftop/files/ax_pthread.m4
new file mode 100644
index 000000000000..6d400ed4e8e2
--- /dev/null
+++ b/net-analyzer/iftop/files/ax_pthread.m4
@@ -0,0 +1,317 @@
+# ===========================================================================
+#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+#
+# DESCRIPTION
+#
+#   This macro figures out how to build C programs using POSIX threads. It
+#   sets the PTHREAD_LIBS output variable to the threads library and linker
+#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
+#   flags that are needed. (The user can also force certain compiler
+#   flags/libs to be tested by setting these environment variables.)
+#
+#   Also sets PTHREAD_CC to any special C compiler that is needed for
+#   multi-threaded programs (defaults to the value of CC otherwise). (This
+#   is necessary on AIX to use the special cc_r compiler alias.)
+#
+#   NOTE: You are assumed to not only compile your program with these flags,
+#   but also link it with them as well. e.g. you should link with
+#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
+#
+#   If you are only building threads programs, you may wish to use these
+#   variables in your default LIBS, CFLAGS, and CC:
+#
+#     LIBS="$PTHREAD_LIBS $LIBS"
+#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+#     CC="$PTHREAD_CC"
+#
+#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
+#   has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
+#   (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
+#
+#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
+#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
+#   PTHREAD_CFLAGS.
+#
+#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
+#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
+#   is not found. If ACTION-IF-FOUND is not specified, the default action
+#   will define HAVE_PTHREAD.
+#
+#   Please let the authors know if this macro fails on any platform, or if
+#   you have any other suggestions or comments. This macro was based on work
+#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
+#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
+#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
+#   grateful for the helpful feedback of numerous users.
+#
+#   Updated for Autoconf 2.68 by Daniel Richard G.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
+#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 20
+
+AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
+AC_DEFUN([AX_PTHREAD], [
+AC_REQUIRE([AC_CANONICAL_HOST])
+AC_LANG_PUSH([C])
+ax_pthread_ok=no
+
+# We used to check for pthread.h first, but this fails if pthread.h
+# requires special compiler flags (e.g. on True64 or Sequent).
+# It gets checked for in the link test anyway.
+
+# First of all, check if the user has set any of the PTHREAD_LIBS,
+# etcetera environment variables, and if threads linking works using
+# them:
+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        save_LIBS="$LIBS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
+        AC_TRY_LINK_FUNC(pthread_join, ax_pthread_ok=yes)
+        AC_MSG_RESULT($ax_pthread_ok)
+        if test x"$ax_pthread_ok" = xno; then
+                PTHREAD_LIBS=""
+                PTHREAD_CFLAGS=""
+        fi
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+fi
+
+# We must check for the threads library under a number of different
+# names; the ordering is very important because some systems
+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
+# libraries is broken (non-POSIX).
+
+# Create a list of thread flags to try.  Items starting with a "-" are
+# C compiler flags, and other items are library names, except for "none"
+# which indicates that we try without any flags at all, and "pthread-config"
+# which is a program returning the flags for the Pth emulation library.
+
+ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+
+# The ordering *is* (sometimes) important.  Some notes on the
+# individual items follow:
+
+# pthreads: AIX (must check this before -lpthread)
+# none: in case threads are in libc; should be tried before -Kthread and
+#       other compiler flags to prevent continual compiler warnings
+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
+# -pthreads: Solaris/gcc
+# -mthreads: Mingw32/gcc, Lynx/gcc
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+#      doesn't hurt to check since this sometimes defines pthreads too;
+#      also defines -D_REENTRANT)
+#      ... -mt is also the pthreads flag for HP/aCC
+# pthread: Linux, etcetera
+# --thread-safe: KAI C++
+# pthread-config: use pthread-config program (for GNU Pth library)
+
+case ${host_os} in
+        solaris*)
+
+        # On Solaris (at least, for some versions), libc contains stubbed
+        # (non-functional) versions of the pthreads routines, so link-based
+        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
+        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
+        # a function called by this macro, so we could check for that, but
+        # who knows whether they'll stub that too in a future libc.)  So,
+        # we'll just look for -pthreads and -lpthread first:
+
+        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
+        ;;
+
+        darwin*)
+        ax_pthread_flags="-pthread $ax_pthread_flags"
+        ;;
+esac
+
+if test x"$ax_pthread_ok" = xno; then
+for flag in $ax_pthread_flags; do
+
+        case $flag in
+                none)
+                AC_MSG_CHECKING([whether pthreads work without any flags])
+                ;;
+
+                -*)
+                AC_MSG_CHECKING([whether pthreads work with $flag])
+                PTHREAD_CFLAGS="$flag"
+                ;;
+
+                pthread-config)
+                AC_CHECK_PROG(ax_pthread_config, pthread-config, yes, no)
+                if test x"$ax_pthread_config" = xno; then continue; fi
+                PTHREAD_CFLAGS="`pthread-config --cflags`"
+                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+                ;;
+
+                *)
+                AC_MSG_CHECKING([for the pthreads library -l$flag])
+                PTHREAD_LIBS="-l$flag"
+                ;;
+        esac
+
+        save_LIBS="$LIBS"
+        save_CFLAGS="$CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+        # Check for various functions.  We must include pthread.h,
+        # since some functions may be macros.  (On the Sequent, we
+        # need a special flag -Kthread to make this header compile.)
+        # We check for pthread_join because it is in -lpthread on IRIX
+        # while pthread_create is in libc.  We check for pthread_attr_init
+        # due to DEC craziness with -lpthreads.  We check for
+        # pthread_cleanup_push because it is one of the few pthread
+        # functions on Solaris that doesn't have a non-functional libc stub.
+        # We try pthread_create on general principles.
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
+                        static void routine(void *a) { a = 0; }
+                        static void *start_routine(void *a) { return a; }],
+                       [pthread_t th; pthread_attr_t attr;
+                        pthread_create(&th, 0, start_routine, 0);
+                        pthread_join(th, 0);
+                        pthread_attr_init(&attr);
+                        pthread_cleanup_push(routine, 0);
+                        pthread_cleanup_pop(0) /* ; */])],
+                [ax_pthread_ok=yes],
+                [])
+
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+
+        AC_MSG_RESULT($ax_pthread_ok)
+        if test "x$ax_pthread_ok" = xyes; then
+                break;
+        fi
+
+        PTHREAD_LIBS=""
+        PTHREAD_CFLAGS=""
+done
+fi
+
+# Various other checks:
+if test "x$ax_pthread_ok" = xyes; then
+        save_LIBS="$LIBS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+        AC_MSG_CHECKING([for joinable pthread attribute])
+        attr_name=unknown
+        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+            AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
+                           [int attr = $attr; return attr /* ; */])],
+                [attr_name=$attr; break],
+                [])
+        done
+        AC_MSG_RESULT($attr_name)
+        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
+            AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name,
+                               [Define to necessary symbol if this constant
+                                uses a non-standard name on your system.])
+        fi
+
+        AC_MSG_CHECKING([if more special flags are required for pthreads])
+        flag=no
+        case ${host_os} in
+            aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
+            osf* | hpux*) flag="-D_REENTRANT";;
+            solaris*)
+            if test "$GCC" = "yes"; then
+                flag="-D_REENTRANT"
+            else
+                flag="-mt -D_REENTRANT"
+            fi
+            ;;
+        esac
+        AC_MSG_RESULT(${flag})
+        if test "x$flag" != xno; then
+            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+        fi
+
+        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
+            ax_cv_PTHREAD_PRIO_INHERIT, [
+                AC_LINK_IFELSE([
+                    AC_LANG_PROGRAM([[#include <pthread.h>]], [[int i = PTHREAD_PRIO_INHERIT;]])],
+                    [ax_cv_PTHREAD_PRIO_INHERIT=yes],
+                    [ax_cv_PTHREAD_PRIO_INHERIT=no])
+            ])
+        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
+            AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], 1, [Have PTHREAD_PRIO_INHERIT.]))
+
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+
+        # More AIX lossage: compile with *_r variant
+        if test "x$GCC" != xyes; then
+            case $host_os in
+                aix*)
+                AS_CASE(["x/$CC"],
+                  [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
+                  [#handle absolute path differently from PATH based program lookup
+                   AS_CASE(["x$CC"],
+                     [x/*],
+                     [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
+                     [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
+                ;;
+            esac
+        fi
+fi
+
+test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
+
+AC_SUBST(PTHREAD_LIBS)
+AC_SUBST(PTHREAD_CFLAGS)
+AC_SUBST(PTHREAD_CC)
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test x"$ax_pthread_ok" = xyes; then
+        ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
+        :
+else
+        ax_pthread_ok=no
+        $2
+fi
+AC_LANG_POP
+])dnl AX_PTHREAD
diff --git a/net-analyzer/iftop/files/iftop-1.0_pre4-Makefile.am.patch b/net-analyzer/iftop/files/iftop-1.0_pre4-Makefile.am.patch
new file mode 100644
index 000000000000..0b1308ab36c5
--- /dev/null
+++ b/net-analyzer/iftop/files/iftop-1.0_pre4-Makefile.am.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -25,7 +25,7 @@ iftop_SOURCES = addr_hash.c edline.c hash.c iftop.c ns_hash.c \
+ #		 addrs_ioctl.c addrs_dlpi.c dlcommon.c \
+ #		 stringmap.c cfgfile.c 
+ 
+-
++iftop_LDADD = $(ncurses_LIBS)
+ 
+ noinst_HEADERS = addr_hash.h ether.h ethertype.h extract.h hash.h iftop.h \
+                  integers.h ip.h llc.h ns_hash.h options.h resolver.h \
diff --git a/net-analyzer/iftop/files/iftop-1.0_pre4-configure.ac.patch b/net-analyzer/iftop/files/iftop-1.0_pre4-configure.ac.patch
new file mode 100644
index 000000000000..ff13fd89fb57
--- /dev/null
+++ b/net-analyzer/iftop/files/iftop-1.0_pre4-configure.ac.patch
@@ -0,0 +1,278 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -51,10 +51,10 @@
+ 			  forking        use the REALLY SUCKY forking resolver.
+ 			  guess          run experiments to guess a
+ 					 reasonable value.  Only works if you
+-					 aren't cross-compiling.  This
++					 are not cross-compiling.  This
+ 					 is the default.  guess will
+ 					 either select netdb or netdb_1thread.
+-			  none           don't do name resolution.],
++			  none           do not do name resolution.],
+     [resolver=$withval],
+     [resolver=guess])
+ 
+@@ -98,45 +98,14 @@
+ AC_CHECK_FUNCS(inet_aton inet_pton)
+ 
+ dnl
+-dnl Find integers of known physical size. This is a pain in the arse because
+-dnl we can't use AC_CHECK_SIZEOF to find the original variables, since that
+-dnl function doesn't permit us to include a header file. Sigh.
+-dnl
+-
+-for type in u_int8_t u_int16_t u_int32_t ; do
+-    AC_MSG_CHECKING([size of $type])
+-    AC_RUN_IFELSE([AC_LANG_SOURCE([
+-#include <sys/types.h>
+-#include <stdio.h>
+-int main() {
+-    $type dummy;
+-    FILE *f=fopen("conftestval", "w");
+-    if (!f) exit(1);
+-    fprintf(f, "%d\n", sizeof($1));
+-    exit(0);
+-}
+-    ])], [
+-        x=`cat conftestval`
+-        eval "size_$type=$x"
+-        AC_MSG_RESULT([$x])
+-    ], [
+-        eval "size_$type=0"
+-        AC_MSG_RESULT([unknown type])
+-    ], [
+-        eval "size_$type=0"
+-        AC_MSG_RESULT([can't determine when cross-compiling])
+-    ])
+-done
+-
+-dnl Groan. Have to do things this way so that autoheader can do its thing....
+-AC_DEFINE_UNQUOTED(SIZEOF_U_INT8_T,  [$size_u_int8_t],  [size of u_int8_t])
+-AC_DEFINE_UNQUOTED(SIZEOF_U_INT16_T, [$size_u_int16_t], [size of u_int16_t])
+-AC_DEFINE_UNQUOTED(SIZEOF_U_INT32_T, [$size_u_int32_t], [size of u_int32_t])
++dnl Find integers of known physical size.
++dnl
+ 
+-dnl If we already have these types, don't piss about any more....
++AC_CHECK_SIZEOF([u_int8_t])
++AC_CHECK_SIZEOF([u_int16_t])
++AC_CHECK_SIZEOF([u_int32_t])
+ 
+-if test $size_u_int8_t != 1 || test $size_u_int16_t != 2 || test $size_u_int32_t != 4 ; then
+-dnl XXXif test $size_u_int8_t != 1 -o $size_u_int16_t != 2 -o $size_u_int32_t != 4 ; then
++if test $ac_cv_sizeof_u_int8_t = 0 || test $ac_cv_sizeof_u_int16_t = 0 || test $ac_cv_sizeof_u_int32_t = 0; then
+     do_int_types=1
+     AC_CHECK_HEADERS(
+         stdint.h             dnl C99
+@@ -154,12 +123,16 @@
+     fi
+ fi
+ 
++AC_DEFINE_UNQUOTED([SIZEOF_U_INT8_T],[$ac_cv_sizeof_u_int8_t],[size of u_int8_t])
++AC_DEFINE_UNQUOTED([SIZEOF_U_INT16_T],[$ac_cv_sizeof_u_int16_t],[size of u_int16_t])
++AC_DEFINE_UNQUOTED([SIZEOF_U_INT32_T],[$ac_cv_sizeof_u_int32_t],[size of u_int32_t])
++
+ dnl
+ dnl Name resolution.
+ dnl
+ dnl This is complicated because we need some sort of reentrant mechanism for
+ dnl name resolution. Naturally, UNIX vendors have come up with a variety of
+-dnl incompatible schemes for this, many of which don't work at all.
++dnl incompatible schemes for this, many of which do not work at all.
+ dnl
+ 
+ dnl First, the default resolver, which uses getnameinfo or gethostbyaddr_r. If
+@@ -175,7 +148,7 @@
+     use_getnameinfo=0
+     AC_SEARCH_LIBS(getnameinfo, [nsl], [use_getnameinfo=1])
+ 
+-    dnl XXX For the moment, don't use getnameinfo, since it isn't actually
++    dnl XXX For the moment, do not use getnameinfo, since it is not actually
+     dnl thread safe on, e.g., NetBSD.
+     use_getnameinfo=0
+ 
+@@ -192,7 +165,7 @@
+     dnl Can use gethostbyaddr_r?
+     AC_SEARCH_LIBS(gethostbyaddr_r, [nsl], , [resolver=guess])
+     if test x$resolver = xguess && test x$specified_resolver != xguess ; then
+-       dnl They wanted gethostbyaddr_r, but they can't have it, so stop.
++       dnl They wanted gethostbyaddr_r, but they cannot have it, so stop.
+        AC_MSG_ERROR([no library defines gethostbyaddr_r])
+     fi
+ fi
+@@ -216,15 +189,15 @@
+ 	            AC_DEFINE(GETHOSTBYADDR_R_RETURNS_INT, 1,
+                     [8-argument gethostbyaddr_r returns int])], [
+     dnl Neither.
+-    AC_MSG_RESULT([don't know how])
++    AC_MSG_RESULT([do not know how])
+     resolver=guess])])
+     if test x$resolver = xguess && test x$specified_resolver != xguess ; then
+-       dnl They wanted gethostbyaddr_r, but they can't have it, so stop.
++       dnl They wanted gethostbyaddr_r, but they cannot have it, so stop.
+        AC_MSG_ERROR([gethostbyaddr_r has no known calling convention])
+     fi
+ fi
+ 
+-dnl If we still want to do gethostbyaddr_r, and we aren't
++dnl If we still want to do gethostbyaddr_r, and we are not
+ dnl cross-compiling, test it.
+ if test x$resolver = xnetdb ; then
+     if test x$ghba_args = x8 ; then
+@@ -237,13 +210,13 @@
+                   [AC_MSG_RESULT([yes])],
+ 		  [AC_MSG_RESULT([no])
+ 		   resolver=guess],
+-		  [AC_MSG_RESULT([can't test because we are cross-compiling])])
++		  [AC_MSG_RESULT([cannot test because we are cross-compiling])])
+     if test x$resolver = xguess ; then
+         if test x$specified_resolver = xguess ; then
+-           AC_MSG_RESULT([gethostbyaddr_r doesn't work, so we'll try something else])
++           AC_MSG_RESULT([gethostbyaddr_r does not work, so we will try something else])
+         else
+-           dnl They wanted gethostbyaddr_r, but it doesn't work, so stop.
+-           AC_MSG_ERROR([gethostbyaddr_r doesn't work])
++           dnl They wanted gethostbyaddr_r, but it does not work, so stop.
++           AC_MSG_ERROR([gethostbyaddr_r does not work])
+         fi
+     fi
+ fi
+@@ -260,11 +233,11 @@
+     AC_SEARCH_LIBS(ares_init, [ares], [
+         AC_DEFINE(USE_ARES, 1, [use ARES for name resolution])
+         ], [
+-        dnl They asked for ares, but we can't give it to them, so stop.
+-        AC_MSG_ERROR([can't find ARES.  Re-run configure and ask for a different resolver.])])
++        dnl They asked for ares, but we cannot give it to them, so stop.
++        AC_MSG_ERROR([cannot find ARES.  Re-run configure and ask for a different resolver.])])
+ fi
+ 
+-dnl Last thing to try if we haven't decided yet is netdb_1thread.
++dnl Last thing to try if we have not decided yet is netdb_1thread.
+ if test x$resolver = xguess ; then
+    resolver=netdb_1thread
+ fi
+@@ -317,16 +290,16 @@
+ 
+ if test $foundpcaph = 0 ; then
+     AC_MSG_RESULT([no idea])
+-    AC_MSG_ERROR([can't find pcap.h
+-  You're not going to get very far without libpcap.])
++    AC_MSG_ERROR([cannot find pcap.h
++  You are not going to get very far without libpcap.])
+ else
+     dnl assume that -lpcap is under $test_prefix/lib
+     if test x$test_prefix != x ; then
+         LDFLAGS="$LDFLAGS -L$test_prefix/lib"
+     fi
+     AC_CHECK_LIB(pcap, pcap_open_live, , [
+-            AC_MSG_ERROR([can't find libpcap
+-  You're not going to get very far without libpcap.])
++            AC_MSG_ERROR([cannot find libpcap
++  You are not going to get very far without libpcap.])
+         ])
+ fi
+ 
+@@ -337,79 +310,50 @@
+     ])
+ 
+ if test $foundpcap = 0 ; then
+-    AC_MSG_ERROR([can't find pcap.h
+-  You're not going to get very far without libpcap.])
++    AC_MSG_ERROR([cannot find pcap.h
++  You are not going to get very far without libpcap.])
+ fi
+ 
+ dnl
+ dnl Curses. Really, we need ncurses or something similarly advanced, since
+ dnl we use the (apparently obscure) mvchgat function. Unfortunately, there's
+-dnl a solid chance that mvchgat is a macro, so we can't just use
++dnl a solid chance that mvchgat is a macro, so we cannot just use
+ dnl AC_SEARCH_LIBS....
+ dnl
+ 
+-AC_MSG_CHECKING([for a curses library containing mvchgat])
+-oldLIBS=$LIBS
+-for curseslib in ncursesw curses ncurses ; do
+-    LIBS="$oldLIBS -l$curseslib"
+-    AC_TRY_LINK([
++PKG_PROG_PKG_CONFIG()
++
++PKG_CHECK_MODULES([ncurses], [ncursesw], [foundcurseslib="$ncurses_LIBS"], [
++    PKG_CHECK_MODULES([ncurses], [ncurses], [foundcurseslib="$ncurses_LIBS"], [
++    AC_MSG_CHECKING([for a curses library containing mvchgat])
++    oldLIBS=$LIBS
++    for curseslib in ncursesw curses ncurses ; do
++        LIBS="$oldLIBS -l$curseslib"
++        AC_TRY_LINK([
+ #include <$curseslib.h>
+         ], [
+         mvchgat(0, 0, 1, A_REVERSE, 0, NULL)
+         ], [
+-        foundcurseslib=$curseslib
++        foundcurseslib=-l$curseslib
+         break
+         ])
+-done
+-
+-if test x$foundcurseslib = x ; then
+-    AC_MSG_RESULT([none found])
++    done
++	],
+     AC_MSG_ERROR([Curses! Foiled again!
+-  (Can't find a curses library supporting mvchgat.)
++  (Cannot find a curses library supporting mvchgat.)
+   Consider installing ncurses.])
+-else
+-    AC_MSG_RESULT([-l$foundcurseslib])
+-fi
+-
++	)
++])
+ 
+ dnl
+ dnl POSIX threads. Different systems like different combinations of flags,
+ dnl libraries, etc. We use a test program to figure this stuff out.
+ dnl
+ 
+-AC_MSG_CHECKING([POSIX threads compilation])
+-thrfail=1
+-oldCFLAGS=$CFLAGS
+-oldLIBS=$LIBS
+-for flag in "" -mt -pthread -thread ; do
+-    CFLAGS="$oldCFLAGS $flag"
+-    for lib in "" -lpthread "-lpthread -lposix4" ; do
+-        LIBS="$oldLIBS $lib"
+-        AC_LINK_IFELSE([AC_LANG_SOURCE([`cat config/pthread.c`])], [
+-            foundthrlib=$lib
+-            foundthrflag=$flag
+-            thrfail=0
+-            break
+-            ])
+-    done
+-    if test $thrfail = 0 ; then
+-        break
+-    fi
+-done
+-
+-if test $thrfail = 1 ; then
+-    AC_MSG_RESULT([no idea])
+-    AC_MSG_ERROR([can't figure out how to compile with POSIX threads
+-  If your system actually supports POSIX threads, this means we've messed up.])
+-fi
+-
+-AC_MSG_RESULT([CFLAGS=$foundthrflag and LIBS=$foundthrlib])
+-AC_MSG_CHECKING([POSIX threads usability])
+-AC_RUN_IFELSE([AC_LANG_SOURCE([`cat config/pthread.c`])],
+-	      [AC_MSG_RESULT([yes])],
+-              [AC_MSG_ERROR(
+-	       [it fails.  We probably guessed the wrong CFLAGS.])],
+-	      [AC_MSG_RESULT([can't test because we are cross-compiling])])
++AX_PTHREAD(
++  [LIBS="$PTHREAD_LIBS $LIBS"
++  CFLAGS="$CFLAGS $PTHREAD_CFLAGS"],
++  AC_MSG_ERROR([Could not find out how to enable POSIX threads]))
+ 
+ dnl
+ dnl Are we on a system (like Solaris) that requires promiscuous mode in order to
diff --git a/net-analyzer/iftop/files/iftop-1.0_pre4-pthread.patch b/net-analyzer/iftop/files/iftop-1.0_pre4-pthread.patch
new file mode 100644
index 000000000000..ce04c46a65ef
--- /dev/null
+++ b/net-analyzer/iftop/files/iftop-1.0_pre4-pthread.patch
@@ -0,0 +1,46 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -383,39 +383,10 @@
+ dnl libraries, etc. We use a test program to figure this stuff out.
+ dnl
+ 
+-AC_MSG_CHECKING([POSIX threads compilation])
+-thrfail=1
+-oldCFLAGS=$CFLAGS
+-oldLIBS=$LIBS
+-for flag in "" -mt -pthread -thread ; do
+-    CFLAGS="$oldCFLAGS $flag"
+-    for lib in "" -lpthread "-lpthread -lposix4" ; do
+-        LIBS="$oldLIBS $lib"
+-        AC_LINK_IFELSE([AC_LANG_SOURCE([`cat config/pthread.c`])], [
+-            foundthrlib=$lib
+-            foundthrflag=$flag
+-            thrfail=0
+-            break
+-            ])
+-    done
+-    if test $thrfail = 0 ; then
+-        break
+-    fi
+-done
+-
+-if test $thrfail = 1 ; then
+-    AC_MSG_RESULT([no idea])
+-    AC_MSG_ERROR([can't figure out how to compile with POSIX threads
+-  If your system actually supports POSIX threads, this means we've messed up.])
+-fi
+-
+-AC_MSG_RESULT([CFLAGS=$foundthrflag and LIBS=$foundthrlib])
+-AC_MSG_CHECKING([POSIX threads usability])
+-AC_RUN_IFELSE([AC_LANG_SOURCE([`cat config/pthread.c`])],
+-	      [AC_MSG_RESULT([yes])],
+-              [AC_MSG_ERROR(
+-	       [it fails.  We probably guessed the wrong CFLAGS.])],
+-	      [AC_MSG_RESULT([can't test because we are cross-compiling])])
++AX_PTHREAD(
++  [LIBS="$PTHREAD_LIBS $LIBS"
++  CFLAGS="$CFLAGS $PTHREAD_CFLAGS"],
++  AC_MSG_ERROR([Could not find out how to enable POSIX threads]))
+ 
+ dnl
+ dnl Are we on a system (like Solaris) that requires promiscuous mode in order to
diff --git a/net-analyzer/iftop/files/iftop-1.0_pre4-tinfo.patch b/net-analyzer/iftop/files/iftop-1.0_pre4-tinfo.patch
new file mode 100644
index 000000000000..bb14b3c6ca47
--- /dev/null
+++ b/net-analyzer/iftop/files/iftop-1.0_pre4-tinfo.patch
@@ -0,0 +1,55 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -25,7 +25,7 @@ iftop_SOURCES = addr_hash.c edline.c hash.c iftop.c ns_hash.c \
+ #		 addrs_ioctl.c addrs_dlpi.c dlcommon.c \
+ #		 stringmap.c cfgfile.c 
+ 
+-
++iftop_LDADD = $(ncurses_LIBS)
+ 
+ noinst_HEADERS = addr_hash.h ether.h ethertype.h extract.h hash.h iftop.h \
+                  integers.h ip.h llc.h ns_hash.h options.h resolver.h \
+--- a/configure.ac
++++ b/configure.ac
+@@ -348,29 +348,27 @@
+ dnl AC_SEARCH_LIBS....
+ dnl
+ 
+-AC_MSG_CHECKING([for a curses library containing mvchgat])
+-oldLIBS=$LIBS
+-for curseslib in ncursesw curses ncurses ; do
+-    LIBS="$oldLIBS -l$curseslib"
+-    AC_TRY_LINK([
++PKG_CHECK_MODULES([ncurses], [ncursesw], [foundcurseslib="$ncurses_LIBS"], [
++    PKG_CHECK_MODULES([ncurses], [ncurses], [foundcurseslib="$ncurses_LIBS"], [
++    AC_MSG_CHECKING([for a curses library containing mvchgat])
++    oldLIBS=$LIBS
++    for curseslib in ncursesw curses ncurses ; do
++        LIBS="$oldLIBS -l$curseslib"
++        AC_TRY_LINK([
+ #include <$curseslib.h>
+         ], [
+         mvchgat(0, 0, 1, A_REVERSE, 0, NULL)
+         ], [
+-        foundcurseslib=$curseslib
++        foundcurseslib=-l$curseslib
+         break
+         ])
+-done
+-
+-if test x$foundcurseslib = x ; then
+-    AC_MSG_RESULT([none found])
++    done
++	],
+     AC_MSG_ERROR([Curses! Foiled again!
+   (Can't find a curses library supporting mvchgat.)
+   Consider installing ncurses.])
+-else
+-    AC_MSG_RESULT([-l$foundcurseslib])
+-fi
+-
++	)
++])
+ 
+ dnl
+ dnl POSIX threads. Different systems like different combinations of flags,
diff --git a/net-analyzer/iftop/files/iftop-1.0_pre4-tsent-set-but-not-used.patch b/net-analyzer/iftop/files/iftop-1.0_pre4-tsent-set-but-not-used.patch
new file mode 100644
index 000000000000..5e12b341fe97
--- /dev/null
+++ b/net-analyzer/iftop/files/iftop-1.0_pre4-tsent-set-but-not-used.patch
@@ -0,0 +1,12 @@
+--- a/ui_common.c
++++ b/ui_common.c
+@@ -263,9 +263,6 @@
+ 	} u_screen_line = { &screen_line };
+         addr_pair ap;
+         int i;
+-        int tsent, trecv;
+-        tsent = trecv = 0;
+-
+ 
+         ap = *(addr_pair*)n->key;
+ 
diff --git a/net-analyzer/iftop/files/iftoprc b/net-analyzer/iftop/files/iftoprc
new file mode 100644
index 000000000000..83b136952734
--- /dev/null
+++ b/net-analyzer/iftop/files/iftoprc
@@ -0,0 +1,59 @@
+
+# Sets the network interface to if.
+# interface: if
+interface: ppp0
+
+# Controls reverse lookup of IP addresses.
+# dns-resolution: (yes|no)
+dns-resolution: yes
+
+# Controls conversion of port numbers to service names.
+# port-resolution: (yes|no)
+port-resolution: yes
+
+# Sets the filter code to bpf.
+# filter-code: bpf
+
+# Controls display of bar graphs.
+# show-bars: (yes|no)
+show-bars: yes
+
+# Puts the interface into promiscuous mode.
+# promiscuous: (yes|no)
+
+# Controls display of port numbers.
+# port-display: (off|source-only|destination-only|on)
+port-display: on
+
+# Hides source host names.
+# hide-source: (yes|no)
+
+# Hides destination host names.
+# hide-destination: (yes|no)
+
+# Use bytes for bandwidth display, rather than bits.
+# use-bytes: (yes|no)
+use-bytes: yes
+
+# Sets which column is used to sort the display.
+# sort: (2s|10s|40s|source|destination)
+
+# Controls the appearance of each item in the display.
+# line-display: (two-line|one-line-both|one-line-sent|one-line-received)
+
+# Shows cummulative total for each item.
+# show-totals: (yes|no)
+show-totals: yes
+
+# Use a logarithmic scale for bar graphs.
+# log-scale: (yes|no)
+
+# Fixes the maximum for the bar graph scale to bw, e.g. "10M"
+# max-bandwidth: bw
+
+# Defines an IP network boundary for determining packet direction.
+# net-filter: net/mask
+
+# Sets a regular expression to filter screen output.
+# screen-filter: regexp
+
diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild
new file mode 100644
index 000000000000..bcbf844fda31
--- /dev/null
+++ b/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="display bandwidth usage on an interface"
+SRC_URI="http://www.ex-parrot.com/pdw/iftop/download/${P/_/}.tar.gz"
+HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses:0=
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}"/${P/_/}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-configure.ac.patch \
+		"${FILESDIR}"/${P}-Makefile.am.patch \
+		"${FILESDIR}"/${P}-tsent-set-but-not-used.patch
+
+	# bug 490168
+	cat "${FILESDIR}"/ax_pthread.m4 >> "${S}"/acinclude.m4 || die
+
+	eautoreconf
+}
+
+src_install() {
+	dosbin iftop
+	doman iftop.8
+
+	dodoc AUTHORS ChangeLog README "${FILESDIR}"/iftoprc
+}
diff --git a/net-analyzer/iftop/iftop-1.0_pre4.ebuild b/net-analyzer/iftop/iftop-1.0_pre4.ebuild
new file mode 100644
index 000000000000..84f5ff4d23af
--- /dev/null
+++ b/net-analyzer/iftop/iftop-1.0_pre4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="display bandwidth usage on an interface"
+SRC_URI="http://www.ex-parrot.com/pdw/iftop/download/${P/_/}.tar.gz"
+HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses:0="
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}"/${P/_/}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+
+	# bug 490168
+	cat "${FILESDIR}"/ax_pthread.m4 >> "${S}"/acinclude.m4 || die
+	epatch "${FILESDIR}"/${P}-pthread.patch
+
+	eautoreconf
+}
+
+src_install() {
+	dosbin iftop
+	doman iftop.8
+
+	dodoc AUTHORS ChangeLog README "${FILESDIR}"/iftoprc
+}
diff --git a/net-analyzer/iftop/metadata.xml b/net-analyzer/iftop/metadata.xml
new file mode 100644
index 000000000000..789a44405524
--- /dev/null
+++ b/net-analyzer/iftop/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/ike-scan/Manifest b/net-analyzer/ike-scan/Manifest
new file mode 100644
index 000000000000..71c4ba57e09b
--- /dev/null
+++ b/net-analyzer/ike-scan/Manifest
@@ -0,0 +1,6 @@
+DIST ike-scan-1.9.tar.gz 1412689 SHA256 05d15c7172034935d1e46b01dacf1101a293ae0d06c0e14025a4507656f1a7b6 SHA512 c586ad4d485f04398c2800af5ced1392eee0f7f7d7d117602be45134a47442b38c4fa23fbbf137af5a37298b471a6bcdd6e94559dde695d06e96dd39f0681906 WHIRLPOOL 9d9b5a470466994e90b92d8bd50bcd14683b49175207c88949f1e22234677d676ca0268998c26cab47f6377a6bef60e2ba661812a9299a6276e66da81586e4af
+EBUILD ike-scan-1.9-r1.ebuild 790 SHA256 7441e07d827dd0311b1c0645415b2b2d17fa3f0bc6c2d6d176340a7c6dad09f2 SHA512 cc93382f90b009c9971b5b01ac1589669fbbb6dbec594772611c7b46975530484b513d6beb440832a107592bdcb1fbe5b6190aa0093b7533fa5e575cb93b29fc WHIRLPOOL aac59becfc7593d83c9bc53a9648138475143b401c5fad1183ddfc468ac656fc32e1e236c5f4166d812c34da0de27588a5f68b00f6d7b74f17a422a9cfa84779
+EBUILD ike-scan-1.9-r2.ebuild 855 SHA256 72fd9bbd7cc2fa9eaabd7e1c12e7fec3e759ef885236da7bb4a4ae105f790634 SHA512 179bd4cf30f3fba5f6900673108f7d4811d3d7ede731d830b93fcd2c16bd410092e4d39ddc89e2f342895cb4c7e31e773aeea0c269f6992ffe98af896da5c4b8 WHIRLPOOL 8da831795b9c53771e892bf2df85655f66bff6eee186def2e73f478b8ab94917c5845364c8341c6b7cb99c8dfae6adf8b3f6f340542924d4f0cd92364e0911d4
+MISC ChangeLog 2609 SHA256 05eae3cb48fc063129a46362263d522bc5085e9608d224d285256ac6e17bba87 SHA512 b271884b8f6447d033818f9fa63de6633f8121985958cf61afa2ee38cdf1aa66ff1a19cc03111d66a3da3cd27110c58168637e459d07cb24bbafa3c1c1fd3a35 WHIRLPOOL 34cdb18426b0a9284992cf5fd835c9d009c55fa7ba0f784a8ad643c82155fa1957f38c3d7386e5821ca1c69a6dfd30ad5b3dd6aeaa27e6f857b1d33cc2b8a576
+MISC ChangeLog-2015 2025 SHA256 6cc4abbf406b80bf18fe62e150079d38f1e9daae0b445251470eb7558b23402d SHA512 28805507044c1142224e0b07cf4d683979ddf16da761263ba7662a864d8f355128a00f6d48cd3e6979fb48d826a527e2cb3dd47961f30a323a10db7dfe02190e WHIRLPOOL 220ac446199770cc81bbf16e6f86459cd24e8de364c9c44db852d571d116c6c31724ae889fa10b38c7f37451ae0d55b3d2e6ef8846b810867c672ba7a010b41b
+MISC metadata.xml 280 SHA256 b04c5b9d91f6c4d6e36583488fd032751034d1e035085609c9bdf7677cf1e83f SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef WHIRLPOOL 6f3756b9ac748acccb6ac5a4de133cf93988e8c904f606376fecbb6a21ce038e86437fecca43b2521538da2570d33ff1a6a1e0cab290a3d71a9b4f2734f16328
diff --git a/net-analyzer/ike-scan/ike-scan-1.9-r1.ebuild b/net-analyzer/ike-scan/ike-scan-1.9-r1.ebuild
new file mode 100644
index 000000000000..72e47e829d53
--- /dev/null
+++ b/net-analyzer/ike-scan/ike-scan-1.9-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="A utility for finding, fingerprinting and testing IKE VPN servers"
+HOMEPAGE="http://www.nta-monitor.com/ike-scan/"
+SRC_URI="http://www.nta-monitor.com/ike-scan/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE="ssl"
+
+DEPEND="ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Fix buffer overflow, bug #277556
+	sed \
+		-e "/MAXLINE/s:255:511:g" \
+		-i ike-scan.h || die
+}
+
+src_configure() {
+	# --disable-lookup prevents ike-scan from phoning home
+	# for more information, please see bug 157507
+	econf $(use_with ssl openssl) --disable-lookup
+}
+
+src_install() {
+	default
+	dodoc udp-backoff-fingerprinting-paper.txt
+}
diff --git a/net-analyzer/ike-scan/ike-scan-1.9-r2.ebuild b/net-analyzer/ike-scan/ike-scan-1.9-r2.ebuild
new file mode 100644
index 000000000000..6fa3edca229f
--- /dev/null
+++ b/net-analyzer/ike-scan/ike-scan-1.9-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A utility for finding, fingerprinting and testing IKE VPN servers"
+HOMEPAGE="http://www.nta-monitor.com/ike-scan/"
+SRC_URI="http://www.nta-monitor.com/ike-scan/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="libressl ssl"
+
+DEPEND="ssl? (
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+)"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Fix buffer overflow, bug #277556
+	sed \
+		-e "/MAXLINE/s:255:511:g" \
+		-i ike-scan.h || die
+}
+
+src_configure() {
+	# --disable-lookup prevents ike-scan from phoning home
+	# for more information, please see bug 157507
+	econf $(use_with ssl openssl) --disable-lookup
+}
+
+src_install() {
+	default
+	dodoc udp-backoff-fingerprinting-paper.txt
+}
diff --git a/net-analyzer/ike-scan/metadata.xml b/net-analyzer/ike-scan/metadata.xml
new file mode 100644
index 000000000000..2c2a7923cfc8
--- /dev/null
+++ b/net-analyzer/ike-scan/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/ipaudit/Manifest b/net-analyzer/ipaudit/Manifest
new file mode 100644
index 000000000000..15276320ea75
--- /dev/null
+++ b/net-analyzer/ipaudit/Manifest
@@ -0,0 +1,5 @@
+DIST ipaudit-1.0BETA2.tar.gz 135680 SHA256 86610d06166eb74bcfb1619403f359ff0d82503e11a3bc8128e0eb927920e4d4 SHA512 3a8890821c515aea95762eeb2cc7a649533ff739984c944bcb26acb72434e1f2b453a98365719fce9e062d6262b9d76ac389f149ad2a19361422783bc0b55e09 WHIRLPOOL b1116a32906d931210afb6b2e5f40c5a6c6abc739c2cc711a5f0c5e08cb39bbe574a70545c2a6696043d1ebd2d9d4b5c6fe7b2c1b88bc8a4acffcd40e565cf61
+EBUILD ipaudit-1.0_beta2.ebuild 642 SHA256 6dfe61cdf2d56aaac66809d0904b2f09b8a9558ddf5661dd1c729e8478a8c157 SHA512 734a922c2b8acc1af892005b3e301b69ddb2a856a2570d0bf1129683493bacb5bfa59f82d942f5ae7684c33066cd88de91035a9fade934ce285a7343579a8c50 WHIRLPOOL a2d99adf6e21479cce670259962c7d4f0769d899d4b55188afb5fdd1bcf3ee9416924c20fc90c4b45241ceee5152c230f5000b3a5b04e4df40bc317be10e343b
+MISC ChangeLog 2188 SHA256 3aa6ecf8b087a373c9a8b7d6cdbdae6d930d758ba5f5e23e5e2b6955200ce91a SHA512 a6864a6b79b560df681342182b5a8f4dc866b303119413fa87996aebc1d5d446962d749e1c059b28779f4276da90a03ebfa78c0478f118ece9d5c3a59326c4d1 WHIRLPOOL 8fd361e493c38027eb857c6c2682c21a0cb99bd4874315f14d79adcb2eacb855ddad98089146cb14bbb2fc2a3b53418983d7360adaa7f495d4bc809a67f1fcdd
+MISC ChangeLog-2015 1563 SHA256 9863318b1b68aa3fe6eabea8bff230118e65805c73768d96c6a685071abd66e7 SHA512 3f0ba19677265df37c4d65c4ca94a902c1cade7b902087013b1118529649ab3d02b9a2fdaeea27dffc9053d4ce8093654fb5f987bad96700d0ce35366f846732 WHIRLPOOL fac9e06fd740be0c270f3a688cbe688194b7bfe03cb164a187ceb6df0b990ea281779f9825b4a4aa40ab51610006e6557374266a4f9275e5082189d4d4a292e2
+MISC metadata.xml 337 SHA256 06c2442d70935166921a536a79646533139f421433cd3e959c4d23b1797b773a SHA512 58c8b84ff4dc9e733926d97333c6bee74a769c4e08e6505ff72c317bd55099536e8cba81361d173d501f9b53efdb8d9f3c8c5e60ab79f5b03a63c4cc2ab9ca34 WHIRLPOOL 55822148db297129abe5494b20971bc620478bff73c236f4e51c1f6ec35e381356d352d7c0e1ef70b12c56a5a5ab048e4605bccf1590236492eb3a823a7ad52d
diff --git a/net-analyzer/ipaudit/ipaudit-1.0_beta2.ebuild b/net-analyzer/ipaudit/ipaudit-1.0_beta2.ebuild
new file mode 100644
index 000000000000..286e77456f83
--- /dev/null
+++ b/net-analyzer/ipaudit/ipaudit-1.0_beta2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+DESCRIPTION="IPAudit monitors network activity on a network by host, protocol and port"
+HOMEPAGE="http://ipaudit.sourceforge.net/"
+MY_P="${PN}-${PV/_beta/BETA}"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE="mysql"
+DEPEND="net-libs/libpcap
+		mysql? ( virtual/mysql )"
+#RDEPEND=""
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	econf `use_with mysql` || die
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS README
+}
diff --git a/net-analyzer/ipaudit/metadata.xml b/net-analyzer/ipaudit/metadata.xml
new file mode 100644
index 000000000000..9b6b0277edf6
--- /dev/null
+++ b/net-analyzer/ipaudit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>robbat2@gentoo.org</email>
+    <name>Robin H. Johnson</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">ipaudit</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/ipband/Manifest b/net-analyzer/ipband/Manifest
new file mode 100644
index 000000000000..ddf5c0e8ad61
--- /dev/null
+++ b/net-analyzer/ipband/Manifest
@@ -0,0 +1,8 @@
+AUX ipband-0.8.1-gentoo.patch 353 SHA256 13dbfc565bbd6aa41dfe4c6f54aad3773edf451ed4ae223baa1da716ef971825 SHA512 4d07dfeac19d5c7e0f82007082ef902c5b736aaf26d53dda2c66941f198e9dc0c1c1506c939eae7a491891c3b5bf988cdba37366d5b21005a66503b835fda16e WHIRLPOOL 19c44e28a552d35c5a7e9e58ebc0d25c476546c4452f85e7a4e042ac29e6bcc1978908605df9894532b6445e0a3fe1be7d8a3627d728be0a710cbc729aafe2c3
+AUX ipband-0.8.1-postfix.patch 447 SHA256 b84ba07267717d80fa03d2ebc37b2fb8c7f8e9f89ed2895c0054dadcefe47402 SHA512 9f7948e6bbaba4c7bf9c0fde4c21735a176b522a5765f8c05b4747dabdef1a80f600d2dbb95a24561346edde294f5ad8f3d60a139130149fa320f03701fee9a3 WHIRLPOOL 625ddadbf6ea454ec5eb636caec901f42be920a14e4c7cf10665c8816f8f2bfe8271f7e88fa11d8ec2355a455d642345a7d021addfaa98499b28c1e123d7c836
+AUX ipband-init 449 SHA256 eb51c9aac9d489eebbad502f8ae2898c7992df0ef55aa1dbbf1263bac98a0417 SHA512 0a95f80bbfcc26c089a196ba359812a3292e08f378e94140605d2e4d378c60528af013738268055028c40d45b769317f6f631f1af9330f983172c92180999467 WHIRLPOOL 9f72666e3a786a9dc6595e2643b57c1e13b920a3bf6962bc670c5bd40e28bccee425f145a04787d4f5eea39ede97142abac255960142fa61398f0e27b2aa918f
+DIST ipband-0.8.1.tgz 36675 SHA256 f0a5860647d5364df812f7660d28f1ee8fbd35eb27088ab0cd445963db5806ad SHA512 66347652fee7c7426620260ae615de2f4cfeedacac21d606643e4ae8da204cc81780bfd3f4062a16a9172a78a4a7799fc97e0141750ed26b0e21c8ac2eab3c4f WHIRLPOOL 85239172494d3210bf690c3fbef9b2f867661e75f727cd4804c3c3ea1a6b3ea52fac6194e45c7f5a0c7ec0fe2011cfbeeb2f0293f47228c678707a3c5d971527
+EBUILD ipband-0.8.1-r1.ebuild 735 SHA256 d1517c093a51b2505186157b3e7627f1b70cec5dfa4bf78b89cff93aa5602ced SHA512 6439330ff316aea465e36cc46aaa7b975fe1d80be4c48cab259b907f2cf442338b3f7507b4d08b3cbf045b6c9f148918719ada77edbc9d8d898dcf1944c19e55 WHIRLPOOL 92fa508272c74127726c7b6b4e4ad47e26a2b3eb04ef8ea8126c7a7be1c784ffbeccc8d2ac1e08b4f84e544f4482610b6228fc02987f08ed65878203645b1788
+MISC ChangeLog 3199 SHA256 bc94a49f4cd3ebbde58b44d8519c520899f54d86da369c7b1a7a52699ee591d7 SHA512 8067af74f0dfb9f8b7fa2d5d3a9ac3161dc3b723f50a9b75cc5e9d61209627be6aff12d416e3784d698c80a70d6af53537d7fb548d29f28092f631d2c45b78c6 WHIRLPOOL a75a16ca19fef4bd1a64a7193abd0e58ab2e6540ec787896332aee04fe6100bc0cd80e137b3e3bd271636b5d884a93d5b3b61c0cb137c2d24d178002ce467b54
+MISC ChangeLog-2015 1758 SHA256 730693d6b6ecdad40c243e99dd42e5019a99c98cab01828f84d142696b555c28 SHA512 cdf5b04d81944c509257a75497e1151301130e812d671e2f3ba9fef52d6ced63ceda0f84236cbcdfde3e05535056b1c5f8a5dc4b9cfbcf12e55185da15f9d86e WHIRLPOOL 7f5b67fde2c0dc4ae77e79cd42a8819afb8bdad6ed74d4c11846434120eeef7f58b37a3e1607dcb1a42ba8f2497064766bdbf69be4eb61b379010385560c98f8
+MISC metadata.xml 356 SHA256 b0843bde0bc4c7d90061d446c08736af73f535096b63786dc5235c535bd3599a SHA512 6c8c90ab34232d8be24772a9dca38941823d65270cff167a9ac3eff89c00d447e881fa2dade1201dccece369a7c6e52fb265ff15e33799c8fccfe3adf2c56399 WHIRLPOOL a5a36032419cde7ae9c21a6cacc9ff318a6b1a413a7ce18866ca071b94b768b4295640be1071f737e2990ce5a7ade17a1ba6245e3b8d6f7bf202460103551f09
diff --git a/net-analyzer/ipband/files/ipband-0.8.1-gentoo.patch b/net-analyzer/ipband/files/ipband-0.8.1-gentoo.patch
new file mode 100644
index 000000000000..e3929da8cfb4
--- /dev/null
+++ b/net-analyzer/ipband/files/ipband-0.8.1-gentoo.patch
@@ -0,0 +1,20 @@
+--- a/Makefile
++++ b/Makefile
+@@ -12,7 +12,6 @@
+ CPPFLAGS=-I/usr/include/pcap
+ LIBS=-lpcap
+ CFLAGS := -Wall $(CFLAGS)
+-CC=gcc 
+ 
+ ifndef PREFIX
+ PREFIX=/usr
+@@ -49,8 +48,7 @@
+ all: 	$(BIN)
+ 
+ $(BIN):	$(OBJ_C)
+-	$(CC) -o $(BIN) $(OBJ_C) $(LIBS) $(CFLAGS)
+-	strip $(BIN)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $(BIN) $(OBJ_C) $(LIBS)
+ 
+ install-strip:	install
+ 
diff --git a/net-analyzer/ipband/files/ipband-0.8.1-postfix.patch b/net-analyzer/ipband/files/ipband-0.8.1-postfix.patch
new file mode 100644
index 000000000000..9db8313afb30
--- /dev/null
+++ b/net-analyzer/ipband/files/ipband-0.8.1-postfix.patch
@@ -0,0 +1,13 @@
+--- a/ipband.sample.conf
++++ b/ipband.sample.conf
+@@ -61,7 +61,10 @@
+ #   MTA string. Default is "/usr/sbin/sendmail -t -ba". Change it to
+ #   whatever runs MTA of your choice. Note that the stringis tokenized and 
+ #   passed to exec(), so that shell's metacharacters are not interpreted.
++# Sendmail
+ #mtastring "/usr/sbin/sendmail -t -ba"
++# Postfix
++#mtastring "/usr/sbin/sendmail -t"
+ 
+ #   Default number of subnet mask bits.
+ #maskbits 24
diff --git a/net-analyzer/ipband/files/ipband-init b/net-analyzer/ipband/files/ipband-init
new file mode 100644
index 000000000000..aa3474129eb5
--- /dev/null
+++ b/net-analyzer/ipband/files/ipband-init
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting ipband"
+	start-stop-daemon --start --exec /usr/bin/ipband -- -F > /dev/null
+	if [ $? -ne 0 ]; then
+		ewarn "Check settings in /etc/ipband.conf"
+		eend 1
+	else
+		eend 0
+	fi
+}
+
+stop() {
+	ebegin "Stopping ipband"
+	start-stop-daemon --stop --exec /usr/bin/ipband
+	eend $?
+}
diff --git a/net-analyzer/ipband/ipband-0.8.1-r1.ebuild b/net-analyzer/ipband/ipband-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..1e0feff597c1
--- /dev/null
+++ b/net-analyzer/ipband/ipband-0.8.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A pcap based IP traffic and bandwidth monitor with configurable reporting and alarm abilities"
+HOMEPAGE="http://ipband.sourceforge.net/"
+SRC_URI="http://ipband.sourceforge.net/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+
+DEPEND=">=net-libs/libpcap-0.4"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-postfix.patch
+
+	tc-export CC
+}
+
+src_install() {
+	dobin ipband
+	doman ipband.8
+	dodoc CHANGELOG README
+
+	newinitd "${FILESDIR}"/ipband-init ipband
+
+	insinto /etc/
+	newins ipband.sample.conf ipband.conf
+}
diff --git a/net-analyzer/ipband/metadata.xml b/net-analyzer/ipband/metadata.xml
new file mode 100644
index 000000000000..1a6bed5f2dea
--- /dev/null
+++ b/net-analyzer/ipband/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ipband</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/ipcad/Manifest b/net-analyzer/ipcad/Manifest
new file mode 100644
index 000000000000..bf43ef5c70c9
--- /dev/null
+++ b/net-analyzer/ipcad/Manifest
@@ -0,0 +1,10 @@
+AUX ipcad-3.7-linux-2.6.27.patch 440 SHA256 72f09db7ef239ee3f0bd0c7fe80cca0d276131e2c0141a19280030ade0d2465a SHA512 08916ac3635885776d44ccd313bfae1dc85d9de0406572537aa756b152860a10d9f3155cd335e409e8831ed1ae6fe7d95f17836a54d9712bfbb2df5c79e9bf8c WHIRLPOOL e4a7210674b2974d028f0b122ed9f8bd3f9ea68051ce08422749e23bc815d07b20a6add153575b5eeb0f255211cffc34d12893e82be6fde73210f86dc25c3f54
+AUX ipcad-3.7-linux-2.6.35.patch 1219 SHA256 cb1722f230ec0c08aec3acf49f6b425d2b9ab54ab732b550a17d630d622ad03e SHA512 8781cb4074db97a06a461558b1094c2934803fbb00bc619bc97742f908ece1fed1a5303cd337a75a9e3736536d0506b38053b310b30537468a377613127074c9 WHIRLPOOL 38594a6db43565c5f0429be6483617d6e18b14f4cf3dde25720539d2ac754829d61fa7ecf280d08243fafc83b70a7db963949ade5545625b7c575f4804a98bfb
+AUX ipcad-3.7.3-signal_h.patch 480 SHA256 ada8e91fd55c50e27f861cc1dd52b2eff238c1da9318a6e7aec67f9a90cd7069 SHA512 6a1032d52575c483a0e25fa88ccb2719474c7619ea20f923fe6d8ca0358c3810277c73137e7ddd7138992f3f1ff517b3c9f354c88d862df6ab4ed71cc481f313 WHIRLPOOL 5ccf57e7cc1ae5f4240503031f68e10cac9e8db5c853644a3e09fb3aa118661018827959b590855a2b019e1949311bb2c20448a7d85788dba00cb69ef6a70526
+AUX ipcad.conf.d 320 SHA256 4962387db2452a1fb892c658da8b5ea9d816b69b5451fc0faf7670ef448b2797 SHA512 bfe0c3b988cbe1442c5637728ef2f51e58cb8f8d6752a94eb9ce42ec1ba4a1ed7129c65e11971ab227901a91e23872eb38ee47ff1bb539b04948d91d227a8944 WHIRLPOOL 9992849414b42dd354333e2efd6088ca7ba746004ad259c8d947c08f24660aaf570d5f598bfc5e2c4912a77a902e7a3323036170ca5cdab7c1cde7dc11e14920
+AUX ipcad.init 818 SHA256 8a9f9b664d679805bf1b863bf4386a2cdd0ac9dc1839e4d34fd2c9cc77205490 SHA512 638c527ea723cd1cbadf24dcafe84803575251ee465b8e0cdf4a3a8e76302190694f75153ef33086fdf47a17be335d136b9fc38dc962fbeb143c784d1e2caa3a WHIRLPOOL abb538b06c986637c60bb233ae3d82b507543b4e0af05946b545996baa89ab531ef15023e0ce60c2a8b0094d9a5ce88fb255816c7e25dc117487154064703426
+DIST ipcad-3.7.3.tar.gz 172457 SHA256 72372d46ae35e4d7cc74d96fbaf8bb0ae189aa9ecfd89026487aca790c2f0716 SHA512 a25a2551bd88727c20f969b780e09d2776bf1fe4f684b0a7a6e571bb7b5684743ade0571b7993849b65c58def4550aa88bcb52a91d5cc6c21e562627fb3b80b6 WHIRLPOOL 17f8d9f7d04dd84f83f0910c64b5c4a1aee475bbe79fe058b6ecdab0efe12fe4e04c50aff039fb9c1fa018a0ebe9acbd921f89f47707778e8d3fe625e552144d
+EBUILD ipcad-3.7.3.ebuild 1136 SHA256 2f063641dd8ec089991e7b121978a32849b6b0a340d71ee4de2fddebbcd250ad SHA512 0d158a37e82d8bf1061513c191ae19d34b076526ca8cae24aca62524c8649cd3bdf4c5027b88718a770a5a69d60476f02622dc5b938b9cc02de3b0f0b534d873 WHIRLPOOL b09e9fb9a1303512699a02fec8b726e5b2d1bbab0ba61632b78846c04fe51bb669099b0f8a35b9424485984a42bb1eaedd120c6926f83cc8d8b835c3e912d2e5
+MISC ChangeLog 2815 SHA256 d5cc9e8b45c2da94f599755290cfe9b0d20d07e2c2880759942d2ef308db31c8 SHA512 16be11d436b727e54b31869e65aecf2944580c0683aea2c78159b2bb25f4336169f4ebae5939dcc7445c1c644756986aa89e60a7c5da048c4339284477f7cfb4 WHIRLPOOL 9f8be64d5584ca71659bdcea8b6401f7df3873b4ff97b220cf4db0834771b103fd980d44a73b59e454f6684a490b2a5b34da8cd08549583b3adfbec8232f7c09
+MISC ChangeLog-2015 5845 SHA256 5d80e9be0b1e735f49cfbf42b5a036b5e75e7d48f20e27414bd9bb1718c9d64d SHA512 95fb3aa6e75f60d8a84e7d5e7da0d5ebc4b7e54cf074bed5c34ec296bd57357dbf43d0081b93415646ccfa932401ed2c11942bdccf85e3ce7462863efbb72cbe WHIRLPOOL b8731875eb12a43645d7c31d4ee047939b663af7c4c09cd954b00d151d05e29bbcbb622af34cb920e6565ddbafa44181a5c060d1bb0519c0bbe950006c392e66
+MISC metadata.xml 418 SHA256 fbbb9a4362cd2cbed06b2ac1e4224cd7764bea84e94bfe1124c0d50fa6cdf67f SHA512 b13c8bec8eb28fbd650c4448f4af8b179e284334ad1245abb7283fd45edbbf42b1d81033c3bfb693eed5a07f2190fae803f506ade5e3424d3388b59546a15afc WHIRLPOOL eef5c7f00ceaa0618857947f1cfc58dadc96c9367239bb7ff31a8fcb2467810bb815466795da4042bca64a67da29a1a1db22d15effec2ac0c9d3a4e04f5cdf7d
diff --git a/net-analyzer/ipcad/files/ipcad-3.7-linux-2.6.27.patch b/net-analyzer/ipcad/files/ipcad-3.7-linux-2.6.27.patch
new file mode 100644
index 000000000000..3b21efb4ff4e
--- /dev/null
+++ b/net-analyzer/ipcad/files/ipcad-3.7-linux-2.6.27.patch
@@ -0,0 +1,21 @@
+--- a/configure.in
++++ b/configure.in
+@@ -156,6 +156,7 @@
+ ])
+ 
+ AC_CHECK_HEADERS(asm/types.h)
++AC_CHECK_HEADERS(linux/in.h)
+ AC_CHECK_HEADERS(linux/socket.h)
+ AC_CHECK_HEADERS(linux/netlink.h,,,
+ [#ifdef HAVE_LINUX_SOCKET_H
+@@ -164,6 +165,9 @@
+ AC_CHECK_HEADERS(linux/netfilter.h,,,
+ [#ifdef HAVE_LINUX_SOCKET_H
+ #include <linux/socket.h>
++#endif
++#ifdef HAVE_LINUX_IN_H
++#include <linux/in.h>
+ #endif])
+ 
+ AC_CHECK_HEADERS(linux/if.h,,,
+
diff --git a/net-analyzer/ipcad/files/ipcad-3.7-linux-2.6.35.patch b/net-analyzer/ipcad/files/ipcad-3.7-linux-2.6.35.patch
new file mode 100644
index 000000000000..84cc52da6bfb
--- /dev/null
+++ b/net-analyzer/ipcad/files/ipcad-3.7-linux-2.6.35.patch
@@ -0,0 +1,43 @@
+Author: Peter Volkov <pva@gentoo.org>
+Fixes: https://bugs.gentoo.org/show_bug.cgi?id=335592
+
+i686-pc-linux-gnu-gcc -DIPCAD_VERSION=\"3.7.2\" -DCONFIG_FILE=\"/etc/ipcad.conf\" -DHAVE_CONFIG_H -D_REENTRANT -D_THREAD_SAFE -DPSRC_pcap -DIFST_linux -O2 -pipe -O2 -pipe -I/usr/local/include -DHAVE_CONFIG_H -W -Wall -o dump.o -c dump.c
+In file included from ipcad.h:33:0,
+                 from disp.c:29:
+		 psrc.h:93:23: error: field ‘peer’ has incomplete type
+
+--- a/configure.in
++++ b/configure.in
+@@ -155,17 +155,29 @@
+ #endif
+ ])
+ 
+-AC_CHECK_HEADERS(asm/types.h)
+-AC_CHECK_HEADERS(linux/in.h)
++AC_CHECK_HEADERS(asm/types.h sys/socket.h)
++AC_CHECK_HEADERS(linux/in.h linux/in6.h,,,
++[#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif])
+ AC_CHECK_HEADERS(linux/socket.h)
+ AC_CHECK_HEADERS(linux/netlink.h,,,
+ [#ifdef HAVE_LINUX_SOCKET_H
+ #include <linux/socket.h>
++#endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
+ #endif])
+ AC_CHECK_HEADERS(linux/netfilter.h,,,
+ [#ifdef HAVE_LINUX_SOCKET_H
+ #include <linux/socket.h>
+ #endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
++#ifdef HAVE_LINUX_IN6_H
++#include <linux/in6.h>
++#endif
+ #ifdef HAVE_LINUX_IN_H
+ #include <linux/in.h>
+ #endif])
+
diff --git a/net-analyzer/ipcad/files/ipcad-3.7.3-signal_h.patch b/net-analyzer/ipcad/files/ipcad-3.7.3-signal_h.patch
new file mode 100644
index 000000000000..83d0a35e01fc
--- /dev/null
+++ b/net-analyzer/ipcad/files/ipcad-3.7.3-signal_h.patch
@@ -0,0 +1,32 @@
+--- a/main.c
++++ b/main.c
+@@ -26,6 +26,8 @@
+  * $Id$
+  */
+ 
++#include <signal.h> /* signal */
++
+ #include "ipcad.h"
+ #include "cfgvar.h"
+ #include "servers.h"
+--- a/pps.c
++++ b/pps.c
+@@ -26,6 +26,7 @@
+  * $Id$
+  */
+ 
++#include <signal.h> /* sigprocmask */
+ 
+ #include "ipcad.h"
+ #include "opt.h"
+--- a/servers.c
++++ b/servers.c
+@@ -26,6 +26,8 @@
+  * $Id$
+  */
+ 
++#include <signal.h> /* pthread_kill and sigprocmask */
++
+ #include "ipcad.h"
+ #include "servers.h"
+ #include "opt.h"
diff --git a/net-analyzer/ipcad/files/ipcad.conf.d b/net-analyzer/ipcad/files/ipcad.conf.d
new file mode 100644
index 000000000000..8304b5d161e9
--- /dev/null
+++ b/net-analyzer/ipcad/files/ipcad.conf.d
@@ -0,0 +1,9 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Config file for /etc/init.d/ipcad
+
+# Any extra options you want to pass to ipcad
+# on start-up should be put here.
+# Read tables on startup (-r), daemonize (-d), and save tables on exit (-s).
+IPCAD_OPTS="-rds"
diff --git a/net-analyzer/ipcad/files/ipcad.init b/net-analyzer/ipcad/files/ipcad.init
new file mode 100644
index 000000000000..84ff3eeebf31
--- /dev/null
+++ b/net-analyzer/ipcad/files/ipcad.init
@@ -0,0 +1,36 @@
+#!/sbin/openrc-run
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ ! -f /etc/ipcad.conf ] ; then
+		eerror "No /etc/ipcad.conf file exists!"
+		return 1
+	fi
+
+	`egrep -v "(^#|^$)" /etc/ipcad.conf | grep interface > /dev/null 2>&1` || {
+		eerror "Please, configure at least one interface in /etc/ipcad.conf." ;
+		return 1 ;
+		}
+	
+	return 0
+}
+
+start() {
+	# Comment out the following line to get faster startups
+	checkconfig || return 1
+
+	ebegin "Starting ipcad"
+	start-stop-daemon --start --pidfile=/var/ipcad/run/ipcad.pid --exec /usr/sbin/ipcad -- ${IPCAD_OPTS}
+	eend $?
+}
+
+stop () {
+	ebegin "Stopping ipcad"
+	start-stop-daemon --stop --pidfile=/var/ipcad/run/ipcad.pid --exec /usr/sbin/ipcad --retry 20
+	eend $?
+}
diff --git a/net-analyzer/ipcad/ipcad-3.7.3.ebuild b/net-analyzer/ipcad/ipcad-3.7.3.ebuild
new file mode 100644
index 000000000000..e9723ab496af
--- /dev/null
+++ b/net-analyzer/ipcad/ipcad-3.7.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="IP Cisco Accounting Daemon"
+HOMEPAGE="https://sourceforge.net/projects/ipcad/ http://lionet.info/ipcad/"
+SRC_URI="mirror://sourceforge/ipcad/${P}.tar.gz"
+
+LICENSE="BSD-2 GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+RDEPEND="
+	net-libs/libpcap
+	net-firewall/iptables
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-3.7-linux-2.6.27.patch \
+		"${FILESDIR}"/${PN}-3.7-linux-2.6.35.patch \
+		"${FILESDIR}"/${P}-signal_h.patch
+
+	sed -i \
+		-e "s|^chroot = /adm/tmp;|chroot = /var/ipcad;|" \
+		-e "s|^interface|#&|" \
+		-e "s|^aggregate|#&|" \
+		-e "s|^pidfile = ipcad.pid;|pidfile = /run/ipcad.pid;|" \
+		ipcad.conf.default || die
+
+	eautoreconf
+}
+
+src_install() {
+	dodoc AUTHORS ChangeLog README BUGS FAQ ipcad.conf.simple ipcad.conf.default
+
+	dosbin ipcad
+
+	insinto /etc
+	insopts -m0600
+	newins ipcad.conf.default ipcad.conf
+
+	keepdir /var/ipcad/run
+
+	doman ipcad.8 ipcad.conf.5
+
+	newinitd "${FILESDIR}"/ipcad.init ipcad
+	newconfd "${FILESDIR}"/ipcad.conf.d ipcad
+}
diff --git a/net-analyzer/ipcad/metadata.xml b/net-analyzer/ipcad/metadata.xml
new file mode 100644
index 000000000000..007abc824220
--- /dev/null
+++ b/net-analyzer/ipcad/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>IP Cisco Accounting Daemon</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">ipcad</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/ipgen/Manifest b/net-analyzer/ipgen/Manifest
new file mode 100644
index 000000000000..da41a2f6d8c7
--- /dev/null
+++ b/net-analyzer/ipgen/Manifest
@@ -0,0 +1,4 @@
+EBUILD ipgen-9999.ebuild 443 SHA256 f5ed67999e2b19bf1e72f5ffe2cfb1ac0bf70e982c55722ce7b3bcb0f7f1f1d0 SHA512 6a087d3f58e78777a95e68c9b63814ed7262c81f8d2bc9e4c8d0acf00e7ae1fd96d607c7ee485aff016824dddd9f768ceb1a9a44802fcc9929742e45054aa5f5 WHIRLPOOL 18a592ba8363f69d27ca8fcf5418cf39aa712a1c886b6ca12e4935ce769f81cbb3068288061b810de01c4fbb3aa83653a7820ab668a88e300d7c8b7c44bb87db
+MISC ChangeLog 2423 SHA256 2075ddb54ef0761a915dc228b1cf3d3305e34f60bc5da052e8957f7020d92904 SHA512 2b7699525e4fdaf8b1716171cd0b66ac9e967d19db7755f1fe19f6564cfc62657824bfeeddc4570278307e49a1a61b36ff7269671b00a991ff48b4e38df1dfa1 WHIRLPOOL f85e5ba79763e52b17e2455d1ce0e6b65f176ba447c74fb05ac1002757293ce8747091ec5ea30dcdc56dd6c332663a1bfdaa9c6d4f7bee51092f9d65fa0c33c8
+MISC ChangeLog-2015 336 SHA256 2c33ca7fb403f29c087b5dec7b6f03feb666719a34e6eeaec649b986f527e485 SHA512 4963e688faa24252e09a4737d1f4c5b35c67e00a5f1ca0fc975d4de0e768694632526670ccdf86ef01804a34843ab62fab95450b3085424bf65feaf88c30f45a WHIRLPOOL 489ef0e378c76de963325bbede1d2a6098f68c8d12fc9510a044c75f4259b1d8af511b59c2495a5cf4a7d83c827d005d3b42b5f0fce8dafd4c305ad78c5dbb78
+MISC metadata.xml 359 SHA256 1f8342eb49f44e4446631b40c5481363f3d47f93ee3ec3f725290afa1ee7e46a SHA512 16fea253daff394dc078f806bb07eaf38bfa795f67cff59b3c8a256d0c86f375a748ac74751f04c08abde0b57b099bdfd420e53c7a3b8fb90781aa9e3f9d02aa WHIRLPOOL 14239a3272687ca4f92f2c02c200f14350a6642b5bebbfcb3839548f9ec41f9415287ec34123105ab086b0edf52f950e264699c7dca65033b4eabc061de765e0
diff --git a/net-analyzer/ipgen/ipgen-9999.ebuild b/net-analyzer/ipgen/ipgen-9999.ebuild
new file mode 100644
index 000000000000..9b3058c197fa
--- /dev/null
+++ b/net-analyzer/ipgen/ipgen-9999.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools git-r3
+
+DESCRIPTION="Generate list of IP addresses from a network specification"
+HOMEPAGE="http://www.nta-monitor.com/tools-resources/security-tools/ipgen https://github.com/royhills/ipgen"
+EGIT_REPO_URI="https://github.com/royhills/ipgen"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+
+src_prepare() {
+	eautoreconf
+}
diff --git a/net-analyzer/ipgen/metadata.xml b/net-analyzer/ipgen/metadata.xml
new file mode 100644
index 000000000000..2f99ecc465ec
--- /dev/null
+++ b/net-analyzer/ipgen/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">royhills/ipgen</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/ipguard/Manifest b/net-analyzer/ipguard/Manifest
new file mode 100644
index 000000000000..52e0a074b184
--- /dev/null
+++ b/net-analyzer/ipguard/Manifest
@@ -0,0 +1,6 @@
+AUX ipguard.confd 186 SHA256 11767d4c5647789b2c41cee51c0f390f8010c0910f8e3ee3e9e4d0c49729ff1b SHA512 efb47689d944ce77863b7cd1722bba974fbf573af2e1051c08166a535dd8284f2cc820a624531d1c60e099e6da06d59f3659ab52b4b3557f3e1f4bf5c572f58d WHIRLPOOL 66554b7994399038341d29751968d7341c76bb0e123ef877d933a9d82678b5e56fa8e62e054970417cc0d093c400059c42e467d2715050543235e78bde7b4899
+DIST ipguard-1.04.tar.gz 24566 SHA256 95bf97ae2c58827e34d40daa7065c5107d39a67eb92e2164f7758846f43c41fe SHA512 c29c3f594e09ad1c06ca7297f794ddfada48da7ec2b98786694cd6af7508cbff232889e0c90718d96519297870b93132b7b0f9f310a0e4d7a7c2d54a30ca893c WHIRLPOOL 2536d29f074fbb940dc5d8b828f1742d2712b8cbebb5374a271d7a7c2c0540642a6fc511ddbd179211ae78568e86504a6a418f6257cbbdabc01b6134187a2ab7
+EBUILD ipguard-1.04.ebuild 1146 SHA256 f3765b65934cbf1a69aa0152b2fd0f4c48c65c2b4722e101aa761d1e5e9e16f7 SHA512 5ed15737b5b9039c5ef510c60e38a657ecbfb3b02e148a673a8c879f40178484f3779285d31d4138fb01116f69435df1a02ec42cf57b14406035bb70422658b6 WHIRLPOOL f440be1d20833275814dd45781d899e3a1b02e11ac95b26d9d95934c8890e7c35de8322951a90a83d40cff6c64b2f76b04649f9ab7f402a2e16cbcca5da26d69
+MISC ChangeLog 2451 SHA256 a561e55e0547f5fca0d44deaa8642a86b3347d6af9b6d772604e2f7ac7066ce8 SHA512 80faef478f67c6787147ba6bf1ba20dd8ca52c7a0b8812f85feaf09f44d03281330b3b141719ce40c14aaff4512cf0697d48cc8eaa715f23f52c5ee1fa708df4 WHIRLPOOL a7c24fec68aca3c250d9c534dfdda4385cc1fe3709b9e5658bfb62f4651c287d9bfde898f00cdcd55fa385f09c1f031c85baacf2459d62933c7239a016cc2bb8
+MISC ChangeLog-2015 463 SHA256 02b93ec72e94a4847e434ee28837989962153d5ae2311967c7afd7585f2c1ed8 SHA512 2959f9853545890cd28da6e52652532c470b59505031b994dfb5819e0c2c4d27be98290e7573f8181a7a43a1ca4cf1a0308b6d06391d726d2adc4a877189fd4f WHIRLPOOL 988a282efb135104677f188cad863ed6b3538c180a2539ce962b92a5ac777363da9484b45bb0b104e8b1fc1b7e3ccc1dde4f95cb752033b9f20c34c618cd0ba3
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/ipguard/files/ipguard.confd b/net-analyzer/ipguard/files/ipguard.confd
new file mode 100644
index 000000000000..fc7fb66cd46c
--- /dev/null
+++ b/net-analyzer/ipguard/files/ipguard.confd
@@ -0,0 +1,8 @@
+# ipguard configuration file
+
+# IFACE - the name of the network interface you want to monitor
+# IFACE=eth0
+IFACE=eth0
+
+# OPTS - command line options (see ipguard(8)
+OPTS="-u 300 -xz -r"
diff --git a/net-analyzer/ipguard/ipguard-1.04.ebuild b/net-analyzer/ipguard/ipguard-1.04.ebuild
new file mode 100644
index 000000000000..0de7e748f4a2
--- /dev/null
+++ b/net-analyzer/ipguard/ipguard-1.04.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="Tool designed to protect LAN IP adress space by ARP spoofing"
+HOMEPAGE="http://ipguard.deep.perm.ru/"
+SRC_URI="${HOMEPAGE}files/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	net-libs/libnet
+	net-libs/libpcap
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i \
+		-e 's|-g ||g' \
+		-e 's|	@$(CC)|	$(CC)|g' \
+		-e 's| -s | |g' \
+		-e 's| -o | $(CFLAGS) $(LDFLAGS)&|g' \
+		-e 's|$(PREFIX)|${D}&|g' \
+		-e 's|/man/|/share&|g' \
+		Makefile || die
+	sed -i \
+		-e 's|opts=|extra_commands=|g' \
+		-e 's|/var/run/|/run/|g' \
+		-e 's|-u 300 -xz|${OPTS} ${IFACE}|g' \
+		doc/${PN}.gentoo || die
+	sed -i \
+		-e 's|/var/run/|/run/|g' \
+		doc/${PN}.8 ${PN}.h || die
+}
+
+src_compile() {
+	emake LIBNET_CONFIG=libnet-config CC=$(tc-getCC) PREFIX=\"${EPREFIX:-/usr}\"
+}
+
+src_install() {
+	emake LIBNET_CONFIG=libnet-config DESTDIR="${D}" PREFIX=\"${EPREFIX:-/usr}\" install
+	newinitd doc/${PN}.gentoo ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	dodoc doc/{NEWS,README*,ethers.sample}
+}
diff --git a/net-analyzer/ipguard/metadata.xml b/net-analyzer/ipguard/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/ipguard/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/iplog/Manifest b/net-analyzer/iplog/Manifest
new file mode 100644
index 000000000000..5c4fa5a8704d
--- /dev/null
+++ b/net-analyzer/iplog/Manifest
@@ -0,0 +1,7 @@
+AUX 2.2.3-DLT_LINUX_SSL.patch 7265 SHA256 2eb802c0dab53ca2252267cbc1f6ef45bdbd6ee01bb2c971b01a006d513c7267 SHA512 de93d97688e1079e480c138abc1a25572c47f2e045f70c98b7ba2c2098bcfffdb36997aab0a4272cbe908bead503b2531543368ac35624527cb8c0640594ad4b WHIRLPOOL f0b678bdc243d2c10d120edd88ec70c41d5f4afa368f6119e382b3acf4733ff8314bd850c33f850780f87c1c420d74c966329ec5fa01ab20c8de2255c38edc9c
+AUX iplog.rc6 776 SHA256 9663dd9a7b1b8f833dae0937050d3a71043e72565428860a19a8ba068e677d79 SHA512 f0c3965810f7005e1ae183a2f3ed66ba06c054fcfd78da6277eaa364518ebffb9f44a0c99200b0d3042a63d4c57141d5b29823e8bc1d3f030e00d8e913021a34 WHIRLPOOL 8f16dc619a17a59332cb16e3f7e5962ce3caa9fe8016c45b78cc3cc6e714d83239f139f61db5cee4e7c499d666b39c029f81ff1d469a78a12c4d74dbdf55b6c6
+DIST iplog-2.2.3.tar.gz 133639 SHA256 cc3da7b6f360ff25455e5ae7c95d7377de332deb23f6dcb5c1ea11e563702fff SHA512 d7669e39b728af366b5199c58d396c6907496b4895ffb1ba0cba54fae0646f9792170f932de1eae9634b5ac356644a5d6d0ccaf7bc77a62641695992245c9aed WHIRLPOOL c654eb286f494c99d3608ac8fe363d441a242a40b6fad45df9e515ace478a0045c35f3704cc70d3320ea0b280f1d6f82d45ff858a232e4a2020d2a49b72b5a18
+EBUILD iplog-2.2.3-r2.ebuild 712 SHA256 096410a3e83970ca726560687d94f84707b2d718324a4e1357fad212f29a636e SHA512 357a32105c24519e9d433f9f0768fa1977e8fc88ff10b0001a9657c238c81df083b629212bb3d22d02749b22fa5f44a6fedd0da5c9fe9d619e271c6c4c459315 WHIRLPOOL 30c14df589b1b3229264c4c78557fc64d5a7194fba8d024d67acd1f2e2d48337f6693371adb0cdf0e20b66866bee0a0a581b6d0638e816e170b6b339a04ea64b
+MISC ChangeLog 2611 SHA256 ad34901dab4771f801c3a950db4eaea217dc92804c5ec6504a40118b92d29031 SHA512 b5680c5c129100db9d5ef51c41f9d73d724eb535dae2ea6ca943af4d2f4fb0d9885b8e2a3a837bd580aad842de68851008c20c5e3eaa3f296ed96c1a4ea34f7c WHIRLPOOL beae2520e4d471c7fef5e293e270cc819ab8d65ded9310834071ba406f01745b0be9514c4a4240c57ad7db4d2d133e2c1cf565a788a864704210d78a0d60bd27
+MISC ChangeLog-2015 2767 SHA256 a220b081b257abca13a7235aa2859fdea22909d91409bf2e47c9f59779923144 SHA512 f8a3066b8c386c88a186c072245b6ee57a189a674ee1f21f32f0c8b5295b3df71c2be828a6da5033cc63b4a3ff089fae0aa98e385e66aac770a31f02aea937b6 WHIRLPOOL 68071045c89954a2d05b4c55c5f900919e1be2fc05baba2831bf838c61f0d5a3156b38f318f1cbb4254b249f6f3e5f28dcf5ef7669f900822eb9beb01aa30859
+MISC metadata.xml 423 SHA256 9db2a95411786ea1419c0cca3cdb7a1730d5c18ff0d64b2441d70b027da631c2 SHA512 e3bd873037dd3fbbdb8fa401e2da3c8c6bb35305b63c2bb4cbc0213d5089e714b48c67fa625037b9342c5f8d136363e558583acd864e99e0f5bc591a9bec639d WHIRLPOOL 0c5c67bb177039246e3f66db15494863dd9364fcdc6771e8db8aab25e84e6e1917440cfeb57e1bf8d4d942cd554cad9e11379da16216913d4ee53e14fb7133cd
diff --git a/net-analyzer/iplog/files/2.2.3-DLT_LINUX_SSL.patch b/net-analyzer/iplog/files/2.2.3-DLT_LINUX_SSL.patch
new file mode 100644
index 000000000000..84a447af4f9f
--- /dev/null
+++ b/net-analyzer/iplog/files/2.2.3-DLT_LINUX_SSL.patch
@@ -0,0 +1,134 @@
+--- a/src/iplog_options.c
++++ b/src/iplog_options.c
+@@ -440,58 +440,58 @@
+ 
+ static void print_help(void) {
+ 	mysyslog(
+-"Usage: " PACKAGE " [options] (\"*\" Denotes enabled by default)
+---user      or -u <user|UID>     Run as specified the user or UID.
+---group     or -g <group|GID>    Run with specified the group or GID.
+---logfile   or -l <file>         Log to <file>.
+---pid-file  <file>               Use <file> as the pid file.
+---ignore    or -d                Ignore DNS traffic from nameservers listed in
+-                                 /etc/resolv.conf.
+---interface or -i <if0,...,ifN>  Listen on the specified interface(s).
+---promisc   or -a <network>      Log traffic to all hosts on <network>.
+---kill      or -k                Kill iplog, if it is running.
+---restart   or -R                Restart iplog, if it is running.
+---no-fork   or -o                Run in the foreground.
+---stdout    or -L                Log to stdout.
+---help      or -h                This help screen.
+---version   or -v                Print version information and exit.
+-
+---facility <facility>            Use the specified syslog facility.
+---priority <priority>            Use the specified syslog priority.
+-
+---tcp[=true|false|toggle]                      %cLog TCP traffic.
+---udp[=true|false|toggle]                      %cLog UDP traffic.
+---icmp[=true|false|toggle]                     %cLog ICMP traffic.
+-
+---log-ip[=true|false|toggle]            or -w  %cLog IP along with hostname.
+---log-dest[=true|false|toggle]          or -D  %cLog the destination of traffic.
+---dns-cache[=true|false|toggle]         or -c  %cUse the built-in DNS cache.
+---get-ident[=true|false|toggle]         or -e  %cGet ident info on connections
+-                                                to listening ports.
+-
+---tcp-resolve[=true|false|toggle]       or -T  %cResolve IPs of TCP traffic.
+---udp-resolve[=true|false|toggle]       or -U  %cResolve IPs of UDP traffic.
+---icmp-resolve[=true|false|toggle]      or -I  %cResolve IPs of ICMP traffic.
+---disable-resolver                      or -N  %cDo not resolve any IPs.
+-
+---verbose[=true|false|toggle]           or -V  %cBe verbose.
+---fool-nmap[=true|false|toggle]         or -z  %cFool nmap's OS detection.
+---scans-only[=true|false|toggle]        or -m  %cOnly log scans.
+---detect-syn-flood[=true|false|toggle]  or -s  %cStop resolving IPs if a
+-                                                SYN flood is detected.
+-
+---log-frag[=true|false|toggle]          or -y  %cLog fragment attacks.
+---log-traceroute[=true|false|toggle]    or -t  %cLog traceroutes.
+---log-ping-flood[=true|false|toggle]    or -P  %cLog ICMP ping floods.
+---log-smurf[=true|false|toggle]         or -S  %cLog smurf attacks.
+---log-bogus[=true|false|toggle]         or -b  %cLog bogus TCP flags.
+---log-portscan[=true|false|toggle]      or -p  %cLog port scans.
+---log-udp-scan[=true|false|toggle]      or -F  %cLog UDP scans/floods.
+---log-fin-scan[=true|false|toggle]      or -f  %cLog FIN scans.
+---log-syn-scan[=true|false|toggle]      or -q  %cLog SYN scans.
+---log-xmas-scan[=true|false|toggle]     or -x  %cLog Xmas scans.
+---log-null-scan[=true|false|toggle]     or -n  %cLog null scans.",
+-IS_DEFAULT(LOG_TCP),	IS_DEFAULT(LOG_UDP),	IS_DEFAULT(LOG_ICMP),
++"Usage: %s [options] (\"*\" Denotes enabled by default)\n"
++"--user      or -u <user|UID>     Run as specified the user or UID.\n"
++"--group     or -g <group|GID>    Run with specified the group or GID.\n"
++"--logfile   or -l <file>         Log to <file>.\n"
++"--pid-file  <file>               Use <file> as the pid file.\n"
++"--ignore    or -d                Ignore DNS traffic from nameservers listed in\n"
++"                                 /etc/resolv.conf.\n"
++"--interface or -i <if0,...,ifN>  Listen on the specified interface(s).\n"
++"--promisc   or -a <network>      Log traffic to all hosts on <network>.\n"
++"--kill      or -k                Kill iplog, if it is running.\n"
++"--restart   or -R                Restart iplog, if it is running.\n"
++"--no-fork   or -o                Run in the foreground.\n"
++"--stdout    or -L                Log to stdout.\n"
++"--help      or -h                This help screen.\n"
++"--version   or -v                Print version information and exit.\n"
++"\n"
++"--facility <facility>            Use the specified syslog facility.\n"
++"--priority <priority>            Use the specified syslog priority.\n"
++"\n"
++"--tcp[=true|false|toggle]                      %cLog TCP traffic.\n"
++"--udp[=true|false|toggle]                      %cLog UDP traffic.\n"
++"--icmp[=true|false|toggle]                     %cLog ICMP traffic.\n"
++"\n"
++"--log-ip[=true|false|toggle]            or -w  %cLog IP along with hostname.\n"
++"--log-dest[=true|false|toggle]          or -D  %cLog the destination of traffic.\n"
++"--dns-cache[=true|false|toggle]         or -c  %cUse the built-in DNS cache.\n"
++"--get-ident[=true|false|toggle]         or -e  %cGet ident info on connections\n"
++"                                                to listening ports.\n"
++"\n"
++"--tcp-resolve[=true|false|toggle]       or -T  %cResolve IPs of TCP traffic.\n"
++"--udp-resolve[=true|false|toggle]       or -U  %cResolve IPs of UDP traffic.\n"
++"--icmp-resolve[=true|false|toggle]      or -I  %cResolve IPs of ICMP traffic.\n"
++"--disable-resolver                      or -N  %cDo not resolve any IPs.\n"
++"\n"
++"--verbose[=true|false|toggle]           or -V  %cBe verbose.\n"
++"--fool-nmap[=true|false|toggle]         or -z  %cFool nmap's OS detection.\n"
++"--scans-only[=true|false|toggle]        or -m  %cOnly log scans.\n"
++"--detect-syn-flood[=true|false|toggle]  or -s  %cStop resolving IPs if a\n"
++"                                                SYN flood is detected.\n"
++"\n"
++"--log-frag[=true|false|toggle]          or -y  %cLog fragment attacks.\n"
++"--log-traceroute[=true|false|toggle]    or -t  %cLog traceroutes.\n"
++"--log-ping-flood[=true|false|toggle]    or -P  %cLog ICMP ping floods.\n"
++"--log-smurf[=true|false|toggle]         or -S  %cLog smurf attacks.\n"
++"--log-bogus[=true|false|toggle]         or -b  %cLog bogus TCP flags.\n"
++"--log-portscan[=true|false|toggle]      or -p  %cLog port scans.\n"
++"--log-udp-scan[=true|false|toggle]      or -F  %cLog UDP scans/floods.\n"
++"--log-fin-scan[=true|false|toggle]      or -f  %cLog FIN scans.\n"
++"--log-syn-scan[=true|false|toggle]      or -q  %cLog SYN scans.\n"
++"--log-xmas-scan[=true|false|toggle]     or -x  %cLog Xmas scans.\n"
++"--log-null-scan[=true|false|toggle]     or -n  %cLog null scans.",
++PACKAGE, IS_DEFAULT(LOG_TCP),	IS_DEFAULT(LOG_UDP),	IS_DEFAULT(LOG_ICMP),
+ IS_DEFAULT(LOG_IP),		IS_DEFAULT(LOG_DEST),	IS_DEFAULT(DNS_CACHE),
+ IS_DEFAULT(GET_IDENT),	IS_DEFAULT(TCP_RES),	IS_DEFAULT(UDP_RES),
+ IS_DEFAULT(ICMP_RES),	IS_DEFAULT(NO_RESOLV),	IS_DEFAULT(VERBOSE),
+--- a/src/iplog_pcap.c
++++ b/src/iplog_pcap.c
+@@ -189,8 +189,16 @@
+ 		case DLT_PPP_BSDOS:
+ 			dlt = 24;
+ 			break;
+-		case DLT_SLIP:
+-			dlt = 16;
++#ifdef DLT_FDDI
++	        case DLT_FDDI:
++	                dlt = 21;
++	                break;
++#endif
++	        case DLT_SLIP:
++#ifdef DLT_LINUX_SLL
++	        case DLT_LINUX_SLL:
++#endif
++	                dlt = 16;
+ 			break;
+ 		case DLT_PPP:
+ 		case DLT_NULL:
diff --git a/net-analyzer/iplog/files/iplog.rc6 b/net-analyzer/iplog/files/iplog.rc6
new file mode 100644
index 000000000000..031f0ce3af7c
--- /dev/null
+++ b/net-analyzer/iplog/files/iplog.rc6
@@ -0,0 +1,36 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+pidfile=/var/run/iplog.pid
+
+start() {
+	ebegin "Starting iplog"
+	checkconfig 
+	rc=$?
+	if [ $rc -eq 0 ]; then
+		start-stop-daemon --start --quiet --startas /usr/sbin/iplog \
+		--pidfile=${pidfile} --name=iplog
+		rc=$?
+		eend $rc "Failed to start iplog $rc"
+	else
+		eend $rc "/etc/iplog.conf does not exist!"
+	fi
+}
+
+stop() {
+	ebegin "Stopping iplog"
+	start-stop-daemon --stop --retry=5 --quiet --pidfile=${pidfile} --name=iplog
+	# due to a bug in the program, it doesn't properly remove it's pidfile sometimes
+	rm -f ${pidfile}
+	eend $? "Failed to stop iplog!"
+}
+
+checkconfig() {
+	[ -f /etc/iplog.conf ] || return 1
+	return 0
+}
diff --git a/net-analyzer/iplog/iplog-2.2.3-r2.ebuild b/net-analyzer/iplog/iplog-2.2.3-r2.ebuild
new file mode 100644
index 000000000000..3aa9eb1e45fc
--- /dev/null
+++ b/net-analyzer/iplog/iplog-2.2.3-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="iplog is a TCP/IP traffic logger"
+HOMEPAGE="http://ojnk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 FDL-1.1 )"
+SLOT="0"
+KEYWORDS="alpha ~mips ppc sparc x86 ~amd64"
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-DLT_LINUX_SSL.patch
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS} -D_REENTRANT" all
+}
+
+src_install() {
+	emake \
+		prefix="${D}"/usr \
+		mandir="${D}"/usr/share/man \
+		install
+
+	dodoc AUTHORS NEWS README TODO example-iplog.conf
+
+	newinitd "${FILESDIR}"/iplog.rc6 iplog
+}
diff --git a/net-analyzer/iplog/metadata.xml b/net-analyzer/iplog/metadata.xml
new file mode 100644
index 000000000000..8d4f6dcb5209
--- /dev/null
+++ b/net-analyzer/iplog/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>iplog is a TCP/IP traffic logger</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">ojnk</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/ippl/Manifest b/net-analyzer/ippl/Manifest
new file mode 100644
index 000000000000..92ae16ef779e
--- /dev/null
+++ b/net-analyzer/ippl/Manifest
@@ -0,0 +1,12 @@
+AUX ippl-1.4.14-format-warnings.patch 645 SHA256 1f677214697c8fa6a0eb02dedb3a9616eb2c0ad9bcc8b6512e4195c7ecdab3fa SHA512 e3b247d5628883c4bbc5ae24e39bf4ef0910ed15dbcc7a13d586eddbea6ee1dfa5de1c4252c07fa87564da60febbb200f0e78a58cf29547db4b7446eebc73544 WHIRLPOOL 5b24b9cc5b75347ead6fecd28e1806c60a1831fe6439c62701151ec02b930421153bfde670e20bd5f4cb9c511f64df0183dc5035130ce571d5a370af87ce6a83
+AUX ippl-1.4.14-includes.patch 374 SHA256 bffdfaa881cd176d2f6900bf387613485a9fba7b35aee68f8614a26272d7f4ea SHA512 5e7c8ab27770e3f50d09ee7e1f68246828d1b540a87c50c5c1afb3bbbe646af3b3d71369dfe2e41a1f04c306d88b8ef20f2be80edca8c201f7cb6d8c5539dfc9 WHIRLPOOL de8473f766992cec5e3e5a60380e519fa29a91ac79c2c530e5b7443cd117862e8ce81ff972855474a537702ff9dcc0a1a85df964edd97cbd8476d6b7a1698f3a
+AUX ippl-1.4.14-manpage.patch 306 SHA256 c1f1d47ce32c3133430312142e68e62c4aa243eed5afd8273ebe72e36ed04700 SHA512 4dc5b6ad12875c94a5b86ca380aeabb003734aabfd54b97edba20614b449dab35d8ba748e8faeda8a2bf2608158d4dd5c6e34c82b664ddf4fd12710ab81498ef WHIRLPOOL 67363710fc441665fa658b444961317d736214003df2ce0c383bc908afd4f34fdab4a690b797b8a8a5f66d813720557d63ecca3bbf998ad85c02fa2f64e5ca0e
+AUX ippl-1.4.14-noportresolve.patch 10610 SHA256 469f4c308379450c44399fb973c3963a1aa0dafe7dd95d1302a3a992843065ca SHA512 591a0aaaac11f80087e2f7a53a18434c065a2d29ba6a09893f2927edbd9b0622925e5bc441657f283fe4689c21bb669bfdfd71faf900d8ff9309e25885adc7e3 WHIRLPOOL a83593cfe2d126e2293b509510697955826d60560e4677be040d6b357c8f09c95e542a5c50c6c3f13202c5ba05dcd8dbf90ac9c78ff65747c9a2d58f323ff8ce
+AUX ippl-1.4.14-privilege-drop.patch 4289 SHA256 ab6839f5d9c5c74be5a8fa2cf03a236e4bc7b7096c4a5432b52ad78d39334020 SHA512 7b711bd0ac56867a6936035f63b047c1e86fe072f215dcc18eb8dada58d1087964a29b05c1eadef0303d203329a91a053e747c997d78ecd1697788e9f7a15f2f WHIRLPOOL 93cf090cb7e1db232d9979ee570e0b79c071901d8ccf78b8d1773fbec0737b34092d7fed9c279933fe3c013c323d23d0ea0da7ddcc79b0b1f55a560f83eb7fd6
+AUX ippl.rc 573 SHA256 d8c3e9b223974384a51838532010777fc4847207fa19184d708f8e42a8243b3d SHA512 2aadbb7cf33c83addef03e7815dd5d6c6a983ee0b269677d251a3b4550e2c038db4436b03a27024ea5ce12f0ca1eb2b87f33ba267e78f70afb06436119b99396 WHIRLPOOL 35f7e5a5bd5d71c2446112d96dff3d8e6e8d06ddbd41bbe11157e8a6c2b817573246568551aba574ebc2ed676cbc0dc66417b9ddfe030f079932723ae968f452
+DIST ippl-1.4.14.tar.gz 54030 SHA256 e1808c65e498036de2529d053dbaa95ba3f6821e2c7196d4dcbb5039489cfeb4 SHA512 3d71afc3ec7a0420cc9b269bf67dc008a777464c68d233dfbad4ee7a2dd2b960e114500e42866977e31b9dbeee26bbefea937fef8a09aa41cf87f96361ba0088 WHIRLPOOL aeab98a00d31583f19d4c98839f8eef4adbb263e274df2cd4065910e8a05d19e432be235de378e4039abc8465ff4fe8c11fcae1e95aa4e5dd34565acd4169c2a
+EBUILD ippl-1.4.14-r3.ebuild 1164 SHA256 14312ab7486cba9e5d4dd789b8c4585c6150b0c689935b7f6edc21286740d015 SHA512 1d840eb3757d941ba84955d80799425f45732db03151b5b00e45a6cf7e97b84ed7b4c3c017677d99748cb8d88b1b119796acc6ea01c0a5b1938022416fa85c1c WHIRLPOOL 550415122f5440dd515db8c9e426ede5d59b38411f234141f7385b0918088fac7553fd81fbdaa7654067db50fce6c8411707ab0b1560b65b075bdce83ed86720
+EBUILD ippl-1.4.14-r5.ebuild 1133 SHA256 84a34d088fd8451406ae257af59992e6a67549589accbd9c297295be133fdc82 SHA512 6da05595f41493eee312d43f6120ebb961806e949a132a28541d38e0b501305650b51e386bd08f89d709afd4b56a28380eb0014ddb56e274625e84af319669ce WHIRLPOOL 1cf97c60dc3219ad2b2d058765e8319768ee4e13119f2265abe0f324c66b997a1f7999e9b9c8ffbbf7c25aa363e44c699273b520a363c3cc155bdbd3d26e4cdc
+MISC ChangeLog 2822 SHA256 74f48cb11aa4eb8ed3d793bf9a737d759df913e55471017a670d20593ad33603 SHA512 3b8192dd83a7584fc8511dae0f980f9b8f3c8bb5eb6e1574a26ad3fcf3d571115c000e7e5d8515748d3ff882995c444251ef6d81b7aff9ac933827277960cf32 WHIRLPOOL a53cc1f6286a8fd192daab2834cd30b2b14a3bd3c9cdcd9da37b6db10d03fea393d2e15253eba4059abeb382e1601c6d00d970847af6445fab5378422d2d333b
+MISC ChangeLog-2015 4060 SHA256 2ad780985057265fdfe2aa37649897056f11d9e941736a0a5ff692c088b4aab7 SHA512 789900b4dd8e5a897e06b8ecbea08a0621d604df0cf682e4493d5623904c1d9311eefd958b72929751d5e30b4c949e36dae2d9f266dbe0097e0d6d7d6925f98b WHIRLPOOL 3d58be7ab47c86f5c1516f8772173c1e6d5803802c4577cecf6774aa10e6bc039b3a834ea984a5d10c30f6cb65ac52845c023c06d06c8975755546c85963d1fb
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/ippl/files/ippl-1.4.14-format-warnings.patch b/net-analyzer/ippl/files/ippl-1.4.14-format-warnings.patch
new file mode 100644
index 000000000000..db6cfcd7e1d0
--- /dev/null
+++ b/net-analyzer/ippl/files/ippl-1.4.14-format-warnings.patch
@@ -0,0 +1,20 @@
+--- a/Source/log.c
++++ b/Source/log.c
+@@ -147,7 +147,7 @@
+   }
+ 
+   if (repeats > 0) {
+-    snprintf(date, 27, asctime(localtime(&last_repeat)));
++    snprintf(date, 27, "%s", asctime(localtime(&last_repeat)));
+     snprintf(repeat_message, 40, "last message repeated %d time(s)\n", repeats);
+     write(fd, date+4, strlen(date)-10);
+     write(fd, " ", 1);
+@@ -155,7 +155,7 @@
+     repeats = 0;
+   }
+ 
+-  snprintf(date, 27, asctime(localtime(&current)));
++  snprintf(date, 27, "%s", asctime(localtime(&current)));
+   write(fd, date+4, strlen(date)-10);
+   write(fd, " ", 1);
+   write(fd, entry, (strlen(entry) < 1023) ? strlen(entry) : 1023 );
diff --git a/net-analyzer/ippl/files/ippl-1.4.14-includes.patch b/net-analyzer/ippl/files/ippl-1.4.14-includes.patch
new file mode 100644
index 000000000000..12b2832fa342
--- /dev/null
+++ b/net-analyzer/ippl/files/ippl-1.4.14-includes.patch
@@ -0,0 +1,20 @@
+--- a/Source/filter.c
++++ b/Source/filter.c
+@@ -22,6 +22,7 @@
+ 
+ #include <stdlib.h>
+ #include <ctype.h>
++#include <string.h> /* memcpy() */
+ 
+ #include <fnmatch.h>
+ 
+--- a/Source/main.c
++++ b/Source/main.c
+@@ -37,6 +37,7 @@
+ #include <pwd.h>
+ #include <stdlib.h>
+ #include <getopt.h>
++#include <grp.h> /* initgroups() */
+ 
+ #include "defines.h"
+ #include "configuration.h"
diff --git a/net-analyzer/ippl/files/ippl-1.4.14-manpage.patch b/net-analyzer/ippl/files/ippl-1.4.14-manpage.patch
new file mode 100644
index 000000000000..d17e5939cdee
--- /dev/null
+++ b/net-analyzer/ippl/files/ippl-1.4.14-manpage.patch
@@ -0,0 +1,15 @@
+patch by Marc Haber <mh+debian-packages@zugschlus.de>
+
+--- a/Docs/ippl.conf.man
++++ b/Docs/ippl.conf.man
+@@ -222,9 +222,7 @@
+ .SS Protocol
+ .PP
+ protocol is one of the supported protocols (see the protocols
+-section), except the
+-.I all
+-keyword, which is not supported.
++section).
+ 
+ .SS Description
+ .PP
diff --git a/net-analyzer/ippl/files/ippl-1.4.14-noportresolve.patch b/net-analyzer/ippl/files/ippl-1.4.14-noportresolve.patch
new file mode 100644
index 000000000000..919623040f7f
--- /dev/null
+++ b/net-analyzer/ippl/files/ippl-1.4.14-noportresolve.patch
@@ -0,0 +1,347 @@
+patch by Marc Haber <mh+debian-packages@zugschlus.de>
+
+--- a/Docs/ippl.conf.man
++++ b/Docs/ippl.conf.man
+@@ -92,6 +92,13 @@
+ .PP
+ By default, IP address resolution is disabled for all the protocols.
+ 
++Ippl by default resolves tcp/udp port numbers to their respective
++service names. If you pass a protocol to the noportresolve option,
++ippl logs the port number instead. This is a Debian specific extension.
++
++By default service resolving is enabled, since this is the behaviour
++of the upstream program.
++
+ .SH LOGGING FORMAT
+ 
+ .BR ippl
+@@ -198,6 +205,12 @@
+ .I noresolve
+ disable IP address resolution.
+ .PP
++.I portresolve
++enable IP service resolution.
++.PP
++.I noportresolve
++disable IP service resolution.
++.PP
+ .I ident
+ use ident logging (only for TCP).
+ .PP
+
+--- a/Source/configuration.c
++++ b/Source/configuration.c
+@@ -60,6 +60,7 @@
+   extern unsigned int dns_expire;
+   extern unsigned short log_protocols;
+   extern unsigned short resolve_protocols;
++  extern unsigned short portresolve_protocols;
+   extern unsigned short icmp_format;
+   extern unsigned short tcp_format;
+   extern unsigned short udp_format;
+@@ -71,6 +72,7 @@
+   dns_expire = DNS_EXPIRE;
+   log_protocols = NONE;
+   resolve_protocols = 0; /* Do not resolve by default */
++  portresolve_protocols = RUN_TCP | RUN_UDP | RUN_ICMP; /* Resolve by default */
+   icmp_format = LOGFORMAT_NORMAL;
+   tcp_format = LOGFORMAT_NORMAL;
+   udp_format = LOGFORMAT_NORMAL;
+
+--- a/Source/filter.c
++++ b/Source/filter.c
+@@ -46,6 +46,7 @@
+ 
+ extern unsigned short use_ident;
+ extern unsigned short resolve_protocols;
++extern unsigned short portresolve_protocols;
+ extern unsigned short icmp_format;
+ extern unsigned short tcp_format;
+ extern unsigned short udp_format;
+@@ -66,7 +67,7 @@
+ #ifdef FILTER_DEBUG
+ void display_info(struct log_info *info, int entries) {
+ 
+-  log.log(log.level_or_fd, "DBG: (e:%d) log:%d ident:%d resolve:%d closing:%d format:%d", entries, info->log, info->ident, info->resolve, info->logclosing, info->logformat);
++  log.log(log.level_or_fd, "DBG: (e:%d) log:%d ident:%d resolve:%d portresolve: %d, closing:%d format:%d", entries, info->log, info->ident, info->resolve, info->portresolve, info->logclosing, info->logformat);
+ }
+ #endif
+ 
+@@ -200,6 +201,19 @@
+       break;
+     }
+   }
++  if (info->portresolve == -1) {
++    switch (protocol) {
++    case IPPROTO_ICMP:
++      info->portresolve = portresolve_protocols & RUN_ICMP;
++      break;
++    case IPPROTO_TCP:
++      info->portresolve = portresolve_protocols & RUN_TCP;
++      break;
++    case IPPROTO_UDP:
++      info->portresolve = portresolve_protocols & RUN_UDP;
++      break;
++    }
++  }
+ }
+ 
+ struct log_info do_log(const __u32 from, const __u32 to, const __u16 type, const __u16 srctype, const short protocol) {
+@@ -244,6 +258,7 @@
+         info.log = p->log;
+         info.ident = p->ident;
+         info.resolve = p->resolve;
++        info.portresolve = p->portresolve;
+         info.logformat = p->logformat;
+         info.logclosing = p->logclosing;
+         set_defaults(protocol, &info);
+@@ -265,6 +280,7 @@
+         info.log = p->log;
+         info.ident = p->ident;
+         info.resolve = p->resolve;
++        info.portresolve = p->portresolve;
+         info.logformat = p->logformat;
+         set_defaults(protocol, &info);
+ #ifdef FILTER_DEBUG
+@@ -280,7 +296,7 @@
+   info.log = TRUE;
+   info.ident = use_ident;
+   info.logclosing = log_closing;
+-  info.logformat = info.resolve = -1;
++  info.logformat = info.resolve = info.portresolve = -1;
+   set_defaults(protocol, &info);
+ 
+ #ifdef FILTER_DEBUG
+
+--- a/Source/filter.h
++++ b/Source/filter.h
+@@ -53,6 +53,7 @@
+ struct filter_entry {
+   short log;		/* TRUE for "log", FALSE for "ignore" */
+   short ident;          /* TRUE if we should use ident */
++  short portresolve;    /* TRUE if we should resolve TCP/UDP services */
+   short resolve;        /* TRUE if we should resolve IP addresses */
+   short logformat;      /* format used to log */
+   short logclosing;     /* TRUE to log closing TCP connections */
+@@ -72,6 +73,7 @@
+   short log;
+   short ident;
+   short resolve;
++  short portresolve;
+   short logclosing;
+   short logformat;
+ };
+
+--- a/Source/ippl.l
++++ b/Source/ippl.l
+@@ -75,6 +75,9 @@
+ [lL][oO][gG][cC][lL][oO][sS][iI][nN][gG] return LOGCLOSING;
+ [nN][oO][lL][oO][gG][cC][lL][oO][sS][iI][nN][gG] return NOLOGCLOSING;
+ 
++[nN][oO][pP][oO][rR][tT][rR][eE][sS][oO][lL][vV][eE] return NOPORTRESOLVE;
++[pP][oO][rR][tT][rR][eE][sS][oO][lL][vV][eE] return PORTRESOLVE;
++
+ [nN][oO][rR][eE][sS][oO][lL][vV][eE] return NORESOLVE;
+ [rR][eE][sS][oO][lL][vV][eE] return RESOLVE;
+ 
+
+--- a/Source/ippl.y
++++ b/Source/ippl.y
+@@ -61,6 +61,7 @@
+ 
+ /* Should name resolving be done? */
+ unsigned short resolve_protocols;
++unsigned short portresolve_protocols;
+ 
+ /* Logging format for each protocol */
+ unsigned short icmp_format;
+@@ -100,7 +101,7 @@
+ %token<stringval> IP HOSTMASK IDENTIFIER FILENAME
+ %token<longval> NUMBER
+ 
+-%token LOGFORMAT DETAILED SHORT NORMAL RESOLVE NORESOLVE IDENT NOIDENT LOGCLOSING NOLOGCLOSING
++%token LOGFORMAT DETAILED SHORT NORMAL RESOLVE NORESOLVE IDENT NOIDENT LOGCLOSING NOLOGCLOSING PORTRESOLVE NOPORTRESOLVE
+ %token RUN RUNAS EXPIRE LOG_IN LOG IGNORE FROM TO TYPE PORT SRCPORT OPTION COMMA
+ %token ICMP TCP UDP ALL
+ 
+@@ -138,6 +139,11 @@
+         | NORESOLVE ProtoList EOL
+           { resolve_protocols &= ~$2; }
+ 
++        | PORTRESOLVE ProtoList EOL
++          { portresolve_protocols |= $2; }
++        | NOPORTRESOLVE ProtoList EOL
++          { portresolve_protocols &= ~$2; }
++
+         | LOGCLOSING EOL
+           { log_closing = TRUE; }
+         | NOLOGCLOSING EOL
+@@ -249,6 +255,7 @@
+             switches.log = -1;
+             switches.ident = use_ident;
+             switches.resolve = -1;
++	    switches.portresolve = -1;
+             switches.logformat = -1;
+             switches.logclosing = log_closing;
+           } 
+@@ -259,6 +266,7 @@
+             $$->ident = switches.ident;
+             $$->logclosing = switches.logclosing;
+             $$->resolve = switches.resolve;
++            $$->portresolve = switches.portresolve;
+             $$->logformat = switches.logformat;
+             $$->protocol = $4.protocol;
+             $$->loginfo = $4.loginfoval;
+@@ -287,6 +295,8 @@
+         | NOIDENT    { switches.ident = FALSE; }
+         | RESOLVE    { switches.resolve = RUN_ICMP | RUN_TCP | RUN_UDP; }
+         | NORESOLVE  { switches.resolve = 0; }
++        | PORTRESOLVE    { switches.portresolve = RUN_ICMP | RUN_TCP | RUN_UDP; }
++        | NOPORTRESOLVE  { switches.portresolve = 0; }
+         | SHORT      { switches.logformat = LOGFORMAT_SHORT; }
+         | NORMAL     { switches.logformat = LOGFORMAT_NORMAL; }
+         | DETAILED   { switches.logformat = LOGFORMAT_DETAILED; }
+
+--- a/Source/main.c
++++ b/Source/main.c
+@@ -48,6 +48,10 @@
+ #include "filter.h"
+ #include "pidfile.h"
+ 
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ /* Logging mechanism */
+ struct loginfo log;
+ 
+
+--- a/Source/netutils.c
++++ b/Source/netutils.c
+@@ -237,15 +237,21 @@
+  * Get a service name for a specified protocol
+  */
+ 
+-void service_lookup(char *proto, char *service, __u16 port) {
++void service_lookup(char *proto, char *service, __u16 port, int portresolve) {
+   struct servent *se;
+ 
+   pthread_mutex_lock(&service_mutex);
+-  se = getservbyport(port, proto);
+-  if (se == NULL)
++  if (portresolve)
++  {
++    se = getservbyport(port, proto);
++    if (se == NULL)
++      snprintf(service, SERVICE_LENGTH, "port %d", ntohs(port));
++    else {
++      snprintf(service, SERVICE_LENGTH, "%s", se->s_name);
++    }
++  }
++  else {
+     snprintf(service, SERVICE_LENGTH, "port %d", ntohs(port));
+-  else {
+-    snprintf(service, SERVICE_LENGTH, "%s", se->s_name);
+   }
+   pthread_mutex_unlock(&service_mutex);
+ }
+
+--- a/Source/netutils.h
++++ b/Source/netutils.h
+@@ -53,6 +53,6 @@
+                  const __u32 src_addr, const __u16 src_port,
+                  const __u32 dst_addr, const __u16 dst_port);
+ 
+-void service_lookup(char *proto, char *service, __u16 port);
++void service_lookup(char *proto, char *service, __u16 port, int portresolve);
+ 
+ #endif
+
+--- a/Source/tcp.c
++++ b/Source/tcp.c
+@@ -51,6 +51,7 @@
+ struct loginfo tcp_log;
+ extern struct loginfo log;
+ extern unsigned short resolve_protocols;
++extern unsigned short portresolve_protocols;
+ 
+ /*
+  * Structure of a TCP packet
+@@ -88,7 +89,7 @@
+     *details ='\0';
+     host_print(remote_host, IPHDR.saddr,
+                info.resolve);
+-    service_lookup("tcp", service, TCPHDR.dest);
++    service_lookup("tcp", service, TCPHDR.dest, info.portresolve);
+     if (info.logformat == LOGFORMAT_DETAILED) {
+       get_details(details,
+                   IPHDR.saddr,
+@@ -186,7 +187,7 @@
+     *details ='\0';
+     host_print(remote_host, IPHDR.saddr,
+                info.resolve);
+-    service_lookup("tcp", service, TCPHDR.dest);
++    service_lookup("tcp", service, TCPHDR.dest, info.portresolve);
+     if (info.logformat == LOGFORMAT_DETAILED) {
+       get_details(details,
+                   IPHDR.saddr,
+
+--- a/Source/udp.c
++++ b/Source/udp.c
+@@ -81,7 +81,7 @@
+     *details ='\0';
+     host_print(remote_host, IPHDR.saddr,
+                info.resolve);
+-    service_lookup("udp", service, UDPHDR.dest);
++    service_lookup("udp", service, UDPHDR.dest, info.portresolve);
+     if (info.logformat == LOGFORMAT_DETAILED) {
+       get_details(details,
+                   IPHDR.saddr,
+
+--- a/ippl.conf
++++ b/ippl.conf
+@@ -4,13 +4,15 @@
+ # User used
+ # ---------
+ # Specify the user (declared in /etc/passwd) used to run the
+-# logging threads.
+-#runas nobody
++# logging threads. The ippl process visible in the process table
++# is still running as root! Look in /proc/pid/task to see the threads
++# running as ippl
++runas ippl
+ 
+ # Resolve hostnames?
+ # ------------------
+-# Uncomment the line below to disable DNS lookups
+-#noresolve all
++# Uncomment the line below to enable DNS lookups
++#resolve all
+ 
+ # Use ident?
+ # ----------
+@@ -38,9 +40,14 @@
+ # ----------------
+ run icmp tcp
+ # Uncomment the line below to log UDP traffic.
+-# See ippl.conf(5) for recommandations.
++# See ippl.conf(5) for recommendations.
+ #run udp
+ 
++# Resolve tcp/udp port to service name?
++# -------------------------------------
++# portresolve icmp tcp udp
++# Set noportresolve <protocol-list> to log port numbers instead
++
+ # Logging format
+ # ----------------
+ # If you want to see the destination address, the ports, etc
+@@ -63,6 +70,3 @@
+ # Do not log DNS queries
+ #ignore udp port domain
+ #ignore udp srcport domain
+-
+-# End of configuration
+-# Copyright (C) 1998-1999 Hugo Haas - Etienne Bernard
+
diff --git a/net-analyzer/ippl/files/ippl-1.4.14-privilege-drop.patch b/net-analyzer/ippl/files/ippl-1.4.14-privilege-drop.patch
new file mode 100644
index 000000000000..0f6d03684a93
--- /dev/null
+++ b/net-analyzer/ippl/files/ippl-1.4.14-privilege-drop.patch
@@ -0,0 +1,140 @@
+privilege-drop by Marc Haber <mh+debian-packages@zugschlus.de>
+
+--- a/Source/icmp.c
++++ b/Source/icmp.c
+@@ -39,6 +39,8 @@
+ #include "log.h"
+ #include "filter.h"
+ #include "configuration.h"
++#include <string.h>
++#include <errno.h>
+ 
+ /* Socket */
+ int icmp_socket;
+@@ -296,14 +298,16 @@
+ 
+   icmp_socket = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
+   if (icmp_socket <= 0) {
+-	log.log(log.level_or_fd, "FATAL: Unable to open icmp raw socket");
++	int error = errno;
++    	log.log(log.level_or_fd, "FATAL: Unable to open icmp raw socket\nERROR No: %d\nERROR : %s", error, strerror(error));
+     exit(1);
+   }
+ 
+-  setgid(((struct passwd *)nobody)->pw_gid);
++  /* Don't do this here - race conditions will arise */
++  /* setgid(((struct passwd *)nobody)->pw_gid);
+   initgroups(((struct passwd *)nobody)->pw_name,
+ 	     ((struct passwd *)nobody)->pw_gid);
+-  setuid(((struct passwd *)nobody)->pw_uid);
++  setuid(((struct passwd *)nobody)->pw_uid); */
+ 
+   for(;;) {
+     if (read(icmp_socket, (__u8 *) &pkt, ICMP_CAPTURE_LENGTH) == -1) {
+--- a/Source/main.c
++++ b/Source/main.c
+@@ -153,6 +153,17 @@
+     run_thread(&udp_t, log_udp, (void *)account);
+   }
+ 
++  /* Sleep 1 sec to allow the other threads to catchup */
++  /* Not the best way to solve the issue but it works */
++  sleep(1);
++
++  /* Drop privileges */
++
++  setgid(((struct passwd *)account)->pw_gid);
++  initgroups(((struct passwd *)account)->pw_name,
++	     ((struct passwd *)account)->pw_gid);
++  setuid(((struct passwd *)account)->pw_uid);
++
+ }  
+ 
+ 
+@@ -160,8 +171,10 @@
+  * reload_configuration
+  *
+  * Stops the threads and reloads the configuration
++ *
++ * -- DEPRECATED (due to privilege drop cannot reload - needs a restart!)
+  */
+-void reload_configuration() {
++void reload_configuration_DEPRECATED() {
+   extern pthread_mutex_t log_mutex, service_mutex, dns_mutex, r_mux, w_mux;
+   extern pthread_cond_t w_cond;
+   extern int readers;
+@@ -353,8 +366,10 @@
+  * Function executed when we receive a SIHUP signal
+  */
+ void sighup(int sig) {
+-  reload_configuration();
+-  log.log(log.level_or_fd, "IP Protocols Logger: reloaded configuration.");
++  // DEPRECATED - reload_configuration();
++  // log.log(log.level_or_fd, "IP Protocols Logger: reloaded configuration.");
++  log.log(log.level_or_fd, "IP Protocols Logger: reload configuration is unsupported.");
++  die(sig);
+   signal(SIGHUP, sighup);
+ }
+ 
+--- a/Source/tcp.c
++++ b/Source/tcp.c
+@@ -44,6 +44,8 @@
+ #include "filter.h"
+ #include "configuration.h"
+ #include "ident.h"
++#include <errno.h>
++#include <string.h>
+ 
+ /* Socket */
+ int tcp_socket;
+@@ -258,14 +260,16 @@
+ 
+   tcp_socket = socket(AF_INET, SOCK_RAW, IPPROTO_TCP);
+   if (tcp_socket <= 0) {
+-	log.log(log.level_or_fd, "FATAL: Unable to open tcp raw socket");
++  	int error = errno;
++	log.log(log.level_or_fd, "FATAL: Unable to open tcp raw socket\nERROR No: %d\nERROR : %s", error, strerror(error));
+     exit(1);
+   }
+ 
+-  setgid(((struct passwd *)nobody)->pw_gid);
++  /* Don't do this here - race conditions will arise */
++  /* setgid(((struct passwd *)nobody)->pw_gid);
+   initgroups(((struct passwd *)nobody)->pw_name,
+ 	     ((struct passwd *)nobody)->pw_gid);
+-  setuid(((struct passwd *)nobody)->pw_uid);
++  setuid(((struct passwd *)nobody)->pw_uid); */
+ 
+   for(;;) {
+     if (read(tcp_socket, (__u8 *) &pkt, TCP_CAPTURE_LENGTH) == -1) {
+--- a/Source/udp.c
++++ b/Source/udp.c
+@@ -39,6 +39,8 @@
+ #include "filter.h"
+ #include "configuration.h"
+ #include "ident.h"
++#include <errno.h>
++#include <string.h>
+ 
+ /* Socket */
+ int udp_socket;
+@@ -138,14 +140,16 @@
+ 
+   udp_socket = socket(AF_INET, SOCK_RAW, IPPROTO_UDP);
+   if (udp_socket <= 0) {
+-	log.log(log.level_or_fd, "FATAL: Unable to open udp raw socket");
++  	int error = errno;
++	log.log(log.level_or_fd, "FATAL: Unable to open udp raw socket\nERROR No: %d\nERROR : %s", error, strerror(error));
+     exit(1);
+   }
+ 
+-  setgid(((struct passwd *)nobody)->pw_gid);
++  /* Don't do this here - race conditions will arise */
++  /* setgid(((struct passwd *)nobody)->pw_gid);
+   initgroups(((struct passwd *)nobody)->pw_name,
+ 	     ((struct passwd *)nobody)->pw_gid);
+-  setuid(((struct passwd *)nobody)->pw_uid);
++  setuid(((struct passwd *)nobody)->pw_uid); */
+ 
+   for(;;) {
+     if (read(udp_socket, (__u8 *) &pkt, UDP_CAPTURE_LENGTH) == -1) {
diff --git a/net-analyzer/ippl/files/ippl.rc b/net-analyzer/ippl/files/ippl.rc
new file mode 100644
index 000000000000..e16ccfc6c4e3
--- /dev/null
+++ b/net-analyzer/ippl/files/ippl.rc
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ ! -f /etc/ippl.conf ]
+	then
+		eerror "Please create /etc/ippl.conf"
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+	ebegin "Starting ippl"
+	start-stop-daemon --start --quiet --pidfile /run/ippl.pid \
+		--exec /usr/sbin/ippl
+	eend $? "Failed to start ippl"
+}
+
+stop() {
+	ebegin "Stopping ippl"
+	start-stop-daemon --stop --quiet --pidfile /run/ippl.pid
+	eend $? "Failed to stop ippl"
+}
diff --git a/net-analyzer/ippl/ippl-1.4.14-r3.ebuild b/net-analyzer/ippl/ippl-1.4.14-r3.ebuild
new file mode 100644
index 000000000000..9f807cd264aa
--- /dev/null
+++ b/net-analyzer/ippl/ippl-1.4.14-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils toolchain-funcs user
+
+DESCRIPTION="A daemon which logs TCP/UDP/ICMP packets"
+HOMEPAGE="http://pltplp.net/ippl/"
+SRC_URI="http://pltplp.net/ippl/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+DEPEND="virtual/yacc
+	>=sys-devel/flex-2.5.4a-r4"
+RDEPEND=""
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/ippl-1.4.14-noportresolve.patch \
+		"${FILESDIR}"/ippl-1.4.14-manpage.patch \
+		"${FILESDIR}"/ippl-1.4.14-privilege-drop.patch \
+		"${FILESDIR}"/ippl-1.4.14-includes.patch
+	sed -i Source/Makefile.in \
+		-e 's|^LDFLAGS=|&@LDFLAGS@|g' \
+		|| die "sed Source/Makefile.in"
+	sed -i Makefile.in \
+		-e 's|make |$(MAKE) |g' \
+		|| die "sed Makefile.in"
+	# fix for bug #351287
+	sed -i -e '/lex.yy.c/s/ippl.l/& y.tab.c/' Source/Makefile.in \
+		|| die "sed src/Makefile.in"
+	tc-export CC
+}
+
+src_install() {
+	dosbin Source/ippl
+
+	insinto "/etc"
+	doins ippl.conf
+
+	doman Docs/{ippl.8,ippl.conf.5}
+
+	dodoc BUGS CREDITS HISTORY README TODO
+
+	newinitd "${FILESDIR}"/ippl.rc ippl
+}
+
+pkg_postinst() {
+	enewuser ippl
+}
diff --git a/net-analyzer/ippl/ippl-1.4.14-r5.ebuild b/net-analyzer/ippl/ippl-1.4.14-r5.ebuild
new file mode 100644
index 000000000000..e436f03ac433
--- /dev/null
+++ b/net-analyzer/ippl/ippl-1.4.14-r5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs user
+
+DESCRIPTION="A daemon which logs TCP/UDP/ICMP packets"
+HOMEPAGE="http://pltplp.net/ippl/"
+SRC_URI="http://pltplp.net/ippl/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+DEPEND="virtual/yacc
+	>=sys-devel/flex-2.5.4a-r4"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/ippl-1.4.14-noportresolve.patch \
+		"${FILESDIR}"/ippl-1.4.14-manpage.patch \
+		"${FILESDIR}"/ippl-1.4.14-privilege-drop.patch \
+		"${FILESDIR}"/ippl-1.4.14-includes.patch \
+		"${FILESDIR}"/ippl-1.4.14-format-warnings.patch
+
+	sed -i Source/Makefile.in \
+		-e 's|^LDFLAGS=|&@LDFLAGS@|g' \
+		|| die
+
+	sed -i Makefile.in \
+		-e 's|make |$(MAKE) |g' \
+		|| die
+
+	# fix for bug #351287
+	sed -i -e '/lex.yy.c/s/ippl.l/& y.tab.c/' Source/Makefile.in \
+		|| die
+
+	tc-export CC
+}
+
+src_install() {
+	dosbin Source/ippl
+
+	insinto "/etc"
+	doins ippl.conf
+
+	doman Docs/{ippl.8,ippl.conf.5}
+
+	dodoc BUGS CREDITS HISTORY README TODO
+
+	newinitd "${FILESDIR}"/ippl.rc ippl
+}
+
+pkg_postinst() {
+	enewuser ippl
+}
diff --git a/net-analyzer/ippl/metadata.xml b/net-analyzer/ippl/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/ippl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/ipsumdump/Manifest b/net-analyzer/ipsumdump/Manifest
new file mode 100644
index 000000000000..76e35b0204f0
--- /dev/null
+++ b/net-analyzer/ipsumdump/Manifest
@@ -0,0 +1,4 @@
+DIST ipsumdump-1.85.tar.gz 919540 SHA256 98feca0f323605a022ba0cabcd765a8fcad1b308461360a5ae6c4c293740dc32 SHA512 b42844cf028b9c1ea9da90306be8d731bffcec1a8f5c9eeb8029f563ddd5781651c583913a2105d8ad99cabac4b003345e1e8fdfb83367cabf806de1bca31596 WHIRLPOOL e30959f3ec0416a0c85c63aafa78433f46364fd01e8dde9fac6874d4c73838096d3f48abba9b4fa5f191062a9e5186b3efa32615626e62aa724b6884be1ad6aa
+EBUILD ipsumdump-1.85.ebuild 566 SHA256 8b37c9356c0f3ba510fc70b919074f6fc63e12b8bb584474b037f4dd3506264b SHA512 7bdd99fc11e9384a6ccadd786b71e142ef8890bd9b4082f254b56a62797761ec4e26a70b0a9193ca882f95eec91a157a62fcd5f3d539aa54a86b53fa4e51460d WHIRLPOOL b539d95dbdd6572307aaf4e8b1aaf3eeacd53fbe39505a4e94c6663cb84098aaf79a58a779867d4ab3c2a0321ff3f13a99c4618fcfd5cbe6cc892fb0a11fd8d3
+MISC ChangeLog 808 SHA256 e1bb6b8a5cf1043c7b07310202ed92e51b2f5d5cef940bac646d56d241f633ef SHA512 9c323b9c89db5ca9c18d1f1db32ffdf4fddfad9ca7a8c46a8a81eb0cb6b03a68fb82de0dc1200be0a97ed3517e11b2193ac08f87ae0f81c2938308d3b15c6f6d WHIRLPOOL 30530384e3810e7e46e13594c3ef4e8ce41071eabe1155ca4bec7dc573fbedb99b681060d0ae2f5e476336759dbf79b74b4be8f6dab8917e4e8a0bd26a7e3699
+MISC metadata.xml 836 SHA256 1495310bee1fbb7e7157073a54dca1790d227d43ea8d29935bdecbd97cb55692 SHA512 3789ba4324f2e610041417555d1775de2e464b1b8ca5809450cfc41e5598c4d353f76216b682540e86867aa73d7ec2cb3ed77cf713601cad095a4badc6a2e804 WHIRLPOOL 2a4e01a03f6e4a7288660663f44b95cbac6ade93320ed1113d8b8c371ba6f96ed9c02c7cede1e7f4e13eb4cc34350691bb36de833b68745d7006037601004f5b
diff --git a/net-analyzer/ipsumdump/ipsumdump-1.85.ebuild b/net-analyzer/ipsumdump/ipsumdump-1.85.ebuild
new file mode 100644
index 000000000000..371b03c67b61
--- /dev/null
+++ b/net-analyzer/ipsumdump/ipsumdump-1.85.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Simple TCP/IP Dump summarizer/analyzer"
+HOMEPAGE="http://read.seas.harvard.edu/~kohler/ipsumdump/"
+SRC_URI="http://read.seas.harvard.edu/~kohler/ipsumdump/${P}.tar.gz"
+
+LICENSE="the-Click-license"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ipv6 +nanotimestamp"
+
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-libs/expat
+	sys-apps/texinfo"
+
+src_configure() {
+	econf $(use_enable ipv6 ip6) \
+		$(use_enable nanotimestamp)
+}
diff --git a/net-analyzer/ipsumdump/metadata.xml b/net-analyzer/ipsumdump/metadata.xml
new file mode 100644
index 000000000000..43ceb8c9a02e
--- /dev/null
+++ b/net-analyzer/ipsumdump/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>tomboy64@sina.cn</email>
+        <name>M.B.</name>
+        <description>Maintainer, assign bugs to him</description>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <use>
+        <flag name="nanotimestamp">Enable timestamps with nano-second resolution</flag>
+    </use>
+    <longdescription lang="en">
+        The ipsumdump program summarizes TCP/IP dump files into a self-describing ASCII format easily readable by humans and programs. The companion ipaggcreate program counts various properties of packet aggregates.
+    </longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/iptraf-ng/Manifest b/net-analyzer/iptraf-ng/Manifest
new file mode 100644
index 000000000000..a85a1f4cd7c8
--- /dev/null
+++ b/net-analyzer/iptraf-ng/Manifest
@@ -0,0 +1,10 @@
+AUX iptraf-ng-1.1.4-printf-format.patch 284 SHA256 b9d988ea503c4ea3b14fcdd0761914748d777056549ecc28c90954645d52a178 SHA512 d4b566bfa724209c920b688e3b51c722d05c6e63929d5338ee8dcfa978e0e0ff4ee8dd5e2d5f8a70afe317e2c379171fd28c7d7446a7b24b1efe17f525a5dad1 WHIRLPOOL 0a579a9bd87e4b1c4efe29b9dc8da5dca49df1381e32419a7f5269ce5af708843500c38c4c52729197022217b9751bd8950881b0943091de2c596de0ba49a90f
+AUX iptraf-ng-1.1.4-sprintf-format.patch 551 SHA256 166ec9d6f5f18355c9606f7e3758f114e40a8c3eef8427bbe53de69729a4306a SHA512 d3c49119f1ea5a3664e85b06e949bf574da3a000dcc9a3dcee92ae3d19e6a55a32031dacc4b759e3c63d85100129bb70ad58cbda7e45386da4b1660224198029 WHIRLPOOL 0c3e7d7cdb67a5d2712ceff06d62ca564ed52a95541e31029d69b6c4cb056cee4d940827fa6c5361c90dcc3dd45e0cbf248c3f79890118d0c92370ff99fea587
+AUX iptraf-ng-1.1.4-tcplog_flowrate_msg.patch 330 SHA256 e9c9057612bca5b793ea12a271aabedba7185975edfd5571b9a2a664e31ed236 SHA512 4b0c318ad245a82bb44243e23322f3d71ef4af9b4c86c95911e4da1e8145418ac7b9ee76c7d33bdf05c1189ec782443382de773e228c76f179fab87d5e897ec6 WHIRLPOOL e93af74b32ab84ac2b3e8b23c63591819e3bfa5c4f21a39989fb93f84280015eebb5e76363e1cdb63ccd38db9be26ab12b52f951d93fa76c33cf2a163c7af924
+DIST iptraf-ng-1.1.4.tar.gz 583306 SHA256 79140cf07c0cceb1b5723242847a73aa86f5e4f9dccfe8970fda6801d347eb09 SHA512 8cafb0000cec75eb4071156a9e9350ffe6de99cb6386e8f50d05337113872ee50082a30009d85faa02d83633a8e727039791332d600654321b95ca6cfc881774 WHIRLPOOL 442b6091c818f81a4db98999e7a6f0b9a1b58271c49c5758c70fd97c98c8b28c2f83e2824fb5ef434610f117ff071d5cc7335ea5cc01cbb384725018e9781d5d
+EBUILD iptraf-ng-1.1.4-r1.ebuild 1330 SHA256 163e4b2d7ca2f52da9395b70fbebc8369a21ad20011fecfe5466d950016ed867 SHA512 8e47e2b556632445670916d1fddea8254f9078c3237c4c48f076cf7b61ebe5ccae30600d7485cb518b56ccf9e235dbdd72e3bbcd18a08a591bfde3ba3702b85c WHIRLPOOL b2dd2b7644e3074d15f7ee287d246084d71fc4f57f5f70d2be2e454760d7cd9fd388ec103378b55ab785b7b66a97ed1753f3eb889952e4087536af8ab8db5f18
+EBUILD iptraf-ng-1.1.4-r2.ebuild 1434 SHA256 fe6dbc4907315f4991398a2ad5012e9dbedcbcf78ed55d1de8078c456283c61d SHA512 71fd8f9b5fcc3f36b46a09d15e6a1d1bfcf1643574a958b0a8228cfb1c56f542ee163de7aa661ad79fd4d6df06fb4d02399843d1372bf4552464ab468afda8e7 WHIRLPOOL 676408341b427a33060bbfd3954f94b2fd5196c2be6359dda5c18bd33b95a34714115245f5815a964871b42fda0687ce7a940a33780b3feeced8df0de4d8ab14
+EBUILD iptraf-ng-9999.ebuild 1204 SHA256 fe77b23a994ec644bc5fb4b187430d1c0be752966bcf5048901dbf2c66d258dd SHA512 f51efabad085887a2bd610fd08039b5a9b53d3c68949a7c117920045c3fc51196a3851ab20e0e4412f1fabab14be3ef482107ff22ac6365dbf0fdfc955323303 WHIRLPOOL 788d26f198cd5cd816fc18c8dc3c1504d295a4a0d53d66f99c96f74bf58161bd9c4ec3a6d52f089a555d508ac734e50dcbb54fd93f351eb4761d3633cccc96a1
+MISC ChangeLog 3276 SHA256 0fa695a0f96c1dca0391eb42e381fbde73b74e2c762b6612766bcb773b6540bc SHA512 ee5c7c35c2ddad8ab11ef698e0825514d8c797fb7ae1d19b5b681fe2db43b7f5d8164773f2fe7c4fd97a6f9e1f99d1a102e8415cadf17f88c69a8a9eb61c11fc WHIRLPOOL 8b552d861cd2197d5bd5b2d75fb038c92a4ac7c45fcbe3ce4ecbb7db8b876c68bebedcfed014a5007d5207ab6149b781c0fd5bd60a46f865b8a70056bf26ea7b
+MISC ChangeLog-2015 10213 SHA256 04a636f38ac9b04b237cfbade59a0063ddc5cee5373fb41c82c2d44f2c85313b SHA512 fff884c19bc848878b119ea9cd9fad13674fadd9a50f924b03bf885476fdfeed3081503ca14bc510fa92b92a4e648d15d1784706c1f47b45818ac60d0fd70d2b WHIRLPOOL 5b108bcb5773ea11d05c43bb5ae3d972fdde62284b2c960c17994d1d1fc77bc2d46d6afd0d01eb38b446c12b4de0a445520d1105a74eb7a36930ba786af8c155
+MISC metadata.xml 376 SHA256 feda48b3b4d80b2c7d2e8f60360b2930311220b829a808b2163cfbd20d436fd3 SHA512 440bbe472188ac3acd7f0dcdddf8390e690a8f81cda49d6be5bed8a46cdf1fb10416f4313d426c408bd9f88501312af812badc765a24e76927b5ecfc64e7c225 WHIRLPOOL c523db223aa5a877a8e2fa8f3d9b6200674c1b0a9fb3ed3e587b7076c6a4aab6948764991c9773ad6d2060128e980f40b122c6e0ac4ff65d98d125d382de1861
diff --git a/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-printf-format.patch b/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-printf-format.patch
new file mode 100644
index 000000000000..6bad736e2e44
--- /dev/null
+++ b/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-printf-format.patch
@@ -0,0 +1,11 @@
+--- a/src/ipfilter.c
++++ b/src/ipfilter.c
+@@ -146,7 +146,7 @@
+ 				snprintf(msgstr, 60,
+ 					 "Invalid protocol input at or near token \"%s\"",
+ 					 bptr);
+-				tui_error(ANYKEY_MSG, msgstr);
++				tui_error(ANYKEY_MSG, "%s", msgstr);
+ 				doagain = 1;
+ 			} else
+ 				doagain = 0;
diff --git a/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-sprintf-format.patch b/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-sprintf-format.patch
new file mode 100644
index 000000000000..96f252895cb2
--- /dev/null
+++ b/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-sprintf-format.patch
@@ -0,0 +1,20 @@
+--- a/src/othptab.c
++++ b/src/othptab.c
+@@ -410,7 +410,7 @@
+ 				break;
+ 			}
+ 
+-			sprintf(scratchpad, rarp_mac_addr);
++			sprintf(scratchpad, "%s", rarp_mac_addr);
+ 			strcat(msgstring, scratchpad);
+ 			wattrset(table->othpwin, ARPATTR);
+ 			break;
+@@ -485,7 +485,7 @@
+ 		wattrset(table->othpwin, UNKNIPATTR);
+ 		protptr = getprotobynumber(entry->protocol);
+ 		if (protptr != NULL) {
+-			sprintf(protname, protptr->p_aliases[0]);
++			sprintf(protname, "%s", protptr->p_aliases[0]);
+ 		} else {
+ 			sprintf(protname, "IP protocol");
+ 			unknown = 1;
diff --git a/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch b/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch
new file mode 100644
index 000000000000..8e01989fe6fe
--- /dev/null
+++ b/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch
@@ -0,0 +1,11 @@
+--- a/src/tcptable.c
++++ b/src/tcptable.c
+@@ -437,6 +437,8 @@ static char *tcplog_flowrate_msg(struct tcptableent *entry, char *buf,
+ 				 size_t bufsize)
+ {
+ 	time_t interval = time(NULL) - entry->conn_starttime;
++	if (interval < 1)
++		interval = 1;
+ 
+ 	char rbuf[64];
+ 	rate_print(entry->bcount / interval, rbuf, sizeof(rbuf));
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..def3a784a7ea
--- /dev/null
+++ b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A console-based network monitoring utility"
+HOMEPAGE="http://fedorahosted.org/iptraf-ng/"
+SRC_URI="http://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 doc? ( FDL-1.1 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="doc"
+
+RESTRICT="test"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.7-r7:0=
+"
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+	!net-analyzer/iptraf
+"
+
+src_prepare() {
+	sed -i \
+		-e '/^CC =/d' \
+		-e '/^CFLAGS/s:= -g -O2:+= :' \
+		-e '/^LDFLAGS =/d' \
+		-e 's|$(QUIET_[[:alpha:]]*)||g' \
+		Makefile || die
+	sed -i \
+		-e 's|IPTRAF|&-NG|g' \
+		-e 's|IPTraf|&-NG|g' \
+		-e 's|iptraf|&-ng|g' \
+		-e 's|rvnamed|&-ng|g' \
+		-e 's|RVNAMED|&-NG|g' \
+		src/*.8 || die
+
+	epatch "${FILESDIR}"/${P}-tcplog_flowrate_msg.patch
+}
+
+# configure does not do very much we do not already control
+src_configure() { :; }
+
+src_compile() {
+	tc-export CC
+	CFLAGS+=' -DLOCKDIR=\"/run/lock/iptraf-ng\"'
+	default
+}
+
+src_install() {
+	dosbin {iptraf,rvnamed}-ng
+
+	doman src/*.8
+	dodoc AUTHORS CHANGES FAQ README* RELEASE-NOTES
+	use doc && dohtml -a gif,html,png -r Documentation/*
+
+	keepdir /var/{lib,log}/iptraf-ng #376157
+}
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r2.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r2.ebuild
new file mode 100644
index 000000000000..1cb32750a719
--- /dev/null
+++ b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A console-based network monitoring utility"
+HOMEPAGE="http://fedorahosted.org/iptraf-ng/"
+SRC_URI="http://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 doc? ( FDL-1.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc"
+
+RESTRICT="test"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.7-r7:0=
+"
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+	!net-analyzer/iptraf
+"
+
+src_prepare() {
+	sed -i \
+		-e '/^CC =/d' \
+		-e '/^CFLAGS/s:= -g -O2:+= :' \
+		-e '/^LDFLAGS =/d' \
+		-e 's|$(QUIET_[[:alpha:]]*)||g' \
+		Makefile || die
+	sed -i \
+		-e 's|IPTRAF|&-NG|g' \
+		-e 's|IPTraf|&-NG|g' \
+		-e 's|iptraf|&-ng|g' \
+		-e 's|rvnamed|&-ng|g' \
+		-e 's|RVNAMED|&-NG|g' \
+		src/*.8 || die
+
+	epatch "${FILESDIR}"/${P}-tcplog_flowrate_msg.patch
+	epatch "${FILESDIR}"/${P}-printf-format.patch
+	epatch "${FILESDIR}"/${P}-sprintf-format.patch
+}
+
+# configure does not do very much we do not already control
+src_configure() { :; }
+
+src_compile() {
+	tc-export CC
+	CFLAGS+=' -DLOCKDIR=\"/run/lock/iptraf-ng\"'
+	default
+}
+
+src_install() {
+	dosbin {iptraf,rvnamed}-ng
+
+	doman src/*.8
+	dodoc AUTHORS CHANGES FAQ README* RELEASE-NOTES
+	use doc && dohtml -a gif,html,png -r Documentation/*
+
+	keepdir /var/{lib,log}/iptraf-ng #376157
+}
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild
new file mode 100644
index 000000000000..ea4ed84750bc
--- /dev/null
+++ b/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils git-r3 toolchain-funcs
+
+DESCRIPTION="A console-based network monitoring utility"
+HOMEPAGE="http://fedorahosted.org/iptraf-ng/"
+EGIT_REPO_URI="https://git.fedorahosted.org/git/iptraf-ng.git"
+
+LICENSE="GPL-2 doc? ( FDL-1.1 )"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc"
+
+RESTRICT="test"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.7-r7:0=
+"
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+	!net-analyzer/iptraf
+"
+
+src_prepare() {
+	sed -i \
+		-e '/^CC =/d' \
+		-e '/^CFLAGS/s:= -g -O2:+= :' \
+		-e '/^LDFLAGS =/d' \
+		-e 's|$(QUIET_[[:alpha:]]*)||g' \
+		Makefile || die
+	sed -i \
+		-e 's|IPTRAF|&-NG|g' \
+		-e 's|IPTraf|&-NG|g' \
+		-e 's|iptraf|&-ng|g' \
+		-e 's|rvnamed|&-ng|g' \
+		-e 's|RVNAMED|&-NG|g' \
+		src/*.8 || die
+}
+
+# configure does not do very much we do not already control
+src_configure() { :; }
+
+src_compile() {
+	tc-export CC
+	CFLAGS+=' -DLOCKDIR=\"/run/lock/iptraf-ng\"'
+	default
+}
+
+src_install() {
+	dosbin {iptraf,rvnamed}-ng
+
+	doman src/*.8
+	dodoc AUTHORS CHANGES FAQ README* RELEASE-NOTES
+	use doc && dohtml -a gif,html,png -r Documentation/*
+
+	keepdir /var/{lib,log}/iptraf-ng #376157
+}
diff --git a/net-analyzer/iptraf-ng/metadata.xml b/net-analyzer/iptraf-ng/metadata.xml
new file mode 100644
index 000000000000..68c7fc650126
--- /dev/null
+++ b/net-analyzer/iptraf-ng/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<longdescription>
+	Interactive Colorful IP LAN Monitor, an active fork of iptraf
+</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/iptstate/Manifest b/net-analyzer/iptstate/Manifest
new file mode 100644
index 000000000000..321b76aa3779
--- /dev/null
+++ b/net-analyzer/iptstate/Manifest
@@ -0,0 +1,8 @@
+AUX iptstate-2.2.5-gentoo.patch 675 SHA256 9c25da2d82b6e09bd34900a187a92fecb7d3d0fe0f92c044aadacd93f1b90585 SHA512 e78debad0e63c8cb6c41b84a058b597a29366c73bbf06766271179b2b7570e5770c5fe82d239a2d3ddf7bd8d42856ecfaf01fd020e66acbc5842dc598e63a90c WHIRLPOOL df4e5875dcfe16eecb9a45434a749b9ebbad1fdd587d4f4862970ece4012fe513f1113e2bb637c2fb21ec877403c8499c1883dc357bc010cc92c5382914ce6ef
+DIST iptstate-2.2.5.tar.bz2 28270 SHA256 4e4d881b701fc4599a252021d6ef579eb17aea711fbc07f95df61465b38e1055 SHA512 044bbcf96225cc52b82428792d685d19f964520f7f20a9d3fa7e53430c1f552c0f09338a5d347b08e2500206cd7634a6b4a3acffbfd9e59e4657afb6df461795 WHIRLPOOL 193623aeb5a082fa51613c22e01b22d7d8db83099061961ace7e753bd06e16cdc4b001f73d1b5d20e8eafeb3a1412744a95c10d3fab672c2644408ec125369d9
+DIST iptstate-2.2.6.tar.bz2 28700 SHA256 bef8eb67a4533e53079f397b71e91dd34da23f8cbd65cb2d5b67cb907b00c068 SHA512 411b357aced384c52caac17b23f3c6bd631ff34d41b6000b90ff6dfc3cf20e36e46416d3691ac699b06f16d6042a42681b42a5d3594ce287aa6cf3b3b637c999 WHIRLPOOL 59abc09fd5e493e1530eb72c11b48bcce659598fb40c979da46514c5679ab124d24ebce961b9825b22ba52443108e5718ad859140ead18448ec2d0af61baa4a3
+EBUILD iptstate-2.2.5.ebuild 698 SHA256 87666653d14669f87201982c414f685de911ae77677351c02b4daf76b2957d63 SHA512 18c080746fea730f670b7c70c2f50d9c64ac7e7348336f1484fe8b775f16ddc317a027799fec930e645d5d469d0d63173f75cdda5ee2e16405cd0cf60f1d7989 WHIRLPOOL 0a69aef1d14b5d571571530de1bd007a32ca279ab2fc39720bea33634578fbb91d1f96e76a99c619afb69ddc555daa9e079a8a376d8ee74c9d6ed6197ad8e366
+EBUILD iptstate-2.2.6.ebuild 782 SHA256 8b435771805f1873d229b91912b44d6a0a057827c424c7a2874a775e307f0705 SHA512 21330bdaf0a3e966d6c8037860c9ca3a2d2d973de738aca9c8f94f8e21e68e3bb6fbda2a375dee92e472ed8f4c6967363acba30662adcdfe3c84799afeb9b97e WHIRLPOOL 68bd249171352de730460b286f8737ac5106ae6dfd22f4c3ae7554a216c060ee856da83d8afdfe529da250c02a25a16daa104486e125193966e7d5c9ed672697
+MISC ChangeLog 2632 SHA256 e83cac101e338577f1dc3c5c987318fd1e7cb09b8497cf0f1403fe6108627280 SHA512 c12278ac3e782fc182e368dafb0d0f25a89bf44ff3b0616681494ed3b9171ce933bd486739d3a7ff9307d9d6d576e0532e35755029bbd40ac7ae0ff8b89760b9 WHIRLPOOL 68ce2dec0691b431fb9f4e83de670f5d3e7faa2c098940843f9e78c4ea7253ef3ea3ea1f12151b40e42c67c96263f46daef3149a41d557e4ebe968f0505a727e
+MISC ChangeLog-2015 5305 SHA256 82d00f0832e71340860f93d24515182e1d4835677b6d293fd14ad49ad6baf4e7 SHA512 e57d29a444c6842025b35edcb6870933bfefa90aebfeb779103b569a7894d635c838ec0acad4fe9c6721b9c699620ddbc0d4d1e28de0cc7c5fe0d78948e400a6 WHIRLPOOL 854db991c16cf63e2ad8d2510eb1a1f9327acf114edf20c2d9f24c25d8c20f8f74f87eb81523101e7eb55c3ae0797ea6cfc6bc283a601947dcb3902d7278cb7f
+MISC metadata.xml 413 SHA256 ee2d4954a59062cf20088a4c74f34187765dc6ae5f56aa57d09b35a9d4903317 SHA512 d2bc802f6220c831ecf4c13c95d24e71032aea4b81e54a359eba2c6212df5cbb0c2ae00d2687bbc94d917b863917905b862bedd3f27a3eb7dc9239c06315bf7e WHIRLPOOL 75e7deb4c86c787f9e6298e17b82620866676d280f9fb286456596d39ad0e45479fda322ff6362cde451d31fe60d783f4ed4d6bbb37ceb48c0c4db7e4baf24df
diff --git a/net-analyzer/iptstate/files/iptstate-2.2.5-gentoo.patch b/net-analyzer/iptstate/files/iptstate-2.2.5-gentoo.patch
new file mode 100644
index 000000000000..fdaeeb7867b2
--- /dev/null
+++ b/net-analyzer/iptstate/files/iptstate-2.2.5-gentoo.patch
@@ -0,0 +1,26 @@
+--- a/Makefile
++++ b/Makefile
+@@ -17,12 +17,11 @@
+ ### ADVANCED USERS AND PACKAGERS MIGHT WANT TO CHANGE THIS
+ 
+ CXX?= g++
+-CXXFLAGS?= -g -Wall -O2
++CXXFLAGS+= -Wall
+ CXXFILES?= iptstate.cc
+ 
+ # THIS IS FOR NORMAL COMPILATION
+-LIBS?= -lncurses -lnetfilter_conntrack
+-CPPFLAGS=
++LIBS= $(shell $(PKG_CONFIG) --libs ncurses libnetfilter_conntrack)
+ 
+ ### YOU SHOULDN'T NEED TO CHANGE ANYTHING BELOW THIS
+ 
+@@ -45,7 +44,7 @@
+ 	echo "+------------------------------------------------------------+" ;\
+ 	echo "";
+ 
+-	$(CXX) $(CXXFLAGS) $(CXXFILES) -o iptstate $(LIBS) $(CPPFLAGS)
++	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(CXXFILES) -o iptstate $(LIBS)
+ 	@touch iptstate
+ 
+ 	@\
diff --git a/net-analyzer/iptstate/iptstate-2.2.5.ebuild b/net-analyzer/iptstate/iptstate-2.2.5.ebuild
new file mode 100644
index 000000000000..a3a8e345be01
--- /dev/null
+++ b/net-analyzer/iptstate/iptstate-2.2.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="IP Tables State displays states being kept by iptables in a top-like format"
+HOMEPAGE="http://www.phildev.net/iptstate/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~ppc x86"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.7-r7:0=
+	>=net-libs/libnetfilter_conntrack-0.0.50
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	tc-export CXX PKG_CONFIG
+}
+
+src_install() {
+	emake PREFIX="${D}"/usr install
+	dodoc BUGS Changelog CONTRIB README WISHLIST
+}
diff --git a/net-analyzer/iptstate/iptstate-2.2.6.ebuild b/net-analyzer/iptstate/iptstate-2.2.6.ebuild
new file mode 100644
index 000000000000..229188a3b618
--- /dev/null
+++ b/net-analyzer/iptstate/iptstate-2.2.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="IP Tables State displays states being kept by iptables in a top-like format"
+HOMEPAGE="http://www.phildev.net/iptstate/ https://github.com/jaymzh/iptstate"
+SRC_URI="https://github.com/jaymzh/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.7-r7:0=
+	>=net-libs/libnetfilter_conntrack-0.0.50
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.5-gentoo.patch
+)
+
+src_prepare() {
+	default
+	tc-export CXX PKG_CONFIG
+}
+
+src_install() {
+	emake PREFIX="${D}"/usr install
+	dodoc BUGS Changelog CONTRIB README.md WISHLIST
+}
diff --git a/net-analyzer/iptstate/metadata.xml b/net-analyzer/iptstate/metadata.xml
new file mode 100644
index 000000000000..bcd164dad76c
--- /dev/null
+++ b/net-analyzer/iptstate/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">iptstate</remote-id>
+		<remote-id type="github">jaymzh/iptstate</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/ipv6toolkit/Manifest b/net-analyzer/ipv6toolkit/Manifest
new file mode 100644
index 000000000000..fb1c9e81b0f0
--- /dev/null
+++ b/net-analyzer/ipv6toolkit/Manifest
@@ -0,0 +1,4 @@
+DIST ipv6toolkit-2.0_p20160422.tar.gz 796716 SHA256 eea52d414ec1439e39afcf0199db8f73ee20f4618efa83ba7fcf75eba46de1a2 SHA512 532d6b76159fca03bdcebe341540a4071d2381dd3046469d0dfa5e8eecda5ffb4182d40658ef14c67bd11b781773bff1192e96d0ac4210c5ca095c6475d6c26d WHIRLPOOL 1accd014cc47171bb8627ccfd962c2736f51858f711e916b065d72513cbfb9a694246c98b1de78854a0652eb1611280dacd792b74c948b66d29311ed3cb0acfd
+EBUILD ipv6toolkit-2.0_p20160422.ebuild 1244 SHA256 c4940b9de01fcd7445223fe2308f0fbe556ca54896b82eeba6f1bab9a4f14fc0 SHA512 5fa5fd9b4a008f7508edca7c6bff3080a2ff823c7d1b70128fb199237958832aca4a12d7137a3cb90a6f3c2dfb39408627bb69c8983dfca0a54865caf9a23fa8 WHIRLPOOL d423b6d41c1a0d38d7ddb68b5650cb89983a76e7bebcc0f72f849bceb5366c21b8e5b4198d6dd9d43e22fe40f297345d448a299ab53430312462fe9de8b9842a
+MISC ChangeLog 710 SHA256 d1e5bc060ae5adeb6f5fef1358b2f52c1323a756c5b68fd5ceea0b2351d78a7a SHA512 14d45e1b8d4cf5ebdf5204fb5cb8bbe30cf9b34da1327e83bdf14f0d4fb273c369d4104ecd13d8d697da2b4e634293f6798243f5bb1f46b61675505f8fc95ccc WHIRLPOOL 3feafb30de4e7e6a6844569928a610c0731e6ca8c30359b50f4afef18ffe28cc6a8fedf64813b7322a1676c4e44040a88cf292fbc39cb969fe4ff5de5af29e46
+MISC metadata.xml 527 SHA256 4e76349d610c7fff78e3ce0d0eaf7d8a96c510f4bdcdd84bcc5f889cf3aa7e9e SHA512 acec773e132e352f4f81af6840f3370da00f48e5e13f39a2fccc441e5d119c5fac4319b24745eef1b4fb0921e8ace7456f7230432fd86978bb27cc54b7de3ec4 WHIRLPOOL f1615bae66d1b4cfa93c358e4d20134462478bff3a4a2c09a89c80d7ad4b0cbf7b7e464e75a68aa08cb196efd08d30be1d634530a552048930ff09862f82d7ae
diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-2.0_p20160422.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-2.0_p20160422.ebuild
new file mode 100644
index 000000000000..0e211fa6f1bb
--- /dev/null
+++ b/net-analyzer/ipv6toolkit/ipv6toolkit-2.0_p20160422.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Set of IPv6 security/trouble-shooting tools to send arbitrary IPv6-based packets"
+HOMEPAGE="http://www.si6networks.com/tools/ipv6toolkit/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/fgont/ipv6toolkit.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SNAPSHOT="d14d90969e88a455e4ca8ea0ea7d88c9b7fb5c9f"
+	SRC_URI="https://github.com/fgont/ipv6toolkit/archive/${SNAPSHOT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/"${PN}"-"${SNAPSHOT}"
+fi
+
+DEPEND="net-libs/libpcap[ipv6(+)]"
+RDEPEND="${DEPEND}
+	sys-apps/hwids"
+
+HWIDS_OUI_PATH=/usr/share/misc/oui.txt
+
+src_prepare() {
+	sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \
+		manuals/ipv6toolkit.conf.5
+}
+src_compile() {
+	emake CFLAGS="${CFLAGS}" PREFIX=/usr
+}
+
+src_install() {
+	dodir /etc
+	emake install DESTDIR="${ED}" PREFIX=/usr
+	#remove the included oui file
+	rm -f "${D}"/usr/share/ipv6toolkit/oui.txt
+	#fix the conf file to use the one from sys-apps/hwids
+	sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \
+		"${ED}"/etc/ipv6toolkit.conf
+	dodoc CHANGES.TXT README.TXT
+}
diff --git a/net-analyzer/ipv6toolkit/metadata.xml b/net-analyzer/ipv6toolkit/metadata.xml
new file mode 100644
index 000000000000..65a725a606c7
--- /dev/null
+++ b/net-analyzer/ipv6toolkit/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>
+	The SI6 Networks' IPv6 toolkit is a set of IPv6 security/trouble-shooting tools, that can send arbitrary IPv6-based packets.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">fgont/ipv6toolkit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/isic/Manifest b/net-analyzer/isic/Manifest
new file mode 100644
index 000000000000..e4fb35dbd3f2
--- /dev/null
+++ b/net-analyzer/isic/Manifest
@@ -0,0 +1,5 @@
+DIST isic-0.07.tgz 39823 SHA256 e033c53e03e26a4c72b723e2a5a1c433ee70eb4d23a1ba0d7d7e14ee1a80429d SHA512 2495ee1c6d552fa6f8f79ab06a886aeef39d247589479e75124a03d5633a75d47e8c9a15e16de3596744a83f74da7afa460cc3dd8653e346e58ac70e04126882 WHIRLPOOL e730aa1f43e48f44f18e65b4bbe3520934d5ce02bd9d30b700195ede565ca1810002fb97a2b0828499777f3720ceb7dbebbf4fe84c875742e4c86b01219e1596
+EBUILD isic-0.07-r1.ebuild 766 SHA256 e49aca8c15d0e6afe9fdd0d347c5528fce8829eec0d16777d39c4dbddd6a7d8c SHA512 2bbf8ddab0097b72983faf86aaf3eddabe9e6e41a381b35af2ac484e75b63d1fa253871eea2d5c9098725709b57e3242f89b44e244c193b6498d8850abbe200a WHIRLPOOL 5ebc3328170fc7405a68b9d6a9683488a3ec7cfa6b81881d565689ff1d2a7b55a8a44e2307ea9786d5b137eca1955e17d77fbda11cd3e5d52cb804de3be23fa6
+MISC ChangeLog 2426 SHA256 b1b9408bed9899b2ca2edcb5d7af6a45975762aba007c6ad8cf02b9c0ebb8c71 SHA512 991172a0032d2ad1bf278a26c79d15c68c76e14502ba5021d3b1ebfb354c7a8fd00bd2b4247227467bee5d963b2bcee942db575b2c0427a21c4264b975e53f40 WHIRLPOOL e4f5a7ebe2d20dccc7a27af509e220cf21723cc1231e85f4df8254095501f625bb9a6c921f4ab900952a307a65b112afa48c9c9aec6fd47919472845a2939f74
+MISC ChangeLog-2015 3066 SHA256 87e2a90360f5324939defc8ea057995c501b0a6d93c4fcccb75d5e44b262319f SHA512 b936423c9bf5741a4db62b06274d7d805bedb4d1b38abde992c9499d725c4b6377b73d707890b501083a7fde50f4d561b9d26381b09f220f8a66d1970a2864d5 WHIRLPOOL 98ded75378ccffff0066323a8032f3825b6561d266febb523474b7455f2e5740af9c6d09a7457b2104f05dcaccefe927ee500f8dfefba7bb2e2a736beb9ca7f5
+MISC metadata.xml 354 SHA256 441035368bde00b23d604c78fcfa4768700703c3b89c45fc485785cd1b29093b SHA512 b29606fd321cd7a3de06bfb7ebf194cbf0b8af59b4b1087ff30c9b22344fd90c2107e349b74c6c0378696b1d109468088b76ed55164b695a0f7039551a012811 WHIRLPOOL 2ba05836ea99e15d37817f73655abad468570db8ace28b1eb86cf56dc3a0c6d58b8016e6456665e61760ecedbb733765876e22d4d6e7efe1e4a4e819bd792537
diff --git a/net-analyzer/isic/isic-0.07-r1.ebuild b/net-analyzer/isic/isic-0.07-r1.ebuild
new file mode 100644
index 000000000000..ac8c670339bd
--- /dev/null
+++ b/net-analyzer/isic/isic-0.07-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="IP Stack Integrity Checker"
+HOMEPAGE="http://isic.sourceforge.net/"
+SRC_URI="mirror://sourceforge/isic/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+DEPEND="net-libs/libnet:1.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( ChangeLog README )
+
+src_prepare() {
+	# Add two missing includes
+	echo "#include <netinet/udp.h>" >> isic.h || die
+	echo "#include <netinet/tcp.h>" >> isic.h || die
+
+	# Install man pages in /usr/share/man
+	sed -i -e 's|/man/man1|/share&|g' Makefile.in || die
+
+	tc-export CC
+}
+
+src_configure() {
+	# Build system does not know about DESTDIR
+	econf --prefix="${D}/usr" --exec_prefix="${D}/usr"
+}
diff --git a/net-analyzer/isic/metadata.xml b/net-analyzer/isic/metadata.xml
new file mode 100644
index 000000000000..27b1e5096bbf
--- /dev/null
+++ b/net-analyzer/isic/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">isic</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/jffnms/Manifest b/net-analyzer/jffnms/Manifest
new file mode 100644
index 000000000000..04edf36bb287
--- /dev/null
+++ b/net-analyzer/jffnms/Manifest
@@ -0,0 +1,5 @@
+DIST jffnms-0.9.4.tgz 610758 SHA256 8e20d361ad3dc01d800315e3978f1873c3b6d1ebd3bc93a74a3fb8789d56da2b SHA512 4d0c4ed1fbf0107029d92b2ea8f0f02c46d532810dc58bf048c5ffaf79f7f24630101be8319876db1aee3356ced32e7cba2f2494bc8a92a635b0a4e6897c6fe7 WHIRLPOOL 10ac59bd5a52c1803e124b6a47b889bda938760359bd995311486c7156840ddd88092ceba5280fb090dd3484927f6d52121428e4a75d4aca1cb6135ee8cf29e2
+EBUILD jffnms-0.9.4-r1.ebuild 1352 SHA256 0c53122ae4a7bb8ce70cff62d32dd2e87f9533e324e14b40a965ef6ec607b978 SHA512 a9e195307f40390399a3f707942b1b2b77ff0572bcf2545abffabcabea72ba124a42ccaf07bd53dbb93df7a8e3d527d9eb2380dbc9a23b00c4ad9d19f2f38371 WHIRLPOOL 40fe087b8f71e34813cef20b0db028d40350979393505a4965246a4a607f6d36e7e3dec73f9299b94298890b4bef9579e6134e5601950302f1d7a4c20ae2ecd3
+MISC ChangeLog 2428 SHA256 208b25bf66b6af47107e306ce6dfab9e84127034ab04a3707accaf6cc5655c0f SHA512 3ee9ad6b05f37ba88a942239055228d73d2f4e39077c037ae54ddd1f4c81427abc705129da4c439376f8534483bf25536f73237c01da1be259634e33e179a8f7 WHIRLPOOL 66d92e7382b90a51d04b6f9d2000da8dcc392ea7a15b789541ecfa0bb1048d44f6d9aac720882e382fff06699cb048d276f335ff60fd1b74f61d9722ba76b817
+MISC ChangeLog-2015 3314 SHA256 3dcb5853f78712817d597df6efdf48dbe77a2940bd24f6bc202f35a4634280a3 SHA512 7d0caa12106ad35f964ab98c5d3fbd589c442e0ccdab486d3d4024207cf1d0ef2b664a098462956579a3d46634b39a174917f539af27ef41df4880bc2aac5f83 WHIRLPOOL 59699c4f2932bf68beb80b12404a4511f7c570d6be27fa8931e807eb9592487ae9bfab782f40995b6147361d20f23e0fa28240ae2c302c2e8f42ba7bdf3ac88a
+MISC metadata.xml 356 SHA256 493fda89af561c7e5837f5e88d3eb9551ab80b3265be29a2287e148dc3fb912f SHA512 d9902d5255db25672152c02e26494f9c42137714feb9318a8eaf517c6a62255d036a3c2b1b308a3c32882b7648f33a38a7af344c2e3ec4b2f402fe26870435f1 WHIRLPOOL 6ede64561f2339d7a87b5ed3747cb500c3270c7d7842abddef62a5aa02e798f67313ee74e624391365c45de7da648fd915b8c4c4855691f5928781d00bdf3973
diff --git a/net-analyzer/jffnms/jffnms-0.9.4-r1.ebuild b/net-analyzer/jffnms/jffnms-0.9.4-r1.ebuild
new file mode 100644
index 000000000000..ddbea9ec4ebb
--- /dev/null
+++ b/net-analyzer/jffnms/jffnms-0.9.4-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user
+
+DESCRIPTION="Network Management and Monitoring System"
+HOMEPAGE="http://www.jffnms.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mysql postgres snmp"
+
+RDEPEND="
+	dev-lang/php[apache2,cli,gd,mysql?,postgres?,session,snmp,sockets,wddx]
+	dev-php/PEAR-PEAR
+	media-gfx/graphviz
+	media-libs/gd
+	net-analyzer/fping
+	net-analyzer/net-snmp
+	net-analyzer/nmap
+	net-analyzer/rrdtool[graph]
+	sys-apps/diffutils
+"
+
+pkg_setup() {
+	enewgroup jffnms
+	enewuser jffnms -1 /bin/bash -1 jffnms,apache
+}
+
+src_install(){
+	local INSTALL_DIR="/opt/${PN}"
+	local IMAGE_DIR="${D}${INSTALL_DIR}"
+
+	insinto "${INSTALL_DIR}"
+	doins -r *
+
+	rm -f "${IMAGE_DIR}/LICENSE"
+
+	# Clean up Windows related stuff
+	rm -f "${IMAGE_DIR}"/*.win32.txt
+	rm -rf "${IMAGE_DIR}"/docs/windows
+	rm -rf "${IMAGE_DIR}"/engine/windows
+
+	fowners -R jffnms:apache "${INSTALL_DIR}"
+	fperms -R ug+rw "${INSTALL_DIR}"
+}
+
+pkg_postinst() {
+	elog "${PN} has been partialy installed on your system. However you"
+	elog "still need proceed with final installation and configuration."
+	elog "You can visit https://wiki.gentoo.org/wiki/Jffnms in order"
+	elog "to get detailed information on how to get jffnms up and running."
+}
diff --git a/net-analyzer/jffnms/metadata.xml b/net-analyzer/jffnms/metadata.xml
new file mode 100644
index 000000000000..a7910963dea7
--- /dev/null
+++ b/net-analyzer/jffnms/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jffnms</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/jmx2munin/Manifest b/net-analyzer/jmx2munin/Manifest
new file mode 100644
index 000000000000..badfb6abd755
--- /dev/null
+++ b/net-analyzer/jmx2munin/Manifest
@@ -0,0 +1,5 @@
+DIST jmx2munin-gentoo-1.0_p20120811.tar.gz 6890 SHA256 38f7281ca2164778cd40d2aa09a274d000c4a1ef325f20eddfb058885595a4ef SHA512 154817d63fb278970d04785821a29833007a553055efe28aa6a3654d01b7a4422a2a1c98cd1693ae52ea28a57505b6d7988f241f6d119425f5c3ae38471b72be WHIRLPOOL 59f302a24798319648998ac296aec13059a868695eda92aebdccb0fb34cbc1ce9fa7aa1fb388ed7d45acbce444c7c138bb718840477ba427937cbb10b879c5bd
+EBUILD jmx2munin-1.0_p20120811-r1.ebuild 1042 SHA256 fb2d3e0db334889828ea49e52c250443dc05f1d8848fa369808b5bc7d8e3a370 SHA512 fec90b91b98934c2cc2d637aa553031f8027908362bd2cbd1cf427a199110dc05b8583749a3820e3afb2b5e104d1fd500bf90db9e4ce5566bd7964c18ec23d0d WHIRLPOOL a1c0192da01e61aa6993edc93b1a15353b3e719cb99979b1ed2c72af06ed6c1c0ce5b9e0590ed3e56db72da558f79fc261661655b8c6588728c640d16a23244c
+MISC ChangeLog 2459 SHA256 9a3683860bf7ed20a5fe99971a906b3fd106dd30d32df1e0ce212d2aac4a10b2 SHA512 83f59f74b2bc7204f52deca4a872c282613486070b978394ae468e22e7e001fb7ff8e43255d848e2b9da799e49da4bbb037d8f66cb9104d4398c5deaf06c9da6 WHIRLPOOL cac5ed6d004ede266bf3dcab797e1613e98486a5959bed5b0202f2d3ae581443d0cecb0f2731bd80be435ae433932ccee025652877676172acb61ac07303d9b6
+MISC ChangeLog-2015 847 SHA256 a73aec7ff45db851b2202c76afaa1476f2de789482dfbab83ae28810b9f524f7 SHA512 d73136bb7710ae80847b08ba8e1b031866c371d790b88863c671e72ae352e37111872eccfea822b2a92738be8d47bb33e836d25b1783d2f2d057f8011e9772e2 WHIRLPOOL 705b32c4ebc8f4eb36a54427e1d838f347067a1d9d20d72cd806a8205185d15e20389752927b1b8b7687ab8fa9bc5a69a7af752ce44eb795dc7970b9a0f93971
+MISC metadata.xml 453 SHA256 8ba3d9ccd68e600e729b5811d28f7326c3e9be30c363486c1cef4b793355090e SHA512 932ab6744d17bd6b912e9a1fe6aa1420f7aec75b4678428636ed8150c99af2aa618dc39094f7400b85070ced96eac82d5671e189d20e9ae255c5a1c3ea3499b1 WHIRLPOOL ffcf80b9a368a2213ca696ec9ca16be9e6a0f4af97955ddaad3204173bbdc062fdcf0481665efc21d81112b61f301cbb89538cded1a35707313bfeffe76342ed
diff --git a/net-analyzer/jmx2munin/jmx2munin-1.0_p20120811-r1.ebuild b/net-analyzer/jmx2munin/jmx2munin-1.0_p20120811-r1.ebuild
new file mode 100644
index 000000000000..ad8601a5fcc0
--- /dev/null
+++ b/net-analyzer/jmx2munin/jmx2munin-1.0_p20120811-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-gentoo-${PV}"
+
+DESCRIPTION="JMX Monitoring plugin for Munin"
+HOMEPAGE="https://github.com/tcurdt/jmx2munin"
+SRC_URI="https://github.com/gentoo/jmx2munin/tarball/${MY_P} -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+CDEPEND="dev-java/jcommander:0"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="${CDEPEND}
+	net-analyzer/munin
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_SRC_DIR="src/main/java/org/vafer/jmx"
+JAVA_GENTOO_CLASSPATH="jcommander"
+
+src_unpack() {
+	unpack ${A}
+	mv gentoo-${PN}-* ${MY_P}
+}
+
+java_prepare() {
+	rm pom.xml || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${PN} --main org.vafer.jmx.munin.Munin
+
+	exeinto /usr/libexec/munin/plugins
+	newexe contrib/${PN}.sh ${PN}_
+
+	dodoc README.md contrib/jmx2munin.cfg/cassandra/nodes_in_cluster
+
+	keepdir /etc/munin/${PN}
+}
diff --git a/net-analyzer/jmx2munin/metadata.xml b/net-analyzer/jmx2munin/metadata.xml
new file mode 100644
index 000000000000..737e4b4746ff
--- /dev/null
+++ b/net-analyzer/jmx2munin/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">gentoo/jmx2munin</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/jnettop/Manifest b/net-analyzer/jnettop/Manifest
new file mode 100644
index 000000000000..c619d7351236
--- /dev/null
+++ b/net-analyzer/jnettop/Manifest
@@ -0,0 +1,7 @@
+AUX jnettop-0.13.0-asneeded.patch 253 SHA256 a4b523b4779674ffe1816f873801cb085ada0d2da20ca5c5bbea1c493a16cc5e SHA512 68084c207c6154a86bb65913c523264ceb83e349d21de9ed7184aafaa21f63d9739154b69fd3f55023d89947ae70727dbdecd6dc8483854f1f2e5bc5565b52e7 WHIRLPOOL 8b13bdacf11bad12d09bbb3451095f1955550116ea08bd3133ab4974fb1b02fa3bf75326c2c9cd3d1c22104f9d69499f0a4d8f1b7ffcb1250ed34ea7e3d14f16
+AUX jnettop-0.13.0-tinfo.patch 375 SHA256 e24a83df4cb609a8d2ce422c9d920ffe8d7c468f9dc9366481c8a5b3008af055 SHA512 07f6ad5cf44648925d64277f2e74d4a70c1770d192a7b6e6f39c1fc3e28748de1e959cb95d841a9a3b0afee337bb1a8a6c342a698115c44ad76969cf6c095189 WHIRLPOOL 0ea4876ee27b2e017e0b0ae99be9425210605f88802c4714bc86a552f209d924f12ab4776c698db24c5401d11b38814abe2d5afd2e342b7f825e6574a977e4c6
+DIST jnettop-0.13.0.tar.gz 131009 SHA256 e987a1a9325595c8a0543ab61cf3b6d781b4faf72dd0e0e0c70b2cc2ceb5a5a0 SHA512 304293cd011ce8556aabf69e91b2e831ac61aa43016bb5b616d24b45805315a815dfba37dfe9f7cd3c637931043d4123b2f46a7637ba1a0b9d30267fe6dcb051 WHIRLPOOL 9e4c2226f40b6ee95905e51f0f4d2b70e4a0aeea40ca9fbb3cc0ba696c673d4fb95aecbe5757857e49533b7628bd8cdf5c27cc568fbcd34167fe40fca52b961f
+EBUILD jnettop-0.13.0-r1.ebuild 901 SHA256 9428fbce6efb9cf176562ca77a317b493a6ce156cc9a2ad0f90f5e34ecb407e6 SHA512 04c74b3e1e7fbdf8a564bd5c7c76449b01da0cbe5354b93b241de2710498b22aedfeb5b83f4201d630ff75c3c29d32411f673421eb29fe10e7d027e53a7537ce WHIRLPOOL 87e8d60d39f7fdab353aea69d2d689d491b60c44717ac559f3d8c16c77f912c4560a1fb1f94259d66e9c14b29b86e347c1e31d11f9557c0a134a93f34b9e95f8
+MISC ChangeLog 2514 SHA256 580b3ceac253cad8fe6eb260937e56a8f0e7405519d54a777ea4b982d0289a60 SHA512 26f6c8a77123a1869d25ce8a57336fb6db3afcc9861a5c651030d9c37bb5d4c48bfd8cb78283f3fa63c0bd638a027277647dee7e2926b24baf1a7289c8fc96d6 WHIRLPOOL c40a531e0da7dffc5ce59fc600a910b8995ebaeeb17f6b44d1e1c9f5de09ef411cef74e9a925f52d8c5ca214992d5ccad16b259020e6a90e826bd4226beda81b
+MISC ChangeLog-2015 3854 SHA256 2dda129193618a600a30d206199856404f6f2bc1b49f12bb87aa34faf42c2c17 SHA512 0c7917ec0efd20cf6704256284c925152c0d121e21c84600df3b7bbba01b4603c5238c6d2b5cf8705c3b75a87a50f13c75342ab952c7e0351fbac48fa52f8b2e WHIRLPOOL 873c49be91f0c4d46fb6b197ba671416ca416ee59794d22d5e5689c27bce75372e17cebee2bba9d4a7c7ffa1d5d9e1eb5578db5a0b61a23386b25ce17f7af8b8
+MISC metadata.xml 357 SHA256 3dbae83e76c977e735a4c60bf6e37dc4be0ac1707dda4a251fe03b0036aac90b SHA512 3dc7ce2393c1b86d854442a7a1c6322a7697cd00c9f88412beff6064e0a5ce8b2bc7016cf6fa8a7dca6affb25c1eff8b6a6a1860d767d3e9a296051317ca8bd8 WHIRLPOOL 65051840ef1cf77d2f5932d0523e4a5f6e25028dff59587dc9e0bd611d23b8fdc8a81d55bbd38e45d2d6aac8ff6d30f3caf23c891b564c894e9bf12e51ac6594
diff --git a/net-analyzer/jnettop/files/jnettop-0.13.0-asneeded.patch b/net-analyzer/jnettop/files/jnettop-0.13.0-asneeded.patch
new file mode 100644
index 000000000000..8a43240bb0de
--- /dev/null
+++ b/net-analyzer/jnettop/files/jnettop-0.13.0-asneeded.patch
@@ -0,0 +1,12 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,8 +1,7 @@
+
+ 
+ INCLUDES = -I$(top_srcdir)/include @GLIB_CFLAGS@
+-AM_LDFLAGS = @GLIB_LIBS@ @NSL_LIBS@ @SOCKET_LIBS@
+-CFLAGS = -g -O0
++jnettop_LDADD = @GLIB_LIBS@ @NSL_LIBS@ @SOCKET_LIBS@
+ 
+ man_MANS = jnettop.8
+ 
diff --git a/net-analyzer/jnettop/files/jnettop-0.13.0-tinfo.patch b/net-analyzer/jnettop/files/jnettop-0.13.0-tinfo.patch
new file mode 100644
index 000000000000..958685cb5c12
--- /dev/null
+++ b/net-analyzer/jnettop/files/jnettop-0.13.0-tinfo.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -15,6 +15,8 @@
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/sockio.h])
+ 
++PKG_CHECK_MODULES(ncurses,ncurses,[LIBS="$LIBS $ncurses_LIBS"],)
++
+ # with definitions
+ AC_ARG_WITH([ncurses],
+ 	AC_HELP_STRING([--without-ncurses], [don't use ncurses, default is YES when available]),
diff --git a/net-analyzer/jnettop/jnettop-0.13.0-r1.ebuild b/net-analyzer/jnettop/jnettop-0.13.0-r1.ebuild
new file mode 100644
index 000000000000..e0c718000574
--- /dev/null
+++ b/net-analyzer/jnettop/jnettop-0.13.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A top like console network traffic visualiser"
+HOMEPAGE="http://jnettop.kubs.info/"
+SRC_URI="http://jnettop.kubs.info/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="berkdb ncurses syslog"
+
+RDEPEND="
+	net-libs/libpcap
+	>=dev-libs/glib-2.0.1
+	berkdb? ( =sys-libs/db-4* )
+	ncurses? ( sys-libs/ncurses )
+	syslog? ( virtual/logger )
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-asneeded.patch" \
+		"${FILESDIR}/${P}-tinfo.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ncurses) \
+		$(use_with berkdb db4) \
+		$(use_with syslog)
+}
+
+src_install() {
+	default
+	newdoc .${PN} ${PN}.dotfile
+}
diff --git a/net-analyzer/jnettop/metadata.xml b/net-analyzer/jnettop/metadata.xml
new file mode 100644
index 000000000000..819c7823b02c
--- /dev/null
+++ b/net-analyzer/jnettop/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<longdescription>A top like console network traffic visualiser</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/knocker/Manifest b/net-analyzer/knocker/Manifest
new file mode 100644
index 000000000000..ef5281375703
--- /dev/null
+++ b/net-analyzer/knocker/Manifest
@@ -0,0 +1,9 @@
+AUX knocker-0.7.1-fency.patch 5350 SHA256 b734c353fefacf5cc96cfc8b72210dc5a52112aca6c611922c8257a7dc35b422 SHA512 6836be77417fc4a5e98c9a5aa619a66eae012037162b78532fd0269ebeec54c7f91537c159d9a1374b1c9b470a632ba1a90d28cd7514155d98752bc59ab6d17b WHIRLPOOL 037e88c2fc94cb011043e432f597933e6885bb8006d7fb2171c124d932b7252f4759ed72b0864d0299a02ecf127f37cf594828db2d7091c81529557c403a1004
+AUX knocker-0.7.1-free.patch 607 SHA256 486c3eef3b0508740c6366f6c80ecfda70c840fb06c3a4c9cf0478479fe6e20b SHA512 f1f237747394a2ca6b14105be5461c98e441ecd3c4da0c1475ac6dfa717d2a0b004d3fb702b026b45f5f873c88d3f60b4fd5234dd445fd27346c95bc4c5c5671 WHIRLPOOL 48843ff76fab21930a932d8c21b490b4314c30c34debe99fbf8f655f206d453bac22826db9485c47c26c975faa99393ce0b93d27def7d5d187521cb4743b35c5
+AUX knocker-0.7.1-knocker_user_is_root.patch 221 SHA256 14169d6b5775b3f0844798ec1f99624bf55c36db86723b28567265b0e07db96e SHA512 42b4d4de839e0a606d091909f7bbba0031a6e337fa7b766bb737fd60006afdc87c368cdb642e9bf14ee1d7d0c5bd7b6193006ab0240230f819b67df155f1822d WHIRLPOOL 447db4cf44dd15e19f61c99efce8c61855eb369680828d70de3d06510b33ac6e240ca9b76c7875c901175aa785c5ac7a4a3a480368e797104522a758fad434b0
+DIST knocker-0.7.1.tar.gz 72132 SHA256 db6f2a9e9705e3b678b9fd7fdd32ccdf13ab3f2dba2a6d053530a2faf67faf8d SHA512 e65d615235328c027e1c6179a11bee186fa3d173205850e8b9fac591819e344de770d968c2667f1a18bef88cf90422c357bf76b9d05a8915629977cb8e334cc2 WHIRLPOOL 03943601b8fa07d49b33f0a4b2bdc36d062cca83a2fd20acac7bc0741079fbbbc469f05f418e6743adb4e0eba04a4406eeca0ec4bf861d650089de68174a62ab
+EBUILD knocker-0.7.1-r2.ebuild 593 SHA256 b36539b37cf5766e405669edaf5260a0e539ba4da21046f5b121c07fd3d5b418 SHA512 023fe82a6fa348ef9810f0c3e451f8dcbb2a25e8d5d81b1d715fbecf9d20b2d0c831ac8640cf585a7618caa2ab5e1bed6a0742e52bc6f62a53685d0c0513ad18 WHIRLPOOL fb4773a51648188e37af16b00ddf0021cf8aeb79941525bc6178479266b7aa4c20b9e4d287c4d211059009d943d424adb8ea03a579a635f402859dea0fcdf31c
+EBUILD knocker-0.7.1-r3.ebuild 575 SHA256 3a8630b0a6945a854edb45c51ad200cb6d563689ffb3c7579f3649b22603c0b6 SHA512 ca3e9cc58c364b72652f2444b3083870c5f5e8b2af8769173aff1d6fe17fe296467007c4baf94725dc95c138ef333a8d88ebd784de4fbed1efc8d61564de1812 WHIRLPOOL bddca89fc301114cecda0d43125e052da2e8edd96c42fa983611a2b2162d4598c14bf14759205f54ff90cb339ed32c9086b628758532f3dff84d58eab7771967
+MISC ChangeLog 2615 SHA256 d982b1a980eefb7839e9d61bb1fab5048903e5c04f4ba4e5e5fc06f05ee357ae SHA512 3f93e45f5be0fb4e2558ba75b9e481912cd76d3d909a9cfacf4b7ac7ae232e14cfcf20d4e1af5ca1fb442b996b08cb6163e55ca7bb90f5bc32241450c3c87b7b WHIRLPOOL 74f8c07627fd6624355305ab7b2f72ba5a17d14b30212cd91cbd02f561aa76929bb5c6274ff381b876f8cc24eceec887f87c19800a41e16e2399a3c088c43d39
+MISC ChangeLog-2015 3692 SHA256 96b13626f8389aae681779b173371324eaf12c2f5731e698d1d1dccb77495f2f SHA512 6143bf4b0928436d75400c2dcdd2c5791ddfa5d578f4b786b49938cdad4d96ca0b1c763d8a6b32fbbcc03f27dca070ae9126bbe950021e2322af35ac816ad0e0 WHIRLPOOL a8941cd0c273a1884401f58699cc94a5fe7bb018ce8bd6056ff60d3d422f603c61e76ab6fc25eb468154d3ce93fcab32b5cbda3b7ff919ba1594ffe39fe9d49e
+MISC metadata.xml 357 SHA256 6bab911365cde10fae7690dc159e91b461508c3e636349590223e269db3f8484 SHA512 e74b8f089a05b739cd6e7864802a5e6759b416d41f122e45ea529feadd69ecd04aff2ed695687710eba64dc24087f4fd364dbda33b59f9983aa453c3d699ba69 WHIRLPOOL cff7343418c2712a20a7c8cfe3005cb54a2afb2f480cf3c065082ce0b345043170631aa53ed2250405669389549c6bfab906d55a136d6f0515e5bd89195462a3
diff --git a/net-analyzer/knocker/files/knocker-0.7.1-fency.patch b/net-analyzer/knocker/files/knocker-0.7.1-fency.patch
new file mode 100644
index 000000000000..6051d87b2e68
--- /dev/null
+++ b/net-analyzer/knocker/files/knocker-0.7.1-fency.patch
@@ -0,0 +1,149 @@
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -23,7 +23,7 @@
+    .conf in the user ~/.knocker subdirectory.
+  
+ 13 May 2002
+-  - --no-fency (-nf for short) option added. This switch tells knocker to show
++  - --no-fancy (-nf for short) option added. This switch tells knocker to show
+     the output in a "polite" way. All the lines and stuffs shown in the default
+ 	mode, will not be displayed using this option.
+   
+--- a/src/knocker_args.c
++++ b/src/knocker_args.c
+@@ -82,7 +82,7 @@
+   fprintf (stdout, "Extra options:\n");
+   fprintf (stdout, "      %s,  %s             quiet mode (no console output, logs to file)\n", QUIET_MODE_SHORT_OPT, QUIET_MODE_LONG_OPT);
+   fprintf (stdout, "      %s, %s <logfile> log scan results to the specified file\n", ENABLE_LOGFILE_SHORT_OPT, ENABLE_LOGFILE_LONG_OPT);
+-  fprintf (stdout, "      %s, %s          disable fency output\n", NO_FENCY_SHORT_OPT, NO_FENCY_LONG_OPT);
++  fprintf (stdout, "      %s, %s          disable fancy output\n", NO_FANCY_SHORT_OPT, NO_FANCY_LONG_OPT);
+   fprintf (stdout, "      %s, %s         disable colored output\n", NO_COLORS_SHORT_OPT, NO_COLORS_LONG_OPT);
+   fprintf (stdout, "\n");
+   fprintf (stdout, "      %s              let you configure %s\n", CONFIGURE_LONG_OPT, PACKAGE);
+@@ -111,7 +111,7 @@
+   args->logfile = logfile;
+   args->quiet = quiet;
+   args->colors = colors;
+-  args->fency = TRUE;           /* true by default */
++  args->fancy = TRUE;           /* true by default */
+ 
+   return 0;
+ }
+@@ -189,10 +189,10 @@
+             }
+           return (0);           /* we should have all arguments here */
+         }
+-      else if ((!strcmp (argv[i], NO_FENCY_SHORT_OPT)) || (!strcmp (argv[i], NO_FENCY_LONG_OPT)))
++      else if ((!strcmp (argv[i], NO_FANCY_SHORT_OPT)) || (!strcmp (argv[i], NO_FANCY_LONG_OPT)))
+         {
+-          /* Disable fency output */
+-          args->fency = FALSE;
++          /* Disable fancy output */
++          args->fancy = FALSE;
+         }
+       else if ((!strcmp (argv[i], NO_COLORS_SHORT_OPT)) || (!strcmp (argv[i], NO_COLORS_LONG_OPT)))
+         {
+--- a/src/knocker_output.c
++++ b/src/knocker_output.c
+@@ -48,7 +48,7 @@
+ {
+   time_t timenow;
+ 
+-  if (!knocker_args.fency)
++  if (!knocker_args.fancy)
+     return 0;
+ 
+ 
+@@ -104,7 +104,7 @@
+ */
+ void knocker_output_host_info (const char *hostname_str, const char *hostip_str)
+ {
+-  if (knocker_args.fency)
++  if (knocker_args.fancy)
+     {
+       knocker_term_color_fprintf (knocker_output_fp, " - ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR);
+       knocker_term_color_fprintf (knocker_output_fp, "hostname to scan: ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR);
+@@ -134,7 +134,7 @@
+ */
+ void knocker_output_resolve_error (char *hostname_str)
+ {
+-  if (knocker_args.fency)
++  if (knocker_args.fancy)
+     {
+       knocker_term_color_fprintf (knocker_output_fp, " - ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR);
+       knocker_term_color_fprintf (knocker_output_fp, "failed to resolve given hostname/IP: ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR);
+@@ -157,7 +157,7 @@
+ */
+ void knocker_output_ports_info (int sp, int ep)
+ {
+-  if (!knocker_args.fency)
++  if (!knocker_args.fancy)
+     {
+       knocker_term_color_fprintf (knocker_output_fp, "\n", KNOCKER_COLOR_2, KNOCKER_COLOR_2_ATTR);
+       return;
+@@ -183,7 +183,7 @@
+ */
+ void knocker_output_open_port (int port, char *service_str)
+ {
+-  if (knocker_args.fency)
++  if (knocker_args.fancy)
+     {
+       knocker_term_color_fprintf (knocker_output_fp, " -=[ ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR);
+       knocker_term_color_intfprintf (knocker_output_fp, port, KNOCKER_COLOR_2, KNOCKER_COLOR_2_ATTR);
+@@ -216,7 +216,7 @@
+ */
+ void knocker_output_results (char *hostname_str, char *hostname_ip, int tot_ps,  int open_ps, char *secs)
+ {
+-  if (knocker_args.fency)
++  if (knocker_args.fancy)
+     {
+       knocker_term_color_fprintf (knocker_output_fp, "\n", KNOCKER_COLOR_2, KNOCKER_COLOR_2_ATTR);
+       knocker_term_color_fprintf (knocker_output_fp, "+=- - - - - - - - - - - - - - - - - - - - - - - - - - - - ",
+--- a/src/knocker_main.c
++++ b/src/knocker_main.c
+@@ -75,7 +75,7 @@
+ 
+   knocker_core_init_portscan_data (&pscan_data);
+ 
+-  if (knocker_args.fency)
++  if (knocker_args.fancy)
+     knocker_term_clear ();
+ 
+   knocker_output_open ();
+--- a/src/knocker_args.h
++++ b/src/knocker_args.h
+@@ -53,9 +53,9 @@
+ #define QUIET_MODE_SHORT_OPT "-q"
+ #define QUIET_MODE_LONG_OPT "--quiet"
+ 
+-  /* option to disable fency cool out put */
+-#define NO_FENCY_SHORT_OPT "-nf"
+-#define NO_FENCY_LONG_OPT  "--no-fency"
++  /* option to disable fancy cool out put */
++#define NO_FANCY_SHORT_OPT "-nf"
++#define NO_FANCY_LONG_OPT  "--no-fancy"
+ 
+   /* option to disable colored out put */
+ #define NO_COLORS_SHORT_OPT "-nc"
+@@ -88,7 +88,7 @@
+   int logfile;     /* log to file TRUE,FALSE */
+   int quiet;       /* quiet mode TRUE,FALSE  */
+   int colors;      /* no colors, TRUE,FALSE  */
+-  int fency;       /* fency output, TRUE, FALSE */
++  int fancy;       /* fancy output, TRUE, FALSE */
+   int win32_frontend;
+ } knocker_args_t;
+ 
+--- a/docs/knocker.1
++++ b/docs/knocker.1
+@@ -38,8 +38,8 @@
+ \fB\-lf\fr, \fB\-\-logfile <logfile>\fR
+ log the results to a specified file.
+ .TP
+-\fB\-nf\fr, \fB\-\-no-fency\fR
+-disable fency output
++\fB\-nf\fr, \fB\-\-no-fancy\fR
++disable fancy output
+ .TP
+ \fB\-nc\fr, \fB\-\-no-colors\fR
+ disable colored output
diff --git a/net-analyzer/knocker/files/knocker-0.7.1-free.patch b/net-analyzer/knocker/files/knocker-0.7.1-free.patch
new file mode 100644
index 000000000000..5381d2fd83e3
--- /dev/null
+++ b/net-analyzer/knocker/files/knocker-0.7.1-free.patch
@@ -0,0 +1,30 @@
+--- a/src/knocker_conf.c
++++ b/src/knocker_conf.c
+@@ -223,6 +223,8 @@
+ {
+   char *tmpp = malloc (strlen (line));
+   char *p = malloc (strlen (line));
++  char *tmpp_orig = tmpp;
++  char *p_orig = p;
+ 
+   /* Check if the option is present in the line */
+   tmpp = strstr (line, opt);
+@@ -234,7 +236,7 @@
+ 
+   if (!_isblank (*tmpp) || *tmpp != KNOCKER_OPTION_TOKEN)
+     {
+-      free (tmpp);
++      free (tmpp_orig);
+       return 0;
+     }
+ 
+@@ -247,8 +249,7 @@
+ 
+   strcpy (value, p);
+ 
+-  /* free(p); this cause knocker to segfault */
+-  /* well I have to know why... */
++  free(p_orig);
+ 
+   return 1;
+ }
diff --git a/net-analyzer/knocker/files/knocker-0.7.1-knocker_user_is_root.patch b/net-analyzer/knocker/files/knocker-0.7.1-knocker_user_is_root.patch
new file mode 100644
index 000000000000..d93136b2f255
--- /dev/null
+++ b/net-analyzer/knocker/files/knocker-0.7.1-knocker_user_is_root.patch
@@ -0,0 +1,11 @@
+--- a/src/knocker_user.c
++++ b/src/knocker_user.c
+@@ -82,7 +82,7 @@
+       _dir_create (user->dir);
+     }
+ 
+-  if (knocker_user_is_root)
++  if (knocker_user_is_root())
+     user->super = 1;
+   else
+     user->super = 0;
diff --git a/net-analyzer/knocker/knocker-0.7.1-r2.ebuild b/net-analyzer/knocker/knocker-0.7.1-r2.ebuild
new file mode 100644
index 000000000000..f8f17e39bcb8
--- /dev/null
+++ b/net-analyzer/knocker/knocker-0.7.1-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit base toolchain-funcs
+
+DESCRIPTION="Knocker is an easy to use security port scanner written in C"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://knocker.sourceforge.net"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+DOCS="AUTHORS BUGS ChangeLog NEWS README TO-DO"
+
+PATCHES=( "${FILESDIR}"/${P}-free.patch )
+
+src_prepare() {
+	# fix configure checks for compiler, wrt bug #442962
+	tc-export CC
+
+	base_src_prepare
+}
diff --git a/net-analyzer/knocker/knocker-0.7.1-r3.ebuild b/net-analyzer/knocker/knocker-0.7.1-r3.ebuild
new file mode 100644
index 000000000000..9731d03bf7b7
--- /dev/null
+++ b/net-analyzer/knocker/knocker-0.7.1-r3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit base toolchain-funcs
+
+DESCRIPTION="Knocker is an easy to use security port scanner written in C"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://knocker.sourceforge.net"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86"
+
+DOCS=( AUTHORS BUGS ChangeLog NEWS README TO-DO )
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-fency.patch \
+		"${FILESDIR}"/${P}-free.patch \
+		"${FILESDIR}"/${P}-knocker_user_is_root.patch
+
+	tc-export CC
+}
diff --git a/net-analyzer/knocker/metadata.xml b/net-analyzer/knocker/metadata.xml
new file mode 100644
index 000000000000..490337f25c7d
--- /dev/null
+++ b/net-analyzer/knocker/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">knocker</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/labrea/Manifest b/net-analyzer/labrea/Manifest
new file mode 100644
index 000000000000..f39e20a06165
--- /dev/null
+++ b/net-analyzer/labrea/Manifest
@@ -0,0 +1,6 @@
+AUX labrea-2.5-stable-1-incdir.patch 218 SHA256 45bfd1227458af66a5e49c09f464cd6cf4ed632332b1c7faba14fb898c7455c5 SHA512 935a9e0a884d8b1c7ae30c24c59c3f30d0491bde45329fe00f0f64e854d9c686b22f002dce832d5dbb17a45e23a0a3e3aae64f1150edc349c8b3499bd8bcadd1 WHIRLPOOL 78db2b256e24cf417a31ac5962e8803f9a9aa2b7b88feabd3c05afdc0888aa7e176bf35ffdf2eff360497dbbb63484d4bd5144b1e65259dda2485925170fb223
+DIST labrea-2.5-stable-1.tar.gz 210494 SHA256 7db462576a7e9446906ed7b8ce9f61a2754fdefd73bf0c369c9c17c96c9644b4 SHA512 63523f59e9e6ca31d2a5ea781f7b7087e7e41835aec24cd8cbf1cf7b65893fb1cedb2b13aa5fcfab458375ef27f5521a9ab88a71734b7317edf8eda2746c566c WHIRLPOOL 72ac934a2e5744d1da0bf9456633b71a3757b3583fd899e78df6400bd15b4e8602e4b36e6e920517117d222bbbc81faf13258e9c53d4308f2167d3d174fb299f
+EBUILD labrea-2.5-r2.ebuild 797 SHA256 182b7537d897f7d2083c36e9a8d7104d7eb81780f6ded2fa06cbe124659fdc61 SHA512 e2d5cdf2c81b941f62c54832a8f2b03774540474491694b243581693fa61391174c14ce2947d4cfa7d95e1450a8d7ab075ab26001f96f6b5d5518cd4db10afd1 WHIRLPOOL a71839ce3a6c8c9b9bafeb9f0a8565d3a13d6269a5da6432ff18a2b750bf6a265f932914e241b0c107d5def5f4daad3f9728c4c7abdb20b0b8c5d4ebc7ba8848
+MISC ChangeLog 2473 SHA256 efec6404ff2d2234b9c8efadc5711daedbbe04da6d218b97b390e0d0fd96033c SHA512 c8e4308c11928fbe6d59191d9a59436b3f017224caf12d112f2f76e0e1a51fca0a19d19443c3bfde5517d7c959789002ac9f9f896641be4e64defd326647cb2e WHIRLPOOL e66c79337b3826dfd8dfa74a6095d44f3340eb74454bd5e059637817e7432bc907a8e2b7b0775cb2b9f31a4fc9cd89c61a1d058a12c4e7ebfc9165fb33a34c1a
+MISC ChangeLog-2015 2288 SHA256 b62c5fd77f778540048438395e8f8e83c518ce8b90176b577ce04796c0cf9d29 SHA512 650f6d39ded289124d244746a8001ebdfb23fb91caf4ebfcf8aa9034dedddf0e889b107cd549fc7eae1097301b18abf18edb05e5c36fe30caeb659587e34ff18 WHIRLPOOL ffe3d6d646a89c6119886240437d2980e9bbd48778f3b200f9f60da7828a76d5de8b5b0b3711c41a73f7ca42f1627b5818c1c0fa1e272c6b31c3ad879096ea46
+MISC metadata.xml 418 SHA256 9c3f14f2eacefe16288c24f379b1bb27c83246b26682cbb2254bdc6e1e43ac36 SHA512 b099ece62d6f338e2ba3b8c3c653833252a6cd34d4f9bd0efd227cf6a0c2aedddd6c241c557ce3e05e56bfb9e99923228556d7b28ad26f641872d7ef1fd2acd9 WHIRLPOOL d7422a167f8648af4c6443455a394b3b8abc6f462927fca0496a893f067052f05fc9a1c7d398923999e9c073027666d36d8a7ded462da730e62e2ed37553fb74
diff --git a/net-analyzer/labrea/files/labrea-2.5-stable-1-incdir.patch b/net-analyzer/labrea/files/labrea-2.5-stable-1-incdir.patch
new file mode 100644
index 000000000000..54293a64b572
--- /dev/null
+++ b/net-analyzer/labrea/files/labrea-2.5-stable-1-incdir.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -2,7 +2,7 @@
+ 
+ 
+ 
+-AM_CPPFLAGS = -I../inc -I- @DNETINC@ @PCAPINC@
++AM_CPPFLAGS = -iquote../inc @DNETINC@ @PCAPINC@ -idirafter/usr/include/asm
+ 
+ sbin_PROGRAMS = labrea
+ 
diff --git a/net-analyzer/labrea/labrea-2.5-r2.ebuild b/net-analyzer/labrea/labrea-2.5-r2.ebuild
new file mode 100644
index 000000000000..cdbff85668a0
--- /dev/null
+++ b/net-analyzer/labrea/labrea-2.5-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="'Sticky' Honeypot and IDS"
+HOMEPAGE="http://labrea.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-stable-1.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+DEPEND="net-libs/libpcap
+	>=dev-libs/libdnet-1.7"
+RDEPEND="${DEPEND}"
+
+MY_P="${P}-stable-1"
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS ChangeLog README TODO NEWS )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-stable-1-incdir.patch
+	eautoreconf
+}
+
+src_install() {
+	default
+	newdoc INSTALL README.first
+}
+
+pkg_postinst() {
+	ewarn "Before using this package READ the INSTALL and README"
+	ewarn "as the author states that it can cause serious problems on your network."
+
+}
diff --git a/net-analyzer/labrea/metadata.xml b/net-analyzer/labrea/metadata.xml
new file mode 100644
index 000000000000..4b6eef6e2752
--- /dev/null
+++ b/net-analyzer/labrea/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>'Sticky' Honeypot and IDS</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">labrea</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/lft/Manifest b/net-analyzer/lft/Manifest
new file mode 100644
index 000000000000..d9127bbba928
--- /dev/null
+++ b/net-analyzer/lft/Manifest
@@ -0,0 +1,9 @@
+DIST lft-3.77.tar.gz 376369 SHA256 d182d6774e64dcdeb19ed1a598fa588e57ddb6cbb6847d9277c405d3a4597d89 SHA512 b06fa50cbccb40d275ac604b86c6aed4ee00700cde38fd579de06bb577280f154d0173c4788920410a5c2e0c8ed20d7adf07f15d0b98cf5ad4ea422651df60f1 WHIRLPOOL ecadee1574cac8d46e930ea67d4def06ff682810ba588db74b6f45ba89b116601bb8d6b060426f4151f2f1c9c43081e303fdf3c14a2c44579adcd2cbef723e02
+DIST lft-3.78.tar.gz 376574 SHA256 000575891b4094319a56d395c0ec576651fe76b251596ab19d3eb2e5f8d4bf78 SHA512 16636e60ed1fb0e0ffa52e24c4d23bc83de14f5c4fbb60641be9a8a6e54c1d28c8aa66ad0e8ae502e199e60653c368ed140a1027a9928dd8d76d1e5d8326122a WHIRLPOOL 6dbd39b91465a61a21e573e7ddb46bdc5217143c5bb88021b8f8e612231945ab9acc5a9bfaed2774caaa51d368f2de78c820b98a5b203cdeb217fa053eb906cb
+DIST lft-3.79.tar.gz 376655 SHA256 08e5c7973551b529c850bffbc7152c4e5f0bcb1f07ebbb39151a7dc9a3bf9de0 SHA512 83f35cb24966467a7da180ca8ac9d642e7ca6267a14e752a813f172956554c3d4b278a450d230535c15db1b14d415dca752ad05ed1cec8c1c7cf4953b90a646d WHIRLPOOL 41c93bc93640393eb402360103b03ca772b3de3ff82170a5781928f83218a7303685fa3091355a877373a3d7a73182985198d0f59bd30e5102050e6e3b669c41
+EBUILD lft-3.77.ebuild 493 SHA256 1d15c43f296d3d8f6ccf18597b16b3df563a41898058dee213942b09327ebb99 SHA512 7d921ace43680f2ead6e1e9a1cd45d8e3a3a505b2b9293ad2940dbe117a3339e1a80ff04b15831459b80a214beaf27efaac57c9696642d4a58933516756c7164 WHIRLPOOL 4c35ef7c016e5a04a80e9042b12893e74831cac9b97311d8d557906e7e35194d2f2e07f05c917172e9487985c219b8bec7884d59edccdd180c34850826bd23da
+EBUILD lft-3.78.ebuild 496 SHA256 d50913521cce371c6e0683b9a69e96e868664c12c2073d8960ee320a7d755495 SHA512 763ac7adc467f1517e7dc682ee179f9e8a58b94f67c871a898c55f4545c66219764bef441aece29a575675b54e899bcc59b408f4c755188f176694852c374c89 WHIRLPOOL 5fa7ad5bbef11ba74517fa6153fb5f0df25272a61e73a6d4bfebce4da48bda32274d69634c2102074aa578400552c5bdd7ced064d76cac8eff1bed17ac5127b2
+EBUILD lft-3.79.ebuild 496 SHA256 d50913521cce371c6e0683b9a69e96e868664c12c2073d8960ee320a7d755495 SHA512 763ac7adc467f1517e7dc682ee179f9e8a58b94f67c871a898c55f4545c66219764bef441aece29a575675b54e899bcc59b408f4c755188f176694852c374c89 WHIRLPOOL 5fa7ad5bbef11ba74517fa6153fb5f0df25272a61e73a6d4bfebce4da48bda32274d69634c2102074aa578400552c5bdd7ced064d76cac8eff1bed17ac5127b2
+MISC ChangeLog 3467 SHA256 9b91e40598c14bc5fa8c7c0053377f5a9734716d949d93ff07dfe6ed16465a2e SHA512 feee9aeabed91289440c79129c6e41f7fc48591a920032eea6e806617a8a20541de85a951522e67d1ed3f1e98c396924faf2885b93a1ebdae33d3bcfb95cb54b WHIRLPOOL 293903994e5ea41571b1789bc780c89f41d1dfa53bb7b4b7c863b52f6c6462dc92a14cb817af946e2c355590a911cd5c434f99b2843fee30cbbd05d20f0532c5
+MISC ChangeLog-2015 6134 SHA256 365197e26715447e9e805ff3fb16ee89ea08801ef2723c51fcbe661c34f5b9a9 SHA512 8f22b48e1c27597f5ec2912f08f406427a5a5c68efc54281068f90eb56efe6e97fc9f22309999c16c2330d769bb6481fcd1a8090f44e41ecc2de3fe97758b470 WHIRLPOOL 6bad44042632f12585624ee5f2a2ad541185a222f9cab8b5ee9d2247c53740a83643733fb4ab15a00acb18cc56f9322234ed1c5e6472cd11dcb5ea91aa10a2dc
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/lft/lft-3.77.ebuild b/net-analyzer/lft/lft-3.77.ebuild
new file mode 100644
index 000000000000..b79c445424c0
--- /dev/null
+++ b/net-analyzer/lft/lft-3.77.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Layer Four Traceroute (LFT) and WhoB"
+HOMEPAGE="http://pwhois.org/lft/"
+SRC_URI="http://pwhois.org/get/${P}.tar.gz"
+
+LICENSE="VOSTROM"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="
+	net-libs/libpcap
+"
+RDEPEND="
+	${DEPEND}
+"
+
+DOCS=( CHANGELOG README TODO )
+
+src_prepare() {
+	default
+	sed -i Makefile.in -e 's:strip:true:g' || die
+}
diff --git a/net-analyzer/lft/lft-3.78.ebuild b/net-analyzer/lft/lft-3.78.ebuild
new file mode 100644
index 000000000000..58a145bd7256
--- /dev/null
+++ b/net-analyzer/lft/lft-3.78.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Layer Four Traceroute (LFT) and WhoB"
+HOMEPAGE="http://pwhois.org/lft/"
+SRC_URI="http://pwhois.org/get/${P}.tar.gz"
+
+LICENSE="VOSTROM"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="
+	net-libs/libpcap
+"
+RDEPEND="
+	${DEPEND}
+"
+
+DOCS=( CHANGELOG README TODO )
+
+src_prepare() {
+	default
+	sed -i Makefile.in -e 's:strip:true:g' || die
+}
diff --git a/net-analyzer/lft/lft-3.79.ebuild b/net-analyzer/lft/lft-3.79.ebuild
new file mode 100644
index 000000000000..58a145bd7256
--- /dev/null
+++ b/net-analyzer/lft/lft-3.79.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Layer Four Traceroute (LFT) and WhoB"
+HOMEPAGE="http://pwhois.org/lft/"
+SRC_URI="http://pwhois.org/get/${P}.tar.gz"
+
+LICENSE="VOSTROM"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="
+	net-libs/libpcap
+"
+RDEPEND="
+	${DEPEND}
+"
+
+DOCS=( CHANGELOG README TODO )
+
+src_prepare() {
+	default
+	sed -i Makefile.in -e 's:strip:true:g' || die
+}
diff --git a/net-analyzer/lft/metadata.xml b/net-analyzer/lft/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/lft/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/libnasl/Manifest b/net-analyzer/libnasl/Manifest
new file mode 100644
index 000000000000..cc1956afb9b4
--- /dev/null
+++ b/net-analyzer/libnasl/Manifest
@@ -0,0 +1,8 @@
+AUX libnasl-2.2.9-bison3.patch 596 SHA256 55bead62fa79fe13fadbec2b5d8e2350388405a6d3390c6feccd43984e5491e4 SHA512 29d03681ffac9b050ff8bc5aa5641c70ebfd6523810e22941e7b262bb1591e3c2d59b3c863725e9dd5ff696ad1a5f2d2b573784607022afd62d33fcaee5822c4 WHIRLPOOL 6fef0e20d1589534152856a3d3fd836f04640c863e2657f569675cffd30cd7e533ccb3b8bc756ff7369230eea5c95456e5ba2fad040f5e6aa6fcd2ef754f7806
+AUX libnasl-2.2.9-gentoo.patch 929 SHA256 3eb28fdcd664b2b88b055d85a9b27a102d426c179a74bad332b7fb04a1dfdc79 SHA512 7d4fe54240b771f30f1b80e35be828868428ad24b3654aedb91ef5da42f2bde379347a4730e71f04edb373ab9d7a6be981769eef7aa3514d4275177391f7290f WHIRLPOOL 8b02b2986c1293b87d7d40a18f291dae5cb90c4717fcf1f3f0580ca813b1ae6741e1cd17b6dfada5ae21d8e47dd11d511041a817ae318c01e15f461986f10d27
+AUX libnasl-2.2.9-openssl-1.patch 844 SHA256 b277cc237d1920d424c9c51c10609829550cf5dfce2915a45ec63c76288cabd1 SHA512 d39c7d89166aa2274dead9378e5b8c763672830aaa7ae7ee9166137aa984aa9d2497ebdfaf6312356c78c95404a763e3b6b9ab58a460cc1bfc8a9c8d1db8590e WHIRLPOOL 78383fc29afa2184d23788b31679c61e4d33d902da2ee6bf3f3e40ea5268d1764faa62f6eabd4990c4db98fb4a2fb4d39191d015aad95391d97a988f416182fe
+DIST libnasl-2.2.9.tar.gz 366960 SHA256 2d9cebfe69e40963d790295993e096697a0bed37774b66ee8b14e48c2231fa93 SHA512 74a637d39f0d61c9e0f692d3a6754000ef635690a61b05c88608fd5bbee438ce720597babe25af80bccd4fca52f22531b3fc913820a13147c179f8a16c034e03 WHIRLPOOL 3d02768d18451c0a648f56bb55a118587c77598c1cefb1fba4db538b9266016f76710038e714813bfbce392a3054115a2345413269cbb58246519baee9338f83
+EBUILD libnasl-2.2.9-r1.ebuild 983 SHA256 e2d3fe1eb1896867d45f7eb5c079813f1f4396164479566cebc5382b40ac380c SHA512 bb8dbde665776d6bd0df74e532c8553638c5114bb7d5bfdd7c6c162474b9c911fe1d465a2834fce18ae671b6a628996fa87d0329dbc5f53cbb846cd9d8a9dc33 WHIRLPOOL 6c85aa8f245183d9fa8ee7b744115c1b63ff486cdeb13bcb1b8e67996f65e307d08fca6c6221976a2829d739c5b93cef52e21f47cce43457720fc7f0e0f9b007
+MISC ChangeLog 2549 SHA256 5e7030a3ca0c5c539de65289f184c66500b04bc29cb28173017dd9db6545b9d4 SHA512 d3fac78f5f3332766d59097f4f78f5b5aa19bccb4d86717d53657567324fe400a0fe976ab606b0926615f062c12d43d70fd2f36ece39df6f065018a9df438849 WHIRLPOOL 88e43448fbf329b1831133ae9f5fc3f7df49d843128a68723b55a0728f94288cd651b9f8ea9a370b37b41568dd10d5a8acdef3cc402af9fd96f28490483e115e
+MISC ChangeLog-2015 12848 SHA256 32332a94b38402a0d297d3978470cfcbbba8f2a9c75a82b612a256e4ed171bcc SHA512 a6cafbf9331369b2bc220be6deac08ac52c669a8e67ec4e0ddde6bf6799a944b4b76f737f77e2cc5ff02b5a50b9d847f9724d5364c9a566381919792f288562c WHIRLPOOL 84ed5b106b3ae96e98381644e812e55ec0ccd0a0866a9b7b5e701bb553e4a97b946446ab8cd785f983deca15a44ee24b02661c19530cb895f42af9e965b7741f
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/libnasl/files/libnasl-2.2.9-bison3.patch b/net-analyzer/libnasl/files/libnasl-2.2.9-bison3.patch
new file mode 100644
index 000000000000..91f91fa38e09
--- /dev/null
+++ b/net-analyzer/libnasl/files/libnasl-2.2.9-bison3.patch
@@ -0,0 +1,29 @@
+--- a/nasl/nasl_grammar.y
++++ b/nasl/nasl_grammar.y
+@@ -1,4 +1,6 @@
+-%pure_parser
++%pure-parser
++%parse-param {naslctxt * parm}
++%lex-param {naslctxt * parm}
+ %expect 1
+ %{
+ /* Nessus Attack Scripting Language version 2
+@@ -31,7 +33,7 @@
+ #include "nasl_lex_ctxt.h"
+ #include "nasl_debug.h"
+ 
+-static void naslerror(const char *);
++static void naslerror(naslctxt *, const char *);
+ #define YYERROR_VERBOSE
+ %}
+ 
+@@ -465,8 +467,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+-static void 
+-naslerror(const char *s)
++static void naslerror(naslctxt *parm, const char *s)
+ {
+   fputs(s, stderr);
+ }
diff --git a/net-analyzer/libnasl/files/libnasl-2.2.9-gentoo.patch b/net-analyzer/libnasl/files/libnasl-2.2.9-gentoo.patch
new file mode 100644
index 000000000000..c82f76d60016
--- /dev/null
+++ b/net-analyzer/libnasl/files/libnasl-2.2.9-gentoo.patch
@@ -0,0 +1,29 @@
+index 860653d..82bdf2f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ include nasl.tmpl
+ 
+ all: 
+-	cd nasl && ${MAKE}
++	${MAKE} -C nasl
+ 
+ nasl.tmpl: nasl.tmpl.in configure
+ 	$(SHELL) configure $(CONFIGURE_ARGS)
+--- a/nasl/Makefile
++++ b/nasl/Makefile
+@@ -97,11 +97,11 @@ cflags :
+ 	@echo "echo \"$(NESSUS_CFLAGS) $(include) $(DEFS) \"" > cflags
+ 	@chmod +x cflags
+ 
+-nasl : cflags $(OBJS) nasl.c
+-	$(CC) $(CFLAGS)  $(NESSUS_INCLUDE) $(include) -o nasl -DVERSION=\"$(VERSION)\" nasl.c $(OBJS) $(NESSUS_LIBS) 
++nasl : cflags $(OBJS) nasl.c libnasl.la
++	$(CC) $(CFLAGS) $(LDFLAGS) $(NESSUS_INCLUDE) $(include) -o nasl -DVERSION=\"$(VERSION)\" nasl.c $(OBJS) $(NESSUS_LIBS) 
+ 
+ libnasl.la : cflags $(OBJS)
+-	$(COMPILE) $(NESSUS_LIBS) -o libnasl.la $(LO_OBJS) -rpath ${libdir} \
++	$(COMPILE) $(NESSUS_LIBS) $(LDFLAGS) -o libnasl.la $(LO_OBJS) -rpath ${libdir} \
+ 	-version-info ${PACKAGE_VERSION}
+ 
+ install : libnasl.la nasl
diff --git a/net-analyzer/libnasl/files/libnasl-2.2.9-openssl-1.patch b/net-analyzer/libnasl/files/libnasl-2.2.9-openssl-1.patch
new file mode 100644
index 000000000000..fc3b38be4c2e
--- /dev/null
+++ b/net-analyzer/libnasl/files/libnasl-2.2.9-openssl-1.patch
@@ -0,0 +1,45 @@
+http://bugs.gentoo.org/326545
+
+--- a/nasl/nasl_crypto.c
++++ b/nasl/nasl_crypto.c
+@@ -22,7 +22,9 @@
+   */
+ #include <includes.h>
+ #ifdef HAVE_SSL
++#ifdef HAVE_OPENSSL_MD2_H
+ #include <openssl/md2.h>
++#endif
+ #include <openssl/md4.h>
+ #include <openssl/md5.h>
+ #include <openssl/ripemd.h>
+@@ -45,6 +47,7 @@
+ 
+ 
+ /*-------------------[  Std. HASH ]-------------------------------------*/
++#ifdef HAVE_OPENSSL_MD2_H
+ tree_cell * nasl_md2(lex_ctxt * lexic)
+ {
+  char * data = get_str_var_by_num(lexic, 0);
+@@ -63,6 +66,7 @@
+  retc->size = MD2_DIGEST_LENGTH;
+  return retc;
+ }
++#endif
+ 
+ tree_cell * nasl_md4(lex_ctxt * lexic)
+ {
+@@ -192,12 +196,12 @@
+  return retc;
+ }
+ 
+-
++#ifdef HAVE_OPENSSL_MD2_H
+ tree_cell * nasl_hmac_md2(lex_ctxt * lexic)
+ {
+  return nasl_hmac(lexic, EVP_md2());
+ }
+-
++#endif
+ 
+ tree_cell * nasl_hmac_md5(lex_ctxt * lexic)
+ {
diff --git a/net-analyzer/libnasl/libnasl-2.2.9-r1.ebuild b/net-analyzer/libnasl/libnasl-2.2.9-r1.ebuild
new file mode 100644
index 000000000000..497332220f40
--- /dev/null
+++ b/net-analyzer/libnasl/libnasl-2.2.9-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A remote security scanner for Linux (libnasl)"
+HOMEPAGE="http://www.nessus.org/"
+SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="static-libs"
+
+RDEPEND="
+	~net-analyzer/nessus-libraries-${PV}
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/bison
+"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-openssl-1.patch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-bison3.patch
+
+	sed \
+		-e "/^LDFLAGS/s:$:${LDFLAGS}:g" \
+		-i nasl.tmpl.in || die
+
+	tc-export CC
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--enable-shared
+}
+
+src_compile() {
+	# emake fails for >= -j2. bug #16471.
+	emake -C nasl cflags
+	emake
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/net-analyzer/libnasl/metadata.xml b/net-analyzer/libnasl/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/libnasl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/lilac/Manifest b/net-analyzer/lilac/Manifest
new file mode 100644
index 000000000000..7ea85c3cd2de
--- /dev/null
+++ b/net-analyzer/lilac/Manifest
@@ -0,0 +1,5 @@
+DIST lilac-1.0.3.tar.gz 1794493 SHA256 af684cf91fd850705837ee95e3a222c56fc71fd4ab5165e08b98a5fb913d13fa SHA512 bee9ddb7f4adc2199ee804db2d5758bb172f7f18a868206774d54d2ad7b9741a16152dbdd8c8c7cd82e6375428c9d0466bd38e3affdab55bcb574914f0fb813c WHIRLPOOL 3d01715ad25cf07688d19f190480791c73224e7c311f14a79204a1cbedd6808def6a4bcb6cf51dd597e8cc00ef5811db925a379c8fbfc13fecce2b9af35c7b39
+EBUILD lilac-1.0.3.ebuild 776 SHA256 c4a4a169afe317bbe84f03a957140558a0d2038d0f5b42555f00422ead4d10b7 SHA512 e077ff663b16de3ed810d9cea0757342efc61acd194d4620f4d6509a21eae0ee6683a5bbfbd25f84fc4b5d568d81ba9c83ca1ddf2c3b87083c361714d68e9b28 WHIRLPOOL 97dd86ba34c86a1d55f40d43212da69c5d74f5b6d1cabc2e12d6a73ced49a70da527607ffec3e8fc89114ab11d7acd1d2dd3127e4af0c73bb3049643b12b8d8a
+MISC ChangeLog 2676 SHA256 839d6c3b3d5e6be46f90cfac97d4315c723bd4e86ccf0b9c7f03dae79e43351e SHA512 32cbc721ce1294d39eaf3646fde6010c822d88eb64b122d9176e6d6e711fcbfe40c59f915c8fe254705b4acf94c8ea7c0260605bf7b26f1a5301131101a8dec5 WHIRLPOOL d9b3dcf2cadf6c711edc5de1950052fa4d665dd068e60a35acfdbd54baed4301cb70920923fec78e60d7281233607adcecaab92ed45dd9f974192a9d88b6de07
+MISC ChangeLog-2015 797 SHA256 c30990fbf2bf1f7e2320f1148f7c47238ca6547b46d9223b2e9ad8e320c89a2b SHA512 1bb239d8e88af1fc4be9c246c30629fe8a4f74add50794ed3c17a8c750e8a4baa68966947b9a3e39f852db5471459bf1aaa6062bc03450f8db952eabee977adf WHIRLPOOL db9f7453c3ce079605466bd06e49e4721a3bd573dd007d06a48436079fa8bb48200ce03d4597341d89c34b24290d51a20ccb5cb0f3566ca2487034c2bf11690b
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/lilac/lilac-1.0.3.ebuild b/net-analyzer/lilac/lilac-1.0.3.ebuild
new file mode 100644
index 000000000000..cb574a7876cd
--- /dev/null
+++ b/net-analyzer/lilac/lilac-1.0.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils webapp
+
+DESCRIPTION="Web-based configuration tool written to configure Nagios"
+HOMEPAGE="http://www.lilacplatform.com"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-php/PEAR-PEAR-1.6.1
+	>=net-analyzer/nagios-3.0
+	>=virtual/mysql-5.0
+	dev-lang/php[curl,json,mysql,pcntl,pdo,posix,simplexml]
+	virtual/httpd-php
+"
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc INSTALL UPGRADING
+	rm -f INSTALL UPGRADING
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR}"/includes/lilac-conf.php.dist
+	webapp_serverowned "${MY_HTDOCSDIR}"/includes/lilac-conf.php.dist
+	webapp_src_install
+}
diff --git a/net-analyzer/lilac/metadata.xml b/net-analyzer/lilac/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/lilac/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest
new file mode 100644
index 000000000000..f573c8bc34ac
--- /dev/null
+++ b/net-analyzer/linkchecker/Manifest
@@ -0,0 +1,10 @@
+AUX linkchecker-9.2-unbundle.patch 840 SHA256 00e09db9076262acce8a6bc4171b78e972622ccb1b9e01d88cbeaed5f1871a0a SHA512 899db2f7567d7f101ca995d2b8b26dfaedb854a856902cb3fd2bda50f872e9bd345d10acf7b4687635541a8c5cc69050146c317c7f2875d8841f98d5d8b9d7d4 WHIRLPOOL 57050f5bb5b568364545492fb371927033dcd5ffe72315481739145314ced8cc4f8b36d828d23971377dc22cdc5c8ed18d717c1c518488bcdf1fe036d4fcf06a
+AUX linkchecker-9.3-bash-completion.patch 621 SHA256 8c813196d0a309cefe97b9eb46a6096bbb687a669cd5d3d30b7178ba6c065c5d SHA512 736b4da75bf905845964e2a097d192fe075095656818d9e9fd118327510d8fe176c713d5e77752be99b2b13fc10dc4c07bd246cb8b77bd2a99056e6ef0fe4904 WHIRLPOOL dcbec297b6e809aa94e242cd40ebd84e23acfed6546be47324a6babdf329e72adea4212c8d9a14ca2e00b043a352f5ca17977a9dd8f03956b77044471f97eaac
+AUX linkchecker-9.3-desktop.patch 1783 SHA256 b8aa9161621fbf91d9897f8bf63fd66d15a59e991381313abd62530b90a784e2 SHA512 4100c7844548a7894157cf884ed3093e3cb4d11cad33bda605ce1328e7214fb40a229935716a1775978bfe96c87413b52fca4783d7a167027736a1284b8d39b0 WHIRLPOOL 552de2657602b97985351a713053840a23c37789dc99f40e54031f6011aa2d1bd39bb35b596beb17f2fa619af555946a5ba829083e6f32791a5d8973cc236ebb
+AUX linkchecker-9.3-requests-check.patch 1538 SHA256 92b37711695bbb62aa97619aefd26285ebf6bef4ba17f7d50bac3bb6cf7baba7 SHA512 3ba20f160aa27a611d92ad5b6a31f134b64f52644ad1ac73d41dd7ea77fa3b5d743f3fd51cf5f6d4f3229ec27cfb0758d1d4c87dd14c95ab83c0af54236d5d96 WHIRLPOOL d09598bf673a70ed5afe41204df0418950ac5137b6d727627420e141e5941417682a9393c515a261d5fa38a21e51c2c06b3d1d9718453ced7007815f6c487724
+DIST LinkChecker-9.3.tar.gz 719896 SHA256 ee0aa60de440fdcf8587ddebf1f691bc777a32d8d4f119beed63f405dc56176d SHA512 26686e5373aaa942b631b5184f8bda8fbe1410c8875bf8499a2b61dc18b7bdfa29a3c18edf98c28dc189a493a3f5794a0020a0211b7d5d3814b33994603dcc59 WHIRLPOOL 6b0b41d3edacafba6ae5df5b0f4ccf1fb5877c938acdd2d66c443bf10c43fcc9213f08cfff212a1a259d9f767138cd04fc1c481db1594d426784b0ce5702ee5f
+EBUILD linkchecker-9.3-r2.ebuild 2018 SHA256 7c3d57b1679a706bd0d16bf8b7af83aa11e379f2a72d931d905f42bb274508e1 SHA512 a1a065faf5975ee296db2b8800d7a58723a87188f544e74e3f1168bb79693de600cc530277f0d1b357950e098bdb65be9a34e39684688da8e02bbd2002fadfbe WHIRLPOOL 3a45e519ee1011ef4e78402e23109d0d65eb9a13e517c2dabe359803b847ad061b4105b8c8fc4c635a3af0b75cb775a55dfef1452a2f04efc56407a34930c5bd
+EBUILD linkchecker-9999.ebuild 1873 SHA256 ab3fc328e4e471e19a40ed8c57d5e3084a1e5b7aa84efe5ac10b9b678027197c SHA512 7857c356f300001bb66978ec65a006f19f334047723b152f62a83c9a219f69120c5e23f285d8884948f57ac5289767b48f551b513aa01569a340988bb1804670 WHIRLPOOL 9d384352e0a5525a3af7d387344518275fccb93e80931d7ce64a8628d57f508fadd8c3bf3af3bb26ba6dac4d000c8ed9e11a21039607cc949821b1ed33d3008a
+MISC ChangeLog 3778 SHA256 ded745b6d7f73c1ee45f9664396867e9ee535ac0af84c26d78c0ea6ed2273e70 SHA512 7224b4817ed8aefa0108ffafb416724ff76acf20bce1dcb3f100a24fdec1ee74c94f7ce95f30023adb6e60918ff5adada4c8b2e5478b1d205d9bfd4de71b745d WHIRLPOOL 4d4f1ffe24f9cd2dce90cfccfabc172f98bf8d2a93326e5b23328929e0a706326b0a72567857522981d9eca5a354c5b903c7d5142cbcf0d58b60f8bbf9b4cdbd
+MISC ChangeLog-2015 14704 SHA256 9c76d68e2715eac9afd45313f6df18af8743d36896d8262c6aab9cfa26a4eab6 SHA512 a841e23272743cd5d23990fe66516b5df0f70a5bb40a186638d1262cab914d243af4e6764397f741f49eef3745fb68061f290d9f8d4912043434b0fc0ec9035c WHIRLPOOL 0ac6095fd9bc22c5088bd75263b72ad8e020837f39cb0f636be501b831796b89c8eb83d35ce2f9552d3ee27b76c80c2a6789c2b93326b8d9601e09320cad9490
+MISC metadata.xml 319 SHA256 a6721e9667ae302ec14e8ad34cb1b47a69d4e67d9b207eb0e0e52306abe63ca2 SHA512 2fbc3b85bcfd178e2614ef73d55c633e6e3b5ee59d39ca0a6099ffd7e8067e890f69252666d8d6d9a173371d95c4b1fbb8157cb94fd307ee20672fb9ff4182fb WHIRLPOOL 4e391db22c8bcfe0cdd382c464369be0aed1364d8ee65f417976173fbd29ad5f9f7906006518592b6a31c742c148e9a341d3f0db143f7c09da8652fba5c73116
diff --git a/net-analyzer/linkchecker/files/linkchecker-9.2-unbundle.patch b/net-analyzer/linkchecker/files/linkchecker-9.2-unbundle.patch
new file mode 100644
index 000000000000..598f856b0007
--- /dev/null
+++ b/net-analyzer/linkchecker/files/linkchecker-9.2-unbundle.patch
@@ -0,0 +1,30 @@
+ setup.py | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/setup.py b/setup.py
+old mode 100755
+new mode 100644
+index dc30a7d..d62622b
+--- a/setup.py
++++ b/setup.py
+@@ -900,9 +900,6 @@ o a command line, GUI and web interface
+         'py2exe': MyPy2exe,
+         'py2app': MyPy2app,
+     },
+-    package_dir = {
+-        'linkcheck_dns.dns': 'third_party/dnspython/dns',
+-    },
+     packages = [
+         'linkcheck',
+         'linkcheck.bookmarks',
+@@ -917,10 +914,6 @@ o a command line, GUI and web interface
+         'linkcheck.network',
+         'linkcheck.parser',
+         'linkcheck.plugins',
+-        'linkcheck_dns.dns',
+-        'linkcheck_dns.dns.rdtypes',
+-        'linkcheck_dns.dns.rdtypes.ANY',
+-        'linkcheck_dns.dns.rdtypes.IN',
+     ],
+     ext_modules = [
+         Extension('linkcheck.HtmlParser.htmlsax',
diff --git a/net-analyzer/linkchecker/files/linkchecker-9.3-bash-completion.patch b/net-analyzer/linkchecker/files/linkchecker-9.3-bash-completion.patch
new file mode 100644
index 000000000000..5c7540f0bc85
--- /dev/null
+++ b/net-analyzer/linkchecker/files/linkchecker-9.3-bash-completion.patch
@@ -0,0 +1,21 @@
+ config/linkchecker-completion | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/config/linkchecker-completion b/config/linkchecker-completion
+index 5252b3b..0ea3b21 100644
+--- a/config/linkchecker-completion
++++ b/config/linkchecker-completion
+@@ -2,7 +2,6 @@
+ # Debian Linux system. For other system read the documentation that
+ # comes with the bash-completion package.
+ 
+-have linkchecker &&
+ _linkcheck() {
+     local cur prev
+ 
+@@ -17,4 +16,4 @@ _linkcheck() {
+     fi
+     return 0
+ }
+-[ "$have" ] && complete $filenames -F _linkcheck linkchecker
++complete $filenames -F _linkcheck linkchecker
diff --git a/net-analyzer/linkchecker/files/linkchecker-9.3-desktop.patch b/net-analyzer/linkchecker/files/linkchecker-9.3-desktop.patch
new file mode 100644
index 000000000000..40fa18a45983
--- /dev/null
+++ b/net-analyzer/linkchecker/files/linkchecker-9.3-desktop.patch
@@ -0,0 +1,34 @@
+From c25bdb3f55a791bfa087fb5a3d8e3d5d62991745 Mon Sep 17 00:00:00 2001
+From: Christopher Meng <cickumqt@gmail.com>
+Date: Fri, 10 Jan 2014 19:57:47 +0800
+Subject: [PATCH] Fix non-standard deskop file
+
+desktop-file-validate /home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker-gui.desktop /home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker.desktop
+/home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker-gui.desktop: error: value "Network;WebDevelopment" for string list key "Categories" in group "Desktop Entry" does not have a semicolon (';') as trailing character
+/home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker.desktop: error: value "True" for boolean key "Terminal" in group "Desktop Entry" contains invalid characters, boolean values must be "false" or "true"
+/home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker.desktop: error: value "Network;WebDevelopment" for string list key "Categories" in group "Desktop Entry" does not have a semicolon (';') as trailing character
+---
+ doc/linkchecker-gui.desktop | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/doc/linkchecker-gui.desktop b/doc/linkchecker-gui.desktop
+index 7e06b6e..09bd997 100644
+--- a/doc/linkchecker-gui.desktop
++++ b/doc/linkchecker-gui.desktop
+@@ -1,10 +1,10 @@
+ [Desktop Entry]
+-Name=LinkChecker GUI
++Name=LinkChecker GUI
+ GenericName=URL validator
+ GenericName[de]=URL Validator
+ Version=1.0
+ Type=Application
+ Exec=linkchecker-gui
+ Terminal=false
+-Categories=Network;WebDevelopment;
+-Icon=logo48x48
++Categories=Network;WebDevelopment;
++Icon=linkchecker
+-- 
+1.8.5.1
+
diff --git a/net-analyzer/linkchecker/files/linkchecker-9.3-requests-check.patch b/net-analyzer/linkchecker/files/linkchecker-9.3-requests-check.patch
new file mode 100644
index 000000000000..905b7f718414
--- /dev/null
+++ b/net-analyzer/linkchecker/files/linkchecker-9.3-requests-check.patch
@@ -0,0 +1,34 @@
+From c2ce810c3fb00b895a841a7be6b2e78c64e7b042 Mon Sep 17 00:00:00 2001
+From: Bastian Kleineidam <bastian.kleineidam@web.de>
+Date: Tue, 28 Jun 2016 21:55:10 +0200
+Subject: [PATCH] Fix python requests version check
+
+---
+ linkcheck/__init__.py | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/linkcheck/__init__.py b/linkcheck/__init__.py
+index 22a0cf5..1cec214 100644
+--- a/linkcheck/__init__.py
++++ b/linkcheck/__init__.py
+@@ -24,10 +24,17 @@
+ # Needs Python >= 2.7.2 which fixed http://bugs.python.org/issue11467
+ if not (hasattr(sys, 'version_info') or
+         sys.version_info < (2, 7, 2, 'final', 0)):
+-    raise SystemExit("This program requires Python 2.7.2 or later.")
++    import platform
++    version = platform.python_version()
++    raise SystemExit("This program requires Python 2.7.2 or later instead of %s." % version)
++# require a reasonably recent requests module: 2.4.0 from 2014-08-29
+ import requests
+-if requests.__version__ <= '2.2.0':
+-    raise SystemExit("This program requires Python requests 2.2.0 or later.")
++# PEP 396 has only version strings, bummer! PEP 386 is also not helpful.
++requests_version = requests.__version__.split('.')
++# Depends on the version scheme of Python requests
++if int(requests_version[0]) < 2 or \
++   (int(requests_version[0]) == 2 and int(requests_version[1]) < 4):
++    raise SystemExit("This program requires Python requests 2.4.0 or later instead of %s." % requests.__version__)
+ 
+ import os
+ # add the custom linkcheck_dns directory to sys.path
diff --git a/net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild b/net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild
new file mode 100644
index 000000000000..e0b3d0f0fb54
--- /dev/null
+++ b/net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite?"
+
+inherit bash-completion-r1 distutils-r1 eutils multilib
+
+MY_PN="${PN/linkchecker/LinkChecker}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Check websites for broken links"
+HOMEPAGE="https://wummel.github.com/linkchecker/ https://pypi.python.org/pypi/linkchecker/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~ppc-macos ~x64-solaris"
+IUSE="gnome sqlite X"
+
+RDEPEND="
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
+	gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
+	X? (
+		dev-python/PyQt4[X,help,${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
+		)"
+DEPEND="
+	X? (
+		dev-qt/qthelp:4
+		dev-python/markdown2[${PYTHON_USEDEP}]
+		)"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-9.2-unbundle.patch
+		"${FILESDIR}"/${P}-bash-completion.patch
+		"${FILESDIR}"/${P}-desktop.patch
+		"${FILESDIR}"/${P}-requests-check.patch
+		)
+
+	emake -C doc/html
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	DOCS=(
+		doc/upgrading.txt
+		doc/python3.txt
+		doc/changelog.txt
+		doc/development.txt
+	)
+	distutils-r1_python_install_all
+	if ! use X; then
+		delete_gui() {
+				rm -rf \
+					"${ED}"/usr/bin/linkchecker-gui* \
+					"${ED}"/$(python_get_sitedir)/linkcheck/gui* || die
+		}
+		python_foreach_impl delete_gui
+		rm -f "${ED}"/usr/share/applications/linkchecker*.desktop || die
+	fi
+
+	rm -f "${ED}"/usr/share/applications/linkchecker.desktop || die
+
+	newicon doc/html/logo64x64.png ${PN}.png
+
+	docinto html
+	dodoc doc/html/*
+	newbashcomp config/linkchecker-completion ${PN}
+	optfeature "bash-completion support" dev-python/argcomplete[${PYTHON_USEDEP}]
+	optfeature "Virus scanning" app-antivirus/clamav
+	optfeature "Geo IP support" dev-python/geoip-python[${PYTHON_USEDEP}]
+}
diff --git a/net-analyzer/linkchecker/linkchecker-9999.ebuild b/net-analyzer/linkchecker/linkchecker-9999.ebuild
new file mode 100644
index 000000000000..82cfea75b987
--- /dev/null
+++ b/net-analyzer/linkchecker/linkchecker-9999.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite?"
+
+inherit bash-completion-r1 distutils-r1 eutils git-r3 multilib
+
+MY_P="${P/linkchecker/LinkChecker}"
+
+DESCRIPTION="Check websites for broken links"
+HOMEPAGE="https://wummel.github.com/linkchecker/ https://pypi.python.org/pypi/linkchecker/"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/wummel/linkchecker.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="gnome sqlite X"
+
+RDEPEND="
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
+	X? (
+		dev-python/PyQt4[X,help,${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
+		)"
+DEPEND="
+	X? (
+		dev-qt/qthelp:4
+		dev-python/markdown2[${PYTHON_USEDEP}]
+		)"
+
+RESTRICT="test"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-9.2-unbundle.patch
+		"${FILESDIR}"/${PN}-9.3-bash-completion.patch
+		"${FILESDIR}"/${PN}-9.3-desktop.patch
+		)
+
+	emake -C doc/html
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	DOCS=(
+		doc/upgrading.txt
+		doc/python3.txt
+		doc/changelog.txt
+		doc/development.txt
+	)
+	distutils-r1_python_install_all
+	if ! use X; then
+		delete_gui() {
+				rm -rf \
+					"${ED}"/usr/bin/linkchecker-gui* \
+					"${ED}"/$(python_get_sitedir)/linkcheck/gui* || die
+		}
+		python_foreach_impl delete_gui
+		rm -f "${ED}"/usr/share/applications/linkchecker*.desktop || die
+	fi
+
+	rm -f "${ED}"/usr/share/applications/linkchecker.desktop || die
+
+	newicon doc/html/logo64x64.png ${PN}.png
+
+	docinto html
+	dodoc doc/html/*
+	newbashcomp config/linkchecker-completion ${PN}
+	optfeature "bash-completion support" dev-python/argcomplete[${PYTHON_USEDEP}]
+	optfeature "Virus scanning" app-antivirus/clamav
+	optfeature "Geo IP support" dev-python/geoip-python[${PYTHON_USEDEP}]
+}
diff --git a/net-analyzer/linkchecker/metadata.xml b/net-analyzer/linkchecker/metadata.xml
new file mode 100644
index 000000000000..02dc64200827
--- /dev/null
+++ b/net-analyzer/linkchecker/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <use>
+    <flag name="sqlite">Mozilla Bookmark parsing</flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">LinkChecker</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/macchanger/Manifest b/net-analyzer/macchanger/Manifest
new file mode 100644
index 000000000000..0f0ca376ab27
--- /dev/null
+++ b/net-analyzer/macchanger/Manifest
@@ -0,0 +1,7 @@
+AUX macchanger-1.7.0-fix-caddr_t.patch 357 SHA256 044630d7bd01e56797095f61cb582f363faa4dc7df16e48f11ae257a1f556fbd SHA512 00d59ce7562f0f011bd00f68d6e9aa4dd09d1dfb1aff4cb7291602e02d7015fb1f5038037c638e79f8aaf3c4787ef549c83d60303512b7d983b7f2ab386ccd21 WHIRLPOOL 4884abd987902c89d9ae07e8f77a63adba696e22b814b6a3526b39d0586e2cdf67a8fa8fc5145d206bc62394eece182a78f6e4334fa341fb761cb0c1dbda4f69
+DIST macchanger-1.7.0.tar.gz 396848 SHA256 dae2717c270fd5f62d790dbf80c19793c651b1b26b62c101b82d5fdf25a845bf SHA512 69f2008ace6ff8223ecf25805c08ddf42add9ed16c65f3bb57f74b8b0d080d584381ce79592d2ef581a9ba73f12624dae8db63dbb12e4875dfd29d828a4a5da3 WHIRLPOOL 94b9f01d881c58b6282a6916f7d88c1c7a8cdf1ff991cc07beaa0a3ce22fbe05620337adda583bf5affcce98907dfc83c2b914b07d9719e7aafc854db22f4d32
+EBUILD macchanger-1.7.0-r1.ebuild 827 SHA256 2fe9cdffabc6edf137c227b2437ab421e610d83c3c301db15948393dd4b8df6d SHA512 e4ea29afaae5fef4772bc7f35b050047ab4c0b8338dcd99c3e1ae9548a2f484b75796161e07de1d774b723080fd349c06e44d4a64f1293bbc850d2b594c7fdc8 WHIRLPOOL 7bc04f844c69459cbaacc13c38c36b75eb75453d97b3323da03ffb4ee775271e8f4a2983242baba4cc39d4ee025cd8c4635c923d54e3fbc88356d4b3d781a357
+EBUILD macchanger-1.7.0.ebuild 786 SHA256 55b2740dc35d5513376d3db56624de8edd62ed5e0fef7e4d368c81ea163a2122 SHA512 f41d16d66bb5bfa112b988fbda7d70a0ef21f8d638811bfb2eacfdbd392170c1fc3767e702804c2e2d62f54efc2d4509e0cd8404eca7532d6872b443bf8b76fc WHIRLPOOL 53f36e694482be269ff2ca2b4a366576e204fe4bfe126861fecd955b3b1a14264fb41cc3926a04a1aa362beb23e4d32a2deb6f39bb4132a1cc1438171d497769
+MISC ChangeLog 2952 SHA256 cc17852bd27e96eaf51195464d610d1ca63c83f45ea4cc6f73619aa6b875aa49 SHA512 d4270d5fbfa96691895da24762c8c8214d637e7c44ebbed410f68d8959a517c618bdabf4353e902fec50b9819500f37f1b064fb210a7219c2c80ac28d7473f9b WHIRLPOOL 1601405cf236445c7c76c2d00f92d002a1b2cf2dba60f1d9fc165007d94d9aad7e3cf55a0f02adf3691193192787bbe6d3d68a74cb6c9a6934da7e84ce225112
+MISC ChangeLog-2015 4760 SHA256 294c7b7b3092fded26c6d9fc069164dcf3eba9950b3ab2bf07e6be1b452d4737 SHA512 bea94a42aba638f16bb8a33b5068cae5821668de47b9ef99ce253720c54fa18b4210f2b76596cbe4f7f9e6c20fed92974473686a290635b4b05ca1879353f070 WHIRLPOOL b01cbcc2e406b5f9917b608ed6acf36372f18bea8b855cd8d9560979a730bee351323be7cdff46afc19a5da2cbf25fb5f2be1c2b0d58934aa839895b65da6c8c
+MISC metadata.xml 473 SHA256 42a529d12a1386496711e96cdff05b8b165690334756cb0e357c4762b639bd09 SHA512 f328b70876919441f61939ad0198c98acfcae561b3eb27beeb6d09d565191f64075a63e7f99af6d69493c6100256fb2cec0a3b60b62c7d28fd41c885cedad4a4 WHIRLPOOL 11398a0ae2d68ace40918fd46b74f677cf9a54f9dffb8093146ed6a456b9f85b70c9b4177db28c54e290f99bf2210c8144bcd06df3a97eea6bfd0c0ce59f137b
diff --git a/net-analyzer/macchanger/files/macchanger-1.7.0-fix-caddr_t.patch b/net-analyzer/macchanger/files/macchanger-1.7.0-fix-caddr_t.patch
new file mode 100644
index 000000000000..c5fe5f6e16cb
--- /dev/null
+++ b/net-analyzer/macchanger/files/macchanger-1.7.0-fix-caddr_t.patch
@@ -0,0 +1,13 @@
+https://github.com/alobbs/macchanger/issues/14
+
+--- ./src/netinfo.c.orig
++++ ./src/netinfo.c
+@@ -113,7 +113,7 @@
+ 	epa->size = IFHWADDRLEN;
+ 
+ 	memcpy(&req, &(net->dev), sizeof(struct ifreq));
+-	req.ifr_data = (caddr_t)epa;
++	req.ifr_data = (void *)epa;
+ 
+ 	if (ioctl(net->sock, SIOCETHTOOL, &req) < 0) {
+ 		perror ("[ERROR] Could not read permanent MAC");
diff --git a/net-analyzer/macchanger/macchanger-1.7.0-r1.ebuild b/net-analyzer/macchanger/macchanger-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..e854b260252b
--- /dev/null
+++ b/net-analyzer/macchanger/macchanger-1.7.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Utility for viewing/manipulating the MAC address of network interfaces"
+OUI_DATE="20091029" # Generated with tools/IEEE_OUI.py in the source
+OUI_FILE="OUI.list-${OUI_DATE}"
+HOMEPAGE="https://github.com/alobbs/macchanger"
+SRC_URI="https://github.com/alobbs/macchanger/releases/download/${PV}/${P}.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+SLOT="0"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-caddr_t.patch )
+
+src_configure() {
+	# Shared data is installed below /lib, see Bug #57046
+	econf \
+		--bindir="${EPREFIX}/sbin" \
+		--datadir="${EPREFIX}/lib"
+}
+
+src_install() {
+	default
+
+	dodir /usr/bin
+	dosym /sbin/macchanger /usr/bin/macchanger
+	dosym /lib/macchanger /usr/share/macchanger
+}
diff --git a/net-analyzer/macchanger/macchanger-1.7.0.ebuild b/net-analyzer/macchanger/macchanger-1.7.0.ebuild
new file mode 100644
index 000000000000..009b018eb6e0
--- /dev/null
+++ b/net-analyzer/macchanger/macchanger-1.7.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Utility for viewing/manipulating the MAC address of network interfaces"
+OUI_DATE="20091029" # Generated with tools/IEEE_OUI.py in the source
+OUI_FILE="OUI.list-${OUI_DATE}"
+HOMEPAGE="https://github.com/alobbs/macchanger"
+SRC_URI="https://github.com/alobbs/macchanger/releases/download/${PV}/${P}.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="amd64 arm ppc sparc x86"
+SLOT="0"
+
+src_configure() {
+	# Shared data is installed below /lib, see Bug #57046
+	econf \
+		--bindir=/sbin \
+		--datadir=/lib
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS ChangeLog NEWS README
+
+	dodir /usr/bin
+	dosym /sbin/macchanger /usr/bin/macchanger
+	dosym /lib/macchanger /usr/share/macchanger
+}
diff --git a/net-analyzer/macchanger/metadata.xml b/net-analyzer/macchanger/metadata.xml
new file mode 100644
index 000000000000..27fa81884460
--- /dev/null
+++ b/net-analyzer/macchanger/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">alobbs/macchanger</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/masscan/Manifest b/net-analyzer/masscan/Manifest
new file mode 100644
index 000000000000..c3ebd387cb54
--- /dev/null
+++ b/net-analyzer/masscan/Manifest
@@ -0,0 +1,9 @@
+AUX masscan-1.0.3-gcc5.patch 293 SHA256 6705e610199996644c5e6567f2918746377e153ca882b72ea31f350febc2b6f2 SHA512 78718499c8548dcf88fa7f57c38ddf5fe5c9b5720a5141b4dd7e1b24d2f33e4b640c7ff3d3a8ba38590431c5e4fc3a7f16825b2e2fb05d6836d84d68f431d6ba WHIRLPOOL e9ee3fee18b06e3e0794761cc39460d39d425c51ffd12cbf1ab897c7524afc794648a9c621a39bf59a2ea386a67e4ba145d467a3598beb749432d4b114c79df9
+AUX masscan.conf 174 SHA256 dcbfb005306c945d38ebde125735c2b13cc6f574aa2dfe566a2ac099345ae2b0 SHA512 dee80bdeac6755a7edd24a12b25fc071e45680a8849eeb60193ad1089262989aeb7b44f75b0de34e6b07dac1ceecb759f1776e27bec2bfcd13b077baad0ebb77 WHIRLPOOL 1de52ffcd3ec9af1955af37632baa53b41ce599d371cc39f0a4f15ed985cbf75eee187be268c8ba58271ebb79028dff2212f4ddb77bc868a16da6cbdc6d6059e
+DIST masscan-1.0.3.tar.gz 333393 SHA256 331edd529df1904bcbcfb43029ced7e2dafe1744841e74cd9fc9f440b8301085 SHA512 e64b11deaaaa71d5be95e8f2b1fdfa679f5c8e8074c97f9d60d57659f33aec0699673c5aab72824f62d1a8b0e8c9188dcf296dd078bc6c2dbdad95c35c3a5f40 WHIRLPOOL fa1c4e931ef0d6ca534b0ccff790e86eef3a058f46b39fff0c94326fa41ddee9007030240a83171171ef10ead862721844330599ff271bbc08ca9f168ff6a3d0
+DIST masscan-1.0.4.tar.gz 343513 SHA256 51de345f677f46595fc3bd747bfb61bc9ff130adcbec48f3401f8057c8702af9 SHA512 eb82d8ad4d6a5c77cf79197e18470a68f7c361f0785180d631e9625578e90af6ffdaa45b728349da5a1cb945a8f902541b8f708be8a4075737ccb06e948d6e2b WHIRLPOOL e90bfe019e1c047b3f3c8e8c7e51ac2998c8b4eed817c9757dcf1d1fdffa9f1f298d4944e6cad67346159c8ba1ad886895f2b74184a8aa7818881e4a15c28a72
+EBUILD masscan-1.0.3-r2.ebuild 981 SHA256 b4db8345c044ff5585345f469c39cebaa10285d788ad6ee0183e0419840bdeb9 SHA512 73af493d6e0f90b62383c3a3931b761b90d185a650bcfedf1565c077996b238c9247ee6eee24d5b26f4cb5a674ce937b1ecafeea7e5e7b4221c838d79e7cdfb7 WHIRLPOOL 148230c8666d9ab63db8bd1ce9f0c5423807502bd8539315f55f885d07190828ed1b6f2237bef47cbfee862a89f568650cb926a94607c4ea11ae765647c02d17
+EBUILD masscan-1.0.4.ebuild 802 SHA256 bd866147baf2047861216b975e70f04327b1ab4e46c7c49842e022ef3b25e242 SHA512 009a6801721979fef9d79101bd9f3badd492c386d4abbef0b2b7a861de23685ceecb885feb0c1ba1cfc06ee9a53e86c293c893445164b72d600734f7c0a834d6 WHIRLPOOL 4f4be5682d95ee22a37c91050b506636a0bec709c38db29638e55c37a8f26f64fdfeeb92333b89e89d7fe0b3f340b0f06f6dd30d2ff85750eceab271236d860a
+MISC ChangeLog 2696 SHA256 2fe448458275c0fe304f6d7afb62bd3a630d655f8d6b058682dab1fe86411b7c SHA512 e9e2a33a4f7aec1e2a91d8a8693943ec638ede9003ee8f8778304a055b9f1285765c86039278ef3999ef32c4874f907c719c129e8adda5a80ad2a8fba502a2e6 WHIRLPOOL d579980ddb71321082ac3823e944417cc633af60f6edb3283b7960ecc0491890509338abd5a1d54062a4d4487ff2d8cc7d4c2aec297d4271b635db1c7d05c9c6
+MISC ChangeLog-2015 710 SHA256 505faf9588494c29f28ed91e4abebc23f08b228643d4b9c88893e342669bce87 SHA512 b58db508c6295eda52cd697de40b8b080d343b5adb32a01bb4d799876163cd32703674c2080c002b9bb1ccff71358526875797a92de208e1e73c86e1e77a1278 WHIRLPOOL 9e4702c176f1cafb6532cb3aeef88fe46b60581de583480274d472409e6e809f19c16daeff9cc2d1cfeeeb4edf7df94e3c4ea50dad6ede4b3ae65ee3128a66bd
+MISC metadata.xml 982 SHA256 57f14d3e67aabf7648de4b1196b84a8e4f29b3e8b4ce66b4afb20ba4a2d4087c SHA512 02a138f9c887f08d6bea4707fcc717d1dc8feccd3ed9c2e030973768bc42fdb41e67a987485398f61f723cae75e3db7ff3144c5e8a0a572da8b52f96badd0480 WHIRLPOOL 2d0e534e96b35bee5265e806c0949ae8d3ed5dbf861c4fad37201ca0479f6bc917594dc509271e3de1718cde67b03e599bb24833027cfe5659da79d2074aa6b1
diff --git a/net-analyzer/masscan/files/masscan-1.0.3-gcc5.patch b/net-analyzer/masscan/files/masscan-1.0.3-gcc5.patch
new file mode 100644
index 000000000000..6bf92fd25d14
--- /dev/null
+++ b/net-analyzer/masscan/files/masscan-1.0.3-gcc5.patch
@@ -0,0 +1,11 @@
+--- a/src/string_s.h
++++ b/src/string_s.h
+@@ -77,7 +77,7 @@
+  typedef int errno_t;
+ errno_t fopen_s(FILE **fp, const char *filename, const char *mode);
+ 
+-#elif defined(__GNUC__) && (__GNUC__ == 4)
++#elif defined(__GNUC__)
+ #include <inttypes.h>
+ /* GCC 4 */
+ # define sprintf_s      snprintf
diff --git a/net-analyzer/masscan/files/masscan.conf b/net-analyzer/masscan/files/masscan.conf
new file mode 100644
index 000000000000..86a88868dffe
--- /dev/null
+++ b/net-analyzer/masscan/files/masscan.conf
@@ -0,0 +1,7 @@
+rate =  100000.00
+output-format = xml
+output-status = all
+output-filename = scan.xml
+ports = 0-65535
+#range = 0.0.0.0-255.255.255.255
+excludefile = /etc/masscan/exclude.conf
diff --git a/net-analyzer/masscan/masscan-1.0.3-r2.ebuild b/net-analyzer/masscan/masscan-1.0.3-r2.ebuild
new file mode 100644
index 000000000000..894968ab55bd
--- /dev/null
+++ b/net-analyzer/masscan/masscan-1.0.3-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Mass IP port scanner"
+HOMEPAGE="https://github.com/robertdavidgraham/masscan"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="AGPL-3"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}"
+
+src_prepare(){
+	epatch "${FILESDIR}"/${PN}-1.0.3-gcc5.patch
+
+	sed -i \
+		-e '/$(CC)/s!$(CFLAGS)!$(LDFLAGS) $(CFLAGS)!g' \
+		-e '/^GITVER :=/s!= .(.*!=!g' \
+		-e '/^SYS/s|gcc|$(CC)|g' \
+		-e '/$(CC)/s!-DGIT=\"$(GITVER)\"!!g' \
+		-e '/^CFLAGS =/{s,=,+=,;s,-g -ggdb,,;s,-O3,,;}' \
+		Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake CC="$(tc-getCC)" DESTDIR="${D}" PREFIX=/usr install
+
+	insinto /etc/masscan
+	doins data/exclude.conf
+	doins "${FILESDIR}"/masscan.conf
+
+	mv doc/bot.{hml,html} || die
+	dohtml doc/bot.html
+	doman doc/masscan.8
+	dodoc *.md
+}
diff --git a/net-analyzer/masscan/masscan-1.0.4.ebuild b/net-analyzer/masscan/masscan-1.0.4.ebuild
new file mode 100644
index 000000000000..66006b6476c1
--- /dev/null
+++ b/net-analyzer/masscan/masscan-1.0.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="Mass IP port scanner"
+HOMEPAGE="https://github.com/robertdavidgraham/masscan"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="AGPL-3"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="net-libs/libpcap"
+
+src_prepare(){
+	default
+
+	sed -i \
+		-e '/$(CC)/s!$(CFLAGS)!$(LDFLAGS) $(CFLAGS)!g' \
+		-e '/^GITVER :=/s!= .(.*!=!g' \
+		-e '/^SYS/s|gcc|$(CC)|g' \
+		-e '/^CFLAGS =/{s,=,+=,;s,-g -ggdb,,;s,-O3,,;}' \
+		Makefile || die
+
+	tc-export CC
+}
+
+src_install() {
+	dobin bin/masscan
+
+	insinto /etc/masscan
+	doins data/exclude.conf
+	doins "${FILESDIR}"/masscan.conf
+
+	mv doc/bot.{hml,html} || die
+	dodoc doc/bot.html *.md
+
+	doman doc/masscan.8
+}
diff --git a/net-analyzer/masscan/metadata.xml b/net-analyzer/masscan/metadata.xml
new file mode 100644
index 000000000000..ab58c05fdec9
--- /dev/null
+++ b/net-analyzer/masscan/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>robbat2@gentoo.org</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
+  <longdescription lang="en">
+ This is the fastest Internet port scanner. It can scan the
+ entire Internet in under 6 minutes, transmitting 10 million
+ packets per second.
+ 
+ It produces results similar to nmap, the most famous port
+ scanner. Internally, it operates more like scanrand,
+ unicornscan, and ZMap, using asynchronous transmission.
+ The major difference is that it's faster than these other
+ scanners. In addition, it's more flexible, allowing
+ arbitrary address ranges and port ranges.
+	</longdescription>
+  <upstream>
+    <remote-id type="github">robertdavidgraham/masscan</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/mate-netspeed/Manifest b/net-analyzer/mate-netspeed/Manifest
new file mode 100644
index 000000000000..deefbc59bdd8
--- /dev/null
+++ b/net-analyzer/mate-netspeed/Manifest
@@ -0,0 +1,5 @@
+DIST mate-netspeed-1.12.0.tar.xz 563888 SHA256 1dec90c5211d306af8fe3a6c079a5d2ac1aeafad2b2de60ae177c97e3151e05d SHA512 1c6570ff4aac3b2e19c90e5805d8169a31a92289a39c6075b114a0c13e5d89f69b5fec48f549ce0c4d92b323034a18d4a26292c9a88a6995ccbf4d595e908e34 WHIRLPOOL 79315b745bf6e03d8a40ca2e047eb639ef85ae4cefcf5b4709414c72f51a8eac7e07bc316a0666c31fe5694ed45a6d2a0448f0d43d228c63db69aba73a7521d8
+EBUILD mate-netspeed-1.12.0.ebuild 737 SHA256 5d39299ea1ec303fa26dba166dfc5532afd0095711219200b2a5ced6bd84f48e SHA512 da682d9a1ce8304c8f2a1d772f9ba9e4125475aec80340bf8c0ba2930e7eeae2bb7e6511a2d9b5fafaefcd4a4b7c7f49d35d64e3ff26858dc9904dfbf53762c0 WHIRLPOOL 56ad399cabf7e6888c674cff33b0581cc2e9769e5e57a253313e1b94fb28f7d15ad88fd96e3396bffb75e4085115a58d74184f05b402c691d5ee5f12e507a0b8
+MISC ChangeLog 3831 SHA256 f42ad3e7931b08d5e833f7e2567d34637e04aea1f0aea20d9d49f31ce8260da5 SHA512 eea1c3a907300cee3feee6ada62a11cfc3dc2bc6426c85006322ed89a607dcd178358066f7421840ab4994fa994a9eb51b5c1ab62c44e13f36977fea96b5eb4a WHIRLPOOL 637214965ebb517051742bf39cb697ea7fc1bc4a79f184456c1e0ee968d0452d77f73f9f952899cb21b70dc2982583b058ce3af36947ffe7bb8ffbb896535223
+MISC ChangeLog-2015 1349 SHA256 83e589a92041e2b272c0f036c597b81b5d816b6c1a1501d927ca006d8f81737a SHA512 cb2856e1482c885b7556a760dd0d579970266c9b62a844d766a027fc43f2b2492599e595cf6169d918571dec0f90b8d077b50c3b47f55b495d3b1654d7c08d48 WHIRLPOOL 5f6863d8477d0f3573e0f5e5a30cc73b9c72fa4f8ac4538d4c50761bf980c103afc6c44a59ef666021c88da901e3d712a50f2946487e91b8ce9be71db367fefa
+MISC metadata.xml 418 SHA256 c2de7cbd7f874dabc2e1c46830d9a35ed1ed0e3a5f885a90cb689c72c45fdaff SHA512 e267216d7130cc0837aefd1de5c1f3361fc6f27569c56d63a4794f5cb85c912464a7d90f7514607670a8f6e362f3a6c9cb6dafa5be525f1a3c9b51a707eec4b4 WHIRLPOOL 35b75da44d46037c6c588b37ef64b69456498b7d54f10df64359a3f6cbf0a80910cb4720c3b6aa1f3519d6a4e6f4c6c3a151475718e3335e48702a52f07aba3b
diff --git a/net-analyzer/mate-netspeed/mate-netspeed-1.12.0.ebuild b/net-analyzer/mate-netspeed/mate-netspeed-1.12.0.ebuild
new file mode 100644
index 000000000000..751e0a110e07
--- /dev/null
+++ b/net-analyzer/mate-netspeed/mate-netspeed-1.12.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="amd64 ~arm x86"
+fi
+
+DESCRIPTION="Applet showing network traffic for MATE"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="gtk3"
+
+# FIXME: wireless-tools >= 28pre9 is automagic
+RDEPEND="dev-libs/glib:2
+	>=gnome-base/libgtop-2.14.2:2
+	>=mate-base/mate-desktop-1.9[gtk3(-)=]
+	>=mate-base/mate-panel-1.7[gtk3(-)=]
+	>=net-wireless/wireless-tools-28_pre9:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango:0
+	virtual/libintl:0
+	!gtk3? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )"
+
+DEPEND="${RDEPEND}
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
diff --git a/net-analyzer/mate-netspeed/metadata.xml b/net-analyzer/mate-netspeed/metadata.xml
new file mode 100644
index 000000000000..677f9a8598cf
--- /dev/null
+++ b/net-analyzer/mate-netspeed/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mate-desktop/mate-netspeed</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/mbrowse/Manifest b/net-analyzer/mbrowse/Manifest
new file mode 100644
index 000000000000..adb5130c75bf
--- /dev/null
+++ b/net-analyzer/mbrowse/Manifest
@@ -0,0 +1,5 @@
+DIST mbrowse-0.4.3.tar.gz 146028 SHA256 735a86a027659d3be39723d554758d6b51cce56ef3807efd5123d48ebf41506e SHA512 adccf8de707611034db0cbb6a37117f6a4741eb92656eab0e9e5c6a8268b17cc66080ed9663fe59a3fea9b110d83bcff9094b5fec133ca7ceb2650fd532a6cb4 WHIRLPOOL a715c14397b7a89cd5318017bc7640bfe951b14721288c315aa24a91e2c483b63aab7633b585a52a6c892703c4d9801974045c2d30787ad1386233e772f1c779
+EBUILD mbrowse-0.4.3.ebuild 572 SHA256 18763ab8a90656ce1cc249bbe398133e206ebff5e2a43c198b35e7773b3bb8ae SHA512 c9984d298f30a081068ec8de858c1d7c3a195af2a74c3fc82f4c85f7e801d8aaa1aa27c057fcb8577e95526c98c5b7c1f15786ea556aacfb4c41b80b369e367d WHIRLPOOL 9a7128832560f3a125148f879ea242c1eebafc0b7bbf7b1f65d2511fee4fe6fa38548a939bbd76a1adacb1cc4cbd1ee560128e60a1b01ee7cc1dd6ee493416fb
+MISC ChangeLog 2543 SHA256 7c065603fbdd4e38e0e52cc82d6a586c1360db95ed31976a30bcb79049ac2d0a SHA512 2318d2d3d2c7c61edf6dae687b58dff24e257ad90023d435e5f0309fa17b029f0ded74c810b511e777105d177fccc4cb923e213e3bbffafab8b2d750505be344 WHIRLPOOL f9b3764ef96691626e22078bb66f86cdd6e7665bd1fb8727cea93de8222ad92462fbd4ff70daece3acfada13f68460388bb3812a87ed3587b635da75d0e2ff8e
+MISC ChangeLog-2015 2325 SHA256 e2b831a50cb604a6ca38c10e2f1dae028cdd07b1bf23d246aa8db3f33a67ef12 SHA512 75254b7085b36d56f0a3f2fe83cc2375caf96912c5918899022b7e51c007afff55c291ab5616e221f2fb76d6cf95f9f6fbb45eb667102a56ead7a86f9fa12b2b WHIRLPOOL 8006c99055ddd7b45ea2b2ca3679f9219574e60ddbec0a63501ef4d4534f42d2da191057b253b6a28fdbb87631a4ad89ecde57f99b916724b280c75c0b8f607a
+MISC metadata.xml 357 SHA256 47743f80788b20bd0920c8d30cf6bd73d5eb03d4610ce2acea7de43ae8161c2b SHA512 5199c9147351e6dc733c1b8f2edaf598d9ae32d0a72de149a2b1550a4aaa1081d80ee5ae175fd9dc4de7e65d177055ee9dad006a81a268f8af6f8497e202261f WHIRLPOOL ec75cf159a0f2bb26ff4b309347124ea95369b5aec578bcbe97805f6a81a6fe514184d688e9a095288cfb0788dacd62f90c8d5a00cb83737a0f77eba8c3749a4
diff --git a/net-analyzer/mbrowse/mbrowse-0.4.3.ebuild b/net-analyzer/mbrowse/mbrowse-0.4.3.ebuild
new file mode 100644
index 000000000000..fea497f3bb7a
--- /dev/null
+++ b/net-analyzer/mbrowse/mbrowse-0.4.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools
+
+DESCRIPTION="MBrowse is a graphical MIB browser"
+HOMEPAGE="https://sourceforge.net/projects/mbrowse/"
+SRC_URI="mirror://sourceforge/${PN}/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+DEPEND="
+	dev-libs/glib
+	net-analyzer/net-snmp
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS README ChangeLog )
+
+src_prepare() {
+	sed -i \
+		-e '/LDFLAGS=/d' \
+		acinclude.m4 || die
+	eautoreconf
+}
diff --git a/net-analyzer/mbrowse/metadata.xml b/net-analyzer/mbrowse/metadata.xml
new file mode 100644
index 000000000000..600ef9a54661
--- /dev/null
+++ b/net-analyzer/mbrowse/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">mbrowse</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/metadata.xml b/net-analyzer/metadata.xml
new file mode 100644
index 000000000000..58f5863c9fea
--- /dev/null
+++ b/net-analyzer/metadata.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The net-analyzer category contains network analysis software.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie net-analyzer enthält Software zur Netzwerkanalyse.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría net-analyzer contiene programas de análisis de redes.
+	</longdescription>
+	<longdescription lang="ja">
+		net-analyzerカテゴリー���ットワーク・アナリシス�ソフトウェア���れ����。
+	</longdescription>
+	<longdescription lang="nl">
+		De net-analyzer categorie bevat applicaties voor netwerk-analyse.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm net-analyzer chứa các phần m�m phân tích mạng.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria net-analyzer contiene programmi per l'analisi della rete.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria net-analyzer contém programas de análise de rede.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria net-analyzer zawiera programy do analizowania sieci.
+	</longdescription>
+</catmetadata>
+
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
new file mode 100644
index 000000000000..bdbec41bf936
--- /dev/null
+++ b/net-analyzer/metasploit/Manifest
@@ -0,0 +1,7 @@
+AUX database.yml 613 SHA256 cd7761772acee89e6ff9743fbde33fd1e6d0ffd9d7c271e80be502a25be75dd7 SHA512 b178724382a88b87b9007f950fb5e8f93936f3e5a58f89c90f67120c4d50c98d4de758c8a6e321a0a68caa12ccab003d502377621bfe762279eb5ae2a3d5ff2b WHIRLPOOL ad8a6df2031de5c97299fbcf29d8c18e61fc16ff90d44d6cf1bb4849901cdb883cb5a3549ca8bf5ed0ebfba2056c23ffa302bbff74eb5dcb4005607ca037b833
+DIST metasploit-4.14.16.tar.gz 23726763 SHA256 c45e17fb3e63569294366806743d2cb0fe44b7173c031c019725ebf36f5922f2 SHA512 882968e68ff5adf10426f6e8480f3eac7cd9b289c1e641a91e537d31a434858f2c47b4f7b5bf23fcfc22eceecd2527eedb7eac3e9a8ad4a212187762b1b9aab2 WHIRLPOOL b634b804a701a0154b86ddb95f5159f80e76f7146032236fd32198af7f01f51dc56eef2f22eee2da2bbc382ed5fde51b5d8d5fcca1a9b5e81bb93a06c2f12b1d
+EBUILD metasploit-4.14.16.ebuild 11672 SHA256 6dc23e33d8e5a455edaf52ea967e94a2de4aa353024c765c37575e0b9a219c01 SHA512 5bfbefe00a16e6d78f6051ca4b418cda2e6a8ba236bbeb881ea759a4abb69127b6dfffbea0abccc24e359eadb35f56790e9a1d7ffccdad0fbebfe884e3dc379e WHIRLPOOL f4bdcafd5a6a3b0c3994c3fcee8c0ace1a3e051cbcf65894a0762367199fd84e8f02264305c6fe40623a4a42abd4c05b169d5e7b0c680b538a7abcd076925818
+EBUILD metasploit-9999.ebuild 11585 SHA256 c0e71affa08894d197c6185da2a792c3b9fceedafe2dbd7eb24b1511fe809e1e SHA512 c234cc0bbe2db31a2dca819f1e5ffdae99aaa8271c8ee5dbe930edadaafd803ae4704d41df1b4ad57c04bdde899d3b4e4f9c4fca617a63d8fe0c8e734abaecf6 WHIRLPOOL 881a687c58e39780e65bd4586c7951849641f8d8544a8b9cf5028039cb0fb0ed0b90ecb09566036479c3d8cf88442daf7a127e5de2cfe43a411d84b2879cf830
+MISC ChangeLog 9427 SHA256 afe42e48baf4e3cb767f0393917f1b1019216e2af9e700551112457ee7e67ca9 SHA512 62aee259db2202d9d17f17b111da4b1f241690857a2e2a00d08a68bc541a46fb553be9bac288fc3fb0f45d30cf981d43b9cc485f45e4ce1e5ef728e35ef16a56 WHIRLPOOL a0e5ee0592a70a309ddd54151c013250e429f07764f30977f85cf5da9d1ff400a5f4a7381a73f76431c426452bf254a982d4fe5124d7866e0f2861605d06adb1
+MISC ChangeLog-2015 18329 SHA256 f4aac7f141940c7457979d1c1c6ddb4a24176cdabda06133965eecea9a53dc7b SHA512 39a0952bf76bfaf5e6822317b4cc61bb8256a25da62bda84ddd8911d0e1ac1f0b85772786dbfdaded1958510a96584bfc3ddac7b62c5cb5b6ee3254b6d96c926 WHIRLPOOL d4d836f5f47ff7f231be2977a228a7039eb98ba8b486a3ddf8ee5105773cca6e41446641f04e23a8c2dcf184320c1549f17182cb1b46ab06bb4c0923eb9683b0
+MISC metadata.xml 853 SHA256 7d3505320c7de50c9e3e13bc9d8f288e25aeb99852968f5442b8af4ab334df17 SHA512 9af2dae0c12ae84ae2a7887fad0e7f5ea1d945a8b6e6674ba9e3c3bbff167b00a4aeff2da8b457ff8657f83d617dad67f633b260578a1e9608475fe45585cad0 WHIRLPOOL 8b7de86e174f467ad4ea075d39327caf3aa35ede4ee5f8db1d625396a8e75d5a5f74f1905680e924001dd09065c211f0260b8c9e6cb4848e772f4d2decde1753
diff --git a/net-analyzer/metasploit/files/database.yml b/net-analyzer/metasploit/files/database.yml
new file mode 100644
index 000000000000..403191669cca
--- /dev/null
+++ b/net-analyzer/metasploit/files/database.yml
@@ -0,0 +1,34 @@
+#
+# The tests currently use the development user
+# https://dev.metasploit.com/redmine/issues/8418
+#
+
+development:
+  adapter: "postgresql"
+  database: "msf_test_database"
+  username: "msf_test_user"
+  password: "secure"
+  port: 5432
+  host: "localhost"
+  pool: 256
+  timeout: 5
+
+production:
+  adapter: "postgresql"
+  database: "msf_database"
+  username: "msf_user"
+  password: "secure"
+  port: 5432
+  host: "localhost"
+  pool: 256
+  timeout: 5
+
+test:
+  adapter: "postgresql"
+  database: "msf_test_database"
+  username: "msf_test_user"
+  password: "secure"
+  port: 5432
+  host: "localhost"
+  pool: 256
+  timeout: 5
diff --git a/net-analyzer/metasploit/metadata.xml b/net-analyzer/metasploit/metadata.xml
new file mode 100644
index 000000000000..e449553f4ecd
--- /dev/null
+++ b/net-analyzer/metasploit/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+		<description>Very delicate package, ask before you touch please</description>
+	</maintainer>
+	<use>
+		<flag name="development">Install dependencies needed for metasploit and exploit development</flag>
+		<flag name="nexpose">Enable the plugin to integrate with nexpose</flag>
+		<flag name="openvas">Enable the plugin to integrate <pkg>net-analyzer/openvas</pkg></flag>
+		<flag name="oracle">Enable restricted oracle modules which have additional deps</flag>
+		<flag name="pcap">Enable libpcap for packet sniffing</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">rapid7/metasploit-framework</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/metasploit/metasploit-4.14.16.ebuild b/net-analyzer/metasploit/metasploit-4.14.16.ebuild
new file mode 100644
index 000000000000..1df710fce577
--- /dev/null
+++ b/net-analyzer/metasploit/metasploit-4.14.16.ebuild
@@ -0,0 +1,332 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+#never ever ever have more than one ruby in here
+USE_RUBY="ruby23"
+inherit eutils ruby-ng
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}"/all
+	inherit git-r3
+	KEYWORDS=""
+	SLOT="9999"
+else
+	##Tags https://github.com/rapid7/metasploit-framework/releases
+	MY_PV=${PV/_p/-}
+	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+	RUBY_S="${PN}-framework-${MY_PV}"
+	inherit versionator
+	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
+fi
+
+DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
+HOMEPAGE="http://www.metasploit.org/"
+LICENSE="BSD"
+IUSE="development +java nexpose openvas oracle +pcap test"
+
+#multiple known bugs with tests reported upstream and ignored
+#http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
+RESTRICT="test"
+
+RUBY_COMMON_DEPEND="virtual/ruby-ssl
+	>=dev-ruby/activesupport-4.2.6:4.2
+	>=dev-ruby/actionpack-4.2.6:4.2
+	>=dev-ruby/activerecord-4.2.6:4.2
+	dev-ruby/bcrypt-ruby
+	dev-ruby/bit-struct
+	>=dev-ruby/builder-3.0
+	dev-ruby/bundler
+	dev-ruby/filesize
+	>=dev-ruby/jsobfu-0.3.0
+	dev-ruby/json:*
+	dev-ruby/kissfft
+	dev-ruby/metasm:1.0.2
+	>=dev-ruby/metasploit_data_models-2.0.0
+	dev-ruby/meterpreter_bins:0.0.22
+	dev-ruby/metasploit-payloads:1.2.24
+	dev-ruby/metasploit_payloads-mettle:0.1.9
+	>=dev-ruby/metasploit-credential-2.0.0
+	>=dev-ruby/metasploit-concern-2.0.0
+	>=dev-ruby/metasploit-model-2.0.0
+	dev-ruby/msgpack
+	dev-ruby/net-ssh:*
+	dev-ruby/nokogiri
+	dev-ruby/octokit
+	dev-ruby/openssl-ccm:1.2.1
+	dev-ruby/patch_finder
+	>=dev-ruby/recog-2.0.14
+	dev-ruby/redcarpet
+	>=dev-ruby/rkelly-remix-0.0.6
+	=dev-ruby/rex-arch-0.1.4
+	dev-ruby/rex-bin_tools
+	dev-ruby/rex-core
+	dev-ruby/rex-encoder
+	dev-ruby/rex-exploitation
+	dev-ruby/rex-java
+	dev-ruby/rex-mime
+	dev-ruby/rex-nop
+	dev-ruby/rex-ole
+	dev-ruby/rex-powershell
+	dev-ruby/rex-random_identifier
+	dev-ruby/rex-registry
+	dev-ruby/rex-socket
+	dev-ruby/rex-sslscan
+	dev-ruby/rex-rop_builder
+	dev-ruby/rex-struct2
+	dev-ruby/rex-text
+	dev-ruby/rex-zip
+	dev-ruby/ruby_smb
+	dev-ruby/sqlite3
+	>=dev-ruby/pg-0.11
+	dev-ruby/packetfu:1.1.13
+	>=dev-ruby/rubyzip-1.1
+	>=dev-ruby/rb-readline-0.5.4
+	dev-ruby/robots
+	dev-ruby/sshkey
+	dev-ruby/tzinfo:*
+	dev-ruby/windows_error
+	dev-ruby/xmlrpc
+	java? ( dev-ruby/rjb )
+	nexpose? ( dev-ruby/nexpose )
+	openvas? ( dev-ruby/openvas-omp )
+	oracle? ( dev-ruby/ruby-oci8 )
+	pcap? ( dev-ruby/pcaprub:*
+		dev-ruby/network_interface )
+	development? ( dev-ruby/fivemat
+			dev-ruby/pry
+			dev-ruby/redcarpet
+			dev-ruby/yard
+			>=dev-ruby/rake-10.0.0
+			>=dev-ruby/factory_girl-4.1.0 )"
+	#lorcon doesn't support ruby21
+	#lorcon? ( net-wireless/lorcon[ruby] )
+ruby_add_bdepend "${RUBY_COMMON_DEPEND}
+		test? ( >=dev-ruby/factory_girl-4.1.0
+			dev-ruby/fivemat
+			dev-ruby/database_cleaner
+			>=dev-ruby/rspec-2.12
+			dev-ruby/shoulda-matchers
+			dev-ruby/timecop
+			>=dev-ruby/rake-10.0.0 )"
+ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
+
+COMMON_DEPEND="dev-db/postgresql[server]
+	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
+	net-analyzer/nmap"
+RDEPEND+=" ${COMMON_DEPEND}
+	>=app-eselect/eselect-metasploit-0.16"
+
+RESTRICT="strip"
+
+QA_PREBUILT="
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_solaris.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_bsd.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_bsd.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
+	usr/lib*/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
+	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
+	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
+	usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
+	"
+
+pkg_setup() {
+	if use test; then
+		su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail
+		su postgres -c "createuser msf_test_user -d -S -R"
+		if [ $? -ne 0 ]; then
+			su postgres -c "dropuser msf_test_user" || die
+			su postgres -c "createuser msf_test_user -d -S -R" || die
+		fi
+		su postgres -c "createdb --owner=msf_test_user msf_test_database" || die
+	fi
+	ruby-ng_pkg_setup
+}
+
+all_ruby_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+	else
+		default_src_unpack
+#		mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all
+#		rm -r msf3
+		#msf_version=$(grep --color=never "CURRENT_VERSION =" ${S}/spec/lib/msf/core/framework_spec.rb)
+		#msf_version=${msf_version#*=}
+	fi
+}
+
+all_ruby_prepare() {
+	# add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs
+	#epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
+	eapply_user
+
+	#remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
+	rm -r data/cpuinfo
+
+	#remove unneeded ruby bundler versioning files
+	#Gemfile.lock contains the versions tested by the msf team but not the hard requirements
+	#we regen this file in each_ruby_prepare
+	rm Gemfile.lock
+
+	#The Gemfile contains real known deps
+	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
+	#use released packetfu
+	sed -i "s/1.1.13.pre/1.1.13/" metasploit-framework.gemspec || die
+	#git gems are only for ruby24 support and we are not there yet
+	sed -i "/git:/d" Gemfile || die
+
+	#now we edit the Gemfile based on use flags
+	if ! use pcap; then
+		sed -i -e "/^group :pcap do/,/^end$/d" Gemfile || die
+	fi
+	if ! use nexpose; then
+		sed -i -e "/nexpose/d" metasploit-framework.gemspec || die
+	fi
+	#no support for nessus right now
+	#if ! use nessus; then
+		sed -i -e "/nessus/d" metasploit-framework.gemspec || die
+	#fi
+	if ! use openvas; then
+		sed -i -e "/openvas-omp/d" metasploit-framework.gemspec || die
+	fi
+	#even if we pass --without=blah bundler still calculates the deps and messes us up
+	if ! use development; then
+		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
+	fi
+	if ! use test; then
+		sed -i -e "/^group :test/,/^end$/d" Gemfile || die
+	fi
+	if ! use test && ! use development; then
+		sed -i -e "/^group :development/,/^end$/d" Gemfile || die
+	fi
+	#We don't need simplecov
+	sed -i -e "/^group :coverage/,/^end$/d" Gemfile || die
+	sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die
+
+	#we need to edit the gemspec too, since it tries to call git instead of anything sane
+	#probably a better way to fix this... if I care at some point
+	sed -i -e "/^  spec.files/,/^  }/d" metasploit-framework.gemspec || die
+
+	#https://bugs.gentoo.org/show_bug.cgi?id=584522 no tzinfo-data by choice in gentoo
+	sed -i '/tzinfo-data/d' metasploit-framework.gemspec
+
+	#let's bogart msfupdate
+	rm msfupdate
+	echo "#!/bin/sh" > msfupdate
+	echo "echo \"[*]\"" >> msfupdate
+	echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate
+	echo "echo \"[*]\"" >> msfupdate
+	echo "echo \"\"" >> msfupdate
+	if [[ ${PV} == "9999" ]] ; then
+		echo "if [ -x /usr/bin/smart-live-rebuild ]; then" >> msfupdate
+		echo "	smart-live-rebuild -f net-analyzer/metasploit" >> msfupdate
+		echo "else" >> msfupdate
+		echo "	echo \"Please install app-portage/smart-live-rebuild for a better experience.\"" >> msfupdate
+		echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate
+		echo "fi" >> msfupdate
+	else
+		echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate
+		echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate
+		echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate
+	fi
+	#this is set executable in src_install
+
+	#install our database.yml file before tests are run
+	cp "${FILESDIR}"/database.yml config/
+
+}
+
+each_ruby_prepare() {
+	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+
+	#force all metasploit executables to use desired ruby version
+	#https://dev.metasploit.com/redmine/issues/8357
+	for file in $(ls -1 msf*)
+	do
+		#poorly adapted from python.eclass
+		sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
+	done
+}
+
+each_ruby_test() {
+	#review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox
+
+	#we bogart msfupdate so no point in trying to test it
+	rm spec/msfupdate_spec.rb || die
+	#we don't really want to be uploading to virustotal during the tests
+	rm spec/tools/virustotal_spec.rb || die
+
+	# https://dev.metasploit.com/redmine/issues/8425
+	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die
+	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:migrate || die
+
+	MSF_DATABASE_CONFIG=config/database.yml BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake  || die
+	su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user"
+}
+
+each_ruby_install() {
+	#Tests have already been run, we don't need this stuff
+	rm -r spec || die
+	rm -r test || die
+	rm Gemfile.lock || die
+
+	#I'm 99% sure that this will only work for as long as we only support one ruby version.  Creativity will be needed if we wish to support multiple.
+	# should be as simple as copying everything into the target...
+	dodir /usr/$(get_libdir)/${PN}${SLOT}
+	cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed"
+	rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md
+	fowners -R root:0 /
+
+}
+
+all_ruby_install() {
+	# do not remove LICENSE, bug #238137
+	dodir /usr/share/doc/${PF}
+	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
+	dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation
+
+	fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
+
+	#tell revdep-rebuild to ignore binaries meant for the target
+	dodir /etc/revdep-rebuild
+	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
+		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
+		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter"
+		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits"
+	EOF
+}
+
+pkg_postinst() {
+	elog "Before use you should run 'env-update' and '. /etc/profile'"
+	elog "otherwise you may be missing important environmental variables."
+
+	elog "You need to prepare the database by running:"
+	elog "emerge --config postgresql"
+	elog "/etc/init.d/postgresql-<version> start"
+	elog "emerge --config =metasploit-${PV}"
+
+	"${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT}
+
+	einfo
+	elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary"
+}
+
+pkg_config() {
+	einfo "If the following fails, it is likely because you forgot to start/config postgresql first"
+	su postgres -c "createuser msf_user -D -S -R"
+	su postgres -c "createdb --owner=msf_user msf_database"
+}
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
new file mode 100644
index 000000000000..f2e549088f84
--- /dev/null
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+#never ever ever have more than one ruby in here
+USE_RUBY="ruby23"
+inherit eutils ruby-ng
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}"/all
+	inherit git-r3
+	KEYWORDS=""
+	SLOT="9999"
+else
+	##Tags https://github.com/rapid7/metasploit-framework/releases
+	MY_PV=${PV/_p/-}
+	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	RUBY_S="${PN}-framework-${MY_PV}"
+	inherit versionator
+	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
+fi
+
+DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
+HOMEPAGE="http://www.metasploit.org/"
+LICENSE="BSD"
+IUSE="development +java nexpose openvas oracle +pcap test"
+
+#multiple known bugs with tests reported upstream and ignored
+#http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
+RESTRICT="test"
+
+RUBY_COMMON_DEPEND="virtual/ruby-ssl
+	>=dev-ruby/activesupport-4.2.6:4.2
+	>=dev-ruby/actionpack-4.2.6:4.2
+	>=dev-ruby/activerecord-4.2.6:4.2
+	dev-ruby/bcrypt-ruby
+	dev-ruby/bit-struct
+	>=dev-ruby/builder-3.0
+	dev-ruby/bundler
+	dev-ruby/filesize
+	>=dev-ruby/jsobfu-0.3.0
+	dev-ruby/json:*
+	dev-ruby/kissfft
+	dev-ruby/metasm:1.0.2
+	>=dev-ruby/metasploit_data_models-2.0.0
+	dev-ruby/meterpreter_bins:0.0.22
+	dev-ruby/metasploit-payloads:1.2.28
+	dev-ruby/metasploit_payloads-mettle:0.1.9
+	>=dev-ruby/metasploit-credential-2.0.0
+	>=dev-ruby/metasploit-concern-2.0.0
+	>=dev-ruby/metasploit-model-2.0.0
+	dev-ruby/msgpack
+	dev-ruby/net-ssh:*
+	dev-ruby/nokogiri
+	dev-ruby/octokit
+	dev-ruby/openssl-ccm:1.2.1
+	dev-ruby/patch_finder
+	>=dev-ruby/recog-2.0.14
+	dev-ruby/redcarpet
+	>=dev-ruby/rkelly-remix-0.0.6
+	=dev-ruby/rex-arch-0.1.4
+	dev-ruby/rex-bin_tools
+	dev-ruby/rex-core
+	dev-ruby/rex-encoder
+	dev-ruby/rex-exploitation
+	dev-ruby/rex-java
+	dev-ruby/rex-mime
+	dev-ruby/rex-nop
+	dev-ruby/rex-ole
+	dev-ruby/rex-powershell
+	dev-ruby/rex-random_identifier
+	dev-ruby/rex-registry
+	dev-ruby/rex-socket
+	dev-ruby/rex-sslscan
+	dev-ruby/rex-rop_builder
+	dev-ruby/rex-struct2
+	dev-ruby/rex-text
+	dev-ruby/rex-zip
+	dev-ruby/ruby_smb
+	dev-ruby/sqlite3
+	>=dev-ruby/pg-0.11
+	dev-ruby/packetfu:1.1.13
+	>=dev-ruby/rubyzip-1.1
+	>=dev-ruby/rb-readline-0.5.4
+	dev-ruby/robots
+	dev-ruby/sshkey
+	dev-ruby/tzinfo:*
+	dev-ruby/windows_error
+	dev-ruby/xmlrpc
+	java? ( dev-ruby/rjb )
+	nexpose? ( dev-ruby/nexpose )
+	openvas? ( dev-ruby/openvas-omp )
+	oracle? ( dev-ruby/ruby-oci8 )
+	pcap? ( dev-ruby/pcaprub:*
+		dev-ruby/network_interface )
+	development? ( dev-ruby/fivemat
+			dev-ruby/pry
+			dev-ruby/redcarpet
+			dev-ruby/yard
+			>=dev-ruby/rake-10.0.0
+			>=dev-ruby/factory_girl-4.1.0 )"
+	#lorcon doesn't support ruby21
+	#lorcon? ( net-wireless/lorcon[ruby] )
+ruby_add_bdepend "${RUBY_COMMON_DEPEND}
+		test? ( >=dev-ruby/factory_girl-4.1.0
+			dev-ruby/fivemat
+			dev-ruby/database_cleaner
+			>=dev-ruby/rspec-2.12
+			dev-ruby/shoulda-matchers
+			dev-ruby/timecop
+			>=dev-ruby/rake-10.0.0 )"
+ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
+
+COMMON_DEPEND="dev-db/postgresql[server]
+	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
+	net-analyzer/nmap"
+RDEPEND+=" ${COMMON_DEPEND}
+	>=app-eselect/eselect-metasploit-0.16"
+
+RESTRICT="strip"
+
+QA_PREBUILT="
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_solaris.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_bsd.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_bsd.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
+	usr/lib*/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
+	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
+	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
+	usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
+	"
+
+pkg_setup() {
+	if use test; then
+		su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail
+		su postgres -c "createuser msf_test_user -d -S -R"
+		if [ $? -ne 0 ]; then
+			su postgres -c "dropuser msf_test_user" || die
+			su postgres -c "createuser msf_test_user -d -S -R" || die
+		fi
+		su postgres -c "createdb --owner=msf_test_user msf_test_database" || die
+	fi
+	ruby-ng_pkg_setup
+}
+
+all_ruby_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+	else
+		default_src_unpack
+#		mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all
+#		rm -r msf3
+		#msf_version=$(grep --color=never "CURRENT_VERSION =" ${S}/spec/lib/msf/core/framework_spec.rb)
+		#msf_version=${msf_version#*=}
+	fi
+}
+
+all_ruby_prepare() {
+	# add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs
+	#epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
+	eapply_user
+
+	#remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
+	rm -r data/cpuinfo
+
+	#remove unneeded ruby bundler versioning files
+	#Gemfile.lock contains the versions tested by the msf team but not the hard requirements
+	#we regen this file in each_ruby_prepare
+	rm Gemfile.lock
+	#The Gemfile contains real known deps
+	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
+	#git gems are only for ruby24 support and we are not there yet
+	sed -i "/git:/d" Gemfile || die
+
+	#now we edit the Gemfile based on use flags
+	if ! use pcap; then
+		sed -i -e "/^group :pcap do/,/^end$/d" Gemfile || die
+	fi
+	if ! use nexpose; then
+		sed -i -e "/nexpose/d" metasploit-framework.gemspec || die
+	fi
+	#no support for nessus right now
+	#if ! use nessus; then
+		sed -i -e "/nessus/d" metasploit-framework.gemspec || die
+	#fi
+	if ! use openvas; then
+		sed -i -e "/openvas-omp/d" metasploit-framework.gemspec || die
+	fi
+	#even if we pass --without=blah bundler still calculates the deps and messes us up
+	if ! use development; then
+		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
+	fi
+	if ! use test; then
+		sed -i -e "/^group :test/,/^end$/d" Gemfile || die
+	fi
+	if ! use test && ! use development; then
+		sed -i -e "/^group :development/,/^end$/d" Gemfile || die
+	fi
+	#We don't need simplecov
+	sed -i -e "/^group :coverage/,/^end$/d" Gemfile || die
+	sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die
+
+	#we need to edit the gemspec too, since it tries to call git instead of anything sane
+	#probably a better way to fix this... if I care at some point
+	sed -i -e "/^  spec.files/,/^  }/d" metasploit-framework.gemspec || die
+
+	#https://bugs.gentoo.org/show_bug.cgi?id=584522 no tzinfo-data by choice in gentoo
+	sed -i '/tzinfo-data/d' metasploit-framework.gemspec
+
+	#let's bogart msfupdate
+	rm msfupdate
+	echo "#!/bin/sh" > msfupdate
+	echo "echo \"[*]\"" >> msfupdate
+	echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate
+	echo "echo \"[*]\"" >> msfupdate
+	echo "echo \"\"" >> msfupdate
+	if [[ ${PV} == "9999" ]] ; then
+		echo "if [ -x /usr/bin/smart-live-rebuild ]; then" >> msfupdate
+		echo "	smart-live-rebuild -f net-analyzer/metasploit" >> msfupdate
+		echo "else" >> msfupdate
+		echo "	echo \"Please install app-portage/smart-live-rebuild for a better experience.\"" >> msfupdate
+		echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate
+		echo "fi" >> msfupdate
+	else
+		echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate
+		echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate
+		echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate
+	fi
+	#this is set executable in src_install
+
+	#install our database.yml file before tests are run
+	cp "${FILESDIR}"/database.yml config/
+
+}
+
+each_ruby_prepare() {
+	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+
+	#force all metasploit executables to use desired ruby version
+	#https://dev.metasploit.com/redmine/issues/8357
+	for file in $(ls -1 msf*)
+	do
+		#poorly adapted from python.eclass
+		sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
+	done
+}
+
+each_ruby_test() {
+	#review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox
+
+	#we bogart msfupdate so no point in trying to test it
+	rm spec/msfupdate_spec.rb || die
+	#we don't really want to be uploading to virustotal during the tests
+	rm spec/tools/virustotal_spec.rb || die
+
+	# https://dev.metasploit.com/redmine/issues/8425
+	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die
+	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:migrate || die
+
+	MSF_DATABASE_CONFIG=config/database.yml BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake  || die
+	su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user"
+}
+
+each_ruby_install() {
+	#Tests have already been run, we don't need this stuff
+	rm -r spec || die
+	rm -r test || die
+	rm Gemfile.lock || die
+
+	#I'm 99% sure that this will only work for as long as we only support one ruby version.  Creativity will be needed if we wish to support multiple.
+	# should be as simple as copying everything into the target...
+	dodir /usr/$(get_libdir)/${PN}${SLOT}
+	cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed"
+	rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md
+	fowners -R root:0 /
+
+}
+
+all_ruby_install() {
+	# do not remove LICENSE, bug #238137
+	dodir /usr/share/doc/${PF}
+	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
+	dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation
+
+	fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
+
+	#tell revdep-rebuild to ignore binaries meant for the target
+	dodir /etc/revdep-rebuild
+	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
+		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
+		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter"
+		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits"
+	EOF
+}
+
+pkg_postinst() {
+	elog "Before use you should run 'env-update' and '. /etc/profile'"
+	elog "otherwise you may be missing important environmental variables."
+
+	elog "You need to prepare the database by running:"
+	elog "emerge --config postgresql"
+	elog "/etc/init.d/postgresql-<version> start"
+	elog "emerge --config =metasploit-${PV}"
+
+	"${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT}
+
+	einfo
+	elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary"
+}
+
+pkg_config() {
+	einfo "If the following fails, it is likely because you forgot to start/config postgresql first"
+	su postgres -c "createuser msf_user -D -S -R"
+	su postgres -c "createdb --owner=msf_user msf_database"
+}
diff --git a/net-analyzer/mk-livestatus/Manifest b/net-analyzer/mk-livestatus/Manifest
new file mode 100644
index 000000000000..1f375def467e
--- /dev/null
+++ b/net-analyzer/mk-livestatus/Manifest
@@ -0,0 +1,9 @@
+AUX 1.2.8_p10-MEDIUM-Drop-default-strip.patch 812 SHA256 ca35f7cfb3f28a4d56de7896bfc5891c4ab87b9d8d183d65918c4d3a567f740c SHA512 6fc48bbda7b235e50fb7cfa1298b9c7a2c6730e14639371a811febf84c2f7ed30d43cef6e54c794c50dc2e78fba5ead8a3a5c852bc1d605d5d202c92527242cf WHIRLPOOL 451df1f776a764e576c7fd02974a3037fe59b495805f1e0991c0d5173477dcbbc35d81475973330a1b4918469685391ea04d2246cb281daf15bf711f9e3fd545
+AUX 1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch 1111 SHA256 fa51370936c5e7db75a63ffca9ec2a53fe1078abcd331def688f52526f64835f SHA512 162daa81e2122dfd806e3227b3d22775fa3c36d97e92ce638328e46b99d54d2ff9c1ee51b525677a48a40c180ee0cac2c5c8fbcf50bebdb2f6a18ff836310404 WHIRLPOOL 658b0d6f2b9a406ccbccf646632a9e01a9f6c44344989e43d51ff00f357c90dfcadf9c7415143a50171a02132e5652d6051c9048d6826b398fe6878aaa1356c0
+DIST mk-livestatus-1.2.8p10.tar.gz 453496 SHA256 af21c393a17b783f8ca83ffe6e5eea884c74557c4f2bd8899720ced0b443b35e SHA512 ff25c2a8d0105fdd156bc922b56df10e3497361620671dc73242db0a7b57fbd34955b5f4fbd9954602c8011b1f6a5ebd4e278df7c3e66639d74110fd0035682d WHIRLPOOL c3354b04eac1eb8907eb781cdc785136ea4aac0c9d9a2e66d89291d4eeb89f3cd6efcfb2e554295140157b0d7099f1621cd4258e3cd7fa9c0459cd8c7c373d7e
+DIST mk-livestatus-1.2.8p16.tar.gz 453565 SHA256 db6ca46f9616d218103c441de8b72a7ae0a74836e65a85511bf60167625f8e95 SHA512 32d4bc014c008ac7afbdca53e6b3e0d71f8eee5f41f4a0299a8e14cee2a1ea93216fe04c4ff9aa7d7b927dde8e63d186f09a2847665851f1063e699cf73a8df4 WHIRLPOOL 1bb9fd21c78d8b9b1efa48204dbb9ed6676f7a43765e6e8c78cf62df182527b1d9ae589968b7d7c9075d30d6628e2c4eb95cfcaebbb0b6926821fc08510bfaec
+EBUILD mk-livestatus-1.2.8_p10.ebuild 2656 SHA256 ce91d8dff5e17bc749d2f662a3f91de7077c5596219eb1fec6a767d0cd5e8bd5 SHA512 348b1a88b335865bf0867d3f61a4b4d5787942c50c9b6c5f5f9da85ec81c128a879dc634797823924c0b140d4364a154e4d750cea7f8d8ab1f3e59cf6fb68d9c WHIRLPOOL f7489395811ad12ec1cc90834d715c75ded85b53ff42d7e5734b1455ea5ba6d61cf16536ff397fa27910305ebe9e4dd4bda0492b793f332d36049c5b865aee79
+EBUILD mk-livestatus-1.2.8_p16.ebuild 3456 SHA256 beea065369230f5b3f4130cc5c9e8841faa9aa9e002ea0c6247813417b937fd8 SHA512 a2d86da6a554f9d918afc07d494730682ce17314eff7a206f469d6b268146cdd800fe56459815f2bea7283fa925976e3d184195f588cf620c485e9a75166f608 WHIRLPOOL e44edb0719cc065fdecbb63b10851ac27446cf7021b27b5339c0821b5317ed3a583f6877cbfa339ff470269efcc6595e750e6b0f8050bb92952af0722095240a
+MISC ChangeLog 3967 SHA256 685d1264ed584a52a0416029aa1944ab6576ba7098753e2b141781560e546ebb SHA512 ca300050249fae628f1410a0c65ab25be7718f643da36d432f49c7b540f6461b1b328a454d6e4205dfd6ed09de971d5ec88685c9f48cf44a058d56c3446f8515 WHIRLPOOL bbe55658fe9071078f3e46c681d99f5eeaabff54468d353cbe1c4a1b77a2bc923e9a326b79df659024baef1a9a29b68d366e6da605e2fcccc50783b9ec0a8fcf
+MISC ChangeLog-2015 2277 SHA256 4f191043ff6b5393672fcfd81a426c6355e6302ec6fdc8028af90749dc21345f SHA512 f549328aca37d7a6a07dfc6fb662703c2bfade981a25e6b75bb7f4c4858ac4cb96a14880bfc0dbce6847c5109c2bbf62a82335a0c415b883e305e0c19805fc46 WHIRLPOOL 601499571fea74b11f172831481f0d939978f942f2e129595ab58b6afd90e02ecff697fd9af0f258208fdacc481709cf0215324acf43e8f6777b5018bbf88d6f
+MISC metadata.xml 617 SHA256 dfa52ef9d6f5b5fdac4646ccd400c11e153089589ec0c2b12ed6c52c9641b6a0 SHA512 227a4ec9dad38a0be74140697b5095c694ca6837d1bf6fc396f6de28781eba572164e9c8cf7273a8b7286f2d68e5b8efe2facde4b705901d4d675936ccd9d87e WHIRLPOOL ff2b20eaead62bfb10cae1d8a4981d9f61d9383d3643d2580659059fb34d6b5115e1a7bd7d8762a41bc4ac2ea40c85262f978176f87c350abdf3d062e3590309
diff --git a/net-analyzer/mk-livestatus/files/1.2.8_p10-MEDIUM-Drop-default-strip.patch b/net-analyzer/mk-livestatus/files/1.2.8_p10-MEDIUM-Drop-default-strip.patch
new file mode 100644
index 000000000000..5b5009bfaa01
--- /dev/null
+++ b/net-analyzer/mk-livestatus/files/1.2.8_p10-MEDIUM-Drop-default-strip.patch
@@ -0,0 +1,24 @@
+From 1798492a27a1ac3819cb366e1a3e789d663f55a0 Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <bertrand@jacquin.bzh>
+Date: Wed, 21 Aug 2013 23:00:21 +0200
+Subject: [PATCH 1/2] MEDIUM: Drop default strip
+
+See: https://bugs.gentoo.org/show_bug.cgi?id=482026
+
+---
+ src/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index deab289..126b503 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -55,7 +55,7 @@ livestatus_so_CFLAGS   = -fPIC
+ 
+ livestatus.o: $(livestatus_so_OBJECTS) $(livestatus_so_DEPENDENCIES)
+ 	-rm -f plugin.so
+-	$(CXX) $(LDFLAGS) -s -fPIC -shared $(livestatus_so_OBJECTS) -o $@ -lpthread -static-libstdc++
++	$(CXX) $(LDFLAGS) -fPIC -shared $(livestatus_so_OBJECTS) -o $@ -lpthread -static-libstdc++
+ 
+ all-local: livestatus.o
+ 
diff --git a/net-analyzer/mk-livestatus/files/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch b/net-analyzer/mk-livestatus/files/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch
new file mode 100644
index 000000000000..264d9bb899b6
--- /dev/null
+++ b/net-analyzer/mk-livestatus/files/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch
@@ -0,0 +1,34 @@
+From 39cc57667a93f1cf18f935fdfda4d602667c89c8 Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <bertrand@jacquin.bzh>
+Date: Wed, 21 Aug 2013 23:00:21 +0200
+Subject: [PATCH 2/2] MINOR: test: Remove the usage of
+ Perl::Critic::Policy::Modules::ProhibitAutomaticExportation
+
+This does not exist since
+http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-perl/Perl-Critic/metadata.xml?r1=1.3&r2=1.4
+
+See: https://bugs.gentoo.org/show_bug.cgi?id=482026
+---
+ api/perl/t/perlcriticrc | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/api/perl/t/perlcriticrc b/api/perl/t/perlcriticrc
+index f7e4721..f686dca 100644
+--- a/api/perl/t/perlcriticrc
++++ b/api/perl/t/perlcriticrc
+@@ -133,8 +133,6 @@ severity   = 3
+ [Perl::Critic::Policy::Miscellanea::ProhibitTies]
+ severity   = 4
+ 
+-[-Perl::Critic::Policy::Miscellanea::RequireRcsKeywords]
+-
+ [Perl::Critic::Policy::Modules::ProhibitAutomaticExportation]
+ severity   = 4
+ 
+@@ -283,4 +281,4 @@ severity   = 5
+ severity   = 5
+ 
+ [Perl::Critic::Policy::Variables::RequireNegativeIndices]
+-severity   = 4
+\ No newline at end of file
++severity   = 4
diff --git a/net-analyzer/mk-livestatus/metadata.xml b/net-analyzer/mk-livestatus/metadata.xml
new file mode 100644
index 000000000000..29e9ad4c81c5
--- /dev/null
+++ b/net-analyzer/mk-livestatus/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bertrand@jacquin.bzh</email>
+		<name>Bertrand Jacquin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="nagios4">Generate a <pkg>net-analyzer/nagios</pkg>-4 compatible plugin</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild
new file mode 100644
index 000000000000..74f333413356
--- /dev/null
+++ b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python2_7 )
+inherit autotools perl-module python-r1
+
+MY_PV="${PV/_p/p}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Nagios/Icinga event broker that allows quick/direct access to your status data"
+HOMEPAGE="http://mathias-kettner.de/checkmk_livestatus.html"
+SRC_URI="http://mathias-kettner.de/download/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples nagios4 perl python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="!sys-apps/ucspi-unix:0
+	perl? (
+		dev-lang/perl:0
+		virtual/perl-Digest-MD5:0
+		virtual/perl-Scalar-List-Utils:0
+		>=virtual/perl-Thread-Queue-2.11:0
+		virtual/perl-Encode:0
+		dev-perl/JSON-XS:0
+	)
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	perl? (
+		dev-perl/Module-Install:0
+		virtual/perl-ExtUtils-MakeMaker:0
+		virtual/perl-File-Path:0
+		virtual/perl-File-Spec:0
+		virtual/perl-File-Temp:0
+		test? (
+			dev-perl/File-Copy-Recursive:0
+			dev-perl/Test-Pod:0
+			dev-perl/Test-Perl-Critic:0
+			dev-perl/Test-Pod-Coverage:0
+			dev-perl/Perl-Critic:0
+			dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect:0
+			dev-perl/Perl-Critic-Deprecated:0
+			dev-perl/Perl-Critic-Nits:0
+		)
+	)"
+
+# For perl test
+SRC_TEST="parallel"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-MEDIUM-Drop-default-strip.patch"
+	"${FILESDIR}/${PV}-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch"
+)
+
+src_prepare() {
+	default
+
+	# Use system Module::Install instead, it will be copied to $S by
+	# Module::install itself.
+	rm -rf api/perl/inc || die
+
+	if use perl; then
+		# Ensure patches are not applied twice
+		unset PATCHES
+		perl-module_src_prepare
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with nagios4)
+
+	if use perl; then
+		cd api/perl || die
+		perl-module_src_configure
+	fi
+}
+
+src_compile() {
+	emake
+
+	if use perl; then
+		cd api/perl || die
+		perl-module_src_compile
+	fi
+}
+
+src_test() {
+	if use perl; then
+		cd api/perl || die
+
+		export TEST_AUTHOR="Test Author"
+		perl-module_src_test
+	fi
+}
+
+src_install() {
+	emake install DESTDIR="${ED}"
+
+	if use perl; then
+		cd api/perl || die
+		perl-module_src_install
+		cd "${S}"
+
+		if use examples; then
+			docinto /
+			newdoc api/perl/README README.perl
+
+			docinto examples
+			dodoc api/perl/examples/dump.pl
+		fi
+	fi
+
+	if use python; then
+		python_foreach_impl python_domodule api/python/livestatus.py
+
+		if use examples; then
+			docinto /
+			newdoc api/python/README README.python
+
+			docinto examples
+			dodoc api/python/{example,example_multisite,make_nagvis_map}.py
+		fi
+	fi
+}
diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild
new file mode 100644
index 000000000000..4d0653d1def5
--- /dev/null
+++ b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python2_7 )
+inherit autotools perl-module python-single-r1
+
+MY_PV="${PV/_p/p}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Nagios/Icinga event broker that allows quick/direct access to your status data"
+HOMEPAGE="http://mathias-kettner.de/checkmk_livestatus.html"
+SRC_URI="http://mathias-kettner.de/download/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples nagios4 perl python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="!sys-apps/ucspi-unix:0
+	perl? (
+		dev-lang/perl:0
+		virtual/perl-Digest-MD5:0
+		virtual/perl-Scalar-List-Utils:0
+		>=virtual/perl-Thread-Queue-2.11:0
+		virtual/perl-Encode:0
+		dev-perl/JSON-XS:0
+	)
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	perl? (
+		dev-perl/Module-Install:0
+		virtual/perl-ExtUtils-MakeMaker:0
+		virtual/perl-File-Path:0
+		virtual/perl-File-Spec:0
+		virtual/perl-File-Temp:0
+		test? (
+			dev-perl/File-Copy-Recursive:0
+			dev-perl/Test-Pod:0
+			dev-perl/Test-Perl-Critic:0
+			dev-perl/Test-Pod-Coverage:0
+			dev-perl/Perl-Critic:0
+			dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect:0
+			dev-perl/Perl-Critic-Deprecated:0
+			dev-perl/Perl-Critic-Nits:0
+		)
+	)"
+
+# For perl test
+SRC_TEST="parallel"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/1.2.8_p10-MEDIUM-Drop-default-strip.patch"
+	"${FILESDIR}/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch"
+)
+
+src_prepare() {
+	default
+
+	# Use system Module::Install instead, it will be copied to $S by
+	# Module::install itself.
+	rm -rf api/perl/inc || die
+
+	if use perl; then
+		# Ensure patches are not applied twice
+		unset PATCHES
+		perl-module_src_prepare
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with nagios4)
+
+	if use perl; then
+		cd api/perl || die
+		perl-module_src_configure
+	fi
+}
+
+src_compile() {
+	emake
+
+	if use perl; then
+		cd api/perl || die
+		perl-module_src_compile
+	fi
+}
+
+src_test() {
+	if use perl; then
+		cd api/perl || die
+
+		export TEST_AUTHOR="Test Author"
+		perl-module_src_test
+	fi
+}
+
+src_install() {
+	emake install DESTDIR="${ED}"
+
+	# install a config file showing whats needed to enable livestatus for nagios
+	cat <<EOF >"${T}"/nagios.cfg
+# Ensure all data is set to event brokers
+event_broker_options=-1
+broker_module=${EPREFIX%/}/usr/$(get_libdir)/mk-livestatus/livestatus.o
+EOF
+	# same for icigna
+	cat <<EOF >"${T}"/icigna.cfg
+                cat << EOF > "${T}"/livestatus.cfg || die
+define module{
+        module_name             mk-livestatus
+        module_type             neb
+        path                    /usr/$(get_libdir)/mk-livestatus/livestatus.o
+        args                    /var/lib/icigna/rw/live
+        }
+EOF
+	insinto /usr/share/mk-livestatus
+	doins "${T}"/{nagios,icigna}.cfg
+
+	if use perl; then
+		cd api/perl || die
+		perl-module_src_install
+		cd "${S}"
+
+		if use examples; then
+			docinto /
+			newdoc api/perl/README README.perl
+
+			docinto examples
+			dodoc api/perl/examples/dump.pl
+		fi
+	fi
+
+	if use python; then
+		python_foreach_impl python_domodule api/python/livestatus.py
+
+		if use examples; then
+			docinto /
+			newdoc api/python/README README.python
+
+			docinto examples
+			dodoc api/python/{example,example_multisite,make_nagvis_map}.py
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog "Sample configurations for icigna and nagios are available in"
+	elog "/usr/share/${PN}"
+}
diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest
new file mode 100644
index 000000000000..667a125a3d87
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -0,0 +1,7 @@
+DIST monitoring-plugins-2.1.2.tar.gz 2613060 SHA256 76c6b58f0867ab7b6c8c86c7e94fcce7183618f6daab63488990d0355f5600aa SHA512 845eb7636691aa5402119384c3d4256969e959fbc29ef5257c24fc4c21536cad3dade30747f36c9ad998cb37df0f325df66ea679d3d5b96c2993b59a9a325fed WHIRLPOOL aea22e1a3d3c7622b4645118cf8b5d499882bd30b6af8bdd81287fb99fe42bff7f906b54fda411ac2c33ff6e42872a6ea6af4dcd7611bdc95d308c0fcd954e43
+DIST monitoring-plugins-2.2.tar.gz 2461548 SHA256 296a538f00a9cbef7f528ff2d43af357a44b384dc98a32389a675b62a6dd3665 SHA512 5f8cfa132891d6d96e69bee3f2c26f7d4546f572be6a18f25ea5d9069f162cb2e424361289a5c26bec60d7b63d28a269437fd6f25645903a1c142fdcbbf77f27 WHIRLPOOL 5ca16cbc63cbbe3472f82b87b2c4111df4877bc33b0a9bf638507aaf8020194adc6e8244c5a002ae636121ae58d7a112cb2c5cba6e384c136e5636bbfc4a6141
+EBUILD monitoring-plugins-2.1.2.ebuild 2858 SHA256 64a1c31aa98c89bce7e97adc9ebc4d1880caa4bf5ea4d4ba8718857ea71e3a05 SHA512 9426fdb164c60771cc3dddc6cff2e526ae7770400378b74dde706a2cfce7dba51aecddfb7c7a532e6bc07078d05cf28d64ddddc3e4eefeb4ec2bb70f44151f7a WHIRLPOOL 53739d5dc73981a520bae34597014c2bcd3fb916356ab11fdc57fa8618141ce34e2b9dfad64976f607b6a567729654f3c4d0897046e200643a0f6a65c1b2314e
+EBUILD monitoring-plugins-2.2.ebuild 2869 SHA256 d8a2524831c66cffdd28559621ac2bedfc825e7108fc54ff694fd761f15f6057 SHA512 d0e1dbe65190e568f4ad12e6b6fc2ec5bd7592da197236005e7412ac605c1864853e11e9c42f71e5817fb9b421d421f11d08da76229410b36af77131ff61367b WHIRLPOOL d0c4d04ed84b8c5cda9978290316090caf588c208ae3d3e3c9bd097c9229ad4abe5a592e8e5ad372a7b718f6641f9591fc87bce07a09699a79b0a4790670117d
+MISC ChangeLog 4406 SHA256 0763915a056d3bf9a24757a76b6a36ea9d7ad01e90363cd7129700006ff255cd SHA512 c66af4340242619c68762cd664eea7a81518bbd873747f0d22c5ff902be298e265ee468df03e58ebb7a0142fb2fee9306fc66906c38096845f11188e89ddc464 WHIRLPOOL 9731fa3642854f51a2ca6499a0bfb30e3fdb4574dd34677701a5cc0f2707a8b9836b23abb0d858f532373268c02921ab0cf422154a5571e19489a70d9e84f1a4
+MISC ChangeLog-2015 589 SHA256 f642f2d89f87baaddd8fbdbb798a9e9603a81c39da412d4832668a25ce505ee4 SHA512 dff7df956fa977e38f4b7094d2edd78ca1aaa34b3c8a78620c7d265d8935cb3bf69a1f8446c391b6abb78ee2a82250e47278cc7b5b466c6485c07b8c2b403416 WHIRLPOOL f026417f1ee1dace25a47d2ff59c4dac96abb01ba506c38f69dfae001755589e0ce67fb44e994ac645081e8c12ae12d4efe6bd0b04f2411ad844d87e1bff2bcb
+MISC metadata.xml 1551 SHA256 0cd297b91263b0ee3a6ef6c9810e9a9c26262c3b258f136f5281d4cbe23d3995 SHA512 5c41ed2615a101375171ddebccf5a746fbe7716a57b66c46b35c19755e524cf0bc0b03267bd3a6f4b0689d1db743f7489248d101e0bdda3e32ab0bd4e20fb75f WHIRLPOOL bcd43dd58ef627bd18b8083df38d77ce0eefa9738451c0af9f9041860abcd4b7d04cc079ef2ca64a7f1fc318d9904a24a4cc6e252f6702ababd0c4f11c9e60ec
diff --git a/net-analyzer/monitoring-plugins/metadata.xml b/net-analyzer/monitoring-plugins/metadata.xml
new file mode 100644
index 000000000000..f355cb420c63
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/metadata.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+      <email>hydrapolic@gmail.com</email>
+      <name>Tomas Mozes</name>
+      <description>Primary maintainer. Assign bugs to him.</description>
+  </maintainer>
+  <maintainer type="person">
+      <email>mjo@gentoo.org</email>
+      <name>Michael Orlitzky</name>
+      <description>Secondary maintainer. Please CC on bugs.</description>
+  </maintainer>
+  <maintainer type="project">
+      <email>proxy-maint@gentoo.org</email>
+      <name>Proxy Maintainers</name>
+  </maintainer>
+  <use>
+    <flag name="dns">
+      Install <pkg>net-dns/bind-tools</pkg> required for monitoring
+      DNS servers. Disabling the flag does not remove any plugins.
+    </flag>
+    <flag name="game">
+      Install <pkg>games-util/qstat</pkg> required for monitoring FPS
+      servers. Disabling the flag does not remove any plugins.
+    </flag>
+    <flag name="fping">
+      Install <pkg>net-analyzer/fping</pkg> required for fancy ping
+      monitoring. Disabling the flag does not remove any plugins.
+    </flag>
+    <flag name="ssh">
+      Install <pkg>net-misc/openssh</pkg> required for monitoring SSH
+      servers. Disabling the flag does not remove any plugins.
+    </flag>
+    <flag name="snmp">
+      Install <pkg>dev-perl/Net-SNMP</pkg> and
+      <pkg>net-analyzer/net-snmp</pkg> required for monitoring SNMP
+      values. Disabling the flag does not remove any plugins.
+    </flag>
+  </use>
+</pkgmetadata>
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.2.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.2.ebuild
new file mode 100644
index 000000000000..e48fdba53145
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib user
+
+DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu"
+HOMEPAGE="https://www.monitoring-plugins.org/"
+SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres samba snmp ssh +ssl"
+
+# Most of the plugins use automagic dependencies, i.e. the plugin will
+# get built if the binary it uses is installed. For example, check_snmp
+# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
+# installed. End result: most of our runtime dependencies are required
+# at build time as well.
+#
+# REAL_DEPEND contains the dependencies that are actually needed to
+# build. DEPEND contains those plus the automagic dependencies.
+#
+REAL_DEPEND="dev-lang/perl
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )
+	ssl? (
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+		gnutls? ( net-libs/gnutls )
+	)"
+
+DEPEND="${REAL_DEPEND}
+	dns? ( net-dns/bind-tools )
+	game? ( games-util/qstat )
+	fping? ( net-analyzer/fping )
+	samba? ( net-fs/samba )
+	ssh? ( net-misc/openssh )
+	snmp? ( dev-perl/Net-SNMP
+			net-analyzer/net-snmp[-minimal] )"
+
+# Basically everything collides with nagios-plugins.
+RDEPEND="${DEPEND}
+	!net-analyzer/nagios-plugins"
+
+# At least one test is interactive.
+RESTRICT="test"
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# Use an array to prevent econf from mangling the ping args.
+	local myconf=()
+
+	if use ssl; then
+		myconf+=( $(use_with !gnutls openssl /usr)
+				  $(use_with gnutls gnutls /usr) )
+	else
+		myconf+=( --without-openssl )
+		myconf+=( --without-gnutls )
+	fi
+
+	# The autodetection for these two commands can hang if localhost is
+	# down or ICMP traffic is filtered. Bug #468296.
+	myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" )
+
+	if use ipv6; then
+		myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" )
+	fi
+
+	econf \
+		$(use_with mysql) \
+		$(use_with ipv6) \
+		$(use_with ldap) \
+		$(use_with postgres pgsql /usr) \
+		"${myconf[@]}" \
+		--libexecdir="/usr/$(get_libdir)/nagios/plugins" \
+		--sysconfdir="/etc/nagios"
+}
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
+		NEWS README REQUIREMENTS SUPPORT THANKS )
+
+pkg_preinst() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+pkg_postinst() {
+	elog "This ebuild has a number of USE flags that determine what you"
+	elog "are able to monitor. Depending on what you want to monitor, some"
+	elog "or all of these USE flags need to be set."
+	elog
+	elog "The plugins are installed in ${ROOT}usr/$(get_libdir)/nagios/plugins"
+}
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild
new file mode 100644
index 000000000000..bcc6146dc812
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic multilib user
+
+DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu"
+HOMEPAGE="https://www.monitoring-plugins.org/"
+SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres samba snmp ssh +ssl"
+
+# Most of the plugins use automagic dependencies, i.e. the plugin will
+# get built if the binary it uses is installed. For example, check_snmp
+# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
+# installed. End result: most of our runtime dependencies are required
+# at build time as well.
+#
+# REAL_DEPEND contains the dependencies that are actually needed to
+# build. DEPEND contains those plus the automagic dependencies.
+#
+REAL_DEPEND="dev-lang/perl
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )
+	ssl? (
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+		gnutls? ( net-libs/gnutls )
+	)"
+
+DEPEND="${REAL_DEPEND}
+	dns? ( net-dns/bind-tools )
+	game? ( games-util/qstat )
+	fping? ( net-analyzer/fping )
+	samba? ( net-fs/samba )
+	ssh? ( net-misc/openssh )
+	snmp? ( dev-perl/Net-SNMP
+			net-analyzer/net-snmp[-minimal] )"
+
+# Basically everything collides with nagios-plugins.
+RDEPEND="${DEPEND}
+	!net-analyzer/nagios-plugins"
+
+# At least one test is interactive.
+RESTRICT="test"
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# Use an array to prevent econf from mangling the ping args.
+	local myconf=()
+
+	if use ssl; then
+		myconf+=( $(use_with !gnutls openssl /usr)
+				  $(use_with gnutls gnutls /usr) )
+	else
+		myconf+=( --without-openssl )
+		myconf+=( --without-gnutls )
+	fi
+
+	# The autodetection for these two commands can hang if localhost is
+	# down or ICMP traffic is filtered. Bug #468296.
+	myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" )
+
+	if use ipv6; then
+		myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" )
+	fi
+
+	econf \
+		$(use_with mysql) \
+		$(use_with ipv6) \
+		$(use_with ldap) \
+		$(use_with postgres pgsql /usr) \
+		"${myconf[@]}" \
+		--libexecdir="/usr/$(get_libdir)/nagios/plugins" \
+		--sysconfdir="/etc/nagios"
+}
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
+		NEWS README REQUIREMENTS SUPPORT THANKS )
+
+pkg_preinst() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+pkg_postinst() {
+	elog "This ebuild has a number of USE flags that determine what you"
+	elog "are able to monitor. Depending on what you want to monitor, some"
+	elog "or all of these USE flags need to be set."
+	elog
+	elog "The plugins are installed in ${EROOT%/}/usr/$(get_libdir)/nagios/plugins"
+}
diff --git a/net-analyzer/mping/Manifest b/net-analyzer/mping/Manifest
new file mode 100644
index 000000000000..9e6cd608d424
--- /dev/null
+++ b/net-analyzer/mping/Manifest
@@ -0,0 +1,6 @@
+AUX mping-2.01-RFC3542.patch 1893 SHA256 263a627b4c31098fcfcc4e7bbd3484edbe78499e5eefe3d23aa3268fd7299ed6 SHA512 286126b7abf147a7dd216082a967349e5850c23995a9e0481b31ff29c1c27f6be5da7b61dbc50593a437d460e9a2d48852c3003091876757f4478c4ed1f2b8c9 WHIRLPOOL 5706da72fe80e13709c95a7d9afb24fef91adac8f578a51f1aca9054bb7ae9a41d098f818f26513fa9238757170b53e8b24803aaf122791aceb40f23b7f0dfac
+DIST mping-2.01.tar.gz 159203 SHA256 7728ef3e31299b453e3d7cbb70b2ba0cdd3f5a9a71cae691b9756a7a3a76dde1 SHA512 9e1c243013f74a69d3014c11503ad9ff9b8992dcb3eb252a85a1958e8d63dadeab79b6937b76ddce9cc0d22c50a19ec90d40a68d3efc303c48a631f316f5b167 WHIRLPOOL 538069b71459ca00c3301b46b8df71acecdc852a81038a5e310e2dbd1218ca7ec833f368a6d2d3ba80d5464b0c7cdfae2f5203ecc8155bd913a068aa1ca34676
+EBUILD mping-2.01.ebuild 430 SHA256 c459a3cbd42a3334016041955fc66dc598c435b2cb9ddc2e6974ea04ad3eebec SHA512 4cde24296e6f288bba6ce24c049fdd2303deeef010104be92d0ec919ad72de0ebc2c835118811827d4190f4635c8107dae1b8c4251fa91de87874e589a482437 WHIRLPOOL 2fde6c82a4a6fa09d64e1df59dc3d5d2fdfbb5a9c615cabc5a3a22f336f94829bbd67d968c8d390ad475924751eb7144351e71626d2939f2b67dbc8ae374ed54
+MISC ChangeLog 2456 SHA256 b7f1f78df5258b2ed5aca4eb8a19a19266f4b84314d992d37aa96938a97535d4 SHA512 c72895ab0b667b4ad730e81f77953942fe5f3f26acd3e298ad11f2ab3ab44c2deb5d1976b7c5e74e2e42c7c19dcb208307865f50f95280f52db41b758a74ef52 WHIRLPOOL 078ed8fbfc0ead0f4f0de855916310864f01874e0ba2ee4ab5b3539aff3509f8e808f5c223563ca9a110d9134060dd5905a00f3bc716897c7b9ce774ae635618
+MISC ChangeLog-2015 1784 SHA256 dbc7f47d9583d8eb86eb6d786841419ec8a46ba1800d2a86b9e935b65e4570ef SHA512 53d48c55128f38e849f86b6e6786276352e3f20306a2fad21b0a1b4fa51b9fb2cb0e885d655a9fde1d7bc01208133879c254fe4d09a41ddb67f89e99a96e78f9 WHIRLPOOL 1d18f8c7f566c7e5ab632c1fa86b3ec86e960fb4e1131e58b09f43141ecaf87b89f59c694b97f196cfa778022be00098f222b12a3d35cf6ead4b5229a9f4dc39
+MISC metadata.xml 651 SHA256 3fc30a92f59cd6fc34d62b6ca7bdbda6f4b479c022422e42288a053d87d8879f SHA512 7b9161a3fd66ce7aec220e57186f20b2085d4771784bfc26837695335440fecc9f1c2555404ff6d1b2f7ce3a49adec2b0925cd2b68ed2fa47cdc8d6b87b59271 WHIRLPOOL fe06ef1f21296ca7babeaccf2a9b69f1001c27882c662c15049f7c5d650a779f4911decbee3648908adc14e8786e855428ce7b8068afbc96adca13dd91d0a955
diff --git a/net-analyzer/mping/files/mping-2.01-RFC3542.patch b/net-analyzer/mping/files/mping-2.01-RFC3542.patch
new file mode 100644
index 000000000000..be34aa7357fd
--- /dev/null
+++ b/net-analyzer/mping/files/mping-2.01-RFC3542.patch
@@ -0,0 +1,56 @@
+http://www.ietf.org/rfc/rfc3542.txt
+
+http://bugs.gentoo.org/153252
+
+--- a/src/mping.c
++++ b/src/mping.c
+@@ -1688,6 +1688,20 @@
+         }
+ }
+ 
++/* RFC3542 changed some definitions from RFC2292 for no good reason, whee !
++ * the newer 3542 uses a MLD_ prefix where as 2292 uses ICMP6_ prefix */
++#ifndef MLD_LISTENER_QUERY
++# define MLD_LISTENER_QUERY ICMP6_MEMBERSHIP_QUERY
++#endif
++#ifndef MLD_LISTENER_REPORT
++# define MLD_LISTENER_REPORT ICMP6_MEMBERSHIP_REPORT
++#endif
++#ifndef MLD_LISTENER_REDUCTION
++# define MLD_LISTENER_REDUCTION ICMP6_MEMBERSHIP_REDUCTION
++#endif
++#ifndef ICMP6_DST_UNREACH_BEYONDSCOPE
++# define ICMP6_DST_UNREACH_BEYONDSCOPE ICMP6_DST_UNREACH_NOTNEIGHBOR
++#endif
+ /*
+  *  Print a descriptive string about an ICMP6 header.
+  */
+@@ -1704,8 +1718,8 @@
+                 case ICMP6_DST_UNREACH_ADMIN:
+                         printf("Administratively Prohibited\n");
+                         break;
+-                case ICMP6_DST_UNREACH_NOTNEIGHBOR:
+-                        printf("Not a Neighbour\n");
++                case ICMP6_DST_UNREACH_BEYONDSCOPE:
++                        printf("Beyond scope\n");
+                         break;
+                 case ICMP6_DST_UNREACH_ADDR:
+                         printf("Destination Host Unreachable\n");
+@@ -1755,13 +1769,13 @@
+         case ICMP6_ECHO_REPLY:
+                 printf("Echo reply\n");
+                 break;
+-        case ICMP6_MEMBERSHIP_QUERY:
+-                printf("Membership Query\n");
++        case MLD_LISTENER_QUERY:
++                printf("MLD Query\n");
+                 break;
+-        case ICMP6_MEMBERSHIP_REPORT:
++        case MLD_LISTENER_REPORT:
+                 printf("MLD Report\n");
+                 break;
+-        case ICMP6_MEMBERSHIP_REDUCTION:
++        case MLD_LISTENER_REDUCTION:
+                 printf("MLD Reduction\n");
+                 break;
+ 	case ND_ROUTER_ADVERT:
diff --git a/net-analyzer/mping/metadata.xml b/net-analyzer/mping/metadata.xml
new file mode 100644
index 000000000000..583e01eed1e7
--- /dev/null
+++ b/net-analyzer/mping/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<longdescription>
+UNINETTs delay statistics for IPv6 is now up and 
+running as a test project. The main goal with this 
+test project,is to test how well
+Mping 2.0 works against the IPv6 network, and how well 
+it handles IPv4 and IPv6 adresses simultaniously. For 
+now we have to
+resort to "IPv6 over IPv4 tunneling", but this is not 
+a permanent solution.
+</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/mping/mping-2.01.ebuild b/net-analyzer/mping/mping-2.01.ebuild
new file mode 100644
index 000000000000..3133eb907421
--- /dev/null
+++ b/net-analyzer/mping/mping-2.01.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="IPv4/6 round-robin multiping client"
+HOMEPAGE="http://mping.uninett.no"
+SRC_URI="http://mping.uninett.no/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-RFC3542.patch
+}
diff --git a/net-analyzer/mrtg-ping-probe/Manifest b/net-analyzer/mrtg-ping-probe/Manifest
new file mode 100644
index 000000000000..9d18b0673271
--- /dev/null
+++ b/net-analyzer/mrtg-ping-probe/Manifest
@@ -0,0 +1,6 @@
+AUX mrtg-ping-cfg 2077 SHA256 771bbe8321fa806c86b45b18c0c697a29702ec6b30f167d4b9f757f511ed0c95 SHA512 d4c9f651fff32b7bb417ae07700cc179c4db596270a9f2dba5ccef45992239b0f964ac7cf63478c3c12a02e02adf088b692a66740872ebc8da2edba376f7029c WHIRLPOOL 0ac1264c805aed848f1a2747ac28cc458effedcdcba9385bb7789a17c16c0848ce687edd27785e14ae8fd21543c0a1c869f3a9693b9c13582035f31745f31376
+DIST mrtg-ping-probe-2.2.0.tar.gz 36923 SHA256 2708459c1beb5ab482fa28ff62720f6a2d5707475d40e53a2829927572c96a0e SHA512 efc86ed732547359d8b2d94da367946d8b573e2b4d1b3d240b8eb7c5bfff17971848ad62c1448cdc0305393193d969361328448d9c9b25ae54866f71614b7cea WHIRLPOOL 22efb23198783551bdd65d5f23a5311958865440f78927743509555a5e44b157ed90b55ddfe6e334c02c2938d7b667144e126113eb3d52a610b25746e83f0335
+EBUILD mrtg-ping-probe-2.2.0.ebuild 726 SHA256 cba03591853032b85b08e59689d1485728bbe95e65c6cb96b44c97f17fde426b SHA512 9c754fa34ad2693bc994e5c16e5cf7022db7b29c813f41eecfcb85ab93ff4162e69541bdeb522b409fef1c7affbc901f2c326d78616a7d9bee6401cfa80ebd34 WHIRLPOOL 57274ed5e70eea1c153725cb56de7a8897a5fc64ad55526d97ff3810ca43776c80b0955329deab893207f161c3cca47831641cecdf920143e3ef54f5932b7050
+MISC ChangeLog 2477 SHA256 54e78a1d53856802d4b44c02fe772e974a0ccbf8b254edc1d4c4d73597dcdb85 SHA512 8d6dfb2565f2e74fb1ed33fab31258cc6dda20c483d15a69c23f0fe3d82fd94bcbfa59b879a2709bd477445c0a4139e104a2be1714aece2ba20bd1e76e8c01ce WHIRLPOOL 9cc2aee1ab2b9114a64a3c7a68bbf124fb06034565bf043315af7961eab690112e792c7b324e9b311822b38edf113756c81b463a3e128a230eab4359b6aff45a
+MISC ChangeLog-2015 1187 SHA256 58692df68ff73dbf547e5a958e4477a814df7782b96d4fc7e4f3e152cd72fd47 SHA512 d85af9ae55f0682045b66981fbe4f7bd942751a4a082524d64bb4fa77aa67c2e7473cd2f8ea7abe21eb756a57936aec8b891d0bee8d7d130888e5126709ef609 WHIRLPOOL 66bbc629afe086b22c0e1a83d16ac2085da2100ebeffe31a837711c7b02c62cb70f95faaca8b82689bef40f4319b93f976e56e9d07723386fc313ca8b865c6be
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/mrtg-ping-probe/files/mrtg-ping-cfg b/net-analyzer/mrtg-ping-probe/files/mrtg-ping-cfg
new file mode 100644
index 000000000000..85a38221b625
--- /dev/null
+++ b/net-analyzer/mrtg-ping-probe/files/mrtg-ping-cfg
@@ -0,0 +1,84 @@
+#!/bin/sh
+#
+# mrtg-ping-cfg { ping | loss } <device> <"Title of page">
+#
+# This creates the mrtg.cfg configurations to do pings to devices.
+# Makes use of mrt-ping-probe by Peter W. Osel <pwo@guug.de> (see below)
+#
+# leewm@sgp.hp.com
+# Hewlett Packard Singapore
+# IT Site Infrastructure Services
+# modifed by "Molchanov Alexander <xorader@mail.ru>"
+
+# location of mrtg ping probe
+PING_PROBE=/usr/bin/mrtg-ping-probe
+
+if [ $# -ne 3 ]
+then
+	head -n 11 $0
+	exit
+fi
+
+if   [ $1 == "ping" ] ; then
+	target="$2.ping"
+	MaxBytes=5000
+	AbsMax=10000
+	Unscaled=""
+	YLegend="Round Trip Time"
+	ShortLegend="ms"
+	Legend1="Maximum Round Trip Time in Milli Second"
+	Legend2="Minimum Round Trip Time in Milli Second"
+	Legend3="Maximal 5 Minute Maximum Round Trip Time"
+	Legend4="Maximal 5 Minute Minimum Round Trip Time"
+	LegendI="&nbsp;Max:"
+	LegendO="&nbsp;Min:"
+	PageTop="<H1>$3</H1><P>Actually we are measuring the ping time between our web server and $2."
+elif [ $1 == "loss" ] ; then
+	target="$2.loss"
+	PING_PROBE="$PING_PROBE -p loss/loss"
+	MaxBytes=100
+	AbsMax=101
+	Unscaled="Unscaled[$target]: dwmy"
+	YLegend="% Packet Loss"
+	ShortLegend="%"
+	Legend1="% Packet Loss"
+	Legend2="% Packet Loss"
+	Legend3="Maximal 5 Minute % Packet Loss"
+	Legend4="Maximal 5 Minute % Packet Loss"
+	LegendI="&nbsp;% loss:"
+	LegendO="&nbsp;% loss:"
+	PageTop="<H1>$3</H1><P>Actually we are packet loss between our web server and $2."
+else
+	echo "enter first argument 'ping' or 'loss'" >&2
+	head -n 11 $0
+	exit
+fi
+
+cat <<EOF
+#############################################################
+# $1 stats for $2
+# $3
+
+Title[$target]: $3
+MaxBytes[$target]: $MaxBytes
+AbsMax[$target]: $AbsMax
+Options[$target]: gauge
+Target[$target]: \`$PING_PROBE $2\`
+PageTop[$target]: $PageTop
+YLegend[$target]: $YLegend
+ShortLegend[$target]: $ShortLegend
+Legend1[$target]: $Legend1
+Legend2[$target]: $Legend2
+Legend3[$target]: $Legend3
+Legend4[$target]: $Legend4
+LegendI[$target]: $LegendI
+LegendO[$target]: $LegendO
+WithPeak[$target]: ymwd
+$Unscaled
+
+#-------------------------------------------------------------------
+
+EOF
+
+exit
+
diff --git a/net-analyzer/mrtg-ping-probe/metadata.xml b/net-analyzer/mrtg-ping-probe/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/mrtg-ping-probe/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0.ebuild b/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0.ebuild
new file mode 100644
index 000000000000..9ccb0a69e267
--- /dev/null
+++ b/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Addon mrtg contrib for stats ping/loss packets"
+SRC_URI="ftp://ftp.pwo.de/pub/pwo/mrtg/${PN}/${P}.tar.gz"
+HOMEPAGE="http://pwo.de/projects/mrtg/"
+
+KEYWORDS="~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="dev-lang/perl"
+RDEPEND="
+	${DEPEND}
+	net-analyzer/mrtg
+"
+
+src_prepare() {
+	sed -i check-ping-fmt \
+		-e 's:#!/usr/local/bin/perl -w:#!/usr/bin/perl -w:' \
+		|| die
+	sed -i mrtg-ping-probe \
+		-e 's:#!/bin/perl:#!/usr/bin/perl:' \
+		|| die
+}
+
+src_install () {
+	dodoc ChangeLog NEWS README TODO mrtg.cfg-ping
+	doman mrtg-ping-probe.1
+	dobin check-ping-fmt mrtg-ping-probe "${FILESDIR}"/mrtg-ping-cfg
+}
diff --git a/net-analyzer/mrtg/Manifest b/net-analyzer/mrtg/Manifest
new file mode 100644
index 000000000000..8ab66649826b
--- /dev/null
+++ b/net-analyzer/mrtg/Manifest
@@ -0,0 +1,8 @@
+AUX mrtg-2.17.4-socket6.patch 481 SHA256 9a369a9c383e9ea23b49b6aa687798a2639de6fac7615d4464a63c7641a373fd SHA512 d93456173c25a5858e71ededd30a6322d5a8cb2908053e1a47529774fad1e4ff0c7a9935501391f8b3dee95cda4620d1b2bd98ea67aa9a2618b22c45ce4c7026 WHIRLPOOL cfc74309eb0b0f5fa33bb411c19aa3dc125f637b82d93f416a951a0c1d55ffb42b9f76b6edd821a173b8af4aab1b4d909bf5f4d4028770463258590c5d01405a
+AUX mrtg.confd 402 SHA256 79dd4b1e389882255df41ca916300a9da510cca32cd18581907fb32fe7103f7c SHA512 18066805d2fea3090a3165a15f963310a94b4e4ee5e9fa88617eb246b1a1a4e91e3faabe4f4a2fe2ebd8f7a69acae82f1b51e3830bdab04da64f03d84c2e7e7c WHIRLPOOL 2e38514756a00fd80e7f51c1cee98c97e0a94576facfd1aeb2c3102751692ae7f36c01b32004c46ac8ec88409002fb42c690681d89be9ec64cbea4bf41fd314a
+AUX mrtg.rc 1285 SHA256 5a9db54f50b9b3b2edbcc3f286973837ec497c7903a4ddc0bf28230db20b11f1 SHA512 4885de66f6b9b65e262b1d49ac7cb3c96a29041d3055316f4db7fce4c5a5155fc4640af818f2881bf2fcd23312ff344ad0b2765e9820667fb08fbb21ee520679 WHIRLPOOL ed4cad057c802279bef2fabfc118cffb5b626c33719a6fd7503c1f7d8b62a42630f54aa0339f5ee12848a53d851c7d2371fac1c58670439c31546567c64e330c
+DIST mrtg-2.17.4.tar.gz 1096879 SHA256 5efa7fae8040159208472e5f889be5b41d8c8a2ea6b31616f0f75cc7f48d2365 SHA512 b15dac707e387714ba1a181c487894fcacbb9c2c1a1710475ebe86a11e30d758a4b44c139b42638de7fdef6616cf3112afc4e5a8c5fbf53718829673698ee110 WHIRLPOOL 125ef92077ba691c769924bab20a86e3a72f406a8ce5a7fed0342c0c03aa35d5b1ee4f0ddb6419ab892337ac38bf2ad12131b099ba9e972b08e753b61f08ff11
+EBUILD mrtg-2.17.4-r1.ebuild 839 SHA256 e5c3d5b5020abb5302b04b7e69971497df5e6ff797a7d384456577857d18ca34 SHA512 d4fdf13f873e204d5cb03539e7e37003c904edfb1653a064a7b20cc92875fe07495f202a08cf2b5b1ab88420dca7881ae776fcdb79cd9d95bf9595624b8f9fd9 WHIRLPOOL e7d9ad47cba5cb0e97eb9399fd28c1e7d20a36ddcd1647d73430ae8cdb5c1ac705fb8dcca0dafeae589940a5c7bfabb85d14b066322749485787627537c232f0
+MISC ChangeLog 2625 SHA256 8a4094dc5014b62d211229de4bd4818364f346364339ed0156f7f57c4b4e084b SHA512 c18f2419aceb053fce138219a3b66fffeab25caed9d0bcac6698c96eb2261b3bacec14d3d53390e0f72a9d4d495d4875e266085c1beb5506419e39e992ac35e0 WHIRLPOOL dd7d029e04f5bf219b3505a977f1477c33853939b766177da6477d4f7c2ac038e8a0d54301db32d28f783286956bf13bd3056955ec54a40331d418297ea984e0
+MISC ChangeLog-2015 15850 SHA256 c7d3de8faede888cde8ac3aced8cc299472849cb59e95086725704ff2b964ca3 SHA512 ceff32db5d71d85f6b9bed1544ddf1fcabdc7a898c8c76272b46a7a95970f3be00c7e76f711c49035004e7b8844254ea1645fc07f1219d8e7f4578bb9e4c245b WHIRLPOOL f88d4b72f859eb059b0c536f2be6522be3695c1393e5c5afa1a7eef8ef05d233fc32b7509e0767f616b2a0a6d4617354e6140a94b6eff75554fb4aaef254491a
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/mrtg/files/mrtg-2.17.4-socket6.patch b/net-analyzer/mrtg/files/mrtg-2.17.4-socket6.patch
new file mode 100644
index 000000000000..5540874d9a00
--- /dev/null
+++ b/net-analyzer/mrtg/files/mrtg-2.17.4-socket6.patch
@@ -0,0 +1,11 @@
+--- a/bin/mrtg
++++ b/bin/mrtg
+@@ -300,7 +300,7 @@ sub main {
+     if ($cfg{enableipv6} eq 'yes') {
+         if ( eval {local $SIG{__DIE__};require Socket; require Socket6; require IO::Socket::INET6;}) {
+             import Socket;
+-            import Socket6;
++            Socket6->import(qw(inet_pton getaddrinfo));
+             debug('base', "IPv6 libraries found, IPv6 enabled.");
+         } else {
+             warn "$NOW: WARNING: IPv6 libraries not found, IPv6 disabled.\n";
diff --git a/net-analyzer/mrtg/files/mrtg.confd b/net-analyzer/mrtg/files/mrtg.confd
new file mode 100644
index 000000000000..3164a361955d
--- /dev/null
+++ b/net-analyzer/mrtg/files/mrtg.confd
@@ -0,0 +1,16 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+MRTG_CONF="/etc/mrtg.conf"
+MRTG_PID="/var/run/mrtg.pid"
+
+# uncomment and set the following, if you'd like to run mrtg as a 
+# different user/group
+#MRTG_USER=""
+#MRTG_GROUP=""
+
+# uncomment if you'd like to enable logging
+#MRTG_LOG="/var/log/mrtg.log"
+
+# set any extra options here
+MRTG_OPTS=""
diff --git a/net-analyzer/mrtg/files/mrtg.rc b/net-analyzer/mrtg/files/mrtg.rc
new file mode 100644
index 000000000000..d1ee6861cd45
--- /dev/null
+++ b/net-analyzer/mrtg/files/mrtg.rc
@@ -0,0 +1,53 @@
+#!/sbin/openrc-run
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+    need net
+    
+    # if monitoring snmp variables on this machine:
+    # use net-snmpd
+}
+ 
+checkconfig() {
+    if [[ ! -f ${MRTG_CONF} ]] ; then
+		eerror "Please create ${MRTG_CONF} (try man cfgmaker)"
+		return 1
+	fi
+
+	mrtg --check ${MRTG_CONF}
+	return $?
+}
+
+start() {
+	# mrtg will not run if LANG=*utf8
+	# use grep instead of bash regexp for bug #159786
+	[[ "$(echo $LANG|grep -E '((^[A-Za-z0-9\_\@\-]+\.)|(^))([uU][tT][fF]-?8)$')" ]] \
+	&& LANG='C'
+
+	checkconfig || return $?
+
+	# enable logging?
+	[[ -n "${MRTG_LOG}" ]] && \
+		MRTG_OPTS="${MRTG_OPTS} --logging ${MRTG_LOG}"
+	
+	# run as a different user?
+	[[ -n "${MRTG_USER}" ]] && \
+		MRTG_OPTS="${MRTG_OPTS} --user ${MRTG_USER}"
+
+	# run as a different group?
+	[[ -n "${MRTG_GROUP}" ]] && \
+		MRTG_OPTS="${MRTG_OPTS} --group ${MRTG_GROUP}"
+
+	ebegin "Starting mrtg"
+	start-stop-daemon --start --quiet --pidfile ${MRTG_PID} --name mrtg\
+		--exec /usr/bin/mrtg -- --daemon --pid-file=${MRTG_PID} \
+		${MRTG_OPTS} ${MRTG_CONF} >/dev/null
+	eend $? "Failed to start mrtg"
+}
+
+stop() {
+	ebegin "Stopping mrtg"
+	start-stop-daemon --stop --quiet --pidfile ${MRTG_PID}
+	eend $? "Failed to stop mrtg"
+}
diff --git a/net-analyzer/mrtg/metadata.xml b/net-analyzer/mrtg/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/mrtg/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild b/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild
new file mode 100644
index 000000000000..aa3e52b338d4
--- /dev/null
+++ b/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A tool to monitor the traffic load on network-links"
+HOMEPAGE="http://oss.oetiker.ch/mrtg/"
+SRC_URI="http://oss.oetiker.ch/mrtg/pub/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86"
+IUSE="selinux"
+
+DEPEND="
+	>=dev-perl/SNMP_Session-1.13-r2
+	>=dev-perl/Socket6-0.23
+	dev-lang/perl
+	media-libs/gd[png]
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-mrtg )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-socket6.patch
+	rm ./lib/mrtg2/{SNMP_{Session,util},BER}.pm || die
+}
+
+src_install () {
+	keepdir /var/lib/mrtg
+
+	default
+
+	mv "${ED}"/usr/share/doc/{mrtg2,${PF}} || die
+
+	newinitd "${FILESDIR}/mrtg.rc" ${PN}
+	newconfd "${FILESDIR}/mrtg.confd" ${PN}
+}
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
new file mode 100644
index 000000000000..196b2b553d7c
--- /dev/null
+++ b/net-analyzer/mtr/Manifest
@@ -0,0 +1,13 @@
+AUX mtr-0.80-impl-dec.patch 226 SHA256 55f7f19bb3718ee18b25be15e2a85e432d2c5d044571f3a08d3b117b0fed7c4c SHA512 71c53c22f4ff99b29cd71f4e910e857ea0f4f497d25dcd59295ca2b59eb7be40d021d865489a53234d5fa4395f6baf011073d117653ad82aef78562a60898b1c WHIRLPOOL b9816c9b0b78c2d71be696b40aef762eab7006ff04e0efde7f0a03dd2cd0bdd0f157d71ecb5ac143fa8e24fbda7dbe88db2bceccfbdaa2d8ab970203ff25a50a
+AUX mtr-0.87-ipv6.patch 1846 SHA256 1645b34d2db0ad56af5b59a78874e01e1ad04c77459111a4f85a700266ffae0d SHA512 07a43b798b30893583fb08e7e65a6833ece98f18656f6a31e7e61acd1f582d68d35b63d5aada4175d5df2451cbd856370e85f514e1ee8447ada9a91a83af1345 WHIRLPOOL be39f44bf454bb357595c03412deaf4202090162899b700d0a81c80f0b00df52e2aeeb78e0715b004060c41fc881310f6ac52ab79689ade12a41efffac7f553e
+AUX mtr-0.87-tinfo.patch 380 SHA256 d579470b58c2da6440823dc9f620cc3b09912ec7777c25aba4d0cc9fec743c03 SHA512 91442d319840620273c712e7668d8895a28a10615afa4e06a16a3f86c2dc319a9484c7a8b92a8ad7de97f56c52b881a230ebd3fe59e45a7a4df85fcd77c74229 WHIRLPOOL cdbcf99f2d2dd69def67c67e55f8582095e1387c28c87d085772ce1ab07cf0d251994449996b636f75901dbb66a21c6ebce7ef1d29c398a0c5e1f8700927357c
+AUX mtr-0.88-tinfo.patch 450 SHA256 de8d78b90147858d4a13d4061d9cea7597fe1e27a7a4f2adff20133381a5317b SHA512 996905be6f96f71a742d3a00c0a5c6730b69709f50db4132284e12030dd80929ed838f7a7a94bf3634698bd17234a1324a84f81a5dfe5f4a71ab70e9f8f294aa WHIRLPOOL 42ea7b3ad78d2e33887960fa52f3f9dd338d1f8a1a21c7741977162349f81f7c7110b12fe0808003aebb711e443247fcc392d9b24a1e329160f22d9c8adaa884
+DIST gtk-2.0-for-mtr.m4.bz2 2508 SHA256 59152f9a4a1af5cf09f2aaa804c9071afe3eb6632162f1660d85c820db342eba SHA512 0f593b761d7a9399469f1f7bb3992133b391a2ce760ecfad96237561992802c192b810f4722763685d5f6e7a76bd2806abf08e1850bdce00e5cd3af4c810210f WHIRLPOOL 8bfa2cd70c2aba06473692cdf3e091a983aab69cdb5be3d0382b6b87c05bcc577ecb1afab26afc17ee16d07a1161fe84f17e3cc9ae0a150364f34667cfba5779
+DIST mtr-0.87.tar.gz 184645 SHA256 193947c61d23b154c8dc03677e90e8fd912f8f18567ab76ce619b7856c4af19f SHA512 172ba2f78a6ee4deb427ac2fb00dff16843215dbd23663fbe41fcc957ffe278b408a73a0c7e1c05788b235e2d03fb53f9971b8b82d4de2f95edcaa9f2cff3cf9 WHIRLPOOL 39fc9b60c1eccfdb1159a184f7089f13d1a8fbc35f16b7c23b746f3da709894f99571a57ef3431ca601112691c0e693b86a9941ed20bc236d2630f282e43d641
+DIST mtr-0.92.tar.gz 296430 SHA256 f2979db9e2f41aa8e6574e7771767c9afe111d9213814eb47f5e1e71876e4382 SHA512 d362a418b6c17fd2d08da1ed9e033fa3330e4c0497e1bb0644f6193d23f4e20dd8ee181942c2a20ec0025a8b96c521394a21be5a1d9036f8a0a8c4cddfbe381f WHIRLPOOL 6ee3bfa8be5d214bdd063d9ab7c8f17cc08cab0492cb3292a3869360e2d97a90fb238af8e22d775b66467e8aa564cadb13b2d35af8a694629be555c684c77901
+EBUILD mtr-0.87.ebuild 1160 SHA256 e8929a88c32c4489355470535079ed6e9d809ec2237375c2cd8fc4d8cffef8eb SHA512 93f02f5f2f477f5aeef30fcdf9d589870af55b7076989be6cfd00513796acef1657a0f92558d97807fdfc70764da7b61a8c8f3dd67cdf73e7f9d417ee5fe5e82 WHIRLPOOL 0b688592c8e35fbf4aa4e3b7669cec9e3cdf684ad0d63453bedd98d954681f8106c87e92be047c22659c7463e599d3d6f3e606c92c8ac4bddf1a6295f52d232e
+EBUILD mtr-0.92-r1.ebuild 1428 SHA256 35f78c4c4d59ea7d53759ce0325103092412b3add45687442fc9c74e3bdda793 SHA512 b7dd855dfe63c4d069150cc2c78faad630dfc11e02afa5f9d1262df8ad35cc9d43602f7ca3721ce421285fb40ca362df35a196560726d0f1ca78262388b16ea4 WHIRLPOOL 24f28e77a2e1a5f771702a37ae054731db199b76bd3c1347f5690bb8656a199ff751364e20359029650b77b49da1f1de0ef26e3b3e36f0ec96b0795ec6e60f9f
+EBUILD mtr-9999.ebuild 1585 SHA256 15b461d10590c12e44c7ff74faf141d553f7c7a5fe4d34b34d2fcd9ef1b44256 SHA512 798aadffb0af237a0b94b8b7993b42584dbe416edead6df07c23fdf06a98ba67ddf24e08d0443d8bd73340ae13a60daeb821d397ada4531220cfda3758370009 WHIRLPOOL 89fb1760bcb3c01acb916566c9bca848e77c15541eefc69e27aa067c440b9ade6edcf2be864a1813a5abeba63eb2fa4d5584a273f65ee97b39f4d560d7157d93
+MISC ChangeLog 4414 SHA256 dfee5a09e77642cd39940458eb72c86486f1b85b76a5434add1cd05fe8f46cdd SHA512 4485fc53f5a60db65361998c63b78a016980fe5def35dac149e64f9e54df819c0f18240c2a5023ff0f6222aec714fec746a09e16d06624b9cf795685192b819e WHIRLPOOL 31cc9fb641b7153dffd5fcf061c4f4e4af4e0809e4a28630c0d855f9d15dd1ba8391a71ed21c669448b87643ea22d8766be4770d5683d7b40b734bfc8ba36c8d
+MISC ChangeLog-2015 20485 SHA256 19bed290fa24af5fe19a2b078a86aa870b706d7abdf878b355476407712c16c9 SHA512 c30bc86be3fee9753e10b4f8887b275fe9631b49bc919683c69595c4f80627796468f1c0146aa52616aa75fa427e358dd02583a9bf8151be4a43b1c991beabe2 WHIRLPOOL 0b997c80bc51885c9a73d8dcaacae22551b33c81db9534fef18e912bfad30d7be2b5648cc452d3193fd0ec1b9b3c151b4d28f83ae68680592693a62a3dcdab81
+MISC metadata.xml 280 SHA256 b04c5b9d91f6c4d6e36583488fd032751034d1e035085609c9bdf7677cf1e83f SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef WHIRLPOOL 6f3756b9ac748acccb6ac5a4de133cf93988e8c904f606376fecbb6a21ce038e86437fecca43b2521538da2570d33ff1a6a1e0cab290a3d71a9b4f2734f16328
diff --git a/net-analyzer/mtr/files/mtr-0.80-impl-dec.patch b/net-analyzer/mtr/files/mtr-0.80-impl-dec.patch
new file mode 100644
index 000000000000..5b41a54c744b
--- /dev/null
+++ b/net-analyzer/mtr/files/mtr-0.80-impl-dec.patch
@@ -0,0 +1,12 @@
+diff --git a/gtk.c b/gtk.c
+index e42f4f6..333d7c8 100644
+--- a/gtk.c
++++ b/gtk.c
+@@ -24,6 +24,7 @@
+ #include <unistd.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
++#include <string.h>
+ 
+ #ifndef NO_GTK
+ #include <stdio.h>
diff --git a/net-analyzer/mtr/files/mtr-0.87-ipv6.patch b/net-analyzer/mtr/files/mtr-0.87-ipv6.patch
new file mode 100644
index 000000000000..32a62853387c
--- /dev/null
+++ b/net-analyzer/mtr/files/mtr-0.87-ipv6.patch
@@ -0,0 +1,59 @@
+--- a/net.c
++++ b/net.c
+@@ -320,9 +320,13 @@
+   struct sockaddr_storage local;
+   struct sockaddr_storage remote;
+   struct sockaddr_in *local4 = (struct sockaddr_in *) &local;
++#ifdef ENABLE_IPV6
+   struct sockaddr_in6 *local6 = (struct sockaddr_in6 *) &local;
++#endif
+   struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote;
++#ifdef ENABLE_IPV6
+   struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote;
++#endif
+   socklen_t len;
+ 
+   ttl = index + 1;
+@@ -437,9 +441,13 @@
+   struct sockaddr_storage local;
+   struct sockaddr_storage remote;
+   struct sockaddr_in *local4 = (struct sockaddr_in *) &local;
++#ifdef ENABLE_IPV6
+   struct sockaddr_in6 *local6 = (struct sockaddr_in6 *) &local;
++#endif
+   struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote;
++#ifdef ENABLE_IPV6
+   struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote;
++#endif
+   socklen_t len;
+ 
+   ttl = index + 1;
+@@ -726,8 +734,12 @@
+ 
+   /* sendto() assumes packet length includes the IPv4 header but not the 
+      IPv6 header. */
++#ifdef ENABLE_IPV6
+   spacketsize = abs(packetsize)	-
+ 		( ( af == AF_INET ) ? 0 : sizeof (struct ip6_hdr) );
++#else
++  spacketsize = abs(packetsize);
++#endif
+   rv = sendto(sendsock, packet, spacketsize, 0, remotesockaddr, salen);
+   if (first && (rv < 0) && ((errno == EINVAL) || (errno == EMSGSIZE))) {
+     /* Try the first packet again using host byte order. */
+@@ -1535,11 +1547,15 @@
+   struct sockaddr_in name_struct;
+ #endif
+   struct sockaddr_in *  sa4;
++#ifdef ENABLE_IPV6
+   struct sockaddr_in6 * sa6;
++#endif
+   struct sockaddr * name = (struct sockaddr *) &name_struct;
+   struct sockaddr_storage remote;
+   struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote;
++#ifdef ENABLE_IPV6
+   struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote;
++#endif
+   socklen_t len;
+   int s;
+ 
diff --git a/net-analyzer/mtr/files/mtr-0.87-tinfo.patch b/net-analyzer/mtr/files/mtr-0.87-tinfo.patch
new file mode 100644
index 000000000000..4dbdef1cc2fb
--- /dev/null
+++ b/net-analyzer/mtr/files/mtr-0.87-tinfo.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,6 +25,8 @@
+   AC_DEFINE(NO_CURSES, 1, [Define if you don't have the curses libraries available.])
+   CURSES_OBJ=)
+ 
++AC_SEARCH_LIBS(raw, [ncurses curses cursesX tinfo])
++
+ AC_CHECK_LIB(ncurses, use_default_colors, 
+   AC_DEFINE(HAVE_USE_DEFAULT_COLORS, 1, [Define this if your curses library has the use_default_colors() command.]))
+ 
diff --git a/net-analyzer/mtr/files/mtr-0.88-tinfo.patch b/net-analyzer/mtr/files/mtr-0.88-tinfo.patch
new file mode 100644
index 000000000000..c7252b74435e
--- /dev/null
+++ b/net-analyzer/mtr/files/mtr-0.88-tinfo.patch
@@ -0,0 +1,13 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -101,7 +101,10 @@
+   # (On Solaris 11.3, ncurses builds and links for us, but curses does not.)
+   [AC_SEARCH_LIBS(
+     [initscr], [ncurses curses],
++  [AC_SEARCH_LIBS(
++    [raw], [ncurses curses cursesX tinfo],
+     [AC_DEFINE([HAVE_CURSES], [1], [Define if a curses library available])],
++    [with_ncurses=no])],
+     [with_ncurses=no])
+ ])
+ AM_CONDITIONAL([WITH_CURSES], [test "x$with_ncurses" = xyes])
diff --git a/net-analyzer/mtr/metadata.xml b/net-analyzer/mtr/metadata.xml
new file mode 100644
index 000000000000..2c2a7923cfc8
--- /dev/null
+++ b/net-analyzer/mtr/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/mtr/mtr-0.87.ebuild b/net-analyzer/mtr/mtr-0.87.ebuild
new file mode 100644
index 000000000000..e81c2db77623
--- /dev/null
+++ b/net-analyzer/mtr/mtr-0.87.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils fcaps flag-o-matic
+
+DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
+HOMEPAGE="http://www.bitwizard.nl/mtr/"
+SRC_URI="ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="gtk ipv6"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gtk+:2
+	)
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/autoconf
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS FORMATS NEWS README SECURITY TODO )
+FILECAPS=( cap_net_raw /usr/sbin/mtr )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.80-impl-dec.patch
+	"${FILESDIR}"/${PN}-0.87-ipv6.patch
+	"${FILESDIR}"/${PN}-0.87-tinfo.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# In the source's configure script -lresolv is commented out. Apparently it
+	# is needed for 64bit macos still.
+	[[ ${CHOST} == *-darwin* ]] && append-libs -lresolv
+
+	econf \
+		$(use_enable ipv6) \
+		$(use_with gtk) \
+		--disable-gtktest
+}
diff --git a/net-analyzer/mtr/mtr-0.92-r1.ebuild b/net-analyzer/mtr/mtr-0.92-r1.ebuild
new file mode 100644
index 000000000000..ea48af37e69d
--- /dev/null
+++ b/net-analyzer/mtr/mtr-0.92-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils fcaps flag-o-matic
+
+DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
+HOMEPAGE="http://www.bitwizard.nl/mtr/"
+SRC_URI="ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="gtk ipv6 ncurses"
+
+RDEPEND="
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gtk+:2
+	)
+	ncurses? ( sys-libs/ncurses:0= )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/autoconf
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS FORMATS NEWS README SECURITY TODO )
+FILECAPS=( cap_net_raw usr/sbin/mtr-packet )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.88-tinfo.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# In the source's configure script -lresolv is commented out. Apparently it
+	# is needed for 64bit macos still.
+	[[ ${CHOST} == *-darwin* ]] && append-libs -lresolv
+	econf \
+		$(use_enable ipv6) \
+		$(use_with gtk) \
+		$(use_with ncurses)
+}
+
+src_test() {
+	[[ "$UID" = 0 ]] && default
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
+		ewarn "mtr needs root privileges to run.  To grant them:"
+		ewarn " % sudo chown root ${EPREFIX}/usr/sbin/mtr"
+		ewarn " % sudo chmod u+s ${EPREFIX}/usr/sbin/mtr"
+	fi
+}
diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-9999.ebuild
new file mode 100644
index 000000000000..3a1ec3b3a684
--- /dev/null
+++ b/net-analyzer/mtr/mtr-9999.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils fcaps flag-o-matic git-r3
+
+DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
+HOMEPAGE="http://www.bitwizard.nl/mtr/"
+EGIT_REPO_URI="https://github.com/traviscross/mtr.git"
+SRC_URI="mirror://gentoo/gtk-2.0-for-mtr.m4.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="gtk ipv6 ncurses"
+
+RDEPEND="
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gtk+:2
+	)
+	ncurses? ( sys-libs/ncurses:0= )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/autoconf
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS FORMATS NEWS README SECURITY TODO )
+FILECAPS=( cap_net_raw usr/sbin/mtr-packet )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.88-tinfo.patch
+)
+
+src_unpack() {
+	git-r3_src_unpack
+	unpack ${A}
+}
+
+src_prepare() {
+	# Keep this comment and following mv, even in case ebuild does not need
+	# it: kept gtk-2.0.m4 in SRC_URI but you'll have to mv it before autoreconf
+	mv "${WORKDIR}"/gtk-2.0-for-mtr.m4 gtk-2.0.m4 || die #222909
+
+	default
+
+	AT_M4DIR="." eautoreconf
+}
+
+src_configure() {
+	# In the source's configure script -lresolv is commented out. Apparently it
+	# is still needed for 64-bit MacOS.
+	[[ ${CHOST} == *-darwin* ]] && append-libs -lresolv
+	econf \
+		$(use_enable ipv6) \
+		$(use_with gtk) \
+		$(use_with ncurses)
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
+		ewarn "mtr needs root privileges to run.  To grant them:"
+		ewarn " % sudo chown root ${EPREFIX}/usr/sbin/mtr"
+		ewarn " % sudo chmod u+s ${EPREFIX}/usr/sbin/mtr"
+	fi
+}
diff --git a/net-analyzer/multimon-ng/Manifest b/net-analyzer/multimon-ng/Manifest
new file mode 100644
index 000000000000..3aaae3c22c3d
--- /dev/null
+++ b/net-analyzer/multimon-ng/Manifest
@@ -0,0 +1,6 @@
+DIST multimon-ng-1.0.0.tar.gz 67095 SHA256 521bad293288c0c7c0c1934a36d54c6ea87f0557b197920ff32a2782627e132b SHA512 0fa475c7908bc24a9558c5a7e0aa4737fca117ff323a012b4316ad02840eb97f917a02d1daec50645729c2ca834068467ddc409cbc36af9cd5ffb9e8f6e5e3e9 WHIRLPOOL bb560c0329e61b171e8110f5fd13fde0273b64f2b44e40d5785ee163a604719845a3b38a190399187d31ebab08206c327b906aa073529aa8afc11176d46c1be7
+EBUILD multimon-ng-1.0.0-r1.ebuild 875 SHA256 a8aa37db21c48c09d6b8242c22296ebec97344a48d5e6f7336e2608e02e0a90e SHA512 4e0a8294293c3b33bf1c90ab0157d8d2e33e32286531e12fa5dd54e414fd27e00177a9dcfcb3ea10a3dc1e5d9fe348105e67928f7db7c8172fe00275feef32b3 WHIRLPOOL aaf8b0ff7ef0c317df7571237a2ac01fe327b08318bfa9f916fe79dfcf27636b4b2231cff7be95e1b1c1f70fa4315c7d1a1679052d76adc9c6e73d5fe6636b20
+EBUILD multimon-ng-9999.ebuild 875 SHA256 a8aa37db21c48c09d6b8242c22296ebec97344a48d5e6f7336e2608e02e0a90e SHA512 4e0a8294293c3b33bf1c90ab0157d8d2e33e32286531e12fa5dd54e414fd27e00177a9dcfcb3ea10a3dc1e5d9fe348105e67928f7db7c8172fe00275feef32b3 WHIRLPOOL aaf8b0ff7ef0c317df7571237a2ac01fe327b08318bfa9f916fe79dfcf27636b4b2231cff7be95e1b1c1f70fa4315c7d1a1679052d76adc9c6e73d5fe6636b20
+MISC ChangeLog 2507 SHA256 8c363a2775e95631657b8f7f26506e8509fa37917ee9934ede51fea43c2653ed SHA512 4563c1905fa22f20d53489c43a4f70ca8df9523a49091f9a2b0ef5f0ba58d97d8171de7ff1837e6258940b8c1849628228eaab00e38232732d6b05bdae60c9c0 WHIRLPOOL 21bd8a55cc97923fd0554862721951ad96c44b75a2f8a371fcb463d0831bdb2ba2c9b766d8c06a4d14b261ab7dd9f4b40b4ad92862dd82e8226ff1d634b5325b
+MISC ChangeLog-2015 1265 SHA256 14e5dfeda3faf23aea77ceda996bcf8be596c8ba1f9c0dab4cd3f57bf1ff15d5 SHA512 0bd662b0231e406c237156d2a0d24f92e57923692a5978eafb56b11dcbb8872f7ecaf0b1cf50492c29f7363a4fc7e6fd0b6857a56dd7c5a3d75b4da87e73c69b WHIRLPOOL e87fe2b5b93d950ffbfc3c20b2b737632d0d185f311da0a808ecf8c0c68c0cdd2e660bb8aba708a239c2f296db742de9b9aa85293c5e36bb7675c897a5bfd526
+MISC metadata.xml 432 SHA256 9317d6317afce54c663080889361c3dbb84462d15d6d9a6e928f49f37271ac58 SHA512 f61a6ec965782d81ba149cd16df61d7334a8775a2624ba38408e7ca9660df9d69e40817eecfd17db5b819a68e178648ed440e69278223665e51c98a7c2535230 WHIRLPOOL b055f893d2a1354840acd9c9f7fb8b397495cbe1952c5eb58f2571b98cdeedc2fe30888db5c2df6bfe476c1efe2c8fdc7e60e074d682e59e25d567c927b6b187
diff --git a/net-analyzer/multimon-ng/metadata.xml b/net-analyzer/multimon-ng/metadata.xml
new file mode 100644
index 000000000000..e2d083399d83
--- /dev/null
+++ b/net-analyzer/multimon-ng/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">EliasOenal/multimonNG</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/multimon-ng/multimon-ng-1.0.0-r1.ebuild b/net-analyzer/multimon-ng/multimon-ng-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..6ba3057182a6
--- /dev/null
+++ b/net-analyzer/multimon-ng/multimon-ng-1.0.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit qt4-r2
+
+DESCRIPTION="a fork of multimon, decodes multiple digital transmission modes"
+HOMEPAGE="https://github.com/EliasOenal/multimonNG"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/EliasOenal/multimonNG.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/EliasOenal/multimonNG/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/multimonNG-${PV}
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="pulseaudio"
+
+DEPEND="pulseaudio? ( media-sound/pulseaudio )
+	dev-qt/qtcore:4
+	x11-libs/libX11"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	if use !pulseaudio; then
+		sed -i -e 's/-lpulse-simple//' -e 's/-lpulse//' -e 's/PULSE/DUMMY/' ${PN}.pro || die
+	fi
+	qt4-r2_src_prepare
+}
+src_install() {
+	dobin ${PN}
+}
diff --git a/net-analyzer/multimon-ng/multimon-ng-9999.ebuild b/net-analyzer/multimon-ng/multimon-ng-9999.ebuild
new file mode 100644
index 000000000000..6ba3057182a6
--- /dev/null
+++ b/net-analyzer/multimon-ng/multimon-ng-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit qt4-r2
+
+DESCRIPTION="a fork of multimon, decodes multiple digital transmission modes"
+HOMEPAGE="https://github.com/EliasOenal/multimonNG"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/EliasOenal/multimonNG.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/EliasOenal/multimonNG/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/multimonNG-${PV}
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="pulseaudio"
+
+DEPEND="pulseaudio? ( media-sound/pulseaudio )
+	dev-qt/qtcore:4
+	x11-libs/libX11"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	if use !pulseaudio; then
+		sed -i -e 's/-lpulse-simple//' -e 's/-lpulse//' -e 's/PULSE/DUMMY/' ${PN}.pro || die
+	fi
+	qt4-r2_src_prepare
+}
+src_install() {
+	dobin ${PN}
+}
diff --git a/net-analyzer/munin-plugins-zfs/Manifest b/net-analyzer/munin-plugins-zfs/Manifest
new file mode 100644
index 000000000000..bbac7e9d7f50
--- /dev/null
+++ b/net-analyzer/munin-plugins-zfs/Manifest
@@ -0,0 +1,3 @@
+DIST munin-plugins-zfs-0.20170127.tar.gz 2482 SHA256 84243ea49f14fc046b8188a8057b0f27c182dd670532f0387f757c9206163cfa SHA512 9b7842c6945865be058f7c00a5ffcdd8fb8c50aa1775f5196ce25ffc33b527b0c8d5c42aa7dc21ff81fd4aac16c9c1084c31af44192fe64b6a2fbcd2ccc4bbee WHIRLPOOL a7b58f00dd3edc177d2ebec7d88d4e3925c08a2172503bcc8b2b3fe8211d8813a77bf6ae03a3c90f576b623333d740debf2f1834d7209240000e33c48539c7f3
+EBUILD munin-plugins-zfs-0.20170127.ebuild 617 SHA256 b37a963dc48683830c42266ed9582504a3166b61547599fc7f57b2c0754db4f4 SHA512 dff7144ef6a91e84d8835989caec2bada175d9cc68055351b47b55d29ed29d52a8d5984061d981f2835413424ee404fbcbd56411f7cc6df847dd2946ad163ada WHIRLPOOL 5d333fa993c559e68f9ae8439ce20f53b8af4a326b01e1f9650320b1c8f23ed1240088e4cb5e10a5c35fe50b579efb1a975375c369d42aacb64848227faa965c
+MISC metadata.xml 308 SHA256 7aa6fa8dbb7877b4b505164d63871ab5bed544ce8dc399b65fc9ebafe29f70f6 SHA512 dbd2282c95767e2231c8fabb3871c5ff34f33d8b0e6ca2dee8e581b844993361029259f6b82016ebc8957bcd7725f324266235266a5b07fbac5640f9a7d8b887 WHIRLPOOL bba305959dc23ad3bf4282f7bf8c4b74d907e0ae900d298a97fd6b6a29e65d4505c31ae04b954412583073c7355aaf303b1b91fd0186c11e1654bd3393c4216a
diff --git a/net-analyzer/munin-plugins-zfs/metadata.xml b/net-analyzer/munin-plugins-zfs/metadata.xml
new file mode 100644
index 000000000000..b1859d9d69c6
--- /dev/null
+++ b/net-analyzer/munin-plugins-zfs/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>graaff@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">alexclear/ZoL-munin-plugin</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/munin-plugins-zfs/munin-plugins-zfs-0.20170127.ebuild b/net-analyzer/munin-plugins-zfs/munin-plugins-zfs-0.20170127.ebuild
new file mode 100644
index 000000000000..e552781d0f00
--- /dev/null
+++ b/net-analyzer/munin-plugins-zfs/munin-plugins-zfs-0.20170127.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT="385f9e4cda592ace95b47c69db76553bcb6a42d6"
+
+DESCRIPTION="A Munin plugin for monitoring ZFS on Linux"
+HOMEPAGE="https://github.com/alexclear/ZoL-munin-plugin"
+SRC_URI="https://github.com/alexclear/ZoL-munin-plugin/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/ZoL-munin-plugin-${COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="net-analyzer/munin"
+RDEPEND="${DEPEND}
+	sys-devel/bc
+
+"
+
+src_install() {
+	dodoc README.md
+
+	exeinto /usr/libexec/munin/plugins
+	doexe zfs_stats_
+}
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
new file mode 100644
index 000000000000..3fa6b4ecc510
--- /dev/null
+++ b/net-analyzer/munin/Manifest
@@ -0,0 +1,25 @@
+AUX logrotate.d-munin.2 532 SHA256 3b2597a52a2dc6b49099be6ab9c685be2ea09ed136666c2c1d56af1883fe4378 SHA512 25cd3017c9edcf07ac8e54b75a7b881255a4043cbe6c5f99320aa87cea00118be03010d9b76e5c214eeac82ebc4e4d3807474c5d112bff23d83238e7650d6563 WHIRLPOOL bc956e4454887cc1f102eb4ac0a563b5317acf9cd83a76b1bf379b2cd06e5518878aded99be04e7c03d79bcda02265864d3b83e65afef76a19da81464154937f
+AUX logrotate.d-munin.3 647 SHA256 07059049fd24b261142203e78c217bd037d6ba4d666bcf29c58fcdd3f49de953 SHA512 14ec0363b561695ae58db95e8d6fc68d7161805cfa0002001ec60566d0b22cc6103ae949de12715dc646131d692e023735895007c04807940c6d1a22de342302 WHIRLPOOL 49b8b65f89c208ae6ef7ed4f7750a9d74d9b5e5d76d1489859e72fdcba66380d7cd34abb0f9d21ded4a991f132aa449bbdb13b60a255e4e2b15e361472f3fffc
+AUX munin-1.3.2-plugins.conf 1760 SHA256 50d99bb4612ce0a7be79991c064ab16a833b3312afd8bafc6b9ab13a1ba79e75 SHA512 c3498c4364cedd27016562568f918995be92dd6b3c2735ddd008190de0a729f8ea59e61f8517f6f48beaad14edb349af7476a39f55d246ab06d6cbe91679565f WHIRLPOOL 2accb14a5a72ba89c9559358d3889c1f8c6980c348b8394c0df7faf13bfeeb550b664e8746f8b3fbfdc64ade5d0cb0cdf7b083aeda629b2c93e34e36e78d7efd
+AUX munin-2.0.33-perl526.patch 849 SHA256 baafc45d3b7f5397af02c44b5dc81cc19566d3183c716c194b5f852e96001431 SHA512 b20e6b7de057ea88cfe5420fe79520d1fbb23cfdf961096c355c6bd48384b6d78a74b7545e8ded47374eeb5b884f54b39556abf950577e025d8221f69ef43789 WHIRLPOOL 0564927117e44b33c559645ea2759301f46afd69f2fad4434809e73fca248d6c07e3c530f06740306a42a09d971f0cc7def321c7c39cc19bdc452368a46edbe6
+AUX munin-async.service 201 SHA256 e2638eb1d78316dbd8e00b5c5aa233ed9b6b3e80fba97d96531b11f96600d67c SHA512 55a99866cb9ff50723a223b8a45b418f13ed754b6ca919260af8312a323aad432aca047724a5e32f6aee2f8f541ae829bf6bfdf19d22e7543ef2e5a7b9cd9d6a WHIRLPOOL ac9f5b9a74d7b10851f0c2b2020201960472c239f66fa4b4f34a2718d99f52103ae2508f3ea18592365c9c1d3ce16e2e9c4dc16475c0f66226b0019170da56e2
+AUX munin-asyncd.init.2 452 SHA256 1c2206850827aadcd1441e80e73269db31c3d0d1c38ff9c86568cc71be379252 SHA512 5d2ca928ea953e5fec8451dca218165f2c058c6d57519fea65e94148c0dff5ca0a06a2a22b09f416e375e825463d4d2a7c1a424c60051fdb4fa0d79af9463c26 WHIRLPOOL bc9e09b2a25060d1a7a13328cb3a714f76a6e6221308a0fed1b609bb1d31b74f7b2626ec539e2dedb79e7e1dd8441274ea72b2b63f0ddbd302ce11c51e7092dd
+AUX munin-graph.service 208 SHA256 5ab905477bc531661a32fa6eff7f1ccc629451b2f4dd8b194246c4f7aa1cbdf3 SHA512 3c0ea1cbcaacca02d2e36dbe0dbf02a553ce899db253510a17cbdd1a21275556101117f5d2701bd5519a8813c9ae022465c7fe89fa6000c857ca09c6aed6989c WHIRLPOOL 5a0e928cfb169a1d8a4bad3de9b001ee4dddc0d3e85416a074b9786713752586fcb5ae01b53d218428a06df51416d9f4409d9c8e58f663fdb6e94e8c6ba2593d
+AUX munin-graph.socket 131 SHA256 6fc45060633d243212a9be6cedfd31cc8cbd4001398006650e6754af235ab373 SHA512 b63bc777330b5beafedcaf759d6de1809b0daaea2a811b2138a7bbd0afec7f3f03204674be00d0aae845f30cb09b5d0fb72c46a77be0f6746d6f7dcea061c3ef WHIRLPOOL 904448bc360fe5a2aa0e8a1e90863e2141138957132bf8b1d44e5ddc4b1b328ea4c7dd2777b165d81c51bb92d1682d7518a3cd7a81c42f2cfe9ba5e7aa0e2ad0
+AUX munin-html.service 205 SHA256 73b2f164ccfcd6ff5dba21b33c5ddf3224749c8a511f0a19bc1bb2a6ce2104a7 SHA512 dde77279c0804d7cb83333dafbb2afe5c5231c25fc6c3ce31d0a6711325643ee6a9fc44b1a62accd9cec8bc12077e562adfcf2efbe2667b25ff72145fe1cc472 WHIRLPOOL 0520dec6f7dfae287efc5bb9d5f2c44bc69d7570c9cccd524eebe96bb3449aff545a5a86888249cf3896844c8f92c770ddd822463e9b02289f0c48f78f80a2b2
+AUX munin-html.socket 129 SHA256 42f6f59b449805aec47f151e47125298aee575dcaf2caf56008220d1c22c9ce1 SHA512 d970f77be6a45b8dfc8c22fd80442d90620663bb36b0368bc5f0b36af3300b15b36f08b824eb7550d047bcc31599346f9ed45950fe98ca70ddd7982c4ecd0e9a WHIRLPOOL 809c4dbbe149e0a02cb5344a0cdef139e4c303830767889443668c778e9bc4c607d0f1a73cbce7e948a6256bbd52a96646b42dbbe8ca043e4111c160f8f66428
+AUX munin-node.service 194 SHA256 497f3e4990908f56e3834961c08161675029a945936a96d2d411b971f4bce7b3 SHA512 e7586afed85e67de04494353dbc9a3008e6246a158ddb66634c799c64bd8ea991a153b45c050934edde18cd7ac0828d1961acd3a1ddc9dc6b088cb95f0ea7a1b WHIRLPOOL c827a54da2691e5c61c87117934e6926d9eedb10c256e9514dce90f17d67c1a6f0785a536e03f983919590b17b9867b09c5634f66e0fd40c62cbf444dbda3a48
+AUX munin-node_conf.d_1.4.6-r2 188 SHA256 4188fed9f8f72687f7b625caddac35fac19f2b3bb461e032effc70040b9973cb SHA512 f6b4b198a219ab4706aea3820ac36932bdb807abb7f42447cc36afe140e15a04e65d5daa44843aaedf1ecfa2f040a373687ddea4f94a55d104492e640c313152 WHIRLPOOL 69b1d95b70844a87347502b0de9d2b33cf7ef3b5d3769d0f978c934caa5ae1a49030b300a62e39880fc406355fb68421f4acd7ebb54f5d9df62b4408e1a9eaa1
+AUX munin-node_init.d_2.0.19 598 SHA256 989d65a5b617c8a02e66e57c9ab1e07f235cfe0dac659893dc0b0e53572b2de9 SHA512 c2429156972e6db9c75160dcb3419ea67a59801a70e4a13a07899ebea84db079d1efcbeb653e2abea3212fa7cfb96a35ff020daf4918d8fe2839b670ea63b31b WHIRLPOOL 0f9b048dd27ae54f6414b65f5d6d8adde7be5b8df8322f9f3c1bab973eb1c32ad6b0bc92f7eb282de7e047d4225fb14076d9f0891912511e93d667085bee7a79
+AUX munin-node_init.d_2.0.7 745 SHA256 c115a783591cb997c7b9bd99aaf4b5f16a11c2ece6a1296c6b0da38d0a0512b7 SHA512 e6652707c539afef01e7cd777acec2c639edf66fb9bf1f126711d19f166eb3ef69d5ed8e895e77e4fb0b7f5a4c8788eb6532f4e09d13693d164e6edbde55e5d0 WHIRLPOOL f1a2786f1eb67cbae9996117d2397b0e545626fc4c5b49f1efa7afcf4144272b394beb54102aa15f133b0f0c3d6112aad9abdd49ba2e76b897a047afa4a1f7e5
+AUX munin.apache.include 604 SHA256 5051ff79220e5ef578e6e5fa66ef8b0a71b72cca6fde93264cf371585f56cb52 SHA512 de4797ccac5c9299dd55140300276f746febf3ac5bfebfc48901ca71fa0e035017917eba054b251cc2383c65f1e209e244906b34eebad237f43a7bd7171f6087 WHIRLPOOL 5adfbcc61a3e5f7b6bec7396ca72bf24fd59406ee2a49ac47dc81dfff2eef98e688b6fa6699a9095f34943dd7df2ee1f392e1f7a9c1572dc0505d2439a836c5c
+AUX munin.apache.include-2.4 577 SHA256 21245e9eb7b759d2d2e65c2d1424da6d8c6fd8f49ec2f30cf72696cfc4227694 SHA512 b07791a4d5b822b5d0ad84ddbea3444cc1475cee8ee20f62dbb5f3a1792b71dba995e412433d30b3c295e40ad5346528d25e04438ec2dfa535983aae9198cea4 WHIRLPOOL 90a166f400e8336792fabcbcb786169dc5ed6b5fe9151ac5aef40f85c8d3f2724a6fffe17e41d90f31948a9462fc619fe45747caf8f62d55f6d494d48a7a2bb1
+DIST munin-2.0.33-gentoo-1.tar.xz 11024 SHA256 f956d9051e0da05231bb8777c0ca3342ca5bb86e48c44a68289c41c42c440e46 SHA512 c1f49f01fd641e157145d9710a091696c09380887a374ee845e516d40384ee6bc576019f3510ac322436b1f10ee1b675ae512b9f677a6a0fa2ef022cbb7269b8 WHIRLPOOL 3c0fbccc4c8ee9a2dacf8ce1845d149198c8d53ed17cd62fd17bae60986ca6616e12213d4f520fd06e8329accec559a7f9529559f21dc62de3aa0b66680d7ab7
+DIST munin-2.0.33-gentoo-2.tar.xz 11288 SHA256 a7cc6b060cc1344c9b40278a960ab8fa6848e5db53f8665a952fb602ab0c0c55 SHA512 4d185529199377e85fb3e7d0a8c38de2ae500d2f992292e6ae016d11e81642833725987ac006b5f535963593c7698c676d28091805691e8b46c016fc2580917d WHIRLPOOL 98d2916c10adf554ab1672c602271673cb6dea7ae72fb7849b1bdf16d6f63c6f330def1f4a3cb62fd1fab4e888b2dede2807cde9a7907058f37a0f87a8b67a6b
+DIST munin-2.0.33.tar.gz 1349546 SHA256 99dbc1e5f4f0fed4e28f295245333544193f9a26c597f2a78571ae20b4d450b6 SHA512 33c56fcb347396f29662f304aa50f0e3dfc909b067ea49809762bbbb4dd2cd7e95789c318adcef64923e6d0248dcf9ea6fe933c49d920b6b7856d85511d40d67 WHIRLPOOL 2429b605d19bbf4caa460e9f2b46de8e2462bf606bd1143bcdcbb4f2e079b2acf5f87def86affa6152ed8b26cf14bc83d62274bb58424818deb2b5f2024de7f0
+EBUILD munin-2.0.33-r1.ebuild 12272 SHA256 57b1b0aaaa6cad6f0ee7f54f25e9ea05661c52fb00fd107ceb9ad07f2c3187cc SHA512 b87e00d40132c1c20dec93a674e2b9c0f8adfadb4d1747b5348fd65e7db875a299551a8db684d88126ec926efd0e11de74c18de50ae0525cefb778df4f1822be WHIRLPOOL bdc218b465108378d7059d4f04580569fc06e83d2842d62500863e3b9f6b81761a8c39dba6d134ae1037cbc436118cb6e2cdd4f7526c792d10cfc8bb09421cff
+EBUILD munin-2.0.33.ebuild 12184 SHA256 241922f8f69f56dd3732191e102386392c84dd2ce83ff4161f95f37362d4e227 SHA512 389ac592f1860a021feba2c6beff4d6b55ec5997adbb356b4130ef88e69cb8797e166315af4429956223ae4c6b58b39687dbd1db3578a5f56bff5a8f4d8ccbbb WHIRLPOOL d1bf9b0cf6da0e2a2b7442cf3b02d277ce943881d8245007b5f4c637b570f62091f007ed86eb14dc22eaff1e2946a1d39eedcd269bfd996ec3ccb4451a0921e8
+EBUILD munin-2.1.9999.ebuild 11520 SHA256 5af629f8ff08f1c76a3e1d8d4eae5db42c2b371dcfb050ba89b90b7f88c52971 SHA512 6069e6d31b9385885e98e815d4bf33227689fa8e74c48f4aa7b6af673be76d25ef26e777ef819563a8978a3cd73bc518b0ad3e5807c58a5b0e575aeb712f5ce5 WHIRLPOOL 6fb6950643ea7fd601be1b877ffcaae1322b8816b17a29e84cc0844ee914ff242e460369218e4adb32d78b4eea1fcbdc244d3fdfada0d43cb77b846c956aac25
+MISC ChangeLog 5446 SHA256 cd90509cc51c905cf6b36f78ff98e3def854593831b4bf9264fb6b0745da36d4 SHA512 ff33e1515f24f42dfb968b44055b931ca2f0312a8e92e04da267298fe64b27c3fc7a8e84584dcf6483d38c92c3cfe54255c5bad5fe9f303f5b3029b995ffb0ff WHIRLPOOL 745f937aee96f15345153b9f9f540baefcd2a549c58086c007d463279a329e67a5339a1a1aad129bca0973391f547f8c7b1d2a721c29bc7a07164a62158ffbbd
+MISC ChangeLog-2015 35218 SHA256 9d7cc15eb23b6e6511947c3bb9c8a38f71febe9be2411fd138dc97bb6b8ff83b SHA512 cd6ea50386d5ad031b82c8b865f3577acdaea375eaf6bcdbc0b22ea7b4de0f4742fb0e2a672d54f0b2a2d8a13e7be083a2884f6f98c3c97fa6d1d3d664ea0540 WHIRLPOOL 9bfcef1920d4470a413bb602261ec2b78499852ff07ccd11e038944ed81092878a8f3746540d5e61776fc080ad41c974d18dc5bc38d13522b1078f7f4b9a559c
+MISC metadata.xml 4116 SHA256 72b14bd255f57e4ee773bd60971577928e9135c1e4e176d24a347c4763bc3bfd SHA512 ecfa257040277d815c05693724e9ff454b5ddefc1134b6afb38d66783a5e415aae78bdb35aeb0e80882a7b8ff19499f2b3b3646cc2a139e7797a0a718c2389f3 WHIRLPOOL 6e6146e65fffc5210e4efcd55e923cca8958e2b9b60d31daa12237386402b9df3a505deea71d69f3a68b4f2f7124dabb753767f39dbf96f028cda1c01ccf1b12
diff --git a/net-analyzer/munin/files/logrotate.d-munin.2 b/net-analyzer/munin/files/logrotate.d-munin.2
new file mode 100644
index 000000000000..96a163accbd6
--- /dev/null
+++ b/net-analyzer/munin/files/logrotate.d-munin.2
@@ -0,0 +1,30 @@
+/var/log/munin/munin-node.log {
+	daily
+	missingok
+	rotate 7
+	compress
+	copytruncate
+	notifempty
+	create 640 root root
+	postrotate
+		/etc/init.d/munin-node restart 1>/dev/null || true
+	endscript
+}
+
+/var/log/munin/munin-update.log /var/log/munin/munin-graph.log /var/log/munin/munin-html.log /var/log/munin/munin-limits.log {
+	daily
+	missingok
+	rotate 7
+	compress
+	notifempty
+	nocreate
+}
+
+/var/log/munin/munin-cgi-graph.log /var/log/munin/munin-cgi-html.log {
+	daily
+	missingok
+	rotate 7
+	compress
+	notifempty
+	create 640 @CGIUSER@
+}
diff --git a/net-analyzer/munin/files/logrotate.d-munin.3 b/net-analyzer/munin/files/logrotate.d-munin.3
new file mode 100644
index 000000000000..e7e1dda3fc65
--- /dev/null
+++ b/net-analyzer/munin/files/logrotate.d-munin.3
@@ -0,0 +1,31 @@
+/var/log/munin/munin-node.log {
+	daily
+	missingok
+	rotate 7
+	compress
+	copytruncate
+	notifempty
+	create 640 root root
+	postrotate
+		test -e /run/openrc/softlevel && /etc/init.d/munin-node restart 1>/dev/null || true
+		test -e /run/systemd/system && systemctl restart munin-node 1>/dev/null || true
+	endscript
+}
+
+/var/log/munin/munin-update.log /var/log/munin/munin-graph.log /var/log/munin/munin-html.log /var/log/munin/munin-limits.log {
+	daily
+	missingok
+	rotate 7
+	compress
+	notifempty
+	nocreate
+}
+
+/var/log/munin/munin-cgi-graph.log /var/log/munin/munin-cgi-html.log {
+	daily
+	missingok
+	rotate 7
+	compress
+	notifempty
+	create 640 @CGIUSER@
+}
diff --git a/net-analyzer/munin/files/munin-1.3.2-plugins.conf b/net-analyzer/munin/files/munin-1.3.2-plugins.conf
new file mode 100644
index 000000000000..e85666b77013
--- /dev/null
+++ b/net-analyzer/munin/files/munin-1.3.2-plugins.conf
@@ -0,0 +1,80 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+#
+# This file contains configuration options for the plugins. Three
+# options are understood by munin-node itself:
+#
+# 	user <user>         # Set the user to run the plugin as
+# 	group <group>       # Set the group to run the plugin as
+# 	command <command>   # Run <command> instead of the plugin. %c
+# 	                      expands to what would normally be run.
+#   env.<variable>      # Sets <variable> in the plugin's environment, see the
+#                         individual plugins to find out which variables they
+#                         care about.
+#
+#
+
+[smart_*]
+user root
+group disk
+
+# ipmitool and freeipmi need access to the IPMI device nodes, which
+# are only readable by root
+[ipmi_*]
+user root
+
+[freeipmi_*]
+user root
+
+# Example for a 3ware 8000-series card, with 2 disks
+# use /dev/twe0 as the actual device
+# and replicate this entry for each drive, increasing the number in -d
+#[smart_3ware-0_twe0]
+#user root
+#group root
+#env.smartargs -H -i -c -l error -l selftest -l selective -a -d 3ware,0
+#[smart_3ware-1_twe0]
+#user root
+#group root
+#env.smartargs -H -i -c -l error -l selftest -l selective -a -d 3ware,1
+
+[bind9*]
+user root
+
+[iostat*]
+user munin
+group munin
+
+[iostat_ios]
+user root
+group disk
+
+[vlan*]
+user root
+
+[postfix*]
+user root
+env.logfile maillog
+
+[sendmail*]
+env.mspqueue /var/spool/clientmqueue
+
+[mysql*]
+#env.mysqlopts -u someuser
+
+[exim*]
+group mail
+
+[cps*]
+user root
+
+[mailman]
+env.logfile /var/lib/mailman/logs/post
+env.libdir /var/lib/mailman
+env.lister /usr/lib/mailman/bin/list_members
+
+# More 3ware examples
+#[hddtemp_smartctl]
+#env.drives twe0_0 twe0_1 hda
+#env.type_twe0_0 3ware,0
+#env.type_twe0_1 3ware,1
diff --git a/net-analyzer/munin/files/munin-2.0.33-perl526.patch b/net-analyzer/munin/files/munin-2.0.33-perl526.patch
new file mode 100644
index 000000000000..d3cabb9906c3
--- /dev/null
+++ b/net-analyzer/munin/files/munin-2.0.33-perl526.patch
@@ -0,0 +1,26 @@
+
+
+diff -ruN munin-2.0.33.orig/master/Build.PL munin-2.0.33/master/Build.PL
+--- munin-2.0.33.orig/master/Build.PL	2017-03-03 00:02:39.000000000 -0000
++++ munin-2.0.33/master/Build.PL	2017-08-05 15:06:55.799816839 -0000
+@@ -1,3 +1,4 @@
++use lib q[.];
+ use MasterBuilder;
+ 
+ use warnings;
+diff -ruN munin-2.0.33.orig/node/Build.PL munin-2.0.33/node/Build.PL
+--- munin-2.0.33.orig/node/Build.PL	2017-03-03 00:02:39.000000000 -0000
++++ munin-2.0.33/node/Build.PL	2017-08-05 15:11:07.689824612 -0000
+@@ -1,3 +1,4 @@
++use lib q[.];
+ use NodeBuilder;
+ 
+ use warnings;
+diff -ruN munin-2.0.33.orig/plugins/Build.PL munin-2.0.33/plugins/Build.PL
+--- munin-2.0.33.orig/plugins/Build.PL	2017-03-03 00:02:39.000000000 -0000
++++ munin-2.0.33/plugins/Build.PL	2017-08-05 15:13:57.056168401 -0000
+@@ -1,3 +1,4 @@
++use lib q[.];
+ use PluginsBuilder;
+ 
+ use warnings;
diff --git a/net-analyzer/munin/files/munin-async.service b/net-analyzer/munin/files/munin-async.service
new file mode 100644
index 000000000000..add6d238f456
--- /dev/null
+++ b/net-analyzer/munin/files/munin-async.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Munin Async Service
+After=syslog.target network.target
+
+[Service]
+PIDFile=/run/munin/munin-asyncd.pid
+ExecStart=/usr/libexec/munin/munin-asyncd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-analyzer/munin/files/munin-asyncd.init.2 b/net-analyzer/munin/files/munin-asyncd.init.2
new file mode 100644
index 000000000000..59ef4c6b0280
--- /dev/null
+++ b/net-analyzer/munin/files/munin-asyncd.init.2
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command=/usr/libexec/munin/munin-asyncd
+command_args="--fork"
+pidfile="/run/munin-asyncd.pid"
+start_stop_daemon_args="--background --make-pidfile --user munin-async"
+
+depend() {
+	need munin-node
+	before cron
+}
+
+start_pre() {
+	checkpath -d -o munin-async:munin -m 0750 /var/spool/munin-async
+}
+
+# vim: filetype=gentoo-init-d:
diff --git a/net-analyzer/munin/files/munin-graph.service b/net-analyzer/munin/files/munin-graph.service
new file mode 100644
index 000000000000..9aea1da64e95
--- /dev/null
+++ b/net-analyzer/munin/files/munin-graph.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Munin FastCGI Graph
+Requires=munin-graph.socket
+
+[Service]
+User=munin
+Group=munin
+ExecStart=/usr/libexec/munin/munin-graph
+StandardInput=socket
+StandardOutput=inherit
+StandardError=journal
diff --git a/net-analyzer/munin/files/munin-graph.socket b/net-analyzer/munin/files/munin-graph.socket
new file mode 100644
index 000000000000..533c709c50ec
--- /dev/null
+++ b/net-analyzer/munin/files/munin-graph.socket
@@ -0,0 +1,8 @@
+[Unit]
+Description=Munin FastCGI Graph Socket
+
+[Socket]
+ListenStream=/run/munin/fcgi-graph.sock
+
+[Install]
+WantedBy=sockets.target
diff --git a/net-analyzer/munin/files/munin-html.service b/net-analyzer/munin/files/munin-html.service
new file mode 100644
index 000000000000..09fdf162722b
--- /dev/null
+++ b/net-analyzer/munin/files/munin-html.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Munin FastCGI HTML
+Requires=munin-html.socket
+
+[Service]
+User=munin
+Group=munin
+ExecStart=/usr/libexec/munin/munin-html
+StandardInput=socket
+StandardOutput=inherit
+StandardError=journal
diff --git a/net-analyzer/munin/files/munin-html.socket b/net-analyzer/munin/files/munin-html.socket
new file mode 100644
index 000000000000..52fc3c354d33
--- /dev/null
+++ b/net-analyzer/munin/files/munin-html.socket
@@ -0,0 +1,8 @@
+[Unit]
+Description=Munin FastCGI HTML Socket
+
+[Socket]
+ListenStream=/run/munin/fcgi-html.sock
+
+[Install]
+WantedBy=sockets.target
diff --git a/net-analyzer/munin/files/munin-node.service b/net-analyzer/munin/files/munin-node.service
new file mode 100644
index 000000000000..92c314b6ec33
--- /dev/null
+++ b/net-analyzer/munin/files/munin-node.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Munin Node Service
+After=syslog.target network.target
+
+[Service]
+Type=forking
+PIDFile=/run/munin-node.pid
+ExecStart=/usr/sbin/munin-node
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-analyzer/munin/files/munin-node_conf.d_1.4.6-r2 b/net-analyzer/munin/files/munin-node_conf.d_1.4.6-r2
new file mode 100644
index 000000000000..79b0e14ef7fd
--- /dev/null
+++ b/net-analyzer/munin/files/munin-node_conf.d_1.4.6-r2
@@ -0,0 +1,7 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Set to the nice level for daemon
+NICE_LEVEL=1
+
+# vim: filetype=gentoo-conf-d:
diff --git a/net-analyzer/munin/files/munin-node_init.d_2.0.19 b/net-analyzer/munin/files/munin-node_init.d_2.0.19
new file mode 100644
index 000000000000..fca7880692cf
--- /dev/null
+++ b/net-analyzer/munin/files/munin-node_init.d_2.0.19
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+get_munin_config() {
+	awk '$1 == "'$1'" { s=$2 } END { print s }' "$CFGFILE"
+}
+
+: ${CFGFILE:=/etc/munin/munin-node.conf}
+
+command=/usr/sbin/munin-node
+command_args="--config ${CFGFILE}"
+pidfile=$(get_munin_config pid_file)
+start_stop_daemon_args="--nicelevel ${NICE_LEVEL:-0} --wait 1500"
+extra_started_commands="reload"
+
+depend() {
+	config "$CFGFILE"
+
+	before cron
+
+	[ "$(get_munin_config log_file)" = "Sys::Syslog" ] && \
+		use logger
+}
+
+# vim: filetype=gentoo-init-d:
diff --git a/net-analyzer/munin/files/munin-node_init.d_2.0.7 b/net-analyzer/munin/files/munin-node_init.d_2.0.7
new file mode 100644
index 000000000000..7932e356f2e8
--- /dev/null
+++ b/net-analyzer/munin/files/munin-node_init.d_2.0.7
@@ -0,0 +1,36 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+get_munin_config() {
+	awk '$1 == "'$1'" { s=$2 } END { print s }' "$CFGFILE"
+}
+
+: ${CFGFILE:=/etc/munin/munin-node.conf}
+
+command=/usr/sbin/munin-node
+command_args="--config ${CFGFILE}"
+pidfile=$(get_munin_config pid_file)
+start_stop_daemon_args="--nicelevel ${NICE_LEVEL:-0} --wait 1500"
+extra_started_commands="reload"
+
+depend() {
+	config "$CFGFILE"
+
+	before cron
+
+	[ "$(get_munin_config log_file)" = "Sys::Syslog" ] && \
+		use logger
+}
+
+start_pre() {
+    checkpath -d $(dirname ${pidfile})
+}
+
+reload() {
+    ebegin "Reloading ${SERVICE}"
+    kill -HUP `cat ${pidfile}`
+    eend $?
+}
+
+# vim: filetype=gentoo-init-d:
diff --git a/net-analyzer/munin/files/munin.apache.include b/net-analyzer/munin/files/munin.apache.include
new file mode 100644
index 000000000000..f8b2df5daa66
--- /dev/null
+++ b/net-analyzer/munin/files/munin.apache.include
@@ -0,0 +1,31 @@
+# -*- apache -*-
+
+ScriptAlias /munin-cgi/ /usr/libexec/munin/cgi/
+Alias /munin/static /etc/munin/static
+
+<IfDefine MUNIN_HTML_CGI>
+RewriteEngine on
+
+RewriteCond %{REQUEST_URI} (/|\.html)$
+RewriteCond %{REQUEST_URI} !/static
+RewriteRule ^/munin/(.*) /munin-cgi/munin-cgi-html/$1 [PT,L]
+</IfDefine>
+
+<Directory /usr/libexec/munin/cgi/>
+	Options +ExecCGI
+
+	Order allow,deny
+	Allow from all
+
+	<IfModule mod_fcgid.c>
+		SetHandler fcgid-script
+	</IfModule>
+	<IfModule !mod_fcgid.c>
+		SetHandler cgi-script
+	</IfModule>
+</Directory>
+
+<Directory /etc/munin/static>
+	Order allow,deny
+	Allow from all
+</Directory>
diff --git a/net-analyzer/munin/files/munin.apache.include-2.4 b/net-analyzer/munin/files/munin.apache.include-2.4
new file mode 100644
index 000000000000..ec69cbb07b91
--- /dev/null
+++ b/net-analyzer/munin/files/munin.apache.include-2.4
@@ -0,0 +1,28 @@
+# -*- apache -*-
+
+ScriptAlias /munin-cgi/ /usr/libexec/munin/cgi/
+Alias /munin/static /etc/munin/static
+
+<IfDefine MUNIN_HTML_CGI>
+RewriteEngine on
+
+RewriteCond %{REQUEST_URI} (/|\.html)$
+RewriteCond %{REQUEST_URI} !/static
+RewriteRule ^/munin/(.*) /munin-cgi/munin-cgi-html/$1 [PT,L]
+</IfDefine>
+
+<Directory /usr/libexec/munin/cgi/>
+	Options +ExecCGI
+	Require all granted
+
+	<IfModule mod_fcgid.c>
+		SetHandler fcgid-script
+	</IfModule>
+	<IfModule !mod_fcgid.c>
+		SetHandler cgi-script
+	</IfModule>
+</Directory>
+
+<Directory /etc/munin/static>
+	Require all granted
+</Directory>
diff --git a/net-analyzer/munin/metadata.xml b/net-analyzer/munin/metadata.xml
new file mode 100644
index 000000000000..df14a4c78fe6
--- /dev/null
+++ b/net-analyzer/munin/metadata.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>graaff@gentoo.org</email>
+    <name>Hans de Graaff</name>
+  </maintainer>
+  <longdescription lang="en">
+    Munin the tool surveys all your computers and remembers what it saw. It
+    presents all the information in in graphs through a web interface. Its
+    emphasis is on plug and play capabilities. After completing a installation a
+    high number of monitoring plugins will be playing with no more effort. Using
+    Munin you can easily monitor the performance of your computers, networks,
+    SANs, and quite possibly applications as well. It makes it easy to determine
+    "what's different today" when a performance problem crops up. It makes it
+    easy to see how you're doing capacity wise on all limited resources.
+  </longdescription>
+  <use>
+    <flag name="mysql">
+      Install the packages required for monitoring MySQL. Disabling
+      the flag does not remove any plugin files.
+    </flag>
+    <flag name="postgres">
+      Install the packages required for monitoring
+      PostgreSQL. Disabling the flag does not remove any plugin files.
+    </flag>
+    <flag name="asterisk">
+      Install the packages required for monitoring Asterisk. Disabling
+      the flag does not remove any plugin files.
+    </flag>
+    <flag name="irc">
+      Install the packages required for monitoring IRC. Disabling the
+      flag does not remove any plugin files.
+    </flag>
+    <flag name="memcached">
+      Install the packages required for memcached
+      monitoring. Disabling the flag does not remove any plugin files.
+    </flag>
+    <flag name="ipmi">
+      Install <pkg>sys-apps/ipmitool</pkg> required for monitoring
+      IPMI sensors. Disabling the flag does not remove any plugin
+      file.
+    </flag>
+    <flag name="http">
+      Install <pkg>dev-perl/libwww-perl</pkg> required for monitoring
+      HTTP-based services such as Apache and nginx. Disabling the flag
+      does not remove any plugin file.
+    </flag>
+    <flag name="dhcpd">
+      Install <pkg>dev-perl/Net-IP</pkg>,
+      <pkg>dev-perl/HTTP-Date</pkg> and <pkg>net-misc/dhcp</pkg> to
+      monitor DHCP lease usage. This only works if the server is on
+      the same system as the node, so the server is also brought
+      in. Disabling the flag does not remove any plugin file.
+    </flag>
+    <flag name="java">
+      Build the Java-based plugins to monitor JMX-compatible
+      applications. Disabling the flag removes the jmx monitoring
+      plugins.
+    </flag>
+    <flag name="minimal">
+      Only install munin-node and its plugins. This excludes the
+      scripts to generate the web pages and the graphs.
+    </flag>
+    <flag name="cgi">
+      Install the CGI-compatible scripts for on-the-fly generation of
+      web pages and graphs. This is only meaningful if the minimal USE
+      flag is disabled.
+    </flag>
+    <flag name="apache">
+      Set up the configuration of the CGI generation of HTML and
+      graphs to work with Apache. This also install an include-able
+      configuration file.
+    </flag>
+    <flag name="ipv6">
+      Add support for IPv6 in munin-node. IPv6 support for the master
+      is always enabled, but the node requires a newer version of
+    <pkg>dev-perl/Net-Server</pkg>, capable of listening to IPv6
+      sockets.
+    </flag>
+    <flag name="syslog">
+      Configure the node by default to log on syslog. This requires
+      the presence of <pkg>virtual/perl-Sys-Syslog</pkg>. As of
+      version 2.0.2, the master scripts only log to file, and not to
+      syslog.
+    </flag>
+    <flag name="doc">
+      Build and install a local copy of the HTML documentation for the
+      whole software. This requires <pkg>dev-python/sphinx</pkg> to
+      process the documentation sources.
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">munin</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/munin/munin-2.0.33-r1.ebuild b/net-analyzer/munin/munin-2.0.33-r1.ebuild
new file mode 100644
index 000000000000..3c604180b37e
--- /dev/null
+++ b/net-analyzer/munin/munin-2.0.33-r1.ebuild
@@ -0,0 +1,414 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PATCHSET=2
+
+inherit eutils user java-pkg-opt-2 systemd
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Munin Server Monitoring Tool"
+HOMEPAGE="http://munin-monitoring.org/"
+SRC_URI="
+	https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
+REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
+
+# Upstream's listing of required modules is NOT correct!
+# Some of the postgres plugins use DBD::Pg, while others call psql directly.
+# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
+# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
+DEPEND_COM="
+	dev-lang/perl:=[berkdb]
+	dev-perl/DBI
+	dev-perl/Date-Manip
+	dev-perl/File-Copy-Recursive
+	dev-perl/List-MoreUtils
+	dev-perl/Log-Log4perl
+	dev-perl/Net-CIDR
+	dev-perl/Net-DNS
+	dev-perl/Net-Netmask
+	dev-perl/Net-SNMP
+	dev-perl/Net-Server[ipv6(-)?]
+	virtual/perl-Digest-MD5
+	virtual/perl-Getopt-Long
+	virtual/perl-MIME-Base64
+	virtual/perl-Storable
+	virtual/perl-Text-Balanced
+	virtual/perl-Time-HiRes
+	apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
+	asterisk? ( dev-perl/Net-Telnet )
+	cgi? (
+		dev-perl/FCGI
+		dev-perl/CGI-Fast
+		)
+	dhcpd? (
+		>=net-misc/dhcp-3[server]
+		dev-perl/Net-IP
+		dev-perl/HTTP-Date
+		)
+	doc? ( dev-python/sphinx )
+	http? ( dev-perl/libwww-perl )
+	irc? ( dev-perl/Net-IRC )
+	ldap? ( dev-perl/perl-ldap )
+	kernel_linux? ( sys-process/procps )
+	memcached? ( dev-perl/Cache-Memcached )
+	mysql? (
+		virtual/mysql
+		dev-perl/Cache-Cache
+		dev-perl/DBD-mysql
+		)
+	postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
+	ssl? ( dev-perl/Net-SSLeay )
+	syslog? ( virtual/perl-Sys-Syslog )
+	!minimal? (
+		dev-perl/HTML-Template
+		dev-perl/IO-Socket-INET6
+		dev-perl/URI
+		>=net-analyzer/rrdtool-1.3[graph,perl]
+		virtual/ssh
+		)
+	"
+
+# Keep this seperate, as previous versions have had other deps here
+DEPEND="${DEPEND_COM}
+	dev-perl/Module-Build
+	java? ( >=virtual/jdk-1.5 )
+	test? (
+		dev-perl/Test-Deep
+		dev-perl/Test-LongString
+		dev-perl/Test-Differences
+		dev-perl/Test-MockModule
+		dev-perl/Test-MockObject
+		dev-perl/File-Slurp
+		dev-perl/IO-stringy
+		dev-perl/IO-Socket-INET6
+	)"
+RDEPEND="${DEPEND_COM}
+		virtual/awk
+		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
+		java? (
+			>=virtual/jre-1.5
+			|| ( net-analyzer/netcat6 net-analyzer/netcat )
+		)
+		!minimal? (
+			virtual/cron
+			media-fonts/dejavu
+		)
+		selinux? ( sec-policy/selinux-munin )
+		!<sys-apps/openrc-0.11.8"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup munin
+	enewuser munin 177 -1 /var/lib/munin munin
+	enewuser munin-async -1 /bin/sh /var/spool/munin-async
+	esethome munin-async /var/spool/munin-async
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	epatch "${WORKDIR}"/patches/*.patch
+	eapply "${FILESDIR}/${P}"-perl526.patch
+
+	eapply_user
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
+	use cgi || cgidir="${T}/useless/cgi-bin"
+
+	local cgiuser=$(usex apache2 apache munin)
+
+	cat >> "${S}"/Makefile.config <<- EOF
+	PREFIX=\$(DESTDIR)/usr
+	CONFDIR=\$(DESTDIR)/etc/munin
+	DOCDIR=${T}/useless/doc
+	MANDIR=\$(PREFIX)/share/man
+	LIBDIR=\$(PREFIX)/libexec/munin
+	HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
+	CGIDIR=${cgidir}
+	CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
+	CGIUSER=${cgiuser}
+	DBDIR=\$(DESTDIR)/var/lib/munin
+	DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
+	SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
+	LOGDIR=\$(DESTDIR)/var/log/munin
+	PERLSITELIB=$(perl -V:vendorlib | cut -d"'" -f2)
+	JCVALID=$(usex java yes no)
+	STATEDIR=\$(DESTDIR)/run/munin
+	EOF
+}
+
+# parallel make and install need to be fixed before, and I haven't
+# gotten around to do so yet.
+src_compile() {
+	emake -j1
+	use doc && emake -C doc html
+}
+
+src_test() {
+	if [[ ${EUID} == 0 ]]; then
+		eerror "You cannot run tests as root."
+		eerror "Please enable FEATURES=userpriv before proceeding."
+		return 1
+	fi
+
+	local testtargets="test-common test-node test-plugins"
+	use minimal || testtargets+=" test-master"
+
+	LC_ALL=C emake -j1 ${testtargets}
+}
+
+src_install() {
+	local dirs="
+		/var/log/munin
+		/var/lib/munin/plugin-state
+		/etc/munin/plugin-conf.d
+		/etc/munin/plugins"
+	use minimal || dirs+=" /etc/munin/munin-conf.d/"
+
+	keepdir ${dirs}
+	fowners munin:munin ${dirs}
+
+	# parallel install doesn't work and it's also pointless to have this
+	# run in parallel for now (because it uses internal loops).
+	emake -j1 DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
+
+	# we remove /run from the install, as it's not the package's to deal
+	# with.
+	rm -rf "${D}"/run || die
+
+	# remove the plugins for non-Gentoo package managers; use -f so that
+	# it doesn't fail when installing on non-Linux platforms.
+	rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
+
+	insinto /etc/munin/plugin-conf.d/
+	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
+
+	newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
+	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
+
+	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
+
+	dodir /usr/lib/tmpfiles.d
+	cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF
+	d /run/munin 0700 munin munin - -
+	EOF
+
+	systemd_dounit "${FILESDIR}"/munin-async.service
+	systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
+	systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
+	systemd_dounit "${FILESDIR}"/munin-node.service
+
+	cat >> "${T}"/munin.env <<- EOF
+	CONFIG_PROTECT=/var/spool/munin-async/.ssh
+	EOF
+	newenvd "${T}"/munin.env 50munin
+
+	dodoc README ChangeLog INSTALL
+	if use doc; then
+		cd "${S}"/doc/_build/html || die
+		docinto html
+		dodoc -r *
+		cd "${S}" || die
+	fi
+
+	dodir /etc/logrotate.d/
+	sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \
+		"${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
+
+	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
+
+	if use syslog; then
+		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
+			"${D}"/etc/munin/munin-node.conf || die
+	fi
+
+	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
+	# munin-node service is ran as user root, and only later drops
+	# privileges.
+	sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
+		"${D}"/etc/munin/munin-node.conf || die
+
+	keepdir /var/spool/munin-async/.ssh
+	touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
+	fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
+	fperms 0750 /var/spool/munin-async{,/.ssh}
+	fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
+
+	if use minimal; then
+		# This requires the presence of munin-update, which is part of
+		# the non-minimal install...
+		rm "${D}"/usr/libexec/munin/plugins/munin_stats
+	else
+		# remove font files so that we don't have to keep them around
+		rm "${D}"/usr/libexec/${PN}/*.ttf || die
+
+		if use cgi; then
+			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
+
+			keepdir /var/cache/munin-cgi
+			touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
+			fowners $(usex apache2 apache munin) \
+				/var/cache/munin-cgi \
+				/var/log/munin/munin-cgi-{graph,html}.log
+
+			if use apache2; then
+				insinto /etc/apache2/vhosts.d
+				newins "${FILESDIR}"/munin.apache.include munin.include
+				newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
+			fi
+		else
+			sed \
+				-e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
+				-i "${D}"/etc/munin/munin.conf || die
+		fi
+
+		keepdir /var/lib/munin/.ssh
+		cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
+		IdentityFile /var/lib/munin/.ssh/id_ecdsa
+		IdentityFile /var/lib/munin/.ssh/id_rsa
+		EOF
+
+		fowners munin:munin /var/lib/munin/.ssh/{,config}
+		fperms go-rwx /var/lib/munin/.ssh/{,config}
+
+		dodir /usr/share/${PN}
+		cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
+		# Force the shell to bash
+		SHELL=/bin/bash
+		# Mail reports to root@, not munin@
+		MAILTO=root
+
+		# This runs the munin task every 5 minutes.
+		*/5	* * * *		/usr/bin/munin-cron
+
+		# Alternatively, this route works differently
+		# Update once a minute (for busy sites)
+		#*/1 * * * *		/usr/libexec/munin/munin-update
+		## Check for limit excess every 2 minutes
+		#*/2 * * * *		/usr/libexec/munin/munin-limits
+		## Update graphs every 5 minutes
+		#*/5 * * * *		nice /usr/libexec/munin/munin-graph
+		## Update HTML pages every 15 minutes
+		#*/15 * * * *		nice /usr/libexec/munin/munin-html
+		EOF
+
+		cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
+		# Mail reports to root@, not munin@, only execute one at a time
+		!mailto(root),serial(true)
+
+		# This runs the munin task every 5 minutes.
+		@ 5		/usr/bin/munin-cron
+
+		# Alternatively, this route works differently
+		# Update once a minute (for busy sites)
+		#@ 1	/usr/libexec/munin/munin-update
+		## Check for limit excess every 2 minutes
+		#@ 2	/usr/libexec/munin/munin-limits
+		## Update graphs every 5 minutes
+		#@ 5	nice /usr/libexec/munin/munin-graph
+		## Update HTML pages every 15 minutes
+		#@ 15	nice /usr/libexec/munin/munin-html
+		EOF
+
+		# remove .htaccess file
+		find "${D}" -name .htaccess -delete || die
+	fi
+}
+
+pkg_config() {
+	if use minimal; then
+		einfo "Nothing to do."
+		return 0
+	fi
+
+	einfo "Press enter to install the default crontab for the munin master"
+	einfo "installation from /usr/share/${PN}/f?crontab"
+	einfo "If you have a large site, you may wish to customize it."
+	read
+
+	ebegin "Setting up cron ..."
+	if has_version sys-process/fcron; then
+		fcrontab - -u munin < /usr/share/${PN}/fcrontab
+	else
+		# dcron is very fussy about syntax
+		# the following is the only form that works in BOTH dcron and vixie-cron
+		crontab - -u munin < /usr/share/${PN}/crontab
+	fi
+	eend $?
+
+	einfo "Press enter to set up the SSH keys used for SSH transport"
+	read
+
+	# generate one rsa (for legacy) and one ecdsa (for new systems)
+	ssh-keygen -t rsa \
+		-f /var/lib/munin/.ssh/id_rsa -N '' \
+		-C "created by portage for ${CATEGORY}/${PN}" || die
+	ssh-keygen -t ecdsa \
+		-f /var/lib/munin/.ssh/id_ecdsa -N '' \
+		-C "created by portage for ${CATEGORY}/${PN}" || die
+	chown -R munin:munin /var/lib/munin/.ssh || die
+	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
+
+	einfo "Your public keys are available in "
+	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
+	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
+	einfo "and follows for convenience"
+	echo
+	cat /var/lib/munin/.ssh/id_*.pub
+}
+
+pkg_postinst() {
+	elog "Please follow the munin documentation to set up the plugins you"
+	elog "need, afterwards start munin-node."
+	elog ""
+	elog "To make use of munin-async, make sure to set up the corresponding"
+	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
+	elog ""
+	if ! use minimal; then
+		elog "Please run"
+		elog "  emerge --config net-analyzer/munin"
+		elog "to automatically configure munin's cronjobs as well as generate"
+		elog "passwordless SSH keys to be used with munin-async."
+	fi
+	elog ""
+	elog "Further information about setting up Munin in Gentoo can be found"
+	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
+
+	if use cgi; then
+		chown $(usex apache2 apache munin) \
+			"${ROOT}"/var/cache/munin-cgi \
+			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
+
+		if use apache2; then
+			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
+			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
+			elog "host you want it to be served."
+			elog "If you want to enable CGI-based HTML as well, you have to add to"
+			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
+		else
+			elog "Effective CGI support has just been added in 2.0.7-r6."
+			elog "Documentation on how to use it is still sparse."
+		fi
+	fi
+
+	# we create this here as we don't want Portage to check /run
+	# symlinks but we still need this to be present before the reboot.
+	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
+		mkdir "${ROOT}"/run/munin
+		chown munin:munin "${ROOT}"/run/munin
+		chmod 0700 "${ROOT}"/run/munin
+	fi
+}
diff --git a/net-analyzer/munin/munin-2.0.33.ebuild b/net-analyzer/munin/munin-2.0.33.ebuild
new file mode 100644
index 000000000000..463f33791fcc
--- /dev/null
+++ b/net-analyzer/munin/munin-2.0.33.ebuild
@@ -0,0 +1,412 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PATCHSET=1
+
+inherit eutils user java-pkg-opt-2 systemd
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Munin Server Monitoring Tool"
+HOMEPAGE="http://munin-monitoring.org/"
+SRC_URI="
+	https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~mips ppc x86"
+IUSE="asterisk irc java memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache"
+REQUIRED_USE="cgi? ( !minimal ) apache? ( cgi )"
+
+# Upstream's listing of required modules is NOT correct!
+# Some of the postgres plugins use DBD::Pg, while others call psql directly.
+# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
+# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
+DEPEND_COM="
+	dev-lang/perl:=[berkdb]
+	dev-perl/DBI
+	dev-perl/Date-Manip
+	dev-perl/File-Copy-Recursive
+	dev-perl/List-MoreUtils
+	dev-perl/Log-Log4perl
+	dev-perl/Net-CIDR
+	dev-perl/Net-DNS
+	dev-perl/Net-Netmask
+	dev-perl/Net-SNMP
+	dev-perl/Net-Server[ipv6(-)?]
+	virtual/perl-Digest-MD5
+	virtual/perl-Getopt-Long
+	virtual/perl-MIME-Base64
+	virtual/perl-Storable
+	virtual/perl-Text-Balanced
+	virtual/perl-Time-HiRes
+	apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
+	asterisk? ( dev-perl/Net-Telnet )
+	cgi? (
+		dev-perl/FCGI
+		dev-perl/CGI-Fast
+		)
+	dhcpd? (
+		>=net-misc/dhcp-3[server]
+		dev-perl/Net-IP
+		dev-perl/HTTP-Date
+		)
+	doc? ( dev-python/sphinx )
+	http? ( dev-perl/libwww-perl )
+	irc? ( dev-perl/Net-IRC )
+	kernel_linux? ( sys-process/procps )
+	memcached? ( dev-perl/Cache-Memcached )
+	mysql? (
+		virtual/mysql
+		dev-perl/Cache-Cache
+		dev-perl/DBD-mysql
+		)
+	postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
+	ssl? ( dev-perl/Net-SSLeay )
+	syslog? ( virtual/perl-Sys-Syslog )
+	!minimal? (
+		dev-perl/HTML-Template
+		dev-perl/IO-Socket-INET6
+		dev-perl/URI
+		>=net-analyzer/rrdtool-1.3[graph,perl]
+		virtual/ssh
+		)
+	"
+
+# Keep this seperate, as previous versions have had other deps here
+DEPEND="${DEPEND_COM}
+	dev-perl/Module-Build
+	java? ( >=virtual/jdk-1.5 )
+	test? (
+		dev-perl/Test-Deep
+		dev-perl/Test-LongString
+		dev-perl/Test-Differences
+		dev-perl/Test-MockModule
+		dev-perl/Test-MockObject
+		dev-perl/File-Slurp
+		dev-perl/IO-stringy
+		dev-perl/IO-Socket-INET6
+	)"
+RDEPEND="${DEPEND_COM}
+		virtual/awk
+		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
+		java? (
+			>=virtual/jre-1.5
+			|| ( net-analyzer/netcat6 net-analyzer/netcat )
+		)
+		!minimal? (
+			virtual/cron
+			media-fonts/dejavu
+		)
+		selinux? ( sec-policy/selinux-munin )
+		!<sys-apps/openrc-0.11.8"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup munin
+	enewuser munin 177 -1 /var/lib/munin munin
+	enewuser munin-async -1 /bin/sh /var/spool/munin-async
+	esethome munin-async /var/spool/munin-async
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	epatch "${WORKDIR}"/patches/*.patch
+
+	eapply_user
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
+	use cgi || cgidir="${T}/useless/cgi-bin"
+
+	local cgiuser=$(usex apache apache munin)
+
+	cat >> "${S}"/Makefile.config <<- EOF
+	PREFIX=\$(DESTDIR)/usr
+	CONFDIR=\$(DESTDIR)/etc/munin
+	DOCDIR=${T}/useless/doc
+	MANDIR=\$(PREFIX)/share/man
+	LIBDIR=\$(PREFIX)/libexec/munin
+	HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
+	CGIDIR=${cgidir}
+	CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
+	CGIUSER=${cgiuser}
+	DBDIR=\$(DESTDIR)/var/lib/munin
+	DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
+	SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
+	LOGDIR=\$(DESTDIR)/var/log/munin
+	PERLSITELIB=$(perl -V:vendorlib | cut -d"'" -f2)
+	JCVALID=$(usex java yes no)
+	STATEDIR=\$(DESTDIR)/run/munin
+	EOF
+}
+
+# parallel make and install need to be fixed before, and I haven't
+# gotten around to do so yet.
+src_compile() {
+	emake -j1
+	use doc && emake -C doc html
+}
+
+src_test() {
+	if [[ ${EUID} == 0 ]]; then
+		eerror "You cannot run tests as root."
+		eerror "Please enable FEATURES=userpriv before proceeding."
+		return 1
+	fi
+
+	local testtargets="test-common test-node test-plugins"
+	use minimal || testtargets+=" test-master"
+
+	LC_ALL=C emake -j1 ${testtargets}
+}
+
+src_install() {
+	local dirs="
+		/var/log/munin
+		/var/lib/munin/plugin-state
+		/etc/munin/plugin-conf.d
+		/etc/munin/plugins"
+	use minimal || dirs+=" /etc/munin/munin-conf.d/"
+
+	keepdir ${dirs}
+	fowners munin:munin ${dirs}
+
+	# parallel install doesn't work and it's also pointless to have this
+	# run in parallel for now (because it uses internal loops).
+	emake -j1 DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
+
+	# we remove /run from the install, as it's not the package's to deal
+	# with.
+	rm -rf "${D}"/run || die
+
+	# remove the plugins for non-Gentoo package managers; use -f so that
+	# it doesn't fail when installing on non-Linux platforms.
+	rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
+
+	insinto /etc/munin/plugin-conf.d/
+	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
+
+	newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
+	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
+
+	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
+
+	dodir /usr/lib/tmpfiles.d
+	cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF
+	d /run/munin 0700 munin munin - -
+	EOF
+
+	systemd_dounit "${FILESDIR}"/munin-async.service
+	systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
+	systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
+	systemd_dounit "${FILESDIR}"/munin-node.service
+
+	cat >> "${T}"/munin.env <<- EOF
+	CONFIG_PROTECT=/var/spool/munin-async/.ssh
+	EOF
+	newenvd "${T}"/munin.env 50munin
+
+	dodoc README ChangeLog INSTALL
+	if use doc; then
+		cd "${S}"/doc/_build/html || die
+		docinto html
+		dodoc -r *
+		cd "${S}" || die
+	fi
+
+	dodir /etc/logrotate.d/
+	sed -e "s:@CGIUSER@:$(usex apache apache munin):g" \
+		"${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
+
+	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
+
+	if use syslog; then
+		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
+			"${D}"/etc/munin/munin-node.conf || die
+	fi
+
+	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
+	# munin-node service is ran as user root, and only later drops
+	# privileges.
+	sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
+		"${D}"/etc/munin/munin-node.conf || die
+
+	keepdir /var/spool/munin-async/.ssh
+	touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
+	fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
+	fperms 0750 /var/spool/munin-async{,/.ssh}
+	fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
+
+	if use minimal; then
+		# This requires the presence of munin-update, which is part of
+		# the non-minimal install...
+		rm "${D}"/usr/libexec/munin/plugins/munin_stats
+	else
+		# remove font files so that we don't have to keep them around
+		rm "${D}"/usr/libexec/${PN}/*.ttf || die
+
+		if use cgi; then
+			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
+
+			keepdir /var/cache/munin-cgi
+			touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
+			fowners $(usex apache apache munin) \
+				/var/cache/munin-cgi \
+				/var/log/munin/munin-cgi-{graph,html}.log
+
+			if use apache; then
+				insinto /etc/apache2/vhosts.d
+				newins "${FILESDIR}"/munin.apache.include munin.include
+				newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
+			fi
+		else
+			sed \
+				-e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
+				-i "${D}"/etc/munin/munin.conf || die
+		fi
+
+		keepdir /var/lib/munin/.ssh
+		cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
+		IdentityFile /var/lib/munin/.ssh/id_ecdsa
+		IdentityFile /var/lib/munin/.ssh/id_rsa
+		EOF
+
+		fowners munin:munin /var/lib/munin/.ssh/{,config}
+		fperms go-rwx /var/lib/munin/.ssh/{,config}
+
+		dodir /usr/share/${PN}
+		cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
+		# Force the shell to bash
+		SHELL=/bin/bash
+		# Mail reports to root@, not munin@
+		MAILTO=root
+
+		# This runs the munin task every 5 minutes.
+		*/5	* * * *		/usr/bin/munin-cron
+
+		# Alternatively, this route works differently
+		# Update once a minute (for busy sites)
+		#*/1 * * * *		/usr/libexec/munin/munin-update
+		## Check for limit excess every 2 minutes
+		#*/2 * * * *		/usr/libexec/munin/munin-limits
+		## Update graphs every 5 minutes
+		#*/5 * * * *		nice /usr/libexec/munin/munin-graph
+		## Update HTML pages every 15 minutes
+		#*/15 * * * *		nice /usr/libexec/munin/munin-html
+		EOF
+
+		cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
+		# Mail reports to root@, not munin@, only execute one at a time
+		!mailto(root),serial(true)
+
+		# This runs the munin task every 5 minutes.
+		@ 5		/usr/bin/munin-cron
+
+		# Alternatively, this route works differently
+		# Update once a minute (for busy sites)
+		#@ 1	/usr/libexec/munin/munin-update
+		## Check for limit excess every 2 minutes
+		#@ 2	/usr/libexec/munin/munin-limits
+		## Update graphs every 5 minutes
+		#@ 5	nice /usr/libexec/munin/munin-graph
+		## Update HTML pages every 15 minutes
+		#@ 15	nice /usr/libexec/munin/munin-html
+		EOF
+
+		# remove .htaccess file
+		find "${D}" -name .htaccess -delete || die
+	fi
+}
+
+pkg_config() {
+	if use minimal; then
+		einfo "Nothing to do."
+		return 0
+	fi
+
+	einfo "Press enter to install the default crontab for the munin master"
+	einfo "installation from /usr/share/${PN}/f?crontab"
+	einfo "If you have a large site, you may wish to customize it."
+	read
+
+	ebegin "Setting up cron ..."
+	if has_version sys-process/fcron; then
+		fcrontab - -u munin < /usr/share/${PN}/fcrontab
+	else
+		# dcron is very fussy about syntax
+		# the following is the only form that works in BOTH dcron and vixie-cron
+		crontab - -u munin < /usr/share/${PN}/crontab
+	fi
+	eend $?
+
+	einfo "Press enter to set up the SSH keys used for SSH transport"
+	read
+
+	# generate one rsa (for legacy) and one ecdsa (for new systems)
+	ssh-keygen -t rsa \
+		-f /var/lib/munin/.ssh/id_rsa -N '' \
+		-C "created by portage for ${CATEGORY}/${PN}" || die
+	ssh-keygen -t ecdsa \
+		-f /var/lib/munin/.ssh/id_ecdsa -N '' \
+		-C "created by portage for ${CATEGORY}/${PN}" || die
+	chown -R munin:munin /var/lib/munin/.ssh || die
+	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
+
+	einfo "Your public keys are available in "
+	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
+	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
+	einfo "and follows for convenience"
+	echo
+	cat /var/lib/munin/.ssh/id_*.pub
+}
+
+pkg_postinst() {
+	elog "Please follow the munin documentation to set up the plugins you"
+	elog "need, afterwards start munin-node."
+	elog ""
+	elog "To make use of munin-async, make sure to set up the corresponding"
+	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
+	elog ""
+	if ! use minimal; then
+		elog "Please run"
+		elog "  emerge --config net-analyzer/munin"
+		elog "to automatically configure munin's cronjobs as well as generate"
+		elog "passwordless SSH keys to be used with munin-async."
+	fi
+	elog ""
+	elog "Further information about setting up Munin in Gentoo can be found"
+	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
+
+	if use cgi; then
+		chown $(usex apache apache munin) \
+			"${ROOT}"/var/cache/munin-cgi \
+			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
+
+		if use apache; then
+			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
+			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
+			elog "host you want it to be served."
+			elog "If you want to enable CGI-based HTML as well, you have to add to"
+			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
+		else
+			elog "Effective CGI support has just been added in 2.0.7-r6."
+			elog "Documentation on how to use it is still sparse."
+		fi
+	fi
+
+	# we create this here as we don't want Portage to check /run
+	# symlinks but we still need this to be present before the reboot.
+	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
+		mkdir "${ROOT}"/run/munin
+		chown munin:munin "${ROOT}"/run/munin
+		chmod 0700 "${ROOT}"/run/munin
+	fi
+}
diff --git a/net-analyzer/munin/munin-2.1.9999.ebuild b/net-analyzer/munin/munin-2.1.9999.ebuild
new file mode 100644
index 000000000000..d041ec7f4195
--- /dev/null
+++ b/net-analyzer/munin/munin-2.1.9999.ebuild
@@ -0,0 +1,381 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils user java-pkg-opt-2 git-2
+
+EGIT_REPO_URI="https://github.com/munin-monitoring/${PN}.git"
+
+DESCRIPTION="Munin Server Monitoring Tool"
+HOMEPAGE="http://munin-monitoring.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="irc java memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache"
+REQUIRED_USE="cgi? ( !minimal ) apache? ( cgi )"
+
+# Upstream's listing of required modules is NOT correct!
+# Some of the postgres plugins use DBD::Pg, while others call psql directly.
+# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
+# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
+DEPEND_COM="dev-lang/perl:=[berkdb]
+			sys-process/procps
+			doc? ( dev-python/sphinx )
+			irc? ( dev-perl/Net-IRC )
+			mysql? ( virtual/mysql
+					 dev-perl/Cache-Cache
+					 dev-perl/DBD-mysql )
+			ssl? ( dev-perl/Net-SSLeay )
+			postgres? ( dev-perl/DBD-Pg dev-db/postgresql )
+			memcached? ( dev-perl/Cache-Memcached )
+			cgi? ( dev-perl/FCGI )
+			apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
+			syslog? ( virtual/perl-Sys-Syslog )
+			http? ( dev-perl/libwww-perl )
+			dhcpd? (
+				>=net-misc/dhcp-3[server]
+				dev-perl/Net-IP
+				dev-perl/HTTP-Date
+			)
+			dev-perl/DBI
+			dev-perl/Date-Manip
+			dev-perl/File-Copy-Recursive
+			dev-perl/List-MoreUtils
+			dev-perl/Log-Log4perl
+			dev-perl/Net-CIDR
+			dev-perl/Net-Netmask
+			dev-perl/Net-SNMP
+			dev-perl/Net-Server[ipv6(-)?]
+			virtual/perl-Digest-MD5
+			virtual/perl-Getopt-Long
+			virtual/perl-MIME-Base64
+			virtual/perl-Storable
+			virtual/perl-Text-Balanced
+			virtual/perl-Time-HiRes
+			!minimal? (
+				dev-perl/HTML-Template
+				dev-perl/IO-Socket-INET6
+				dev-perl/URI
+				>=net-analyzer/rrdtool-1.3[graph,perl]
+				virtual/ssh
+			)"
+
+# Keep this seperate, as previous versions have had other deps here
+DEPEND="${DEPEND_COM}
+	dev-perl/Module-Build
+	java? ( >=virtual/jdk-1.5 )
+	test? (
+		dev-perl/Test-Deep
+		dev-perl/Test-LongString
+		dev-perl/Test-Differences
+		dev-perl/Test-MockModule
+		dev-perl/Test-MockObject
+		dev-perl/File-Slurp
+		dev-perl/IO-stringy
+		dev-perl/IO-Socket-INET6
+	)"
+RDEPEND="${DEPEND_COM}
+		virtual/awk
+		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
+		java? (
+			>=virtual/jre-1.5
+			|| ( net-analyzer/netcat6 net-analyzer/netcat )
+		)
+		!minimal? (
+			virtual/cron
+			media-fonts/dejavu
+		)
+		selinux? ( sec-policy/selinux-munin )
+		!<sys-apps/openrc-0.11.8"
+
+pkg_setup() {
+	enewgroup munin
+	enewuser munin 177 -1 /var/lib/munin munin
+	enewuser munin-async -1 /bin/sh /var/spool/munin-async
+	esethome munin-async /var/spool/munin-async
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
+	use cgi || cgidir="${T}/useless/cgi-bin"
+
+	local cgiuser=$(usex apache apache munin)
+
+	cat - >> "${S}"/Makefile.config <<EOF
+PREFIX=\$(DESTDIR)/usr
+CONFDIR=\$(DESTDIR)/etc/munin
+DOCDIR=${T}/useless/doc
+MANDIR=\$(PREFIX)/share/man
+LIBDIR=\$(PREFIX)/libexec/munin
+HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
+CGIDIR=${cgidir}
+CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
+CGIUSER=${cgiuser}
+DBDIR=\$(DESTDIR)/var/lib/munin
+DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
+SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
+LOGDIR=\$(DESTDIR)/var/log/munin
+PERLSITELIB=$(perl -V:vendorlib | cut -d"'" -f2)
+JCVALID=$(usex java yes no)
+STATEDIR=\$(DESTDIR)/run/munin
+EOF
+}
+
+# parallel make and install need to be fixed before, and I haven't
+# gotten around to do so yet.
+src_compile() {
+	emake -j1
+	if use doc; then
+		emake -C doc html
+	fi
+}
+
+src_test() {
+	if [[ ${EUID} == 0 ]]; then
+		eerror "You cannot run tests as root."
+		eerror "Please enable FEATURES=userpriv before proceeding."
+		return 1
+	fi
+
+	local testtargets="test-common test-node test-plugins"
+	use minimal || testtargets+=" test-master"
+
+	LC_ALL=C emake -j1 ${testtargets}
+}
+
+src_install() {
+	local dirs="
+		/var/log/munin
+		/var/lib/munin/plugin-state
+		/etc/munin/plugin-conf.d
+		/etc/munin/plugins"
+	use minimal || dirs+=" /etc/munin/munin-conf.d/"
+
+	keepdir ${dirs}
+	fowners munin:munin ${dirs}
+
+	# parallel install doesn't work and it's also pointless to have this
+	# run in parallel for now (because it uses internal loops).
+	emake -j1 DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
+
+	# we remove /run from the install, as it's not the package's to deal
+	# with.
+	rm -rf "${D}"/run
+
+	# remove the plugins for non-Gentoo package managers
+	rm "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
+
+	insinto /etc/munin/plugin-conf.d/
+	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
+
+	newinitd "${FILESDIR}"/munin-node_init.d_2.0.7 munin-node
+	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
+
+	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
+
+	cat - >> "${T}"/munin.env <<EOF
+CONFIG_PROTECT=/var/spool/munin-async/.ssh
+EOF
+	newenvd "${T}"/munin.env 50munin
+
+	dodoc README.rst ChangeLog INSTALL
+	if use doc; then
+		cd "${S}"/doc/_build/html
+		dohtml -r *
+		cd "${S}"
+	fi
+
+	dodir /etc/logrotate.d/
+	sed -e "s:@CGIUSER@:$(usex apache apache munin):g" \
+		"${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
+
+	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
+
+	if use syslog; then
+		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
+			"${D}"/etc/munin/munin-node.conf || die
+	fi
+
+	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
+	# munin-node service is ran as user root, and only later drops
+	# privileges.
+	sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
+		"${D}"/etc/munin/munin-node.conf || die
+
+	keepdir /var/spool/munin-async/.ssh
+	touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
+	fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
+	fperms 0750 /var/spool/munin-async{,/.ssh}
+	fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
+
+	if use minimal; then
+		# This requires the presence of munin-update, which is part of
+		# the non-minimal install...
+		rm "${D}"/usr/libexec/munin/plugins/munin_stats
+	else
+		dodir /usr/lib/tmpfiles.d
+		cat - > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<EOF
+d /run/munin 0700 munin munin - -
+EOF
+
+		# remove font files so that we don't have to keep them around
+		rm "${D}"/usr/libexec/${PN}/*.ttf || die
+
+		if use cgi; then
+			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
+
+			keepdir /var/cache/munin-cgi
+			touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
+			fowners $(usex apache apache munin) \
+				/var/cache/munin-cgi \
+				/var/log/munin/munin-cgi-{graph,html}.log
+
+			if use apache; then
+				insinto /etc/apache2/vhosts.d
+				newins "${FILESDIR}"/munin.apache.include munin.include
+				newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
+			fi
+		else
+			sed -i -e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' "${D}"/etc/munin/munin.conf || die
+		fi
+
+		keepdir /var/lib/munin/.ssh
+		cat - >> "${D}"/var/lib/munin/.ssh/config <<EOF
+IdentityFile /var/lib/munin/.ssh/id_ecdsa
+IdentityFile /var/lib/munin/.ssh/id_rsa
+EOF
+
+		fowners munin:munin /var/lib/munin/.ssh/{,config}
+		fperms go-rwx /var/lib/munin/.ssh/{,config}
+
+		dodir /usr/share/${PN}
+		cat - >> "${D}"/usr/share/${PN}/crontab <<EOF
+# Force the shell to bash
+SHELL=/bin/bash
+# Mail reports to root@, not munin@
+MAILTO=root
+
+# This runs the munin task every 5 minutes.
+*/5	* * * *		/usr/bin/munin-cron
+
+# Alternatively, this route works differently
+# Update once a minute (for busy sites)
+#*/1 * * * *		/usr/libexec/munin/munin-update
+## Check for limit excess every 2 minutes
+#*/2 * * * *		/usr/libexec/munin/munin-limits
+## Update graphs every 5 minutes
+#*/5 * * * *		nice /usr/libexec/munin/munin-graph
+## Update HTML pages every 15 minutes
+#*/15 * * * *		nice /usr/libexec/munin/munin-html
+EOF
+
+		cat - >> "${D}"/usr/share/${PN}/fcrontab <<EOF
+# Mail reports to root@, not munin@, only execute one at a time
+!mailto(root),serial(true)
+
+# This runs the munin task every 5 minutes.
+@ 5		/usr/bin/munin-cron
+
+# Alternatively, this route works differently
+# Update once a minute (for busy sites)
+#@ 1	/usr/libexec/munin/munin-update
+## Check for limit excess every 2 minutes
+#@ 2	/usr/libexec/munin/munin-limits
+## Update graphs every 5 minutes
+#@ 5	nice /usr/libexec/munin/munin-graph
+## Update HTML pages every 15 minutes
+#@ 15	nice /usr/libexec/munin/munin-html
+EOF
+
+		# remove .htaccess file
+		find "${D}" -name .htaccess -delete || die
+	fi
+}
+
+pkg_config() {
+	if use minimal; then
+		einfo "Nothing to do."
+		return 0
+	fi
+
+	einfo "Press enter to install the default crontab for the munin master"
+	einfo "installation from /usr/share/${PN}/f?crontab"
+	einfo "If you have a large site, you may wish to customize it."
+	read
+
+	ebegin "Setting up cron ..."
+	if has_version sys-process/fcron; then
+		fcrontab - -u munin < /usr/share/${PN}/fcrontab
+	else
+		# dcron is very fussy about syntax
+		# the following is the only form that works in BOTH dcron and vixie-cron
+		crontab - -u munin < /usr/share/${PN}/crontab
+	fi
+	eend $?
+
+	einfo "Press enter to set up the SSH keys used for SSH transport"
+	read
+
+	# generate one rsa (for legacy) and one ecdsa (for new systems)
+	ssh-keygen -t rsa -f /var/lib/munin/.ssh/id_rsa -N '' -C "created by portage for ${CATEGORY}/${PN}" || die
+	ssh-keygen -t ecdsa -f /var/lib/munin/.ssh/id_ecdsa -N '' -C "created by portage for ${CATEGORY}/${PN}" || die
+	chown -R munin:munin /var/lib/munin/.ssh || die
+	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
+
+	einfo "Your public keys are available in "
+	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
+	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
+	einfo "and follows for convenience"
+	echo
+	cat /var/lib/munin/.ssh/id_*.pub
+}
+
+pkg_postinst() {
+	elog "Please follow the munin documentation to set up the plugins you"
+	elog "need, afterwards start munin-node via /etc/init.d/munin-node."
+	elog ""
+	elog "To make use of munin-async, make sure to set up the corresponding"
+	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
+	elog ""
+	if ! use minimal; then
+		elog "Please run"
+		elog "  emerge --config net-analyzer/munin"
+		elog "to automatically configure munin's cronjobs as well as generate"
+		elog "passwordless SSH keys to be used with munin-async."
+	fi
+	elog ""
+	elog "Further information about setting up Munin in Gentoo can be found"
+	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
+
+	if use cgi; then
+		chown $(usex apache apache munin) \
+			"${ROOT}"/var/cache/munin-cgi \
+			"${ROOT}"/var/log/munin-cgi-{graph,html}.log
+
+		if use apache; then
+			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
+			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
+			elog "host you want it to be served."
+			elog "If you want to enable CGI-based HTML as well, you have to add to"
+			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
+		else
+			elog "Effective CGI support has just been added in 2.0.7-r6."
+			elog "Documentation on how to use it is still sparse."
+		fi
+	fi
+
+	# we create this here as we don't want Portage to check /run
+	# symlinks but we still need this to be present before the reboot.
+	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
+		mkdir "${ROOT}"/run/munin
+		chown munin:munin "${ROOT}"/run/munin
+		chmod 0700 "${ROOT}"/run/munin
+	fi
+}
diff --git a/net-analyzer/nagios-check_dnssec/Manifest b/net-analyzer/nagios-check_dnssec/Manifest
new file mode 100644
index 000000000000..16f8f3ab38b9
--- /dev/null
+++ b/net-analyzer/nagios-check_dnssec/Manifest
@@ -0,0 +1,5 @@
+DIST check_dnssec-0.1_p28.tar.bz2 73458 SHA256 fedc867447f17299a4bb45c406f99483b0f09689b2a5fbbd3e29926f109952ea SHA512 e99b155f38963858750443f3cf834e4505f871cb06bbfabf07ade1b333b18507b9364e7250118ed5ee4a2134e2a45ee68b6386a9f3b0cb30a0bb02a4a6e263fa WHIRLPOOL 5510bfc17b2cd6e70d9361a44d19af9c7b40823da163c9b92edbc593fed69209127f56e72c239389c750688a4a0ef3ed0b77bcb8f27a6d4328c7130593cf8360
+EBUILD nagios-check_dnssec-0.1_p28.ebuild 655 SHA256 3292829f8866802106c4916e8ab815bc8eefca826cd25c6d0e79792e826ec94e SHA512 a94c6a58a8c3c402faf752cd165cd96b2d260935ca09e82ff953a960f598f20f0bf97eae0aaad8f58bf614ad51be677f612f2a6319e8f80916a7254ed57b8fa4 WHIRLPOOL be95d26d6781a7efa26f1a41a5283ef8e3c0e97b3909e774c0b0246b97943daa7f74d4385d7344fd60c11103f0535a38013fc7cd34b0ff59b5adb2c4b9e1bfd8
+MISC ChangeLog 2471 SHA256 761e4cab5301899de604ecee5110d744a3fc597d663a577ae8971c6227ea3ffb SHA512 5d7584e1a5a2ee762afb9ed759356d93542aaa10e07e340db4ff7f6d0196c1537ae15a7f3647799f8e7096deedcec98ad7c8f120b44bd3a220d1d1f98137eac7 WHIRLPOOL c56729a6b86dceaca8965dd07be899c39675aa98a1410a6abacce4663ce2d172a7b709468f6773ced4e16665b453afda2260ddeaa80cf4ad096a46bea838178e
+MISC ChangeLog-2015 989 SHA256 e69416a317edbb3d92ec2f845b5668c86c3920abbf97ce3ee2deb781944ef06b SHA512 d5fcc34e5bbd8b758c84b2b9342f3997ecfdf52b6daebf5a5d611b092bc71d898c40ca056201536991d653cd4c406eb9b2b8c97b9f1cb807037d40f8766879b6 WHIRLPOOL 6ab81f328ba9b69743656553232ee2490b4606b35a188006574dcb237f1465a8bce9495317d8da7a33b2e0d776d53eb6d5dc97f46cf1ff9d857a99519dbf81ec
+MISC metadata.xml 390 SHA256 f2decf39cdfe68b8e8e335d96364d0d48b994fa76e706122e6fa207a6cc03cd7 SHA512 0814c74c2ffd3728a8231a4d0240b23598719cfe06b57dad979092d8a6171a7564b905da4dad202313bfa2e237036b75f4f12dc57050469dd2f68f91820afda6 WHIRLPOOL 70e86560b3aef4820d2ffb0ffec8da4f90b6e6a23198d28990988a873289bcedb18275bf8929b26c548745ad172bbbb06af588b71986306d232537751af4e87e
diff --git a/net-analyzer/nagios-check_dnssec/metadata.xml b/net-analyzer/nagios-check_dnssec/metadata.xml
new file mode 100644
index 000000000000..b7624565acac
--- /dev/null
+++ b/net-analyzer/nagios-check_dnssec/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+      <email>creffett@gentoo.org</email>
+      <name>Chris Reffett</name>
+  </maintainer>
+  <maintainer type="project">
+      <email>sysadmin@gentoo.org</email>
+      <name>Gentoo Sysadmin Project</name>
+  </maintainer>
+  </pkgmetadata>
diff --git a/net-analyzer/nagios-check_dnssec/nagios-check_dnssec-0.1_p28.ebuild b/net-analyzer/nagios-check_dnssec/nagios-check_dnssec-0.1_p28.ebuild
new file mode 100644
index 000000000000..86cc18b48671
--- /dev/null
+++ b/net-analyzer/nagios-check_dnssec/nagios-check_dnssec-0.1_p28.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils autotools
+DESCRIPTION="check_dnssec is a set of Nagios plugins to monitor DNSSEC services"
+HOMEPAGE="https://svn.durchmesser.ch/trac/check_dnssec"
+
+MY_P=${P/nagios-/}
+
+# No upstream tarballs, tagged releaess in SVN only.
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+LICENSE="GPL-3"
+SLOT="0"
+
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND="|| ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )
+		net-libs/ldns"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	eautoreconf
+}
+
+DOCS=( ChangeLog README AUTHORS )
diff --git a/net-analyzer/nagios-check_fail2ban/Manifest b/net-analyzer/nagios-check_fail2ban/Manifest
new file mode 100644
index 000000000000..d47d1bbb9c6d
--- /dev/null
+++ b/net-analyzer/nagios-check_fail2ban/Manifest
@@ -0,0 +1,5 @@
+DIST nagios-check_fail2ban-3.tar.gz 1848 SHA256 8aa2f8d2cdd687d98906f963b68d5c711471caf626d7be7741461bfd4b83af78 SHA512 a032042f8588575ef70c6644c5d385a18b25b89d71b067cdfe78230e5e53c2fb5bf88de1d97aa9411bfec00b213f6e1eae800e9545f0d8d4bad4e3c878927f9c WHIRLPOOL a9c328633cee90c753aefa4dd24810803f9e308c9833929009409deaf0c448927d74c310b923fa0ca152cf00fc87217500fe3f7ddbbabb82c2984af6df061895
+EBUILD nagios-check_fail2ban-3.ebuild 759 SHA256 4aee2d1b4fb5a3ed955d90cb717bd6e95297eec5f7d70f8ae02375bd560d349b SHA512 82cb01b657824528a0e865277288d317fd93fbc566f76261a83b5d3e4214ea50e2387a0a316d2d0f085f203f5873897c0e480c2102b283ac011e330dc7c4b9c3 WHIRLPOOL 8a3bd5011a5d2f47d2472b29d9146909ef4f8f30a0025e5adff284cc7ec18689f6c23ba1bfddddca22dd40e660197e2942241e65f23ec50ce2164c7a1e5fe7a4
+MISC ChangeLog 2823 SHA256 33e4beb34df9db693cf4d09181bc4261046857beb19623bbc92da47cdac3bf7b SHA512 7bc14088c5b4f547ab596a3302758bba48d6a790830479c6bdc481376168068fe47e05b4dae7aa4f23f1741f31601700399ae1d9e8fa7763ff6c9a11fec7b62b WHIRLPOOL c6077a52a9ca44c053eff77847724fbce029295ed81f5330bd40fdbc192e7e5afb4e2c328a6104a80f8447e2caadd753e6e949c8c3950b4143a3d4d751800f15
+MISC ChangeLog-2015 1328 SHA256 c172b7ccd4a5b7610c847bfeb08c85396f97686af2b4a9ee335998dcbe5183d2 SHA512 2b718fc9792c85b2644d36c26f098c3285711ada4225c5782113a8f5bd612c6865079f288070e60e2e138c4f0702bf823e35b18f71eac29b7ab0b4d8b97c3f6d WHIRLPOOL 08cb3700b0351281befba74fd9d4e09d0a31faf11b53b9cab3a137fdb4112fd193f9ba1221867e80b646c1914907aa45c5bc2ecd182760c34f7f8bf344c61688
+MISC metadata.xml 256 SHA256 16c29ea5f70bce0277e3b7afc01bc2a0d8d4997b5a4e6b34d78145354eb67e38 SHA512 5bfc0e0335cd942fe93eabf7ed1102c34a82e76a05bcf7662aa35fbdaf92f5667f445c9706833615160b237357f28524af886bc387a032b30286ae74834250bd WHIRLPOOL 739faf29a903fee89d7f713da251fdb457a0d8e5095b145dd01651c275c19d5aeff90d370ec33deedeb1dd6a4da58aa0782b7a064d297afef5e1922197fd93a8
diff --git a/net-analyzer/nagios-check_fail2ban/metadata.xml b/net-analyzer/nagios-check_fail2ban/metadata.xml
new file mode 100644
index 000000000000..42237b76505e
--- /dev/null
+++ b/net-analyzer/nagios-check_fail2ban/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="github">hollow/check_fail2ban</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/nagios-check_fail2ban/nagios-check_fail2ban-3.ebuild b/net-analyzer/nagios-check_fail2ban/nagios-check_fail2ban-3.ebuild
new file mode 100644
index 000000000000..ac86c2830797
--- /dev/null
+++ b/net-analyzer/nagios-check_fail2ban/nagios-check_fail2ban-3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib autotools
+
+GITHUB_AUTHOR="hollow"
+GITHUB_PROJECT="check_fail2ban"
+GITHUB_COMMIT="c554837"
+
+DESCRIPTION="A nagios plugin for checking the fail2ban daemon"
+HOMEPAGE="https://github.com/hollow/check_fail2ban"
+SRC_URI="https://nodeload.github.com/${GITHUB_AUTHOR}/${GITHUB_PROJECT}/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="|| ( >=net-analyzer/nagios-plugins-1.4.13-r1 >=net-analyzer/monitoring-plugins-2 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${GITHUB_AUTHOR}-${GITHUB_PROJECT}-${GITHUB_COMMIT}
+
+src_prepare() {
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+}
diff --git a/net-analyzer/nagios-check_glsa2/Manifest b/net-analyzer/nagios-check_glsa2/Manifest
new file mode 100644
index 000000000000..286afa98ee96
--- /dev/null
+++ b/net-analyzer/nagios-check_glsa2/Manifest
@@ -0,0 +1,5 @@
+DIST check_glsa2-20120930.tar.xz 1980 SHA256 cb5f73b0482c88ace0ba02499443a5f903773f57dc7967840711a58e5ff1aed5 SHA512 ecf7f6f119c8a73bf672eddc64374ed07c03720ec97b51f7e0bd779b3ba2c4ceab87c1c3cbbe38b1f0224234a9fb2af7bd156f9073a8a0aa8da1458988a2bc65 WHIRLPOOL 23c901c4bd2d0ad1b15af6f75c56500fa6f0c0b4204022c95aecfeb4d010f60c0aa87766c6e748f9bf34de5cc1856bbddf437875fa381568de30013378be53eb
+EBUILD nagios-check_glsa2-20120930-r1.ebuild 869 SHA256 4f4725aedd5a71aa29402826d37aae936ef27ed35eb79f894cc41fc9a46fdd1f SHA512 5c3d23e1f5e5881c05e64efef7f3295568d65fa0bbf7d22cfe0aa1d2b58df1f7595d83f64fc9ea3e867a1a961789131325d73190e2f22339af09971173e7ca4d WHIRLPOOL b593bda6b4241bc105a808bcb841501a40ecccf712a274ce226712cef1f6dafc376bfc9aec04eb4f0e400d0449f66c158aba6d4e6416bd3b86dd91408c51a320
+MISC ChangeLog 2517 SHA256 634921b98563f39b3dd4c0748dfce4b4cc480ca447679e362090db856a728da8 SHA512 26b6aed8f01bf4dc8ed340ee7a46e585b775d63c707ebf7e9e7e4dabd6172e5c3c6524f99bf5825b0c2138e9b492f717d009a37e1072e2f95cb159d9d7050996 WHIRLPOOL e97feb1a53c457de48809540c7768030898f2f9e7a4ce2920ca5fb9f3f96f2fac4641991532dbfacd46aa01a709e4317ab62fba52b85f9cae93c9cdb31aa9468
+MISC ChangeLog-2015 918 SHA256 c86b0ff0d243db9056cb9081dd3c0a5b648337e91e988a1635710c3b83b53b35 SHA512 b1f33f72af72068a81df35ba836276116e4ffcc00c6f15c2ed00ad31a37cd6322804970684dd66e10482d843bbba6401ef3bc22c4f5fb5b239a3b06979aa0e17 WHIRLPOOL 43092209f0a6adba3061ea932186efe766f3947c0ee043cfcd6814fccd74eda68a90ab776c3d351551b258a692274d583633b71f9cfa98df960ca9d8347d1223
+MISC metadata.xml 466 SHA256 c647a38dc191cd40761328def81624b3f615e622d4d62b79c4370781f77e2cdb SHA512 b4b4b92d39729b3f5b08c53ebf3181ea847438177ddd119adb585b5ca5376b7c359e7a51d687e01a9339ea9464da48a24beb345cef83bf5befbd38128bb1d914 WHIRLPOOL 3398f29c3194aa995cbca54917e4120f55f97a06d0af1b9b2b5fbd0bb1a1f186e71db9c201d7ac6edad73a7cbd81b6f2494e711150829422cc0f43143a3e14d3
diff --git a/net-analyzer/nagios-check_glsa2/metadata.xml b/net-analyzer/nagios-check_glsa2/metadata.xml
new file mode 100644
index 000000000000..37450fe98c62
--- /dev/null
+++ b/net-analyzer/nagios-check_glsa2/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>creffett@gentoo.org</email>
+    <name>Chris Reffett</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">craig/check_glsa2</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/nagios-check_glsa2/nagios-check_glsa2-20120930-r1.ebuild b/net-analyzer/nagios-check_glsa2/nagios-check_glsa2-20120930-r1.ebuild
new file mode 100644
index 000000000000..5b6ab2dd057a
--- /dev/null
+++ b/net-analyzer/nagios-check_glsa2/nagios-check_glsa2-20120930-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit multilib user
+
+DESCRIPTION="Nagios check script for GLSAs (Gentoo Linux Security Advisories)"
+HOMEPAGE="https://github.com/craig/check_glsa2"
+
+MY_PN="${PN/nagios-/}"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+SRC_URI="https://dev.gentoo.org/~flameeyes/${MY_PN}/${MY_P}.tar.xz"
+LICENSE="GPL-2 BSD-2"
+SLOT="0"
+
+KEYWORDS="amd64"
+
+RDEPEND="app-portage/gentoolkit"
+DEPEND=""
+
+pkg_setup() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /dev/null nagios
+}
+
+src_prepare() {
+	sed -i -e '/CACHEDIR=/s:=.*:=/var/cache/check_glsa2:' ${MY_PN}_cached.sh || die
+}
+
+src_install() {
+	local nagiosplugindir=/usr/$(get_libdir)/nagios/plugins
+	exeinto ${nagiosplugindir}
+	doexe *.sh
+
+	dodoc README
+
+	diropts -o nagios -g nagios
+	keepdir /var/cache/${MY_PN}
+}
diff --git a/net-analyzer/nagios-check_ipmi_sensor/Manifest b/net-analyzer/nagios-check_ipmi_sensor/Manifest
new file mode 100644
index 000000000000..62a56f5cc94d
--- /dev/null
+++ b/net-analyzer/nagios-check_ipmi_sensor/Manifest
@@ -0,0 +1,9 @@
+DIST check_ipmi_sensor_v3-14e6586.tgz 21836 SHA256 eaf7a8206953bd64b7d1d69d3ed42e342c1054f6fd7d524a1f2de6e17afe07a4 SHA512 ac0744348e4d68459326396ee7fcc98bb0c3d2115fcf9724c7391f6f8dc9c0e2bb89a832822424b415acc3062201fb67d7eaceb4b9f2f41526e5fe8823187a0e WHIRLPOOL 4584ecbf36a4f6ed1ca36099eddc4feb79f79fc9988558e1539cfda18baf1cf9de13101bf376c37066a9309c5e6853cb012580d0c22543d6bb68ebfce31f2654
+DIST check_ipmi_sensor_v3-8120430.tgz 20620 SHA256 ac97ad0fed89023117841bb3e60cdb4d86612671f9d50cbaa8e7d44884309061 SHA512 89b3fd7ae2d523e1510c528d44d03ad9af5bc174bb325393f50a4a95380c996867b4502b55f38712515f556fe0f2019e15f6800ca1db00a9bbbcef655f1fd845 WHIRLPOOL 0792e2ee262bc58820684c6dc050d9987ddbd1680cf99083b1598a3377cf7cd861265fe95faa53fc99c4d9e4bdba71ca771fb8d57205b630b5619a6b3433efa0
+DIST check_ipmi_sensor_v3.1.tar.gz 19135 SHA256 ca029bc2be34fbe56c49c681dc8bef7bae02a7a2b38644cb909912f7256e1151 SHA512 b6af98af23ebff361cf2f94ff6c4b083ff175532c1f65b785d6b928db896a6109437f64bb7a93688f20574f0b92485e40d3d0aa4785113703527574b9c28b079 WHIRLPOOL 55868ea709da81ef73854a99d51bc3258fd0dc4dae0cf360c3d65c9c9272a8ddfc086bca59258077b209788e2f34fbbcee917e3bbeffaf8e557dc63a586f1fbd
+EBUILD nagios-check_ipmi_sensor-3.1.ebuild 641 SHA256 b3d9fb70b8ae3a8a2877b7c4dd3a1e14f0f7ad84e69140c8855e1854bb6b90d8 SHA512 293f24c7db18152e93313d427d294567e8a85bc03e1e2e37f0b89c896761f0c23e36c8c08f5d9376f83fe3bd3d337ceb6cc229d26cc11dc33b18c2071a3be757 WHIRLPOOL 5a3f8a7ed30b3131a61eaac7a1d49e74372411d945e61be9fa461d09506ac69169393a224b1faf282d66c91600e0b6dde7be501164b92667ac5ca11eaed841cf
+EBUILD nagios-check_ipmi_sensor-3.2.ebuild 722 SHA256 b706240d1ad640d283527b501946c536c8955d808a0f9947b378bd910babdeaf SHA512 4077d57299356738e94f71e0c8b09c687d32696a21a4448d4f3192a2ebeb2f3edfd366b212ab3593b35dc427fc75b432a29f1bee99b68446a64df69701b23c21 WHIRLPOOL 2374cde71eb0335d42cf62cabc11ce3309d9ff64ea3a95d64883a14ab3f1368594e37bc1019c8f34354e6db29814fca9fbc936ea3fb4bc9681d3043ba3d63aff
+EBUILD nagios-check_ipmi_sensor-3.6.ebuild 724 SHA256 68124806688ab46de43cef3d1f5ef1643356c9abd5b9d1ea7f5bc77ce8806eda SHA512 b13e5fd1d9261b25f225bfff0b9f55b37f0b01cef50f19a5feb0c9db671906f423e6386f87ef8420183d5583c6e24ac815b6c7d93c5a17abad04f0077bd33326 WHIRLPOOL daf1b5319673b91fb318a9365731aee6739b380cd43081f120a51c9614ed48a6bae93d697b909ab91b64288522d98534bedf889ca39c787448fa5b85bb657039
+MISC ChangeLog 2644 SHA256 edff24a78ba1db7a52c71c6d9babf5e1f057bd8ac4e6dd5c727ae00f8219cb84 SHA512 66abdf7cc5e4715d82f528143b46182008ef144157f72e658aeb346c123646d7bda71078d0e344893cd4088bf5d1a05d43c7bdb8c278a077003db81276ee96a0 WHIRLPOOL 8b2b70aae19e3e78a98a37f10e72f15daf04f61758dd3f9b27e5cbfb0702528f66a00748a07e1260f8806024ef5e8894a38a55badec33aa97953b1b8466ba8ab
+MISC ChangeLog-2015 1207 SHA256 64c27fdda0015956508789154b5c5afcaffb35cdabca17facf5c531ce76c6698 SHA512 d3587bdbbfbe7c5f3d71803bb0ad748b7b9d42120953f439e29afb794813c74263e0d8e3118cae4c78aefde3e07a1dd8c1fc6c9a561aff3c851d1966f90fc99c WHIRLPOOL 04247e5cc48a40fd68350389bb9edf5864a091dc79d9746137e7fdbd6f4af23b500ab72897997d18dd8465331e6e5954c2ffa16684fb3b9874df7f518cc3b500
+MISC metadata.xml 672 SHA256 2b55b078cc25c3bb788b82672eaa2382ea6019b03a83a65b871492e857575591 SHA512 ecb95b93ec10a2146b20b558e26009d5bc1ecbe06513811a1e38426466e1117cef75d5b8957957d1ddf594b37fd4d94d07cdf7c75217a0e26189294a0d07b208 WHIRLPOOL f62f364c65052e5f131b3da73e548992fae58b5dc4701062ff84fa832ca6c7d91e9733c7a28aeb755121f62111d030061a9f2d8a38283b20e8fb94be69aa3db9
diff --git a/net-analyzer/nagios-check_ipmi_sensor/metadata.xml b/net-analyzer/nagios-check_ipmi_sensor/metadata.xml
new file mode 100644
index 000000000000..ce7012f3276a
--- /dev/null
+++ b/net-analyzer/nagios-check_ipmi_sensor/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>idl0r@gentoo.org</email>
+		<name>Christian Ruppert</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>wfischer@thomas-krenn.com</email>
+		<name>Werner Fischer</name>
+		<description>Upstream Maintainer (please CC on bugs)</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>sysadmin@gentoo.org</email>
+		<name>Gentoo Sysadmin Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	</pkgmetadata>
diff --git a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.1.ebuild b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.1.ebuild
new file mode 100644
index 000000000000..0993cde08f51
--- /dev/null
+++ b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit multilib
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN#nagios-}_v${MY_PV}"
+
+DESCRIPTION="IPMI Sensor Monitoring Plugin for Nagios/Icinga"
+HOMEPAGE="http://www.thomas-krenn.com/en/oss/ipmi-plugin/"
+SRC_URI="http://www.thomas-krenn.com/en/oss/ipmi-plugin/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+	dev-perl/IPC-Run
+	sys-libs/freeipmi"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	exeinto /usr/$(get_libdir)/nagios/plugins
+	doexe check_ipmi_sensor
+
+	dodoc changelog.txt
+}
diff --git a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild
new file mode 100644
index 000000000000..ca84b3bf75e0
--- /dev/null
+++ b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib versionator
+
+MY_COMMIT="8120430"
+MY_P="${PN#nagios-}_v$(get_major_version $PV)-${MY_COMMIT}"
+
+DESCRIPTION="IPMI Sensor Monitoring Plugin for Nagios/Icinga"
+HOMEPAGE="http://www.thomas-krenn.com/en/oss/ipmi-plugin/"
+SRC_URI="http://git.thomas-krenn.com/?p=check_ipmi_sensor_v3.git;a=snapshot;h=${MY_COMMIT};sf=tgz -> ${MY_P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+	dev-perl/IPC-Run
+	sys-libs/freeipmi"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	exeinto /usr/$(get_libdir)/nagios/plugins
+	doexe check_ipmi_sensor
+
+	dodoc changelog.txt
+}
diff --git a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.6.ebuild b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.6.ebuild
new file mode 100644
index 000000000000..54faddb493b8
--- /dev/null
+++ b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib versionator
+
+MY_COMMIT="14e6586"
+MY_P="${PN#nagios-}_v$(get_major_version $PV)-${MY_COMMIT}"
+
+DESCRIPTION="IPMI Sensor Monitoring Plugin for Nagios/Icinga"
+HOMEPAGE="http://www.thomas-krenn.com/en/oss/ipmi-plugin/"
+SRC_URI="http://git.thomas-krenn.com/?p=check_ipmi_sensor_v3.git;a=snapshot;h=${MY_COMMIT};sf=tgz -> ${MY_P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+	dev-perl/IPC-Run
+	sys-libs/freeipmi"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	exeinto /usr/$(get_libdir)/nagios/plugins
+	doexe check_ipmi_sensor
+
+	dodoc changelog.txt
+}
diff --git a/net-analyzer/nagios-check_linux_bonding/Manifest b/net-analyzer/nagios-check_linux_bonding/Manifest
new file mode 100644
index 000000000000..0d90717b078b
--- /dev/null
+++ b/net-analyzer/nagios-check_linux_bonding/Manifest
@@ -0,0 +1,7 @@
+DIST check_linux_bonding-1.3.2.tar.gz 24540 SHA256 4c10b9c6840d70d736d3d18a95c5173624f97d76b9d107cc77b8cd0075ca9963 SHA512 c00eb7b209d49c8552b1e5e38196890bc4c5bed26d57af8c8b89e750488bd0822c74ab2efa58ba20309cfe6444e5aafd98db14946a5b09e334fb5f9a4fd404e8 WHIRLPOOL 03a4e00b45bbe8ce574f5a0893ad71c80050cd14c141193f360b6f6e4262305349e658d9645fb2daa800561a9b9bf28d12d3a4b3db1988949f14e1f080834446
+DIST check_linux_bonding-1.4.tar.gz 24670 SHA256 67d663740c0c84b7069c805048e7c5a0c50f818d173dba514a8e68c5bbc6b4a1 SHA512 2b1e11007680accd8667ceb8710c7a7448766fd0c5aa3be60a34209f1b25892e7fecc46f9fc5e7cc0d4776f68cc17f8db8d8f2758695c82045a5832e8a4c7e81 WHIRLPOOL 1bcd792469c87d1ca3971fdf342bf7f82d435c1c59c2aef83348bb10e2f14dab2a7ecbb3d2a8788e92ed22e726d8ef79ef838442a73340083de3726341afa1e7
+EBUILD nagios-check_linux_bonding-1.3.2.ebuild 715 SHA256 11fed043f9e923f8ad6d8057d6e1cd3d23235c8698007210260e62cf85635b51 SHA512 1c3e9cabe175877fb22d3e9821b9d9d54eabd37e7c2ac1f49071e618a335a24b4f8293ec26fc44048c45136ef33630a7e12c3c54396664cf1593d4ff4db8cd2a WHIRLPOOL 4272ba4e16faeedda5a48acdb17ed032f7cd8a0df6da6f99537043f9f365d1206b8e110ec7a1a27f0a588afc3a99b86b229e5c04698e3b45b1d0afde1666bf5e
+EBUILD nagios-check_linux_bonding-1.4.ebuild 715 SHA256 11fed043f9e923f8ad6d8057d6e1cd3d23235c8698007210260e62cf85635b51 SHA512 1c3e9cabe175877fb22d3e9821b9d9d54eabd37e7c2ac1f49071e618a335a24b4f8293ec26fc44048c45136ef33630a7e12c3c54396664cf1593d4ff4db8cd2a WHIRLPOOL 4272ba4e16faeedda5a48acdb17ed032f7cd8a0df6da6f99537043f9f365d1206b8e110ec7a1a27f0a588afc3a99b86b229e5c04698e3b45b1d0afde1666bf5e
+MISC ChangeLog 2718 SHA256 b2698dd8c126c3051e14e7c9dfeb4bb0e62389fb106721a7bf7e8925c4c95776 SHA512 6af8b04af9c86a90263c0be6f6c82a7b7e4a6c1eb2d617d21355420df680657debdce18b8e54f5d7ab37ac8945aa4f3eca64223f1b7311c4d0fe9495c5de919c WHIRLPOOL 8ce503d6e6d7e353019bf29765151edc90f064840052faa389bc584bb262b7a186ae3b3ece28f1572ee7f6949b7a4e3a8f170fc8c6b6c689ca33f6a36ea73d3b
+MISC ChangeLog-2015 653 SHA256 0e768b0d321620c76085f4d23962fdff9af2a9fea9fc445b51538fe2c9388693 SHA512 00cea21d368cc6b32f519da4b104d85a9a6fc250eaa6d281acbb270c2f0892f94a359ba44f862c71e0e8b34a8bfd787aa7b18341fd9ef7fe8c413be810673afa WHIRLPOOL 08f85cd073270ac1f37ff10655146636ea1a1baced57600be37e206badb0bb2871c4512fd7b3bdf3f7911286f131db003b2e54b4bbcd4501abcb78cbfae4aab3
+MISC metadata.xml 254 SHA256 e3dd2c0f647ce0f3b9fff87148dc222ca901e0c9f74cebdc99143f962c1ecff6 SHA512 d54bbd438702882474a84ef2661d0010a26676a9b1d2315076519409fe5432f4e818fa8c4838f3f773be36dc1ebe18f291e9ed81f87ef6e059ef2ecde072cfd6 WHIRLPOOL 1c91c8c3d7201c0e83ac54baf47be75109e719de2481e22ba51734a5fbca0a1b770abe1e90eef34629b9f8135768f9fcb87ffd2cf52f8d88e11336c80bcbb0ae
diff --git a/net-analyzer/nagios-check_linux_bonding/metadata.xml b/net-analyzer/nagios-check_linux_bonding/metadata.xml
new file mode 100644
index 000000000000..1b3572fd9b8e
--- /dev/null
+++ b/net-analyzer/nagios-check_linux_bonding/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ercpe@gentoo.org</email>
+		<name>Johann Schmitz (ercpe)</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.3.2.ebuild b/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.3.2.ebuild
new file mode 100644
index 000000000000..f4770fb1ae58
--- /dev/null
+++ b/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.3.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib
+
+MY_P=${P/nagios-/}
+
+DESCRIPTION="Nagios plugin to monitor bonding status of network interfaces"
+HOMEPAGE="http://folk.uio.no/trondham/software/check_linux_bonding.html"
+SRC_URI="http://folk.uio.no/trondham/software/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	default
+
+	local nagiosplugindir=/usr/$(get_libdir)/nagios/plugins
+	dodir "${nagiosplugindir}"
+	exeinto ${nagiosplugindir}
+	doexe check_linux_bonding
+
+	dodoc CHANGES
+	doman man/check_linux_bonding.8
+}
diff --git a/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild b/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild
new file mode 100644
index 000000000000..f4770fb1ae58
--- /dev/null
+++ b/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib
+
+MY_P=${P/nagios-/}
+
+DESCRIPTION="Nagios plugin to monitor bonding status of network interfaces"
+HOMEPAGE="http://folk.uio.no/trondham/software/check_linux_bonding.html"
+SRC_URI="http://folk.uio.no/trondham/software/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	default
+
+	local nagiosplugindir=/usr/$(get_libdir)/nagios/plugins
+	dodir "${nagiosplugindir}"
+	exeinto ${nagiosplugindir}
+	doexe check_linux_bonding
+
+	dodoc CHANGES
+	doman man/check_linux_bonding.8
+}
diff --git a/net-analyzer/nagios-check_logfiles/Manifest b/net-analyzer/nagios-check_logfiles/Manifest
new file mode 100644
index 000000000000..d871d08e51a5
--- /dev/null
+++ b/net-analyzer/nagios-check_logfiles/Manifest
@@ -0,0 +1,5 @@
+DIST nagios-check_logfiles-3.7.6.3.tar.gz 238683 SHA256 8f782297f276024b4ff545b7c7094eb3a6981ebb719c5cb91fea05267fe3ef04 SHA512 2f72d571bfc0815e12b5c9a6e178b7b9b6e58d69e2d1a3efc560dd6b7bfd3d04a705d15e93069959611be1981941866e8775ee7d67c5dbf3983a155ab2ec3c91 WHIRLPOOL 8b45071210c35e8f3fba5f7b586b23baafaa3fa8a8a1e25d13a97cfa9fd04d8a4ae83b67b66b07956721779cf601e2eb26d4b4109206887d1cb9e923b73ca5ec
+EBUILD nagios-check_logfiles-3.7.6.3.ebuild 665 SHA256 92278e525947734924cda2cda3ff83cd6ead3d67aab6b259ffa7eebeb7580c35 SHA512 61c6bbcb2ea40f575f53259bf97638c7966e62153fc0c6d20116b2475c93368b8fbe3beb708307689f55f6fc6634d28f25a71f04c43b1b9fb2af2fcfabaec8f1 WHIRLPOOL ab2433f4119daad1c1eb925477b0a8e92e5b8dd760b5a570fb988cb5fadb07aaf5ba152635bc7707a7d588f1243df9a9364b044cad7c4fe724690459063ac7fb
+MISC ChangeLog 3962 SHA256 9d7c02d482d324c952c376a1c752ee7e6817b0efef582f5526a5b8ca5168f3e2 SHA512 7832e1a967a85f49c6b57de153e878961643dcf552410400a2604de0c89ec2e7e7dce08a554ad94836c4af5dc30ba46ddc047160807be87af798a6e9d5f6061f WHIRLPOOL eb9e275ef0af7fcdaa6ab95507a9abb1accf502e0486a91a5a067c04b0f953d09a881e734ee461cffb1a992c7b9735afe9c93cd1a13d2dee8ab216a6f32bbb9d
+MISC ChangeLog-2015 2370 SHA256 041fa8ce3e0f94d35116d045b65a813213d574ded9b626ea993e00241fe3ef5f SHA512 73a7ea13f431aa283c2f37df199443ba66472512cbcb7d0dd67be3629e54a364f71ba6e9a11ea705dc8ad44bc03d6eaebd0681ebbffbd4e8f6bd5e2f64580012 WHIRLPOOL affa2d433174ff3d8137b60752089a9eae23c527bb0cadf3a6e89aac87dde19b9a293838b872e75a5c2fc1711ed77f4d5128a4255d078bf85f047f17510c090d
+MISC metadata.xml 369 SHA256 f48bbe8ed774a32df5624771e455bc09359b1cda143d066bf80426ec3c92c8ac SHA512 fe2c7e4ca898e3af6ded0a8b525b6441ae55fd4ea74f5355b2932d9a5c87ecd930cd5566a5804b978ef882ce7e4fc53055ed9c097d97806bb94d3a8d1b94fc02 WHIRLPOOL 9ea6a71a132c3d4a86ad397ad6a7d57ddb76cc058678e92f593f76621413f1664dba21056627d30d4723e0920af24ba4511a5143df5fbbcc53f1b66781df3c34
diff --git a/net-analyzer/nagios-check_logfiles/metadata.xml b/net-analyzer/nagios-check_logfiles/metadata.xml
new file mode 100644
index 000000000000..690dfd5d057d
--- /dev/null
+++ b/net-analyzer/nagios-check_logfiles/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>creffett@gentoo.org</email>
+		<name>Chris Reffett</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sysadmin@gentoo.org</email>
+		<name>Gentoo Sysadmin Project</name>
+	</maintainer>
+	</pkgmetadata>
diff --git a/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-3.7.6.3.ebuild b/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-3.7.6.3.ebuild
new file mode 100644
index 000000000000..bf4835955eaa
--- /dev/null
+++ b/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-3.7.6.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A nagios plugin for checking logfiles"
+HOMEPAGE="https://labs.consol.de/nagios/check_logfiles/index.html"
+
+MY_P=${P/nagios-/}
+
+SRC_URI="https://labs.consol.de/assets/downloads/nagios/${MY_P}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+
+KEYWORDS="~alpha amd64 ~ppc ppc64 ~sparc x86"
+
+RDEPEND="|| ( >=net-analyzer/nagios-plugins-1.4.13-r1 >=net-analyzer/monitoring-plugins-2 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	econf \
+		--libexecdir="${EPREFIX}/usr/$(get_libdir)/nagios/plugins" \
+		--sysconfdir="${EPREFIX}/etc/nagios"
+}
diff --git a/net-analyzer/nagios-check_mysql_health/Manifest b/net-analyzer/nagios-check_mysql_health/Manifest
new file mode 100644
index 000000000000..8e802fb9ead5
--- /dev/null
+++ b/net-analyzer/nagios-check_mysql_health/Manifest
@@ -0,0 +1,7 @@
+DIST check_mysql_health-2.1.9.2.tar.gz 139293 SHA256 fc46225372bd29a6bd0256db612c1a050892b99889e67788f3a4242df16e629b SHA512 4a68f5f9c53d9c612e7b7185c1d593f896d4122887088f2c2dd824efa936da42c28ae720e5fbe513654721e8313530bfa3b3b973fe19009d6c7fc561402e66f7 WHIRLPOOL a5454bccb944588190572b2b3146c9cbe38745569baa7c55bcb5e96c09a1b2a908218907b8b6f921c558f38d51925578ab6381eca4f5732c9ffc0a3c1ed41380
+DIST check_mysql_health-2.2.2.tar.gz 140250 SHA256 bae2a2b415a902a42287459acdc4dda5278decd43bd24b4ac7770ec2ad11559f SHA512 027e47747aba524d8c7d168f6c440271434db2e152e59821eff06449d98919ab343a7840ecf73a1fcbc864799d6d3094088bb06f6b36b16989a5184676ae2628 WHIRLPOOL 370c1bcacdb4d5d66b1241e898e9cd7a374699df98514d345c784e4e9edd39b58f062d860d759c8abed9524bf8842f4c4270c196092cc86caf93c1583728a54b
+EBUILD nagios-check_mysql_health-2.1.9.2.ebuild 1158 SHA256 98872e0809312d96e14f465939436c8b1b608c4fa72af218aabeb511713d5fb1 SHA512 fc946ded7de791366e95b21ebaa38f41ee9cf7ab29374066104c3bcd8147971117b17f1c8515599a7ca9ff3a161087f25230ad4db4fd0eddd0f61d1b68482a0f WHIRLPOOL 9e66db64fa648fba9b5d7b2956359f0f1bab529c164ccb5a0774efe52dc0637214989b80b8c46cb60350a59fc8a5ee73c8048a3f263efaa5342d8e03c75383dc
+EBUILD nagios-check_mysql_health-2.2.2.ebuild 1142 SHA256 a3a7df4ee10df825fd7fede7b3287940a6e79c5d88dfbda80659e8e1e38ac1f0 SHA512 4701d50c8ea95ebcc36dbee8d6d9584506f94911ac867d407199f826188557f552b53f31545991b09731e110ac8b572edf5c780fc4ecf652f9fdbabd0ac4860a WHIRLPOOL d7086c8fbfeeef1ee1272159c603788f0f4f376883a9e0d95afc680fc38ffa87efe7b16105960e3c425b1c45d6c1fe7f61c5edef74391139b2d6c8daa98b10a5
+MISC ChangeLog 3462 SHA256 08c83180e2663e66482eec7014c24b79529d91eeee690803a23cc5289d2bbbfb SHA512 dd57fa3bfd2a556a353e124211c863ad7dead4df6281eb251da38dcb5487aba530ccce40017491c242696b84002d345375a52710ecd167b0899662c4f3e805c1 WHIRLPOOL 05f35acb5a0537554347f5e887e6079c1767396f3ec337939611e4859883116dca5cb283dd8fe886c6914ecb5e5cc654c482590cb93f18c74502ac68e7f642de
+MISC ChangeLog-2015 2240 SHA256 54599fc5ea8f5147f8de49ad5927419688f0549ddd0752095c838b6f407398ba SHA512 7f4cdbccf8238c54aa179c85e78715728228ff2257f8a562fa6e66bae5dd9139aa54fb70acf1deb7afbee1ac1a7bbc1c12c2852351baa604527dad0cd6088dc7 WHIRLPOOL 19b3c7e3dc44f6d94212bbc4976702ae8ad3f3a46de92116bc79b6e23956293de0db240ea6d3ec8e4b90c74800194f4539e55be18bd89ada66fb158f3b96e7e7
+MISC metadata.xml 256 SHA256 f684681d61e8fe16e202c27803783224f1dd31ad83a13febe1b418dc1b547000 SHA512 2c63ddb5d1254a9c4c14b6a41b12a2152d2230fe5c79fe7e7e2351dd23037c7422dcff80e1731259c6a233020bbd5d438ec1c2ad0fba114ec33ea97a4dc5826e WHIRLPOOL 30efcd932e14dcedab9bdeb3fc9c5543937e710aa5cfbfaa84c1a9dc20cb3082d1253dd045e6f74d2c549730e67549fa48df40e99d21d74f23ece036a52f82d1
diff --git a/net-analyzer/nagios-check_mysql_health/metadata.xml b/net-analyzer/nagios-check_mysql_health/metadata.xml
new file mode 100644
index 000000000000..1e9767fee723
--- /dev/null
+++ b/net-analyzer/nagios-check_mysql_health/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+      <email>mjo@gentoo.org</email>
+      <name>Michael Orlitzky</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.1.9.2.ebuild b/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.1.9.2.ebuild
new file mode 100644
index 000000000000..0048f8658de8
--- /dev/null
+++ b/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.1.9.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib
+
+MY_PN="${PN#nagios-}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A nagios plugin for checking MySQL server health"
+HOMEPAGE="https://labs.consol.de/nagios/${MY_PN}/"
+SRC_URI="https://labs.consol.de/assets/downloads/nagios/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+# Found by grepping for "use " in the built
+# plugins-scripts/check_mysql_health.
+RDEPEND="dev-perl/DBD-mysql
+	dev-perl/DBI
+	virtual/perl-Data-Dumper
+	virtual/perl-File-Temp
+	virtual/perl-Net-Ping
+	virtual/perl-Time-HiRes"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure(){
+	# Should match net-analyzer/{monitoring,nagios}-plugins.
+	econf --libexecdir="/usr/$(get_libdir)/nagios/plugins"
+}
+
+# Here we should have a pkg_preinst() that creates the nagios user/group
+# (using the same command from e.g. net-analyzer/nagios-plugins). But
+# right now, the build system for check_mysql_health has a bug: it
+# doesn't use the configured user (INSTALL_OPTIONS aren't passed to
+# /usr/bin/install), so it's pointless. Don't forget to inherit
+# user.eclass!
diff --git a/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild b/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild
new file mode 100644
index 000000000000..eed773ec2099
--- /dev/null
+++ b/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN#nagios-}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A nagios plugin for checking MySQL server health"
+HOMEPAGE="https://labs.consol.de/nagios/${MY_PN}/"
+SRC_URI="https://labs.consol.de/assets/downloads/nagios/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Found by grepping for "use " in the built
+# plugins-scripts/check_mysql_health.
+RDEPEND="dev-perl/DBD-mysql
+	dev-perl/DBI
+	virtual/perl-Data-Dumper
+	virtual/perl-File-Temp
+	virtual/perl-Net-Ping
+	virtual/perl-Time-HiRes"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure(){
+	# Should match net-analyzer/{monitoring,nagios}-plugins.
+	econf --libexecdir="/usr/$(get_libdir)/nagios/plugins"
+}
+
+# Here we should have a pkg_preinst() that creates the nagios user/group
+# (using the same command from e.g. net-analyzer/nagios-plugins). But
+# right now, the build system for check_mysql_health has a bug: it
+# doesn't use the configured user (INSTALL_OPTIONS aren't passed to
+# /usr/bin/install), so it's pointless. Don't forget to inherit
+# user.eclass!
diff --git a/net-analyzer/nagios-check_openvpn-simple/Manifest b/net-analyzer/nagios-check_openvpn-simple/Manifest
new file mode 100644
index 000000000000..1948ae50b9a9
--- /dev/null
+++ b/net-analyzer/nagios-check_openvpn-simple/Manifest
@@ -0,0 +1,5 @@
+DIST check_openvpn-simple-0.0.1.tar.gz 13597 SHA256 f761c7e5c4673b62ef50bb67be61efe178791fc5aa54c62695c5fee7f4a50fae SHA512 186575e4de4fd5f27f9701b5e5a56d8b6eae454bfefd8b13e6cbcee9da795833a567fc7a4fc5331a1498f6c0428599f0ec895acecb410e95e37ed43df58abc8f WHIRLPOOL 8441b69f83526bbda730d61a26fe3ce62bb70963ce5220c77c60e19c5772adb3508ba73f768b02e5640b8e8e1e42c5a1c70b6bdbb14d18417c406bb5d885deba
+EBUILD nagios-check_openvpn-simple-0.0.1-r1.ebuild 1195 SHA256 0a6079dbccbccee29fb78df4595ad6037aea7d0475e5e675ce2a1ac98462e119 SHA512 68a5f5b6864802b92360d7819f04409ef1def77369769416b05143bc6d52c98293155bcdec9ace15dcf21c5662a0ee93265d00eed250e25a6738f2fb3239ba98 WHIRLPOOL 003a93986abfcdda3c049ae23a01db261dfe92819694b24d55ffaae3dbcf6f6c68193e73dc21a8e341f0988d24432ffa80993803a36c22ab18bb000634f8b319
+MISC ChangeLog 2660 SHA256 d5ca1263823f8b573e80117d34ade54b8dcc49a0d749dba8ea39d143852f8a81 SHA512 8b1f930f7872737b08ba4d8fcb4041fe14361af7e39d55894665088e516116b76e8f16ad55e1516e55e8ced700e20b6df0fa1aff1c47c6670f4e12cbeb31254d WHIRLPOOL 1c406ad6dee3c33540d741fd45d96adb8c03f7d77ce22d99702ab9a6c226364dbfad6b63d28ccab2c72bcec0a6b188422981a0cd20005594f2da28d17acf348e
+MISC ChangeLog-2015 1015 SHA256 36f7499cb1ff04cc2a9f6df24efafc32a82b80e88ae4196905d01610f4c364b1 SHA512 a07937c0f693603f05417aa5a5742f604869f8a75d8ee591c2fd45c39782d33a8efb46f0fd26fa51494127fa42605ae0ad114be8a69d17796720298aa5e46ffe WHIRLPOOL bbec2d76d4c3dbfc7d5d2450aab714a6a78b8b6f6d26c5ee8fd7022ccb0687396550fa6776664965e3dff716faf193cc09001f8bdd82c625d79ac06c2b0c152a
+MISC metadata.xml 252 SHA256 f12a15b7cc3ce0ff76c3dbbeba9d162cac9771fb6ecc0f965a34e93f73e67d52 SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742 WHIRLPOOL b7954a2a1cbccce0641aaf3dd273bf6dc64e7b5d39097eefe4d0c06eacc0b5f310db23e93a0a2fff7c8c735193acb1c5c8d4210bf77e78d457d50d05412796e0
diff --git a/net-analyzer/nagios-check_openvpn-simple/metadata.xml b/net-analyzer/nagios-check_openvpn-simple/metadata.xml
new file mode 100644
index 000000000000..45125b9b6e99
--- /dev/null
+++ b/net-analyzer/nagios-check_openvpn-simple/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/nagios-check_openvpn-simple/nagios-check_openvpn-simple-0.0.1-r1.ebuild b/net-analyzer/nagios-check_openvpn-simple/nagios-check_openvpn-simple-0.0.1-r1.ebuild
new file mode 100644
index 000000000000..e08a6ef0d41d
--- /dev/null
+++ b/net-analyzer/nagios-check_openvpn-simple/nagios-check_openvpn-simple-0.0.1-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit distutils-r1
+
+MY_PN="${PN/nagios-/}"
+MY_P="${P/nagios-/}"
+DESCRIPTION="A Nagios plugin to check whether an OpenVPN server is alive"
+HOMEPAGE="http://michael.orlitzky.com/code/${MY_PN}.php"
+SRC_URI="http://michael.orlitzky.com/code/releases/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_install() {
+	distutils-r1_src_install
+
+	local nagiosplugindir="/usr/$(get_libdir)/nagios/plugins"
+	dodir "${nagiosplugindir}"
+
+	# Create a symlink from the nagios plugin directory to the /usr/bin
+	# location. The "binary" in /usr/bin should also be a symlink, since
+	# the python machinery allows the user to switch out the
+	# interpreter. We don't want to mess with any of that, so we just
+	# point to whatever the system would use if the user executed
+	# ${MY_PN}.
+	#
+	# The relative symlink is preferred so that if the package is
+	# installed e.g. while in a chroot, the symlink will never point
+	# outside of that chroot.
+	#
+	dosym "../../../bin/${MY_PN}" "${nagiosplugindir}/${MY_PN}"
+}
diff --git a/net-analyzer/nagios-check_pidfile/Manifest b/net-analyzer/nagios-check_pidfile/Manifest
new file mode 100644
index 000000000000..4355a5ced7a0
--- /dev/null
+++ b/net-analyzer/nagios-check_pidfile/Manifest
@@ -0,0 +1,5 @@
+DIST nagios-check_pidfile-1.tar.gz 2137 SHA256 1448331938e586f0764c2f752487c5873eb02f16c7075dc9a5bf1adc8f362973 SHA512 a24493a72f6d9fb4daf606a131a3a6cafe6085b1d47f7b0f7944642929e86b5d29cf46fb28c20b7683ea5b9a99beb93bb5f32a08542e2e9af613e4cc62197ffe WHIRLPOOL c2ba19beccd2d9d65773df0f3c0cd87041a5f54a7d8518c46746b479b7a53e337b6cd158f082c15fd0dd0e9afe5285d3067d5d019cefd9d03603691598a63b5b
+EBUILD nagios-check_pidfile-1.ebuild 618 SHA256 4e1035d89b76b7524a5d3d2cbd17efec8717c1b8b36bdb193348cf7036cbeac3 SHA512 3090231d43fe8c6ca96310098ac5bdea62f28f719ac1327174be52d895467c7902b535bbfac02fe464f1fcfbd08ee7775837fb8248dc0e86b5df70d067fa7e8a WHIRLPOOL cb4d953a9be9663f0b0c2f49fd61acc1a08a6746baaa493a02e9b8103a4a4a3b1a3af56da55f6e7422b23284d8112199f6f2cf5820573464a834ab9f0317fbdb
+MISC ChangeLog 2583 SHA256 8b730acfbd8fc194663ec7b8b16d1ef12865cd2a633c3eab818573a0f430db00 SHA512 b026260d5fc26881f7534dab595a395b583a57ea909ce8631e7bfefc455fde73b36fa404f5dfe74cd9f942844df23fb3cc3781729eed75fb05c21d69fe7374df WHIRLPOOL 433c6d14a4a46d6674ee6daf2b191515c11aaee0cb655216b3ccccc1ed51f70810a80eb74df72858cbfbeeb3dcd161df80d6c10802d91ba37d72eac91ae43d2a
+MISC ChangeLog-2015 918 SHA256 010d4734614933f01a92d4062430b8a513219979f9437a2484aa48dba752e040 SHA512 8d527081eafabd96871f296e094ff90689635a91b70d0e7d0b8b04d5b5bd744f4948d812503a861436541fef3a2ed596cf64313af71f1219cd089b384ef447ab WHIRLPOOL a0c63a85787338663f27b27ad3cd2b3c792a3893a89d237b0e579c10c8c3e001a27d7f8049ca17e4452a1340b5b0546c2cbcbe918bbb6dc14548cacdcffff28b
+MISC metadata.xml 255 SHA256 f6155d1393970ed92bd92686eff91f387b0759e4023f2dfd79f3bca018f7e283 SHA512 b6272d646623ad562c319bdca88879d228d8ebc62b9227bbfab0371790c9bbbe8e4f6958970dd6030da55b09ffd6a3903c946fefe931baf6bf7164167dcead52 WHIRLPOOL 644d8929258aa9317b5aabb7540a0f6d4ee9c1570b8f941043a6f520e35fbc80889e1dc54bd05980c5d62c321a5be8c5ceccdd5f66d414aad4fa42d9fe676bb7
diff --git a/net-analyzer/nagios-check_pidfile/metadata.xml b/net-analyzer/nagios-check_pidfile/metadata.xml
new file mode 100644
index 000000000000..b0bc64ef4267
--- /dev/null
+++ b/net-analyzer/nagios-check_pidfile/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="github">hollow/check_pidfile</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/nagios-check_pidfile/nagios-check_pidfile-1.ebuild b/net-analyzer/nagios-check_pidfile/nagios-check_pidfile-1.ebuild
new file mode 100644
index 000000000000..0c557fdb768e
--- /dev/null
+++ b/net-analyzer/nagios-check_pidfile/nagios-check_pidfile-1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools
+
+DESCRIPTION="A nagios plugin for checking daemons via pidfiles"
+HOMEPAGE="https://github.com/hollow/check_pidfile"
+SRC_URI="https://github.com/hollow/check_pidfile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="|| ( >=net-analyzer/nagios-plugins-1.4.13-r1 net-analyzer/monitoring-plugins )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/check_pidfile-${PV}
+
+src_prepare() {
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+}
diff --git a/net-analyzer/nagios-check_rbl/Manifest b/net-analyzer/nagios-check_rbl/Manifest
new file mode 100644
index 000000000000..da318f6d16b3
--- /dev/null
+++ b/net-analyzer/nagios-check_rbl/Manifest
@@ -0,0 +1,8 @@
+AUX nagios-check_rbl-1.3.7-perl526.patch 347 SHA256 d11ead366c83234812b058b319571f1ce400be6c50dc5ac40c32355058029a46 SHA512 704b4fbb92d3abf4964dfb2affecf9577df263745d869c213c4a645b85f52c5a9b969088143c46f58b5de0be3549de2c383e52b33a3746f9ae07da9563f8d266 WHIRLPOOL 6e1b9bfa5b5266db42b5da03d84a0a366c5c239c3506b98d66a1957c06640bd73c061703e8c707daaa8b5707394b7dd2f70a2c816c316f1162bfe80196c81d67
+DIST check_rbl-1.3.7-r1.tar.gz 38565 SHA256 dbe76bd24ab9404817f74fd895dfeb1c55d296fe9a8264a4c631c5139ea31247 SHA512 a918090b2c1e93095b155215de559b0d7f35c949e9c9d27c7b6dc91e21391b03d716154dd90ea1a68deeabce5afde3c9e5746190910f18bf1d3e08ff20d02431 WHIRLPOOL 31a13de7cfc650deea83d8c7cf148358046260502c34e3d643ad53c1e96854b0194da80fac3d95cf5fa06b01d9224fb9716ce3e281148ce174f89e75bb418023
+DIST check_rbl-1.4.1.tar.gz 47585 SHA256 6121e01be4b65f4ed34e8387366a616ceef79f74e44322f68ea8d384c193a177 SHA512 3023aab6ba42dec46cb93eb2ef15e1998a1b3226bd1f143441e14a4271279ac9b24b85b9fc41a382eb203e5d2846b7f4ea4fe27db99d75b104d9182ea53079cb WHIRLPOOL 535cbfad9cb300e51526ea7127ed5c25a2274a0ade4aaa98e3755793fc82ac7adc91a34adba6af2a8d0708869317c33aeccfaaf5bf6c6b2f44974c0db9f99406
+EBUILD nagios-check_rbl-1.3.7-r1.ebuild 2092 SHA256 e09e647308a654d171daf9824a49d88894d29ee6f4d3896606b8b6bf9e6e2138 SHA512 64cc8c4a2dce5b65e7a05d62e9b3a82425bdbf55aa39aa50c82b158098f394daae61d457b77b1b2de5be38d42a74c1a7db9e383143d7149cc88e9c4dfa737b57 WHIRLPOOL dd1ce4321c110bcf52631cb0f3be8b2c3d2c3f8b1782ba14d3bce6006cf062ebf1797fdb484ed38198e439913c76763a7988d65cba0272638fdb709399303e8b
+EBUILD nagios-check_rbl-1.4.1.ebuild 1453 SHA256 3c9a9e495c960d55d5df57ec9d4e9b1e3d4d3b77280e03567ff113213ece7cc2 SHA512 c4da93075e88bff87e3e3babfc8b95908641cd6187a1139dbac97c2a5651b3d79a8eef8706c79c99af8ca2a6aa96673f000ddb1b23459732fa6f3a90d9b63131 WHIRLPOOL b1a7b0b3b7e17f0ecc48035cf59f9b029040e3c19f6124e9b0d40c9f32fab86c627e49e7d1cac6c7383634080f6680413aade9eb6065e513cd778ca7a5ce70bf
+MISC ChangeLog 3776 SHA256 b0393d619fe95003b3418e3e4d884e47850a4ffe6105e98eaf00b17c0311de6b SHA512 3170c484e9c39f3edf4d1042e7b8611811dde432013af50a26ddfa403a8eeb8cbe0b87f9eff1b6d5f8c100c4b40bfdde6646c51ca1266c2af4663eeaa548cf26 WHIRLPOOL 17f8aca44c4d64505d3dddfd1698943949dbb5066a41a6cef894c8862df4d6bf5a17399511a9c9f11ab1641b08ee044f499dc2e05a37d64d78261d3b41c8fbbc
+MISC ChangeLog-2015 1356 SHA256 1f897895ad7e60695630e76403454849c7eeab387e0aa4ef96a11afeb3c1f62f SHA512 c27fb2eacd085c8725bb72eb236872bcb82fae407547f8a49a0b50b88275ac4fc1c0458892716e42ce5fa870968472b1705521793ff740684fbf476d79ac5b78 WHIRLPOOL f6d59d6d5a082869d0487302e2c990a52fb554882d6b48a8eff29590a124530baead1e3b9fc53415b6c3aa3570318d7c770183cf5ede06ebd3894671c627c6bc
+MISC metadata.xml 468 SHA256 a3d69541ec3415d47f9a111d580f2a492a98d9cf94a9abfce657ee3c6d99fa5d SHA512 e75e18c5bfb8b7b6cbc4729dc791e687403c00a16705622bb1f956e29dccec25a8ce8179a6908358189edd8c0d8c8e29beaa31039a4d0356d7a75cacfec64d05 WHIRLPOOL ca63f90fc1c86212308162df656eb28e5ee225f199bdafe274e2743058c9afb3ab10fa5b62f4b3ea88443cf6ae0915a04738ff9aaedf216da6447fe6ff101a20
diff --git a/net-analyzer/nagios-check_rbl/files/nagios-check_rbl-1.3.7-perl526.patch b/net-analyzer/nagios-check_rbl/files/nagios-check_rbl-1.3.7-perl526.patch
new file mode 100644
index 000000000000..b44ae74a0ea6
--- /dev/null
+++ b/net-analyzer/nagios-check_rbl/files/nagios-check_rbl-1.3.7-perl526.patch
@@ -0,0 +1,9 @@
+diff -ruN check_rbl-1.3.7.orig/Makefile.PL check_rbl-1.3.7/Makefile.PL
+--- check_rbl-1.3.7.orig/Makefile.PL	2015-10-24 13:06:09.000000000 -0000
++++ check_rbl-1.3.7/Makefile.PL	2017-08-04 16:10:49.881515014 -0000
+@@ -1,4 +1,5 @@
+ # Load the Module::Install bundled in ./inc/
++use lib q[.];
+ use inc::Module::Install;
+ 
+ # File version information:
diff --git a/net-analyzer/nagios-check_rbl/metadata.xml b/net-analyzer/nagios-check_rbl/metadata.xml
new file mode 100644
index 000000000000..366e3f343c3c
--- /dev/null
+++ b/net-analyzer/nagios-check_rbl/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">matteocorti/check_rbl</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.3.7-r1.ebuild b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.3.7-r1.ebuild
new file mode 100644
index 000000000000..ab79f03df135
--- /dev/null
+++ b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.3.7-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Needed for perl_rm_files in src_prepare() only.
+inherit perl-functions
+
+DESCRIPTION="Monitor whether or not a host is blacklisted"
+HOMEPAGE="https://github.com/matteocorti/check_rbl"
+
+MY_P="${P/nagios-/}"
+
+# We rename the tarball here because the upstream source changed without
+# a new release. That change happens to fix bug #583966, so we do want
+# the newer tarball. But I think, without the rename, that user might
+# have gotten a checksum failure.
+SRC_URI="${HOMEPAGE}/releases/download/v${PV}/${MY_P}.tar.gz
+	-> ${MY_P}-r1.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+KEYWORDS="amd64 hppa x86"
+IUSE=""
+
+# The package's INSTALL/Makefile.PL files specify its dependencies.
+#
+#   * Data::Validate::Domain (dev-perl/Data-Validate-Domain)
+#   * Data::Validate::IP (dev-perl/Data-Validate-IP)
+#   * IO::Select (dev-lang/perl)
+#   * Monitoring::Plugin (dev-perl/Monitoring-Plugin)
+#   * Monitoring::Plugin::Getopt (dev-perl/Monitoring-Plugin)
+#   * Monitoring::Plugin::Threshold (dev-perl/Monitoring-Plugin)
+#   * Net::DNS (dev-perl/Net-DNS)
+#   * Readonly (dev-perl/Readonly)
+#
+RDEPEND="dev-lang/perl
+	dev-perl/Data-Validate-Domain
+	dev-perl/Data-Validate-IP
+	dev-perl/Monitoring-Plugin
+	dev-perl/Net-DNS
+	dev-perl/Readonly"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${P}-perl526.patch" )
+
+src_prepare() {
+	default
+
+	# The copy of version.pm that upstream ships causes problems and
+	# isn't necessary. They probably shouldn't be shipping it at all.
+	# See bug #583966 for more information. You should check on
+	# https://github.com/matteocorti/check_rbl/issues/6 every once
+	# in a while to see if this can be removed.
+	perl_rm_files inc/version.pm
+}
+
+src_configure() {
+	perl Makefile.PL INSTALLDIRS=vendor || die
+}
+
+src_install() {
+	default
+
+	local nagiosplugindir=/usr/$(get_libdir)/nagios/plugins
+
+	# It's simplest to move this file after it's been installed.
+	dodir "${nagiosplugindir}"
+	mv "${D}"/usr/bin/check_rbl "${D}"/"${nagiosplugindir}" || die
+}
diff --git a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.4.1.ebuild b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.4.1.ebuild
new file mode 100644
index 000000000000..028ce81b4ac4
--- /dev/null
+++ b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.4.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Monitor whether or not a host is blacklisted"
+HOMEPAGE="https://github.com/matteocorti/check_rbl"
+
+MY_P="${P/nagios-/}"
+SRC_URI="${HOMEPAGE}/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE=""
+
+# No, this is not redundant -- see bug 627082.
+RESTRICT=test
+
+# The package's INSTALL/Makefile.PL files specify its dependencies.
+#
+#   * Data::Validate::Domain (dev-perl/Data-Validate-Domain)
+#   * Data::Validate::IP (dev-perl/Data-Validate-IP)
+#   * IO::Select (dev-lang/perl)
+#   * Monitoring::Plugin (dev-perl/Monitoring-Plugin)
+#   * Monitoring::Plugin::Getopt (dev-perl/Monitoring-Plugin)
+#   * Monitoring::Plugin::Threshold (dev-perl/Monitoring-Plugin)
+#   * Net::DNS (dev-perl/Net-DNS)
+#   * Net::IP (dev-perl/Net-IP)
+#   * Readonly (dev-perl/Readonly)
+#
+RDEPEND="dev-lang/perl
+	dev-perl/Data-Validate-Domain
+	dev-perl/Data-Validate-IP
+	dev-perl/Monitoring-Plugin
+	dev-perl/Net-DNS
+	dev-perl/Net-IP
+	dev-perl/Readonly"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	perl Makefile.PL INSTALLDIRS=vendor || die
+}
+
+src_install() {
+	default
+
+	local nagiosplugindir=/usr/$(get_libdir)/nagios/plugins
+
+	# It's simplest to move this file after it's been installed.
+	dodir "${nagiosplugindir}"
+	mv "${D}"/usr/bin/check_rbl "${D}"/"${nagiosplugindir}" || die
+}
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
new file mode 100644
index 000000000000..e8ca1e072d09
--- /dev/null
+++ b/net-analyzer/nagios-core/Manifest
@@ -0,0 +1,21 @@
+AUX 99_nagios3.conf 377 SHA256 0bfa88db78ab036d177c68da20a8fd2f567ba8c9f54c14cfb8e1fc121641051b SHA512 53ceae12cf19d2dda1298e9faaa3ddab9b4d95163df87ccfaa0a58e54d60cf8e005ea32ed827348f1b43aee53258896972b72727145f9a20f6a4e1ce1e56ea3f WHIRLPOOL 63d6c403ff09a5365a42bd3d59e37f67a8af7fef41cb52cfb5facf1a2ff48e53c5c82096a5e3df0f5f58b5e2aac55ee7efbf6de9da2ff475c80285d9b61ea3c1
+AUX 99_nagios4.conf 368 SHA256 cae38c4b5f298c72807e14b66e8cb69bbcbca56edb127c37acf719d26f016fe8 SHA512 f0b239f23d74afa89483806f27fb9259054e46bc5742de8a414c9a9a9852a4fbdc14db45aeb148a15288196c8f7d51bdd485b005e20d012892e9e7321b50e161 WHIRLPOOL 62994852b142363847273b3d101d36929df5727f8d65ac4984a712ffbf5698e4dfc8806a170c832249cf4e9374c85c424e4cd9eb327866011e874cac52dec744
+AUX conf.d 298 SHA256 70d79394b3013848941a9b98d3de6d9321efc07896f395ca35d1cbe1cefe17d7 SHA512 81d1bbbff88b56f2bbad7e38701977eeaeaa56c6511e98fa2675960040dbad45b3243f22742b68c1a18e7df1b2fadcc6593b61e92eac42f7362ae16c33989418 WHIRLPOOL a5851b41af8dd0a12f4842c265f2e5d75742bf2f45f2d9b377104f0f3d6c99b5b942445e3de4edcf9161429aed34d61ca13eaab4491e86f407b42f7f146503ca
+AUX lighttpd_nagios3-r1.conf 482 SHA256 0cbe138afb954ee434dd3ea3146fc0677533085c2f2f8fa7faebe0bb3a64e172 SHA512 8a6811432034f97aa136b4d2c4cf1382c8cb13388eec67a2112034aa1331e08fa73e5822ef78634cf25581b068280736a9efd15848fecaa7215364104778194b WHIRLPOOL a9f53e9eada7efbd4f5f538597d9040fb68c65a3f6b5b728bfa1fa83cf16ab50d8893d80a7d5ebd74352108a56e6add4b39e0f1fe37f4fbc263ad9ec434a36e3
+AUX lighttpd_nagios4.conf 325 SHA256 0326b4d25315e3c446cb98f10e0cc47eadfacae2916c59d5aa2829643f3805ae SHA512 a2f854713512ee8ee5c451235beb6ffccf2e04617a98619c6de807a5abca0a424e0581c34b4d255dcbc108e677e18bed25dd33e3d38df8fe10d7d8d4fab015c9 WHIRLPOOL 3aff58f01e9ce76b471c757b983eb6c1f3bb1a9d870b5d7f32ba1419082c23403ad01f7ffe87e1bc8ea81eb392a88e37f7be0fd229333a535f062e321d3948b5
+AUX nagios-core-3.5.1-process_cgivars.patch 5282 SHA256 a11bdc0ac1324fb36393c4850b41b089a3be1dccafc1d707b935e08c73419406 SHA512 302d45f59f9165771ae766d1a3e085995056c515fc1ae8a61341b44afe7b903f85a2ac5a7dd68d3b9f1944a6d102d63d1fd9aded5d2c916e70affec5d43b766a WHIRLPOOL 661dcf6cea30d147033c5cd16301d43f03f411d05924ac82a8f88b0fe8477d028162d3346095744006db605bc36c27fc0669ac55924eb918a85ae1d772765648
+AUX nagios-core-4.3.1-fix-upstream-issue-337.patch 810 SHA256 32848a38c3321f4234a92c9f6198682786500718ef26449cd813ee132e171369 SHA512 67c4c8efe0df27e83cf8108bd43fc6d4cc9b75b531761cd9e17794965d9fed27593897f8ab2b8569e3980abd9b52b26c1edacfed90fae1134b3bf3526a39228f WHIRLPOOL 82301ef2c447890162518816be27003b2a14537ffac59f60338b79a9895ed335af2f4afa636c7750b6defff20e15d225d4cb7e76ca4a14044d33919c35b6e509
+AUX nagios3 1208 SHA256 1d062cbc54994a470cc9bb46a3c490adb7c0a598b572d956458fb91b1b8af43b SHA512 92ed5cc52440c622af1e9346177dfd22167d2ebffbe00a24c2661d29de7dbf153f9a27143f29f7c42fb1a727b2bbb3dea0806a6adf1e1def7e010c3d7a9a5e75 WHIRLPOOL b1fa72d19c7ae75aa61901a142934324d94ea9f2cf0a31a251042688ede38551c1650b38f03429959581f7ba4d7fd7f06014849d2dabaf11120abaca02164a42
+AUX nagios4-r1 1077 SHA256 bd77faef2be15ccf201601c4e3435e2cca4a4a7db28e524e1895c0ee4349300d SHA512 91955f947b7bc70ba330bc541ea8770fafd7f4f77fbc1e08c2838029c7fbac6610adafc14afff01261d3d294cd8649456b78d2a940a87baa47808dace9ca3cc6 WHIRLPOOL 29b94928401fc9f9dea309630718c94e4f13eeac96efb3e7903be5e5f619d06e1c388b6741c11a0ad684cd87d264bb2c11a0e10ae956ffe39539cc52c37cd9d7
+DIST nagios-3.5.1.tar.gz 1763584 SHA256 ca9dd68234fa090b3c35ecc8767b2c9eb743977eaf32612fa9b8341cc00a0f99 SHA512 48e2ecb91002b08203937b12a438c87c62cd3c5c401a0ed9e861cd6d79074c7017ed373e9379f013d87dea1fd7cb8e3d85112d55c87ac91aed96b256868c112d WHIRLPOOL 2c02584702c64dbb0e353e34b758fab079eee0dc7a401e7b5947a21733758d3596401e5519e2dd7f05c89ee4835c21965d2718157fd9d6d3d20af9c853d688ca
+DIST nagios-4.3.1.tar.gz 11095797 SHA256 dfc2f5f146eb508b2a28d28af7c338ef9eb604327efdc50142642026f7e79f82 SHA512 d5f1919e2b32b0b2f4c5766367f0992fcf9b1f6766f4d3386e15e318cc1f57cdae6bc07f09464fd8212bef1713948fcb25d233eab588438036f996b6c479c97e WHIRLPOOL 72032e93802fd28db71bb5a10bba703a9508c587de69ff24ce302ad4fbbd93996b4800ceb7dd4f5648e2717377409cd7a66591f177e775da1c69444d528be1a2
+DIST nagios-4.3.3.tar.gz 11101531 SHA256 1fc4c72f76c720884dd3b538dc423b44f3bdde24e014f4212e58046a1fc114b6 SHA512 588292a95342cb2d95d7b58f70442b82b99a23dd9fdc1390e9ae0743626a047e5127d77b1d7e6a1d8edd6f34a425e581bcd42459b673a0ddea14125bde4b7d9e WHIRLPOOL 1452256a79190eae90076a9b50fdac3876557a6382d15d38a0c7930ec6d286c58e44220fee3243c9bcb1ae0ef337ddadd19e3552f02049959e69eaffd9fcd4a8
+DIST nagios-4.3.4.tar.gz 11101966 SHA256 c90b7812d9e343db12be19a572e15c415c5d6353a91c5e226e432c2d4aaa44f1 SHA512 f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316 WHIRLPOOL dae991fe44f2d8c5457cffec6647d2b8a7ace60450e0ec2409838aaf1a6f35af1f6c56d260a36cceeede21cfd4521e695146a8c18b38d4e6689d0801d3471157
+DIST nagios-core-gentoo-icons-20141125.tar 40960 SHA256 68b715f636eb291343cab3259862bbed8b6b898520b58df522438524de3d8761 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766 WHIRLPOOL 7ec3a944b2a659b456d3168818ca5b1af3a427436e6af2f3e5d6cba6fc7b1c7bad6f552301f064df31988865b3b32fd117d9e6f61c630d6d817a51cbbbcb331d
+EBUILD nagios-core-3.5.1.ebuild 6154 SHA256 074c4b31f7ec83caff01f8133cbea7c9d2f9e76db0128337e90cea704c536797 SHA512 c402040b5449fe096d40d0313ee08380089788c57da4dc780a8736eb335fb775379db4667145baed355dbbe9128e99d2662f54d9a57e44f2cc5fc35f0fe2bf01 WHIRLPOOL 3dc306c99a2d8da810a671ff7026348817f887c23e9839c9f61f9f7fbee2e39634064316f5b7e481c5c61b43cfdc96bf282be2f3cfc1c68e7ced0ae55edbdeda
+EBUILD nagios-core-4.3.1-r1.ebuild 7579 SHA256 59dc0741a74350b7b8ea45eeed8ee615b9914227f4d1de0fa1e007ec43a15a4f SHA512 8a4273cb4e2f50ed4e69d190743c362db3c1c9480ea19d061501dc57e48fea7e6b3c1811107714667b7ead9eb748ee8a7a106b792f066422ef13640b14bd5aac WHIRLPOOL a3ec231a49d488aaca020f654ec5e1e531bc7c3b3623e2b35b040260bbb10d789245d4d4ed3b8684cc3a98a4e8709fca5d9ac5703e68c83287f90c374838f6a2
+EBUILD nagios-core-4.3.3.ebuild 7468 SHA256 325d84375de3679238126be983e67801ca70e60596d0ae3433778bec5f87ca88 SHA512 e1a9e9ea8aac7ab746c69925ed8d6e67fe52a0e1ef7e753ca66d205e680b9f5fedc83fbdaed1a4860bb5d63e1bb94415e1f49bca70432839cc2f72f122326d4c WHIRLPOOL 40adc8d7ee519b0837de94213731e2d98a037738fa0d52aa049e128207ab7969b1d2a97299cd291beda16b487c5eb9289a7b8619139717ad3fa7c27ce529542a
+EBUILD nagios-core-4.3.4.ebuild 6647 SHA256 5a1c13161c3a456fb3d29aaaa48f19a59219357213787f3db9ae2b2d4ccc7499 SHA512 7cbe1d7067a862543aafcd591a2cf8b5abe40af75f7daa3eecbc4aa3f8afaaa5a0f366c4f4175b1680f7d30c481aa2d39296049a9963631c6c29edad465949e4 WHIRLPOOL a864fa1548be74e7976f29b87f11709bd474d079b8ff9ee0d17b5f5db5e3a911cbdaa5333eac751d1edca5ea4417555e2cc7de14a85f8f2446cbf41ea1893217
+MISC ChangeLog 9808 SHA256 b19bd88b156c5328fb84b82463c7e9f2368bb6345056f69dfba49efce0b46fdd SHA512 89556c2ce3a8975682c9b9da2098dd5410dc98e432d9aa37a7bde5445e0dfc0cbd6c2c7963b5ceee516b0ebe92df5944ab2da93af37515419921cc940d936919 WHIRLPOOL 9725300fcaf5bcd46d7f6d0ea1b6e5d58f4982a82d194a76fa795fd6596bba9e640b7cfba72471dd650b06c46dad7cad77e48043fbd0a2ce1210f3eb9233a641
+MISC ChangeLog-2015 33539 SHA256 28d8b03589fb01e259aac550508273f287ead57f10f905a9b3c26ac0a6e1232e SHA512 32de57ce104d88c4b92cf54b47cfddd3abfb5a31ab7d3ff9371b1c2b3522ccb2a97331f66284b48cf04438a6453a9b54c5f8e1b1749fd506807691f31f5ba661 WHIRLPOOL 406df23c9449f282a40f3ed16ffea06635ad3d523d1f33423305803fbb2f484997a80ba422e736b6c2bfe59ab0f2238eeb94307ba22702a28ef75b99d2050ac2
+MISC metadata.xml 1466 SHA256 ddba3ecd9908a4f0adc9959b4a7e4d1f830356e15e2a25e2ae99c9b1cae2b52a SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b WHIRLPOOL e87251f603285d97b018b5491b379ce60e8394fa8560df63e07418f885cf942614d78a3267f026c4ce7bc9deae62da72d5da1f0bf3636fa78b8a2d148da915f7
diff --git a/net-analyzer/nagios-core/files/99_nagios3.conf b/net-analyzer/nagios-core/files/99_nagios3.conf
new file mode 100644
index 000000000000..074f9ce5e4a9
--- /dev/null
+++ b/net-analyzer/nagios-core/files/99_nagios3.conf
@@ -0,0 +1,15 @@
+<IfDefine NAGIOS>
+	ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi-bin/
+	<Directory "/usr/lib/nagios/cgi-bin/">
+		AllowOverride AuthConfig
+		Options ExecCGI
+		Order allow,deny
+		Allow from all
+	</Directory>
+	Alias /nagios /usr/share/nagios/htdocs
+	<Directory "/usr/share/nagios/htdocs">
+		AllowOverride AuthConfig
+		Order allow,deny
+		Allow from all
+	</Directory>
+</IfDefine>
diff --git a/net-analyzer/nagios-core/files/99_nagios4.conf b/net-analyzer/nagios-core/files/99_nagios4.conf
new file mode 100644
index 000000000000..b04c2980ebab
--- /dev/null
+++ b/net-analyzer/nagios-core/files/99_nagios4.conf
@@ -0,0 +1,16 @@
+<IfDefine NAGIOS>
+
+  ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi-bin/
+  <Directory "/usr/lib/nagios/cgi-bin/">
+    AllowOverride AuthConfig
+    Options ExecCGI
+    Require all granted
+  </Directory>
+
+  Alias /nagios /usr/share/nagios/htdocs
+  <Directory "/usr/share/nagios/htdocs">
+    AllowOverride AuthConfig
+    Require all granted
+  </Directory>
+
+</IfDefine>
diff --git a/net-analyzer/nagios-core/files/conf.d b/net-analyzer/nagios-core/files/conf.d
new file mode 100644
index 000000000000..68c7370c887c
--- /dev/null
+++ b/net-analyzer/nagios-core/files/conf.d
@@ -0,0 +1,9 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2         
+
+# Distributed monitoring users will want to configure here the ip/hostname of the central server.
+# It will be used by submit_check_result_via_nsca.
+NAGIOS_NSCA_HOST="localhost"
+
+
+
diff --git a/net-analyzer/nagios-core/files/lighttpd_nagios3-r1.conf b/net-analyzer/nagios-core/files/lighttpd_nagios3-r1.conf
new file mode 100644
index 000000000000..6e2577029aca
--- /dev/null
+++ b/net-analyzer/nagios-core/files/lighttpd_nagios3-r1.conf
@@ -0,0 +1,24 @@
+server.modules += ("mod_cgi")
+server.modules += ("mod_auth")
+server.modules += ("mod_alias")
+
+auth.require += ( "/nagios" =>
+  (
+    "method"  => "digest",
+    "realm"   => "nagios",
+    "require" => "valid-user"
+  )
+)
+
+$HTTP["url"] =~ "^/nagios/cgi-bin/" {
+  dir-listing.activate = "disable"
+  cgi.assign = (
+    ".pl"  => "/usr/bin/perl",
+    ".cgi" => ""
+  )
+}
+
+alias.url += (
+  "/nagios/cgi-bin" => "/usr/lib/nagios/cgi-bin",
+  "/nagios"         => "/usr/share/nagios/htdocs"
+)
diff --git a/net-analyzer/nagios-core/files/lighttpd_nagios4.conf b/net-analyzer/nagios-core/files/lighttpd_nagios4.conf
new file mode 100644
index 000000000000..a073f177f238
--- /dev/null
+++ b/net-analyzer/nagios-core/files/lighttpd_nagios4.conf
@@ -0,0 +1,15 @@
+server.modules += ("mod_cgi")
+server.modules += ("mod_alias")
+
+$HTTP["url"] =~ "^/nagios/cgi-bin/" {
+  dir-listing.activate = "disable"
+  cgi.assign = (
+    ".pl"  => "/usr/bin/perl",
+    ".cgi" => ""
+  )
+}
+
+alias.url += (
+  "/nagios/cgi-bin" => "/usr/lib/nagios/cgi-bin",
+  "/nagios"         => "/usr/share/nagios/htdocs"
+)
diff --git a/net-analyzer/nagios-core/files/nagios-core-3.5.1-process_cgivars.patch b/net-analyzer/nagios-core/files/nagios-core-3.5.1-process_cgivars.patch
new file mode 100644
index 000000000000..9d9536747794
--- /dev/null
+++ b/net-analyzer/nagios-core/files/nagios-core-3.5.1-process_cgivars.patch
@@ -0,0 +1,175 @@
+commit d97e03f32741a7d851826b03ed73ff4c9612a866
+Author: Eric Stanley <estanley@nagios.com>
+Date:   Fri Dec 20 13:14:30 2013 -0600
+
+    CGIs: Fixed minor vulnerability where a custom query could crash the CGI.
+    
+    Most CGIs previously incremented the input variable counter twice when
+    it encountered a long key value. This could cause the CGI to read past
+    the end of the list of CGI variables. This commit removes the second
+    increment, removing the possibility of reading past the end of the list
+    of CGI variables.
+
+diff --git a/cgi/avail.c b/cgi/avail.c
+index 76afd86..64eaadc 100644
+--- a/cgi/avail.c
++++ b/cgi/avail.c
+@@ -1096,7 +1096,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
+diff --git a/cgi/cmd.c b/cgi/cmd.c
+index fa6cf5a..50504eb 100644
+--- a/cgi/cmd.c
++++ b/cgi/cmd.c
+@@ -311,7 +311,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
+diff --git a/cgi/config.c b/cgi/config.c
+index f061b0f..3360e70 100644
+--- a/cgi/config.c
++++ b/cgi/config.c
+@@ -344,7 +344,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
+diff --git a/cgi/extinfo.c b/cgi/extinfo.c
+index 62a1b18..5113df4 100644
+--- a/cgi/extinfo.c
++++ b/cgi/extinfo.c
+@@ -591,7 +591,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
+diff --git a/cgi/histogram.c b/cgi/histogram.c
+index 4616541..f6934d0 100644
+--- a/cgi/histogram.c
++++ b/cgi/histogram.c
+@@ -1060,7 +1060,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
+diff --git a/cgi/notifications.c b/cgi/notifications.c
+index 8ba11c1..461ae84 100644
+--- a/cgi/notifications.c
++++ b/cgi/notifications.c
+@@ -327,7 +327,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
+diff --git a/cgi/outages.c b/cgi/outages.c
+index 426ede6..cb58dee 100644
+--- a/cgi/outages.c
++++ b/cgi/outages.c
+@@ -225,7 +225,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
+diff --git a/cgi/status.c b/cgi/status.c
+index 3253340..4ec1c92 100644
+--- a/cgi/status.c
++++ b/cgi/status.c
+@@ -567,7 +567,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
+diff --git a/cgi/statusmap.c b/cgi/statusmap.c
+index ea48368..2580ae5 100644
+--- a/cgi/statusmap.c
++++ b/cgi/statusmap.c
+@@ -400,7 +400,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
+diff --git a/cgi/statuswml.c b/cgi/statuswml.c
+index bd8cea2..d25abef 100644
+--- a/cgi/statuswml.c
++++ b/cgi/statuswml.c
+@@ -226,8 +226,13 @@ int process_cgivars(void) {
+ 
+ 	for(x = 0; variables[x] != NULL; x++) {
+ 
++		/* do some basic length checking on the variable identifier to prevent buffer overflows */
++		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
++			continue;
++			}
++
+ 		/* we found the hostgroup argument */
+-		if(!strcmp(variables[x], "hostgroup")) {
++		else if(!strcmp(variables[x], "hostgroup")) {
+ 			display_type = DISPLAY_HOSTGROUP;
+ 			x++;
+ 			if(variables[x] == NULL) {
+diff --git a/cgi/summary.c b/cgi/summary.c
+index 126ce5e..749a02c 100644
+--- a/cgi/summary.c
++++ b/cgi/summary.c
+@@ -725,7 +725,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
+diff --git a/cgi/trends.c b/cgi/trends.c
+index b35c18e..895db01 100644
+--- a/cgi/trends.c
++++ b/cgi/trends.c
+@@ -1263,7 +1263,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
+diff --git a/contrib/daemonchk.c b/contrib/daemonchk.c
+index 78716e5..9bb6c4b 100644
+--- a/contrib/daemonchk.c
++++ b/contrib/daemonchk.c
+@@ -174,7 +174,6 @@ static int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 		}
diff --git a/net-analyzer/nagios-core/files/nagios-core-4.3.1-fix-upstream-issue-337.patch b/net-analyzer/nagios-core/files/nagios-core-4.3.1-fix-upstream-issue-337.patch
new file mode 100644
index 000000000000..d5344a6442cb
--- /dev/null
+++ b/net-analyzer/nagios-core/files/nagios-core-4.3.1-fix-upstream-issue-337.patch
@@ -0,0 +1,21 @@
+From e03e4fd470fbc8d4304d860d7b3b523c5d78373d Mon Sep 17 00:00:00 2001
+From: "John C. Frickson" <jfrickson@nagios.com>
+Date: Thu, 2 Mar 2017 10:24:24 -0600
+Subject: [PATCH] every 15sec /var/log/messages is flooded with "nagios:
+ set_environment_var"
+
+Fix for https://github.com/NagiosEnterprises/nagioscore/issues/337
+diff --git a/base/utils.c b/base/utils.c
+index 733fdef..19e20c7 100644
+--- a/base/utils.c
++++ b/base/utils.c
+@@ -872,9 +872,6 @@ int set_environment_var(char *name, char *value, int set) {
+ 
+ 	/* set the environment variable */
+ 	if(set == TRUE) {
+-		log_debug_info(DEBUGL_EVENTS, 0, "set_environment_var '%s'='%s'\n", name, value);
+-		syslog(LOG_DAEMON|LOG_INFO, "set_environment_var '%s'='%s'\n", name, value);
+-
+ #ifdef HAVE_SETENV
+ 		setenv(name, (value == NULL) ? "" : value, 1);
+ #else
diff --git a/net-analyzer/nagios-core/files/nagios3 b/net-analyzer/nagios-core/files/nagios3
new file mode 100644
index 000000000000..9b9049362277
--- /dev/null
+++ b/net-analyzer/nagios-core/files/nagios3
@@ -0,0 +1,52 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+nagios_config="/etc/nagios/nagios.cfg"
+nagios_cmdfile="/var/nagios/rw/nagios.cmd"
+
+command="/usr/sbin/nagios"
+command_args="-d ${nagios_config}"
+pidfile="/var/nagios/nagios.lock"
+start_stop_daemon_args="-e HOME=/var/nagios/home"
+
+depend() {
+	need net
+	use dns logger firewall
+	after mysql postgresql
+}
+
+reload()
+{
+	checkconfig || return 1
+	ebegin "Reloading configuration"
+	start-stop-daemon --signal HUP --pidfile ${pidfile}
+	eend $?
+}
+
+checkconfig() {
+	ebegin "Verifying config files"
+
+	# Silent Check
+	/usr/sbin/nagios -v ${nagios_config} &>/dev/null && return 0
+
+	# Now we know there's problem - run again and display errors
+	/usr/sbin/nagios -v ${nagios_config}
+	eend $? "Configuration Error. Please fix your configfile"
+}
+
+start_pre() {
+	checkconfig || return 1
+
+	touch /var/nagios/nagios.log /var/nagios/status.sav
+	chown nagios:nagios /var/nagios/nagios.log /var/nagios/status.sav
+	rm -f ${nagios_cmdfile}
+}
+
+stop_post() {
+	rm -f /var/nagios/status.log /var/nagios/nagios.tmp ${pidfile} \
+		${nagios_cmdfile}
+}
diff --git a/net-analyzer/nagios-core/files/nagios4-r1 b/net-analyzer/nagios-core/files/nagios4-r1
new file mode 100644
index 000000000000..6309fcf06706
--- /dev/null
+++ b/net-analyzer/nagios-core/files/nagios4-r1
@@ -0,0 +1,45 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+nagios_config="/etc/nagios/nagios.cfg"
+
+command="/usr/sbin/nagios"
+command_args="-d ${nagios_config}"
+pidfile="/var/nagios/nagios.lock"
+start_stop_daemon_args="-e HOME=/var/nagios/home"
+
+depend(){
+	need net
+	use dns logger firewall
+	after mysql postgresql
+}
+
+reload(){
+	checkconfig || return 1
+	ebegin "Reloading configuration"
+	start-stop-daemon --signal HUP --pidfile ${pidfile}
+	eend $?
+}
+
+checkconfig(){
+	ebegin "Verifying config files"
+
+	# Silent Check
+	${command} -v ${nagios_config} > /dev/null 2>&1 && return 0
+
+	# Now we know there's a problem. Run the check again and
+	# this time, display the errors.
+	${command} -v ${nagios_config}
+	eend $? "Configuration Error. Please fix your config file."
+}
+
+start_pre() {
+	# Without this, the "start" action will appear to succeed even
+	# when the config file contains errors and the daemon failed to
+	# start.
+	checkconfig || return 1
+}
diff --git a/net-analyzer/nagios-core/metadata.xml b/net-analyzer/nagios-core/metadata.xml
new file mode 100644
index 000000000000..2837e2b7ed5c
--- /dev/null
+++ b/net-analyzer/nagios-core/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
+  <longdescription>
+    Nagios is a host and service monitor designed to inform you of
+    network problems before your clients, end-users or managers do. It
+    has been designed to run under the Linux operating system, but
+    works fine under most *NIX variants as well. The monitoring daemon
+    runs intermittent checks on hosts and services you specify using
+    external "plugins" which return status information to Nagios. When
+    problems are encountered, the daemon can send notifications out to
+    administrative contacts in a variety of different ways (email,
+    instant message, SMS, etc.). Current status information,
+    historical logs, and reports can all be accessed via a web
+    browser.
+  </longdescription>
+  <use>
+    <flag name="classicui">use the classic web theme</flag>
+    <flag name="lighttpd">install <pkg>www-servers/lighttpd</pkg> config</flag>
+    <flag name="web">enable web interface</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">NagiosEnterprises/nagioscore</remote-id>
+    <remote-id type="sourceforge">nagios</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/nagios-core/nagios-core-3.5.1.ebuild b/net-analyzer/nagios-core/nagios-core-3.5.1.ebuild
new file mode 100644
index 000000000000..515322c7481c
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-3.5.1.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit depend.apache eutils multilib toolchain-funcs user
+
+MY_P=${PN/-core}-${PV}
+DESCRIPTION="Nagios Core - Check daemon, CGIs, docs"
+HOMEPAGE="http://www.nagios.org/"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
+IUSE="debug lighttpd perl +web vim-syntax"
+DEPEND="virtual/mailx
+	web? (
+		>=media-libs/gd-1.8.3-r5[jpeg,png]
+		lighttpd? ( www-servers/lighttpd dev-lang/php[cgi] )
+		apache2? ( || ( dev-lang/php[apache2] dev-lang/php[cgi] ) )
+	)
+	perl? ( >=dev-lang/perl-5.6.1-r7:= )"
+RDEPEND="${DEPEND}
+	!net-analyzer/nagios-imagepack
+	vim-syntax? ( app-vim/nagios-syntax )"
+
+want_apache2
+
+S="${WORKDIR}/${PN/-core}"
+
+pkg_setup() {
+	depend.apache_pkg_setup
+
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.5.1-process_cgivars.patch"
+	local strip="$(echo '$(MAKE) strip-post-install')"
+	sed -i -e "s:${strip}::" {cgi,base}/Makefile.in || die "sed failed in Makefile.in"
+}
+
+src_configure() {
+	local myconf
+
+	if use perl ; then
+		myconf="${myconf} --enable-embedded-perl --with-perlcache"
+	fi
+
+	if use debug; then
+		myconf="${myconf} --enable-DEBUG0"
+		myconf="${myconf} --enable-DEBUG1"
+		myconf="${myconf} --enable-DEBUG2"
+		myconf="${myconf} --enable-DEBUG3"
+		myconf="${myconf} --enable-DEBUG4"
+		myconf="${myconf} --enable-DEBUG5"
+	fi
+
+	if use !apache2 && use !lighttpd ; then
+		myconf="${myconf} --with-command-group=nagios"
+	else
+		if use apache2 ; then
+			myconf="${myconf} --with-command-group=apache"
+			myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
+		elif use lighttpd ; then
+			myconf="${myconf} --with-command-group=lighttpd"
+		fi
+	fi
+
+	econf ${myconf} \
+		--prefix=/usr \
+		--bindir=/usr/sbin \
+		--sbindir=/usr/$(get_libdir)/nagios/cgi-bin \
+		--datadir=/usr/share/nagios/htdocs \
+		--localstatedir=/var/nagios \
+		--sysconfdir=/etc/nagios \
+		--libexecdir=/usr/$(get_libdir)/nagios/plugins
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) nagios
+
+	if use web ; then
+		# Only compile the CGI's if "web" useflag is set.
+		emake CC=$(tc-getCC) DESTDIR="${D}" cgis
+	fi
+}
+
+src_install() {
+	dodoc Changelog INSTALLING LEGAL README UPGRADING
+
+	if ! use web ; then
+		sed -i -e 's/cd $(SRC_CGI) && $(MAKE) $@/# line removed due missing web use flag/' \
+			-e 's/cd $(SRC_HTM) && $(MAKE) $@/# line removed due missing web use flag/' \
+			-e 's/$(MAKE) install-exfoliation/# line removed due missing web use flag/' \
+			Makefile
+	fi
+
+	sed -i -e 's/^contactgroups$//g' Makefile
+
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install-config
+	emake DESTDIR="${D}" install-commandmode
+	if use web; then
+		emake DESTDIR="${D}" install-classicui
+	fi
+
+	newinitd "${FILESDIR}"/nagios3 nagios
+	newconfd "${FILESDIR}"/conf.d nagios
+
+	# Apache Module
+	if use web ; then
+		if use apache2 ; then
+			insinto "${APACHE_MODULES_CONFDIR}"
+			doins "${FILESDIR}"/99_nagios3.conf
+	    elif use lighttpd ; then
+			insinto /etc/lighttpd
+			newins "${FILESDIR}/lighttpd_nagios3-r1.conf" nagios.conf
+		else
+			ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
+			ewarn "out-of-the-box. Since you are not using one of them, you"
+			ewarn "have to configure your webserver accordingly yourself."
+		fi
+
+	fi
+
+	for dir in etc/nagios var/nagios ; do
+		chown -R nagios:nagios "${D}/${dir}" || die "Failed chown of ${D}/${dir}"
+	done
+
+	dosbin p1.pl
+
+	chown -R root:root "${D}"/usr/$(get_libdir)/nagios
+	find "${D}"/usr/$(get_libdir)/nagios -type d -print0 | xargs -0 chmod 755
+	find "${D}"/usr/$(get_libdir)/nagios/cgi-bin -type f -print0 | xargs -0 chmod 755
+
+	keepdir /etc/nagios
+	keepdir /var/nagios
+	keepdir /var/nagios/archives
+	keepdir /var/nagios/rw
+	keepdir /var/nagios/spool/checkresults
+
+	if use !apache2 && use !lighttpd; then
+		chown -R nagios:nagios "${D}"/var/nagios/rw || die "Failed chown of ${D}/var/nagios/rw"
+	else
+		if use apache2 ; then
+			chown -R nagios:apache "${D}"/var/nagios/rw || die "Failed chown of ${D}/var/nagios/rw"
+		elif use lighttpd ; then
+			chown -R nagios:lighttpd "${D}"/var/nagios/rw || die "Failed chown of ${D}/var/nagios/rw"
+		fi
+	fi
+
+	chmod ug+s "${D}"/var/nagios/rw || die "Failed Chmod of ${D}/var/nagios/rw"
+	chmod 0750 "${D}"/etc/nagios || die "Failed chmod of ${D}/etc/nagios"
+}
+
+pkg_postinst() {
+	elog "If you want nagios to start at boot time"
+	elog "remember to execute:"
+	elog "  rc-update add nagios default"
+	elog
+
+	if use web ; then
+		elog "This does not include cgis that are perl-dependent"
+		elog "Currently traceroute.cgi is perl-dependent"
+		elog "To have ministatus.cgi requires copying of ministatus.c"
+		elog "to cgi directory for compiling."
+
+		elog "Note that the user your webserver is running at needs"
+		elog "read-access to /etc/nagios."
+		elog
+
+		if use apache2 || use lighttpd ; then
+			elog "There are several possible solutions to accomplish this,"
+			elog "choose the one you are most comfortable with:"
+			elog
+			if use apache2 ; then
+				elog "	usermod -G nagios apache"
+				elog "or"
+				elog "	chown nagios:apache /etc/nagios"
+				elog
+				elog "Also edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
+			elif use lighttpd ; then
+				elog "  usermod -G nagios lighttpd "
+				elog "or"
+				elog "  chown nagios:lighttpd /etc/nagios"
+			fi
+			elog
+			elog "That will make nagios's web front end visable via"
+			elog "http://localhost/nagios/"
+			elog
+		else
+			elog "IMPORTANT: Do not forget to add the user your webserver"
+			elog "is running as to the nagios group!"
+		fi
+
+	else
+		elog "Please note that you have installed Nagios without web interface."
+		elog "Please don't file any bugs about having no web interface when you do this."
+		elog "Thank you!"
+	fi
+
+	elog
+	elog "If your kernel has /proc protection, nagios"
+	elog "will not be happy as it relies on accessing the proc"
+	elog "filesystem. You can fix this by adding nagios into"
+	elog "the group wheel, but this is not recomended."
+	elog
+}
+
+pkg_postinst() {
+	einfo "Fixing permissions"
+	chown nagios:nagios "${ROOT}"var/nagios
+}
diff --git a/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild
new file mode 100644
index 000000000000..7acee4a50aa9
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs user
+
+MY_P=${PN/-core}-${PV}
+DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
+HOMEPAGE="http://www.nagios.org/"
+
+# The name of the directory into which our Gentoo icons will be
+# extracted, and also the basename of the archive containing it.
+GENTOO_ICONS="${PN}-gentoo-icons-20141125"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
+	web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
+IUSE="apache2 classicui lighttpd perl +web vim-syntax"
+
+# In pkg_postinst(), we change the group of the Nagios configuration
+# directory to that of the web server user. It can't belong to both
+# apache/lighttpd groups at the same time, so we block this combination
+# for our own sanity.
+#
+# This could be made to work, but we would need a better way to allow
+# the web user read-only access to Nagios's configuration directory.
+#
+REQUIRED_USE="apache2? ( !lighttpd )"
+
+# sys-devel/libtool dependency is bug #401237.
+#
+# Note, we require one of the apache2 CGI modules:
+#
+#   * mod_cgi
+#   * mod_cgid
+#   * mod_fcgid
+#
+# We just don't care /which/ one. And of course PHP supports both CGI
+# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
+# dependencies, and expect the user not to do anything /too/
+# stupid. (For example, installing Apache with only FastCGI support, and
+# PHP with only CGI support.)
+#
+# Another annoyance is that the upstream Makefile uses app-arch/unzip to
+# extract a snapshot of AngularJS, but that's only needed when USE=web.
+#
+MOD_ALIAS=apache2_modules_alias
+DEPEND="sys-devel/libtool
+	virtual/mailx
+	perl? ( dev-lang/perl:= )
+	web? (
+		app-arch/unzip
+		media-libs/gd[jpeg,png]
+		lighttpd? ( www-servers/lighttpd[php] )
+		apache2? (
+			|| (
+				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi]
+				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid]
+				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] )
+			|| (
+				dev-lang/php:*[apache2]
+				dev-lang/php:*[cgi]
+				dev-lang/php:*[fpm] )
+		)
+	)"
+RDEPEND="${DEPEND}
+	vim-syntax? ( app-vim/nagios-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.3.1-fix-upstream-issue-337.patch )
+
+pkg_setup() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+src_configure() {
+	local myconf
+
+	if use perl; then
+		myconf="${myconf} --enable-embedded-perl --with-perlcache"
+	fi
+
+	if use !apache2 && use !lighttpd ; then
+		myconf="${myconf} --with-command-group=nagios"
+	else
+		if use apache2 ; then
+			myconf="${myconf} --with-command-group=apache"
+			myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
+		elif use lighttpd ; then
+			myconf="${myconf} --with-command-group=lighttpd"
+		fi
+	fi
+
+	econf ${myconf} \
+		--prefix=/usr \
+		--bindir=/usr/sbin \
+		--sbindir=/usr/$(get_libdir)/nagios/cgi-bin \
+		--datadir=/usr/share/nagios/htdocs \
+		--localstatedir=/var/nagios \
+		--sysconfdir=/etc/nagios \
+		--libexecdir=/usr/$(get_libdir)/nagios/plugins
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) nagios
+
+	if use web; then
+		# Only compile the CGIs/HTML when USE=web is set.
+		emake CC=$(tc-getCC) DESTDIR="${D}" cgis html
+	fi
+}
+
+src_install() {
+	dodoc Changelog INSTALLING LEGAL README.asciidoc UPGRADING
+
+	emake DESTDIR="${D}" install-base
+	emake DESTDIR="${D}" install-basic
+	emake DESTDIR="${D}" install-config
+	emake DESTDIR="${D}" install-commandmode
+
+	if use web; then
+		emake DESTDIR="${D}" install-cgis
+
+		# install-html installs the new exfoliation theme
+		emake DESTDIR="${D}" install-html
+
+		if use classicui; then
+			# This overwrites the already-installed exfoliation theme
+			emake DESTDIR="${D}" install-classicui
+		fi
+
+		# Install cute Gentoo icons (bug #388323), setting their
+		# owner, group, and mode to match those of the rest of Nagios's
+		# images.
+		insopts --group=nagios --owner=nagios --mode=0664
+		insinto /usr/share/nagios/htdocs/images/logos
+		doins "${WORKDIR}/${GENTOO_ICONS}"/*.*
+		insopts --mode=0644 # Back to the default...
+	fi
+
+	newinitd "${FILESDIR}"/nagios4-r1 nagios
+	newconfd "${FILESDIR}"/conf.d nagios
+
+	if use web ; then
+		if use apache2 ; then
+			# Install the Nagios configuration file for Apache.
+			insinto "/etc/apache2/modules.d"
+			doins "${FILESDIR}"/99_nagios4.conf
+		elif use lighttpd ; then
+			# Install the Nagios configuration file for Lighttpd.
+			insinto /etc/lighttpd
+			newins "${FILESDIR}/lighttpd_nagios4.conf" nagios.conf
+		else
+			ewarn "${CATEGORY}/${PF} only supports apache or lighttpd"
+			ewarn "out of the box. Since you are not using one of them, you"
+			ewarn "will have to configure your webserver yourself."
+		fi
+	fi
+
+	for dir in etc/nagios var/nagios ; do
+		chown -R nagios:nagios "${D}/${dir}" \
+			|| die "failed chown of ${D}/${dir}"
+	done
+
+	chown -R root:root "${D}/usr/$(get_libdir)/nagios" \
+		|| die "failed chown of ${D}/usr/$(get_libdir)/nagios"
+
+	# The following two find...exec statements will die properly as long
+	# as chmod is only called once (that is, as long as the argument
+	# list is small enough).
+	find "${D}/usr/$(get_libdir)/nagios" -type d \
+		-exec chmod 755 '{}' + || die 'failed to make nagios dirs traversable'
+
+	if use web; then
+		find "${D}/usr/$(get_libdir)/nagios/cgi-bin" -type f \
+			-exec chmod 755 '{}' + || die 'failed to make cgi-bins executable'
+	fi
+
+	keepdir /etc/nagios
+	keepdir /var/nagios
+	keepdir /var/nagios/archives
+	keepdir /var/nagios/rw
+	keepdir /var/nagios/spool/checkresults
+
+	if use !apache2 && use !lighttpd; then
+		chown -R nagios:nagios "${D}"/var/nagios/rw \
+			|| die "failed chown of ${D}/var/nagios/rw"
+	else
+		if use apache2 ; then
+			chown -R nagios:apache "${D}"/var/nagios/rw \
+				|| die "failed chown of ${D}/var/nagios/rw"
+		elif use lighttpd ; then
+			chown -R nagios:lighttpd "${D}"/var/nagios/rw \
+				|| die "failed chown of ${D}/var/nagios/rw"
+		fi
+	fi
+
+	chmod ug+s "${D}"/var/nagios/rw || die "failed chmod of ${D}/var/nagios/rw"
+	chmod 0750 "${D}"/etc/nagios || die "failed chmod of ${D}/etc/nagios"
+}
+
+pkg_postinst() {
+
+	if use web; then
+		elog "Note that your web server user requires read-only access to"
+		elog "${ROOT}etc/nagios."
+
+		if use apache2 || use lighttpd ; then
+			elog
+			elog "To that end, we have changed the group of ${ROOT}etc/nagios"
+			elog "to that of your web server user."
+			elog
+			if use apache2; then
+				chown nagios:apache "${ROOT}etc/nagios" \
+					|| die "failed to change group of ${ROOT}etc/nagios"
+
+				elog "To enable the Nagios web front-end, please edit"
+				elog "${ROOT}etc/conf.d/apache2 and add \"-D NAGIOS -D PHP\""
+				elog "to APACHE2_OPTS. Then Nagios will be available at,"
+				elog
+			elif use lighttpd; then
+				chown nagios:lighttpd "${ROOT}etc/nagios" \
+					|| die "failed to change group of ${ROOT}etc/nagios"
+				elog "To enable the Nagios web front-end, please add"
+				elog "'include \"nagios.conf\"' to the lighttpd configuration"
+				elog "file at ${ROOT}etc/lighttpd/lighttpd.conf. Then Nagios"
+				elog "will be available at,"
+				elog
+			fi
+
+			elog "  http://localhost/nagios/"
+		else
+			elog "Since you're not using either Apache or Lighttpd, you"
+			elog "will have to grant the necessary permissions yourself."
+		fi
+	fi
+
+	elog
+	elog "If your kernel has /proc protection, nagios"
+	elog "will not be happy as it relies on accessing the proc"
+	elog "filesystem. You can fix this by adding nagios into"
+	elog "the group wheel, but this is not recomended."
+	elog
+}
diff --git a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
new file mode 100644
index 000000000000..0b26c87cad81
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs user
+
+MY_P=${PN/-core}-${PV}
+DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
+HOMEPAGE="http://www.nagios.org/"
+
+# The name of the directory into which our Gentoo icons will be
+# extracted, and also the basename of the archive containing it.
+GENTOO_ICONS="${PN}-gentoo-icons-20141125"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
+	web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
+IUSE="apache2 classicui lighttpd perl +web vim-syntax"
+
+# In pkg_postinst(), we change the group of the Nagios configuration
+# directory to that of the web server user. It can't belong to both
+# apache/lighttpd groups at the same time, so we block this combination
+# for our own sanity.
+#
+# This could be made to work, but we would need a better way to allow
+# the web user read-only access to Nagios's configuration directory.
+#
+REQUIRED_USE="apache2? ( !lighttpd )"
+
+# sys-devel/libtool dependency is bug #401237.
+#
+# Note, we require one of the apache2 CGI modules:
+#
+#   * mod_cgi
+#   * mod_cgid
+#   * mod_fcgid
+#
+# We just don't care /which/ one. And of course PHP supports both CGI
+# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
+# dependencies, and expect the user not to do anything /too/
+# stupid. (For example, installing Apache with only FastCGI support, and
+# PHP with only CGI support.)
+#
+# Another annoyance is that the upstream Makefile uses app-arch/unzip to
+# extract a snapshot of AngularJS, but that's only needed when USE=web.
+#
+MOD_ALIAS=apache2_modules_alias
+DEPEND="sys-devel/libtool
+	virtual/mailx
+	perl? ( dev-lang/perl:= )
+	web? (
+		app-arch/unzip
+		media-libs/gd[jpeg,png]
+		lighttpd? ( www-servers/lighttpd[php] )
+		apache2? (
+			|| (
+				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi]
+				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid]
+				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] )
+			|| (
+				dev-lang/php:*[apache2]
+				dev-lang/php:*[cgi]
+				dev-lang/php:*[fpm] )
+		)
+	)"
+RDEPEND="${DEPEND}
+	vim-syntax? ( app-vim/nagios-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+src_configure() {
+	local myconf
+
+	if use perl; then
+		myconf="${myconf} --enable-embedded-perl --with-perlcache"
+	fi
+
+	if use !apache2 && use !lighttpd ; then
+		myconf="${myconf} --with-command-group=nagios"
+	else
+		if use apache2 ; then
+			myconf="${myconf} --with-command-group=apache"
+			myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
+		elif use lighttpd ; then
+			myconf="${myconf} --with-command-group=lighttpd"
+		fi
+	fi
+
+	econf ${myconf} \
+		--prefix=/usr \
+		--bindir=/usr/sbin \
+		--sbindir=/usr/$(get_libdir)/nagios/cgi-bin \
+		--datadir=/usr/share/nagios/htdocs \
+		--localstatedir=/var/nagios \
+		--sysconfdir=/etc/nagios \
+		--libexecdir=/usr/$(get_libdir)/nagios/plugins
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) nagios
+
+	if use web; then
+		# Only compile the CGIs/HTML when USE=web is set.
+		emake CC=$(tc-getCC) DESTDIR="${D}" cgis html
+	fi
+}
+
+src_install() {
+	dodoc Changelog CONTRIBUTING.md README.asciidoc THANKS UPGRADING
+
+	emake DESTDIR="${D}" install-base
+	emake DESTDIR="${D}" install-basic
+	emake DESTDIR="${D}" install-config
+	emake DESTDIR="${D}" install-commandmode
+
+	if use web; then
+		emake DESTDIR="${D}" install-cgis
+
+		# install-html installs the new exfoliation theme
+		emake DESTDIR="${D}" install-html
+
+		if use classicui; then
+			# This overwrites the already-installed exfoliation theme
+			emake DESTDIR="${D}" install-classicui
+		fi
+
+		# Install cute Gentoo icons (bug #388323), setting their
+		# owner, group, and mode to match those of the rest of Nagios's
+		# images.
+		insopts --group=nagios --owner=nagios --mode=0664
+		insinto /usr/share/nagios/htdocs/images/logos
+		doins "${WORKDIR}/${GENTOO_ICONS}"/*.*
+		insopts --mode=0644 # Back to the default...
+	fi
+
+	newinitd openrc-init nagios
+
+	if use web ; then
+		if use apache2 ; then
+			# Install the Nagios configuration file for Apache.
+			insinto "/etc/apache2/modules.d"
+			doins "${FILESDIR}"/99_nagios4.conf
+		elif use lighttpd ; then
+			# Install the Nagios configuration file for Lighttpd.
+			insinto /etc/lighttpd
+			newins "${FILESDIR}/lighttpd_nagios4.conf" nagios.conf
+		else
+			ewarn "${CATEGORY}/${PF} only supports apache or lighttpd"
+			ewarn "out of the box. Since you are not using one of them, you"
+			ewarn "will have to configure your webserver yourself."
+		fi
+	fi
+
+	for dir in etc/nagios var/nagios ; do
+		chown -R nagios:nagios "${D}/${dir}" \
+			|| die "failed chown of ${D}/${dir}"
+	done
+
+	chown -R root:root "${D}/usr/$(get_libdir)/nagios" \
+		|| die "failed chown of ${D}/usr/$(get_libdir)/nagios"
+
+	# The following two find...exec statements will die properly as long
+	# as chmod is only called once (that is, as long as the argument
+	# list is small enough).
+	find "${D}/usr/$(get_libdir)/nagios" -type d \
+		-exec chmod 755 '{}' + || die 'failed to make nagios dirs traversable'
+
+	if use web; then
+		find "${D}/usr/$(get_libdir)/nagios/cgi-bin" -type f \
+			-exec chmod 755 '{}' + || die 'failed to make cgi-bins executable'
+	fi
+
+	keepdir /etc/nagios
+	keepdir /var/nagios
+	keepdir /var/nagios/archives
+	keepdir /var/nagios/rw
+	keepdir /var/nagios/spool/checkresults
+
+	if use !apache2 && use !lighttpd; then
+		chown -R nagios:nagios "${D}"/var/nagios/rw \
+			|| die "failed chown of ${D}/var/nagios/rw"
+	else
+		if use apache2 ; then
+			chown -R nagios:apache "${D}"/var/nagios/rw \
+				|| die "failed chown of ${D}/var/nagios/rw"
+		elif use lighttpd ; then
+			chown -R nagios:lighttpd "${D}"/var/nagios/rw \
+				|| die "failed chown of ${D}/var/nagios/rw"
+		fi
+	fi
+
+	chmod ug+s "${D}"/var/nagios/rw || die "failed chmod of ${D}/var/nagios/rw"
+	chmod 0750 "${D}"/etc/nagios || die "failed chmod of ${D}/etc/nagios"
+}
+
+pkg_postinst() {
+
+	if use web; then
+		elog "Note that your web server user requires read-only access to"
+		elog "${ROOT}etc/nagios."
+
+		if use apache2 || use lighttpd ; then
+			elog
+			elog "To that end, we have changed the group of ${ROOT}etc/nagios"
+			elog "to that of your web server user."
+			elog
+			if use apache2; then
+				chown nagios:apache "${ROOT}etc/nagios" \
+					|| die "failed to change group of ${ROOT}etc/nagios"
+
+				elog "To enable the Nagios web front-end, please edit"
+				elog "${ROOT}etc/conf.d/apache2 and add \"-D NAGIOS -D PHP\""
+				elog "to APACHE2_OPTS. Then Nagios will be available at,"
+				elog
+			elif use lighttpd; then
+				chown nagios:lighttpd "${ROOT}etc/nagios" \
+					|| die "failed to change group of ${ROOT}etc/nagios"
+				elog "To enable the Nagios web front-end, please add"
+				elog "'include \"nagios.conf\"' to the lighttpd configuration"
+				elog "file at ${ROOT}etc/lighttpd/lighttpd.conf. Then Nagios"
+				elog "will be available at,"
+				elog
+			fi
+
+			elog "  http://localhost/nagios/"
+		else
+			elog "Since you're not using either Apache or Lighttpd, you"
+			elog "will have to grant the necessary permissions yourself."
+		fi
+	fi
+
+	elog
+	elog "If your kernel has /proc protection, nagios"
+	elog "will not be happy as it relies on accessing the proc"
+	elog "filesystem. You can fix this by adding nagios into"
+	elog "the group wheel, but this is not recomended."
+	elog
+}
diff --git a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
new file mode 100644
index 000000000000..6de6b181b223
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs user
+
+MY_P=${PN/-core}-${PV}
+DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
+HOMEPAGE="http://www.nagios.org/"
+
+# The name of the directory into which our Gentoo icons will be
+# extracted, and also the basename of the archive containing it.
+GENTOO_ICONS="${PN}-gentoo-icons-20141125"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
+	web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 classicui lighttpd perl +web vim-syntax"
+
+# In pkg_postinst(), we change the group of the Nagios configuration
+# directory to that of the web server user. It can't belong to both
+# apache/lighttpd groups at the same time, so we block this combination
+# for our own sanity.
+#
+# This could be made to work, but we would need a better way to allow
+# the web user read-only access to Nagios's configuration directory.
+#
+REQUIRED_USE="apache2? ( !lighttpd )"
+
+# sys-devel/libtool dependency is bug #401237.
+#
+# Note, we require one of the apache2 CGI modules:
+#
+#   * mod_cgi
+#   * mod_cgid
+#   * mod_fcgid
+#
+# We just don't care /which/ one. And of course PHP supports both CGI
+# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
+# dependencies, and expect the user not to do anything /too/
+# stupid. (For example, installing Apache with only FastCGI support, and
+# PHP with only CGI support.)
+#
+# Another annoyance is that the upstream Makefile uses app-arch/unzip to
+# extract a snapshot of AngularJS, but that's only needed when USE=web.
+#
+MOD_ALIAS=apache2_modules_alias
+DEPEND="sys-devel/libtool
+	virtual/mailx
+	perl? ( dev-lang/perl:= )
+	web? (
+		app-arch/unzip
+		media-libs/gd[jpeg,png]
+		lighttpd? ( www-servers/lighttpd[php] )
+		apache2? (
+			|| (
+				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi]
+				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid]
+				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] )
+			|| (
+				dev-lang/php:*[apache2]
+				dev-lang/php:*[cgi]
+				dev-lang/php:*[fpm] )
+		)
+	)"
+RDEPEND="${DEPEND}
+	vim-syntax? ( app-vim/nagios-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+src_configure() {
+	local myconf
+
+	if use perl; then
+		myconf="${myconf} --enable-embedded-perl --with-perlcache"
+	fi
+
+	if use !apache2 && use !lighttpd ; then
+		myconf="${myconf} --with-command-group=nagios"
+	else
+		if use apache2 ; then
+			myconf="${myconf} --with-command-group=apache"
+			myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
+		elif use lighttpd ; then
+			myconf="${myconf} --with-command-group=lighttpd"
+		fi
+	fi
+
+	econf ${myconf} \
+		--prefix=/usr \
+		--bindir=/usr/sbin \
+		--sbindir=/usr/$(get_libdir)/nagios/cgi-bin \
+		--datadir=/usr/share/nagios/htdocs \
+		--localstatedir=/var/nagios \
+		--sysconfdir=/etc/nagios \
+		--libexecdir=/usr/$(get_libdir)/nagios/plugins
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) nagios
+
+	if use web; then
+		# Only compile the CGIs/HTML when USE=web is set.
+		emake CC=$(tc-getCC) DESTDIR="${D}" cgis html
+	fi
+}
+
+src_install() {
+	dodoc Changelog CONTRIBUTING.md README.asciidoc THANKS UPGRADING
+
+	# There is no way to install the CGIs unstripped from the top-level
+	# makefile, so descend into base/ here. The empty INSTALL_OPTS
+	# ensures that root:root: owns the nagios executables.
+	cd "${S}/base" || die
+	emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
+	cd "${S}" || die
+
+	# Otherwise this gets installed as 770 and you get "access denied"
+	# for some reason or other when starting nagios. The permissions
+	# on nagiostats are just for consistency (these should both get
+	# fixed upstream).
+	fperms 775 /usr/sbin/nagios /usr/sbin/nagiostats
+
+	# INSTALL_OPTS are needed for most of install-basic, but we don't
+	# want them on the LIBEXECDIR, argh.
+	emake DESTDIR="${D}" install-basic
+	fowners root:root /usr/$(get_libdir)/nagios/plugins
+
+	# Don't make the configuration owned by the nagios user, because
+	# then he can edit nagios.cfg and trick nagios into running as root
+	# and doing his bidding.
+	emake INSTALL_OPTS="" DESTDIR="${D}" install-config
+
+	# No INSTALL_OPTS used in install-commandmode, thankfully.
+	emake DESTDIR="${D}" install-commandmode
+
+	if use web; then
+		# There is no way to install the CGIs unstripped from the
+		# top-level makefile, so descend into cgi/ here. The empty
+		# INSTALL_OPTS ensures that root:root: owns the CGI executables.
+		cd "${S}/cgi" || die
+		emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
+		cd "${S}" || die
+
+		# install-html installs the new exfoliation theme
+		emake INSTALL_OPTS="" DESTDIR="${D}" install-html
+
+		if use classicui; then
+			# This overwrites the already-installed exfoliation theme
+			emake INSTALL_OPTS="" DESTDIR="${D}" install-classicui
+		fi
+
+		# Install cute Gentoo icons (bug #388323), setting their
+		# owner, group, and mode to match those of the rest of Nagios's
+		# images.
+		insinto /usr/share/nagios/htdocs/images/logos
+		doins "${WORKDIR}/${GENTOO_ICONS}"/*.*
+	fi
+
+	newinitd openrc-init nagios
+
+	if use web ; then
+		if use apache2 ; then
+			# Install the Nagios configuration file for Apache.
+			insinto "/etc/apache2/modules.d"
+			doins "${FILESDIR}"/99_nagios4.conf
+		elif use lighttpd ; then
+			# Install the Nagios configuration file for Lighttpd.
+			insinto /etc/lighttpd
+			newins "${FILESDIR}/lighttpd_nagios4.conf" nagios.conf
+		else
+			ewarn "${CATEGORY}/${PF} only supports apache or lighttpd"
+			ewarn "out of the box. Since you are not using one of them, you"
+			ewarn "will have to configure your webserver yourself."
+		fi
+	fi
+}
+
+pkg_postinst() {
+
+	if use web; then
+		if use apache2 || use lighttpd ; then
+			if use apache2; then
+				elog "To enable the Nagios web front-end, please edit"
+				elog "${ROOT}etc/conf.d/apache2 and add \"-D NAGIOS -D PHP\""
+				elog "to APACHE2_OPTS. Then Nagios will be available at,"
+				elog
+			elif use lighttpd; then
+				elog "To enable the Nagios web front-end, please add"
+				elog "'include \"nagios.conf\"' to the lighttpd configuration"
+				elog "file at ${ROOT}etc/lighttpd/lighttpd.conf. Then Nagios"
+				elog "will be available at,"
+				elog
+			fi
+
+			elog "  http://localhost/nagios/"
+		fi
+	fi
+
+	elog
+	elog "If your kernel has /proc protection, nagios"
+	elog "will not be happy as it relies on accessing the proc"
+	elog "filesystem. You can fix this by adding nagios into"
+	elog "the group wheel, but this is not recomended."
+	elog
+}
diff --git a/net-analyzer/nagios-plugin-check_raid/Manifest b/net-analyzer/nagios-plugin-check_raid/Manifest
new file mode 100644
index 000000000000..844a1ab537ba
--- /dev/null
+++ b/net-analyzer/nagios-plugin-check_raid/Manifest
@@ -0,0 +1,10 @@
+DIST nagios-plugin-check_raid-02b6425dac3db7e98d4c36bf0836357c6b36196c.tar.gz 49866 SHA256 959e269e58795cf89fab61b041511513d1b724855f1d38338f1f5e4e1083a8a7 SHA512 548241cd344c135dd6509e930329a9957184330a6f317f758a35c32fc680d421932e3daa12a8f7c0ec8071f96f9e63619de4dff2ea648652b6c2494e800d7ed4 WHIRLPOOL cd00353df2c133576e36f8fe204e11fb754fed081565d87b305905b0ee2a1e6c652f11a9bb99769e1467e838711583886dfe9ecfeb3c40c566069ce07af84cd0
+DIST nagios-plugin-check_raid-4.0.0.tar.gz 46308 SHA256 eb33c54b6c532076dafe72bc80905c17d1604fc306f5075b6fdc6cf41dcd8ac2 SHA512 0f80321615a29665c32bef8b5426fad5994c28b48446167d81504b8ae5720c28b9eaf449f48147e5fc7b24907560994d61b81bed68f9b8caa9a87b18eddd9ee9 WHIRLPOOL 8af62afd9eff172ab4e24bbde564c52826390ad40130ae091d62c10634e0313cb55f39e163988349015694389c152a6e4930c84ebd230ac3686a59e8b6ca56b9
+DIST nagios-plugin-check_raid-4.0.1.tar.gz 50173 SHA256 270fd6c8189269152255ceb19288736afe4b9398b1a9a94409e2c73f13fa43d3 SHA512 882d76d71231d675caaf75883962c3983acbec194ee437ee7447f75607b1767e3aed3e939bdafb90cfab5d131c40d3e0b1d77b90a4c19a4809f18c9e64c114fd WHIRLPOOL bb9b31925a9977de4393bb4f949ac6ec281144e8d6c25ee33e14002bac546b3f2b89cf3a9c84a208d7505d1e1378bd19805ebd018d639c595c1b6fd7a67f0750
+DIST nagios-plugin-check_raid-5da4400ff978189d6be889f2448099535baa01f4.tar.gz 46422 SHA256 423da601fa7471dda5db839a07a52ce21e33ec00e09ad859f4fac4705f6bad18 SHA512 4c4d372735576cf104886c62c071dc98512687ecc1b2f3d56f614c24b747566ff849119c3e0a71b011db5a32e67f50c9d772c0c68a895320e0a5b63322cf6446 WHIRLPOOL 791836ab95edc679cd2288ba9231c4eccddd1d7a09cca68ce446fde498503942a040d48862f4157ebe1b83f645d31b77f7a7a6785095d3e4a5a7a40f56dd56c4
+EBUILD nagios-plugin-check_raid-4.0.0-r1.ebuild 2093 SHA256 50d17085f4b1405a134cbcf4822829cf6f3458eb196f8403bcedb31304077ca0 SHA512 41719dd9092b671b0660679aa9af8a29cdcfc1a7aee423f2af9fa66b2b444f8f0b33f114fb6b19358bc66830d6f78c73e99a71280fb8cb8c95f10e4a313cf482 WHIRLPOOL a48198db65866aa3fef6d0a3b4916be62558e521c06140d4c76cdffa248a8362d1dfafee1147290763185d581d112f3336f77411b5c0cf2079d8fb9fb488d383
+EBUILD nagios-plugin-check_raid-4.0.0_p20151215.ebuild 2125 SHA256 d0a86af3c8b879549fc43fa29647739105ebfae54cbd116be4d55b9672f50837 SHA512 84ec5f6c48ecb436857b2600e46b6873651c909e8804574c5ee6468daf211a225de1cd9cad18d072aee4a410b006f51e273a7d6649993db080b58e5789e13e43 WHIRLPOOL d22484fbe7a076bd96e0e4d7e4d356d0e196605a39be4f8653a000b96f1a1238004a3c777f2bb5258f125de04c19fe50e46e944d7817a59610dc0a6c3645df21
+EBUILD nagios-plugin-check_raid-4.0.0_p20160215.ebuild 2125 SHA256 4a3ad24a26f2b6e97d177f0fdc5c07111e02bde7362ca52814ba4690fce26d8a SHA512 1f9afc62ee8684d2151011b6c9c9a8a59224268436f2c637398e12448b3f15d11ffb443cca6456eab2800317cd201059c71992bf3b875f7940d916cb0813624e WHIRLPOOL f44e5372466576faf9c079e244a70f379fded24c00f39fc1274f4ea461c3e23f151c22641157072ff20d3500ae7ec388508ccd8043249d9274553778dcde83ba
+EBUILD nagios-plugin-check_raid-4.0.1.ebuild 2085 SHA256 0f38fc0e5795b71b65220068e3613498bda05619b29c102b9d5f8e7cf95bef9b SHA512 c5f3ae89ce16bf5a49c954204eb24abe601e74f9b24813d31a1a8750ec76ba0e023f7f582dedced2df24937ecc91854d586a48bc143ab49b8f3da0a2cddfed1b WHIRLPOOL a2d5b384b6d886b3ed17eec38589d3ce875727dce706813cfb9493ee942c6b6333021a94a2fd4974d72b35769fe449b288d5a4636b4352c21b329195086da2a4
+MISC ChangeLog 802 SHA256 e7836e43895ec8996e4846c395d75644070b5dbefedfea1617d6cb271d0f265e SHA512 9068002713bd4e27154cd1b38498621b58bc3fc78102f9d1f4da40bff989c4452f8b564d48843aa65e8aa6d7cfee096cb38b756fa8c759160c03f4a8dc7b1f81 WHIRLPOOL 23be9f70b2af26b349bfadd95cfa23ed3c655b216791165098f5ba448fe5715621e36e882bb4a3bf9ce441d59fbfe9915e8c4fadd91a441bd5abff1afea322a5
+MISC metadata.xml 1205 SHA256 f0c1dfacfa57808841a7274f07e7f54ce7d43e4336426b6b906943dbf01ea6cb SHA512 c91761d711709ae8edd20e716e7233242feecbc3156f86c1811add83b453ae8cfb71e2de66ee3902f56f182d87019bd11eb417ca5e1e99ef540f920088dce472 WHIRLPOOL ec3acabbbe653e7d3ce54512221c39d1615b132e47b68294447d329561b45ac81d96dd5dedca7d7b5aa7582ada963e5ad6d90962e45b435cae98a4255661b65c
diff --git a/net-analyzer/nagios-plugin-check_raid/metadata.xml b/net-analyzer/nagios-plugin-check_raid/metadata.xml
new file mode 100644
index 000000000000..61b6124e4182
--- /dev/null
+++ b/net-analyzer/nagios-plugin-check_raid/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+	<longdescription lang="en">
+		Nagios/Icinga plugin to check current server's RAID status; this tool
+		wraps MANY different RAID tools and provides a consistent check for
+		them.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">glensc/nagios-plugin-check_raid</remote-id>
+	</upstream>
+	<use>
+		<flag name='3ware'>Support 3ware RAID controllers</flag>
+		<flag name='aacraid'>Support Adaptec AAC-RAID controllers</flag>
+		<flag name='dmraid'>Support Device-Mapper RAID</flag>
+		<flag name='hpa'>Support HP Array controllers</flag>
+		<flag name='hpsa'>Support HP SmartArray (CCISS) controllers</flag>
+		<flag name='megaraid-sas'>Support LSI MegaRAID SAS controllers</flag>
+		<flag name='megaraid-scsi'>Support LSI MegaRAID SCSI controllers</flag>
+		<flag name='mpt-sas2'>Support LSI SAS-2 controllers</flag>
+		<flag name='mpt'>Support LSI MPT Fusion controllers</flag>
+		<flag name='i2o'>Support DPT-I2O controllers (mostly Adaptec)</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0-r1.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..d1b0e53b96be
--- /dev/null
+++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils perl-module
+
+DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status"
+HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="3ware aacraid dmraid hpa hpsa i2o megaraid-sas megaraid-scsi mpt mpt-sas2"
+
+DEPEND="dev-perl/Monitoring-Plugin
+		dev-perl/Module-Pluggable"
+RDEPEND="${DEPEND}
+		sys-apps/smartmontools
+		sys-fs/lsscsi
+		3ware? ( sys-block/tw_cli )
+		aacraid? ( sys-block/arcconf )
+		dmraid? ( sys-fs/dmraid )
+		hpa? ( sys-block/hpacucli )
+		hpsa? ( sys-apps/cciss_vol_status )
+		i2o? ( sys-apps/raidutils )
+		megaraid-sas? ( sys-block/megacli )
+		megaraid-scsi? ( sys-block/megarc )
+		mpt-sas2? ( sys-block/sas2ircu )
+		mpt? ( sys-block/mpt-status )
+		"
+
+# TODO:
+# Package all the other Perl build pieces, and stop using the monolithic perl script.
+src_prepare() {
+	# Upstream has a custom Makefile that is meant to build bundles.
+	mv -f Makefile Makefile.upstream
+	sed -i '/CPANfile/d' Makefile.PL
+	default
+}
+
+src_install() {
+	default
+	plugindir="/usr/$(get_libdir)/nagios/plugins"
+	dodir "$plugindir"
+	mv -f "${D}"/usr/bin/check_raid.pl "${D}"/"${plugindir}"
+	dodoc README.md ChangeLog.md CONTRIBUTING.md check_raid.cfg
+}
+
+pkg_postinst() {
+	einfo "The following RAID controllers are supported without special tools:"
+	einfo "GDT (Intel/ICP) RAID Controller"
+	einfo "HP MSA (special configuration needed)"
+	einfo "The following RAID controllers do not have tools packaged in Gentoo, but ARE supported by this tool:"
+	einfo "Intel: CmdTool2"
+	einfo "Areca: areca-cli"
+	einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/10"
+	einfo "Marvell RAID: mvcli"
+	einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/92"
+	einfo "Adaptec ServeRAID: aaccli"
+	einfo "Adaptec AACRAID: afacli (* some controllers supported by USE=aacraid, sys-block/arcconf)"
+	einfo "Adaptec ServeRAID 7k: ipssend"
+}
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20151215.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20151215.ebuild
new file mode 100644
index 000000000000..dfc0eeaab718
--- /dev/null
+++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20151215.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils perl-module
+
+DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status"
+HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid"
+COMMIT="5da4400ff978189d6be889f2448099535baa01f4"
+MY_PV="${COMMIT:-$PV}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="${HOMEPAGE}/archive/${COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="3ware aacraid dmraid hpa hpsa i2o megaraid-sas megaraid-scsi mpt mpt-sas2"
+
+DEPEND="dev-perl/Monitoring-Plugin
+		dev-perl/Module-Pluggable"
+RDEPEND="${DEPEND}
+		sys-apps/smartmontools
+		sys-fs/lsscsi
+		3ware? ( sys-block/tw_cli )
+		aacraid? ( sys-block/arcconf )
+		dmraid? ( sys-fs/dmraid )
+		hpa? ( sys-block/hpacucli )
+		hpsa? ( sys-apps/cciss_vol_status )
+		i2o? ( sys-apps/raidutils )
+		megaraid-sas? ( sys-block/megacli )
+		megaraid-scsi? ( sys-block/megarc )
+		mpt-sas2? ( sys-block/sas2ircu )
+		mpt? ( sys-block/mpt-status )
+		"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Upstream has a custom Makefile that is meant to build bundles.
+	mv -f Makefile Makefile.upstream
+	sed -i '/CPANfile/d' Makefile.PL
+	default
+}
+
+src_install() {
+	default
+	plugindir="/usr/$(get_libdir)/nagios/plugins"
+	dodir "$plugindir"
+	mv -f "${D}"/usr/bin/check_raid.pl "${D}"/"${plugindir}"
+	dodoc README.md ChangeLog.md CONTRIBUTING.md check_raid.cfg
+}
+
+pkg_postinst() {
+	einfo "The following RAID controllers are supported without special tools:"
+	einfo "GDT (Intel/ICP) RAID Controller"
+	einfo "HP MSA (special configuration needed)"
+	einfo "The following RAID controllers do not have tools packaged in Gentoo, but ARE supported by this tool:"
+	einfo "Intel: CmdTool2"
+	einfo "Areca: areca-cli"
+	einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/10"
+	einfo "Marvell RAID: mvcli"
+	einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/92"
+	einfo "Adaptec ServeRAID: aaccli"
+	einfo "Adaptec AACRAID: afacli (* some controllers supported by USE=aacraid, sys-block/arcconf)"
+	einfo "Adaptec ServeRAID 7k: ipssend"
+}
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20160215.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20160215.ebuild
new file mode 100644
index 000000000000..470b7a2f2308
--- /dev/null
+++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20160215.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils perl-module
+
+DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status"
+HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid"
+COMMIT="02b6425dac3db7e98d4c36bf0836357c6b36196c"
+MY_PV="${COMMIT:-$PV}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="${HOMEPAGE}/archive/${COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="3ware aacraid dmraid hpa hpsa i2o megaraid-sas megaraid-scsi mpt mpt-sas2"
+
+DEPEND="dev-perl/Monitoring-Plugin
+		dev-perl/Module-Pluggable"
+RDEPEND="${DEPEND}
+		sys-apps/smartmontools
+		sys-fs/lsscsi
+		3ware? ( sys-block/tw_cli )
+		aacraid? ( sys-block/arcconf )
+		dmraid? ( sys-fs/dmraid )
+		hpa? ( sys-block/hpacucli )
+		hpsa? ( sys-apps/cciss_vol_status )
+		i2o? ( sys-apps/raidutils )
+		megaraid-sas? ( sys-block/megacli )
+		megaraid-scsi? ( sys-block/megarc )
+		mpt-sas2? ( sys-block/sas2ircu )
+		mpt? ( sys-block/mpt-status )
+		"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Upstream has a custom Makefile that is meant to build bundles.
+	mv -f Makefile Makefile.upstream
+	sed -i '/CPANfile/d' Makefile.PL
+	default
+}
+
+src_install() {
+	default
+	plugindir="/usr/$(get_libdir)/nagios/plugins"
+	dodir "$plugindir"
+	mv -f "${D}"/usr/bin/check_raid.pl "${D}"/"${plugindir}"
+	dodoc README.md ChangeLog.md CONTRIBUTING.md check_raid.cfg
+}
+
+pkg_postinst() {
+	einfo "The following RAID controllers are supported without special tools:"
+	einfo "GDT (Intel/ICP) RAID Controller"
+	einfo "HP MSA (special configuration needed)"
+	einfo "The following RAID controllers do not have tools packaged in Gentoo, but ARE supported by this tool:"
+	einfo "Intel: CmdTool2"
+	einfo "Areca: areca-cli"
+	einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/10"
+	einfo "Marvell RAID: mvcli"
+	einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/92"
+	einfo "Adaptec ServeRAID: aaccli"
+	einfo "Adaptec AACRAID: afacli (* some controllers supported by USE=aacraid, sys-block/arcconf)"
+	einfo "Adaptec ServeRAID 7k: ipssend"
+}
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.1.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.1.ebuild
new file mode 100644
index 000000000000..2db9d1b6c6a8
--- /dev/null
+++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils perl-module
+
+DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status"
+HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid"
+#COMMIT=""
+MY_PV="${COMMIT:-$PV}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="${HOMEPAGE}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="3ware aacraid dmraid hpa hpsa i2o megaraid-sas megaraid-scsi mpt mpt-sas2"
+
+DEPEND="dev-perl/Monitoring-Plugin
+		dev-perl/Module-Pluggable"
+RDEPEND="${DEPEND}
+		sys-apps/smartmontools
+		sys-fs/lsscsi
+		3ware? ( sys-block/tw_cli )
+		aacraid? ( sys-block/arcconf )
+		dmraid? ( sys-fs/dmraid )
+		hpa? ( sys-block/hpacucli )
+		hpsa? ( sys-apps/cciss_vol_status )
+		i2o? ( sys-apps/raidutils )
+		megaraid-sas? ( sys-block/megacli )
+		megaraid-scsi? ( sys-block/megarc )
+		mpt-sas2? ( sys-block/sas2ircu )
+		mpt? ( sys-block/mpt-status )
+		"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Upstream has a custom Makefile that is meant to build bundles.
+	mv -f Makefile Makefile.upstream
+	sed -i '/CPANfile/d' Makefile.PL
+	default
+}
+
+src_install() {
+	default
+	plugindir="/usr/$(get_libdir)/nagios/plugins"
+	dodir "$plugindir"
+	mv -f "${D}"/usr/bin/check_raid.pl "${D}"/"${plugindir}"
+	dodoc README.md ChangeLog.md CONTRIBUTING.md check_raid.cfg
+}
+
+pkg_postinst() {
+	einfo "The following RAID controllers are supported without special tools:"
+	einfo "GDT (Intel/ICP) RAID Controller"
+	einfo "HP MSA (special configuration needed)"
+	einfo "The following RAID controllers do not have tools packaged in Gentoo, but ARE supported by this tool:"
+	einfo "Intel: CmdTool2"
+	einfo "Areca: areca-cli"
+	einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/10"
+	einfo "Marvell RAID: mvcli"
+	einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/92"
+	einfo "Adaptec ServeRAID: aaccli"
+	einfo "Adaptec AACRAID: afacli (* some controllers supported by USE=aacraid, sys-block/arcconf)"
+	einfo "Adaptec ServeRAID 7k: ipssend"
+}
diff --git a/net-analyzer/nagios-plugins-flameeyes/Manifest b/net-analyzer/nagios-plugins-flameeyes/Manifest
new file mode 100644
index 000000000000..8f92bbfeaf24
--- /dev/null
+++ b/net-analyzer/nagios-plugins-flameeyes/Manifest
@@ -0,0 +1,4 @@
+EBUILD nagios-plugins-flameeyes-9999.ebuild 1106 SHA256 efa1f04648c7c3a327983a3ade209966806611057a12658badd634847965cbbe SHA512 b26844e3264f0a4f77994419d151c978574c1cd5e765bc3bde2b19e202a0d4d68aa56b92911c12d4ccc1a5a4768a2742fb60f951aa0f2744b262c29eb6e40a35 WHIRLPOOL cae8d088d957f13032b785494f52f9c35848d03dd2585d5fcf0b5a87dbd6ddb7639faf26bd5128fcc43bc0332fdd30fe47107fa333fa4c3c0172463c5782bac7
+MISC ChangeLog 2600 SHA256 6f390b960afe4b0c938a32b304f0c921da2edd2aebecedda4e6b3cf0d93bc352 SHA512 96435c02c6759597dd6361a242e279bd2e5705726a5158877d777b7e06b175b307c789f52e25862ecc15dedfaadeb7c75f32b9b674bb91e7cbbdf452d7ec3965 WHIRLPOOL 9ac2167fccf810edbe2921bb88dfb9f9914ffcc2a908dc33a26769b879560d5ad44d62d67dd92412c03d12fce6a1558df11e015a25a70f7115c896dafc31b635
+MISC ChangeLog-2015 1032 SHA256 003871ce9515b51cbcb2f5aace62e550842219ef4cbb92974eba2d64b69a3666 SHA512 b4a00542af13aff7a856da1576dda193bb5f441a2c1f08b468eb40b2a505caf3fda637c76575ceabe478dbb7b2acf2355d56f84f73ef6ab9194c176d2fef1d2e WHIRLPOOL a9373ba9f2b8e17e52dce0a9cf9126979802bc23d4b031f405b8520e2a4d90da2d759e944be348595296f656d2362bddbe003d9f6e653ba445e6630aec0c758d
+MISC metadata.xml 626 SHA256 fabbbce39e10cf0676e036d2116a10ab90fa2245029bf50abcac3ff112e24248 SHA512 f89139edf88000f6767eeb1424ead0fc9a87e9ededbdb4277e73db92a766804182540aa82a0de37b7b708d0f5094fc816be9be2485a8f1af9190cc690cd57176 WHIRLPOOL 865d2867bc834d8b767cb55795a2628f3ac1d870808ed8deadc503161b061cffcf42ae8c47ad801ec80f7659a9711f282e25e8ccf03c375e0511591af34b87ec
diff --git a/net-analyzer/nagios-plugins-flameeyes/metadata.xml b/net-analyzer/nagios-plugins-flameeyes/metadata.xml
new file mode 100644
index 000000000000..7bf85b98253c
--- /dev/null
+++ b/net-analyzer/nagios-plugins-flameeyes/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
+  <use>
+    <flag name="smart">
+      Install <pkg>sys-apps/smartmontools</pkg> required for
+      S.M.A.R.T. disk monitoring. Disabling the flag removes the
+      plugin file. This plugin also requires the sudo flag to be
+      enable.
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="github">Flameeyes/nagios-plugins-flameeyes</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-9999.ebuild b/net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-9999.ebuild
new file mode 100644
index 000000000000..dd0b836e946c
--- /dev/null
+++ b/net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-9999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit git-2 multilib
+
+EGIT_REPO_URI="https://github.com/Flameeyes/${PN}.git"
+SRC_URI=""
+KEYWORDS=""
+
+DESCRIPTION="Flameeyes's custom Nagios/Icinga plugins"
+HOMEPAGE="https://github.com/Flameeyes/nagios-plugins-flameeyes"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="smart samba"
+
+RDEPEND="
+	dev-perl/Monitoring-Plugin
+	sys-apps/portage
+	dev-perl/Time-Duration
+	dev-perl/TimeDate
+	smart? (
+		sys-apps/smartmontools
+		app-admin/sudo
+	)
+	samba? ( dev-perl/Filesys-SmbClient )"
+DEPEND=""
+
+src_compile() {
+	cat - > "${T}"/50${PN} <<EOF
+Cmnd_Alias NAGIOS_PLUGINS_FLAMEEYES_CMDS = /usr/sbin/smartctl
+User_Alias NAGIOS_PLUGINS_FLAMEEYES_USERS = nagios, icinga
+
+NAGIOS_PLUGINS_FLAMEEYES_USERS ALL=(root) NOPASSWD: NAGIOS_PLUGINS_FLAMEEYES_CMDS
+EOF
+}
+
+src_install() {
+	insinto /etc/sudoers.d
+	doins "${T}"/50${PN}
+
+	dodir /usr/$(get_libdir)/nagios/plugins/flameeyes
+	cp -Rp $(find . -type d -mindepth 1 -maxdepth 1 -not -name .git) \
+		"${D}/usr/$(get_libdir)/nagios/plugins/flameeyes" || die
+
+	dodoc README.md
+}
diff --git a/net-analyzer/nagios-plugins-snmp/Manifest b/net-analyzer/nagios-plugins-snmp/Manifest
new file mode 100644
index 000000000000..2288a38f6d53
--- /dev/null
+++ b/net-analyzer/nagios-plugins-snmp/Manifest
@@ -0,0 +1,5 @@
+DIST nagios-plugins-snmp-0.6.0.tgz 381664 SHA256 c3616feeb817165bc356df8f2daef52e1077f5d97a35c8074cadc68e15c0fff5 SHA512 42fe9e2a9a99876d81731d821b7d1e4700f8637c8a890980f5cb3de4a3985210d86d38fd7ebbd7d075ff616da518cc932f5eb999f47fc3833ed62c1f7d4f4529 WHIRLPOOL 74fd6272690e307bfa996d6db08230dfc4314f14a2e146545913b4d0b42a42168560dded9be51c101a7571411663d74d78a9d1a35d9119b67c3765f28d33187f
+EBUILD nagios-plugins-snmp-0.6.0-r2.ebuild 889 SHA256 f3b495a29c4e7ca50257b9d9a9d97d688dc21725408842312184923a6b507808 SHA512 44c6501861586be89f75df69dd5b43b3938ad32d8560afd243931c4ccba5999f6814f5e8c528482428e88697b6c1610ec810e7db326946c2b476bef903af06ca WHIRLPOOL e14d572166e1c2ca2d3820bfb36fb83259857ba8d07c7abd257d1e4a8b2a52203e9da2af527fc77b2ae0decc758b0de0756b8634bfda15f47a5aaf12a3678e54
+MISC ChangeLog 2866 SHA256 d79751ae72f7496fb64b482a421650d2d01a99cde7fc67178e7c5ebd7b7ac8a7 SHA512 45ea5974c9fbcd4492e7911fd05b10b25e318dc744000590859bd058b6ed8d43ba0f1f7c088ac3c8b4492cc96bda741a4df905790d2c7a5832dac2587305c7ff WHIRLPOOL bc4287b42b0537e1503a17de843934534df7a198d5749fde695ecf02be2a5077905abf518e0b7da51fe94a55bb5d126a2335712d15691a3192af791bf0ab2c56
+MISC ChangeLog-2015 3448 SHA256 6bbe367401d70f5f8be39caa20e9db0784e255671e442a10a39b435fecd1747d SHA512 cd0a3f320fa8e86a9d6032946688d9aa5e732691494de14c963b8e45322bc48d8885ab3cf5ae69a558d412ae7c74327d16ec66aa044053fb06b85d9aba9d3e3b WHIRLPOOL 2f662cc08d9e0d4ff115309da45753115a9587f0354c6873b17498661f8cbfa788f544cd1f2540759ca7af98d2c9ed4c560650d99f32c75ad31f34455510c1d8
+MISC metadata.xml 390 SHA256 f2decf39cdfe68b8e8e335d96364d0d48b994fa76e706122e6fa207a6cc03cd7 SHA512 0814c74c2ffd3728a8231a4d0240b23598719cfe06b57dad979092d8a6171a7564b905da4dad202313bfa2e237036b75f4f12dc57050469dd2f68f91820afda6 WHIRLPOOL 70e86560b3aef4820d2ffb0ffec8da4f90b6e6a23198d28990988a873289bcedb18275bf8929b26c548745ad172bbbb06af588b71986306d232537751af4e87e
diff --git a/net-analyzer/nagios-plugins-snmp/metadata.xml b/net-analyzer/nagios-plugins-snmp/metadata.xml
new file mode 100644
index 000000000000..b7624565acac
--- /dev/null
+++ b/net-analyzer/nagios-plugins-snmp/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+      <email>creffett@gentoo.org</email>
+      <name>Chris Reffett</name>
+  </maintainer>
+  <maintainer type="project">
+      <email>sysadmin@gentoo.org</email>
+      <name>Gentoo Sysadmin Project</name>
+  </maintainer>
+  </pkgmetadata>
diff --git a/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild b/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild
new file mode 100644
index 000000000000..c89ed52c8249
--- /dev/null
+++ b/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools user
+
+DESCRIPTION="Additional Nagios plugins for monitoring SNMP capable devices"
+HOMEPAGE="http://nagios.manubulon.com"
+SRC_URI="http://nagios.manubulon.com/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
+IUSE=""
+
+DEPEND="net-analyzer/net-snmp"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/nagios-plugins-snmp
+
+pkg_setup() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+src_prepare() {
+	sed -i -e '/^CFLAGS=""/d' configure.in
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/nagios \
+		--libexec=/usr/$(get_libdir)/nagios/plugins
+}
+
+DOCS=( README NEWS AUTHORS )
+
+src_install() {
+	default
+
+	fowners root:nagios /usr/$(get_libdir)/nagios/plugins
+	fperms o-rwx /usr/$(get_libdir)/nagios/plugins
+}
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
new file mode 100644
index 000000000000..cdcf3a5744fe
--- /dev/null
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -0,0 +1,7 @@
+DIST nagios-plugins-2.0.3.tar.gz 2659772 SHA256 8f0021442dce0138f0285ca22960b870662e28ae8973d49d439463588aada04a SHA512 2753e6f3fc7433a5583fee01e63a65b9ea74155964f2b6e6bf3458e56cb29ea5dbd020f83816044a717b66d6548d203b3a082fba0faedcd629c7a8457bc19b36 WHIRLPOOL 4b0e4024833373df3f0db44657345a1f4495c4022e56bf6b369cc2846f9127e565520f6b7cdf1b94384592e78327d584da7d939a3ac0586e0ae67fd1258c138b
+DIST nagios-plugins-2.2.1.tar.gz 2728818 SHA256 647c0ba4583d891c965fc29b77c4ccfeccc21f409fdf259cb8af52cb39c21e18 SHA512 6ffe313a56a305b382f62abc0f0958d7078f9050e1340f30721d6e6f71944b57b1650e90e6835c35dd7c9f3f4b4cee9f235b8382b0811db30b3729daaafc9bc3 WHIRLPOOL 57579a7948ab1ce5c66db47e7221b5b8087e3fa027b2a69ad95129ba44af6ba13eaa4b766f3a2de11f708a80e3f44d6d54c6d513388e58c5be75c7bb166325e8
+EBUILD nagios-plugins-2.0.3-r2.ebuild 2828 SHA256 8ad04b08572e3e7d56ae11f9e0b82fd87f041040fd8fbf1cfdb8a2fdd4fe6b78 SHA512 cabe19f142006c4d104721361c2c58fc7a103717041050a21bc21b47adb6702bf05c77f1ed8b063f74b11a59a2dd1120d8478e5b1d803636aeb9f1ae92c2ae91 WHIRLPOOL 3bdfcb4df0bb46509d9ce0cdfbe3e0e74cb9e7452f0f0c314f570bffac452366e858f4d0175292da9e97188c5a0ec0ffff972ca0bf821fe93ef520328c12f016
+EBUILD nagios-plugins-2.2.1.ebuild 2979 SHA256 29d987c96b656566dcc806be515cf6fd157f707f813830bd520fef7690616589 SHA512 d11747ef8007eedb29f51598bdd2109fbb17a8cc93304b441b22be94fbbbb4ce8b59132340e20999428123650972708f3812fc8134cc95256d4ab09cff6f2ba2 WHIRLPOOL 5db78b4a161216381bf3cb3d1488c37f9fd37ae7f0702d0778cdf06047763823bcd4f0710bb2bbb1a38b9b8924f8197645702161cf0d27bd95cde41dc70dc073
+MISC ChangeLog 4744 SHA256 4c08d4f657682469e96dd1a18715ab6b6439de60e0b69132de016bd98acf3138 SHA512 5af2e792504b1771880084c26439b4446bf614c3e1fcc00a1b84c600eb35ce02b729af739d8f7443671a093f16d37ba5f20129c1d43aaab54640e109c128762a WHIRLPOOL 4765d0aae5d3f87f28506bcdbbfbf7e6bcf1dd5a66366b0c05c69423a910b8d4f54168f397dc84343ec85dce9d9a5170c84be02e88dbc837a4698698f0768f4c
+MISC ChangeLog-2015 16032 SHA256 0fcc0dcd50ab5fd579c2fe7d87c33deb815f396f4c70a31909f1da00a47b7a74 SHA512 2ac4eb36d06e72159faa28f62cafa23f8e3b5db0f030209717cf65775f1ff3bd3f95511fd5c17f95866689e77624ab76835876dc00c1598bae45d6f6e4ed9fe5 WHIRLPOOL 2eb21e54a88026a1adfbd242b1ed2892b4c28b8fb418f6dee36f2077571d9b9f25f6c82f9b3774847e62aa6e5261b695d4bdfc3d31cf06ced31aa493a6a47496
+MISC metadata.xml 1430 SHA256 656fca85f1a00b533736cd3d51ab50a2d4c110b31fc33214a6740ee15435c0ea SHA512 d6cbc6820de52e1ed471b97a6c592af72474db492204594314eebb656b8abe89a01667a7bbb621418fd393aeacb28e9a10c5749de7ace67dd15119f701019e72 WHIRLPOOL 6bbedfdaf61e458a0ed5ded3e6e2be96ac27d05aca94dbcef212e8226f57c7cba4db05cfaaa80c238dafa83d49039183969870975bff28e119b200220c6dcf5a
diff --git a/net-analyzer/nagios-plugins/metadata.xml b/net-analyzer/nagios-plugins/metadata.xml
new file mode 100644
index 000000000000..21e64f4399ba
--- /dev/null
+++ b/net-analyzer/nagios-plugins/metadata.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
+  <use>
+    <flag name="nagios-dns">
+      Install <pkg>net-dns/bind-tools</pkg> required for monitoring
+      DNS servers. Disabling the flag does not remove any plugin file.
+    </flag>
+    <flag name="nagios-game">
+      Install <pkg>games-util/qstat</pkg> required for monitoring FPS
+      servers. Disabling the flag does not remove any plugin file.
+    </flag>
+    <flag name="nagios-ping">
+      Install <pkg>net-analyzer/fping</pkg> required for fancy ping
+      monitoring. Disabling the flag does not remove any plugin file.
+    </flag>
+    <flag name="ssh">
+      Install <pkg>net-misc/openssh</pkg> required for monitoring SSH
+      servers. Disabling the flag does not remove any plugin file.
+    </flag>
+    <flag name="snmp" restrict="&gt;=net-analyzer/nagios-plugins-1.4.16-r1">
+      Install <pkg>dev-perl/Net-SNMP</pkg> required for monitoring
+      SNMP values. Disabling the flag does not remove any plugin file.
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="github">nagios-plugins/nagios-plugins</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.0.3-r2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.0.3-r2.ebuild
new file mode 100644
index 000000000000..e50223884561
--- /dev/null
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.0.3-r2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib user
+
+DESCRIPTION="Official set of plugins for Nagios"
+HOMEPAGE="http://nagios-plugins.org/"
+SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
+IUSE="ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres samba snmp ssh +ssl"
+
+# Most of the plugins use automagic dependencies, i.e. the plugin will
+# get built if the binary it uses is installed. For example, check_snmp
+# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
+# installed. End result: most of our runtime dependencies are required
+# at build time as well.
+#
+# REAL_DEPEND contains the dependencies that are actually needed to
+# build. DEPEND contains those plus the automagic dependencies.
+#
+REAL_DEPEND="dev-lang/perl
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:* )
+	ssl? ( dev-libs/openssl:0 )"
+
+DEPEND="${REAL_DEPEND}
+	nagios-dns? ( net-dns/bind-tools )
+	nagios-game? ( games-util/qstat )
+	nagios-ping? ( net-analyzer/fping )
+	samba? ( net-fs/samba )
+	ssh? ( net-misc/openssh )
+	snmp? ( dev-perl/Net-SNMP
+			net-analyzer/net-snmp[-minimal] )"
+
+# Basically everything collides with nagios-plugins.
+RDEPEND="${DEPEND}
+	!net-analyzer/monitoring-plugins"
+
+# At least one test is interactive.
+RESTRICT="test"
+
+src_prepare() {
+	# Fix the path to our perl interpreter
+	sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \
+		"${S}"/plugins-scripts/*.pl || die
+}
+
+src_configure() {
+	# Use an array to prevent econf from mangling the ping args.
+	local myconf=()
+
+	if use ssl; then
+		myconf+=( $(use_with ssl openssl /usr) )
+	else
+		myconf+=( --without-openssl )
+		myconf+=( --without-gnutls )
+	fi
+
+	# The autodetection for these two commands can hang if localhost is
+	# down or ICMP traffic is filtered. Bug #468296.
+	myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" )
+
+	if use ipv6; then
+		myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" )
+	fi
+
+	econf \
+		$(use_with mysql) \
+		$(use_with ipv6) \
+		$(use_with ldap) \
+		$(use_with postgres pgsql /usr) \
+		"${myconf[@]}" \
+		--libexecdir="/usr/$(get_libdir)/nagios/plugins" \
+		--sysconfdir="/etc/nagios"
+}
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
+		NEWS README REQUIREMENTS SUPPORT THANKS )
+
+pkg_preinst() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+pkg_postinst() {
+	elog "This ebuild has a number of USE flags that determine what you"
+	elog "are able to monitor. Depending on what you want to monitor, some"
+	elog "or all of these USE flags need to be set."
+	elog
+	elog "The plugins are installed in ${ROOT}usr/$(get_libdir)/nagios/plugins"
+}
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1.ebuild
new file mode 100644
index 000000000000..25ec7dd32f37
--- /dev/null
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="Official plugins for Nagios"
+HOMEPAGE="http://nagios-plugins.org/"
+SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres samba selinux snmp ssh +ssl"
+
+# Most of the plugins use automagic dependencies, i.e. the plugin will
+# get built if the binary it uses is installed. For example, check_snmp
+# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
+# installed. End result: most of our runtime dependencies are required
+# at build time as well.
+#
+# REAL_DEPEND contains the dependencies that are actually needed to
+# build. DEPEND contains those plus the automagic dependencies.
+#
+REAL_DEPEND="dev-lang/perl
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:* )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)"
+
+DEPEND="${REAL_DEPEND}
+	nagios-dns? ( net-dns/bind-tools )
+	nagios-game? ( games-util/qstat )
+	nagios-ping? ( net-analyzer/fping )
+	samba? ( net-fs/samba )
+	ssh? ( net-misc/openssh )
+	snmp? ( dev-perl/Net-SNMP
+			net-analyzer/net-snmp[-minimal] )"
+
+# Basically everything collides with nagios-plugins.
+RDEPEND="${DEPEND}
+	!net-analyzer/monitoring-plugins
+	selinux? ( sec-policy/selinux-nagios )"
+
+# At least one test is interactive.
+RESTRICT="test"
+
+DOCS=(
+	ACKNOWLEDGEMENTS
+	AUTHORS
+	CODING
+	ChangeLog
+	FAQ
+	NEWS
+	README
+	REQUIREMENTS
+	SUPPORT
+	THANKS
+)
+
+src_prepare() {
+	default
+
+	# Fix the path to our perl interpreter
+	sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \
+		"${S}"/plugins-scripts/*.pl \
+		|| die 'failed to fix perl interpreter path'
+}
+
+src_configure() {
+	# Use an array to prevent econf from mangling the ping args.
+	local myconf=()
+
+	if use ssl; then
+		myconf+=( $(use_with ssl openssl /usr) )
+	else
+		myconf+=( --without-openssl )
+		myconf+=( --without-gnutls )
+	fi
+
+	# The autodetection for these two commands can hang if localhost is
+	# down or ICMP traffic is filtered. Bug #468296.
+	myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" )
+
+	if use ipv6; then
+		myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" )
+	fi
+
+	econf \
+		$(use_with mysql) \
+		$(use_with ipv6) \
+		$(use_with ldap) \
+		$(use_with postgres pgsql /usr) \
+		"${myconf[@]}" \
+		--libexecdir="/usr/$(get_libdir)/nagios/plugins" \
+		--sysconfdir="/etc/nagios"
+}
+
+pkg_preinst() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+pkg_postinst() {
+	elog "This ebuild has a number of USE flags that determine what you"
+	elog "are able to monitor. Depending on what you want to monitor, some"
+	elog "or all of these USE flags need to be set."
+	elog
+	elog "The plugins are installed in ${ROOT}usr/$(get_libdir)/nagios/plugins"
+}
diff --git a/net-analyzer/nagios-sap-ccms-plugin/Manifest b/net-analyzer/nagios-sap-ccms-plugin/Manifest
new file mode 100644
index 000000000000..178e1de0bf43
--- /dev/null
+++ b/net-analyzer/nagios-sap-ccms-plugin/Manifest
@@ -0,0 +1,8 @@
+AUX nagios-sap-ccms-plugin-0.8-gentoo.patch 1360 SHA256 e1f381bb08e4fc2d1394099622780eb8d28f7c9b771bdf61ec705158d6ae7849 SHA512 133b5ee63448111e512958ee0eb6d45308aebd78c441265c0020bcf9211fe8a746b9f85bb319d4b943e4f52677920c77956807cf907044361507f8f68ebd34fe WHIRLPOOL 57a3d4df31b23362a6f79abc9cee495ef5e98642f3cfa2dc53f11dd0d0d7c29cd67eecc69cfb3384dd64aaf29a6b0a8fca1b6a7917acc2d577319f85d47337ff
+DIST sap-ccms-plugin-0.7.3.tar.gz 2948020 SHA256 ce3831bc8156f5fafe8fb4366bd9d4b2df4c85d55c92d4b38c41f10f701206eb SHA512 5de7b1a39c97ba0aac736814df2e7973c7b79d3411bdcd148a3eac2d2a1a84406b3e22f1b4979524154d02d03cb0ba3757bb68a24e8a280ceec98b767dd4b1d9 WHIRLPOOL 351db8f8ae58a461163526a6d7b3520fb21b18176d7a122d1d28d0a722d78d3f8e7bc96313d20af5036ac455f146e3a81dd5a00bd365c0fab5c1551fd17d8c75
+DIST sap-ccms-plugin-0.8.tar.bz2 10143558 SHA256 6af24e4ac2f3dddc435394e49f491a32c1c1c447025479190e710f1132a708ee SHA512 b1937f798f38e8e835610ecf78bb3a5d03d4b6dbdac728f93e0026ce9122524d772289570256849936a1dc2d3be22d4ba8760657a0dc14d6ba8cb8cae6746dc2 WHIRLPOOL 5f135421fd8304c36629a720888727eba9d090b9462218130c3a04690fe488e84ebb17fe742b73583577a3d42a0cf5995673ca81b63c025203257d9e7f5434ba
+EBUILD nagios-sap-ccms-plugin-0.7.3-r1.ebuild 1179 SHA256 cf5cfe16f532c370210cc059b3ef6be68aafd49de57eb3353a482980d21db19b SHA512 b4ed9c5b4cf4c0e63218b8feca5f1b8c9928e36965b73c206de7aa15212fe88427788d3081d92ae4ea931b029ebf296fe8ea54fc1c002491830fe94a51d0f93d WHIRLPOOL 8fc222b913bc5636d49a34c6f0e60651f5129a9aa8cd37875dcb19fb1c73ffb333e0dc3ec9f43c1d3560f930874cacae877f8d6eb50e107f357ce3397b13167a
+EBUILD nagios-sap-ccms-plugin-0.8.ebuild 1525 SHA256 f73d11762abf690ec084d3e7e7eec527104b9b347a81263f1b509a3e4286b83c SHA512 85d5c6f78520bee84ba5ca2a7c3407bcf72331ad1b24ff67fa95e55e7bea3592a307ff3a5e07cc32d20366b55931f1395beeaec509a91cbd27263ba00d5322ce WHIRLPOOL 25459bb21bb9790286f4b821f77b2b3406f573684e30b6ab0322614deae75cdc64ae8225ac555d12e23a55b374100e87af729ffe26607b1abed87ec9d46c0e95
+MISC ChangeLog 2991 SHA256 4ad32d954c0fea260855ac81d3e473f58b41f389159bd19182af6502a961d867 SHA512 72cf33ab24e0f82bd1f92cc7bf1eb26fee2312c628b5c3507e447992e837a257eddd43b64460bbe737d96685ee69b3c02213b8df33f8529919bd2f64cf28a815 WHIRLPOOL 8c668b8972d45ada7c58e2e332a1c11f1674ba6b41aa0d180a33026cabe32d40972dbdc4497187d57de308d7a873bb8dde880b9b40eca547fb9bf1209fd9c233
+MISC ChangeLog-2015 2496 SHA256 6ecd96dd38869b11c5b53c14bfee7bbe0227a5a90514d3d2fe086b0a639c4dda SHA512 95455228b46c528db2af065b6172414ec2c1a743240f90b494a4eddfe45c07d15c5ad097596bbd2339b16c8517fbc8fbfb52ce1f81c5866dc30582b0e9981db3 WHIRLPOOL 22e1ba45bfc04ec9380e78ced897c842cc6b204c20856106757ed89634cdc5d0e9f68078db0670762e205d3ab61fca7dac68f7d93f72043e124f5ba64d4343ef
+MISC metadata.xml 469 SHA256 eb416d82fcb36945fed53d8385cf7ee0ba4a43c8b37c874c4df74569001c7030 SHA512 e29ec78dc41a8362b6811bd347173d9d396676efad424c83d2d979742e1f62584f40a458f51e21ddc0b44dab5f8f1249b8e7ba89931e0941d09bab56f89ff01a WHIRLPOOL 0b120f6f36bb3daaaf234e85a38be95b67d70a1e0a6f844cf4cfbbc98409dd0fa3b8053dfda447da94f3ad32fb6a85fcff7466db6e69f9175810535e0019c220
diff --git a/net-analyzer/nagios-sap-ccms-plugin/files/nagios-sap-ccms-plugin-0.8-gentoo.patch b/net-analyzer/nagios-sap-ccms-plugin/files/nagios-sap-ccms-plugin-0.8-gentoo.patch
new file mode 100644
index 000000000000..8ded76b3b7d1
--- /dev/null
+++ b/net-analyzer/nagios-sap-ccms-plugin/files/nagios-sap-ccms-plugin-0.8-gentoo.patch
@@ -0,0 +1,61 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1,5 +1,5 @@
+ 
+-VERSION=0.7.3
++VERSION=0.8
+ PLATFORM=$(shell uname -m)
+ 
+ 
+@@ -33,12 +33,10 @@
+ SUBDIRS = sap_moni
+ #C-Compiler
+ 
+-CC=gcc -DSAP_RFC_TIME
+-X_CFLAGS = $(CFLAGS)
++X_CFLAGS = $(CFLAGS) $(LDFLAGS) -DSAP_RFC_TIME
+ SHARED_OBJECTS=libs/$(PLATFORM)/librfccm.so
+ 
+ ifeq ($(patsubst i%86,x86,$(PLATFORM)), x86)
+-	CC=gcc -DSAP_RFC_TIME
+ 	SHARED_OBJECTS=libs/x86/librfccm.so
+ endif
+ 
+--- a/src/sap_moni/Makefile	2009-03-16 12:34:26.000000000 +0100
++++ b/src/sap_moni/Makefile	2010-10-20 01:24:14.000000000 +0200
+@@ -1,23 +1,16 @@
+-PLATFORM=$(shell uname -m)

+-

+ #used files

+-SRC_INI = iniparser.c dictionary.c strlib.c

++SRC_INI = dictionary.c strlib.c

+ OBJ_INI = $(SRC_INI:.c=.o)

+ OBJ=ctype_b.o agnt_rfc.o agnt_mon.o $(OBJ_INI)

+ 

+ SHARED  = sap_moni.so 

+ 

+ #C-Compiler

+-CC=gcc -DSAP_RFC_TIME

+-X_CFLAGS=$(CFLAGS) -fPIC

+-

+-ifeq ($(PLATFORM),ppc64)

+-	CC=gcc -m64 -DSAP_RFC_TIME

+-endif

++X_CFLAGS=$(CFLAGS) -fPIC -DSAP_RFC_TIME

+ 

+ #Rules

+ shared: $(OBJ)

+-	$(CC) -shared $ $(X_CFLAGS) -o $(SHARED) $(OBJ) -ldl -lm

++	$(CC) -shared $ $(X_CFLAGS) $(LDFLAGS) -o $(SHARED) $(OBJ) -ldl -lm -liniparser

+ 

+ 

+ .SUFFIXES: .c .o

+@@ -26,7 +19,7 @@
+ 

+ #Dependencies

+ agnt_rfc.o: saprfc.h sapitab.h agnt_def.h

+-agnt_mon.o: agnt_def.h iniparser.h sapitab.h

++agnt_mon.o: agnt_def.h sapitab.h

+ 

+ 

+ #------

diff --git a/net-analyzer/nagios-sap-ccms-plugin/metadata.xml b/net-analyzer/nagios-sap-ccms-plugin/metadata.xml
new file mode 100644
index 000000000000..4ccb214d4443
--- /dev/null
+++ b/net-analyzer/nagios-sap-ccms-plugin/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>creffett@gentoo.org</email>
+    <name>Chris Reffett</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">nagios-sap-ccms</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/nagios-sap-ccms-plugin/nagios-sap-ccms-plugin-0.7.3-r1.ebuild b/net-analyzer/nagios-sap-ccms-plugin/nagios-sap-ccms-plugin-0.7.3-r1.ebuild
new file mode 100644
index 000000000000..464dbdd90121
--- /dev/null
+++ b/net-analyzer/nagios-sap-ccms-plugin/nagios-sap-ccms-plugin-0.7.3-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit multilib
+
+MY_P="sap-ccms-plugin-${PV}"
+
+DESCRIPTION="Nagios plugin that provides an interface to SAP CCMS
+Infrastructure"
+HOMEPAGE="https://sourceforge.net/projects/nagios-sap-ccms/"
+SRC_URI="mirror://sourceforge/nagios-sap-ccms/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+IUSE=""
+
+DEPEND="net-analyzer/nagios-core"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	cd "${S}/src"
+	emake || die "emake failed"
+}
+
+src_install() {
+	cd "${S}/src"
+	exeinto /usr/$(get_libdir)/nagios/plugins
+
+	for file in {check_sap{,_cons,_instance,_instance_cons,_mult_no_thr,_multiple,_system,_system_cons},create_cfg,sap_change_thr}
+	do
+		doexe ${file}
+	done
+
+	chown -R root:nagios "${D}"/usr/$(get_libdir)/nagios/plugins || die "Failed Chown of ${D}usr/$(get_libdir)/nagios/plugins"
+
+	dolib.so sap_moni.so
+	cd "${S}/config"
+
+	dodir /etc/sapmon
+	insinto /etc/sapmon
+	doins "${S}"/config/*
+}
+
+pkg_postinst() {
+	elog "Have a look at /etc/sapmon for configuring ${PN}"
+	elog "Further information can be found at"
+	elog "http://nagios-sap-ccms.sourceforge.net/"
+}
diff --git a/net-analyzer/nagios-sap-ccms-plugin/nagios-sap-ccms-plugin-0.8.ebuild b/net-analyzer/nagios-sap-ccms-plugin/nagios-sap-ccms-plugin-0.8.ebuild
new file mode 100644
index 000000000000..39bbc8a46c26
--- /dev/null
+++ b/net-analyzer/nagios-sap-ccms-plugin/nagios-sap-ccms-plugin-0.8.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+MY_P="sap-ccms-plugin-${PV}"
+
+DESCRIPTION="Nagios plugin that provides an interface to SAP CCMS
+Infrastructure"
+HOMEPAGE="https://sourceforge.net/projects/nagios-sap-ccms/"
+SRC_URI="mirror://sourceforge/nagios-sap-ccms/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+QA_PRESTRIPPED="/usr/lib/librfccm.so"
+QA_FLAGS_IGNORED="/usr/lib/librfccm.so"
+
+DEPEND="
+	net-analyzer/nagios-core
+	dev-libs/iniparser:0
+"
+RDEPEND=${DEPEND}
+
+S="${WORKDIR}/${PN/-plugin*}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	sed -i src/sap_moni/* \
+		-e 's|#include "iniparser.h"|#include <iniparser.h>|g' \
+		|| die "sed sap_moni/"
+}
+
+src_compile() {
+	emake -C src CC=$(tc-getCC)
+}
+
+src_install() {
+	cd "${S}/src"
+	exeinto /usr/$(get_libdir)/nagios/plugins
+
+	for file in {check_sap{,_cons,_instance,_instance_cons,_mult_no_thr,_multiple,_system,_system_cons},create_cfg,sap_change_thr}
+	do
+		doexe ${file}
+	done
+
+	chown -R root:nagios "${D}"/usr/$(get_libdir)/nagios/plugins || die "Failed Chown of ${D}usr/$(get_libdir)/nagios/plugins"
+
+	dolib.so sap_moni.so
+	newlib.so $(readlink librfccm.so) librfccm.so
+	cd "${S}/config"
+
+	dodir /etc/sapmon
+	insinto /etc/sapmon
+	doins "${S}"/config/*
+}
+
+pkg_postinst() {
+	elog "Have a look at /etc/sapmon for configuring ${PN}"
+	elog "Further information can be found at"
+	elog "http://nagios-sap-ccms.sourceforge.net/"
+}
diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest
new file mode 100644
index 000000000000..221e2be857f1
--- /dev/null
+++ b/net-analyzer/nagios/Manifest
@@ -0,0 +1,6 @@
+EBUILD nagios-4.3.1.ebuild 392 SHA256 e340d184f1babbf01e594d9f5f0a4a91b62247a3a3faffc0c7304eb62e4ad38c SHA512 13cd73016da7a9675039b73f1f3b1cd4d2e0aedf617019278ce728653b3cb7fab7ed1ef572ff942a87cc651b1ee567f9701bfca7080bc90d17ddcbb5e16a7b58 WHIRLPOOL d04bee59b71c77dce8baf4569db4a311e5bcb367866d513667eaef74fe7619d147187d44e8951fd21776b103bdc46bb133a1e6ffea12f2184042698c7483d85a
+EBUILD nagios-4.3.3.ebuild 394 SHA256 194140150f27c1a6985d5b8992c0eeef601a0325f90c73d4d368c88f5dfb364c SHA512 c739a30790603f47f62705e2793eda0ac7d764c196065d952a1cffed10f1acd621872286540ea5565a9aa400a112422cbb0f1203bb0d7c4d8b95ab17a4aaa18e WHIRLPOOL 05f62d5b3ed77fc6a372a609bf2d9aebcfa3384b8f887c9306873147e5c95ffdbd273d9548c6cb8b264212bf9459d4322dfbf6e037bd34d3ddb559feb2df4e2e
+EBUILD nagios-4.3.4.ebuild 399 SHA256 827940978a650d133d3a87f6449ee29032d0fd12180e57416e82f7122899b24e SHA512 1efb7d777b2fd99310dfad42eeeec251347f065637fdf46e5faa8c5579a8f572654828e1e4084982c2f06d5c0e0a5a5fb2966621eac83bc973e3964bf40a471c WHIRLPOOL e722b805eb40ebcb64111259f17bf911442c54aa78423783673ae8a402561f69e9c21f93c7a119bc3afc9c20c251024425c1c1447efcd18d19f24abf47c47307
+MISC ChangeLog 5914 SHA256 561ff371187a99842494e95c18e3bdbc765e0afec38f0b01788c435d26a3617e SHA512 a72ec5f266fd9944977d286d51a56d6815484a2d6f72886b4734f6fbc7b88d54c65a69e85df9757bb29b7986d9e804632c6f6d81cb539efd351f93d0107f688b WHIRLPOOL 56eafed78046177a4406cbad3bf7073c7f33f4bdbe49a552245659b451ac7c60f9eb7af2694924a5c8958b612a85929132279d966a50f4e9d48187792e1e0d36
+MISC ChangeLog-2015 15996 SHA256 18fad7098e79526eccab8935fff43315b0b55387bcd7a3d3f47bdb62f1e6ada4 SHA512 7629c4a3878bf03acd177b1278f9833c3a1ca28cb34cb88078b8ec096663116f070a25216e9d4dd9d110906747f0f4fd14d6dc78e545507f560d1c3a8ab92cf5 WHIRLPOOL 9fe49e0312ef7ecf857cf92d4086193055443e353272eb8a24155ae7e5b9300eb0b8ae84a9f83e19a3f384c6e316772195a60e0c770fbde18b5b1019d03df365
+MISC metadata.xml 1110 SHA256 11508d54aaaccda5cbd1978aae873a5f0e277e6283b5ca15119ba0fdc95b9e8b SHA512 7614b25879899b4939a136de6cd4cbd3995372747e95d2d6b90ccd8e074800b6acb738df5f9c852625c34f5a72c3072c0dec910266068ec8a72184f75aa204e1 WHIRLPOOL 5c1ac52a6d2717b521969ca87d3a28e98d7d6b443b63af0d9ac7645cd23c296bdec26f1da7b83f9de062185c7796b4e30f42fd1ead4e1d32a1c7785f4f798678
diff --git a/net-analyzer/nagios/metadata.xml b/net-analyzer/nagios/metadata.xml
new file mode 100644
index 000000000000..6d334d5e5ae3
--- /dev/null
+++ b/net-analyzer/nagios/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
+  <longdescription>
+    Nagios is a host and service monitor designed to inform you of
+    network problems before your clients, end-users or managers do. It
+    has been designed to run under the Linux operating system, but
+    works fine under most *NIX variants as well. The monitoring daemon
+    runs intermittent checks on hosts and services you specify using
+    external "plugins" which return status information to Nagios. When
+    problems are encountered, the daemon can send notifications out to
+    administrative contacts in a variety of different ways (email,
+    instant message, SMS, etc.). Current status information,
+    historical logs, and reports can all be accessed via a web
+    browser.
+  </longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/nagios/nagios-4.3.1.ebuild b/net-analyzer/nagios/nagios-4.3.1.ebuild
new file mode 100644
index 000000000000..e2be13acf415
--- /dev/null
+++ b/net-analyzer/nagios/nagios-4.3.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The Nagios metapackage"
+HOMEPAGE="http://www.nagios.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND="~net-analyzer/nagios-core-${PV}
+	|| ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )"
diff --git a/net-analyzer/nagios/nagios-4.3.3.ebuild b/net-analyzer/nagios/nagios-4.3.3.ebuild
new file mode 100644
index 000000000000..4c2bad9bdf5c
--- /dev/null
+++ b/net-analyzer/nagios/nagios-4.3.3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The Nagios metapackage"
+HOMEPAGE="http://www.nagios.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND="~net-analyzer/nagios-core-${PV}
+	|| ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )"
diff --git a/net-analyzer/nagios/nagios-4.3.4.ebuild b/net-analyzer/nagios/nagios-4.3.4.ebuild
new file mode 100644
index 000000000000..56f21be590af
--- /dev/null
+++ b/net-analyzer/nagios/nagios-4.3.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The Nagios metapackage"
+HOMEPAGE="http://www.nagios.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="~net-analyzer/nagios-core-${PV}
+	|| ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )"
diff --git a/net-analyzer/nagircbot/Manifest b/net-analyzer/nagircbot/Manifest
new file mode 100644
index 000000000000..7aa870c27936
--- /dev/null
+++ b/net-analyzer/nagircbot/Manifest
@@ -0,0 +1,7 @@
+AUX conf 125 SHA256 b3a338b3c01aca142621f77e4c2f30c89ffcb694565da0c36a1fc3123e471f94 SHA512 4bcf5127e8c8b8b23fc1268ee67f2bfe1f803f9ca552fd8f74dd41c2ebfdaa5f1445a51cb2c56df4f1b83059e94277ea25993dc2496266ac763b0ea30da951fc WHIRLPOOL d13b83b65daedd060bdafce624dbb3a6bfe8148d355f41fb7fc15c04c78bf75e4da8105da1a716cc804ad77d76a96d2a7bff666928c78ab092257a0750c6d8c1
+AUX init 435 SHA256 21043278f0edfab7c0dc6a2f791e3606c1c9b881f5d6819a07f9f9556c45dddd SHA512 5fb4711b20a85811be2932e961a5192f5f6a13311c3299c45d125bb7d7aa9fa564488085408e4ee3c4d01c7051d8ac693b1ac9555164cb635dba1562f47f1930 WHIRLPOOL 3db0ba0829341d6ebf08fcca4f54c356e6800ccf2bdac7081c375ce5431949fb8301df1ffab71448d79578e798fb0de0e069e35b5b1f0b86aeabd56bd6bc9865
+DIST nagircbot-0.0.33.tgz 20085 SHA256 7a7c63a409bdad125b19ec852a772746eda2b1feef71bbdf58bd2a2c785a0887 SHA512 1e4d69cef4a425e8540ff408688cf7899c04098ec47acbd6da601f48e01f808958982e7d8a1519934bd5aa895fe0f8dedc51d80460f85097355d5bdea79fd708 WHIRLPOOL 4a3b89fd0234f0643fde0824bb538617d7dc3f9736ddc18dcfacc6aa217417ed9f25adad2e0f9525b0b90b424c7a9ef95d6b349a997a5143bbe4db72bc751723
+EBUILD nagircbot-0.0.33.ebuild 886 SHA256 65d1b1365e2ad5623a0790e3ad286dfe9c50932b9a0c49375503f0cf24948cd2 SHA512 4d0d1536295546a677016da1350bab878263900cf3e2ff4215ff70ed91a81a1d7f112c243879bef9d38a6eac119b5aa7b4c06ed42bc2784f78ac9c806b59c538 WHIRLPOOL c6f4df4d23a1918eec4c6f3073f3294df4901c210ae5c446b2109101db10ef5f65e150ba964e617915136f27dd26013c832c14ffe14d979ea4ad51750b625e27
+MISC ChangeLog 2840 SHA256 74ca9c4df3f3a11675e7e7673adece3c1c519103cf04e9985ad4068e928e88ec SHA512 6688b5bb598b991675e3f89432f5a62c462cd7e7c5ab1c0d4bccf37086d1e7fc176e8f6b24ac72068792e073f1729ec37e3d66bb2fae67518dd45c7025744575 WHIRLPOOL d9196d03bde2f518b48f23c2ef04a9b95c09179c25d957460520bde8ed764bd36be92357d060bd474b2dabae393c1b089fe27e7ca3f9cd9804e816f41ab1348d
+MISC ChangeLog-2015 1900 SHA256 d1de0e008127edf669a1cd691b2a3c807680c674a66cabe5c6b7729c30df3d02 SHA512 c7e68c464b342a37d13d5325d5ab808a6f103a532d6bd8a78e5d3fbcabe2b2039282aba2f75e88e0c3fa5742d6db935125c1ad1516ef3611656fb88c1f8eb9d5 WHIRLPOOL 24af7d3f3396120b9c89d1cd12e0431ac0d4dc0bfd4fdba5fe46a9a0c0f9e0c091aedcc1c4194b4f4d7f9c5734838e4faaaccda8ebe4ca3e1e9f7d167f457e3c
+MISC metadata.xml 265 SHA256 ed9b60ea2ab3797ad5a41f71fcddf5b580fe433dfaa72f67aa8699cf700ec7a9 SHA512 f37fc4a2e155bc8ef9ef4107341e024691079bafe8da5c090ec19bc571da23297074b57ece45f436fddf0f2f7e34435a3b09e2bfa4993f2188ece9d748e6fa99 WHIRLPOOL 45fa2ec5318494df0aa87801cc2c68fabc6d5669155dc2fd202a3e8fcbded88db7213c2603e1cc6f54dce1151a675762450e75f51e4a083f0c457b839d34de82
diff --git a/net-analyzer/nagircbot/files/conf b/net-analyzer/nagircbot/files/conf
new file mode 100644
index 000000000000..79fc899e11bd
--- /dev/null
+++ b/net-analyzer/nagircbot/files/conf
@@ -0,0 +1,2 @@
+# Put nagircbot arguments here
+# BOTCONF="-f /var/nagios/status.dat -s irc.freenode.net:6667 -c channel -k password -n name"
diff --git a/net-analyzer/nagircbot/files/init b/net-analyzer/nagircbot/files/init
new file mode 100644
index 000000000000..c9cb5a3539bf
--- /dev/null
+++ b/net-analyzer/nagircbot/files/init
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+    use net
+}
+
+start() {
+    ebegin "Starting nagircbot"
+    start-stop-daemon --start -x /usr/bin/nagircbot -- $BOTCONF
+    eend $? "Failed to start nagircbot"
+}
+
+stop() {
+    ebegin "Stopping nagircbot"
+    start-stop-daemon --stop -x /usr/bin/nagircbot
+    eend $? "Failed to stop nagircbot"
+}
diff --git a/net-analyzer/nagircbot/metadata.xml b/net-analyzer/nagircbot/metadata.xml
new file mode 100644
index 000000000000..1d0d59c9a025
--- /dev/null
+++ b/net-analyzer/nagircbot/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/nagircbot/nagircbot-0.0.33.ebuild b/net-analyzer/nagircbot/nagircbot-0.0.33.ebuild
new file mode 100644
index 000000000000..6d748bc63809
--- /dev/null
+++ b/net-analyzer/nagircbot/nagircbot-0.0.33.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="An irc bot that alerts you to nagios changes"
+HOMEPAGE="http://www.vanheusden.com/nagircbot"
+SRC_URI="http://www.vanheusden.com/nagircbot/${P}.tgz"
+
+LICENSE="GPL-2" # GPL-2 only
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="libressl"
+
+CDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="virtual/pkgconfig
+	${CDEPEND}"
+RDEPEND="net-analyzer/nagios-core
+	${CDEPEND}"
+
+src_prepare() {
+cp -av Makefile{,.org}
+	sed -i Makefile \
+		-e 's:-lcrypto -lssl:$(shell pkg-config --libs openssl):g' \
+		-e 's:-O2::g;s:-g::g' \
+		|| die
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) CXX=$(tc-getCXX)
+}
+
+src_install() {
+	dobin nagircbot
+	newconfd "${FILESDIR}"/conf nagircbot
+	newinitd "${FILESDIR}"/init nagircbot
+}
diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
new file mode 100644
index 000000000000..7d7579c22064
--- /dev/null
+++ b/net-analyzer/nagstamon/Manifest
@@ -0,0 +1,10 @@
+AUX nagstamon-2.0-setup.patch 1095 SHA256 1d6520383ea4870c008ecb4423e9d56fc0eb5e317cc95c284aff6e0d73adda84 SHA512 93f98a8e590bd46f8745f5ec9b4ea363a4c4fd7810013aa329bdc4fce12d3f8bfcea46412aea7c87188b4cf2634d002c9f91f09e12870c4686cb0646f6c6a428 WHIRLPOOL f62efe14dd58d5319896b7a112454e831b56b12740a243fab0c8fe098803dc23274f42d02f0cfe916e7564fbbb70c62d2cb3923f9965a88f96309a9348934004
+AUX nagstamon-3.0-setup.patch 1139 SHA256 3ac25bb7e4ea5dec4dfc78b59324db3563f84429fe79f2d9d88854c50231acda SHA512 7ec4f621e1dc91cb941811aaacb6322fee8024d39dfa65e39b3a19631a3ef7c78d4fcd4d8df5630b76904e3c415290b35ac777c4d0e863ce83e15832d061ea4d WHIRLPOOL e1abf37a3c3d9cfcdeb404244d36d0ccef92060efb02d2c82a145a7432d5cfea7f93291be4aa1e97e7645cb0f6127c6c7166c97a063c2f72be5d6b5dbca256bc
+AUX nagstamon.desktop 284 SHA256 f339017716aebaca3f75b0ff395809823d8ac0c0c48803874104bf73fc0c33fb SHA512 1ac7315d89967135de804ccf4c4dd78e28a6018e72bd4ca2274aa81fde8978d93542cf5ad96a58b44e0f1efd4d397b1c42dcc339a3f32b0b33346804162da60e WHIRLPOOL ff2cbafaff167e5e36ebea64f3c66c07f67909c593d31a13482dad1cf6f8a5ca6071d00b82c43cdd4f23ca5927bbf136b4d143ff30d8ffc6271783c45e007559
+DIST Nagstamon-2.0.1.tar.gz 535814 SHA256 3d4b22190d47250b175a4a70b12391c694ba2399832320887e5909e1ce3dfd7b SHA512 f9c8ab928a78f289693ae58cd3dde6fa75dd66dc931dbec6a4affc35bd96f16c39a03cb441575c9ca42e810ae5962fc7226513b8cc2a17871e0365aa3a207db6 WHIRLPOOL fb1ab6f9c3ccef81f4d62f238bf998d98186ff24d44e2a41554a13f82a783e8a14a1ac21d046f179ef62347dd252cb34d818d032c0ef78d7f742fd45acbec033
+DIST Nagstamon-3.0.1.tar.gz 541845 SHA256 e1782d5299205baec54fe003fbe5e4f6bec15986c1e7a942fe3af4b381332128 SHA512 1facbdbba9f9cb545f73b7d63f7c6350f7d01b3dd1104444c2b1c50272361b21f9f1cb2f72f019ad22a554a0863aaa29d0780e8722767e9c2448d8980207c252 WHIRLPOOL 857fcfb39eb6f451dcc111a11b661c87a31d55d075fabfaa42320dba48433d3597e6bcf69356e293be3da160805667be9b00cde2e87630906b69da891be1cd0c
+EBUILD nagstamon-2.0.1.ebuild 1193 SHA256 6fdb284059aa1a3144c15386d4e39400dac664be7fe70014a3159e046090f6c9 SHA512 4e4e469d11fcb40dfc5a3a2f0ce5c95886432c92f11116f9e860fb7f3ae7a0159ea26108bf32729ef75807bc37e885e96cb97b22e9b806057eeac0e27ae298e1 WHIRLPOOL 93d273581c0c0d80bff18f1a24c874bb65a64394d48059109b73624f6c83519a6332b7290fbe6762dbaff5ea78b7016b8d327828db49a6468a272976b573e8bc
+EBUILD nagstamon-3.0.1.ebuild 1379 SHA256 8f00073bcb8b04b9386500484c5c8a269d6e991643cca2fc40de318d1b42bab8 SHA512 9b0f15f63c4a6ede8f885a1ca5dd234ef8b9a93e0856e7e5c5e5654a46ed5c0953fd480e7ee3ce40ac3d179a200ce368b691a38481ee1cd4ec8c9ee820086ba4 WHIRLPOOL d7a0ea5b90c2752ae7d179cd4005e55e0e7acd2980ac76cb3e9f1757f2e4589a6e11c3a88d25b2f4530b4d7aa1aa17d5888ae44e453655b77b2e6228e989b5a0
+MISC ChangeLog 3771 SHA256 2f1e8c8b5f1d22ff1612a0e1e4d16e939c6ab015798314a2bc8317dc6d70c0d7 SHA512 12a41982e6217a0e1bc0267b769d88422f2ca655590828d0393e3d0d0c03129dc287c81e6c15ea2ffdf63db2e3f628206071d7cf089dd114c23df7eb75275c57 WHIRLPOOL 5463a92f0af5fad985881181eeb5513c24554594105190a0b294c8ce54f4db9a52a3be440221ec3ffe960714a14f4b761b679455a8bc26b9880307ad576041c8
+MISC ChangeLog-2015 9077 SHA256 84f7785a087cf79ae90a50c6308f486af11672d64465279f4250543d8cdab60f SHA512 ddc3c13957dac3ad83b9e12721233c683ddf759c7430fe42f6b039e0930d8e31bc94a618f5969e843c5d5910e73c20cd3abd1062431d36515874076ed226d6dd WHIRLPOOL e504c5560cc8820789b4005bc04990b545749a8b30957dec61442dc02c00f07e78dbb662525fb5e8585d8786f1b9a754664770a21668f766d13d978d4e42a06e
+MISC metadata.xml 525 SHA256 97dfb7033f8f6ad2664488b47a5dc9bc9e64859045d84a73f751b16dd13e2bd2 SHA512 5a1bf5be48ee8d28b501dceea33c65791b13cf0301c6bb170e4fe5ecd7b771cc28d3e9a49b82440770800854146961069cb26529ed5fe3e2c9a796329b085c64 WHIRLPOOL d3cdcc13c69163617e09965524c96f0a8536c3617fb2296bf452179ab742ad53ad5e15d62233d0812a5316a52257d00cf52e3a30625b48ebfd88ffd98e4db80e
diff --git a/net-analyzer/nagstamon/files/nagstamon-2.0-setup.patch b/net-analyzer/nagstamon/files/nagstamon-2.0-setup.patch
new file mode 100644
index 000000000000..3a58227e0144
--- /dev/null
+++ b/net-analyzer/nagstamon/files/nagstamon-2.0-setup.patch
@@ -0,0 +1,25 @@
+diff --git a/setup.py b/setup.py
+index 467bb42..24644a3 100644
+--- a/setup.py
++++ b/setup.py
+@@ -35,7 +35,7 @@ if platform.system() not in ['Windows', 'Darwin']:
+     NAME = NAME.lower()
+ VERSION = AppInfo.VERSION
+
+-NAGSTAMON_SCRIPT = 'nagstamon.py'
++NAGSTAMON_SCRIPT = 'nagstamon'
+
+ # workaround to get directory of Qt5 plugins to add missing 'mediaservice' folder needed for audio on OSX and Windows
+ import os.path
+@@ -134,10 +134,7 @@ setup(name=NAME,
+                   'Nagstamon.thirdparty.Xlib.ext',
+                   'Nagstamon.thirdparty.Xlib.protocol',
+                   'Nagstamon.thirdparty.Xlib.support',
+-                  'Nagstamon.thirdparty.Xlib.xobject',
+-                  'Nagstamon.thirdparty.keyring',
+-                  'Nagstamon.thirdparty.keyring.backends',
+-                  'Nagstamon.thirdparty.keyring.util'],
++                  'Nagstamon.thirdparty.Xlib.xobject',],
+       package_dir={'Nagstamon':'Nagstamon'},
+       package_data={'Nagstamon':['resources/*']},
+       data_files=[('%s/share/man/man1' % sys.prefix, ['Nagstamon/resources/nagstamon.1.gz']),
diff --git a/net-analyzer/nagstamon/files/nagstamon-3.0-setup.patch b/net-analyzer/nagstamon/files/nagstamon-3.0-setup.patch
new file mode 100644
index 000000000000..26bb22fec4df
--- /dev/null
+++ b/net-analyzer/nagstamon/files/nagstamon-3.0-setup.patch
@@ -0,0 +1,27 @@
+diff --git a/setup.py b/setup.py
+index 267ced2..538c5bb 100644
+--- a/setup.py
++++ b/setup.py
+@@ -37,7 +37,7 @@ if OS not in ['Windows', 'Darwin']:
+     NAME = NAME.lower()
+ VERSION = AppInfo.VERSION.replace('-', '.') + '.' + DIST + DIST_VERSION
+ 
+-NAGSTAMON_SCRIPT = 'nagstamon.py'
++NAGSTAMON_SCRIPT = 'nagstamon'
+ 
+ # workaround to get directory of Qt5 plugins to add missing 'mediaservice' folder needed for audio on OSX and Windows
+ from PyQt5 import QtCore
+@@ -130,12 +130,7 @@ setup(name=NAME,
+       packages=['Nagstamon',
+                 'Nagstamon.QUI',
+                 'Nagstamon.Servers',
+-                'Nagstamon.thirdparty',
+-                'Nagstamon.thirdparty.Xlib',
+-                'Nagstamon.thirdparty.Xlib.ext',
+-                'Nagstamon.thirdparty.Xlib.protocol',
+-                'Nagstamon.thirdparty.Xlib.support',
+-                'Nagstamon.thirdparty.Xlib.xobject'],
++                'Nagstamon.thirdparty',],
+       package_dir={'Nagstamon': 'Nagstamon'},
+       package_data={'Nagstamon': ['resources/*']},
+       data_files=[('%s/share/man/man1' % sys.prefix, ['Nagstamon/resources/nagstamon.1.gz']),
diff --git a/net-analyzer/nagstamon/files/nagstamon.desktop b/net-analyzer/nagstamon/files/nagstamon.desktop
new file mode 100644
index 000000000000..d853e1aae7ba
--- /dev/null
+++ b/net-analyzer/nagstamon/files/nagstamon.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Nagstamon
+GenericName=Nagios status monitor
+Comment=Quick status overview of your Nagios monitoring system
+Exec=nagstamon
+Icon=/usr/share/nagstamon/resources/nagstamon.png
+Terminal=false
+Categories=Network;Monitor;
+StartupNotify=true
diff --git a/net-analyzer/nagstamon/metadata.xml b/net-analyzer/nagstamon/metadata.xml
new file mode 100644
index 000000000000..596c2d8745d0
--- /dev/null
+++ b/net-analyzer/nagstamon/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>idl0r@gentoo.org</email>
+    <name>Christian Ruppert</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">nagstamon</remote-id>
+    <remote-id type="github">HenriWahl/nagstamon</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/nagstamon/nagstamon-2.0.1.ebuild b/net-analyzer/nagstamon/nagstamon-2.0.1.ebuild
new file mode 100644
index 000000000000..4b6cb94a77d7
--- /dev/null
+++ b/net-analyzer/nagstamon/nagstamon-2.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit eutils python-r1 distutils-r1
+
+MY_PN="Nagstamon"
+MY_P="${MY_PN}-${PV/_}"
+
+DESCRIPTION="Nagstamon is a systray monitor for displaying realtime status of a Nagios box"
+HOMEPAGE="http://nagstamon.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# TODO: secretstorage
+# TODO: Xlib - https://github.com/python-xlib/python-xlib/tree/master/Xlib
+RDEPEND="${PYTHON_DEPS}
+	dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_PN}"
+
+PATCHES="${FILESDIR}/${PN}-2.0-setup.patch"
+
+src_prepare() {
+	default
+
+	mv ${PN}.py ${PN} || die
+
+#	rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die
+	rm -rf "${S}/Nagstamon/thirdparty/keyring/" || die
+}
diff --git a/net-analyzer/nagstamon/nagstamon-3.0.1.ebuild b/net-analyzer/nagstamon/nagstamon-3.0.1.ebuild
new file mode 100644
index 000000000000..992274b0ce37
--- /dev/null
+++ b/net-analyzer/nagstamon/nagstamon-3.0.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit eutils python-r1 distutils-r1
+
+MY_PN="Nagstamon"
+MY_P="${MY_PN}-${PV/_p/-}"
+
+DESCRIPTION="status monitor for the desktop"
+DESCRIPTION="systray monitor for displaying realtime status of several monitoring systems"
+HOMEPAGE="https://nagstamon.ifw-dresden.de"
+SRC_URI="https://nagstamon.ifw-dresden.de/files/stable/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/secretstorage[${PYTHON_USEDEP}]
+	>=dev-python/python-xlib-0.19[${PYTHON_USEDEP}]
+	dev-python/requests-kerberos[${PYTHON_USEDEP}]
+	dev-python/typing[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_PN}"
+
+PATCHES="${FILESDIR}/${PN}-3.0-setup.patch"
+
+src_prepare() {
+	default_src_prepare
+
+	mv ${PN}.py ${PN} || die
+
+	rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die
+}
diff --git a/net-analyzer/nagtrap/Manifest b/net-analyzer/nagtrap/Manifest
new file mode 100644
index 000000000000..ee6255490c37
--- /dev/null
+++ b/net-analyzer/nagtrap/Manifest
@@ -0,0 +1,5 @@
+DIST nagtrap-0.1.3.tar.gz 141934 SHA256 25082a363101a321d46649d4e5afca92acbafa37564470eadcc331235f4656f1 SHA512 4603157beb35850a6f8b69919cd0ce8f108e6de8e85711b9c18665b69f91082d6703da396b1170633172cef630c2f3d73b717f1893cb4da6b6d15a3f577d445a WHIRLPOOL a17dfe70c6e5fda47347199312e068a1a0429cd1a9880e183f9f31057b70b20282852f48c91fce52435f4a14db90375cc119672087aba13148c04e234b76ad45
+EBUILD nagtrap-0.1.3.ebuild 1338 SHA256 d049b24c64c71b4406db267ebe8cb6447127b0bcdadebf9364c71ef54c7c5d0d SHA512 d1283c81b9fd3654721f1190ee51c7e74ebdebfe6ee04012b49af0f3058cdd94096268134ce91e689d85a21ad9e666c61210b54ed5f1716e4071c4f0092eba19 WHIRLPOOL 5694f76716aeef359177395003a9c208ebf72360dc6715a1729eaa2f6c63ac1b5c08b56abd855c7527f269898ff96647b5cc139ae49ad8d6d6497e49922404fa
+MISC ChangeLog 2526 SHA256 efb93f0c37cdb75878a6008bbc8ce25d2530d8dadba4e31c2d4dbd19663ed03b SHA512 110c4a297d2e617fe86be302e45dfd568cd8defc0e5b93a5ff7b7b119661d4e169b2db187ca8f9cc42fd56ea6a55b560c5da7578390d61ff8d34b801172a9ac7 WHIRLPOOL 81260e940ee36a55de977fe207c6f8b72a49f3fc63735be75f3b2701e474057e3c152d05887458cfa1f01960c8d081236c5cb846800aec7b0be82c3d8d4c5778
+MISC ChangeLog-2015 729 SHA256 9839cf1aaba94d6546306867e176ccea1f46981ebd03184fe9aec91c409934b0 SHA512 4c4c3288bf896226b57b0d622b768db805ff946b95f2fda9520ae4251819cbd6a16775694e138a6fe611e4440d28999d8f6e3d0e495be2af4127e32cbc6fc68d WHIRLPOOL 669530e8d1c56a3d52fac32f7c5da4b51047c797abdafb6da0209a421188c5cd4ce1938ee3f83f9f86e34657275534e297d7978b02989cccce7512912c2d40a6
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-analyzer/nagtrap/metadata.xml b/net-analyzer/nagtrap/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-analyzer/nagtrap/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-analyzer/nagtrap/nagtrap-0.1.3.ebuild b/net-analyzer/nagtrap/nagtrap-0.1.3.ebuild
new file mode 100644
index 000000000000..d1ed7bd19ebb
--- /dev/null
+++ b/net-analyzer/nagtrap/nagtrap-0.1.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit eutils multilib
+
+DESCRIPTION="Integrated snmptt visualization addon for the Nagios monitoring system"
+HOMEPAGE="http://www.nagtrap.org/"
+SRC_URI="http://www.nagiosforge.org/gf/download/frsrelease/126/252/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="virtual/httpd-php"
+RDEPEND="dev-lang/php[mysql]
+		net-analyzer/snmptt[mysql]
+		net-analyzer/nagios-core
+		virtual/httpd-php"
+
+src_install() {
+	dodoc ChangeLog THANKS
+
+	dodir /usr/share/nagtrap
+	cp -r {db,nagtrap} "${D}"/usr/share/nagtrap/
+	fperms 640 "${D}"/usr/share/nagtrap/nagtrap/etc/config.ini.php-dist
+
+	sed -i -e 's#use lib.*#use lib "/usr/lib/nagios/plugins";#g' \
+	  plugin/check_snmptraps.pl || die "sed failed"
+
+	insinto /usr/$(get_libdir)/nagios/plugins
+	insopts -m 750 -g nagios
+	doins plugin/check_snmptraps.pl
+}
+pkg_postinst() {
+	elog "Before running NagTrap for the first time, you will need setup its configuration"
+	elog "/usr/share/nagtrap/nagtrap/etc/config.ini.php"
+	elog "A sample is installed in"
+	elog "/usr/share/nagtrap/nagtrap/etc/config.ini.php-sample"
+	elog
+	elog "NagTrap requires snmptt to write traps into a MySQL database."
+	elog "A database schema is available in {$D}usr/share/nagtrap/db"
+}
diff --git a/net-analyzer/nagvis/Manifest b/net-analyzer/nagvis/Manifest
new file mode 100644
index 000000000000..7186fa5ce57b
--- /dev/null
+++ b/net-analyzer/nagvis/Manifest
@@ -0,0 +1,7 @@
+AUX nagvis-1.6.6-base-path.patch 799 SHA256 6b82254353595a8aab86bb65b46da0c7d7cfe1b15f69387f039a6049616c6a09 SHA512 54476998b1bf0b8ce25691fff558e3faa0aefaa4c1ba5d9804e809ae862f79cb96ea87fb7368a1100282bbc8d1f89902f8b4bca397df1ea24a840996889de1e0 WHIRLPOOL 01be41d6194945804f7e59401c9ddd703a1f10d9bbbf8b68762bcfa9587d7b6fa93d53c7caced4a33446fd402036305bb5b245c557d62d8e4f19ae3538f87335
+AUX nagvis-1.6.6-global-definitions.patch 1177 SHA256 dbfa2b300ffdf5fb3b8f48b7b5f0f9a577cff816b6323e2489456c6a9767f1ff SHA512 26d53a48852082010c660280ffef786a8713a02ba675b4b455de48c65136816772c8012ead282bd8da879b1696bf811e4ef091765cc3014d5b2fb1445166c79d WHIRLPOOL 75584f403eccbdc84e0a403e96891285e0bd3e1b14f05299fd2190b249e5ca357b8a037c760276c87466b197530d5ae97d7cf6c3710a9552f0d1e836704241a9
+DIST nagvis-1.6.6.tar.gz 3430714 SHA256 8aefe17ea7f43839fd5db4063fbac96eeedddbdcdf3789f4a75e9ca51c2833a8 SHA512 e5858b185dd5d31fc8d414df5b3464941769249ce582b10e155e89ba7aa0c45724550c44de9d7bfb23b96caa737e519f320e45050126feb94593cca2bfc583cb WHIRLPOOL 8af9d6c86ec84cc3630d0d93cd6cc55d2687a8b55f0f3b6eb2cadf946580af3a314daae9d5055ca41fd62f27fe06e188c9c319b42bd9118a1a6976815f2e18ad
+EBUILD nagvis-1.6.6.ebuild 2768 SHA256 63c201f69d2cda4d5fb8c7c8d06a1d50f27c0498f5903e2b6d4c716ffc3d0d5c SHA512 25566b1c0bcf9a097614001652588b174c88312aa12fec7b47be1171be5e08a095387fab6da7f250cfc31791be3e124ded3aa9d84a3330b2073608138e7ce24f WHIRLPOOL 45dd6a3146856df17cba62d13bf67259f9a210b6aa8d7f5716af3181b3806401f39f316b6a193db1f2f6ec530d084f11c6e9d81095fb970f0057aece850c37a2
+MISC ChangeLog 2610 SHA256 6dac0f57a50a48e08e954db8b7872b62591775230e4b3b6a64d9af6d69cb19e0 SHA512 d48a940f07a9200bcbe548fcf172c65365cd0c1af830a9fe9f73c0c1579c144860bbf1e06d1add63846db83fa5958963a229e03f3abe24036228d63d33a7e96e WHIRLPOOL 75013729c071b9c9b8be5ee56b3720b00c3bfd6ed5d74c53820b17e469d6d84203b025f4364efdf98ed807037efa05166a276941470e25f354d701ee235ef8fd
+MISC ChangeLog-2015 2698 SHA256 751354c703c0bd5bf866c7d9d4ed22a90da1bbabf2479bb4430d7a0a34317c64 SHA512 eabd677eca63730035756601ac8083b80fc36cfe12bc693a5b5b98bf8ef7f50b143767c9f7bc9b7bf4d577a152328947384ea05decf299b8cdbc17d16e7a1815 WHIRLPOOL 02e76b4b307f2ecd3e21f9252bac058e1a2594577bdd13b49ee9e7729798f29f3d60478021623b179d15cbb7fba113eef55826252bd896c84639a90b5da042d3
+MISC metadata.xml 365 SHA256 7b75923bdeebd1b276c680f5554303d783db0bd8321c846fdc1b1ac592c071f1 SHA512 3c0b10ae339027a59540557329d0a0316d6f82c791a6f915d06e6b19f7c12e26145e08845b9eb901d5fb2ca460953c6625978a701b552bc559f30a7eca0e18fd WHIRLPOOL 4a3c3d97fe801a7f196065132cd15919ee1bb49e837ff0dad688043ee2a2cde63134c380c20aecae413d98dda0c45287702e335b1c125ce53a81429bf2c06508
diff --git a/net-analyzer/nagvis/files/nagvis-1.6.6-base-path.patch b/net-analyzer/nagvis/files/nagvis-1.6.6-base-path.patch
new file mode 100644
index 000000000000..771076c4eaa7
--- /dev/null
+++ b/net-analyzer/nagvis/files/nagvis-1.6.6-base-path.patch
@@ -0,0 +1,13 @@
+--- a/share/server/core/classes/GlobalMainCfg.php	2012-05-31 11:14:23.000000000 -0400
++++ b/share/server/core/classes/GlobalMainCfg.php	2012-05-31 11:17:10.000000000 -0400
+@@ -1215,8 +1215,8 @@
+      * @author	Roman Kyrylych <rkyrylych@op5.com>
+      */
+     private function getBasePath() {
+-        // Go 3 levels up from nagvis/share/nagvis to nagvis base path
+-        return realpath(dirname($_SERVER['SCRIPT_FILENAME']) . '/../../..') . '/';
++        // Go 2 levels up from share/nagvis to nagvis base path
++        return realpath(dirname($_SERVER['SCRIPT_FILENAME']) . '/../..') . '/';
+         // Note: the method below causes problems when <docroot>/nagvis is a symlink to <nagvis-base>/share
+         // return realpath(dirname(dirname(dirname($_SERVER['SCRIPT_FILENAME'])))).'/';
+     }
diff --git a/net-analyzer/nagvis/files/nagvis-1.6.6-global-definitions.patch b/net-analyzer/nagvis/files/nagvis-1.6.6-global-definitions.patch
new file mode 100644
index 000000000000..9786b970179f
--- /dev/null
+++ b/net-analyzer/nagvis/files/nagvis-1.6.6-global-definitions.patch
@@ -0,0 +1,30 @@
+--- a/share/server/core/defines/global.php	2012-05-13 05:44:27.000000000 -0400
++++ b/share/server/core/defines/global.php	2012-05-31 11:20:39.000000000 -0400
+@@ -64,7 +64,7 @@
+ define('DEBUGLEVEL', 6);
+ 
+ // Path to the debug file
+-define('DEBUGFILE', '../../../var/nagvis-debug.log');
++define('DEBUGFILE', '../../var/nagvis-debug.log');
+ 
+ // It is possible to define a conf.d directory for splitting the main
+ // configuration in several files. Only the values defined in the CONST_MAINCFG
+@@ -78,14 +78,14 @@
+ // The last value wins.
+ //
+ // Path to the main configuration file
+-define('CONST_MAINCFG', '../../../etc/nagvis.ini.php');
+-define('CONST_MAINCFG_CACHE', '../../../var/nagvis-conf');
++define('CONST_MAINCFG', '../../etc/nagvis.ini.php');
++define('CONST_MAINCFG_CACHE', '../../var/nagvis-conf');
+ 
+ // Path to the main configuration conf.d directory
+-define('CONST_MAINCFG_DIR', '../../../etc/conf.d');
++define('CONST_MAINCFG_DIR', '../../etc/conf.d');
+ 
+ // The directory below the NagVis root which is shared by the webserver
+-define('HTDOCS_DIR', 'share');
++define('HTDOCS_DIR', '');
+ 
+ // Needed minimal PHP version
+ define('CONST_NEEDED_PHP_VERSION', '5.0');
diff --git a/net-analyzer/nagvis/metadata.xml b/net-analyzer/nagvis/metadata.xml
new file mode 100644
index 000000000000..03cfbae2f915
--- /dev/null
+++ b/net-analyzer/nagvis/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <use>
+    <flag name="automap">Enable automated map generation using <pkg>media-gfx/graphviz</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">nagvis</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/nagvis/nagvis-1.6.6.ebuild b/net-analyzer/nagvis/nagvis-1.6.6.ebuild
new file mode 100644
index 000000000000..19ce16533ff7
--- /dev/null
+++ b/net-analyzer/nagvis/nagvis-1.6.6.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils depend.apache
+
+DESCRIPTION="Visualization addon for the network managment system Nagios"
+HOMEPAGE="http://www.nagvis.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="apache2 automap"
+
+DEPEND="virtual/httpd-php"
+RDEPEND="|| ( net-analyzer/nagios net-analyzer/icinga )
+	automap? ( >=media-gfx/graphviz-2.14 )
+	apache2? ( dev-lang/php[apache2] )
+	net-analyzer/mk-livestatus
+	dev-lang/php[gd,nls,json,session,pdo,sqlite,sockets,mysql,unicode,xml]
+	virtual/httpd-php:*"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-base-path.patch
+	epatch "${FILESDIR}"/${P}-global-definitions.patch
+	grep -Rl "/usr/local" "${S}"/* | xargs sed -i s:/usr/local:/usr:g ||die
+	sed -i s:@NAGVIS_WEB@:/nagvis:g "${S}"/etc/apache2-nagvis.conf-sample ||die
+	sed -i s:@NAGVIS_PATH@:/usr/share/nagvis/:g "${S}"/etc/apache2-nagvis.conf-sample ||die
+	sed -i s:/usr/nagios/var/rw/live:/var/nagios/rw/live:g "${S}"/etc/nagvis.ini.php-sample ||die
+}
+
+src_install() {
+	dodoc README INSTALL
+
+	insinto /usr/share/nagvis
+	doins -r share/{config.php,index.php,frontend,netmap,server,userfiles}
+	doins -r docs
+
+	diropts -o apache -g root
+	dodir /var/nagvis/tmpl/{cache,compile}
+	diropts
+	dosym /var/nagvis /usr/share/nagvis/var
+
+	if use apache2 ; then
+		insinto "${APACHE_MODULES_CONFDIR}"
+		newins etc/apache2-nagvis.conf-sample 98_${PN}.conf
+	fi
+
+	insinto /etc/nagvis
+	doins -r etc/{conf.d,automaps,geomap,.htaccess,nagvis.ini.php-sample}
+	fowners apache:root /etc/nagvis
+	fperms 0664 /etc/nagvis/nagvis.ini.php-sample
+	dosym /etc/nagvis /usr/share/nagvis/etc
+
+	diropts -o apache -g root -m0775
+	insopts -o apache -g root -m0664
+	doins -r etc/maps
+	diropts
+	insopts
+
+	# move image maps dir from usr to var and symlink it back
+	dodir /var/nagvis/userfiles/images
+	mv "${D}"/usr/share/nagvis/userfiles/images/maps "${D}"/var/nagvis/userfiles/images/ ||die
+	fowners apache:root /var/nagvis/userfiles/images/maps
+	dosym /var/nagvis/userfiles/images/maps /usr/share/nagvis/userfiles/images/maps
+}
+
+pkg_postinst() {
+	elog "Before running NagVis for the first time, you will need to set up"
+	elog "/etc/nagvis/nagvis.ini.php"
+	elog "A sample is in"
+	elog "/etc/nagvis/nagvis.ini.php-sample"
+	if use apache2 ; then
+		elog
+		elog "For web interface make sure to add -D NAGVIS to APACHE2_OPTS in"
+		elog "/etc/conf.d/apache2 and to restart apache2. A default configuration"
+		elog "has been placed at /etc/apache2/modules.d/98_${PN}.conf"
+	fi
+	elog ""
+	elog "Default user/password are: nagiosadmin/nagiosadmin"
+	elog "                                 guest/guest"
+}
diff --git a/net-analyzer/namebench/Manifest b/net-analyzer/namebench/Manifest
new file mode 100644
index 000000000000..e62762d0c2eb
--- /dev/null
+++ b/net-analyzer/namebench/Manifest
@@ -0,0 +1,5 @@
+DIST namebench-1.3.1-source.tgz 1118505 SHA256 30ccf9e870c1174c6bf02fca488f62bba280203a0b1e8e4d26f3756e1a5b9425 SHA512 df9d120bf9f0bcbb5e3d41d2257b2c594e99b7e69b33435b59587e99dac6dca29e4ae81f51838946bc1955540109da6296abc6b69d411af2b91e05b58367bb3b WHIRLPOOL 808977fd3e9e2f906350d104be91f0aa80b5df29953a92e00953013b33ce8473fcbc955ceb3d1dc1b71d6491816d6a7e04a0244a12fbd039fd304c7b874cf462
+EBUILD namebench-1.3.1-r2.ebuild 1056 SHA256 0cbd56ce46e6b78cd99bec82c25a7a28433aedf08c2c613979c976b3d6cfb2ab SHA512 89e64eb1acaaba51c5347100bd262252db79a2e358888298acc2375b103d5891b10e2dc597dac328005c7b52e48e99d250732efd117892f4d80da0df88297cb1 WHIRLPOOL 9c29c20f55e5dbfea48b65bc9bf8c583fdca1bbcbce5dfd736d2e108874d1ce4b75ed8a960b240c1ab2ea0ad95b4b556ea375a4bb3fdf3511de152072080e9aa
+MISC ChangeLog 3247 SHA256 ab56767cdd708adfa20d6fa366b3eacd062001586e3a20f6ede303b2913a34d6 SHA512 e7a450aa42002eeda48017cc9f1c36d09971da1863b0965004e4d5c3669c2038f989e76e381dd26834be4ce7b362919e78ba47eb7025170f81a6de31c9b97ab1 WHIRLPOOL bdfc80bf4bbb37037f4188ed4657eca74e715f5bb1f9d5e7363c428ce1319d9a93444d1dea119b43e996090a61eeab14488f82ea284e7ed9cfa9dd424116d11c
+MISC ChangeLog-2015 1629 SHA256 5d5f42ec9cf5a51da787589687ca2048339b5c522c8cd47bd4d37c1bef58286e SHA512 84f251eccbb5e0d51c0f00885a481b4c06fc583198b119fc4a91c34e80af808de1f582e7034c637a5111465a5624fae831e1bbb9e4e61fabdbf0f343ee0395a8 WHIRLPOOL 79cdf2c49e1e9057637043fa10ff7a6816801e23b10a687781bc36e996127d60921948eec457e945a1aab6c3d692e205c5c7f7004f819e82c627ebb1a0d09687
+MISC metadata.xml 359 SHA256 e74d52c8cb599ea2997157da2c8562f1a23c174883c4e35da475d73baf7cf03d SHA512 e7f84527d450abc038dd4962899a3a6789787049c8b097ec485f53b6b6143503e3d394be629c3987a450af6c718086bb5deabb38a8e95271d32fdfda7fcff3f6 WHIRLPOOL 982591c116a9fc195bb3c16a6f2c8e547716ab2b8058d8c669469068203477d24e563f0d7a342e74fb5d45a78c816aca546093705e76190353f60fd0ec2555e2
diff --git a/net-analyzer/namebench/metadata.xml b/net-analyzer/namebench/metadata.xml
new file mode 100644
index 000000000000..24087fdb9b23
--- /dev/null
+++ b/net-analyzer/namebench/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">namebench</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/namebench/namebench-1.3.1-r2.ebuild b/net-analyzer/namebench/namebench-1.3.1-r2.ebuild
new file mode 100644
index 000000000000..2b9d0a2ebfa7
--- /dev/null
+++ b/net-analyzer/namebench/namebench-1.3.1-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="DNS Benchmark Utility"
+HOMEPAGE="https://code.google.com/p/namebench/"
+SRC_URI="https://namebench.googlecode.com/files/${P}-source.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+# PYTHON_REQ_USE does not support X? ( tk ) syntax yet
+DEPEND="X? ( $(python_gen_cond_dep dev-lang/python:2.7[tk] python2_7) )"
+RDEPEND="${DEPEND}
+	>=dev-python/httplib2-0.6[${PYTHON_USEDEP}]
+	>=dev-python/graphy-1.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.2.1[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.1.2[${PYTHON_USEDEP}]
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# don't include bundled libraries
+	export NO_THIRD_PARTY=1
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	#set prefix
+	distutils-r1_python_install --install-data=/usr/share
+}
+
+python_install_all() {
+	dosym ${PN}.py /usr/bin/${PN}
+	distutils-r1_python_install_all
+}
diff --git a/net-analyzer/nast/Manifest b/net-analyzer/nast/Manifest
new file mode 100644
index 000000000000..f827680c4a5e
--- /dev/null
+++ b/net-analyzer/nast/Manifest
@@ -0,0 +1,6 @@
+AUX nast-0.2.0-gentoo.patch 3029 SHA256 01b359b94e1f59b2f10def9295b27ee21f3f66e12fe7a2fc83c03420ddb607cd SHA512 fbbd0b5d8426bacf64958032381d5d236d26985802b5c86327fd4102742563a56c7cb873e0f51758b1e2c3ed53d6bf7b57da497eaa401f5ed4eb32941d22adb1 WHIRLPOOL 63eed898d217333f66f66e4d9dc3f43d93a4b9c32795a16c79949948831d255f98dacb485d652d8eebf0b3ea63f495532eec65d308eaa472fe27fa141eba4180
+DIST nast-0.2.0.tar.gz 147568 SHA256 b59adf7980563bca1f44fd6e9a6e1b3c0cfadb53df0d929b6869de53062615c1 SHA512 fbf29f9c2ae783e38d40054577a697f631c6590075ef80aa970002f1133c681a4cc1fcd715bc6140cc361c609dcebe8c6bf74544e8710363d30649398b3e388c WHIRLPOOL b920a02e6599bf58b0242630a27bf7d18b5771ca5cb1d2a7db42cdfaf9a29d2386f478d00be992aa105422ae50ef075077826306ac35eae13ef07abd3a595395
+EBUILD nast-0.2.0-r1.ebuild 744 SHA256 e9a204601ccc3989fa5ba281f0ecc75ede661cbcdfe76574de6ea214794edccb SHA512 5403f70c4b64204494a85443366348be0ef2fe02963d986f7487485141642d619c3042019e322f6ef0d0e8c5e9a2438bab79b944a2a113a30945e15d57a7a127 WHIRLPOOL 690dbf919a575bbd9eb4d17d1a56643e0acac2e9f51f939b2e0f60c14c54edbfc8254951a68a11e5e00ecdef3cc446bab573654eae1e4b870fefbf00294b0947
+MISC ChangeLog 2572 SHA256 d43e28ab7d29700448afda5eca803bb0d7ee543b3598993c9cda3ab62d17b22a SHA512 049480c7bec813feb8ca318106f265c14cf2390dca8399d7623c80eeb6296b2143aef4d6851f6aa8a0b3d19f457e7e6f62e1520ad505f5c7fa3480d5de246815 WHIRLPOOL 7bc782146c3b359d4518a292ed3888c5bf67307cd0885d0c7a34c6e2db6c64e9fb1659ea173ba6fd5017d9d8bf3c0a5c3443c2c6ae44d9b16538b93b8eb85f78
+MISC ChangeLog-2015 1817 SHA256 50333199f26668a9b638cc3c0559e4978d505f63eb309f95b6e7510677551850 SHA512 350bd1fa54eb14af87b66c8472b266ecc0fac03715e9f8a2017749392c263edc9269d66303bb780c3d11462c0cbc7181ff0e7b9f301ca25677202dd2cb64361e WHIRLPOOL 8d7a9ae8a31d6a9bd153112a94aed798fc1acbeb9ab3905d96e38030a3f255a13b68e8cf1f268399c74a260249b540311e4a105d82159a70633eaa56cee19dbb
+MISC metadata.xml 362 SHA256 5cd244b9d810a93b40999439a13b573b2ab47f52a048527f7c6199b39ab9c7d3 SHA512 594d05be889c3a8d6019ee0762773f8abb71f4da276c3a546704ae4e073856fa404f5f9b466502b19423ac9e7f00ad8c2ef85d4adbfebf7fdd0184189e454148 WHIRLPOOL be82385a0d9fc32e9e33cbd734b45dfdeb0e21cc7d927a945956a18e231b20b9b24099a9bcd8d4e920a1a6eec3b24fa258a2277b5ad4ae30eee816d77e63cfbc
diff --git a/net-analyzer/nast/files/nast-0.2.0-gentoo.patch b/net-analyzer/nast/files/nast-0.2.0-gentoo.patch
new file mode 100644
index 000000000000..f8f05ab3a16c
--- /dev/null
+++ b/net-analyzer/nast/files/nast-0.2.0-gentoo.patch
@@ -0,0 +1,79 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -84,14 +84,14 @@
+ #
+ 
+ filechk="yes"
+-AC_CHECK_FILE(/usr/lib/libnet.a,, filechk="no")
++AC_CHECK_FILE(/usr/lib/libnet.so,, filechk="no")
+ if test "$filechk" = "no"; then
+- AC_CHECK_FILE(/usr/local/lib/libnet.a, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
++ AC_CHECK_FILE(/usr/local/lib/libnet.so, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
+ fi
+ 
+ if test "$filechk" = "no"; then AC_MSG_ERROR([
+ 
+-Libnet archive file (libnet.a) not found in /usr or /usr/local!
++Libnet archive file (libnet.so) not found in /usr or /usr/local!
+ 
+ Libnet-1.1.x Packet Shaping Library is required.
+ You can download it from official web site: http://www.packetfactory.net/libnet
+@@ -111,14 +111,14 @@
+ #
+ 
+ filechk="yes"
+-AC_CHECK_FILE(/usr/lib/libpcap.a,, filechk="no")
++AC_CHECK_FILE(/usr/lib/libpcap.so,, filechk="no")
+ if test "$filechk" = "no"; then
+- AC_CHECK_FILE(/usr/local/lib/libpcap.a, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
++ AC_CHECK_FILE(/usr/local/lib/libpcap.so, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
+ fi
+ 
+ if test "$filechk" = "no"; then AC_MSG_ERROR([
+ 
+-Libpcap archive file (libpcap.a) not found in /usr or /usr/local!
++Libpcap archive file (libpcap.so) not found in /usr or /usr/local!
+ 
+ Libpcap-0.7.1 Packet Capture Library is required. 
+ You can download it from official web site: http://www.tcpdump.org/#current
+@@ -137,16 +137,18 @@
+ # -- libncurses support --
+ #
+ 
++PKG_CHECK_MODULES(ncurses,ncurses,[LIBS="$LIBS $ncurses_LIBS"],)
++
+ filechk="yes"
+-AC_CHECK_FILE(/usr/lib/libncurses.a,, filechk="no")
++AC_CHECK_FILE(/usr/lib/libncurses.so,, filechk="no")
+ if test "$filechk" = "no"; then
+- AC_CHECK_FILE(/usr/local/lib/libncurses.a, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
++ AC_CHECK_FILE(/usr/local/lib/libncurses.so, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
+ fi
+ 
+ if test "$filechk" = "no"; 
+ then AC_MSG_WARN([
+ 
+-Libncurses archive file (libncurses.a) not found in /usr or /usr/local!
++Libncurses archive file (libncurses.so) not found in /usr or /usr/local!
+ 
+ Ncurses library (*) not found in your system.
+ You can download it from official web site: http://www.gnu.org/software/ncurses/ncurses.html
+@@ -174,15 +176,15 @@
+ #
+ 
+ filechk="yes"
+-AC_CHECK_FILE(/usr/lib/libmenu.a,, filechk="no")
++AC_CHECK_FILE(/usr/lib/libmenu.so,, filechk="no")
+ if test "$filechk" = "no"; then
+- AC_CHECK_FILE(/usr/local/lib/libmenu.a, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
++ AC_CHECK_FILE(/usr/local/lib/libmenu.so, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
+ fi
+ 
+ if test "$filechk" = "no"; 
+ then AC_MSG_WARN([
+ 
+-Menu archive file (libncurses.a) not found in /usr or /usr/local!
++Menu archive file (libncurses.so) not found in /usr or /usr/local!
+ 
+ 
+ Menu library (*) not found in your system.
diff --git a/net-analyzer/nast/metadata.xml b/net-analyzer/nast/metadata.xml
new file mode 100644
index 000000000000..01ab90fe15dc
--- /dev/null
+++ b/net-analyzer/nast/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">nast.berlios</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/nast/nast-0.2.0-r1.ebuild b/net-analyzer/nast/nast-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..1b4c53803c5b
--- /dev/null
+++ b/net-analyzer/nast/nast-0.2.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="NAST - Network Analyzer Sniffer Tool"
+HOMEPAGE="https://sourceforge.net/projects/nast.berlios/"
+SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+IUSE="ncurses"
+
+RDEPEND="
+	>=net-libs/libnet-1.1.1
+	net-libs/libpcap
+	ncurses? ( >=sys-libs/ncurses-5.4 )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	eautoreconf
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dosbin nast
+	doman nast.8
+	dodoc AUTHORS BUGS CREDITS ChangeLog NCURSES_README README TODO
+}
diff --git a/net-analyzer/nbtscan/Manifest b/net-analyzer/nbtscan/Manifest
new file mode 100644
index 000000000000..15c3b1d977e0
--- /dev/null
+++ b/net-analyzer/nbtscan/Manifest
@@ -0,0 +1,8 @@
+AUX nbtscan-1.5.1-gentoo.patch 407 SHA256 e593b36df5c01d091633f31b665c7a47cfcb536bb86b01002f7395771e6f76f9 SHA512 3bdfb90ac71eb599ec2eb3a8f83c3ba7d821da8cff9b5692aa03047f8212a88a9730c6ef3f20eb9aa250500aed5b49d287859be1d5b3fd4542a1cdb90c796d9b WHIRLPOOL 6871d1cf94c8a579baab3292fe6558485f7d78d4de817e00d9c0d184b56cb685c625542edc114c68de54cff3903078722a0ec4da3e5aadfa5e4ed71d98a55a33
+AUX nbtscan-1.5.1-includes-declarations.patch 954 SHA256 71628668cb76191302e0e1fb9b8c96532b6190bd135332a755683c0c6fab3181 SHA512 793499744b91621462802a6c53c1ba3e53de0537549b1f48047b81f7b34aeb1d1fa4b6dbe3c99048139061b05c2b5db19d9bbd9cb4a74c735a756dfb52843cc3 WHIRLPOOL 74c7d68af93d197254d76c18a0532fef7119ded618177e13b94e59aa4b82207c46727a5adf3f77861b127865802155afee91ccf324928d5727b81ef6c7e65d4e
+AUX nbtscan-1.5.1-script-whitespace.patch 3784 SHA256 e2b0cfce5ec77b44012971fc9762290c9938a172451c861e5d26e5f12c1a1070 SHA512 38c7450809d876f347b17e3b60809ae408168766c2e8898f56495b33e158168e98b5d2f74208f2927af1dea68bf9956bde4bf3a0cbbceb21bae9dd8cee6ec3f6 WHIRLPOOL 368c0e360a1235693880ea9f535a1d6c851cee39cefaa4f666365f54fe83cccc1ad5c012a0f501c9c750d274daf964a73badbcc06ba506f524059e3bc7d08fd4
+DIST nbtscan-1.5.1.tar.gz 82107 SHA256 f9f95d5555356c8d467a576e69d9d348bf2a821ded9a85f895b5e6d21e2aa7eb SHA512 2e2ac6a3ce7b188552c4f5f82b1e2bb99049bd0cd6f69361c59066c0b262d9311186aabc0c03c3096b7d2c48276052b1ddf230eba43051e221019c9bf223ae3e WHIRLPOOL 21c41ed7f21bc60d1949b814eb3e38d45971c9eff67b2dfc6054b3b9f16310733252ae5e75a15b6c698a194dc5c4f4fab0fc754ffddbe36957662d6c109e1b1c
+EBUILD nbtscan-1.5.1-r3.ebuild 736 SHA256 beca9b731f592218f6f66e03c758e8f0f8733da0536d512e7174f44c9debfbbf SHA512 0f198cff62bcc53416031c3bdb2382ed2ad65570e5c6e7c14a4e7d8bb5f88c2e72d0509494208f1bc5758cff23eae0d4baa111c7187f90d47911a59933e01a0b WHIRLPOOL 57805c059f8637d8826e7fe5eb8c862c53d2c01443220622d633df62e6be00700eb02fb6493e270be1e69b9e5ed505ec24c7b07edad4c3823d9e8174b0da23b2
+MISC ChangeLog 2574 SHA256 efcce7fe6b5f10f0b1a110a0ddf791f7f34d5db683118de68f53aa6de2fcdcea SHA512 b69dd0d5d4d401e34d5db66b76c754a6cd18aeb157c1e35a28bc73d1a5698a17c7576da41a9962d0ff8e70c11d820a251e3cddea6aeede9a0d20faf48a9b1113 WHIRLPOOL 8df4d05401f0069dc38aa5c96b96cb35f6baad491297028615bc9b5504e86c2fded8cc33e5e05e00997e14a8782ef80ecd0bc8b17ddf3e21c649484cd12defa3
+MISC ChangeLog-2015 4841 SHA256 e7a6cbdbbc7e0eb05612ee41c5e2b0fe8d02efc7c806a211f79a96e0206bc88c SHA512 2798621b600686c23b2f7d294e655426c26b6cd5d588f523b0e77dc20f9c4cabd92176d70ee2c6a85508bd419422339634077347178b0a2c1bc9f8bb689803d5 WHIRLPOOL 0a50f419355761a8a0dfe62854e94f8d7d7850b2eb9fd909c8c51b047246da2ad619cbe22354278c2b5bd65d564c29e6311b472042608f661174c7702988abe3
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/nbtscan/files/nbtscan-1.5.1-gentoo.patch b/net-analyzer/nbtscan/files/nbtscan-1.5.1-gentoo.patch
new file mode 100644
index 000000000000..dbf2457bc29f
--- /dev/null
+++ b/net-analyzer/nbtscan/files/nbtscan-1.5.1-gentoo.patch
@@ -0,0 +1,15 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -11,10 +11,10 @@
+ BINDIR      = @bindir@
+ 
+ nbtscan: $(OBJECTS)
+-	$(CC) $(CFLAGS) -o nbtscan $(OBJECTS) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o nbtscan $(OBJECTS) $(LIBS)
+ 
+ install:
+-	$(INSTALL) $(TARGET) $(BINDIR)/$(TARGET)
++	$(INSTALL) $(TARGET) $(DESTDIR)/$(BINDIR)/$(TARGET)
+ 
+ nbtscan.o: nbtscan.c statusq.h range.h list.h
+ 	$(CC) $(CFLAGS) $(DEFS) -c nbtscan.c
diff --git a/net-analyzer/nbtscan/files/nbtscan-1.5.1-includes-declarations.patch b/net-analyzer/nbtscan/files/nbtscan-1.5.1-includes-declarations.patch
new file mode 100644
index 000000000000..a585d4495fb5
--- /dev/null
+++ b/net-analyzer/nbtscan/files/nbtscan-1.5.1-includes-declarations.patch
@@ -0,0 +1,42 @@
+--- a/list.h
++++ b/list.h
+@@ -19,3 +19,5 @@
+ int compare(struct list_item* item1, struct list_item* item2);
+ 
+ int insert(struct list* lst, unsigned long content);
++
++int in_list(struct list* lst, unsigned long content);
+--- a/nbtscan.c
++++ b/nbtscan.c
+@@ -5,6 +5,8 @@
+ #include <stdlib.h>
+ #include <sys/time.h>
+ #include <string.h>
++#include <ctype.h>
++#include <unistd.h>
+ #if HAVE_STDINT_H
+ #include <stdint.h>
+ #endif
+--- a/statusq.h
++++ b/statusq.h
+@@ -103,4 +103,10 @@
+ 	char* service_name;
+ } nb_service_t ;
+ 
++char* getnbservicename(my_uint8_t service, int unique, char* name);
++
++struct nb_host_info* parse_response(char* buff, int buffsize);
++
++int send_query(int sock, struct in_addr dest_addr, my_uint32_t rtt_base);
++
+ #endif /* STATUSQ_H */
+--- a/statusq.c
++++ b/statusq.c
+@@ -29,6 +29,7 @@
+ #include <sys/time.h>
+ #include "statusq.h"
+ #include <string.h>
++#include <ctype.h>
+ #include <stdio.h>
+ #include <stddef.h>
+ #include "errors.h"
diff --git a/net-analyzer/nbtscan/files/nbtscan-1.5.1-script-whitespace.patch b/net-analyzer/nbtscan/files/nbtscan-1.5.1-script-whitespace.patch
new file mode 100644
index 000000000000..4aca976dcd38
--- /dev/null
+++ b/net-analyzer/nbtscan/files/nbtscan-1.5.1-script-whitespace.patch
@@ -0,0 +1,119 @@
+--- a/nbtscan.c
++++ b/nbtscan.c
+@@ -86,7 +86,7 @@
+ int d_print_hostinfo(struct in_addr addr, const struct nb_host_info* hostinfo) {
+   int i;
+   unsigned char service; /* 16th byte of NetBIOS name */
+-  char name[16];
++  char comp_name[16];
+ 
+   printf("\nPacket dump for Host %s:\n\n", inet_ntoa(addr));
+   if(hostinfo->is_broken) printf("Incomplete packet, %d bytes long.\n", hostinfo->is_broken);
+@@ -110,9 +110,9 @@
+     printf("Names received:\n");
+     for(i=0; i< hostinfo->header->number_of_names; i++) {
+       service = hostinfo->names[i].ascii_name[15];
+-      strncpy(name, hostinfo->names[i].ascii_name, 15);
+-      name[16]=0; 
+-      printf("%-17s Service: 0x%02x Flags: 0x%04x\n", name, service, hostinfo->names[i].rr_flags);
++      strncpy(comp_name, hostinfo->names[i].ascii_name, 15);
++      comp_name[15]=0; 
++      printf("%-17s Service: 0x%02x Flags: 0x%04x\n", comp_name, service, hostinfo->names[i].rr_flags);
+     }
+   };
+ 	
+@@ -147,9 +147,9 @@
+ 
+ 
+ int v_print_hostinfo(struct in_addr addr, const struct nb_host_info* hostinfo, char* sf, int hr) {
+-  int i, unique;
++  int i, j, unique;
+   my_uint8_t service; /* 16th byte of NetBIOS name */
+-  char name[16];
++  char comp_name[16];
+   char* sname;
+ 
+   if(!sf) {
+@@ -163,20 +163,27 @@
+   if(hostinfo->header && hostinfo->names) {
+     for(i=0; i< hostinfo->header->number_of_names; i++) {
+       service = hostinfo->names[i].ascii_name[15];
+-      strncpy(name, hostinfo->names[i].ascii_name, 15);
+-      name[16]=0;
++      strncpy(comp_name, hostinfo->names[i].ascii_name, 15);
++
++      // Eliminate trailing spaces
++      for(j=0; j < 15; j++) {
++        if (comp_name[j] == ' ')
++          break;
++      }
++      comp_name[j] = 0;
++
+       unique = !(hostinfo->names[i].rr_flags & 0x0080);
+       if(sf) {
+-	printf("%s%s%s%s", inet_ntoa(addr), sf, name, sf);
+-	if(hr) printf("%s\n", (char*)getnbservicename(service, unique, name));
++	printf("%s%s%s%s", inet_ntoa(addr), sf, comp_name, sf);
++	if(hr) printf("%s\n", (char*)getnbservicename(service, unique, comp_name));
+ 	else {
+ 	  printf("%02x", service);
+ 	  if(unique) printf("U\n");
+ 	  else printf("G\n");
+ 	}
+       } else {
+-	printf("%-17s",  name);
+-	if(hr) printf("%s\n", (char*)getnbservicename(service, unique, name));
++	printf("%-17s", comp_name);
++	if(hr) printf("%s\n", (char*)getnbservicename(service, unique, comp_name));
+ 	else {	
+ 	  printf("<%02x>", service);
+ 	  if(unique)  printf("             UNIQUE\n");
+@@ -199,7 +206,7 @@
+ };
+ 
+ int print_hostinfo(struct in_addr addr, struct nb_host_info* hostinfo, char* sf) {
+-  int i;
++  int i,j;
+   unsigned char service; /* 16th byte of NetBIOS name */
+   char comp_name[16], user_name[16];
+   int is_server=0;
+@@ -215,7 +222,13 @@
+       if(service == 0  && unique && first_name) {
+ 				/* Unique name, workstation service - this is computer name */ 
+ 	strncpy(comp_name, hostinfo->names[i].ascii_name, 15);
+-	comp_name[15] = 0;
++
++	// Eliminate trailing spaces
++	for(j=0; j < 15; j++) {
++		if (comp_name[j] == ' ')
++			break;
++	}
++	comp_name[j] = 0;
+ 	first_name = 0;
+       };
+       if(service == 0x20 && unique) {
+@@ -252,7 +265,7 @@
+ /* If l is true adds #PRE to each line of output (for lmhosts) */
+ 
+ int l_print_hostinfo(struct in_addr addr, struct nb_host_info* hostinfo, int l) {
+-  int i;
++  int i,j;
+   unsigned char service; /* 16th byte of NetBIOS name */
+   char comp_name[16];
+   int is_server=0;
+@@ -268,7 +281,13 @@
+       if(service == 0  && unique && first_name) {
+ 				/* Unique name, workstation service - this is computer name */ 
+ 	strncpy(comp_name, hostinfo->names[i].ascii_name, 15);
+-	comp_name[15]=0;
++
++	// Eliminate trailing spaces
++	for(j=0; j < 15; j++) {
++		if (comp_name[j] == ' ')
++			break;
++	}
++	comp_name[j] = 0;
+ 	first_name = 0;
+       };
+     };
+
diff --git a/net-analyzer/nbtscan/metadata.xml b/net-analyzer/nbtscan/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/nbtscan/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/nbtscan/nbtscan-1.5.1-r3.ebuild b/net-analyzer/nbtscan/nbtscan-1.5.1-r3.ebuild
new file mode 100644
index 000000000000..a44802134398
--- /dev/null
+++ b/net-analyzer/nbtscan/nbtscan-1.5.1-r3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="NBTscan is a program for scanning IP networks for NetBIOS name information"
+HOMEPAGE="http://www.inetcat.net/software/nbtscan.html"
+SRC_URI="http://www.sourcefiles.org/Networking/Tools/Miscellanenous/${P}.tar.gz"
+SRC_URI="http://www.inetcat.net/software/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+S=${WORKDIR}/${P}a
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-includes-declarations.patch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-script-whitespace.patch
+}
+
+src_install () {
+	dobin ${PN}
+	dodoc ChangeLog README
+}
diff --git a/net-analyzer/nbwmon/Manifest b/net-analyzer/nbwmon/Manifest
new file mode 100644
index 000000000000..96a81345ff0c
--- /dev/null
+++ b/net-analyzer/nbwmon/Manifest
@@ -0,0 +1,6 @@
+AUX nbwmon-0.5.2-tinfo.patch 255 SHA256 4ba6fed5f8ecc02923b4f91766a4fbedc9eb1650308437a2a580bf9475e586dc SHA512 61db99488e577f202f88a724891f194998c416aa924f8d8a0874925bbda0ca360f606b1adfe4da2c3b0af955791ff3a83a4e21ddf3accdc452c5caf4e666c9a4 WHIRLPOOL 475cb03a0fef105bf823f5f5f69baeea4693154fa43e75a5e7aa42d4aa7f1f57cb3bd1c07e0b95e76a4902c4fd8aee9228673a04c02fc6ba239f7c6e6ae8206b
+DIST nbwmon-0.5.2.tar.gz 5807 SHA256 3244e8504168db04cf3b2b89769b83bb4663be803d4a5dd044b092f3a96c507f SHA512 11502015b8a04d8a65c2f06d9e921c193c2e4968dbbd781791c30f35a2cf1135bbf784280b9070670be2b58c4355bf7bdf631d5932ec3a01637db803a4c88bf4 WHIRLPOOL 80a224d6fef11bdf0a778d06f8f074a106bb99f900afaecc838319d787d836bb054ca0bec517a6db82434338326d3e468b566cba4936a2535d36b80f5ee6f6ca
+EBUILD nbwmon-0.5.2.ebuild 619 SHA256 4fcad51f23f3c7e5e4e46707f0c4091c878ae33e87deb7c6a3921b030e41b88b SHA512 34c42aa051ab388941c3840be87f599c55d4dafa98826cbdd1367f0a6142434d73aa93768a1cbd1df25170d05a5f0532f7d1f1011c4c338a224a6053828d4a2f WHIRLPOOL 27d69d13eb90ca891bc98e5d0bcd5dc5194560eaefbc6469eb46f118c74b6b12d248fbe9edfb41bd24b533bc3d81fb4b1b431ae2c7dbac4422ccf9262cdee9bb
+MISC ChangeLog 2766 SHA256 d68de32f652d2019eb93107c92a61aa4d86c907662633a4d5d768f4fc72ae2c7 SHA512 57b4900446e9f0136956ab8acf354db53e1edda155f56520dd31cd03110f83501f3b8a6dd1d6faf7646a2af78ee2f6f12828c126cab9076e08f6bc122c1862d9 WHIRLPOOL 37c13838ff9f2fe8c8adcf09812d5e68bf2ba4524153330239d6a4639c33487afb8a9a804d586c1a3cf82c84a9a951c9ad0995ae85d5ee33209359356cfe9de5
+MISC ChangeLog-2015 1191 SHA256 6e68cdf9332fbc4ae4b5babfd1ffa359b13ec083091a0732113babcff3ebaa58 SHA512 224587f7ff7c234846c01b899749d49b9bc9c26f28563dcbd6a70436fc1bac779fad6f35ce2f8ca5f3b98344517d23c6908f18c754511bf6498728c4eeababc8 WHIRLPOOL 655d40e4bdb84cf56f569f56141c2e3c873a8d985d8a3881832fc101dfeb99337689f3699864a7dbaa51db78c0803e4fc35a15e69e28a246df6b1050b1d0d46b
+MISC metadata.xml 359 SHA256 edee8555976872d542fd7d55b84d8e614811154c31b7b3af49548759db65915d SHA512 9f6270f390dd2649e7aae19239e590eb9e50ac34db36537de76cb2d01adbcc2afc0ad2983f8dcd0ca5d21d289c1b9e29e85f4d34f80fa625c57ee67833d82bed WHIRLPOOL 84223e3f5bf898cd736eb987f3b2bf60ce650489f824a7727917235f3c271ded73c8c47cc214c6f94a2f19cc046b55d7af7b1ee3c881111842fdaa11614f4ccc
diff --git a/net-analyzer/nbwmon/files/nbwmon-0.5.2-tinfo.patch b/net-analyzer/nbwmon/files/nbwmon-0.5.2-tinfo.patch
new file mode 100644
index 000000000000..0108844db99e
--- /dev/null
+++ b/net-analyzer/nbwmon/files/nbwmon-0.5.2-tinfo.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -2,7 +2,7 @@
+ # add -I/usr/pkg/include and -L/usr/pkg/lib to the options
+ # below.
+ CFLAGS+=-std=c99 -pedantic -Wall -Wextra
+-LDLIBS=-lncurses
++LDLIBS=$(shell $(PKG_CONFIG) --libs ncurses)
+ PREFIX=/usr/local
+ 
+ BIN=nbwmon
diff --git a/net-analyzer/nbwmon/metadata.xml b/net-analyzer/nbwmon/metadata.xml
new file mode 100644
index 000000000000..07903da6f676
--- /dev/null
+++ b/net-analyzer/nbwmon/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">causes-/nbwmon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild b/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild
new file mode 100644
index 000000000000..f2c7742f396c
--- /dev/null
+++ b/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="ncurses bandwidth monitor"
+HOMEPAGE="http://causes.host.funtoo.org/?p=nbwmon https://github.com/causes-/nbwmon"
+SRC_URI="https://github.com/causes-/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	sys-libs/ncurses
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.5.2-tinfo.patch
+	tc-export CC PKG_CONFIG
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README
+}
diff --git a/net-analyzer/ndoutils/Manifest b/net-analyzer/ndoutils/Manifest
new file mode 100644
index 000000000000..9f8404f7279c
--- /dev/null
+++ b/net-analyzer/ndoutils/Manifest
@@ -0,0 +1,8 @@
+AUX ndo2db.init-nagios3 482 SHA256 7d5050da70fb61b7ee29f1ac52b7967db2b5b46e784029616607de658f7def40 SHA512 2679ecf2959c07e6b993e32789b592a3bb8a6443412c8f297303c08255d7761f5f9e47e0f68f92dc3487cbe4795403fae9d98c00f83cbf85cb095739162978a3 WHIRLPOOL 95baf3ee178a60c90784c7d1ad9984f20c1edccf1e1224b6a1b610908b57ad273041f44fed5e0a93379e651d3cf3a0f4cbb65b602dab4796f4cecd2512d85e18
+AUX ndoutils-2.0.0-asprintf.patch 172 SHA256 c7db1469e5be1aeeffb03541dcc851094a8c212d6ad2caae3a37776bdb62ee6b SHA512 f70586d71727cb3017bb1b5c10dacf33f4a4c3ece405d544d182258d96a3540a8b95220d181a65c22a0023cf1c4294c8d2061fd1ab7328c371b0254464119a9c WHIRLPOOL 0100d63a892308766ab7922a5bf92ea4e7c4238b383c0ab50eb52f176207df6e4e934b60929f9ca00367c833eebc74d1b1c84162223e78c4f35debabcb39aab5
+AUX ndoutils-2.0.0-sleep.patch 284 SHA256 b89fdf0f7ff20068e04ccec1411e24c76f7ae85350fd11ee7485bd426e4d9702 SHA512 12ecbe803edc7e4b2c80da34849a7a8e6c64453f98afa51865042282b6420f9a511f08c2f7921ff06455d81a68a35115db942ec1ee6c946969c902dff65346f7 WHIRLPOOL c2f09b6ec089fe25eb78a90dd33a2f467dc3d5c33a7a3848d50c547f2c4c47479b0262d55535d4b5cffebe564ebe4aa5291089f2719a576628dd2940c61f1486
+DIST ndoutils-2.0.0.tar.gz 2207263 SHA256 b95047c812fb61465e66a9e1a6d4a42bf00620f334f08a6faf5afe20bdd43ba1 SHA512 c899c9f9d0a14995ae7e3fc9f8566891acef9186cc53f05e4f509e9dd01a19a17d32c746a4a1c125342ebffad65946c7a3ea11da68ce0ff240bd37e85334545c WHIRLPOOL d3e41eb5e2a3ea9a5ca0d24fc8319beaa914d2bcb16c187ab6c5f5a3f133c27756ecdc2b6302a75c015294a1b2c3cc48d3c87a540ae1b9b07a21eb427b45d181
+EBUILD ndoutils-2.0.0.ebuild 1235 SHA256 d24ca70bfb5c12cf735ca050324a7866d6dc9cea87a0cd97d3ff100502f1279e SHA512 88f28cce914ddc96070c9e5fa9bd3bea6cefdccc7ee97efec302d1df9affaafdf85210e7316acf6f6ab88442d5cfa0768f895b42290ae4306f2bb5f1069d3d74 WHIRLPOOL 1e3dfdf33d0044bf63cc4b906907446695ea4323e8df9bbc3a810e7e3c1013927a5006f1ad7f2c417bcda81956fd075c34612972cd2230226cf77aaa31e4cff7
+MISC ChangeLog 4049 SHA256 e74a1694207f5c20fcc90a88e460fd64d21f961793689c204e16ef2ae1c8942f SHA512 ae3812b8b2d539d7366941fa7ac83fb297247fad97a7f1e85c1f2b6be04d1000fca18d4f6807b7094c1ffb4f80bf14dfc8075fb321c509a60c39e1476548440b WHIRLPOOL 360a188ecc18cf69b3d60779f2e9675d296f1ba6c50370807bea4a410757102c4faabc3407d977751f7711efb2bd3189f36cb6000adbba910d891619c611d990
+MISC ChangeLog-2015 2775 SHA256 0043133f70c0b9dca601b54e3e277eff0bb3c948bd8eae5168c0f3eff36d8960 SHA512 3df4c0854d1db10287bea3dec354f53ee16a5be21a82cafddcc5d5abc63fe00524ceb318329f73b3d57b34eba9947e1167ffd0a5f2fe2edcd21f2661f27b2c48 WHIRLPOOL 5cfa45ed6d3d56802997821e8539f9dd4ceecc773e24bc274beaeb3e334f3481dbb4da93ebb6b3a7d91f0cbaa4a13a74b926396b5bbb8ed82c891721acf7fe5e
+MISC metadata.xml 356 SHA256 e1e604c15342d0f5a3406a55e888f8795a3d1eed2f03a2114748cba9fb42b1b2 SHA512 a74005ec3d18121f5379cfd15757c97f94d6e60864406989f3e60dc065dec57fccd2f06534a94e25235f3bb8bffd26e7adbd66a3216d037b1c7f42005f50512a WHIRLPOOL 9a3b5648fbce4441e3332add12489281576682b6b0ba439bb69f1d42688b1af57ebae973da5836476973b0f079b3537b800cbdfc613575575b7b9f8c8f40deec
diff --git a/net-analyzer/ndoutils/files/ndo2db.init-nagios3 b/net-analyzer/ndoutils/files/ndo2db.init-nagios3
new file mode 100644
index 000000000000..3e1e262f6e0c
--- /dev/null
+++ b/net-analyzer/ndoutils/files/ndo2db.init-nagios3
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depends() {
+	before nagios
+	need mysql
+}
+
+start() {
+	ebegin "Starting ndo2db"
+	if [ -S /var/nagios/ndo.sock ] ; then
+		rm -f /var/nagios/ndo.sock
+	fi
+	start-stop-daemon --start --quiet --exec /usr/bin/ndo2db \
+	-- -c /etc/nagios/ndo2db.cfg
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ndo2db"
+	start-stop-daemon --stop --quiet --exec /usr/bin/ndo2db
+	eend $?
+}
diff --git a/net-analyzer/ndoutils/files/ndoutils-2.0.0-asprintf.patch b/net-analyzer/ndoutils/files/ndoutils-2.0.0-asprintf.patch
new file mode 100644
index 000000000000..146132c21de3
--- /dev/null
+++ b/net-analyzer/ndoutils/files/ndoutils-2.0.0-asprintf.patch
@@ -0,0 +1,10 @@
+--- a/include/config.h.in
++++ b/include/config.h.in
+@@ -9,6 +9,7 @@
+ #ifndef _CONFIG_H
+ #define _CONFIG_H
+ 
++#define _GNU_SOURCE
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
diff --git a/net-analyzer/ndoutils/files/ndoutils-2.0.0-sleep.patch b/net-analyzer/ndoutils/files/ndoutils-2.0.0-sleep.patch
new file mode 100644
index 000000000000..61694baee9e3
--- /dev/null
+++ b/net-analyzer/ndoutils/files/ndoutils-2.0.0-sleep.patch
@@ -0,0 +1,10 @@
+--- a/src/queue.c
++++ b/src/queue.c
+@@ -8,6 +8,7 @@
+ #include "../include/queue.h"
+ #include <errno.h>
+ #include <time.h>
++#include <unistd.h> /* sleep() */
+ 
+ #define RETRY_LOG_INTERVAL	600		/* Seconds */
+ #define MAX_RETRIES	20				/* Max number of times to retry sending message */
diff --git a/net-analyzer/ndoutils/metadata.xml b/net-analyzer/ndoutils/metadata.xml
new file mode 100644
index 000000000000..325efab1c501
--- /dev/null
+++ b/net-analyzer/ndoutils/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">nagios</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild b/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild
new file mode 100644
index 000000000000..b813b079881b
--- /dev/null
+++ b/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils user
+
+MY_P=${P/_beta/b}
+
+DESCRIPTION="Nagios addon to store Nagios data in a MySQL database"
+HOMEPAGE="http://www.nagios.org"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc"
+
+DEPEND="
+	dev-perl/DBD-mysql
+	dev-perl/DBI
+	virtual/mysql
+"
+RDEPEND="
+	${DEPEND}
+	>=net-analyzer/nagios-core-3.0
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-asprintf.patch \
+		"${FILESDIR}"/${P}-sleep.patch
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/nagios \
+		--enable-mysql
+}
+
+DOCS=(
+	'docs/NDOUTILS DB Model.pdf'
+	'docs/NDOUtils Documentation.pdf'
+	Changelog
+	README
+	REQUIREMENTS
+	TODO
+	UPGRADING
+)
+
+src_install() {
+	default
+	emake DESTDIR="${D}" install-config
+
+	newinitd "${FILESDIR}"/ndo2db.init-nagios3 ndo2db
+}
+
+pkg_postinst() {
+	elog "To include NDO in your Nagios setup you'll need to activate the NDO broker module"
+	elog "in /etc/nagios/nagios.cfg:"
+	elog "\tbroker_module=/usr/bin/ndomod-3x.o config_file=/etc/nagios/ndomod.cfg"
+}
diff --git a/net-analyzer/ndsad/Manifest b/net-analyzer/ndsad/Manifest
new file mode 100644
index 000000000000..7f3f103bbf12
--- /dev/null
+++ b/net-analyzer/ndsad/Manifest
@@ -0,0 +1,12 @@
+AUX ndsad-1.33-conf_path.patch 174 SHA256 893acb4d2bdc729eb4700b9432b385dd2cdf63354398dcef404451eeadf8ffcc SHA512 44f7644e419e9fe6c17d241f3a5e51ceb8e89b6c47aba9f0dc9cb53f106658953a3b28d68769a2152f066ee94d4f46a5dddaa150762df207612dd59bd3f7b550 WHIRLPOOL 7c521095bd3113a76bb6385a336ae58664da2ad3e5e35fd27dbb41b0b9a73426d72a0fa4bfc4c5be8bb1805374664e69fb106f6b4a5a2ebbff6fcabf9657415d
+AUX ndsad-1.33-gentoo.patch 865 SHA256 4a785bb5c166cc8422b8f11fcfa57917c3a87962f1e7d222299f7c75b178b5df SHA512 6a0332e0f1fb28862a571e64c7f0f4e94618fec1c7cacf48d7cc0202f725430684639da828348e4f8fdb83ab381ca8b40b619481b595132a330a9ef2b93b9fff WHIRLPOOL a748fbf8c1e8246134ad0468a14273765ec6db2988e854d7321ff0221d35e3b4311990a91e65e4e1ab812edffc7ba888c94e112acb7901ff04d8540dc645f181
+AUX ndsad-1.33-getpid.patch 213 SHA256 112e779c7676721c102cd73658717de90ad71fb70ddee7eaa8e624b091f05cec SHA512 6fcb92fb3477f99b0ac7d99295a3ca2fe91ea6440ad06ad6f8a63a65d9b973c9cd9d1edc0c98c3f3908b2ac8882548fcdc79e0d5ad179058eb22ffff44554c96 WHIRLPOOL 092bf7b639817135e32fe4a79fd4aeebabdec374888722beab2dc064f26de61afbd81d58f3039b02c61a286187ad98126c263b2bf4d5761b494eb6fad619462e
+AUX ndsad-1.33-log-path.patch 233 SHA256 6797406f5e4839eb25ce95394024859a6823992679c2563e52a77058e0ced4d9 SHA512 12e959528ff083fef565701023ae9af2b754312104df3d90a5ee9de232a2d6170b7676e4ad168848f8c33d72728fc8e50fc15e4a801da9e7b0d936cec5244102 WHIRLPOOL ffcb392444d464d6c3cd64461d5cc9374f0beed3e8512de41a1fc346d969c7f10d05ab676aa717539e9ee8a998b5931baafe6ad0b40976c79a8bebc7bc76b7cd
+AUX ndsad-1.33-strncpy-overflow.patch 351 SHA256 9a30af9fa9b21744629abaf5401749edeba09b93afaf7eb90c9955b2dff0befa SHA512 8922b0a2fd69132b568b2323782fbbe9aea76f3e3526fba82ada555790d1b0b818a799ff6bf6959a61acb4a6ddda0effee938d4a7fe63fccfdfc08c46fa8d20c WHIRLPOOL 78e8869e36c5b465097e939a887031c6da4cb3d8ffb7cd0d1957617f8605d7f4c287e0b84b9f652c45d9c8a6cb6c14364dfe2e5a502b01107b35584cf1aea273
+AUX ndsad.conf.d 286 SHA256 c35bc356b2e1a673f46309d1ad17660b79f816248f6ef24d1aa8724c21988650 SHA512 2b2718d6cb638ac6b2a75a7b041d0eaf3629bc4698e4d978cdd196866cbbf5f3965ef3e6052d7af1dcc22ca5046558b36393275ec0c2d025dd1cfca8e2dd6f62 WHIRLPOOL ae77d4301397a4c4a96a925834a80b94dcfb7aafbf632360486a3716294a37b65a00f19b5c0dfdcc81707d62ac31ae742f72b5421bf84f7dd60928641f53bb48
+AUX ndsad.init 675 SHA256 704bddc9728ef76848792517ccde1853ebbc08192d894b7f16614b8e90c9967d SHA512 f08c02ea457e2067e170cea8c2860ac12ccbbc4dd50a27f308e7b6884afa7e2ca8a7cf2f2d627002c43c13c4bc710727579fd22e043105d1c3f135de9cfdb500 WHIRLPOOL 5264955b06214f813b7f487d2caf6164b65f76eefcf837a1a3232012ef25c8f45c178ca3ef83ea308e9fff29d17fc2ea18d740c88b3dbacf6c719214c1c75ff4
+DIST ndsad-1.33.tgz 214614 SHA256 a46403ff15c03b45b479832f5e6d861ec4d6474ef953f7965ae0239c90b9026b SHA512 38ebca91f28d763ce334d92361779f100ee6b98d6d17485bf096f913f777e8525add63bd73aeea43321cee622e10cb88020aca7af492fbafdd50cf740510bd51 WHIRLPOOL e5e202eab7fc16120f1a56d7691fbdb36c4a9af65cc4ec5fd9d39f0d515937ef29fccd6c08d948ddfaf30552dc0b7af63a395f731704c3fa79d7bbf935b81ba8
+EBUILD ndsad-1.33-r1.ebuild 905 SHA256 f3e9c5bc28d60fe4f29fe2ed3dde16840e52be05e3a06986e45a590015bc14c0 SHA512 4fd73c4234e8e08284e2c21501315203feb814d6ce73c4140a9e5f71772f3a2fcdd119f682bce8917ec048876c205db1a6a91c2e56d7794ffb8c09680078adcc WHIRLPOOL 31270843c275655f6a934f32b2f51e1e25ca4e088c9326fcfca9379a3a0f56ae34c0e5f394ae43847eb23ba1102c0314e1a9d78f5c53cd8a1c80db5de639ad37
+MISC ChangeLog 2889 SHA256 70b1db1c01b300a60f6df34cdbac3eec02d1e0af1cf4473c17029df1031f8c77 SHA512 aff29742dd6a67908b6bd122aa55074fdd56546c42d1ebf71e57d9badc8ae5a559dfa45cdea0917ca621147e62f507cae7087de2240af13cbb53a2cbf57ef480 WHIRLPOOL a04f5aa6f5aba2ff682b4b05e7e6ca757d516a573ea2803b9e6c9b530443753c6087f0f6d73a83cb32ecad2739fc06c3670ac287dab0d36fb5a0ad3d0970ddb2
+MISC ChangeLog-2015 2221 SHA256 dffa2462ad45c4e81f0b60813410569774bcf4f4fe0646915b9d1e3ac5c36998 SHA512 8b025b747339ed04af28d76db925ac58c42f29c8d7ccf26ae53b2abedf2184dfc9e4aa340f6c3aed97dac66ef6d8fc2c1f1e131b042baf66a434bd4de534d678 WHIRLPOOL b10676a7f98ea0cbd75d951f7fdb9a850daa559cfe568643c8e58e077340a3de8b2342cc0121785a814a5aa93249ae382f1bdc0cde2f9a7e3d769908737db2bf
+MISC metadata.xml 1271 SHA256 58ea7230a545f32c5108751f3d3e222eba5a65c70af10f638bc7bbda091d9320 SHA512 9db4f4368820e30e5b48f1ad9c49e245348c57a37829aec25b699d863e5e56f565f52c948cb6a2b63efd4c54c4feff204234e2d98bb8525f767d55701d14ce3f WHIRLPOOL cee4c772a5f3e9b3121b3d35b1a602d9a17f87abdea77588716bf0f925c3d9447e2dccb08a4e562205bfe115cc0bee10cdf6745d7f51ba68ad27e5c42028d844
diff --git a/net-analyzer/ndsad/files/ndsad-1.33-conf_path.patch b/net-analyzer/ndsad/files/ndsad-1.33-conf_path.patch
new file mode 100644
index 000000000000..cf3c827cdde7
--- /dev/null
+++ b/net-analyzer/ndsad/files/ndsad-1.33-conf_path.patch
@@ -0,0 +1,11 @@
+--- a/ndsad.cc
++++ b/ndsad.cc
+@@ -12,7 +12,7 @@
+  */

+ 

+ 

+-#define conf_path "/netup/utm5/ndsad.cfg"

++#define conf_path "/etc/ndsad.conf"

+ 

+ #include "pcap.local.h"

+ 

diff --git a/net-analyzer/ndsad/files/ndsad-1.33-gentoo.patch b/net-analyzer/ndsad/files/ndsad-1.33-gentoo.patch
new file mode 100644
index 000000000000..3ccbe3432932
--- /dev/null
+++ b/net-analyzer/ndsad/files/ndsad-1.33-gentoo.patch
@@ -0,0 +1,23 @@
+--- a/configure.in
++++ b/configure.in
+@@ -24,9 +24,6 @@
+ AC_DEFINE(OS_BSD,     2,[BSD OS code])
+ AC_DEFINE(OS_SOLARIS,     3,[SOLARIS on SPARC code])
+ 
+-CFLAGS=-g
+-CXXFLAGS=-g
+-
+ AC_CHECK_LIB(pcap, pcap_loop, [LIBS="$LIBS -lpcap"; __ac_have_libpcap=1;], [ break ])
+ 
+ case "$host_os" in
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,6 @@
+-bin_PROGRAMS = ndsad
++sbin_PROGRAMS = ndsad
+ 
+ ndsad_SOURCES = linux_ulog.cc linux_ulog.h debug.h eth-hndl.h handlers.h iflist.h iptonf.h ldefs.h logger.h mempool.h nethdr.h nfc.h nf.h ppp-hndl.h thr.h config.cc debug.cc eth-hndl.cc handlers.cc iflist.cc iptonf.cc logger.cc mempool.cc ndsad.cc nf.cc nfc.cc ppp-hndl.cc thr.cc bsd_divert.cc  bsd_divert.h
+ 
+-ndsad_CXXFLAGS = $(AM_CXXFLAGS) -O0 -fno-inline -g -ftemplate-depth-32
++ndsad_CXXFLAGS = $(AM_CXXFLAGS) -fno-inline -ftemplate-depth-32
+ ndsad_LDFLAGS = $(AM_LDFLAGS)
diff --git a/net-analyzer/ndsad/files/ndsad-1.33-getpid.patch b/net-analyzer/ndsad/files/ndsad-1.33-getpid.patch
new file mode 100644
index 000000000000..c0e6d94a301c
--- /dev/null
+++ b/net-analyzer/ndsad/files/ndsad-1.33-getpid.patch
@@ -0,0 +1,10 @@
+--- a/linux_ulog.h
++++ b/linux_ulog.h
+@@ -8,6 +8,7 @@
+ #include <pthread.h>
+ #include <iostream>
+ #include <sys/types.h>
++#include <unistd.h> /* getpid() */
+ #include <sys/socket.h>
+ 
+ /// linux specific headers!
diff --git a/net-analyzer/ndsad/files/ndsad-1.33-log-path.patch b/net-analyzer/ndsad/files/ndsad-1.33-log-path.patch
new file mode 100644
index 000000000000..fbeab07fb7a0
--- /dev/null
+++ b/net-analyzer/ndsad/files/ndsad-1.33-log-path.patch
@@ -0,0 +1,11 @@
+--- a/ndsad.conf
++++ b/ndsad.conf
+@@ -75,7 +75,7 @@
+ # Default:
+ #log (null)
+ # Example:
+-log /tmp/ndsad.log
++log /var/log/ndsad.log
+ 
+ # Jump to another configuration file
+ # Current file is closed after this line! Beware of loops!
diff --git a/net-analyzer/ndsad/files/ndsad-1.33-strncpy-overflow.patch b/net-analyzer/ndsad/files/ndsad-1.33-strncpy-overflow.patch
new file mode 100644
index 000000000000..5078f1555ec6
--- /dev/null
+++ b/net-analyzer/ndsad/files/ndsad-1.33-strncpy-overflow.patch
@@ -0,0 +1,12 @@
+--- a/handlers.h
++++ b/handlers.h
+@@ -30,7 +30,8 @@
+ #ifdef WIN32
+ #define IFN_SIZE 512 // on windows iface names are VEERY long
+ #else
+-#define IFN_SIZE 32 // iface name size. As in linux/sockios.h
++#include <net/if.h>
++#define IFN_SIZE IFNAMSIZ // iface name size. As in linux/sockios.h
+ #endif
+ 
+ #define MPH_IFLIST 0x2 // iface type - for mempool
diff --git a/net-analyzer/ndsad/files/ndsad.conf.d b/net-analyzer/ndsad/files/ndsad.conf.d
new file mode 100644
index 000000000000..c216c39affec
--- /dev/null
+++ b/net-analyzer/ndsad/files/ndsad.conf.d
@@ -0,0 +1,8 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# See config file /etc/ndsad.conf for configuration options.
+
+# If you want to add any extra command line options to be used by ndsad on 
+# start-up put them here.
+NDSAD_OPTS=""
diff --git a/net-analyzer/ndsad/files/ndsad.init b/net-analyzer/ndsad/files/ndsad.init
new file mode 100644
index 000000000000..0ae33b5d98ac
--- /dev/null
+++ b/net-analyzer/ndsad/files/ndsad.init
@@ -0,0 +1,32 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ ! -f /etc/ndsad.conf ] ; then
+		eerror "/etc/ndsad.conf does not file exists!"
+		return 1
+	fi
+	
+	return 0
+}
+
+start() {
+	# Comment out the following line to get faster startups
+	checkconfig || return 1
+
+	ebegin "Starting ndsad"
+	# On success ndsad returns 1.
+	start-stop-daemon --start --quiet --exec /usr/sbin/ndsad -- -d ${NDSAD_OPTS} >/dev/null 2>&1
+	eend $(( $? - 1 ))
+}
+
+stop () {
+	ebegin "Stopping ndsad"
+	start-stop-daemon --stop --quiet --pidfile=/run/ndsad.pid --retry 20 >/dev/null
+	eend $?
+}
diff --git a/net-analyzer/ndsad/metadata.xml b/net-analyzer/ndsad/metadata.xml
new file mode 100644
index 000000000000..18ff97735235
--- /dev/null
+++ b/net-analyzer/ndsad/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription lang="en">
+		The NetUP ndsad (NetUp Data Stream Accounting Daemon) utility captures
+		IP-traffic from network interfaces and export NetFlow v.5. Data is
+		gathered from libpcap library on Unix and from winpcap on Windows. Also
+		you are able to use tee/divert sockets on FreeBSD and ULOG on Linux for
+		data source.
+	</longdescription>
+	<longdescription lang="ru">
+		Демон ndsad (NetUp Data Stream Accounting Daemon) компании �етап
+		захватывает �етевой трафик � �етевых интерфей�ов и �к�портирует его в
+		NetFlow v.5. Трафик �обирает�� при помощи библиотеки libpcap в Unix или
+		winpcap в Windows. В каче�тве и�точника данных вы также можете
+		и�пользовать tee/divert �океты в FreeBSD и ULOG в Linux.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">ndsad</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/ndsad/ndsad-1.33-r1.ebuild b/net-analyzer/ndsad/ndsad-1.33-r1.ebuild
new file mode 100644
index 000000000000..5ccdff9433d7
--- /dev/null
+++ b/net-analyzer/ndsad/ndsad-1.33-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Cisco netflow probe from libpcap, ULOG, tee/divert sources"
+HOMEPAGE="https://sourceforge.net/projects/ndsad"
+SRC_URI="mirror://sourceforge/ndsad/ndsad-${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+
+DEPEND=">=net-libs/libpcap-0.8"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-conf_path.patch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-getpid.patch \
+		"${FILESDIR}"/${P}-log-path.patch \
+		"${FILESDIR}"/${P}-strncpy-overflow.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-ulog=yes
+}
+
+DOCS=( ChangeLog AUTHORS README )
+
+src_install() {
+	default
+
+	doman ndsad.conf.5
+
+	insinto /etc
+	newins ndsad.conf ndsad.conf
+
+	newinitd "${FILESDIR}"/ndsad.init ndsad
+	newconfd "${FILESDIR}"/ndsad.conf.d ndsad
+}
diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest
new file mode 100644
index 000000000000..efd67d1d9a50
--- /dev/null
+++ b/net-analyzer/nessus-agent-bin/Manifest
@@ -0,0 +1,8 @@
+AUX nessusagent.initd 563 SHA256 8af63cc2f4c139adb87f71fb7178dd554023a3da82e2b45d8e05b1231b067bc1 SHA512 acc9a64e1cbff1119876f186aa6c40d6f5772c55a919914c410fed9e0974d2ce8fe5b965248aeae590ae5dd551ab530c59dad42c6f793d995193f9b8f9d89718 WHIRLPOOL d827f1607d4745beaf343eee0408a66d6fd2cc7b22c92b63132847b0c6bae80add1f9707054456269e364925b4c4d3a46046700496c0096553154fb206910eef
+DIST NessusAgent-6.10.5-es7.x86_64.rpm 15573580 SHA256 47df9f78bc2e79721c4d50c27c7f5d8bf4ddd4f5616ad1dd757d8d6e2d62e853 SHA512 671219b52ad70e5713379447884c4d38488dba62ac44fa9a56145e414ae4890ce9824b99c99218bba1fb3d8ac91ae81674b3c548cf4dc33712ae4ec6438ab826 WHIRLPOOL 75bc381ca9138f0a01a234d34ec45925ef46d08060d35fda0d732efb5779af5d93077b96d592a003542c1534ebb0659464d4129c4b25ce92ceed61c70bbe091c
+DIST NessusAgent-6.10.7-es7.x86_64.rpm 15584200 SHA256 36e90c98e3370df45442b78059fd08c67042e8c01e62b18ed61c0b3397fee2cf SHA512 2a9231abc9f694bd74bf0cc7bfbe56d4d7c58aae4602a5288f3becc5d7c2fddc2fe54c71917f71ed1613596198dbe735f780b38d1836e2e39d63bb9ac28d15b4 WHIRLPOOL c70120a1e7a6d05722189b3697e2c2d9d55343ed523e2da197cbfa2e29b00699d2dd1eea6a732092005b0366bc2ca26951e5536250e5f03d8bb462079360f49b
+DIST NessusAgent-6.10.9-es7.x86_64.rpm 15578800 SHA256 687b2dd40aef6f0cd27613ee05408aec7d9755bb2eed18d243dbb46ce9357f05 SHA512 f84beee03f872a8c5aae4e5d0b63d02b6de5f9786950cf083bc0c9d266f8f5390d6e738c6cdc041c5f927f0644ab382bb4e715445a383a48b3889e89f2b2ef54 WHIRLPOOL 79529bbadfc8ae7abbda7824d660f282bc4a2515c5e9ff1896ead3ddeb8e432b9a4029e46829986f84e4da0aa64a3fc7d9c5f298b41e33aec144c2bbe708e3b9
+EBUILD nessus-agent-bin-6.10.5.ebuild 1953 SHA256 4b5cf962f150d4a2223377d882a5f3198c9cf2ddf75354c7e1c0ccc4b3a6a50a SHA512 e88f677a4a2b371712ca487bc67a377708b5c9dd8c8d2aed9c6f77fac056c3a6118d204348beee8241faa7d305fbfcc79014eaaae2cda06ff5ac824a316d5d7c WHIRLPOOL 056003844acbaeb3b467149aa3ff671a82304430a8a412f05ee1b2e2c07b467deb274a3de0d053495b8bfb3efa96341ef400107e2f9dff390facbde43877ae5a
+EBUILD nessus-agent-bin-6.10.7.ebuild 1953 SHA256 4b5cf962f150d4a2223377d882a5f3198c9cf2ddf75354c7e1c0ccc4b3a6a50a SHA512 e88f677a4a2b371712ca487bc67a377708b5c9dd8c8d2aed9c6f77fac056c3a6118d204348beee8241faa7d305fbfcc79014eaaae2cda06ff5ac824a316d5d7c WHIRLPOOL 056003844acbaeb3b467149aa3ff671a82304430a8a412f05ee1b2e2c07b467deb274a3de0d053495b8bfb3efa96341ef400107e2f9dff390facbde43877ae5a
+EBUILD nessus-agent-bin-6.10.9.ebuild 1953 SHA256 4b5cf962f150d4a2223377d882a5f3198c9cf2ddf75354c7e1c0ccc4b3a6a50a SHA512 e88f677a4a2b371712ca487bc67a377708b5c9dd8c8d2aed9c6f77fac056c3a6118d204348beee8241faa7d305fbfcc79014eaaae2cda06ff5ac824a316d5d7c WHIRLPOOL 056003844acbaeb3b467149aa3ff671a82304430a8a412f05ee1b2e2c07b467deb274a3de0d053495b8bfb3efa96341ef400107e2f9dff390facbde43877ae5a
+MISC metadata.xml 245 SHA256 1cbbdb363f68b45429ec1f8c22f5c47251f2376210c285a59e0cf6f905131563 SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a WHIRLPOOL 1c76cb23b2bece7265391203746461cfef14ac3966ecb8c411739ba4f7214bd6952deeb910c04f9f3bf6c60f9847ca006654100a6f76e06a90fa2da2f5a68048
diff --git a/net-analyzer/nessus-agent-bin/files/nessusagent.initd b/net-analyzer/nessus-agent-bin/files/nessusagent.initd
new file mode 100644
index 000000000000..6f43fc421e1b
--- /dev/null
+++ b/net-analyzer/nessus-agent-bin/files/nessusagent.initd
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+start() {
+	ebegin "Starting nessusagent"
+	start-stop-daemon --start --quiet --exec /opt/nessus_agent/sbin/nessus-service -- -D --quiet
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping nessusagent"
+	start-stop-daemon --stop --quiet --exec /opt/nessus_agent/sbin/nessus-service
+	einfo "Waiting for the environment to be sane"
+	while [ -n "$RUNNING" ] ; do
+		sleep 1
+		RUNNING=$(ps aux | grep -m 1 nessusd: | grep -v grep)
+	done
+	sleep 3
+	eend $?
+}
diff --git a/net-analyzer/nessus-agent-bin/metadata.xml b/net-analyzer/nessus-agent-bin/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/net-analyzer/nessus-agent-bin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-6.10.5.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-6.10.5.ebuild
new file mode 100644
index 000000000000..f7e50ca245a6
--- /dev/null
+++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-6.10.5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rpm pax-utils systemd
+
+MY_P="NessusAgent-${PV}-es7"
+
+DESCRIPTION="A remote security scanner for Linux - agent component"
+HOMEPAGE="https://www.tenable.com/"
+SRC_URI="${MY_P}.x86_64.rpm"
+
+LICENSE="GPL-2 Nessus-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="mirror fetch strip"
+
+QA_PREBUILT="opt/nessus_agent/bin/nasl
+	opt/nessus_agent/bin/nessus-mkrand
+	opt/nessus_agent/lib/nessus/libjemalloc.so.${PV}
+	opt/nessus_agent/lib/nessus/libnessus-glibc-fix.so
+	opt/nessus_agent/lib/nessus/plugins/ovaldi64-rhel7.inc
+	opt/nessus_agent/sbin/nessus-check-signature
+	opt/nessus_agent/sbin/nessus-service
+	opt/nessus_agent/sbin/nessuscli
+	opt/nessus_agent/sbin/nessusd"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	einfo "Please download ${A} from ${HOMEPAGE}/agent-download"
+	einfo "The archive should then be placed into ${DISTDIR}."
+}
+
+src_install() {
+	# Using doins -r would strip executable bits from all binaries
+	cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files"
+
+	pax-mark m "${D}"/opt/nessus_agent/sbin/nessusd
+
+	# Make sure these originally empty directories do not vanish,
+	# Nessus will not run properly without them
+	keepdir /opt/nessus_agent/com/nessus/CA
+	keepdir /opt/nessus_agent/etc/nessus
+	keepdir /opt/nessus_agent/var/nessus/logs
+	keepdir /opt/nessus_agent/var/nessus/tmp
+	keepdir /opt/nessus_agent/var/nessus/users
+
+	newinitd "${FILESDIR}"/nessusagent.initd nessusagent
+	systemd_dounit usr/lib/systemd/system/nessusagent.service
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "In order to link the agent to Tenable.io or an instance of Nessus Manager,"
+		elog "obtain an appropriate linking key and run"
+		elog ""
+		elog "  /opt/nessus_agent/sbin/nessuscli agent link --key=<key> --host=<host> --port=<port> [optional parameters]"
+		elog ""
+		elog "This can be done before the agent is started."
+	fi
+}
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-6.10.7.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-6.10.7.ebuild
new file mode 100644
index 000000000000..f7e50ca245a6
--- /dev/null
+++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-6.10.7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rpm pax-utils systemd
+
+MY_P="NessusAgent-${PV}-es7"
+
+DESCRIPTION="A remote security scanner for Linux - agent component"
+HOMEPAGE="https://www.tenable.com/"
+SRC_URI="${MY_P}.x86_64.rpm"
+
+LICENSE="GPL-2 Nessus-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="mirror fetch strip"
+
+QA_PREBUILT="opt/nessus_agent/bin/nasl
+	opt/nessus_agent/bin/nessus-mkrand
+	opt/nessus_agent/lib/nessus/libjemalloc.so.${PV}
+	opt/nessus_agent/lib/nessus/libnessus-glibc-fix.so
+	opt/nessus_agent/lib/nessus/plugins/ovaldi64-rhel7.inc
+	opt/nessus_agent/sbin/nessus-check-signature
+	opt/nessus_agent/sbin/nessus-service
+	opt/nessus_agent/sbin/nessuscli
+	opt/nessus_agent/sbin/nessusd"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	einfo "Please download ${A} from ${HOMEPAGE}/agent-download"
+	einfo "The archive should then be placed into ${DISTDIR}."
+}
+
+src_install() {
+	# Using doins -r would strip executable bits from all binaries
+	cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files"
+
+	pax-mark m "${D}"/opt/nessus_agent/sbin/nessusd
+
+	# Make sure these originally empty directories do not vanish,
+	# Nessus will not run properly without them
+	keepdir /opt/nessus_agent/com/nessus/CA
+	keepdir /opt/nessus_agent/etc/nessus
+	keepdir /opt/nessus_agent/var/nessus/logs
+	keepdir /opt/nessus_agent/var/nessus/tmp
+	keepdir /opt/nessus_agent/var/nessus/users
+
+	newinitd "${FILESDIR}"/nessusagent.initd nessusagent
+	systemd_dounit usr/lib/systemd/system/nessusagent.service
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "In order to link the agent to Tenable.io or an instance of Nessus Manager,"
+		elog "obtain an appropriate linking key and run"
+		elog ""
+		elog "  /opt/nessus_agent/sbin/nessuscli agent link --key=<key> --host=<host> --port=<port> [optional parameters]"
+		elog ""
+		elog "This can be done before the agent is started."
+	fi
+}
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-6.10.9.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-6.10.9.ebuild
new file mode 100644
index 000000000000..f7e50ca245a6
--- /dev/null
+++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-6.10.9.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rpm pax-utils systemd
+
+MY_P="NessusAgent-${PV}-es7"
+
+DESCRIPTION="A remote security scanner for Linux - agent component"
+HOMEPAGE="https://www.tenable.com/"
+SRC_URI="${MY_P}.x86_64.rpm"
+
+LICENSE="GPL-2 Nessus-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="mirror fetch strip"
+
+QA_PREBUILT="opt/nessus_agent/bin/nasl
+	opt/nessus_agent/bin/nessus-mkrand
+	opt/nessus_agent/lib/nessus/libjemalloc.so.${PV}
+	opt/nessus_agent/lib/nessus/libnessus-glibc-fix.so
+	opt/nessus_agent/lib/nessus/plugins/ovaldi64-rhel7.inc
+	opt/nessus_agent/sbin/nessus-check-signature
+	opt/nessus_agent/sbin/nessus-service
+	opt/nessus_agent/sbin/nessuscli
+	opt/nessus_agent/sbin/nessusd"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	einfo "Please download ${A} from ${HOMEPAGE}/agent-download"
+	einfo "The archive should then be placed into ${DISTDIR}."
+}
+
+src_install() {
+	# Using doins -r would strip executable bits from all binaries
+	cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files"
+
+	pax-mark m "${D}"/opt/nessus_agent/sbin/nessusd
+
+	# Make sure these originally empty directories do not vanish,
+	# Nessus will not run properly without them
+	keepdir /opt/nessus_agent/com/nessus/CA
+	keepdir /opt/nessus_agent/etc/nessus
+	keepdir /opt/nessus_agent/var/nessus/logs
+	keepdir /opt/nessus_agent/var/nessus/tmp
+	keepdir /opt/nessus_agent/var/nessus/users
+
+	newinitd "${FILESDIR}"/nessusagent.initd nessusagent
+	systemd_dounit usr/lib/systemd/system/nessusagent.service
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "In order to link the agent to Tenable.io or an instance of Nessus Manager,"
+		elog "obtain an appropriate linking key and run"
+		elog ""
+		elog "  /opt/nessus_agent/sbin/nessuscli agent link --key=<key> --host=<host> --port=<port> [optional parameters]"
+		elog ""
+		elog "This can be done before the agent is started."
+	fi
+}
diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest
new file mode 100644
index 000000000000..0edb837c1abd
--- /dev/null
+++ b/net-analyzer/nessus-bin/Manifest
@@ -0,0 +1,13 @@
+AUX 90nessus-bin 25 SHA256 2343d5e672abb085400173f26df960d6f2b98ffa7b5b7b431675dd5b98d164cb SHA512 9152eb4d80a0ef6ce9f0eae3fe5f1ca700ec4d82ccffc229b2b6e000593cb29680b5ab0a9c77d853adb1328026bb93901541db83b2f4a3461a87f9994a0e36e0 WHIRLPOOL b608ca96432bdf23aae6ee319d378ffe7008a91720c1b2ed113ab4f8207522c70cb6076e796718560f67d7840ba6c4f04615d99284626dd1ea175db0633c4735
+AUX nessusd-initd 582 SHA256 6738bbff759ef9c44dc7efca48b3bdcad76dc721db745b23338af8f8ea656246 SHA512 f825fad89564303aeff423f3c32a1544ee4b063ef57702cd54220aebed8e01e7b178ff5bd10b48b654ebdee78657a9bc41caf779a23968d008916fd51e88b2f4 WHIRLPOOL 0a2d2aa8679e68cc4cc2af1ad77d2a0d2d8d90995f85d900b9ea20cbfad52ecf0531fb243000ea4c5404397f8a0a4c101caf33ea2711999c98a281d26949ab8e
+DIST Nessus-4.4.1-es6.i686.rpm 11222888 SHA256 91420688688da3347c0f2ad2be38b4495bedc4a94d1a1e159afb6ba5d2029bdc SHA512 dbc3c42989442830c7048135d4c1c582cd8a21801b7cf2e6522826992303e5ba6d6770136bb5c2b7be4b15f5f997e61ddbb31d1c9ed09358c3f20c77934c9e3e WHIRLPOOL 90b31b758a841b4a837efce2b4baec8fb3698cb2da37ebff93d8b0d01f4503af225e66140af1d233653b966f1ee5e054d830e97a84603954fc4f0310c3dda72e
+DIST Nessus-4.4.1-es6.x86_64.rpm 12516672 SHA256 b06585509ac4bcda874a333a22eaffef78aa9642c79350ef9b5a5a8c169be58a SHA512 5c788663bfb72978976dcbeb7cf586b74a1ebcb4cb856e595954343647e2ad5309c81661c47ebc6e7b31f993957bd26e73c2db69328735a90a87ff8799422e40 WHIRLPOOL d5d74bffadec10fd4c31d403bf4a24338d5cf517a455cce4dd478c92a1cd9d3f188f85a50b24816490e57f4e0df5342b52b289af4b4b1bdc0aef6462d25a7a96
+DIST Nessus-5.0.1-es6.i686.rpm 20401680 SHA256 540ca445d5eb886335f38b5e7b69f2c1c512eda9f633199cf31e29abc519432e SHA512 5d86549903ee71250a120d5c413e502041f3d36ff4712ff1e567c77750b723ab36b1da55b5035ce3b5e74adc2fb30f42153c2d0bd7bf1ff410daf2ab64a86eab WHIRLPOOL f2f5ec35b7d84ee61ed9a65f97bf7ffcd51e87a8b565fbc4d6836288f0ceb3093a007a9f8d6217f3931c6d21e7a2dd950aa3cd2e5bf43d3591437a4e917e5066
+DIST Nessus-5.0.1-es6.x86_64.rpm 22784992 SHA256 dc5c1af6dfc80b20e6019c86ee5b21178347817b50edd2f8c287f03cec8a1837 SHA512 180066cefabf56f1be416ff97e50171d9c75d19d03980e84696a8c34aba7628bdf12c0189e1c589eb1bba32ca38602023563f6d9e5c30cc3ec3a875fa08cc3a1 WHIRLPOOL 1f574f7984710ed594a67f5050a9672a0a87b34319a5f1c478d9bdd308b6503dd92ac2d4031ee468e62c8eb937ae0f2268ffe78e4c380090cdd44f22f9faa473
+DIST Nessus-6.10.5-es7.x86_64.rpm 41596796 SHA256 b658a80098177bb5dfc01774df755707fa1ce322c2f1a974f3e1d3acd52c04d1 SHA512 a407aa010d3d59d5c4d717159851a6b81ef9e1f1b4327c8382abe1b866c4969cf6e32251077270eae719b66af9ce29641c40ca6093df30f88ce9be81ba168f75 WHIRLPOOL 9ee3abf7bee6214ce0d8de2c3c519f768a5390634e6cf80eeeec8e4f1b6a6b26dc83e1614bf6ead0006c0094d9cda038f86cb37ba69f1c935d622c1dabbfa129
+EBUILD nessus-bin-4.4.1.ebuild 1909 SHA256 f9d4efa5ae843208ab19a873bd1735372e867a1118cdde317b3b23bdb88704ae SHA512 3fc04694b36e569a58e03715e32d235f2863980efedd9c83314bba066532dd8bf89869f015364fa55378e3567f4b0162082f4f50c7f07c905a14c93c806dd2d0 WHIRLPOOL adc5e175b901c5e5f809230454f506fe9505de715c7861c8eba9577fbd5c19a34ddf557c52901cd416c660b932b95da2bdfe6c273519ff8b87e337bcdf0480fa
+EBUILD nessus-bin-5.0.1.ebuild 1693 SHA256 a680b972146338b17b9c6fcb0ba39ca87d43ba8d824501fa2b0b1faca025dc28 SHA512 0d4f815186c8ea489e045ba634237ff19786dce6b672fac2dbae38fd5f7a86eaadef422d72fa1366ef308d636e6d4354c974dddc38471cf345f1f0c900077b14 WHIRLPOOL 96577a326684c7487f47d5d36f4f7d7df08178ee60ce990ced0ac18713df0184839b06626088cac9d3af442d96a4f5796f33f5ba04b8ae36fa1201e39fef0a66
+EBUILD nessus-bin-6.10.5.ebuild 1760 SHA256 489a817a5d7d485f88df529e61da18c9671ce812dfcf190438755dfc548df22e SHA512 4389e324582a3d9177cfa1f717ded52c561385e75e05c1ce20dec63a802a871d88996d9d50bc7e0683a614c0ad1f2e38d88eea771f7d5eb40ca523bbf1310661 WHIRLPOOL 678a0b256f7402f5244365a30ed91531aa7d350bf97f530305eff1ebd5fc025c1e4a1cbf026077e0edb262c83583b80079b474d9398554f261045926d721bcca
+MISC ChangeLog 2673 SHA256 70c0440f5c202f3d7d4f2e76a1b46c385d3fdd44d969ab1b9fde4c715642941e SHA512 9ed2e0f810d66d7d0382e8262c35cb20c04cab14b63f9789b1d3716bb162155b349c527d32d17049aa910dd5672d6ca6f40ed9cd9513769a0b4c79184f5b4549 WHIRLPOOL c22862ba6c218d3b2a01ee54c6fea612cd9f3aaa74b3f8bc467c7e90b3bac559b6756c50223a5f9984cc274ab03504347eaa1aebf9676ed9b7a0840e7428bba5
+MISC ChangeLog-2015 3381 SHA256 fdb0ba80c7f400917fe214af2a042a17aca4434b57a2800aed4ca5c6c9d07a05 SHA512 7bf4af80f4869a4025626f5d6f82f5ba3578292290467ab79079609c59f473681a4c656978d031b99829b201b58c643e8999c80431288ab7b55f9b6cb86ac37b WHIRLPOOL f1d081a44c9e74b983dd25c750b61dd90a40d64822cc1947b796b88b69176c6b85bd18d499649d46d4ff70c5aed75de0b1f6c40817fed4fe98d78d5780766d0d
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/nessus-bin/files/90nessus-bin b/net-analyzer/nessus-bin/files/90nessus-bin
new file mode 100644
index 000000000000..598d86b3cd70
--- /dev/null
+++ b/net-analyzer/nessus-bin/files/90nessus-bin
@@ -0,0 +1 @@
+LDPATH="/opt/nessus/lib"
diff --git a/net-analyzer/nessus-bin/files/nessusd-initd b/net-analyzer/nessus-bin/files/nessusd-initd
new file mode 100644
index 000000000000..fb95cb2b2d8e
--- /dev/null
+++ b/net-analyzer/nessus-bin/files/nessusd-initd
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting nessus-service"
+	start-stop-daemon --start --quiet --exec /opt/nessus/sbin/nessus-service -- -D --quiet
+	eend $? 
+}
+
+stop() {
+	ebegin "Stopping nessus-service"
+	start-stop-daemon --stop --quiet --exec /opt/nessus/sbin/nessus-service
+	einfo "Waiting for the environment to be sane"
+	while [ -n "$RUNNING" ] ; do
+		sleep 1
+		RUNNING=$(ps aux | grep -m 1 nessusd: | grep -v grep)
+	done
+	sleep 3
+	eend $?
+}
diff --git a/net-analyzer/nessus-bin/metadata.xml b/net-analyzer/nessus-bin/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/nessus-bin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/nessus-bin/nessus-bin-4.4.1.ebuild b/net-analyzer/nessus-bin/nessus-bin-4.4.1.ebuild
new file mode 100644
index 000000000000..1f8abf2a4bd8
--- /dev/null
+++ b/net-analyzer/nessus-bin/nessus-bin-4.4.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit multilib rpm
+
+MY_P="Nessus-${PV}-es6"
+# We are using the Red Hat/CentOS binary
+
+DESCRIPTION="A remote security scanner for Linux"
+HOMEPAGE="http://www.nessus.org/"
+SRC_URI="
+	x86? ( ${MY_P}.i686.rpm )
+	amd64? ( ${MY_P}.x86_64.rpm )"
+
+RESTRICT="mirror fetch strip"
+
+LICENSE="GPL-2 Nessus-EULA"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="X"
+
+pkg_nofetch() {
+		einfo "Please download ${A} from ${HOMEPAGE}/download"
+		einfo "The archive should then be placed into ${DISTDIR}."
+}
+
+pkg_setup() {
+	case ${CHOST} in
+		i686-pc-linux-gnu*) einfo "Found compatible architecture." ;;
+		x86_64-pc-linux-gnu*) einfo "Found compatible architecture." ;;
+		*) die "No compatible architecture found." ;;
+	esac
+}
+
+src_install() {
+	cp -pPR "${WORKDIR}"/opt "${D}"/
+
+	# make sure these directories do not vanish
+	# nessus will not run properly without them
+	keepdir /opt/nessus/etc/nessus
+	keepdir /opt/nessus/var/nessus/jobs
+	keepdir /opt/nessus/var/nessus/logs
+	keepdir /opt/nessus/var/nessus/tmp
+	keepdir /opt/nessus/var/nessus/users
+
+	# add PATH and MANPATH for convenience
+	doenvd "${FILESDIR}"/90nessus-bin
+
+	# init script
+	newinitd "${FILESDIR}"/nessusd-initd nessusd-bin
+	dosym libssl.so /usr/$(get_libdir)/libssl.so.10
+	dosym libcrypto.so /usr/$(get_libdir)/libcrypto.so.10
+}
+
+pkg_postinst() {
+	elog "You can get started running the following commands:"
+	elog "/opt/nessus/sbin/nessus-adduser"
+	elog "/opt/nessus/sbin/nessus-mkcert"
+	elog "/opt/nessus/bin/nessus-fetch --register <your registration code>"
+	elog "/etc/init.d/nessusd-bin start"
+	elog
+	elog "If you had a previous version of Nessus installed, use"
+	elog "the following command to update the plugin database:"
+	elog "/opt/nessus/sbin/nessusd -R"
+	elog
+	elog "For more information about nessus, please visit"
+	elog "${HOMEPAGE}/documentation/"
+}
diff --git a/net-analyzer/nessus-bin/nessus-bin-5.0.1.ebuild b/net-analyzer/nessus-bin/nessus-bin-5.0.1.ebuild
new file mode 100644
index 000000000000..ec3887f0d4ae
--- /dev/null
+++ b/net-analyzer/nessus-bin/nessus-bin-5.0.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit multilib rpm
+
+MY_P="Nessus-${PV}-es6"
+# We are using the Red Hat/CentOS binary
+
+DESCRIPTION="A remote security scanner for Linux"
+HOMEPAGE="http://www.nessus.org/"
+SRC_URI="
+	x86? ( ${MY_P}.i686.rpm )
+	amd64? ( ${MY_P}.x86_64.rpm )"
+
+RESTRICT="mirror fetch strip"
+
+LICENSE="GPL-2 Nessus-EULA"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="X"
+
+pkg_nofetch() {
+		einfo "Please download ${A} from ${HOMEPAGE}/download"
+		einfo "The archive should then be placed into ${DISTDIR}."
+}
+
+src_install() {
+	cp -pPR "${WORKDIR}"/opt "${D}"/
+
+	# make sure these directories do not vanish
+	# nessus will not run properly without them
+	keepdir /opt/nessus/etc/nessus
+	keepdir /opt/nessus/var/nessus/jobs
+	keepdir /opt/nessus/var/nessus/logs
+	keepdir /opt/nessus/var/nessus/tmp
+	keepdir /opt/nessus/var/nessus/users
+
+	# add PATH and MANPATH for convenience
+	doenvd "${FILESDIR}"/90nessus-bin
+
+	# init script
+	newinitd "${FILESDIR}"/nessusd-initd nessusd-bin
+	dosym libssl.so /usr/$(get_libdir)/libssl.so.10
+	dosym libcrypto.so /usr/$(get_libdir)/libcrypto.so.10
+}
+
+pkg_postinst() {
+	elog "You can get started running the following commands:"
+	elog "/opt/nessus/sbin/nessus-adduser"
+	elog "/opt/nessus/sbin/nessus-mkcert"
+	elog "/opt/nessus/bin/nessus-fetch --register <your registration code>"
+	elog "/etc/init.d/nessusd-bin start"
+	elog
+	elog "If you had a previous version of Nessus installed, use"
+	elog "the following command to update the plugin database:"
+	elog "/opt/nessus/sbin/nessusd -R"
+	elog
+	elog "For more information about nessus, please visit"
+	elog "${HOMEPAGE}/documentation/"
+}
diff --git a/net-analyzer/nessus-bin/nessus-bin-6.10.5.ebuild b/net-analyzer/nessus-bin/nessus-bin-6.10.5.ebuild
new file mode 100644
index 000000000000..bcc0cf88ff1a
--- /dev/null
+++ b/net-analyzer/nessus-bin/nessus-bin-6.10.5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rpm pax-utils systemd
+
+MY_P="Nessus-${PV}-es7"
+
+DESCRIPTION="A remote security scanner for Linux"
+HOMEPAGE="https://www.tenable.com/"
+SRC_URI="${MY_P}.x86_64.rpm"
+
+LICENSE="GPL-2 Nessus-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="mirror fetch strip"
+
+QA_PREBUILT="opt/nessus/bin/nasl
+	opt/nessus/bin/ndbg
+	opt/nessus/bin/nessus-mkrand
+	opt/nessus/lib/nessus/libjemalloc.so.${PV}
+	opt/nessus/lib/nessus/libnessus-glibc-fix.so
+	opt/nessus/sbin/nessus-check-signature
+	opt/nessus/sbin/nessus-service
+	opt/nessus/sbin/nessuscli
+	opt/nessus/sbin/nessusd"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	einfo "Please download ${A} from ${HOMEPAGE}/download"
+	einfo "The archive should then be placed into ${DISTDIR}."
+}
+
+src_install() {
+	# Using doins -r would strip executable bits from all binaries
+	cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files"
+
+	pax-mark m "${D}"/opt/nessus/sbin/nessusd
+
+	# Make sure these originally empty directories do not vanish,
+	# Nessus will not run properly without them
+	keepdir /opt/nessus/com/nessus/CA
+	keepdir /opt/nessus/etc/nessus
+	keepdir /opt/nessus/lib/nessus/plugins
+	keepdir /opt/nessus/var/nessus/logs
+	keepdir /opt/nessus/var/nessus/tmp
+	keepdir /opt/nessus/var/nessus/users
+
+	newinitd "${FILESDIR}"/nessusd-initd nessusd-bin
+	systemd_newunit usr/lib/systemd/system/nessusd.service nessusd-bin.service
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "To get started launch the nessusd-bin service, then point your Web browser to"
+		elog "  https://<yourhost>:8834/"
+	else
+		elog "You may want to restart the nessusd-bin service to use"
+		elog "the new version of Nessus."
+	fi
+}
diff --git a/net-analyzer/nessus-client/Manifest b/net-analyzer/nessus-client/Manifest
new file mode 100644
index 000000000000..27ac74d82bbd
--- /dev/null
+++ b/net-analyzer/nessus-client/Manifest
@@ -0,0 +1,8 @@
+AUX nessus-client-1.0.2-make.patch 2647 SHA256 07328320939bd1b06eff907b298b91131aaa9f3f7c23e12d62bd29828406cef3 SHA512 534ffc58b34cb382ba6e87cce27f8a842bb945f3cd5dbe239dc0acd1f8a3757347d3c529d41f7a213021491933030650fe70a161365eba2a80f81362ced3e48b WHIRLPOOL a01e344189a1cfcb886a9821dda157d0c4fd645a0989fcb880b74dad2bc1a53ae377e00e36871c3de302bce2431126c3e03e988559af37b9736515d90c499d87
+DIST NessusClient-1.0.2.tar.gz 2058324 SHA256 e9c26c2cefce3e0e3eade69199272fcbf2e9c1bd19d51ae8f8d73b0e82aee1af SHA512 999e8ba11208351ffc37bad9fabc8c0b01e4abc2a638660818a1877cdb21a5d3b40d330b722debe9833e87db60e4f8aef53044f14fe5eeb8ffe57f3522bfa927 WHIRLPOOL 30c417beb97c3c09b86cc4e101babe00641c87f728be3c3d99d2c588402b308b6b86ed061bad66137a93d2a2eabeb9892e02e53dae5798804b490cee66b8649b
+DIST nessus-client.png.bz2 10043 SHA256 857de50872354058de10fee0bd2bbc2a59e6ec56d75ccfd331847cf16142ce4c SHA512 39e2b41e3b4fcfdace80085c917754fb0a4cfebcf1f684d97e36e5212e8e2e3539f10527909d7e4e350afdc73801ac1fb5bff2bb5c12be4770e2bb27487542af WHIRLPOOL 5d01f947352d84e3eaab16d817765e24f224e7f51e105cdac09096d9ac7ed1be23dc2a6f25d01560c84c768d98288bdaac27cf7127672366cbb9c1536f1f5921
+EBUILD nessus-client-1.0.2-r1.ebuild 1245 SHA256 7836adf2364384c2a2867e1117cf3d63b6a54a3a3c4d8f70013abe0662952c43 SHA512 01e860aab8d49353588f62ff5a3927f13fba469d1c19fc0acccb9650dd859ffba5598ec70f295c29e469994c5fbf5cc34b749fbb54fca0ab855a55bc92858a44 WHIRLPOOL 1bc81daba67d74269773425c1fb4a6449dd188b8fdbd8d3995b5cbb7e488f91ad3865f811790bc6bfc0b21d3d88f8f010e4549a9667d5f72af39582ba0b7c347
+EBUILD nessus-client-1.0.2-r2.ebuild 1316 SHA256 b85e03dd3ba9297421575277660cefbcbfe458733881af2cdc8ac441466b770b SHA512 1cd722bc85f1d514616ef98590a4d3b7f5c41f406894ce96222be1673028e00f66c534757c2e416eea411b084bf42fdc63012b702a68bc817aba2ef3f018b636 WHIRLPOOL 764594e55b41c0e398fc6853b3b162ee5c0e6f72c6ee69654d692f19976d4d53a991fa6124ab42be1c8059f458cac3a11b1befbeb20336133613b0dd3a0e6dfb
+MISC ChangeLog 2702 SHA256 d22bde9b2a5fdeac8ced148c25d8f8103472ff9968c8d00abad964901d957d0e SHA512 7d4d039827db3125b2cb38ad3ef27fd0d8d7fad60ba35822c7b158dc5896e5589846e79fbe9e60d96fcc0ef88e51261def5469193cb494697a18e928b4ce7f6c WHIRLPOOL a2ecc4f9f0faeed5bdcb0708493261fdc77e4e87504b34042f4040cf832e319c052f23654820b5baf26e0aad3f37ba8ac6fb369cffd137fc170a7371ce8799a3
+MISC ChangeLog-2015 2799 SHA256 2490a368673a50cddf490bb55a1cf5c5fede32348ee16d696249764f7fa6339f SHA512 a10cb2b67632378053f3c1fc296796df04036526930c3a5ba4276199b8636e6176fdde3c6595c3c964759cfff52591de5505210a9f348dff0a84824633fffa14 WHIRLPOOL f14d0c6ca3271a8bb2fc2e4b6794d91f271dd00ebf0e97c1a0480603a886d2d80c202b20b4fc95cdc2fb02964495886f15ef42f2a3ed9071aea4e25c8c1b988e
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/nessus-client/files/nessus-client-1.0.2-make.patch b/net-analyzer/nessus-client/files/nessus-client-1.0.2-make.patch
new file mode 100644
index 000000000000..a233449b14ad
--- /dev/null
+++ b/net-analyzer/nessus-client/files/nessus-client-1.0.2-make.patch
@@ -0,0 +1,74 @@
+--- a/Makefile	2006-12-23 15:27:39.000000000 +0100
++++ b/Makefile	2010-08-23 01:12:51.000000000 +0200
+@@ -2,8 +2,10 @@
+ 
+ ALLDEPS = nessus.tmpl
+ 
+-all: libnessus-client client sslstuff
+-
++all:
++	$(MAKE) -C libnessus
++	$(MAKE) -C nessus
++	$(MAKE) -C ssl
+ 
+ nessus.tmpl: nessus.tmpl.in configure VERSION
+ 	$(SHELL) configure $(CONFIGURE_ARGS)
+@@ -21,20 +23,17 @@
+ 	$(INSTALL) -m $(CLIENTMODE) nessusclient-mkcert $(DESTDIR)${bindir}
+ 	$(INSTALL) -m $(CLIENTMODE) ssl/nessusclient-mkrand $(DESTDIR)${bindir}
+ 
+-sslstuff:
+-	cd ssl && $(MAKE)
+-
+ install-man:
+ 	@echo installing man pages ...
+ 	@test -d $(DESTDIR)${mandir}/man1 || $(INSTALL_DIR) $(DESTDIR)${mandir}/man1
+ 	@test -d $(DESTDIR)${mandir}/man8 || $(INSTALL_DIR) $(DESTDIR)${mandir}/man8
+ 	@test -d $(DESTDIR)${datadir}/doc/ || $(INSTALL_DIR) $(DESTDIR)${datadir}/doc/
+-	@test -d $(DESTDIR)${datadir}/doc/NessusClient || $(INSTALL_DIR) $(DESTDIR)${datadir}/doc/NessusClient
++	@test -d $(NESSUS_DOCDIR) || $(INSTALL_DIR) $(NESSUS_DOCDIR)
+ 
+ 	$(INSTALL) -c -m 0444 ${MAN_NESSUS_1} $(DESTDIR)${mandir}/man1/NessusClient.1
+ 	$(INSTALL) -c -m 0444 doc/nessusclient-mkcert.1 $(DESTDIR)${mandir}/man1/nessusclient-mkcert.1
+ 	$(INSTALL) -c -m 0444 doc/nessusclient-mkrand.1 $(DESTDIR)${mandir}/man1/nessusclient-mkrand.1
+-	$(INSTALL) -c -m 0444 doc/NessusClient_UserGuide.pdf $(DESTDIR)${datadir}/doc/NessusClient/NessusClient_UserGuide.pdf
++	$(INSTALL) -c -m 0444 doc/NessusClient_UserGuide.pdf $(NESSUS_DOCDIR)/NessusClient_UserGuide.pdf
+ 
+ win32: ${MAN_NESSUS_1}
+ 	$(MANROFF) ${MAN_NESSUS_1}  > doc/NessusClient.1.cat
+@@ -45,23 +44,15 @@
+ 	@echo ' --------------------------------------------------------------'
+ 	@echo
+ 
+-client-install : client
++client-install : nessus
+ 	test -d $(DESTDIR)${bindir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${bindir}
+ 	$(INSTALL) -m $(CLIENTMODE) ${make_bindir}/NessusClient $(DESTDIR)${bindir}
+ 
+-client : 
+-	cd nessus && $(MAKE)
+-
+-libnessus-client:
+-	cd libnessus && $(MAKE)
+-
+-
+ doc : $(MAN_NESSUS_1)
+ 
+ $(MAN_NESSUS_1) : $(MAN_NESSUS_1).in
+ 	@sed -e 's?@NESSUSD_CONFDIR@?${NESSUSD_CONFDIR}?g;s?@NESSUSD_DATADIR@?${NESSUSD_DATADIR}?g;s?@NESSUSD_PLUGINS@?${NESSUSD_PLUGINS}?g;' $(MAN_NESSUS_1).in  >$(MAN_NESSUS_1)
+ 
+-
+ clean:
+ 	cd nessus && $(MAKE) clean
+ 	cd libnessus && $(MAKE) clean
+--- a/ssl/Makefile	2006-09-12 23:41:31.000000000 +0200
++++ b/ssl/Makefile	2010-08-23 01:16:51.000000000 +0200
+@@ -6,7 +6,7 @@
+ all : nessusclient-mkrand
+ 
+ nessusclient-mkrand: $(OBJS)
+-	$(CC) $(OBJS) -o nessusclient-mkrand -lm
++	$(CC) $(LDFLAGS) $(OBJS) -o nessusclient-mkrand -lm
+ 
+ nessusclient-mkrand.o: nessusclient-mkrand.c
+ 	$(CC) $(CFLAGS) -c nessusclient-mkrand.c 
diff --git a/net-analyzer/nessus-client/metadata.xml b/net-analyzer/nessus-client/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/nessus-client/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/nessus-client/nessus-client-1.0.2-r1.ebuild b/net-analyzer/nessus-client/nessus-client-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..52a9411efebd
--- /dev/null
+++ b/net-analyzer/nessus-client/nessus-client-1.0.2-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+MY_PN=NessusClient
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A client for the Nessus vulnerability scanner"
+HOMEPAGE="http://www.nessus.org/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz
+	mirror://gentoo/nessus-client.png.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+IUSE="doc"
+
+RDEPEND="!net-analyzer/nessus-core
+	dev-libs/openssl
+	>=x11-libs/gtk+-2.8.8:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-text/htmldoc )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-make.patch
+	sed -i \
+		-e "/NESSUS_DOCDIR/s|/doc/NessusClient|/doc/${PF}|g" \
+		nessus.tmpl.in || die
+}
+
+src_configure() {
+	tc-export CC
+	econf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc CHANGES README_SSL VERSION
+
+	doicon "${WORKDIR}"/${PN}.png
+	make_desktop_entry NessusClient "Nessus Client" nessus-client "Network"
+}
+
+pkg_postinst() {
+	if ! use doc; then
+		elog "If you do not have documentation installed, nessus-client"
+		elog "will complain. To install documentation, please emerge with"
+		elog "the doc useflag set. Beware that it will emerge app-text/htmldoc,"
+		elog "a big package."
+	fi
+}
diff --git a/net-analyzer/nessus-client/nessus-client-1.0.2-r2.ebuild b/net-analyzer/nessus-client/nessus-client-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..c7485b9e7762
--- /dev/null
+++ b/net-analyzer/nessus-client/nessus-client-1.0.2-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+MY_PN=NessusClient
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A client for the Nessus vulnerability scanner"
+HOMEPAGE="http://www.nessus.org/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz
+	mirror://gentoo/nessus-client.png.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl doc"
+
+RDEPEND="!net-analyzer/nessus-core
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=x11-libs/gtk+-2.8.8:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-text/htmldoc )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-make.patch
+	sed -i \
+		-e "/NESSUS_DOCDIR/s|/doc/NessusClient|/doc/${PF}|g" \
+		nessus.tmpl.in || die
+}
+
+src_configure() {
+	tc-export CC
+	econf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc CHANGES README_SSL VERSION
+
+	doicon "${WORKDIR}"/${PN}.png
+	make_desktop_entry NessusClient "Nessus Client" nessus-client "Network"
+}
+
+pkg_postinst() {
+	if ! use doc; then
+		elog "If you do not have documentation installed, nessus-client"
+		elog "will complain. To install documentation, please emerge with"
+		elog "the doc useflag set. Beware that it will emerge app-text/htmldoc,"
+		elog "a big package."
+	fi
+}
diff --git a/net-analyzer/nessus-core/Manifest b/net-analyzer/nessus-core/Manifest
new file mode 100644
index 000000000000..f3d800a8f727
--- /dev/null
+++ b/net-analyzer/nessus-core/Manifest
@@ -0,0 +1,9 @@
+AUX 2.2.9-crash.patch 418 SHA256 52a43e9d16005d2150f96885e0d91dc6992dc086288e7cf665d77d0ee7758baf SHA512 4581f8a09c23e15adf6401ae9aa90df62a300928ee07467911c3c3dff05c6833cf8112ed12598c3f97f496e745c7d8c7de09db0af3a0a87e02a0b8a95a5026ef WHIRLPOOL 303bed58fb2cda50088cb0822cd98d90d92ad819129292f708af8751aaa4f2e8d4f0ed7148771cb9267e4c1512c6b11cdf114671247edcf7a26292ea7c9417eb
+AUX 2.2.9-gentoo.patch 1470 SHA256 be28f8be6f36e5e7214c9053827d76a45bda40256a54ae6c8ce627914556ffbf SHA512 0d90d349a7c5171cde30dd6d5e2f703c9a8a4c5b02480d785212a36d34fba32784e3655af9d1bb71d6883b6f7b557025c58c72aea701a291e193ffc8459898f7 WHIRLPOOL d8b8de70d76698e7423801780d32c3040f7bf9a7ac3ae19445bf8ce0c2ad008316d5a0eecf4ff2bb30dceaecf7ade6ea32c219700842dcf59dd29dc9759bdbea
+AUX nessus-core-2.2.9-open.patch 315 SHA256 4cbd5c0ce5ac27247cf4a9dead12b61c25ecaae7c5df117bac854e4ef886b381 SHA512 27e90f533f68a858aa813e706a7c0234e63a119db9c0f13026908192ce6b182b04e39c2522637e3ec089dd33854902ce96214186e5a9afb1600a98dfb3415994 WHIRLPOOL c579d0632500303f1afbabe477ca63c0a3a13b4ac96c0c5ffe7d39a0e5ae2cc25344516429a909f0c31c22e1ccd54ef366b0165269e9d83ed525c9e0afbd2429
+AUX nessusd-r7 528 SHA256 8b499a13fa6ec5c13fd986e118e49ce02c7e401e1c566d9a931010ae3d944587 SHA512 0c2d94e55b1ef3709cc2f52936e4477bdc5c491445dd93c2fc7341834b083eb76ada19bdc6b070c698134b72eb593819f38787420e5851951278f4db964204d7 WHIRLPOOL 694067b29115f637d16a773b9c3111466f4567b57d815a747c46c1b502dd3eeeec8342a7a11c12163a2c36b50fa5ae73dcca538a46386902313839b5ac2407dc
+DIST nessus-core-2.2.9.tar.gz 674390 SHA256 b725ace4ef619bc19b372eac9a60db7b083a3e155e11c65443618e52b56c847e SHA512 7ec7f35a2b407126d174b6015e7d9566535892d64c5ea4d05297fbf93493016a885ca15c9102abfd515422b49fcd23585e7d41537a4f1afc0b6278c28690fcb1 WHIRLPOOL e0a5411f616a760f47e1a80c6864c5eb18e007c544ae21c52cd812fc573a159f6c5a92ff01ca417b7c68ea0567586446331231bae78fc8eaa6713e86dbbfe0c1
+EBUILD nessus-core-2.2.9-r1.ebuild 1530 SHA256 9b8fee06b88c9db9ecc62c6eebc15cb4349c97e175a910e3a21f9381512a91b8 SHA512 abc06136517c68846c34947db0f03b5de6ba7b6689b5e8a2e56813e1db85f443e05b0898adbae2781250fa68c8915840c72f6abdd08e1f379675eb825bd3da16 WHIRLPOOL 929b037a87f33994f8a3b2d3c02b1cf962bb7cfd2421c8e80b2934df201cf04279a12e46ea95f1201bd2a64979afb4b2cb15371e3cf0d96ab14457ac8c14c65a
+MISC ChangeLog 2687 SHA256 d7e79c65c8fd398b6e3ecb8bcf4e02909c401b112999237f57fcf945d2b266c8 SHA512 e48269adeaf0bc0f4573ce3ae4f01b9c06f3ddc48b96af32b3200213fdabe2d5a942803c965bad1015056a635f38603e06823503ee10eeab8448a2623011a6cd WHIRLPOOL 4ba682753272b140d3ad95ec5e3b2c24a2937d87337056aac3035cb48cbe0c106096b880e1fb0d334d9b1ba6db405976685e875a40519dde402b623ee116690c
+MISC ChangeLog-2015 18344 SHA256 88ced1f26974b7167611dbb880fccdb869e181cb9ce71c67e0200606d8ddb475 SHA512 31d2d1192a87d8d0ea4b4e9f941af23c17a744e3ddcb6f61bd2169be594b134575b06bceca1d53092ebd0d90b258badcb5a90e5835f8d9d49f6b58f28d5bc565 WHIRLPOOL 51f0640ae91f7380a7e0dcac562d77464cee13c759caf5c810df2b4c0b12b97b692bd222323506d8525b02bc4b832f956de75c6c094c2395126c3c6208146f64
+MISC metadata.xml 361 SHA256 a8bd697427bbd0c5acd1478d5feac9bd88ead50a42cfbfeef24d0fe978ec4a2f SHA512 7e520fb18d066189ee3af40543687e3f378c7e2eb06f3dd869101aa4621893a962f82f0fa50973ba2db817b0266a2cb5caba5e294a9eb1e141e6c25cf9d6a72c WHIRLPOOL 1f0669ca626a471042cebab644325c7f4ecdf00e526879feff1d9af459ae41b9422f7157f4941bf1da5a93dceb9243b551bd6a621c2748d65dff40575862c759
diff --git a/net-analyzer/nessus-core/files/2.2.9-crash.patch b/net-analyzer/nessus-core/files/2.2.9-crash.patch
new file mode 100644
index 000000000000..d95c28404de2
--- /dev/null
+++ b/net-analyzer/nessus-core/files/2.2.9-crash.patch
@@ -0,0 +1,15 @@
+--- nessus-core/nessus/auth.c	2007-08-31 23:12:36.000000000 +0200
++++ nessus-core/nessus/auth.c	2007-08-31 23:12:52.000000000 +0200
+@@ -92,11 +92,11 @@
+   char * buffer = emalloc(s);
+   int len, n = 0;
+   signal(SIGPIPE, sighand_pipe);
+-  va_start(param, data);
+ 
+  
+   for(;;)
+   {
++   va_start(param, data);
+    r = vsnprintf(buffer, s - 1, data, param);
+    if(r >= 0 && r < s)break;
+    s = r > s ? r + 2 : s * 2;
diff --git a/net-analyzer/nessus-core/files/2.2.9-gentoo.patch b/net-analyzer/nessus-core/files/2.2.9-gentoo.patch
new file mode 100644
index 000000000000..c97f6979340d
--- /dev/null
+++ b/net-analyzer/nessus-core/files/2.2.9-gentoo.patch
@@ -0,0 +1,58 @@
+ Makefile              |   10 +++++-----
+ nessus-fetch/Makefile |    2 +-
+ ssl/Makefile          |    2 +-
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index b1485b3..382900a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -86,17 +86,17 @@ client-install : client
+ 	$(INSTALL) -m $(CLIENTMODE) ${make_bindir}/nessus $(DESTDIR)${bindir}
+ 
+ client : 
+-	cd nessus && $(MAKE)
++	$(MAKE) -C nessus
+ 
+-server : 
+-	cd nessusd && $(MAKE)
++server : client
++	$(MAKE) -C nessusd
+ 
+ sslstuff : 
+-	cd ssl && $(MAKE)
++	$(MAKE) -C ssl
+ 
+ 
+ fetchtool:
+-	cd nessus-fetch && $(MAKE)
++	$(MAKE) -C nessus-fetch
+ 
+ 
+ doc : $(MAN_NESSUS_1) $(MAN_NESSUSD_8)
+diff --git a/nessus-fetch/Makefile b/nessus-fetch/Makefile
+index 63439bc..89fd8c9 100644
+--- a/nessus-fetch/Makefile
++++ b/nessus-fetch/Makefile
+@@ -5,7 +5,7 @@ include ../nessus.tmpl
+ all: nessus-fetch
+ 
+ nessus-fetch: nessus-fetch.o
+-	$(CC) nessus-fetch.o -o nessus-fetch $(LIBS)
++	$(CC) $(LDFLAGS) nessus-fetch.o -o nessus-fetch $(LIBS)
+ 
+ nessus-fetch.o: nessus-fetch.c
+ 	$(CC) $(NESSUS_CFLAGS) ${include} $(DEFS) $(NESSUS_DEFS) -c nessus-fetch.c
+diff --git a/ssl/Makefile b/ssl/Makefile
+index 738a692..5e51426 100644
+--- a/ssl/Makefile
++++ b/ssl/Makefile
+@@ -6,7 +6,7 @@ OBJS = nessus-mkrand.o
+ all : nessus-mkrand
+ 
+ nessus-mkrand: $(OBJS)
+-	$(CC) $(OBJS) -o nessus-mkrand -lm
++	$(CC) $(LDFLAGS) $(OBJS) -o nessus-mkrand -lm
+ 
+ nessus-mkrand.o: nessus-mkrand.c
+ 	$(CC) $(CFLAGS) -c nessus-mkrand.c 
diff --git a/net-analyzer/nessus-core/files/nessus-core-2.2.9-open.patch b/net-analyzer/nessus-core/files/nessus-core-2.2.9-open.patch
new file mode 100644
index 000000000000..fe60ede62b29
--- /dev/null
+++ b/net-analyzer/nessus-core/files/nessus-core-2.2.9-open.patch
@@ -0,0 +1,11 @@
+--- nessus-core/nessusd/detached.c.orig
++++ nessus-core/nessusd/detached.c
+@@ -408,7 +408,7 @@
+  char * target;
+ {
+  char * fname = detached_fname(globals);
+- int f = open(fname, O_CREAT|O_WRONLY|O_TRUNC);
++ int f = open(fname, O_CREAT|O_WRONLY|O_TRUNC, 0600);
+  if(f >= 0)
+  {
+   write(f, target, strlen(target));
diff --git a/net-analyzer/nessus-core/files/nessusd-r7 b/net-analyzer/nessus-core/files/nessusd-r7
new file mode 100644
index 000000000000..e19296b01b9b
--- /dev/null
+++ b/net-analyzer/nessus-core/files/nessusd-r7
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting nessusd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/nessusd -- -D
+	eend $? 
+}
+
+stop() {
+	ebegin "Stop nessusd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/nessusd
+	einfo "Waiting for the environment to be sane"
+	while [ -n "$RUNNING" ] ; do
+		sleep 1
+		RUNNING=$(ps aux | grep -m 1 nessusd: | grep -v grep)
+	done
+	sleep 3
+	eend $?
+}
diff --git a/net-analyzer/nessus-core/metadata.xml b/net-analyzer/nessus-core/metadata.xml
new file mode 100644
index 000000000000..3907d4a0d0e6
--- /dev/null
+++ b/net-analyzer/nessus-core/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<longdescription>A remote security scanner for Linux (nessus-core)</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/nessus-core/nessus-core-2.2.9-r1.ebuild b/net-analyzer/nessus-core/nessus-core-2.2.9-r1.ebuild
new file mode 100644
index 000000000000..695ef1f31909
--- /dev/null
+++ b/net-analyzer/nessus-core/nessus-core-2.2.9-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit toolchain-funcs eutils autotools
+
+DESCRIPTION="A remote security scanner for Linux (nessus-core)"
+HOMEPAGE="http://www.nessus.org/"
+SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="debug gtk prelude tcpd"
+
+RDEPEND="
+	~net-analyzer/nessus-libraries-${PV}
+	~net-analyzer/libnasl-${PV}
+	tcpd? ( sys-apps/tcp-wrappers )
+	gtk? ( x11-libs/gtk+:2 )
+	prelude? ( dev-libs/libprelude )
+	!net-analyzer/nessus-client"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${PN}
+
+DOCS="README* UPGRADE_README CHANGES doc/*.txt doc/ntp/*"
+
+src_prepare() {
+	tc-export CC
+	epatch \
+		"${FILESDIR}"/${PV}-gentoo.patch \
+		"${FILESDIR}"/${PV}-crash.patch \
+		"${FILESDIR}"/${P}-open.patch
+
+	sed -i -e "/^LDFLAGS/s:$:${LDFLAGS}:g" nessus.tmpl.in || die
+	sed -i -e 's:CFLAGS="-g"; ::' configure.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable tcpd tcpwrappers) \
+		$(use_enable debug) \
+		$(use_enable gtk)
+}
+
+src_compile() {
+	emake -C nessus cflags
+	emake -C nessusd cflags
+	default
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}"/nessusd-r7 nessusd
+	keepdir /var/lib/nessus/logs
+	keepdir /var/lib/nessus/users
+	# newer version is provided by nessus-libraries
+	# should be fixed upstream in version 2.2.6
+	rm "${ED}"/usr/include/nessus/includes.h
+}
diff --git a/net-analyzer/nessus-libraries/Manifest b/net-analyzer/nessus-libraries/Manifest
new file mode 100644
index 000000000000..0b6bff8a1d91
--- /dev/null
+++ b/net-analyzer/nessus-libraries/Manifest
@@ -0,0 +1,6 @@
+AUX nessus-libraries-2.2.9-linking.patch 2009 SHA256 24428548259153da84932c782707b1183869ece1543ef3b35ef291f4a8f58b88 SHA512 2d6e3e32b37eb73d03fbad4f3bd6107ec228cf2cbe8811869fe7019ed430e7ec89d54b20b36606be0621427a4d80919ae64225b9a5df28194ff995fe8d5d8279 WHIRLPOOL 0ee465473114f7783c16e1c0f5e717e4ade475af9255acdc20a039f3cc5b44f6f944913d47327086dbe426319fa2684aaa812b069bb7d1e4f894ed12d7c19cb6
+DIST nessus-libraries-2.2.9.tar.gz 426560 SHA256 5a3c32d6eab8ccc8a22ab5bb224228152e10731c06561f679c41b92263c7ef18 SHA512 4a87ad07cde5ca82d673efbe2b2d951231880533bc30be4b265ea1f81fba39ae90ef150293486e8bba227a1c174e89cde6e8f95b60f2250f7c2c9ae910d52cff WHIRLPOOL d8bd157f7562b8129e9ef1d7a28eb939a98817134960e6601b2e789b3f8804eb610720173dcddd0831fee67b8fa1e57a6d6cdecb1c027a8e0ee0b11d91d7163d
+EBUILD nessus-libraries-2.2.9-r1.ebuild 1202 SHA256 015955fad01d0b68b0f4c1e797389ab510b281c71668a716067c742f81f6c1ea SHA512 9f79ce3aa10c2d4d3750ec266bdb2f0bcf440ab0e765a8383aa3ddb4eecb78a797c2e7e8e85827ddcce0a0b34cbb7f239873007545e25609bf2c3d3710428ce6 WHIRLPOOL 5350e1b5cef12048908e65a2315c8a2efa93c1ddbdaff00d1ab5ad2c50bed58af8005616d33d1ecb5cd7fc56c0c16e948c018e81aec9736213fd732a3d92fe7c
+MISC ChangeLog 2661 SHA256 49c2db838b6a8a5f1e0e5699463e26f55c325b7232ca5dfff86a23c6cd5e2489 SHA512 79261ae4f84b9583d65e485b3d89cb049f59e1ce04a740fe7bad16413e15de8225bcf9e321a64a231d7be96ab0b670bb1772b2e5d7956a2d86ba6384a0ce73ae WHIRLPOOL 4a6eb55db0829fea6aa6a846fcac5481038d9743deb0e864b137efc72f8a0c00359f90e616d9274dec8592f16f3b2fa60b9c4c4ecadef873422e70a25bd996e7
+MISC ChangeLog-2015 13966 SHA256 977339a73eb3f0b65304282de2deab57123a7a4f7e3c6003e9d2bb4f84848f78 SHA512 254776d0d1933186c12a9becda440ec5a69f9bb611cb340278c310ee16eb8f20e0e02a0b3a63c7f64469e9098422438b86f4cda321b42bf9ba23517f27feed9b WHIRLPOOL 7fea3e2ee220b42a30dc63d87c60bcfd4ae3e3f46c626122de59523b500fa5b7cbcbf3c6d57ff4e8bd9205153719844b05effe1a9f120e7c7448917257d66aed
+MISC metadata.xml 366 SHA256 03cafc593377f654165c09ce631a810e871ce47064b8f79ff5f6045ff38120ee SHA512 488a5015a0350d14c89f1b3f1f16babdfcb965b27cc56a24335a35649116d1220405c9ef210fbacf96c8c855aa49cb2fd33387ed4df10e2f39ca269176887509 WHIRLPOOL 759eba5ede93331ebca082fc3a539d56b9d45ed057bfbc23febc31d5c17a5fa9d97f5e91b357f960af0a6a9a726b3b24633be9b058e302c021c29a027ec91fc2
diff --git a/net-analyzer/nessus-libraries/files/nessus-libraries-2.2.9-linking.patch b/net-analyzer/nessus-libraries/files/nessus-libraries-2.2.9-linking.patch
new file mode 100644
index 000000000000..41cd2b21c938
--- /dev/null
+++ b/net-analyzer/nessus-libraries/files/nessus-libraries-2.2.9-linking.patch
@@ -0,0 +1,61 @@
+ Makefile                   |    4 ++--
+ libhosts_gatherer/Makefile |    2 +-
+ libnessus/Makefile         |    4 ++--
+ libnessus/kb.c             |    1 +
+ 4 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 938d1b2..672d8cf 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,8 +3,8 @@ include nessus.tmpl
+ ALLDEPS = nessus.tmpl nessus-config
+ 
+ all: $(ALLDEPS) $(PCAP_MAKE)
+-	cd libnessus && ${MAKE}
+-	cd libhosts_gatherer && ${MAKE}
++	${MAKE} -C libnessus
++	${MAKE} -C libhosts_gatherer
+ 
+ nessus-config: nessus-config.pre Makefile nessus.tmpl
+ 	@echo Creating $@ ...
+diff --git a/libhosts_gatherer/Makefile b/libhosts_gatherer/Makefile
+index e2a647c..7d628d8 100644
+--- a/libhosts_gatherer/Makefile
++++ b/libhosts_gatherer/Makefile
+@@ -22,7 +22,7 @@ install : libhosts_gatherer.la
+ 	$(LIBTOOL) --finish $(DESTDIR)${libdir}
+ 	
+ libhosts_gatherer.la : $(OBJS)
+-	$(LIBTOOL) $(CC) -o libhosts_gatherer.la $(LO_OBJS) -rpath ${libdir} \
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o libhosts_gatherer.la $(LO_OBJS) -rpath ${libdir} \
+ 	-version-info ${PACKAGE_VERSION}
+ 	        
+ hg_utils.o : hg_utils.h hosts_gatherer.h hg_utils.c
+diff --git a/libnessus/Makefile b/libnessus/Makefile
+index c5a96db..211f57a 100644
+--- a/libnessus/Makefile
++++ b/libnessus/Makefile
+@@ -100,8 +100,8 @@ kb.o: kb.c
+ snprintf.o : snprintf.c
+ 	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c snprintf.c	
+ libnessus.la: $(OBJS)
+-	$(LIBTOOL) $(CC) -o libnessus.la $(LO_OBJS) -rpath ${libdir} \
+-	-version-info ${PACKAGE_VERSION}
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o libnessus.la $(LO_OBJS) -rpath ${libdir} \
++	-version-info ${PACKAGE_VERSION} `pcap-config --libs` `pkg-config --libs openssl`
+ 
+ install : libnessus.la
+ 	test -d $(DESTDIR)${libdir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${libdir}
+diff --git a/libnessus/kb.c b/libnessus/kb.c
+index 921c1a1..cbfd840 100644
+--- a/libnessus/kb.c
++++ b/libnessus/kb.c
+@@ -20,6 +20,7 @@
+  */ 
+ 
+ #include <includes.h>
++#include <fnmatch.h>
+ #define HASH_MAX 65537 
+ 
+ 
diff --git a/net-analyzer/nessus-libraries/metadata.xml b/net-analyzer/nessus-libraries/metadata.xml
new file mode 100644
index 000000000000..41f809fbde83
--- /dev/null
+++ b/net-analyzer/nessus-libraries/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<longdescription>A remote security scanner for Linux (nessus-libraries)</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/nessus-libraries/nessus-libraries-2.2.9-r1.ebuild b/net-analyzer/nessus-libraries/nessus-libraries-2.2.9-r1.ebuild
new file mode 100644
index 000000000000..5b4734740551
--- /dev/null
+++ b/net-analyzer/nessus-libraries/nessus-libraries-2.2.9-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A remote security scanner for Linux (nessus-libraries)"
+HOMEPAGE="http://www.nessus.org/"
+SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="crypt debug libressl static-libs"
+
+# Hard dep on SSL since libnasl won't compile when this package is emerged -ssl.
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-linking.patch
+
+	sed -i -e "s:^\(LDFLAGS=\):\1 ${LDFLAGS}:g" nessus.tmpl.in || die
+	sed -i -e '/sbindir/d' Makefile || die
+}
+
+src_configure() {
+	tc-export CC
+	econf \
+		$(use_enable crypt cypher) \
+		$(use_enable debug) \
+		$(use_enable debug debug-ssl) \
+		$(use_enable static-libs static) \
+		--enable-shared \
+		--with-ssl="${EPREFIX}/usr/$(get_libdir)" \
+		--disable-nessuspcap
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/net-analyzer/nessus-plugins/Manifest b/net-analyzer/nessus-plugins/Manifest
new file mode 100644
index 000000000000..812fa10bfd1c
--- /dev/null
+++ b/net-analyzer/nessus-plugins/Manifest
@@ -0,0 +1,6 @@
+AUX 2.2.9-gentoo.patch 2518 SHA256 d074164ba0382b3bd93e8c5814a41e802944cea9f5f94466e8946d43c215fc2b SHA512 a2d3e17691085a83946bc0ab92eb606bb90d8b325fead9704c935598a2487c5bc73022802aaa98f6056647a3cec8a3d111bcffc7db270cc82590911f27e48894 WHIRLPOOL 67f364a8418a82dbc21589c6e30bae2766cf22e14454ffb31000a062a8e5c7e5f5072771fa571d84c7b3389da46edfbd420b0978a0278e5bd451ea8791b509ae
+DIST nessus-plugins-GPL-2.2.9.tar.gz 1064740 SHA256 126b98173647113946a69ea5e3896cfd92261571d507b37febbdb269c632d395 SHA512 b76a77be29409bca00fb014ae8e35878283e5d8adccef570da08b65df760f46438ef0392c4435366831b4bc456715f7af9c0ad5e20dd5554f1e4b8c9e8791b04 WHIRLPOOL 1da74217ca8fa9e8cedb56656c1b72d0a5993cafc2114d06de19938571fbd7e9654dd62135847936ae8305152b0f4fc02fc9385b19c59f014695075258e46314
+EBUILD nessus-plugins-2.2.9-r1.ebuild 776 SHA256 b0fad9a4d6c0e4dc2c3a87f57601998dd52ea5bbd9f4a12851fa56c540c6d237 SHA512 64704f03dd5d8abb2b8adcc0ac5c58b0ea00239e3868d7a41fe1f0e09a2d155392d304ef9a15517b5f3da72ec798d68053a6e956eb2042783d5edc7016ded683 WHIRLPOOL a1311873b9ffa89562b70bffe074dbd2ffebc02c9a3c4f4057715c4c34fa2f1487ee8aefa335c213c6427e285ec2875086c7c306bd3ae199ac34f93ebf53e1d4
+MISC ChangeLog 2633 SHA256 ed5821e32c76d804d96933178e5c69e7a0ac3a9359e202808a0aaef1225e94d5 SHA512 6a1665e6c00c309b393e4249eb80780e824277a52236bbd095b6283d94548803925f98e749bcfc3b9770f41f0afd2b396a6fde712e12450c1d0fface4bf5ba4a WHIRLPOOL 860c9d7f9c87912402594f5681569501b907b527c6b484b038aec770100b948053abb13d013338a8ebd58cc5960175325c3ecde33884a77dbbd78103ba38e8d4
+MISC ChangeLog-2015 11251 SHA256 d6e3d01e1757299bcbd067c89ae8dd5ab9b382096bcc40442f4782dacf33c59b SHA512 b4f89322aca676c63e73e97ccdf06c136f50e2f8663c6234eaa9f2974c852db2bf051ef7d70077e03db21d8c3466b3161ba935e520f887e5e190c74067394806 WHIRLPOOL 6ee26f418c396bf01dbe3402b18899310495c2c5a88aa7f0941cfac16a00573b69e6c90c1ee0618a4d4da0c2e027d79201c77594ce8f0e553629aadfbbd3358a
+MISC metadata.xml 364 SHA256 ac4ccd3a561fa46c5f292c2777e8fb793bfe95a8e0a72e7b94d5a5e502eb35f6 SHA512 8a5cf6ab17a5c3a117fad6efa89c0b0d193ed91a0e6d4fb08c14641f275a2fade7088cc35ef2ccb55df3dd02456b1ebbc9ca4d7e5ada78526036986b7d0c4dc2 WHIRLPOOL 937d6c68fdad3b9fb1415e03c3641cedd1d79012ab4c423f2666d8004b95253754faa5aedc1c85ea489134cdeb31364956d4296b62ad0222d62e2a0f5e4e2476
diff --git a/net-analyzer/nessus-plugins/files/2.2.9-gentoo.patch b/net-analyzer/nessus-plugins/files/2.2.9-gentoo.patch
new file mode 100644
index 000000000000..39366844382f
--- /dev/null
+++ b/net-analyzer/nessus-plugins/files/2.2.9-gentoo.patch
@@ -0,0 +1,58 @@
+ plugins/find_service/Makefile       |    2 +-
+ plugins/nessus_tcp_scanner/Makefile |    2 +-
+ plugins/ssl_ciphers/Makefile        |    2 +-
+ plugins/synscan/Makefile            |    2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/plugins/find_service/Makefile b/plugins/find_service/Makefile
+index f4fd8e3..12e62a3 100644
+--- a/plugins/find_service/Makefile
++++ b/plugins/find_service/Makefile
+@@ -5,7 +5,7 @@ PLUGNAME=find_service
+ all : $(PLUGNAME).nes
+ $(PLUGNAME).nes : $(PLUGNAME).c
+ 	$(LIBTOOL) $(CC) $(DEFS) $(include) -c  $(PLUGNAME).c
+-	$(LIBTOOL) $(CC) $(DEFS) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) \
++	$(LIBTOOL) $(CC) $(LDFLAGS) $(DEFS) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) \
+ 	-rpath $(rootdir)/bin/plugins
+ 	../install_plug $(PLUGNAME) $(rootdir)
+ clean :
+diff --git a/plugins/nessus_tcp_scanner/Makefile b/plugins/nessus_tcp_scanner/Makefile
+index 8cf6c6d..7a27495 100644
+--- a/plugins/nessus_tcp_scanner/Makefile
++++ b/plugins/nessus_tcp_scanner/Makefile
+@@ -8,7 +8,7 @@ PLUGNAME=nessus_tcp_scanner
+ all : $(PLUGNAME).nes
+ $(PLUGNAME).nes : $(PLUGNAME).c 
+ 	$(LIBTOOL) $(CC) $(DEFS) $(include) -c  $(PLUGNAME).c
+-	$(LIBTOOL) $(CC) $(DEFS) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) -lm $(LIBUTIL) \
++	$(LIBTOOL) $(CC) $(LDFLAGS) $(DEFS) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) -lm $(LIBUTIL) \
+ 	-rpath $(rootdir)/bin/plugins
+ 	../install_plug $(PLUGNAME) $(rootdir)
+ clean :
+diff --git a/plugins/ssl_ciphers/Makefile b/plugins/ssl_ciphers/Makefile
+index dc10e64..1747745 100644
+--- a/plugins/ssl_ciphers/Makefile
++++ b/plugins/ssl_ciphers/Makefile
+@@ -5,7 +5,7 @@ PLUGNAME=ssl_ciphers
+ all : $(PLUGNAME).nes
+ $(PLUGNAME).nes : $(PLUGNAME).c
+ 	$(LIBTOOL) $(CC) $(DEFS) $(include) -c  $(PLUGNAME).c
+-	$(LIBTOOL) $(CC) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) \
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) \
+ 	-rpath $(rootdir)/bin/plugins
+ 	../install_plug $(PLUGNAME) $(rootdir)
+ clean :
+diff --git a/plugins/synscan/Makefile b/plugins/synscan/Makefile
+index 16aefa1..c434b92 100644
+--- a/plugins/synscan/Makefile
++++ b/plugins/synscan/Makefile
+@@ -5,7 +5,7 @@ PLUGNAME=synscan
+ all : $(PLUGNAME).nes
+ $(PLUGNAME).nes : $(PLUGNAME).c
+ 	$(LIBTOOL) $(CC) $(DEFS) $(include) -c  $(PLUGNAME).c
+-	$(LIBTOOL) $(CC) $(DEFS) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) \
++	$(LIBTOOL) $(CC) $(DEFS) $(LDFLAGS) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) \
+ 	-rpath $(rootdir)/bin/plugins
+ 	../install_plug $(PLUGNAME) $(rootdir)
+ clean :
diff --git a/net-analyzer/nessus-plugins/metadata.xml b/net-analyzer/nessus-plugins/metadata.xml
new file mode 100644
index 000000000000..3c5a6082eb8f
--- /dev/null
+++ b/net-analyzer/nessus-plugins/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<longdescription>A remote security scanner for Linux (nessus-plugins)</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/nessus-plugins/nessus-plugins-2.2.9-r1.ebuild b/net-analyzer/nessus-plugins/nessus-plugins-2.2.9-r1.ebuild
new file mode 100644
index 000000000000..1bf4d4933b7a
--- /dev/null
+++ b/net-analyzer/nessus-plugins/nessus-plugins-2.2.9-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A remote security scanner for Linux (nessus-plugins)"
+HOMEPAGE="http://www.nessus.org/"
+SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/nessus-plugins-GPL-${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="libressl"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	~net-analyzer/nessus-core-${PV}
+	~net-analyzer/nessus-libraries-${PV}
+	net-libs/libpcap"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${PN}
+
+src_prepare() {
+	tc-export CC
+	epatch "${FILESDIR}"/${PV}-gentoo.patch
+}
+
+src_install() {
+	default
+	dodoc docs/*.txt
+}
diff --git a/net-analyzer/nessus/Manifest b/net-analyzer/nessus/Manifest
new file mode 100644
index 000000000000..01810fc9ea2b
--- /dev/null
+++ b/net-analyzer/nessus/Manifest
@@ -0,0 +1,4 @@
+EBUILD nessus-2.2.9.ebuild 825 SHA256 546fdc2c2cb98b6fa4ea0446cd142beffe72b9163d463c4486a0ad26d55a05df SHA512 32b685ecc1fe287a5d73da556844b161a98e40d11459b2a9a184421ddf27aa1b257cc6ff52ec70bfa90a21c7d30e72c2b38d8fcc083bc8edf8877056d1e64a1e WHIRLPOOL 9e6da26faab2c391830d3ed049b62e5f6e4f8404fa59fd436137bb920bbd0564bd8f1b2b9829e0c6986ce59ce1f3a725350189b63d32f36bcbe9150d134a2ecb
+MISC ChangeLog 2428 SHA256 727c70f29ad8effbb55e57658c8c7c171e2645d942e967819e24fe5fcc6c09cc SHA512 ad5512d2f5da3047f547b466afc674fc906fed6988c18b0bf159d327b90491a98fc5a22afcb79103e31f0db70ed6c48776f5b51de6308f82b5f5212a0fc1c46e WHIRLPOOL 3163c87007937c13aee1b6e8c7423529056f144b31f5026b7ab4765359520ac65cb536149ff465ca0739574bdc4b7d0ca0cddbd18384f7e770cf6eef6666a6a2
+MISC ChangeLog-2015 12204 SHA256 1ff045e6117d76438457c5b14ddc303c1ccdad3dd8a774da64254bc686d25271 SHA512 209c920f377957dfbdc5a583fb6e7b28442e707219d9f1869dd3175ba5badb14f826cccc60166091012c1b91d2ea69f48954fd0005e1ab0f28bcb77f7bc881a8 WHIRLPOOL 660f866fe0ef94b881f776d95eac1e442af739298f1258917326822886c222b03701c09033cd2b4c1c34c427de70f6b973afc3cb45bb22e420913cbbed60594c
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/nessus/metadata.xml b/net-analyzer/nessus/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/nessus/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/nessus/nessus-2.2.9.ebuild b/net-analyzer/nessus/nessus-2.2.9.ebuild
new file mode 100644
index 000000000000..34bdcb037491
--- /dev/null
+++ b/net-analyzer/nessus/nessus-2.2.9.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="A remote security scanner"
+HOMEPAGE="http://www.nessus.org/"
+SRC_URI=""
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	~net-analyzer/nessus-libraries-${PV}
+	~net-analyzer/libnasl-${PV}
+	~net-analyzer/nessus-core-${PV}
+	~net-analyzer/nessus-plugins-${PV}"
+
+pkg_postinst() {
+	elog "The following article may be useful to get started:"
+	elog "http://www.securityfocus.com/infocus/1741"
+}
+
+pkg_postrm() {
+	elog "Note: this is a META ebuild for ${P}."
+	elog "to remove it completely or before re-emerging"
+	elog "either use 'depclean', or remove/re-emerge these packages:"
+	elog
+	for dep in ${RDEPEND}; do
+		elog "     ${dep}"
+	done
+	echo
+}
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
new file mode 100644
index 000000000000..947baf442fde
--- /dev/null
+++ b/net-analyzer/net-snmp/Manifest
@@ -0,0 +1,20 @@
+AUX net-snmp-5.1.2-snmpconf-selinux.patch 189 SHA256 17b193f804f4cd3d6787a32887b73ff0a069b444a0c898e0322ec9d987f202b7 SHA512 5859742fa90c297af17b1b1a4718af8d03edbb3a78f723c2cbde54576c68a5f562ed573cc0f8cfdd0bdee9d5accb769e6183dbd16d5e5aa66f0d43f174658f75 WHIRLPOOL 43ce9ff2b865b03c44ea6d558df8b438befcaac76d55aba0827f2bf33495fd415d029c6992a74b3e956d4982fe9d3c99420b07fdd3e1143f80c749089d98b2a5
+AUX net-snmp-5.7.3-mariadb-10.2.patch 1292 SHA256 b139563030460238e1db458a978e802e71409e0c057ffdcb667db197d9386f87 SHA512 43b8d39837af147edf66b322d8e75bc82acc243f9eb6bb7ab11ed2975442ee975292d61d953d862679027d5110198ee30347de6209feb2abf3a6ede8547c0de1 WHIRLPOOL e59b36d7a863db939ff5566b88702b7a789103d4ad5b438881a901b58e58de64ee4b8d3883fe5b4cddcc69f33063352f4a24b3e9b95d861e20fec4a73cf49306
+AUX net-snmp-5.7.3-perl524-2.patch 1776 SHA256 48f81ae2632f9c0b4f378292326053242bdd0932d67f3cf22320ccccf0148cd3 SHA512 ddd2ac301995114ea70890d89a320528e9009d9f49203ab9fa247b507e16dfa91cb517dd408290c530c1e0ca07f6ee431015958a625d68dd082d4c1e55d279ae WHIRLPOOL 8044a5164afb9b8951be9e225f160351b7f0ab55731538cec5f388604b2d105da77e201e2910e7ad88b4249af4faafca999c938c470457116faa979377141f35
+AUX snmpd.conf 552 SHA256 23f9f17f237109e976e69a049466b88336abf6da567bc4138860b33a8fda0a8e SHA512 e64f93631e5cb2160d3fb26abb84fc74f5632d8875227d5c8dfa24809b25e8202dcf23251ea8f296aedf16298c31ce49b8e64fb6325c18775d8899a50b853bbc WHIRLPOOL 6917d31d860cb72b589c3ccc708e1c7c5fb0df6756e435200795027f8236ef2e65d11cdd627a20c2158864a7219be0c4ab2c156cc013bd322c151af44a7d11ca
+AUX snmpd.init.2 680 SHA256 3b1cde369ad95779f8fad96e15c3c90a25e4ac4b13286f4fa9b3faaf586ac9f3 SHA512 10394f04dee23537a195f5aed63a3e758ca90227e269076ae9d13f883c7bd666c1c43823d1b869c43f232e97dc4138e52648cae995327f7a7f676ba416ee6fff WHIRLPOOL ce75e6f48db68c9da937f0cb01c23bb0848d0fbca26c02e3f8add0a4657b1244b8bbead8ec94c02a7349f8ccd13d4f7a070f92464556d3f0afb8dcb37d412e99
+AUX snmpd.service 181 SHA256 32e63a1959f80ee237c72cb342a3c70705132dea5d2fc1f4cf42d23aaa32b2ee SHA512 e8fe55538bf8c14ddb84c464bceddc33fdd0a03d303413783fb23d49c5d2417ead17fbcbbe460bf89738a5cff543f3ea0c7a4fd28e6f598dc9458da1d30d74ac WHIRLPOOL 1a812788a096865451a7eb4cb1af916b5fec38161ba653925a4ecccf6169b9f7eac17b467323811029da4ac3fbde69686998feca019e1d858998e3fdfb456c31
+AUX snmptrapd.conf 517 SHA256 8f87c917c6c6ad2c0d55eeac14185508ddbc8bc8fd63a624e95c2b74d18b157f SHA512 283d1503ebca55046cc273f693a257be3e8e6f26b5db10a3b64a5455079a41568eb40c1a3f5dbc698b822502d5e8120ea80b9e2c3ac4aa1d830d318228c0beca WHIRLPOOL c783e8b8feeb5f13cff5021a94b8c345d02e7eaf163d50a88438bd1706d15d497c6d8786c6e71a45365800cafc36de0370f14b7c8467167eb53de9386b78277d
+AUX snmptrapd.init.2 338 SHA256 e1c9e27c200577241c1bedbb6c589d175742fe3aa207a0e5a16e637fe434291f SHA512 316964703559082b1626280bd0532a32533185741d1919f255473ae6bfe30f82b71bee79093cb0b341c99427e14a5ed201b6aa2886a9123c89d5f5f78496f706 WHIRLPOOL 4d87f66a7e5b7440e6249191e735bd8c56da0a4e5166fa6c520826812957181a36d732aa1b85cc609191909e9459a6f57193baab8f5a0aad62b5f5b793e2d368
+AUX snmptrapd.service 190 SHA256 e091dab52eab606a4ae1de408b4633ac1e60a79d786f90a5365916ebe92ba520 SHA512 763682e3926fd1e7f28a013be2ad56cc53eed26a0415770906968e07a183128c9d5fb70d76513244ba0cc95fc2526b68c32207b5fda83b8f53c256549cfa1b1d WHIRLPOOL 175efbeb3ca00d33f76ca9ff8923187fb807c8be0a16b87bf9e5e4be96d5ca9cfd2c186c0f549bcc6cd53e7ab2caadac692331e5fac88550a1df9ee2e7b35ce3
+DIST net-snmp-5.7.3-patches-2.tar.xz 3312 SHA256 a72732f9e40988ef1d79b6750c7ef7f56accbf5a32543dd15c000e58b1e9054c SHA512 22ca6cc4dd1fd58a8cff53881d248155dbfdab765e9a3664320c8c4a5cfa35e741adfb0304bb38be7719ba1c7418f9b0f9178719951b82d70257c3c944c450ad WHIRLPOOL 509da418db4c380f431af1d2d342bea4bd18caad99f2fb8120466ffcbbe8d2e09702a28b43b59d2a633ae3566d599a82a221eae4e9ac601a545445c614d3459f
+DIST net-snmp-5.7.3-patches-3.tar.xz 3176 SHA256 0c3c307b4dc2d068d34f9743f8b8897a9dc53c19056dad809658aaedffff682d SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636 WHIRLPOOL e72cabfeada32a17e4962417466f5e19548a1ef3ab213ecb6d7865ad4f8d26f7b9a33b0c6db9996c70c947300037a0bbcae73d2793044f352bebb7849659aa49
+DIST net-snmp-5.7.3-perl524-2.patch.gz 523 SHA256 237e34a5de032c2173de836ef694583d144717b3441903a7c52f409c0038ca08 SHA512 bede47234b809d67f33c46654f3d09d0b255d835fb97eea23bfa888922dfb80ad287c305596a6b041ed03ec91dc7c647ecd54c3c79e0b4ce08978332de3cc007 WHIRLPOOL c81e8dd2234b090c48e1adfa075d5817263364ade0e39e59c2ecf99e1a3862e6eac70cbfc7eef592de12ecc02d66baf9ae651e2f085936dde4d38f975aef0aed
+DIST net-snmp-5.7.3-perl524.patch.gz 9072 SHA256 e8dfa8546aafc4afa03f8e26d330b92f22ded0674c68a4083bd3c8fb9ad5a418 SHA512 2d3184ac7c96f75af5bf8c8d23f33d5636c701e052a638e5403a8d5aa34985abc38f6a366ba09a1d8499a05fd71d939a7ed4d530661e56a726386603b6f6e6a4 WHIRLPOOL de180f600feeb94ae1cfd6b2e74f96c59618bc0696938e96d93163cd3b0a33c5426bbc2e6523b75cdaadf10018c07806cc8bd79f9c94593633915b33a2d6278a
+DIST net-snmp-5.7.3.tar.gz 6382428 SHA256 12ef89613c7707dc96d13335f153c1921efc9d61d3708ef09f3fc4a7014fb4f0 SHA512 0758bba5844cfd6c80959ac16b83906a2f830ba49fd0ab1bf9e191dc6a79d312a2e4760bd53b3e1a1c82759481f0064d088d5a3cf475d84b25679a6bd0f049bb WHIRLPOOL ee741c1278206dd8dae00e085629e7c13ce518ad1911af804872ccaba576ab4d234f7801dbb447ae1ddba8196d43d1dbcd46c4bd8f69aa9dc9eb1662ce5e718a
+EBUILD net-snmp-5.7.3-r5.ebuild 5070 SHA256 37167e51d101a94dd579475f79b57809109fa41f24f089396d35a4888b6540bb SHA512 390932ca08a0dde4667ea35f045acd678e88ff5eb8f7e3b57806f8b1137e83b374cc98f8287a6508cd3085c2864328df7e7112cd213e4a0bd510578c685f3a0c WHIRLPOOL aad23db40f9a785c3281d014482a6599a4bacf0bfd9db0c14b541235e3d5d5db90d0eaede5c19435930bc8a909a86898611cf915de170c94ee2e0dadc20785d5
+EBUILD net-snmp-5.7.3-r6.ebuild 5101 SHA256 fa322638dd7e7bab067bda28eb018de993aeeb9b86ca877ec1e2cc2f0b813042 SHA512 3e4137e53b52d7b278c67b2be15551c0eca92c622a3b6fbe296e9f4e3ab416f7eea6773337363f29e16e79baad029d0e3fbfb0e854e8e0c2374005be62afd7a9 WHIRLPOOL 525c3941c8a0c59542602ca3d7077b59f3c67d91ffda79eed92c0bb5ec60c3bb9a97d4c77d7c4e08e8771a00392fa8a8477657e769c50b68c16d3655eaa0e85d
+EBUILD net-snmp-5.7.3_p3.ebuild 5166 SHA256 3245dbb2403f282ba9ad50b2cecbf988e37a9d154f525b43f1248a9d0c3be23f SHA512 18c812d293d5c97bf2ac5b111d2e09762328e5e5f96775b1ffe4f379a08bcaecff8f581c06afa84d97dc25694de608bc497e5ac11cd16990373ae7d7fcf3dc94 WHIRLPOOL 01476cc266f21e009013e90eb8861c04f753d7a55ceaf95b059a01743e45352df036b287a5cc58a9b85d1f86992fdb7456a3bbfc6591e3bd61ef2a7e84109158
+MISC ChangeLog 7902 SHA256 09d31df65ddba4c145bec2ca439ded4b0fad6f0a4258d8277351bfe07b7aa4d9 SHA512 d12c07ca79bb19ad396c21d1d329804acd6bbc16726dca073c0aefc62cb615353a87918bba2c9e8a52a365ac415ebf6ce00d9446a22e538e999a4f92475a303d WHIRLPOOL 0f8fc7bf13098a21681d5a3a3ae0a7fb24b9b780c520330ea2afe9e2660efa3638605121d15fede1aa5b3c391616646231e8a1e54d43b065fb9d97893eac2bf3
+MISC ChangeLog-2015 49477 SHA256 895adeadd55a8e05ceadd788996dd423c421f04a04a0653081deaea38b503b07 SHA512 588e785d5caee8f9af54ac5fdcfd2a6fd855ba4a839401f26d86250fc4011c82ea4a047dd74544f07835c7ee53f1ec7eac60c84b14c48ebfc6cf07e67a78063a WHIRLPOOL 2beaa49216657c9f406a74082b246095a945cd613379270b4461d7ab0e69038b97a7e28f170157d6c0b9f8c462efe2c8d9d2910cf5e4ba4f2dcb2b6e047bc007
+MISC metadata.xml 1142 SHA256 4669722563369cbc5c8be7e8a55de26a3e2b3c94f371c47a862eb224638b826c SHA512 76efbc8444b344164960e671df273afaadbb4b64e73b136f559d4f039ee4b145f8ae989d271a8cc025edc917e4213828e0c77f6e5b0258b4c0eb9653c98c58c0 WHIRLPOOL f279bddf798bec119fb7c8224c8814be8727da49c3d2077c04254ee31abf2e0e445e6d2a4ea5b64f562da6b661d3d030e7d287af26fb1c103893f1ca45dbaee9
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.1.2-snmpconf-selinux.patch b/net-analyzer/net-snmp/files/net-snmp-5.1.2-snmpconf-selinux.patch
new file mode 100644
index 000000000000..d2e372161e92
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.1.2-snmpconf-selinux.patch
@@ -0,0 +1,12 @@
+https://bugzilla.redhat.com/show_bug.cgi?id=248329
+
+--- a/local/snmpconf.in
++++ b/local/snmpconf.in
+@@ -680,6 +680,7 @@
+ 	    }
+ 	}
+ 	close(O);
++	system("restorecon $outputf");
+     }
+ }
+ 
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.7.3-mariadb-10.2.patch b/net-analyzer/net-snmp/files/net-snmp-5.7.3-mariadb-10.2.patch
new file mode 100644
index 000000000000..dea1a0178531
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.7.3-mariadb-10.2.patch
@@ -0,0 +1,56 @@
+--- a/apps/snmptrapd_sql.c
++++ b/apps/snmptrapd_sql.c
+@@ -54,6 +54,7 @@
+ #include <my_sys.h>
+ #include <mysql.h>
+ #include <errmsg.h>
++#include <mysql_version.h>
+ 
+ netsnmp_feature_require(container_fifo)
+ 
+@@ -437,6 +438,7 @@ netsnmp_mysql_init(void)
+         return -1;
+     }
+ 
++#if MYSQL_VERSION_ID < 100000
+ #ifdef HAVE_BROKEN_LIBMYSQLCLIENT
+     my_init();
+ #else
+@@ -445,6 +447,7 @@ netsnmp_mysql_init(void)
+ 
+     /** load .my.cnf values */
+     load_defaults ("my", _sql.groups, &not_argc, &not_argv);
++#endif
+     for(i=0; i < not_argc; ++i) {
+         if (NULL == not_argv[i])
+             continue;
+@@ -542,6 +545,10 @@ netsnmp_mysql_init(void)
+         return -1;
+     }
+ 
++#if MYSQL_VERSION_ID > 100000
++    mysql_options(_sql.conn, MYSQL_READ_DEFAULT_GROUP, "snmptrapd");
++#endif
++
+     /** try to connect; we'll try again later if we fail */
+     (void) netsnmp_mysql_connect();
+ 
+--- a/apps/snmptrapd_sql.c
++++ b/apps/snmptrapd_sql.c
+@@ -50,11 +50,16 @@
+ #undef PACKAGE_STRING
+ #undef PACKAGE_TARNAME
+ #undef PACKAGE_VERSION
++#ifdef HAVE_BROKEN_LIBMYSQLCLIENT
++#include <mysql.h>
++#include <errmsg.h>
++#else
+ #include <my_global.h>
+ #include <my_sys.h>
+ #include <mysql.h>
+ #include <errmsg.h>
+ #include <mysql_version.h>
++#endif
+ 
+ netsnmp_feature_require(container_fifo)
+ 
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.7.3-perl524-2.patch b/net-analyzer/net-snmp/files/net-snmp-5.7.3-perl524-2.patch
new file mode 100644
index 000000000000..45855597a867
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.7.3-perl524-2.patch
@@ -0,0 +1,70 @@
+--- a/perl/ASN/Makefile.PL
++++ b/perl/ASN/Makefile.PL
+@@ -1,3 +1,4 @@
++package ASN;
+ use ExtUtils::MakeMaker;
+ require 5;
+ use Config;
+--- a/perl/AnyData_SNMP/Makefile.PL
++++ b/perl/AnyData_SNMP/Makefile.PL
+@@ -1,3 +1,4 @@
++package AnyData_SNMP;
+ use ExtUtils::MakeMaker;
+ # See lib/ExtUtils/MakeMaker.pm for details of how to influence
+ # the contents of the Makefile that is written.
+--- a/perl/OID/Makefile.PL
++++ b/perl/OID/Makefile.PL
+@@ -1,3 +1,4 @@
++package OID;
+ # See lib/ExtUtils/MakeMaker.pm for details of how to influence
+ # the contents of the Makefile that is written.
+ 
+--- a/perl/SNMP/Makefile.PL
++++ b/perl/SNMP/Makefile.PL
+@@ -1,3 +1,4 @@
++package SNMP;
+ use ExtUtils::MakeMaker;
+ require 5;
+ use Config;
+--- a/perl/TrapReceiver/Makefile.PL
++++ b/perl/TrapReceiver/Makefile.PL
+@@ -1,3 +1,4 @@
++package TrapReceiver;
+ use ExtUtils::MakeMaker;
+ require 5;
+ use Config;
+--- a/perl/agent/Makefile.PL
++++ b/perl/agent/Makefile.PL
+@@ -1,3 +1,4 @@
++package agent;
+ use ExtUtils::MakeMaker;
+ require 5;
+ use Config;
+--- a/perl/agent/Support/Makefile.PL
++++ b/perl/agent/Support/Makefile.PL
+@@ -1,3 +1,4 @@
++package agent_Support;
+ use ExtUtils::MakeMaker;
+ require 5;
+ use Config;
+--- a/perl/agent/default_store/Makefile.PL
++++ b/perl/agent/default_store/Makefile.PL
+@@ -1,3 +1,4 @@
++package agent_default_store;
+ use ExtUtils::MakeMaker;
+ require 5;
+ use Config;
+--- a/perl/default_store/Makefile.PL
++++ b/perl/default_store/Makefile.PL
+@@ -1,3 +1,4 @@
++package default_store;
+ use ExtUtils::MakeMaker;
+ require 5;
+ use Config;
+--- a/perl/manager/Makefile.PL
++++ b/perl/manager/Makefile.PL
+@@ -1,3 +1,4 @@
++package manager;
+ use ExtUtils::MakeMaker;
+ # See lib/ExtUtils/MakeMaker.pm for details of how to influence
+ # the contents of the Makefile that is written.
diff --git a/net-analyzer/net-snmp/files/snmpd.conf b/net-analyzer/net-snmp/files/snmpd.conf
new file mode 100644
index 000000000000..a3f88242a127
--- /dev/null
+++ b/net-analyzer/net-snmp/files/snmpd.conf
@@ -0,0 +1,19 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Initial (empty) options.
+SNMPD_FLAGS=""
+
+# Disable smux by default
+SNMPD_FLAGS="${SNMPD_FLAGS} -I -smux"
+
+# Enable connection logging.
+#SNMPD_FLAGS="${SNMPD_FLAGS} -a"
+
+# Enable syslog and disable file log.
+#SNMPD_FLAGS="${SNMPD_FLAGS} -Lsd -Lf /dev/null"
+
+# Enable agentx socket as /var/agentx/master
+# *NOTE* Before uncommenting this, make sure
+#        the /var/agentx directory exists.
+#SNMPD_FLAGS="${SNMPD_FLAGS} -x /var/agentx/master"
diff --git a/net-analyzer/net-snmp/files/snmpd.init.2 b/net-analyzer/net-snmp/files/snmpd.init.2
new file mode 100644
index 000000000000..288fea0d5908
--- /dev/null
+++ b/net-analyzer/net-snmp/files/snmpd.init.2
@@ -0,0 +1,34 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+SNMPD_PIDFILE="${SNMPD_PIDFILE:-/var/run/snmpd.pid}"
+
+extra_started_commands="reload"
+
+command="/usr/sbin/snmpd"
+command_args="-p ${SNMPD_PIDFILE} ${SNMPD_FLAGS}"
+pidfile="${SNMPD_PIDFILE}"
+
+depend() {
+	use logger
+}
+
+checkconfig() {
+	if [ ! -e /etc/snmp/snmpd.conf ] ; then
+		eerror "${SVCNAME} requires an /etc/snmp/snmpd.conf configuration file"
+		return 1
+	fi
+}
+
+start_pre() {
+	checkconfig || return 1
+}
+
+reload() {
+	checkconfig || return 1
+
+	ebegin "Reloading ${SVCNAME} configuration"
+	kill -HUP $(cat ${SNMPD_PIDFILE}) 2>&1 > /dev/null
+	eend $?
+}
diff --git a/net-analyzer/net-snmp/files/snmpd.service b/net-analyzer/net-snmp/files/snmpd.service
new file mode 100644
index 000000000000..8150d7b18818
--- /dev/null
+++ b/net-analyzer/net-snmp/files/snmpd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Simple Network Management Protocol (SNMP) Daemon
+After=syslog.target network.target
+
+[Service]
+ExecStart=/usr/sbin/snmpd -f
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-analyzer/net-snmp/files/snmptrapd.conf b/net-analyzer/net-snmp/files/snmptrapd.conf
new file mode 100644
index 000000000000..bca2a5f4c8de
--- /dev/null
+++ b/net-analyzer/net-snmp/files/snmptrapd.conf
@@ -0,0 +1,15 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# extra flags to pass to snmptrapd
+SNMPTRAPD_FLAGS=""
+
+# ignore authentication failure traps
+#SNMPTRAPD_FLAGS="${SNMPTRAPD_FLAGS} -a"
+
+# log messages to specified file
+#SNMPTRAPD_FLAGS="${SNMPTRAPD_FLAGS} -Lf /var/log/snmptrapd.log"
+
+# log messages to syslog with the specified facility
+# where facility is: 'd' = LOG_DAEMON, 'u' = LOG_USER, [0-7] = LOG_LOCAL[0-7]
+#SNMPTRAPD_FLAGS="${SNMPTRAPD_FLAGS} -Ls d"
diff --git a/net-analyzer/net-snmp/files/snmptrapd.init.2 b/net-analyzer/net-snmp/files/snmptrapd.init.2
new file mode 100644
index 000000000000..9787d6f05c38
--- /dev/null
+++ b/net-analyzer/net-snmp/files/snmptrapd.init.2
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+SNMPTRAPD_PIDFILE="${SNMPTRAPD_PIDFILE:-/var/run/snmptrapd.pid}"
+
+command="/usr/sbin/snmptrapd"
+command_args="-p ${SNMPTRAPD_PIDFILE} ${SNMPTRAPD_FLAGS}"
+pidfile="${SNMPTRAPD_PIDFILE}"
+
+depend() {
+	use logger
+}
diff --git a/net-analyzer/net-snmp/files/snmptrapd.service b/net-analyzer/net-snmp/files/snmptrapd.service
new file mode 100644
index 000000000000..7d19444c1d73
--- /dev/null
+++ b/net-analyzer/net-snmp/files/snmptrapd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Simple Network Management Protocol (SNMP) TRAP Daemon
+After=syslog.target network.target
+
+[Service]
+ExecStart=/usr/sbin/snmptrapd -f
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-analyzer/net-snmp/metadata.xml b/net-analyzer/net-snmp/metadata.xml
new file mode 100644
index 000000000000..99462311c12e
--- /dev/null
+++ b/net-analyzer/net-snmp/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<use>
+<flag name="elf">Enable the use of elf utils to check uptime on some systems</flag>
+<flag name="mfd-rewrites">Use MFD rewrites of mib modules where available</flag>
+<flag name="netlink">Use <pkg>dev-libs/libnl</pkg> to fetch TCP statistics instead of using /proc/net/tcp (Linux only).</flag>
+<flag name="pci">Use libpci (from <pkg>sys-apps/pciutils</pkg>) to look up network interface description. This feature is only available on Linux.</flag>
+<flag name="rpm">Enable monitoring of <pkg>app-arch/rpm</pkg>. This flag requires the bzip2 and zlib flags to be enabled as well.</flag>
+<flag name="ucd-compat">Build UCD compatibility library. Increases significantly the install size.</flag>
+<flag name="smux">Enable support for the legacy smux protocol (superseded by agentx)</flag>
+</use>
+<upstream>
+<remote-id type="sourceforge">net-snmp</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild
new file mode 100644
index 000000000000..00afce2aacf4
--- /dev/null
+++ b/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=yesplz
+DISTUTILS_OPTIONAL=yesplz
+WANT_AUTOMAKE=none
+PATCHSET=2
+GENTOO_DEPEND_ON_PERL=no
+
+inherit autotools distutils-r1 eutils perl-module systemd
+
+DESCRIPTION="Software for generating and retrieving SNMP data"
+HOMEPAGE="http://net-snmp.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz
+	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-${PATCHSET}.tar.xz
+	https://dev.gentoo.org/~dilfridge/distfiles/${P}-perl524.patch.gz
+	https://dev.gentoo.org/~dilfridge/distfiles/${P}-perl524-2.patch.gz
+"
+
+S=${WORKDIR}/${P/_/.}
+
+# GPL-2 for the init scripts
+LICENSE="HPND BSD GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="X bzip2 doc elf ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
+
+COMMON_DEPEND="
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6d:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	rpm? (
+		app-arch/rpm
+		dev-libs/popt
+	)
+	bzip2? ( app-arch/bzip2 )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+	elf? ( dev-libs/elfutils )
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	pci? ( sys-apps/pciutils )
+	lm_sensors? ( sys-apps/lm_sensors )
+	netlink? ( dev-libs/libnl:3 )
+	mysql? ( virtual/mysql )
+	perl? ( dev-lang/perl:= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		X? ( dev-perl/Tk )
+		!minimal? ( dev-perl/TermReadKey )
+	)
+	selinux? ( sec-policy/selinux-snmp )
+"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	rpm? ( bzip2 zlib )
+"
+
+RESTRICT=test
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# snmpconf generates config files with proper selinux context
+	use selinux && epatch "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
+
+	epatch "${WORKDIR}"/${P}-perl524.patch
+	epatch "${WORKDIR}"/${P}-perl524-2.patch
+
+	epatch "${WORKDIR}"/patches/*.patch
+
+	epatch_user
+
+	eautoconf
+}
+
+src_configure() {
+	# keep this in the same line, configure.ac arguments are passed down to config.h
+	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
+	use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
+	use smux && mibs="${mibs} smux"
+
+	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
+	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
+
+	econf \
+		$(use_enable !ssl internal-md5) \
+		$(use_enable ipv6) \
+		$(use_enable mfd-rewrites) \
+		$(use_enable perl embedded-perl) \
+		$(use_enable ucd-compat ucd-snmp-compatibility) \
+		$(use_with bzip2) \
+		$(use_with elf) \
+		$(use_with mysql) \
+		$(use_with netlink nl) \
+		$(use_with pci) \
+		$(use_with perl perl-modules INSTALLDIRS=vendor) \
+		$(use_with python python-modules) \
+		$(use_with rpm) \
+		$(use_with ssl openssl) \
+		$(use_with tcpd libwrap) \
+		$(use_with zlib) \
+		--enable-shared --disable-static \
+		--with-default-snmp-version="3" \
+		--with-install-prefix="${D}" \
+		--with-ldflags="${LDFLAGS}" \
+		--with-logfile="/var/log/net-snmpd.log" \
+		--with-mib-modules="${mibs}" \
+		--with-persistent-directory="/var/lib/net-snmp" \
+		--with-sys-contact="root@Unknown" \
+		--with-sys-location="Unknown"
+}
+
+src_compile() {
+	for target in snmplib agent sedscript all; do
+		emake OTHERLDFLAGS="${LDFLAGS}" ${target}
+	done
+
+	use doc && emake docsdox
+}
+
+src_install () {
+	# bug #317965
+	emake -j1 DESTDIR="${D}" install
+
+	if use perl ; then
+		perl_delete_localpod
+		if ! use X; then
+			rm "${D}"/usr/bin/tkmib || die
+		fi
+	else
+		rm -f \
+			"${D}"/usr/bin/fixproc \
+			"${D}"/usr/bin/ipf-mod.pl \
+			"${D}"/usr/bin/mib2c \
+			"${D}"/usr/bin/net-snmp-cert \
+			"${D}"/usr/bin/snmp-bridge-mib \
+			"${D}"/usr/bin/snmpcheck \
+			"${D}"/usr/bin/snmpconf \
+			"${D}"/usr/bin/tkmib \
+			"${D}"/usr/bin/traptoemail \
+			"${D}"/usr/share/snmp/mib2c.perl.conf \
+			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
+			|| die
+	fi
+
+	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
+	newdoc EXAMPLE.conf.def EXAMPLE.conf
+
+	use doc && dohtml docs/html/*
+
+	keepdir /var/lib/net-snmp
+
+	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
+	newconfd "${FILESDIR}"/snmpd.conf snmpd
+
+	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
+	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
+
+	systemd_dounit "${FILESDIR}"/snmpd.service
+	systemd_dounit "${FILESDIR}"/snmptrapd.service
+
+	insinto /etc/snmp
+	newins "${S}"/EXAMPLE.conf snmpd.conf.example
+
+	# Remove everything not required for an agent.
+	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
+	if use minimal; then
+		rm -rf \
+			"${D}"/**/*.pl \
+			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
+			"${D}"/usr/share/snmp/*.conf \
+			"${D}"/usr/share/snmp/snmpconf-data \
+			|| die
+	fi
+}
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3-r6.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3-r6.ebuild
new file mode 100644
index 000000000000..044f8d6bb311
--- /dev/null
+++ b/net-analyzer/net-snmp/net-snmp-5.7.3-r6.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=yesplz
+DISTUTILS_OPTIONAL=yesplz
+WANT_AUTOMAKE=none
+PATCHSET=2
+GENTOO_DEPEND_ON_PERL=no
+
+inherit autotools distutils-r1 eutils perl-module systemd
+
+DESCRIPTION="Software for generating and retrieving SNMP data"
+HOMEPAGE="http://net-snmp.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz
+	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-${PATCHSET}.tar.xz
+	https://dev.gentoo.org/~dilfridge/distfiles/${P}-perl524.patch.gz
+	https://dev.gentoo.org/~dilfridge/distfiles/${P}-perl524-2.patch.gz
+"
+
+S=${WORKDIR}/${P/_/.}
+
+# GPL-2 for the init scripts
+LICENSE="HPND BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="X bzip2 doc elf ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
+
+COMMON_DEPEND="
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6d:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	rpm? (
+		app-arch/rpm
+		dev-libs/popt
+	)
+	bzip2? ( app-arch/bzip2 )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+	elf? ( dev-libs/elfutils )
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	pci? ( sys-apps/pciutils )
+	lm_sensors? ( sys-apps/lm_sensors )
+	netlink? ( dev-libs/libnl:3 )
+	mysql? ( virtual/mysql )
+	perl? ( dev-lang/perl:= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		X? ( dev-perl/Tk )
+		!minimal? ( dev-perl/TermReadKey )
+	)
+	selinux? ( sec-policy/selinux-snmp )
+"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	rpm? ( bzip2 zlib )
+"
+
+RESTRICT=test
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# snmpconf generates config files with proper selinux context
+	use selinux && epatch "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
+
+	epatch "${WORKDIR}"/${P}-perl524.patch
+	epatch "${WORKDIR}"/${P}-perl524-2.patch
+
+	epatch "${WORKDIR}"/patches/*.patch
+
+	epatch_user
+
+	eautoconf
+}
+
+src_configure() {
+	# keep this in the same line, configure.ac arguments are passed down to config.h
+	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
+	use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
+	use smux && mibs="${mibs} smux"
+
+	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
+	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
+
+	econf \
+		$(use_enable !ssl internal-md5) \
+		$(use_enable ipv6) \
+		$(use_enable mfd-rewrites) \
+		$(use_enable perl embedded-perl) \
+		$(use_enable ucd-compat ucd-snmp-compatibility) \
+		$(use_with bzip2) \
+		$(use_with elf) \
+		$(use_with mysql) \
+		$(use_with netlink nl) \
+		$(use_with pci) \
+		$(use_with perl perl-modules INSTALLDIRS=vendor) \
+		$(use_with python python-modules) \
+		$(use_with rpm) \
+		$(use_with ssl openssl) \
+		$(use_with tcpd libwrap) \
+		$(use_with zlib) \
+		--enable-shared --disable-static \
+		--with-default-snmp-version="3" \
+		--with-install-prefix="${D}" \
+		--with-ldflags="${LDFLAGS}" \
+		--with-logfile="/var/log/net-snmpd.log" \
+		--with-mib-modules="${mibs}" \
+		--with-persistent-directory="/var/lib/net-snmp" \
+		--with-sys-contact="root@Unknown" \
+		--with-sys-location="Unknown"
+}
+
+src_compile() {
+	for target in snmplib agent sedscript all; do
+		emake OTHERLDFLAGS="${LDFLAGS}" ${target}
+	done
+
+	use doc && emake docsdox
+}
+
+src_install () {
+	# bug #317965
+	emake -j1 DESTDIR="${D}" install
+
+	if use perl ; then
+		perl_delete_localpod
+		if ! use X; then
+			rm "${D}"/usr/bin/tkmib || die
+		fi
+	else
+		rm -f \
+			"${D}"/usr/bin/fixproc \
+			"${D}"/usr/bin/ipf-mod.pl \
+			"${D}"/usr/bin/mib2c \
+			"${D}"/usr/bin/net-snmp-cert \
+			"${D}"/usr/bin/snmp-bridge-mib \
+			"${D}"/usr/bin/snmpcheck \
+			"${D}"/usr/bin/snmpconf \
+			"${D}"/usr/bin/tkmib \
+			"${D}"/usr/bin/traptoemail \
+			"${D}"/usr/share/snmp/mib2c.perl.conf \
+			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
+			|| die
+	fi
+
+	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
+	newdoc EXAMPLE.conf.def EXAMPLE.conf
+
+	use doc && dohtml docs/html/*
+
+	keepdir /var/lib/net-snmp
+
+	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
+	newconfd "${FILESDIR}"/snmpd.conf snmpd
+
+	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
+	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
+
+	systemd_dounit "${FILESDIR}"/snmpd.service
+	systemd_dounit "${FILESDIR}"/snmptrapd.service
+
+	insinto /etc/snmp
+	newins "${S}"/EXAMPLE.conf snmpd.conf.example
+
+	# Remove everything not required for an agent.
+	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
+	if use minimal; then
+		rm -rf \
+			"${D}"/**/*.pl \
+			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
+			"${D}"/usr/share/snmp/*.conf \
+			"${D}"/usr/share/snmp/snmpconf-data \
+			|| die
+	fi
+
+	prune_libtool_files
+}
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3_p3.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3_p3.ebuild
new file mode 100644
index 000000000000..4175fec18f21
--- /dev/null
+++ b/net-analyzer/net-snmp/net-snmp-5.7.3_p3.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=yesplz
+DISTUTILS_OPTIONAL=yesplz
+WANT_AUTOMAKE=none
+PATCHSET=3
+GENTOO_DEPEND_ON_PERL=no
+
+inherit autotools distutils-r1 eutils perl-module systemd
+
+DESCRIPTION="Software for generating and retrieving SNMP data"
+HOMEPAGE="http://net-snmp.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/project/${PN}/${PN}/${PV/_p*/}/${P/_p*/}.tar.gz
+	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-${PV/*_p/}.tar.xz
+	https://dev.gentoo.org/~dilfridge/distfiles/${P/_p*/}-perl524.patch.gz
+"
+
+S=${WORKDIR}/${P/_/.}
+
+# GPL-2 for the init scripts
+LICENSE="HPND BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="X bzip2 doc elf ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
+
+COMMON_DEPEND="
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6d:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	rpm? (
+		app-arch/rpm
+		dev-libs/popt
+	)
+	bzip2? ( app-arch/bzip2 )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+	elf? ( dev-libs/elfutils )
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	pci? ( sys-apps/pciutils )
+	lm_sensors? ( sys-apps/lm_sensors )
+	netlink? ( dev-libs/libnl:3 )
+	mysql? ( virtual/mysql )
+	perl? ( dev-lang/perl:= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		X? ( dev-perl/Tk )
+		!minimal? ( dev-perl/TermReadKey )
+	)
+	selinux? ( sec-policy/selinux-snmp )
+"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	rpm? ( bzip2 zlib )
+"
+S=${WORKDIR}/${P/_p*/}
+
+RESTRICT=test
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# snmpconf generates config files with proper selinux context
+	use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
+
+	eapply "${WORKDIR}"/${PN}-5.7.3-perl524.patch
+	eapply "${FILESDIR}"/${PN}-5.7.3-perl524-2.patch
+	eapply "${FILESDIR}"/${PN}-5.7.3-mariadb-10.2.patch
+
+	eapply "${WORKDIR}"/patches/*.patch
+
+	eapply_user
+
+	eautoconf
+}
+
+src_configure() {
+	# keep this in the same line, configure.ac arguments are passed down to config.h
+	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
+	use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
+	use smux && mibs="${mibs} smux"
+
+	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
+	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
+
+	econf \
+		$(use_enable !ssl internal-md5) \
+		$(use_enable ipv6) \
+		$(use_enable mfd-rewrites) \
+		$(use_enable perl embedded-perl) \
+		$(use_enable ucd-compat ucd-snmp-compatibility) \
+		$(use_with bzip2) \
+		$(use_with elf) \
+		$(use_with mysql) \
+		$(use_with netlink nl) \
+		$(use_with pci) \
+		$(use_with perl perl-modules INSTALLDIRS=vendor) \
+		$(use_with python python-modules) \
+		$(use_with rpm) \
+		$(use_with ssl openssl) \
+		$(use_with tcpd libwrap) \
+		$(use_with zlib) \
+		--enable-shared --disable-static \
+		--with-default-snmp-version="3" \
+		--with-install-prefix="${D}" \
+		--with-ldflags="${LDFLAGS}" \
+		--with-logfile="/var/log/net-snmpd.log" \
+		--with-mib-modules="${mibs}" \
+		--with-persistent-directory="/var/lib/net-snmp" \
+		--with-sys-contact="root@Unknown" \
+		--with-sys-location="Unknown"
+}
+
+src_compile() {
+	for target in snmplib agent sedscript all; do
+		emake OTHERLDFLAGS="${LDFLAGS}" ${target}
+	done
+
+	use doc && emake docsdox
+}
+
+src_install () {
+	# bug #317965
+	emake -j1 DESTDIR="${D}" install
+
+	if use perl ; then
+		perl_delete_localpod
+		if ! use X; then
+			rm "${D}"/usr/bin/tkmib || die
+		fi
+	else
+		rm -f \
+			"${D}"/usr/bin/fixproc \
+			"${D}"/usr/bin/ipf-mod.pl \
+			"${D}"/usr/bin/mib2c \
+			"${D}"/usr/bin/net-snmp-cert \
+			"${D}"/usr/bin/snmp-bridge-mib \
+			"${D}"/usr/bin/snmpcheck \
+			"${D}"/usr/bin/snmpconf \
+			"${D}"/usr/bin/tkmib \
+			"${D}"/usr/bin/traptoemail \
+			"${D}"/usr/share/snmp/mib2c.perl.conf \
+			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
+			|| die
+	fi
+
+	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
+	newdoc EXAMPLE.conf.def EXAMPLE.conf
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/html/*
+	fi
+
+	keepdir /var/lib/net-snmp
+
+	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
+	newconfd "${FILESDIR}"/snmpd.conf snmpd
+
+	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
+	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
+
+	systemd_dounit "${FILESDIR}"/snmpd.service
+	systemd_dounit "${FILESDIR}"/snmptrapd.service
+
+	insinto /etc/snmp
+	newins "${S}"/EXAMPLE.conf snmpd.conf.example
+
+	# Remove everything not required for an agent.
+	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
+	if use minimal; then
+		rm -rf \
+			"${D}"/**/*.pl \
+			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
+			"${D}"/usr/share/snmp/*.conf \
+			"${D}"/usr/share/snmp/snmpconf-data \
+			|| die
+	fi
+
+	prune_libtool_files
+}
diff --git a/net-analyzer/netcat/Manifest b/net-analyzer/netcat/Manifest
new file mode 100644
index 000000000000..de6fbb14acba
--- /dev/null
+++ b/net-analyzer/netcat/Manifest
@@ -0,0 +1,7 @@
+DIST nc-v6-20000918.patch.gz 8740 SHA256 7f0d5d05f4ed98f61f7efb167ef29cb25aa71e0df42c1f0cc8472e1ed660cb9a SHA512 56326fc7c40ea676173f150842367ea1782e700de682d790bb0f2c0df86e72a30f4c3ea0d937deb9d92f5eed47d2d4cb53edaca7dd23eb394a498b2f424bb2fe WHIRLPOOL 15fcbb4797900eab97e49b29a2a7a3e29ae449079a52c8bccf2b515c35fe22247105bbdb935c216925d184523e91b9d4d0c49d25c88a911b22bebdfba51135c7
+DIST nc110.tgz 75267 SHA256 5b3fda14e972d908896a605293f4634a72e2968278117410e12d8b3faf9a3976 SHA512 c9a7f5045f76d9ffef4e83fcc3e82f69ac4eb05e061686db51e9367949bfe0b90226b290a059dc68dcf3bf2040b95b5c78545199674da57a7c73e2f9145cf812 WHIRLPOOL 55c941d5996f3069fb5e76c6abedc9cd361dd44d404ddadf63422d3c5611c3b7e9459c58186a5b69aead7306f0842904005c08d0fb815bfbb452fc0f2c9b2b65
+DIST netcat-110-patches-1.0.tar.bz2 25751 SHA256 809517592616b4ca81c7b49541faa6a252ceb93384886d99b83163e9feeca96c SHA512 b9e7e35aa7e26d30f0115d87aff34fd0cadfad99fdb77cc5aa3ba51bec331f632e180484927c4368172ee9cc6c996b8691bd19bad8806912d8820158a98eab46 WHIRLPOOL 3e86f5bb92a905a1347c8af38db76e9c68d72757488dc153e4d1715cf825c4f1ecb74c67138238de4b31fbfe240511b81e495af3d7059fdf9c93c8ae731f476c
+EBUILD netcat-110-r9.ebuild 1647 SHA256 5cdf7c185b936f80c4ef6f12273b213abd579ff64e63a8412504ce85d852aee0 SHA512 c6f41fc3890d7c7da89fab4597c99260de1160e5982732ddd57c090e04aef788e51dcac724ce78d1cc660c7d0a3459844ccf92dcd6c80c117a40dd842dab42d5 WHIRLPOOL d7d4a34bce1697f0318d2b3a07d67f047a45ed6f82956931babe88248694dd79d7cd3b84d2e41435247c4edddb0602d14c7276294d51f2fd35bedb6215b75867
+MISC ChangeLog 2430 SHA256 6ab562482403cc3b3502dd01877033232521dcb5746964d305476f7d9360714a SHA512 a3000b8982476ec9c090567f64377353eb9178b66b091a44469e724e8a840dd199e3db5f9d3f56b2ee05f73febc175a0995ca7686eaee61ecbbd1d67f4ae8400 WHIRLPOOL d8a18db8c0ac3d978fc77f27aa8b55fa378de886a04a7ca8677e64ef200088921932516eb1c37ec12d4cfe8289b0797b32d79f56ff5ff036d825c3aef95fc32e
+MISC ChangeLog-2015 6891 SHA256 979cb744ae4b67b1923fcf7ed9b94f6458477bb94732da0ed41c92dcff131052 SHA512 997d821602bd7a8c02716107109f8114a644f300696c6cf5edb248080e537ca49f855b328da7fecdf8c4139c0a1b1fc13298bddac21b867ca6edc827fca7d00f WHIRLPOOL 093c17f5768bb9c46d9cc3ccdcfae1172c067aabf0d6fb832532cc79c7aa0b629cf87b2173687179bbe043a29964a56a840ddaded81f6fb4e60aab68ce9ada35
+MISC metadata.xml 498 SHA256 f602cb2535056088ad5b9325b271db72d40355445f2c6dc6afb5636f3ed1a6aa SHA512 062866648a6be5781040741cc778034e9c09a7dfe0a97d250dd7d0e197c0981a257a4e0e1e663c49d56218fa7095ad6c21887206b62941210445dc9344144e44 WHIRLPOOL c8dfbf7a063028b2a86a69872fb8b89bc7baf935af68fe7df0ff8aabc6d3afc8a7f65879ece1eed24973f66646eb6f1aba8df7b3ce42e6a6b0aa7efad4c7af9f
diff --git a/net-analyzer/netcat/metadata.xml b/net-analyzer/netcat/metadata.xml
new file mode 100644
index 000000000000..1b0803d3aadf
--- /dev/null
+++ b/net-analyzer/netcat/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>vapier@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>the network swiss army knife</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">nc110</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/netcat/netcat-110-r9.ebuild b/net-analyzer/netcat/netcat-110-r9.ebuild
new file mode 100644
index 000000000000..be5f42d1157c
--- /dev/null
+++ b/net-analyzer/netcat/netcat-110-r9.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs flag-o-matic
+
+PATCH_VER="1.0"
+MY_P=nc${PV}
+DESCRIPTION="the network swiss army knife"
+HOMEPAGE="http://nc110.sourceforge.net/"
+SRC_URI="mirror://sourceforge/nc110/${MY_P}.tgz
+	ftp://sith.mimuw.edu.pl/pub/users/baggins/IPv6/nc-v6-20000918.patch.gz
+	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
+
+LICENSE="netcat"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+IUSE="crypt ipv6 static"
+
+LIB_DEPEND="crypt? ( dev-libs/libmix[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+
+S=${WORKDIR}
+
+src_prepare() {
+	epatch "${DISTDIR}"/nc-v6-20000918.patch.gz patch
+	sed -i 's:#define HAVE_BIND:#undef HAVE_BIND:' netcat.c
+	sed -i 's:#define FD_SETSIZE 16:#define FD_SETSIZE 1024:' netcat.c #34250
+	[[ ${CHOST} == *-solaris* ]] && \
+		sed -i 's:gethostbyname2(\([^)]\+\)):getipnodebyname(\1, AI_DEFAULT, NULL):' netcat.c
+}
+
+src_compile() {
+	export XLIBS=""
+	export XFLAGS="-DLINUX -DTELNET -DGAPING_SECURITY_HOLE"
+	use ipv6 && XFLAGS="${XFLAGS} -DINET6"
+	use static && export STATIC="-static"
+	use crypt && XFLAGS="${XFLAGS} -DAESCRYPT" && XLIBS="${XLIBS} -lmix"
+	[[ ${CHOST} == *-solaris* ]] && XLIBS="${XLIBS} -lnsl -lsocket"
+	emake -e CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" nc
+}
+
+src_install() {
+	dobin nc
+	dodoc README* netcat.blurb debian-*
+	doman nc.1
+	docinto scripts
+	dodoc scripts/*
+}
diff --git a/net-analyzer/netcat6/Manifest b/net-analyzer/netcat6/Manifest
new file mode 100644
index 000000000000..e35fb6cead83
--- /dev/null
+++ b/net-analyzer/netcat6/Manifest
@@ -0,0 +1,7 @@
+AUX netcat6-1.0-automake-1.14.patch 428 SHA256 3f7c2718aa59adc2ddcd607a0ed8f1313de873e66d340018adb4cd088c4d6255 SHA512 91aa92162b379632318e429853382c0e73d8c37ac73fce91975dcc7340705435e5832c4fa7a185a1ad3f4c7b492a256fe08e8233da4bce963969325983f1e473 WHIRLPOOL 23e9805308bcb7e031bb3468dbff3ad3bcf5d98c024430b09324b38b85a2ab84ba4d36b8e500d0cb20545f759559db22a2debfc621a527ecd303f30de66ecd59
+AUX netcat6-1.0-unix-sockets.patch 8039 SHA256 5fb871576118b03c960599624072a0425ceff59c8dad9465ef89ddb10f203aec SHA512 2fbbbb4bdabada521d9fb33ad545459a03a8b443387a490a07a8bcd403817650a2f2cfd73c8a4e8e8fd02d1f5c0bd8a045ecd31ec5ffbdf5d22e0c1b758b12bc WHIRLPOOL 9d0a1b5c18790244acc7c136183073c9100a5a58a8ae73f618ddcba5657feb40c413436385e6b49f882ab49d2cfe7bf57ff8c8569caf15234ed0963defeec864
+DIST nc6-1.0.tar.bz2 264257 SHA256 eb35e7a05a60bf94496075a3a246d7bf63fcdba2ca7ceb6844852a1ff6478206 SHA512 199f3bd18bb452544da8ca1b0f5347f79662bea81e9af335a41ed62c12d5d8cb41d99442ca54f301538d27aec4ada5f59db87461e5b0f20333ba1b52859bd35a WHIRLPOOL e3ad61617daa705efc4a459c96a6e020eb30d6e38be367c5014fa2b8706de53502348ce6995e7804c60e6c4b8cfefc21a50a00987cdb33b9ae2d336d294bbf80
+EBUILD netcat6-1.0-r2.ebuild 1127 SHA256 a7da0b43b4919936f3aff932f57a4bd4aa2acca32f79108a137b0570d5bbf3e6 SHA512 4f0d32dae23c7ea1da0dddf5400d5586b04d73e98d0b18a3e4244adcc81412147d5403ecbe87e599ef7b9b07ee08a0a295f278a147ead8191a7b5a5c08b2eb22 WHIRLPOOL 4a68e61e2b157ad5c813aea3c162af5fa536fbd66d3e38339360c3609542a71b7d2112a97aaf39f2180678f8c6f59fd80ead6c95d7b3e797f2dd69abeb5a2b34
+MISC ChangeLog 3217 SHA256 fbcb2dd91b3b0659f90d8518d8cf1103c0cece6741a46b97de771c7cc8688d5d SHA512 df7558f80329ad051d6216f1456a7b9ba970a683f29f429acfa2fcf904d7dcedc02413c8ad91fc171099f80733a3e7330498ddafbd1de00dbf69c48a95ecbee4 WHIRLPOOL 8758634470fcf9546209334e98cab4a91b73eff4828b2b01c8eb8697c8948059f85615a3d149ea9104f21a7c5b69e64f80a27989f9e3c40a1dca959f5fd95af1
+MISC ChangeLog-2015 4320 SHA256 5aa38f15b44d7df3f400a682f443a19c98ec7fb38724f695b4ed1e10b1f15f65 SHA512 29497fc5f7b85c283850cbc22fec95516ae92b2a03b9f0ec71aed590f54658490399971c79c57b2b8fd072e00fa1e4056d8eecbc8eebb4cb1e4f5540445b721f WHIRLPOOL af0074c896579f8215cc6a19c0bf22de550a65eda5b633d9f706fe7fc3f3095271dc3cc9c26b45cd120a812555efa802c51c558df086811fca2d597abbded982
+MISC metadata.xml 357 SHA256 002026a9359669d67f031467a6838ad0c1d25682e3aadb1c99ff0dabed79a61e SHA512 a5b578146dd743e567e6edceda335342e825a502c0ccabd25597c8c0bc0f8cea6ed662547af284ac6e28da05822f95ac4087411d93d503822379cac49118a6bb WHIRLPOOL 028d9fd3eb830e82631338ce72ab323743f80010e06e3eea78806533af8c69803bf2d9b3bc12f14f8124ed7943a522d5378366c558bb113e77ecb3faac4afce6
diff --git a/net-analyzer/netcat6/files/netcat6-1.0-automake-1.14.patch b/net-analyzer/netcat6/files/netcat6-1.0-automake-1.14.patch
new file mode 100644
index 000000000000..f7c128590be8
--- /dev/null
+++ b/net-analyzer/netcat6/files/netcat6-1.0-automake-1.14.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -2,9 +2,9 @@
+ AC_INIT(nc6, 1.0, [ds6-devel@deepspace6.net])
+ AC_CONFIG_AUX_DIR(config)
+ AC_CONFIG_SRCDIR(src/main.c)
+-AM_GNU_GETTEXT_VERSION(0.14.1)
+ AM_INIT_AUTOMAKE(1.6)           dnl Automake 1.6 or better is required
+-AM_CONFIG_HEADER(config.h)
++AM_GNU_GETTEXT_VERSION(0.14.1)
++AC_CONFIG_HEADERS(config.h)
+ AC_PREREQ(2.52)                 dnl Autoconf 2.52 or better is required
+ 
+ 
diff --git a/net-analyzer/netcat6/files/netcat6-1.0-unix-sockets.patch b/net-analyzer/netcat6/files/netcat6-1.0-unix-sockets.patch
new file mode 100644
index 000000000000..5ab0ece124f1
--- /dev/null
+++ b/net-analyzer/netcat6/files/netcat6-1.0-unix-sockets.patch
@@ -0,0 +1,303 @@
+--- a/docs/nc6.1.in
++++ b/docs/nc6.1.in
+@@ -160,6 +160,10 @@
+ With this option set, netcat6 will use UDP as the transport protocol (TCP is
+ the default).
+ .TP 13
++.I \-U, --unix
++With this option set, netcat6 will connect to a unix domain socket.
++The listen mode has not been implemented yet.
++.TP 13
+ .I \-v
+ Enable verbose mode.  This gives some basic information about what netcat6
+ is doing.  Use it twice for extra verbosity.
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -6,6 +6,7 @@
+   network.h \
+   afindep.h \
+   bluez.h \
++  unixsocket.h \
+   netsupport.h \
+   parser.h \
+   readwrite.h \
+@@ -20,6 +21,7 @@
+   afindep.c \
+   netsupport.c \
+   parser.c \
++  unixsocket.c \
+   readwrite.c \
+   io_stream.c \
+   connection.c
+
+--- a/src/connection.c
++++ b/src/connection.c
+@@ -109,6 +109,9 @@
+ 		fatal_internal("unavailable bluez support required");
+ #endif
+ 		break;
++	case PROTO_UNIX:
++		ainfo->ai_family = PF_UNIX;
++		break;
+ 	default:
+ 		fatal_internal("unknown socket domain");
+ 	}
+@@ -144,6 +147,10 @@
+ 		fatal_internal("unavailable bluez support required");
+ #endif
+ 		break;
++	case UNIX_PROTOCOL:
++		ainfo->ai_protocol = 0;
++		ainfo->ai_socktype = SOCK_STREAM;
++		break;
+ 	default:
+ 		fatal_internal("unknown socket type");
+ 	}
+
+--- a/src/connection.h
++++ b/src/connection.h	2008-10-25 14:17:09 +0000
+@@ -31,12 +31,14 @@
+ 	PROTO_UNSPECIFIED,
+ 	PROTO_IPv6,
+ 	PROTO_IPv4,
++	PROTO_UNIX,
+ 	PROTO_BLUEZ
+ } sock_family_t;
+ 
+ typedef enum sock_protocol {
+ 	TCP_PROTOCOL,
+ 	UDP_PROTOCOL,
++	UNIX_PROTOCOL,
+ 	SCO_PROTOCOL,
+ 	L2CAP_PROTOCOL
+ } sock_protocol_t;
+
+--- a/src/network.c
++++ b/src/network.c
+@@ -23,6 +23,7 @@
+ #include "network.h"
+ #include "connection.h"
+ #include "afindep.h"
++#include "unixsocket.h"
+ #ifdef ENABLE_BLUEZ
+ #include "bluez.h"
+ #endif/*ENABLE_BLUEZ*/
+@@ -113,6 +114,11 @@
+ 
+ 	/* invoke the appropriate connector for the protocol family */
+ 	switch (ca_family(attrs)) {
++	case PROTO_UNIX:
++		fd = unixsocket_connect(&hints,
++				remote->address,
++				timeout, &socktype);
++		break;
+ #ifdef ENABLE_BLUEZ
+ 	case PROTO_BLUEZ:
+ 		fd = bluez_connect(&hints,
+
+--- a/src/parser.c
++++ b/src/parser.c
+@@ -109,7 +109,9 @@
+ 	{"bluetooth",           no_argument,        NULL, 'b'},
+ #define OPT_SCO			24
+ 	{"sco",			no_argument,        NULL,  0 },
+-#define OPT_MAX			25
++#define OPT_UNIX_SOCKET		25
++	{"unix",		no_argument,        NULL, 'U'},
++#define OPT_MAX			26
+ 	{0, 0, 0, 0}
+ };
+ 
+@@ -160,7 +162,7 @@
+ 	_verbosity_level = 0;
+ 
+ 	/* option recognition loop */
+-	while ((c = getopt_long(argc, argv, "46be:hlnp:q:s:uvw:xX",
++	while ((c = getopt_long(argc, argv, "46be:hlnp:q:s:uUvw:xX",
+ 	                        long_options, &option_index)) >= 0)
+ 	{
+  		switch (c) {
+@@ -231,6 +233,9 @@
+ 			family = PROTO_IPv6;
+ 			ca_set_flag(attrs, CA_STRICT_IPV6);
+ 			break;
++		case 'U':
++			family = PROTO_UNIX;
++			break;
+ 		case 'b':
+ 			family = PROTO_BLUEZ;
+ 			break;
+@@ -330,6 +335,9 @@
+ 	/* set default protocols */
+ 	if (protocol == PROTO_UNSPECIFIED) {
+ 		switch (family) {
++		case PROTO_UNIX:
++			protocol = UNIX_PROTOCOL;
++			break;
+ 		case PROTO_BLUEZ:
+ 			protocol = L2CAP_PROTOCOL;
+ 			break;
+@@ -344,6 +352,11 @@
+ 		fatal(_("cannot specify UDP protocol and bluetooth"));
+ 	if (protocol == SCO_PROTOCOL && family != PROTO_BLUEZ)
+ 		fatal(_("--sco requires --bluetooth (-b)"));
++	if (protocol == UNIX_PROTOCOL && family != PROTO_UNIX)
++		fatal(_("--unix does not need protocol specifications"));
++
++	if (family == PROTO_UNIX && listen_mode)
++		fatal(_("--unix cannot --listen yet"));
+ 
+ 	/* check compiled options */
+ #ifndef ENABLE_BLUEZ
+@@ -380,6 +393,10 @@
+ 			fatal_internal("unknown/unsupported bluetooth "
+ 			               "protocol %d", protocol);
+ 		break;
++	case PROTO_UNIX:
++		if (protocol != UNIX_PROTOCOL)
++			fatal_internal("unknown/unsupported UNIX protocol %d", protocol);
++		break;
+ 	default:
+ 		fatal_internal("invalid protocol family %d", family);
+ 	}
+@@ -425,18 +442,18 @@
+ 		fatal(_("cannot set both --recv-only and --send-only"));
+ 	}
+ 
+-	/* check ports have not been specified with --sco */
+-	if (protocol == SCO_PROTOCOL) {
++	/* check ports have not been specified with --sco and --unix */
++	if (protocol == SCO_PROTOCOL || protocol == UNIX_PROTOCOL) {
+ 		if (remote_address.service != NULL)
+-			fatal(_("--sco does not support remote port"));
++			fatal(_("--sco and --unix do not support remote port"));
+ 		if (local_address.service != NULL)
+-			fatal(_("--sco does not support local port (-p)"));
++			fatal(_("--sco and --unix do not support local port (-p)"));
+ 	}
+ 
+ 	/* check mode specific option availability and interactions */
+ 	if (listen_mode == true) {
+ 		/* check port has been specified (except with sco) */
+-		if (local_address.service == NULL && protocol != SCO_PROTOCOL) {
++		if (local_address.service == NULL && protocol != SCO_PROTOCOL && protocol != UNIX_PROTOCOL) {
+ 			fatal(_("in listen mode you must specify a port "
+ 			      "with the -p switch"));
+ 		}
+@@ -450,6 +467,7 @@
+ 		/* check port has been specified (except with sco) */
+ 		if (remote_address.address == NULL || 
+ 		    (remote_address.service == NULL &&
++		    protocol != UNIX_PROTOCOL &&
+ 		    protocol != SCO_PROTOCOL))
+ 		{
+ 			fatal(_("you must specify the address/port couple "
+@@ -553,6 +571,8 @@
+ 	fprintf(fp, " -6                     %s\n", _("Use only IPv6"));
+ 	fprintf(fp, " -b, --bluetooth        %s\n",
+ 	              _("Use Bluetooth (defaults to L2CAP protocol)"));
++	fprintf(fp, " -U, --unix             %s\n",
++	              _("Connect to unix domain sockets"));
+ 	fprintf(fp, " --buffer-size=BYTES    %s\n", _("Set buffer size"));
+ 	fprintf(fp, " --continuous           %s\n",
+ 	              _("Continuously accept connections\n"
+
+--- a/src/unixsocket.c
++++ b/src/unixsocket.c
+@@ -0,0 +1,78 @@
++/*
++ *  unixsocket.c - address family independant networking functions
++ */  
++#include "system.h"
++#include "unixsocket.h"
++#include "misc.h"
++#include "netsupport.h"
++#include "parser.h"
++
++#include <assert.h>
++#include <errno.h>
++#include <string.h>
++#include <stdlib.h>
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <sys/un.h>
++#include <unistd.h>
++#include <limits.h>
++
++RCSID("@(#) $Id$");
++
++
++int unixsocket_connect(const struct addrinfo *hints,
++		const char *remote_address,
++		time_t timeout, int *rt_socktype)
++{
++	int err, fd = -1;
++	struct sockaddr_un sa;
++	const struct addrinfo *ptr = hints;
++
++	/* make sure arguments are valid and preconditions are respected */
++	assert(hints != NULL);
++	assert(remote_address != NULL && strlen(remote_address) > 0);
++	assert(sizeof(sa.sun_path) >= strlen(remote_address));
++
++	sa.sun_family = ptr->ai_family;
++	strncpy(sa.sun_path, remote_address, sizeof(sa.sun_path));
++
++
++	/* create the socket */
++	fd = socket(ptr->ai_family, ptr->ai_socktype, ptr->ai_protocol);
++	if (fd < 0) {
++		warning("cannot create the socket: %s", strerror(errno));
++		return -1;
++	}
++
++	/* attempt the connection */
++	err = connect_with_timeout(fd, (struct sockaddr *)&sa, sizeof(sa), timeout);
++	
++	if (err != 0)
++	{
++		/* check error code */
++		if (verbose_mode()) {
++			/* use different error message for timeout */
++			if (errno == ETIMEDOUT) {
++				/* connection timed out */
++				warning(_("timeout while connecting to %s"), remote_address);
++			}
++			else {
++				/* connection failed */
++				warning(_("cannot connect to %s: %s"), remote_address, strerror(errno));
++			}
++		}
++		close(fd);
++		return -1;
++	}
++
++	assert(ptr == NULL || fd >= 0);
++
++	/* let the user know the connection has been established */
++	if (verbose_mode()) warning(_("%s open"), remote_address);
++
++	/* return the socktype */
++	if (rt_socktype != NULL) *rt_socktype = ptr->ai_socktype;
++
++	return fd;
++}
++
+
+--- a/src/unixsocket.h
++++ b/src/unixsocket.h
+@@ -0,0 +1,12 @@
++#ifndef UNIXSOCKET_H
++#define UNIXSOCKET_H
++
++#include <netdb.h>
++#include <sys/types.h>
++
++/* establish a connection and return a new fd and socktype */
++int unixsocket_connect(const struct addrinfo *hints,
++		const char *remote_address,
++		time_t timeout, int *socktype);
++
++#endif
+
diff --git a/net-analyzer/netcat6/metadata.xml b/net-analyzer/netcat6/metadata.xml
new file mode 100644
index 000000000000..3baf3341ea46
--- /dev/null
+++ b/net-analyzer/netcat6/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">netcat6</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/netcat6/netcat6-1.0-r2.ebuild b/net-analyzer/netcat6/netcat6-1.0-r2.ebuild
new file mode 100644
index 000000000000..f325cd1cdc2a
--- /dev/null
+++ b/net-analyzer/netcat6/netcat6-1.0-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils autotools toolchain-funcs
+
+DESCRIPTION="netcat clone with better IPv6 support, improved code, etc..."
+HOMEPAGE="http://netcat6.sourceforge.net/"
+SRC_URI="ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/nc6-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="ipv6 nls bluetooth"
+
+# need to block netcat as we provide the "nc" file now too
+DEPEND="
+	bluetooth? ( net-wireless/bluez )
+"
+RDEPEND="
+	${DEPEND}
+	!net-analyzer/netcat
+"
+
+S=${WORKDIR}/nc6-${PV}
+
+DOCS=( AUTHORS BUGS README NEWS TODO CREDITS ChangeLog )
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-unix-sockets.patch \
+		"${FILESDIR}"/${P}-automake-1.14.patch
+	AM_OPTS="--force-missing" eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable ipv6) \
+		$(use_enable bluetooth bluez) \
+		$(use_enable nls)
+}
+
+src_compile() {
+	emake AR=$(tc-getAR)
+}
+
+src_install() {
+	default
+	dodir /usr/bin
+	dosym /usr/bin/nc6 /usr/bin/nc
+}
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
new file mode 100644
index 000000000000..951cc7565a13
--- /dev/null
+++ b/net-analyzer/netdata/Manifest
@@ -0,0 +1,20 @@
+AUX netdata-1.4.0-glibc-sysmacros.patch 560 SHA256 3dfd873d8faf9e7578f27c00294b31f3ad4749e2443d74f8fdf3dff65b492055 SHA512 58af1778c9fce5333e984a1a0d8612da4455596f72e6343a656d4aaaa8d6a0809cb2b02647cbdfaef61776a657282583e298a3d5bd555ea9d7d9ee09b819e787 WHIRLPOOL fbba339d641681f23fd25748635c693e1469f05bd9a51314236ef5782eec1c65529268eb18020408ff7a79685915f4ea76ff7b3afde31569cf94d1eb916c87e1
+AUX netdata-1.8.0-openrc-fixes.patch 3618 SHA256 6b5bea165dfb3a377d17a386efd5d952acb24dfd1e5d5d5bca3078f05e3faf74 SHA512 9ba1da7f5a75b99249abe997a54fbd0ec69ef8ad2291d656c739f580c9758c7133224f09462ce001719cc06a7017a1745722977bef91c4e45bdb455377e39069 WHIRLPOOL 8dc713c02954db2c106defc5100b7c143fb308660bc4b52a58be2904c7da38b9eeadcc7fd35b2f69367210c72538e0c76687d5a59e02b9f3c9c481befa2135c3
+DIST netdata-1.2.0.tar.xz 1254000 SHA256 5c1ff3fe0501b654cd92dbba3fe4c0fc125736b58d604340f138df80fb1de1ce SHA512 0c43e89c7cb52a5dde2aec13b06496ffb70fcb1952cf74156bd4400f3520b4136a94b5390077a4e5e3278a8e175dcc14505a456efafec5fdf0759af4846e03f4 WHIRLPOOL 211fabbecfd4b0ffe8f6fb5dbdc28cf08a743c4544e29dd500187547107500c1b42a95677d8de746cce367d4a59c17ff29328c47b0de65208004e6de65d63277
+DIST netdata-1.3.0.tar.xz 1647708 SHA256 bad5d259467ae42ceb0cf5f03fc4b37d094a81f21a772477e6ccc5b8a778bf15 SHA512 0e96f12cbeb7aeecb07b885a0f10940022741633e5cfd76d9f79c9efe3bce2583d96ae18995831fc48d6724f65357929dc5a4220521230ecfb8517f15e779217 WHIRLPOOL 85b87fc6ec76a0255732613606fd4d3000870252c84dbd7be51a2b0132d4d1875d38b61085daeb3ea4e31e522b5e86e05bacf3eb57895ca718cd58501b995955
+DIST netdata-1.4.0.tar.xz 1801440 SHA256 22e293aae156759d220b36ff02fa496548e7386cb4ee53df660fde57418e69ea SHA512 b5f60931372f0c6a437d1340bd9bb07557d8a9ffb478381715495c09c9b9bcf71f287c2e47be40945149a268e0f666289c75cc4eb1d1ab6fc73988f6b71daaf3 WHIRLPOOL ae70a9bca7bf107610e4a81b71f1728a5ffb0721e1c5d53bd2025b8897dbdd6c3569b58bd285e2961243f7d1b501b8ea69c258b5b266ee0bdf04092f62fee249
+DIST netdata-1.5.0.tar.gz 2257299 SHA256 8f66e40ba72ebf5c6e478197eaee3099823fd6380c0870b201f53b5423945338 SHA512 54477c0f9fe2c920580e2e6c3f6c12828f3be2c3dfc1fee47ad98cab51ae3652cb3f223413e9de9399487a35ce844d502ce12fbf615102c0e1962b7dc96a9d95 WHIRLPOOL 2a57636b8ddc6991b6ce18fdb4be73fbd4f658ae0e152eb3c50400c062df87931b3d43b04a31b3857753f7d9ae2ea1a0e62c5235088e20629df1b95abfaf8821
+DIST netdata-1.6.0.tar.gz 2526589 SHA256 960dae3038be1aaf69fe1d1908d898f9a0c535a88362437772170a2979c1740b SHA512 9514fd320fc944897961f9581c123f37fb956dc3ae324a879744fabb0d853e8c6a1d62faf7a486f89a0507b2179f746e8dd0943443eb4744311e905a8c06aed6 WHIRLPOOL f90ca525817dbc3be9b18b8629c8093a32bb642e3d32fff77caf347aa7a6e48ce7b127b87fca43e99db62b7db8f0c2f6e8b4f61f3970256bf75fce6f59cc6977
+DIST netdata-1.7.0.tar.gz 2646936 SHA256 ad57facc58f97f03cd2390ba2ffd253807fb641ec1afc390a81a4e4809287095 SHA512 f7204d77963c06c010b91fb9df47b79cc03070a730f0c09d599a0ec606510f449bab3c8429db2df1494e4cee330c2229300de010c3ec705fe91376d92adf48fd WHIRLPOOL 845b551aab019247b06612d769075b0dee5c4440f3cf2c8d46752f7ccb42b4d9db75d0cfa25279f72ebaf7230d6525e62012d583cba61a12f89fd5df7175a958
+DIST netdata-1.8.0.tar.gz 2779648 SHA256 ca808a345ddf651669fdf53586d8296665d464f3cb25c4915276882d42914a73 SHA512 8bb21f49ce1fcf3d199eabd18f65d5005ef784b227f08cd8efe91e5cab2ae980cf0aea4bcaa3aca1dc666c10845684deca48257510ad574bd948ecd019afcdaf WHIRLPOOL 2e53a4de7617a018c092cea7d235497186ed0c9dffeae08befb1a5ebf25648c6529a01af9d7dc77b2ab2e4963f910deda7db81c73a4105c6af61b84a7dbb4560
+EBUILD netdata-1.2.0-r1.ebuild 1671 SHA256 8812583933a0cd5e72c9b151300ca206f2b2153646292d2b99411e957f40e851 SHA512 201ea834dcc7abfad427c190c745365980cd934ed9506ac9effe78fd1eca9c4f2f623e5735345b260d85e7822f552dbcc98b258cfadd2e36d7df79348c1eb1b5 WHIRLPOOL b10aa85164be02dcae8bd23524f24372dabc873e71b29434cd3dfd046391178b96a5d405f995a384eb58fc06706f0fb23caca9cebd956bd3d996c6598ad81168
+EBUILD netdata-1.3.0.ebuild 2081 SHA256 3710aa649c07244962f343a6931645a06042904c7ebde0e759a2e0f87768a75f SHA512 e6d2277dd199a3f652728bbeffcacbea1f8c184bbde640a344bf617ea0a098a661f9107f9371962c018b988c69d4099f932d5b50a43e85c5a87f612e37941955 WHIRLPOOL 78bc81520c5779392b31e02193356b936040d6ebe44ad7408e2eb1b443e53a660e7548c61b83debbe9866b10a7957d27cc806b37fdd35ea4d58f6b2b4c037dac
+EBUILD netdata-1.4.0-r1.ebuild 2309 SHA256 0a396acf672309734feb3f6fd2e33dadca8de453ea85fd76b9049580dda11cd9 SHA512 32133c833878e9f4ca9c5a69aa8740a3f90b92d0001365aa94e505464599f33eae121c9eb1b290f221ad7d9e69f74c833fb66c3ff25a13bec391c5c7c37e30b3 WHIRLPOOL 8f9faaf05782221fa13cde4ccc26f74bdd5389bc60e825773a842ab4024317ac736acb5cd7512597727e8f597013ef2ce48e0b2c6195f3cd5383629d6a6b7e05
+EBUILD netdata-1.5.0.ebuild 2317 SHA256 28d8d3461c607ad48fc9273b1a682d47cc0b27c31a02ebd503637b70b998fde6 SHA512 817050b6455d5be59577acee787add2b129b5e07bcf7704d7b08163fbbdf59edcce547f451204af35dcd85e0875e53004a4843ddca465b44909dee524522d7d6 WHIRLPOOL ff32afcc27fc7ba0095475a6709991b658a0a0d58cddfa7ab174aa45015721bad4bcaf5093c1494bdec51fe4fddb6b24e825031d6888bd1e26efd939de9b03e4
+EBUILD netdata-1.6.0.ebuild 2411 SHA256 552669178833fc4f8e892e58a52d91ab6f930fced33d1b18ed5149aa5847b681 SHA512 a707699734fa39b033247300aca59a21a38bcd68a178a49c4d5f5a7c5780e13d7081d9014d8e07b357343ba1bdf91dd8073b5dd89178761f9cc8f96d55f09ad3 WHIRLPOOL b3d588b5d11515083673e285062c338116b84fe36fdd8a44fd87f8a2724ef1d36c3bf8d3618ce1736598539b78052df661bbc08a4386478018eea50b0a8281f1
+EBUILD netdata-1.7.0.ebuild 2411 SHA256 552669178833fc4f8e892e58a52d91ab6f930fced33d1b18ed5149aa5847b681 SHA512 a707699734fa39b033247300aca59a21a38bcd68a178a49c4d5f5a7c5780e13d7081d9014d8e07b357343ba1bdf91dd8073b5dd89178761f9cc8f96d55f09ad3 WHIRLPOOL b3d588b5d11515083673e285062c338116b84fe36fdd8a44fd87f8a2724ef1d36c3bf8d3618ce1736598539b78052df661bbc08a4386478018eea50b0a8281f1
+EBUILD netdata-1.8.0-r1.ebuild 2512 SHA256 9bb0aae6b3c04dd8e20ee9f3ecc7cab25ae819118fac237d52f63a983d405c28 SHA512 b0c67391956880bf60e6ec9caeb1addb8029cc676dad69762d90c65a974f3fa6fe847f55b8b7c85739f03759fbaae64216cec31cf8130fbbedb85b23669ae062 WHIRLPOOL 33a20ecab21e7c754f2bda92def878694c0292e3b487abb64a74ac0d83d2397b31b9b92071dde3b949437f3aecd28c4cd9ba746f769fe9ad39ea79f3bdcb456c
+EBUILD netdata-1.8.0.ebuild 2411 SHA256 552669178833fc4f8e892e58a52d91ab6f930fced33d1b18ed5149aa5847b681 SHA512 a707699734fa39b033247300aca59a21a38bcd68a178a49c4d5f5a7c5780e13d7081d9014d8e07b357343ba1bdf91dd8073b5dd89178761f9cc8f96d55f09ad3 WHIRLPOOL b3d588b5d11515083673e285062c338116b84fe36fdd8a44fd87f8a2724ef1d36c3bf8d3618ce1736598539b78052df661bbc08a4386478018eea50b0a8281f1
+EBUILD netdata-9999.ebuild 2462 SHA256 59b133823d83ea5aa69d9959a3739ca49fc6c9f7b691f5ee5cc1e879d152c842 SHA512 8925ef75c6c54588bf4ee97e42f71c0e24f3baad2aec58585b0e789b0fcace1185ba727fb800cdeb5cd109e76139b7cf1c1fe6a9a10d0c90baca52479e23fa8f WHIRLPOOL cea00f84ff2bcb9384cb4977aceeabb728ead39cb1797d3335ef900637f84b8028d019865a490ef88fed84c4949faa60ed6aa1d303de83d222861b3ee200cd3d
+MISC ChangeLog 2323 SHA256 09518022a55e15a57bdb825935351c9a6d3b0fd6dd2e6fc78f537dfc67067753 SHA512 f4ca4dcf9002d8723491908c6e16f347f2197c89878ff42b4d7ce6dd174b39043a6fe2bd07e6105fc9e7750b085f9910d227547e7f6d64c03d3a7973810f44ea WHIRLPOOL 1adfe701f6b349ad469c9411b0b44289c3a406a4ed261a1394e349f9e842ee5f3af71ae9b3a56910966396b1ddc99ca1c4413936bd336c5547418c30ef236290
+MISC metadata.xml 807 SHA256 28865a9dde074fc78671494909a8391edb2302c3e373636630bed57e70e81f66 SHA512 bc6d35a5d9f28c8bf6fc9ccee126f4db6c22c915ee75c45ff0e898e712f8a7277f3d6fb22024a76d624e34609dbab9a36cfff696626eec9de84fadd361d8410d WHIRLPOOL 042362e49e660b07b1b1009c41a96f42af461ab4f1e3af7eac518d7407d772cbd6dde5e6c475a314fb9fda693a7500b088c2dba1e0a4c1349eb228e88d971860
diff --git a/net-analyzer/netdata/files/netdata-1.4.0-glibc-sysmacros.patch b/net-analyzer/netdata/files/netdata-1.4.0-glibc-sysmacros.patch
new file mode 100644
index 000000000000..7722af2e1a8c
--- /dev/null
+++ b/net-analyzer/netdata/files/netdata-1.4.0-glibc-sysmacros.patch
@@ -0,0 +1,21 @@
+From 471d1b5404cd60ea638450e39554ae2878fd5b0d Mon Sep 17 00:00:00 2001
+From: Costa Tsaousis <costa@tsaousis.gr>
+Date: Tue, 20 Dec 2016 20:31:24 +0200
+Subject: [PATCH] added sys/sysmacros.h; fixes #1408
+
+---
+ src/common.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/common.h b/src/common.h
+index c92c049..70cb4d6 100644
+--- a/src/common.h
++++ b/src/common.h
+@@ -64,6 +64,7 @@
+ #include <sys/syscall.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h> // #1408
+ #include <sys/wait.h>
+ #include <time.h>
+ #include <unistd.h>
diff --git a/net-analyzer/netdata/files/netdata-1.8.0-openrc-fixes.patch b/net-analyzer/netdata/files/netdata-1.8.0-openrc-fixes.patch
new file mode 100644
index 000000000000..517eaec51faf
--- /dev/null
+++ b/net-analyzer/netdata/files/netdata-1.8.0-openrc-fixes.patch
@@ -0,0 +1,105 @@
+From 3f4db620484e777265a7e5f0cfe10ba840f7eefd Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Tue, 3 Oct 2017 10:52:02 -0400
+Subject: [PATCH 1/3] Eliminate bashisms in openrc script
+
+---
+ system/netdata-openrc.in | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/system/netdata-openrc.in b/system/netdata-openrc.in
+index 465e1232c..5c4eafa57 100644
+--- a/system/netdata-openrc.in
++++ b/system/netdata-openrc.in
+@@ -38,13 +38,13 @@ depend() {
+ }
+ 
+ start_post() {
+-	if [[ ! -f @sysconfdir_POST@/netdata/netdata.conf ]]; then
++	if [ ! -f @sysconfdir_POST@/netdata/netdata.conf ]; then
+ 		ebegin "Downloading default configuration to @sysconfdir_POST@/netdata/netdata.conf"
+ 		sleep 2
+ 		curl -s -o @sysconfdir_POST@/netdata/netdata.conf.new "${NETDATA_CONFIG_URL}"
+ 		ret=$?
+-		if [[ $ret -eq 0 && -s @sysconfdir_POST@/netdata/netdata.conf.new ]]; then
+-			mv @sysconfdir_POST@/netdata/netdata.conf{.new,}
++		if [ $ret -eq 0 && -s @sysconfdir_POST@/netdata/netdata.conf.new ]; then
++			mv @sysconfdir_POST@/netdata/netdata.conf.new @sysconfdir_POST@/netdata/netdata.conf
+ 		else
+ 			ret=1
+ 			rm @sysconfdir_POST@/netdata/netdata.conf.new 2>/dev/null
+@@ -57,20 +57,20 @@ stop_post() {
+ 	local result ret=0 count=0 sigkill=0
+ 
+ 	ebegin "Waiting for netdata to save its database"
+-	while [[ -f "${pidfile}" ]]; do
+-		if [[ $count -gt ${NETDATA_WAIT_EXIT_TIMEOUT} ]]; then
++	while [ -f "${pidfile}" ]; do
++		if [ $count -gt ${NETDATA_WAIT_EXIT_TIMEOUT} ]; then
+ 			sigkill=1
+ 			break
+ 		fi
+ 
+-		count=$[count + 1]
++		count=$((count + 1))
+ 		kill -0 $(cat ${pidfile}) 2>/dev/null
+ 		ret=$?
+ 		test $ret -eq 0 && sleep 1
+ 	done
+ 	eend $sigkill
+ 
+-	if [[ $sigkill -eq 1 && -f "${pidfile}" ]]; then
++	if [ $sigkill -eq 1 && -f "${pidfile}" ]; then
+ 		ebegin "Netdata is taking too long to exit, forcing it to quit"
+ 		kill -SIGKILL $(cat ${pidfile}) 2>/dev/null
+ 		eend $?
+
+From b6d80fb3a3ae60077cbbc1e8dd0d01e1eb3ff67d Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Tue, 3 Oct 2017 14:56:53 -0400
+Subject: [PATCH 2/3] Fix the path to the netdata executable in the openrc
+ script
+
+Fixes #2826
+---
+ system/netdata-openrc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/system/netdata-openrc.in b/system/netdata-openrc.in
+index 5c4eafa57..512d48278 100644
+--- a/system/netdata-openrc.in
++++ b/system/netdata-openrc.in
+@@ -23,7 +23,7 @@
+ 
+ extra_started_commands="getconf"
+ pidfile="/run/netdata.pid"
+-command="${NETDATA_INSTALL_PATH}/usr/sbin/netdata"
++command="@sbindir_POST@/netdata"
+ command_background="yes"
+ command_args="-P ${pidfile} ${NETDATA_EXTRA_ARGS}"
+ # start_stop_daemon_args="-u ${NETDATA_OWNER}"
+
+From b5823e7865851c3cc2381c4fb45716f269a4e85f Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Tue, 3 Oct 2017 15:56:39 -0400
+Subject: [PATCH 3/3] Create the var/cache/netdata directory if it doesn't
+ already exist in the systemd script
+
+---
+ system/netdata.service.in | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/system/netdata.service.in b/system/netdata.service.in
+index 1d4af988a..58cdff225 100644
+--- a/system/netdata.service.in
++++ b/system/netdata.service.in
+@@ -9,6 +9,9 @@ Group=netdata
+ RuntimeDirectory=netdata
+ RuntimeDirectoryMode=0775
+ ExecStart=@sbindir_POST@/netdata -P /run/netdata/netdata.pid -D
++ExecStartPre=/bin/mkdir -p @localstatedir_POST@/cache/netdata
++ExecStartPre=/bin/chown -R netdata:netdata @localstatedir_POST@/cache/netdata
++PermissionsStartOnly=true
+ 
+ # saving a big db on slow disks may need some time
+ TimeoutStopSec=60
diff --git a/net-analyzer/netdata/metadata.xml b/net-analyzer/netdata/metadata.xml
new file mode 100644
index 000000000000..e3471641d82e
--- /dev/null
+++ b/net-analyzer/netdata/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>candrews@gentoo.org</email>
+        <name>Craig Andrews</name>
+    </maintainer>
+    <use>
+        <flag name="compression">Enable compression via zlib</flag>
+        <flag name="ipmi">Install <pkg>sys-apps/ipmitool</pkg> required for monitoring IPMI sensors.</flag>
+        <flag name="nfacct">Enable the nfacct plugin</flag>
+        <flag name="nodejs">Enable use of nodejs (which some plugins use)</flag>
+    </use>
+    <upstream>
+        <remote-id type="github">firehol/netdata</remote-id>
+    </upstream>
+    <longdescription lang="en">
+        Linux real time system monitoring web interface
+    </longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/netdata/netdata-1.2.0-r1.ebuild b/net-analyzer/netdata/netdata-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..02c65adda6e2
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.2.0-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd user fcaps
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/firehol/${PN}.git"
+	inherit git-r3 autotools
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://firehol.org/download/${PN}/releases/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/firehol/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="+compression nfacct nodejs"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	>=app-shells/bash-4:0
+	net-misc/curl
+	net-misc/wget
+	virtual/awk
+	compression? ( sys-libs/zlib )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? (
+		net-libs/nodejs
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+: ${NETDATA_USER:=netdata}
+: ${NETDATA_GROUP:=netdata}
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 / ${PN}
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		--with-user=${NETDATA_USER} \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	fowners ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
+	fowners ${NETDATA_USER}:${NETDATA_GROUP} /var/cache/netdata
+
+	chown -Rc ${NETDATA_USER}:${NETDATA_GROUP} "${ED}"/usr/share/${PN} || die
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+}
diff --git a/net-analyzer/netdata/netdata-1.3.0.ebuild b/net-analyzer/netdata/netdata-1.3.0.ebuild
new file mode 100644
index 000000000000..e7e9b14a560b
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.3.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit fcaps linux-info python-r1 systemd user
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/firehol/${PN}.git"
+	inherit git-r3 autotools
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://firehol.org/download/${PN}/releases/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/firehol/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="+compression mysql nfacct nodejs +python"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	>=app-shells/bash-4:0
+	net-misc/curl
+	net-misc/wget
+	virtual/awk
+	net-libs/libmnl
+	|| ( net-analyzer/netcat6 net-analyzer/netcat )
+	net-analyzer/tcpdump
+	net-analyzer/traceroute
+	compression? ( sys-libs/zlib )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		mysql? (
+			|| ( dev-python/mysqlclient[${PYTHON_USEDEP}] dev-python/mysql-python[${PYTHON_USEDEP}] )
+		)
+	)
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? (
+		net-libs/nodejs
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+: ${NETDATA_USER:=netdata}
+: ${NETDATA_GROUP:=netdata}
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 / ${PN}
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		--with-user=${NETDATA_USER} \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	fowners ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
+	fowners ${NETDATA_USER}:${NETDATA_GROUP} /var/cache/netdata
+
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+}
diff --git a/net-analyzer/netdata/netdata-1.4.0-r1.ebuild b/net-analyzer/netdata/netdata-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..fa90f4bdc014
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.4.0-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit fcaps linux-info python-r1 systemd user
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/firehol/${PN}.git"
+	inherit git-r3 autotools
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://firehol.org/download/${PN}/releases/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/firehol/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="+compression cpu_flags_x86_sse2 mysql nfacct nodejs +python"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	>=app-shells/bash-4:0
+	net-misc/curl
+	net-misc/wget
+	virtual/awk
+	net-libs/libmnl
+	|| ( net-analyzer/netcat6 net-analyzer/netcat )
+	net-analyzer/tcpdump
+	net-analyzer/traceroute
+	compression? ( sys-libs/zlib )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		mysql? (
+			|| ( dev-python/mysqlclient[${PYTHON_USEDEP}] dev-python/mysql-python[${PYTHON_USEDEP}] )
+		)
+	)
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? (
+		net-libs/nodejs
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+: ${NETDATA_USER:=netdata}
+: ${NETDATA_GROUP:=netdata}
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-glibc-sysmacros.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 / ${PN}
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		--with-user=${NETDATA_USER} \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/cache/netdata
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
+
+	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+}
diff --git a/net-analyzer/netdata/netdata-1.5.0.ebuild b/net-analyzer/netdata/netdata-1.5.0.ebuild
new file mode 100644
index 000000000000..f8e7926d3d72
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.5.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit autotools fcaps linux-info python-r1 systemd user
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/firehol/${PN}.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/firehol/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/firehol/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="+compression cpu_flags_x86_sse2 mysql nfacct nodejs postgres +python"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	>=app-shells/bash-4:0
+	net-misc/curl
+	net-misc/wget
+	virtual/awk
+	net-libs/libmnl
+	|| ( net-analyzer/netcat6 net-analyzer/netcat )
+	net-analyzer/tcpdump
+	net-analyzer/traceroute
+	compression? ( sys-libs/zlib )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		mysql? (
+			|| ( dev-python/mysqlclient[${PYTHON_USEDEP}] dev-python/mysql-python[${PYTHON_USEDEP}] )
+		)
+		postgres? (
+			dev-python/psycopg:2[${PYTHON_USEDEP}]
+		)
+	)
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? (
+		net-libs/nodejs
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+: ${NETDATA_USER:=netdata}
+: ${NETDATA_GROUP:=netdata}
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 / ${PN}
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=${NETDATA_USER} \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/cache/netdata
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
+
+	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+}
diff --git a/net-analyzer/netdata/netdata-1.6.0.ebuild b/net-analyzer/netdata/netdata-1.6.0.ebuild
new file mode 100644
index 000000000000..e2948db1d764
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.6.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit autotools fcaps linux-info python-r1 systemd user
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/firehol/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/firehol/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/firehol/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps +compression cpu_flags_x86_sse2 ipmi mysql nfacct nodejs postgres +python"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/netcat6
+		net-analyzer/netcat
+	)
+	net-analyzer/tcpdump
+	net-analyzer/traceroute
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		mysql? (
+			|| (
+				dev-python/mysqlclient[${PYTHON_USEDEP}]
+				dev-python/mysql-python[${PYTHON_USEDEP}]
+			)
+		)
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+: ${NETDATA_USER:=netdata}
+: ${NETDATA_GROUP:=netdata}
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 / ${PN}
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=${NETDATA_USER} \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/cache/netdata
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
+
+	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+}
diff --git a/net-analyzer/netdata/netdata-1.7.0.ebuild b/net-analyzer/netdata/netdata-1.7.0.ebuild
new file mode 100644
index 000000000000..e2948db1d764
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.7.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit autotools fcaps linux-info python-r1 systemd user
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/firehol/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/firehol/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/firehol/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps +compression cpu_flags_x86_sse2 ipmi mysql nfacct nodejs postgres +python"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/netcat6
+		net-analyzer/netcat
+	)
+	net-analyzer/tcpdump
+	net-analyzer/traceroute
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		mysql? (
+			|| (
+				dev-python/mysqlclient[${PYTHON_USEDEP}]
+				dev-python/mysql-python[${PYTHON_USEDEP}]
+			)
+		)
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+: ${NETDATA_USER:=netdata}
+: ${NETDATA_GROUP:=netdata}
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 / ${PN}
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=${NETDATA_USER} \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/cache/netdata
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
+
+	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+}
diff --git a/net-analyzer/netdata/netdata-1.8.0-r1.ebuild b/net-analyzer/netdata/netdata-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..d23f3237e7b5
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.8.0-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit autotools fcaps linux-info python-r1 systemd user
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/firehol/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/firehol/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/firehol/netdata https://my-netdata.io/"
+PATCHES=( "${FILESDIR}/${P}-openrc-fixes.patch" )
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps +compression cpu_flags_x86_sse2 ipmi mysql nfacct nodejs postgres +python"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/netcat6
+		net-analyzer/netcat
+	)
+	net-analyzer/tcpdump
+	net-analyzer/traceroute
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		mysql? (
+			|| (
+				dev-python/mysqlclient[${PYTHON_USEDEP}]
+				dev-python/mysql-python[${PYTHON_USEDEP}]
+			)
+		)
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+: ${NETDATA_USER:=netdata}
+: ${NETDATA_GROUP:=netdata}
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 / ${PN}
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=${NETDATA_USER} \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/var/cache/netdata" || die
+
+	# Remove unneeded .keep files
+	find "${ED}" -name ".keep" -delete || die
+
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
+
+	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+}
diff --git a/net-analyzer/netdata/netdata-1.8.0.ebuild b/net-analyzer/netdata/netdata-1.8.0.ebuild
new file mode 100644
index 000000000000..e2948db1d764
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.8.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit autotools fcaps linux-info python-r1 systemd user
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/firehol/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/firehol/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/firehol/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps +compression cpu_flags_x86_sse2 ipmi mysql nfacct nodejs postgres +python"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/netcat6
+		net-analyzer/netcat
+	)
+	net-analyzer/tcpdump
+	net-analyzer/traceroute
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		mysql? (
+			|| (
+				dev-python/mysqlclient[${PYTHON_USEDEP}]
+				dev-python/mysql-python[${PYTHON_USEDEP}]
+			)
+		)
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+: ${NETDATA_USER:=netdata}
+: ${NETDATA_GROUP:=netdata}
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 / ${PN}
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=${NETDATA_USER} \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/cache/netdata
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
+
+	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+}
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
new file mode 100644
index 000000000000..7c343955b897
--- /dev/null
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit autotools fcaps linux-info python-r1 systemd user
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/firehol/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/firehol/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/firehol/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps +compression cpu_flags_x86_sse2 ipmi mysql nfacct nodejs postgres +python"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/netcat6
+		net-analyzer/netcat
+	)
+	net-analyzer/tcpdump
+	net-analyzer/traceroute
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		mysql? (
+			|| (
+				dev-python/mysqlclient[${PYTHON_USEDEP}]
+				dev-python/mysql-python[${PYTHON_USEDEP}]
+			)
+		)
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+: ${NETDATA_USER:=netdata}
+: ${NETDATA_GROUP:=netdata}
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 / ${PN}
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=${NETDATA_USER} \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/var/cache/netdata" || die
+
+	# Remove unneeded .keep files
+	find "${ED}" -name ".keep" -delete || die
+
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
+
+	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+}
diff --git a/net-analyzer/netdiscover/Manifest b/net-analyzer/netdiscover/Manifest
new file mode 100644
index 000000000000..dc6bc51452ff
--- /dev/null
+++ b/net-analyzer/netdiscover/Manifest
@@ -0,0 +1,8 @@
+AUX netdiscover-0.3_beta6-gentoo.patch 668 SHA256 4fb4bd72d2a263208ad517b91046c8afd2391ff633214fe407a3ecb61d167430 SHA512 f05aea3f8ef120f3f1a33f1dfff401fc5045cb6e71735dcdc135bb33b5bb338eb90fb442d474a0e8a993df5d67f70fcd676f12c582ca1509d5550724d4f53b99 WHIRLPOOL 44aff796a09406d5f91ca7f5caf804d9325bb986bbe70f8d34da4066b88ac9a1918a938a715367a2624766df98470ac850aef5346f7d246371369c3689afbd3c
+AUX netdiscover-0.3_beta6-misc.patch 432 SHA256 2470d403350dd1cbce6f7fa89fbea1207397900d60fda7a46a4f34ab8109f4f3 SHA512 bf67008aa25558d2a8d1a2a5731fdafb555b5336db2be3ffc6f15e89312341eff9bd351115a2cbd21078d823f4b79a81f0583b0380d44eb617a2770838c07de7 WHIRLPOOL 3a655a6568362e97568b4b1fc31411cc62931c92bda991896a6b4f34d7b01836370012c749e47739eed73ee852f2f8a8aa31fcf9166c302917fe7a4624f3ce9f
+DIST netdiscover-0.3-beta6-oui-db-update-20091010.patch.bz2 151434 SHA256 81d06920e0606ec74a497ca4b34b0288572b9be82093bc19e3b812c036fba9f6 SHA512 936f030bac30cf54d1b9b6bb23045c2cad201a21529706436ab0732c356dc4ab27e3f2a8472437f9ac76d9b819ebc6d8faa05405be13d3d6beda5e261ebf93da WHIRLPOOL fe95a550fa41aedb75bad90cbfebe1b14c63b6f1d1edc2caf82a689bc2740d65b07836701e6f1e8e541eabbd3c35c432ba3a8e771d89f5b4e3e6812f835e6fdb
+DIST netdiscover-0.3-beta6.tar.gz 411018 SHA256 19c367f823c49999e2c05c485cac0a5d5685d23c6b33deae1e957406571924db SHA512 b8205322c34684642d52bf58f8fffa12a0dea387da713caf2935ba348c74b2e6cac717bf1626c9de816e45dce7c42b6b9584b5253351040af806f7ba262ce4d2 WHIRLPOOL 9386451a26a3fb147aadd772bfc71c89cc67185c54c24b306fc421b43799f00402ff383c96944945b06baf90ad22ff409dc0c57a4370b98a20a89951595310fb
+EBUILD netdiscover-0.3_beta6-r3.ebuild 806 SHA256 5a86f803c057915b7d431108eb2fa8ae65d07913c08080e6e1c071f9e292d9ce SHA512 0ab1f50c3c82a95996ecbdbbcb61c09281bb58ff4a3561f73327a7ed26cfc0ce2f23ede1e2984b5774e89b36bc9da2d1ff9684c2fc21f54e88b31b8212319366 WHIRLPOOL cd5e7eff642c9e829fc99e730ff3ccfaf159468596c9731a3d26729a6ae3805d9c0e5249182c22c8f963ad2d69e80f09960281fc8ce33532f98a216d5f8d2cf2
+MISC ChangeLog 2545 SHA256 715a031b1309b513b1894ab6e8600340e444a64f18949ee4b9e66ed25f4583d8 SHA512 affe806714b16942acf42c8089211091d18eda3926a9ac0bcf4743af198b1ed3d2d7a4e1de5c59e42bf2363776a4acef4619ceb76d1cb99cf4f51ffce48c0dff WHIRLPOOL 118e5e720904673ff846f3f02dbe9b32b7a1b38fb3316e3efae86b250795f2b54c2f79c838204632bae2173bb77183f88be9e8a0b43e057ecbd3dbbb0ce98130
+MISC ChangeLog-2015 2503 SHA256 a635b41a286949d48b2fa068efb0ced2036c85ea256c0ecb236a0dabfabf9182 SHA512 bb1bdf3c384c14f695c757bde3aba08bf075e94affcaa087c4361445dbd4ad53151cf5184d1b37cc0058e77f4e87a5184e62c1a614ccc7329eb38968cbb4c4fc WHIRLPOOL 9a86c4b48188b8815ddbdd5cac4c0795584abc34ff0e40add36f3d8cd9f1c71e352e372fab795bfe1da9a1f0f2e0e25e24873944fc5f425fc94067dafa541c59
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-gentoo.patch b/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-gentoo.patch
new file mode 100644
index 000000000000..d70fc36de5a5
--- /dev/null
+++ b/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-gentoo.patch
@@ -0,0 +1,41 @@
+--- a/configure.in
++++ b/configure.in
+@@ -5,7 +5,7 @@
+ 
+ AC_INIT(configure.in)
+ AM_INIT_AUTOMAKE(netdiscover, 0.3-beta6)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_MAINTAINER_MODE
+ 
+ dnl get system information
+@@ -35,7 +35,6 @@
+ 
+ AC_ISC_POSIX
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ 
+ AM_PROG_LIBTOOL
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -5,8 +5,8 @@
+ 
+ SUBDIRS = src doc
+ 
+-netdiscoverdocdir = ${prefix}/doc/netdiscover
+-netdiscoverdoc_DATA = \
++noinstdir = ${prefix}/doc/netdiscover
++noinst_DATA = \
+ 	README\
+ 	COPYING\
+ 	AUTHORS\
+@@ -15,7 +15,7 @@
+ 	NEWS\
+ 	TODO
+ 
+-EXTRA_DIST = $(netdiscoverdoc_DATA)
++EXTRA_DIST = $(noinst_DATA)
+ 
+ 
+ 
diff --git a/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-misc.patch b/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-misc.patch
new file mode 100644
index 000000000000..2b92bfde8629
--- /dev/null
+++ b/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-misc.patch
@@ -0,0 +1,20 @@
+--- a/src/misc.c
++++ b/src/misc.c
+@@ -33,7 +33,7 @@
+ 
+ char *search_vendor(unsigned char mac[6])
+ {
+-	char tmac[6];
++	char tmac[7];
+ 	int i = 0;
+ 	
+ 	sprintf(tmac, "%02x%02x%02x", mac[0], mac[1], mac[2]);
+@@ -42,7 +42,7 @@
+     for (i=0; i<6; i++)
+         tmac[i] = toupper(tmac[i]);
+ 	
+-	for (i=0; i<8436; i++)
++	for (i=0; i<NUM_OUI_RECORDS; i++)
+ 	{
+ 		if (strcmp(oui_table[i].prefix, tmac) == 0)
+ 			return oui_table[i].vendor;
diff --git a/net-analyzer/netdiscover/metadata.xml b/net-analyzer/netdiscover/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/netdiscover/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild b/net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild
new file mode 100644
index 000000000000..77fc58fcf331
--- /dev/null
+++ b/net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils autotools
+
+DESCRIPTION="An active/passive address reconnaissance tool"
+HOMEPAGE="http://nixgeneration.com/~jaime/netdiscover/"
+LICENSE="GPL-2"
+SRC_URI="
+	http://nixgeneration.com/~jaime/${PN}/releases/${P/_/-}.tar.gz
+	https://dev.gentoo.org/~jer/${P/_/-}-oui-db-update-20091010.patch.bz2
+"
+
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+DEPEND="
+	net-libs/libnet:1.1
+	>=net-libs/libpcap-0.8.3-r1
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P/_/-}
+
+DOCS=( AUTHORS ChangeLog README TODO )
+
+src_prepare() {
+	epatch \
+		"${WORKDIR}"/${P/_/-}-oui-db-update-20091010.patch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-misc.patch
+
+	eautoreconf
+}
diff --git a/net-analyzer/nethogs/Manifest b/net-analyzer/nethogs/Manifest
new file mode 100644
index 000000000000..4e14bbf51be9
--- /dev/null
+++ b/net-analyzer/nethogs/Manifest
@@ -0,0 +1,7 @@
+DIST nethogs-0.8.1.tar.gz 35986 SHA256 4c30ef43814549974a5b01fb1a94eb72ff08628c5a421085b1ce3bfe0524df42 SHA512 f1af7bb7208d08fc3a51bb38ee475da5a7b8f8814e2a7a653057d0c5d6b4e73be7742ffef5569525822160971f81dd22212d6854483928e621cfddce8d98409f WHIRLPOOL 4595abdb530329f41dc4d3c4e6ab8cf87a8589d9cd6f8f217644f435449c86747c66ed9884a2afcc858b7eaa9d216ef8d686bc7c5eff84bbec98151bea9ab6c3
+DIST nethogs-0.8.5.tar.gz 112385 SHA256 6a9392726feca43228b3f0265379154946ef0544c2ca2cac59ec35a24f469dcc SHA512 a2be81fcebc9925dd8a0fd9f71c6e790206819e0cc5efeeeb0c741baa9fd25ec685a1784b6d331d938cf14381403f9c13d619509d0ffe713ce8786a83a380908 WHIRLPOOL 6316e96fa87afb13d62436395415bb9acd090d7a2de4c3eb7496c2b11419c3c9d35a8bdd3e4944f5023c038f7b72200917fa108721aa8b0add43deffc95f9eea
+EBUILD nethogs-0.8.1.ebuild 679 SHA256 5e86e4f5fa6bd25d0733c1d62f638668adf3acb5d4b98d6f965dc3edfb688b41 SHA512 76fa00e33e4055259e67843469bdee9433c3d0499e1301b3962e1a2c55417d671eac99c8c08c54671c468e4da58c5faabb8e2461f9b179dac7b20011dff03368 WHIRLPOOL 65791823d3e1ad0e574832db9e42b6ebe5f201164c7a605004972cd2a7b4d2744488ea4b7ccb1d9f2d519c145f1d2c403b6bd2da92b17ec8b77c0dfa93e20166
+EBUILD nethogs-0.8.5-r1.ebuild 689 SHA256 b41d00b92a35132cd0fd404ffe0fe5df9e2f2115b93e83d7898b8d6d5d92f1cf SHA512 da5cd91218bc70ba87be1998f7641221cb39f3d6bfea73d1d6e1deadead85b8c849c5751f8c747ec698b2a5c9ef1fdc343ae26dbcae1c267d722d527b83e33c7 WHIRLPOOL fe91c3dd91dac3b157dc01c4f6b1d186b84f1106484552c76394e3c5f77ef7911b1de7fd75886bf8fe5d95ec75e9f76755c75d91f755dba912b6ec0de928f8eb
+MISC ChangeLog 3122 SHA256 ee656545e75d2323dff31afa9880682908b81c6e43eed13d107ba10e1c58aa9e SHA512 2c49b74a443129c931c3dda399dbf38120bbf2cdb995e51edc6d2f056c0b53a67c42a649074bd974ae01b5b2ee3901a4bef9af33419b859cbeef1cd862dadcaf WHIRLPOOL fc534697adf98b18f1e119cb34f65939107d0b006e9dd3213b44737a32526f3ad2c091f3ca9dacc17351431e0413511ae8feabb5b991c86ecb56c9ec678846f4
+MISC ChangeLog-2015 4208 SHA256 6969a8aa05f8933806865a18c744b7ad655116c916bbf41772d83252484cb972 SHA512 14ed0f6bacaf205d9a84fb4a76d92679439cda7c21427f398bb068c85679054e6c1d2afe2e42ff571b2e50844d7e12b76e1f21d572e0147bf52c2e62da3f52e8 WHIRLPOOL 10770e00cacec13bb54560011a7d83f56f82a3f6a70d608eb0a771f11d5b3b931812dfe6aefe3678358b16735f6c4838f0a1d492aec50f4e72a2775d25b414cc
+MISC metadata.xml 891 SHA256 c91c18b1138c8beb0535953184aec137cfb08669fee53d2ab5bb823b90742dd1 SHA512 a35aac4c7bdd3b013efc2553947c625a7f5d5ded3a4c8f7abce732ae3d59e148abacb929d28266abf3585cdf47e776a81fb25d388e477a011a1201d280d90620 WHIRLPOOL 6d541326e21f60d9c7e60a0feb6aab3396bc3d4888db82262ea9f9b00ce223056598e4f42e9f29ec7f7e2173f7131e1891f7e940f7055b263a90d7f29548e612
diff --git a/net-analyzer/nethogs/metadata.xml b/net-analyzer/nethogs/metadata.xml
new file mode 100644
index 000000000000..1b55544df345
--- /dev/null
+++ b/net-analyzer/nethogs/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>
+NetHogs is a small 'net top' tool. Instead of breaking the traffic down
+ per protocol or per subnet, like most tools do, it groups bandwidth by 
+process. NetHogs does not rely on a special kernel module to be loaded. 
+If there's suddenly a lot of network traffic, you can fire up NetHogs and 
+immediately see which PID is causing this. This makes it easy to indentify 
+programs that have gone wild and are suddenly taking up your bandwidth.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">nethogs</remote-id>
+		<remote-id type="github">raboof/nethogs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/nethogs/nethogs-0.8.1.ebuild b/net-analyzer/nethogs/nethogs-0.8.1.ebuild
new file mode 100644
index 000000000000..8a31eb5993fc
--- /dev/null
+++ b/net-analyzer/nethogs/nethogs-0.8.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="A small 'net top' tool, grouping bandwidth by process"
+HOMEPAGE="https://github.com/raboof/nethogs"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ia64 x86"
+
+RDEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses:0=
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_compile() {
+	tc-export CC CXX
+	emake NCURSES_LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="/usr" install
+	dodoc Changelog DESIGN README.decpcap.txt README.md
+}
diff --git a/net-analyzer/nethogs/nethogs-0.8.5-r1.ebuild b/net-analyzer/nethogs/nethogs-0.8.5-r1.ebuild
new file mode 100644
index 000000000000..96e845c300c7
--- /dev/null
+++ b/net-analyzer/nethogs/nethogs-0.8.5-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A small 'net top' tool, grouping bandwidth by process"
+HOMEPAGE="https://github.com/raboof/nethogs"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~x86"
+
+RDEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses:0=
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_compile() {
+	tc-export CC CXX
+	emake NCURSES_LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )" ${PN}
+}
+
+src_install() {
+	emake DESTDIR="${ED}" PREFIX="/usr" install
+	dodoc Changelog DESIGN README.decpcap.txt README.md
+}
diff --git a/net-analyzer/neti/Manifest b/net-analyzer/neti/Manifest
new file mode 100644
index 000000000000..f777b83aa60e
--- /dev/null
+++ b/net-analyzer/neti/Manifest
@@ -0,0 +1,7 @@
+AUX neti-init2 375 SHA256 fd97497182e2b01ce743a9e62a28d2f8741e3d19281567c1f27bd32e58a7c229 SHA512 37019c01645c720e425354783b6f98a18ad7ec7ee335c393621f4fbb5f04bca8079d47c24f8961abcbcddca8588725e85c6656a4c92ec9749cdbff4ddfe59707 WHIRLPOOL ab1042255c68c58aa0ac7744a899b028ec3e15c675daaeaa8be47b79bf73762483cc209ff4d584da6ae8bfda4dc4a60c62695770a2f22f936e8d9d63b61deeb6
+DIST neti-2.0.tar.gz 383442 SHA256 483f2955baa17a1143ea60ead4a6744f4802dbe8a8a55ad22bd9992322a6e867 SHA512 5a1156195106e8dcb738c5d2efdd88b77803fa16145db182f2d782a21316fac18af6812b264ece3bc49a5d6713b2aa86aca13129edd01753bf5cf0dd33b1aeb5 WHIRLPOOL 2a4cc1701e30b43f436adf9097c143c8f0cf5b0c49319f81626261a2ad6bfd9f42ad27bcd1fa8aa38d4d6cfbd9662996380c4fd8c791434a6ff766997cb84f20
+EBUILD neti-2.0-r1.ebuild 1021 SHA256 80ce5b5f54a691cce2f2ab2ec3ac2e9fe53c4f3afbedd60f0259fe75f3a2e3cd SHA512 5cf91367c8b51b6e4a58382917dd20623aa31b3e4e9e09e4bbd2c9907b4abcb03e4b6502f2fb8a8e20b01b3ec6032706759a90df0dcde22d5f0c9950620f7ff3 WHIRLPOOL 3235ea5ef228f4c6447314733429472e466ae2e534e67b83a019bf7124cadc924a1b550d20180d8b38a8c5e5f95ce91d75ca7493094106be0ed7e1eb88315d65
+EBUILD neti-2.0.ebuild 1172 SHA256 83c0b29d587a55de881fd1a22311f175b7bb79eb35c4c154fadec42e933b5b3f SHA512 c85b1424df14b4c5ea2b8a22ef46c73e744decc6dcbb448e9062c5fcb828c0d52b0c0f91ed857c7dcdfe46bd627ef64ddb182c97eee1a7fcd533a6cb397d5791 WHIRLPOOL 396e192df0f97f9cc621c1a891ee540821ebf936a57327a2a0e456cc5f611604b7dd822b3f0cd7f2aeb2b8ddd638099c37cc47eea21c6536664f4806492578b2
+MISC ChangeLog 2612 SHA256 202f6a8114ab8f2b2d78615f35f86d4771057102774d10980681f20ff11ef10b SHA512 5d5ebe3f0291a86cda6aeda408700a8ca6ecc420e0263139ddd87efb4db310343038a304ef85e2e52ce4842640724cd09edd7ffa8419de2de779a4d8d67398f1 WHIRLPOOL 32f85aa8143406a1e0e54521a14e42d6ccfb8bf21f951a5a276f29eb5b680d20a03f596a2ca48ccb32e11dd5f38323e7e83661834e18b40c2c6ac2af7e5b9e72
+MISC ChangeLog-2015 2912 SHA256 9773f6ab9c5524761000ce067891f230faf542a3e349b74f4cd1795aef749216 SHA512 5465136d2fde717439949c2fd2ea21332d937faf3aa525f8eef622afeda591cf12f5d3eca80afff73332601df98fae77fe9101728ad86ab3a0b4b44da0eb2055 WHIRLPOOL 6d7fab79fc81a43ab4074b4f7a98a48088d7572ab4751d0c300788cb7b1d4cb67d1a9aa1c3eefd06778d0e4ecd91713a210f22a22ac22689cf36ed240cbc2030
+MISC metadata.xml 354 SHA256 87cb930bf3bf672af0942d38fadd9c578ed3b0191b00a48fbe01257513c61446 SHA512 3108cabc42dbe541365c68cd0052ed08d163a100531509c1cacbe20c48f1e2926c32cefdbc393e0d2fd2bc6ac3bce933edffa0e049f4bc012ea69f76b7eb6bde WHIRLPOOL 544c2022f08719acb67dec1bef1a21f6117a304952249b180be959aeb311a3a3b7ffcae85f906f85dba6e2211f1d6cf4734e0ddd497e7421e20331900b831e48
diff --git a/net-analyzer/neti/files/neti-init2 b/net-analyzer/neti/files/neti-init2
new file mode 100644
index 000000000000..556660cae489
--- /dev/null
+++ b/net-analyzer/neti/files/neti-init2
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+    need net
+}
+
+start() {
+	ebegin "Starting netiathome"
+	start-stop-daemon --start --quiet --exec /usr/sbin/neti -- -D
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping netiathome"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/neti
+	eend $?
+}
diff --git a/net-analyzer/neti/metadata.xml b/net-analyzer/neti/metadata.xml
new file mode 100644
index 000000000000..95148c0af8a3
--- /dev/null
+++ b/net-analyzer/neti/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">neti</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/neti/neti-2.0-r1.ebuild b/net-analyzer/neti/neti-2.0-r1.ebuild
new file mode 100644
index 000000000000..453c5877d209
--- /dev/null
+++ b/net-analyzer/neti/neti-2.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="NETI@Home research project from GATech"
+HOMEPAGE="http://www.neti.gatech.edu"
+SRC_URI="mirror://sourceforge/neti/${P}.tar.gz"
+
+KEYWORDS="~ppc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="zlib java"
+
+DEPEND="
+	java? ( || ( >=virtual/jdk-1.2 >=virtual/jre-1.2 ) )
+	net-libs/libpcap
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+src_configure() {
+	econf $(use_with zlib)
+}
+
+src_compile() {
+	emake NETILogParse neti
+
+	use java && emake javadir=/usr/share/${PN} classjava.stamp
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		install-sbinPROGRAMS \
+		install-sysconfDATA \
+		install-man \
+		install-info
+
+	if use java; then
+		emake \
+			DESTDIR="${D}" \
+			javadir=/usr/share/${PN} \
+			install-javaJAVA \
+			install-javaDATA
+
+		echo cd /usr/share/${PN}\;java -cp /usr/share/${PN} NETIMap > "${WORKDIR}"/NETIMap
+		dobin "${WORKDIR}"/NETIMap
+	fi
+
+	dodoc README AUTHORS
+	newinitd "${FILESDIR}"/neti-init2 neti
+}
diff --git a/net-analyzer/neti/neti-2.0.ebuild b/net-analyzer/neti/neti-2.0.ebuild
new file mode 100644
index 000000000000..fdb2705520c2
--- /dev/null
+++ b/net-analyzer/neti/neti-2.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="NETI@Home research project from GATech"
+HOMEPAGE="http://www.neti.gatech.edu"
+SRC_URI="mirror://sourceforge/neti/${P}.tar.gz"
+
+KEYWORDS="~ppc x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="zlib java"
+
+DEPEND="java? ( || ( >=virtual/jdk-1.2 >=virtual/jre-1.2 ) )
+	net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+src_compile() {
+	econf \
+		$(use_with zlib) \
+		 || die "econf failed"
+
+	emake NETILogParse neti \
+		|| die "emake NETILogParse neti failed"
+
+	if use java;
+	then
+		emake javadir=/usr/share/${PN} classjava.stamp || die "emake classjava.stamp failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-sbinPROGRAMS \
+		install-sysconfDATA install-man install-info || die "emake install failed"
+
+	if use java;
+	then
+		emake javadir=/usr/share/${PN} \
+			 DESTDIR="${D}" install-javaJAVA install-javaDATA || die "emake java install failed"
+		dobin /usr/bin
+		echo cd /usr/share/${PN}\;java -cp /usr/share/${PN} NETIMap > "${D}"/usr/bin/NETIMap
+		fperms ugo+x /usr/bin/NETIMap
+	fi
+
+	dodoc README AUTHORS
+	newinitd "${FILESDIR}"/neti-init2 neti
+}
diff --git a/net-analyzer/netio/Manifest b/net-analyzer/netio/Manifest
new file mode 100644
index 000000000000..d55a63b666df
--- /dev/null
+++ b/net-analyzer/netio/Manifest
@@ -0,0 +1,6 @@
+AUX netio-1.26-linux-include.patch 237 SHA256 bff0aa5ec62c0874f3c95bb87c2dbc292595f99fa631de006315a0493b84d804 SHA512 9b8b75f9b4a74690ec4cffaf777bd4f5a46e12880c8919edd91fa853d0b1edcb034b7baa96eafbc7f43d85046d7d4cebb15fca5e6b7402c71f629b56681d0de2 WHIRLPOOL cccaf94844ddfa451bf8bebe8532a73d888c3a2a496b1f83f49fa60b3121cfca8fc7b9303d60714fddb239aa5b0c85e894ca838835851ac9f6b31569e51af7f4
+DIST netio132.zip 162484 SHA256 c21550dfac6634558a7a79957eed28c46c62e0543017ef9d5c97c49f3cd41ddd SHA512 3473b6b41c4a1e054fa0eb3316bc16e799034b4b9402c7751f29724d8ec70c674d3de59140fdbdc301c53f2a24b44d58e8cd50a68f107bd892b1d17b6e695232 WHIRLPOOL 105a55d85292c19d13e8cf61200d1cc6e51b17c061f32adf859f66f53b4000775f2eb248cd767895767369d7cc58963356da61cda7808c4b05c94d0e400f1b31
+EBUILD netio-1.32.ebuild 1006 SHA256 0348f75f9f065f32c2aa6be519a06bf1ce2973580a11eef336d1c6e69346a49a SHA512 928734b1b9172f0ca1cd9f93df69079424ffe4942b81901c13659393b51a519e6bec51afb342cc9752c766db6959240cd79f01c1411fcbd3fd228743b90d262d WHIRLPOOL 260ba15f94e64b3f42e3f25b8d75e33f70f482de50eac4dbe59ec1ad205f63fd47de1471c40c5222c7f4104a88efc54fadbcac7a6f952904dbe22f45c2e1d2dc
+MISC ChangeLog 2462 SHA256 06fdf3cb4feaa1179e2f1a5d120e36db3e453b3f36df7195c94cd35ac17755bf SHA512 03ab353ffc02b580c88907770bf042271b0fdfe7df75af3e3a3f85a7469fb8b13059ab442ab056d41e1496f6147cd2d237b01550e217894cdb11ba12f35b0f9c WHIRLPOOL 9ecb51e7ff07add72bd22824e6a11c8e3d03f775a8351867d1027cf0409aa0410f541c474844ce988a65f7b685943d45cdfbe3801a5e9f600ba1842f9ec17f81
+MISC ChangeLog-2015 6456 SHA256 353a16432cb678a1f6a5b4fd9405d03ee1aaec7513791edb66f65b40b411dc30 SHA512 4732a1bd023a6dc13c5941cd502a4efc0a4982f2e9f00f7ff2b2524795d021ffe868dbe8f7f0cb6a47a0f1f51251382f43709ef69573c74c1afc2c26b865be56 WHIRLPOOL bb3b2819da2f4b0c9c9c99237e743fc02438d49433770ed07413f1bb88c4e35174acbc2f245e298e9cf3d1e0d1ed886038b97732a59ed22db537217457765318
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/netio/files/netio-1.26-linux-include.patch b/net-analyzer/netio/files/netio-1.26-linux-include.patch
new file mode 100644
index 000000000000..e006c82d71aa
--- /dev/null
+++ b/net-analyzer/netio/files/netio-1.26-linux-include.patch
@@ -0,0 +1,13 @@
+Add missing include (see inet(3)) - JeR
+
+
+--- a/netio.c
++++ b/netio.c
+@@ -199,6 +199,7 @@
+ #include <sys/time.h>
+ #include <time.h>
+ #include <netinet/in.h>
++#include <arpa/inet.h>
+ #include <netdb.h>
+ 
+ #define psock_errno(x) perror(x)
diff --git a/net-analyzer/netio/metadata.xml b/net-analyzer/netio/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/netio/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/netio/netio-1.32.ebuild b/net-analyzer/netio/netio-1.32.ebuild
new file mode 100644
index 000000000000..2f43e6a30a2d
--- /dev/null
+++ b/net-analyzer/netio/netio-1.32.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="a network benchmarking tool that measures net throughput with NetBIOS and TCP/IP protocols"
+HOMEPAGE="http://www.ars.de/ars/ars.nsf/docs/netio"
+SRC_URI='http://www.ars.de/ARS/ars.nsf/f24a6a0b94c22d82862566960071bf5a/aa577bc4be573b05c125706d004c75b5/$FILE/netio132.zip'
+
+LICENSE="free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+RESTRICT="mirror" # bug #391789 comment #1
+
+DEPEND="app-arch/unzip
+	>=sys-apps/sed-4"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	edos2unix *.c *.h
+
+	sed -i \
+		-e "s|LFLAGS=\"\"|LFLAGS?=\"${LDFLAGS}\"|g" \
+		-e 's|\(CC\)=|\1?=|g' \
+		-e 's|\(CFLAGS\)=|\1+=|g' \
+		Makefile || die
+	epatch "${FILESDIR}"/${PN}-1.26-linux-include.patch
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		linux
+}
+
+src_install() {
+	dobin netio
+	dodoc netio.doc
+}
diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
new file mode 100644
index 000000000000..36e12e0b0c4a
--- /dev/null
+++ b/net-analyzer/netperf/Manifest
@@ -0,0 +1,17 @@
+AUX netperf-2.2-conf 103 SHA256 9dce33f9552ce91ed5dbf57f44bd3d64a83aeb67ed9a41952a6c69601a10e340 SHA512 88a0d19c59a054071f472e62e6afd8c5fe37a77802dedea3adc82df0701f280c0ad8b5410e7fab74302861bc45920d38d576cfea1d8baa01cd5739801acb3b60 WHIRLPOOL 30bb26aab461eb024e80fdbb663ea334f0112d7bb1c6d6d4c83ccd017efab4a945a1ed2f6073a122de7a9e6888a4fd11787744ce8d236f22ab3b88a93ad61eb2
+AUX netperf-2.2-init 434 SHA256 2c0a09d31fc45c53d5362a97fc0f443c574b520d4613dc944fab540699bd6ad4 SHA512 ec09907d7e3bf9c38e6d142dd605c71620b790ece71685a347906fe1de103a6317345ab9181a618a14173380b155ceaa6a629fe3e33b571f038bde9074dfc112 WHIRLPOOL 9cd4f78fde842cbd7f7ab4271fda3b59216520fa459f9d8934d7124210413768c92ea7ad17759dc92523b025244707c7de5f3bbd6c6c6d2e00ca6ed3ba064a1d
+AUX netperf-2.6.0-log-dir.patch 261 SHA256 c5449f723cc26e3ebada62d954e5b8dbad3b0996db18401c816fa756905eedbb SHA512 108ab43c36041df5051cb1a130d33e42589c020dac296230a325ee4e1805ea2b3bbcb5cd1438cd4abe4d922ff5536410be9364eaad9044a3181c9acdc7b91bb6 WHIRLPOOL 197919f1204465ad813849ab6b6f4ee24f7fe2f5aaf7072ab6f4159a5713163041dffa6e721a066552b0b7746b353b84255a0aceca478993ee229f37dbbb20fd
+AUX netperf-2.7.0-includes.patch 468 SHA256 dcd9ca94d89cf6624d52b9dd8aa7e68d7ac47032ce964049d0faa591731f6270 SHA512 aec77b7a97e83a93d847f0935bd599d7497b3b749bb0cdb722d96cb49535b3eef9b7b9f60388f5cb2de726b4084abd9cd48614d73bc63b34c7bc0fcfffb0fd3f WHIRLPOOL cd740bf0a4a3029f63b44ff0f33e55ae4e7c09a897ff5eb4770269a36c342be7c8c0c77f7a55eb0c277fdc75890a3ca8cd0bc83ad5dcca3b0305f489491ec3c8
+AUX netperf-2.7.0-init 440 SHA256 a0e39a50e640042016fa880519a95fedcf5aa71ac9780e5efa98e9face076f49 SHA512 ed5a56d77f47aa01545be64104decc2893179c80094c50bb023b96b751cb5aa34ec8f18d606b0570bef47037bedf415250d9b55157f5e24c97e246f6f9643a36 WHIRLPOOL 9cbd3b6aaf622f2306d391bb7ace80fdc2e5b67a4eb999f57a945a1d404b248cf4fd632ac5b7f0a8a93a680aed5932fa3f7439ec2531f17c6f03f981f5d1582f
+AUX netperf-2.7.0-inline.patch 974 SHA256 07dba8cf543889f9b28b52c8ff9310f9656d2dc6235a0d6e7b9e52e052309f2f SHA512 9b9c542724456b49ea51c29d6b807edf938db105adfff57a06a9fdc76c5259019450d9ee674ea4e797b973542ea43377ee83332d391bcf14913e395a76a3d76c WHIRLPOOL 3c677547c45c05895b52e68770e3657e77462d464c9b160035cb71ea131aa668240fe55ca2b6bc8a99afc3a7d0b21440082b3910b4582ef6a858344efe83a514
+AUX netperf-2.7.0-space.patch 455 SHA256 607217572c3bf6e1fe7428ef057357157ff78c7075dd95d288678f85b571ff36 SHA512 e39bfcec70da00fa886b1f8389f54eca6bac83fc8ff48a72427fcd30c3f605e4ec2d01d2f7161ae0fa26bd56283c03593caf756db7d808f0e3e4d3a90d50f1fc WHIRLPOOL c384d51e410289da3f5298741b1924dafe5a18040e52c5c0f75496f5f36d8298c19d85b6dcc0ecd67aa7bd2b5e0df849c804edac7d1cf4ba761a47de0b453303
+AUX netperf-fix-scripts.patch 819 SHA256 2dd29e6134f769cfff036945ebbb63e6f10338c95a1d5705c374f63c2d81ac30 SHA512 d82b01695c432be2f7312641b5599514bf21ca4586f15406aa087034de8d7b66f000eafd02f685c56062a8639ff4158e01d56835e6b8c53baf46481b0a3d0f1a WHIRLPOOL eaf301c87e6fd04fbeb6bc2eb33f69036f885dfc8025257a0494d15bb201472d8e2e2b806e01f4634c5f52e3dd43c0f8a13d3b8010b84129ccb808c3ea68a2f0
+DIST netperf-2.6.0.tar.bz2 1032953 SHA256 cd8dac710d4273d29f70e8dbd09353a6362ac58a11926e0822233c0cb230323a SHA512 b3921d2e887088b14a8bbe5ace9b1cc0c8b29951eeaa7857ce3f324933397c8ff6b56eeacfe755181ce1a56c982fe431955f6db55bd20f2343324e22ee23c9b3 WHIRLPOOL b602c8660bae59648cbbe9eed47ee9d86b0ae714bc0c2906e80a14d0ce18951f125f3331f90acd776850b04506e37030545084677f6be512477ea37f76d972e7
+DIST netperf-2.7.0.tar.bz2 1024430 SHA256 842af17655835c8be7203808c3393e6cb327a8067f3ed1f1053eb78b4e40375a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad WHIRLPOOL 66c81e418750d67bfa15d6f1e3cd7a3a65f1168ebb080263cf70e0f3fe023a8128bfc559249268ec8e597ef3db5acdf5509861f12f8f49c6b2586e679014e34a
+EBUILD netperf-2.6.0-r1.ebuild 1666 SHA256 c587be6c47acda218a2793654c391345239b25bae4a34fdb14f5ea80861313f8 SHA512 59808e4719f87cdff58a090c8669f481d4c850a08ed8023e5fd4be837b23f7faa7b99c8f91dca300586e1d70cc20d1a727c433fe264b26c6b68916b9f0e68194 WHIRLPOOL 09bf41eac1524930dbeca8777f8ac6e9ec0c52f3912a00ac21ce30e5e82638d2fe2ab26bd5e324bd3030b74d5df80a839f66a3e45b873ed9e5009276b6cfb57b
+EBUILD netperf-2.7.0-r1.ebuild 1877 SHA256 5ce447fd66a185153ccd100e1db8f5119b56c58a388565baded1bf975c120835 SHA512 a1cbc73bf527e97afdfa88b3644d2f459138363fc8232a5a657b502214fd0d3eb0b48579831df7c56c07ec954b41724ee7cd1555a74d9229ff796cb50e7c7e6f WHIRLPOOL eebdee296487c79a26d4c4bbd95dd1e263a282e86e974b11f872220413abd88ee9c80095d6b85f60c0c457685e69c74f1356c5d0d74761f2a294b78fea8931c6
+EBUILD netperf-2.7.0-r2.ebuild 1928 SHA256 a99822044af5590a84b1bc418d87b2400750d35cbf46cf584dd0c84331515a0b SHA512 a4258a977642cd0a174bf41493d5526b8ea447e39fc01282f5d7d7b2f0da3ea400203b68522dcfe51e8da0d335167c9d0dc1c3e202d532d34cba23932875cca4 WHIRLPOOL 00dcd45209d8beaecb0fd6988cf559152a616d69fff7a5d3cafb6858e0a3b5a8bb93f897b97c11f982219699818f283d4b3edc4c299f14caf3f58e072753823c
+EBUILD netperf-2.7.0.ebuild 1727 SHA256 5bcc55c7d832a97806d6a3412e30c190f039338a4021c53d6c452e97e73901a7 SHA512 71cc28a007eb990c0325ab9592f5f7478ffd2b7484cc2ab4da4cab06e1f7971f1688b401b2951f7dde5dd3b1bea2cf58340b1e592b3d0738509cb48cab0da716 WHIRLPOOL e409731c7f498c467eab6e040bb5a425e4afc30bf38633c38714dca8bf7cf96accb62bbc7dd6adbf3e5828424dfed7c37ce9c49563b77620e1030f03e966820b
+MISC ChangeLog 4882 SHA256 3298e9cd396ef08266e9dd8397c349041ff93610df96f737b24233d78369df5e SHA512 ca249667d6e66fe7bd67b1755430dcb3808cd399bbac81d13b9ce5cb35a5f8c1ac705525b2aab098cfd208bfd52e41c096a266ef087d086deb28f01a0efe1d66 WHIRLPOOL 3b6884d2cef7e1074e65d792a7001e6b256ede146558d5bfe512358ec74b1b283d04daf308c8ae17f22636b4b6935d5182e89b78d4f4e44c6a90218f7becbf9b
+MISC ChangeLog-2015 10406 SHA256 526c3eff24ed9f2f0c19e644def228b125b9e4927c8f1112cdf1680c0fecab69 SHA512 3e7c21a4d2532f6099b7dc4471fb6d1980f3c91448f02798e799a7e82a8843e66c17b8199b79f0386fee5f177a743aef2924b94bd17cc03e31dd4fa323f5569b WHIRLPOOL 3b1dda403052008ea7e1ca1f3adf42667dc29dc5eef255c9389e71ad4892d8cb48d52463893cce0180eff1223316b4c21326594a86add9e7a79a2001e8488574
+MISC metadata.xml 775 SHA256 5b7fd3fabda186edc729f0e3b5eb5b27b5ca974f9e72be183888c49adcab39c0 SHA512 c1aaecd84a7fe73d798842ed1c117357809069f3f8c30a6920abf6641c46a5885e170dcecf7f2172d376b7f010e6dd07c47e233f15289c5de432550f1d05845e WHIRLPOOL fe76b6b6eb138e45c041bbb0037d755bed3d187efc8864f11d00ec28b2f8fc79e4edfc3124d6c62596d4a7742a4c6a511496441c35f1988fb8b138ec85511e98
diff --git a/net-analyzer/netperf/files/netperf-2.2-conf b/net-analyzer/netperf/files/netperf-2.2-conf
new file mode 100644
index 000000000000..f61f483a83ea
--- /dev/null
+++ b/net-analyzer/netperf/files/netperf-2.2-conf
@@ -0,0 +1,4 @@
+# Config file for /etc/init.d/netperf
+
+# Add your preferred netserver args here
+#NETSERVER_ARGS="-n 4"
diff --git a/net-analyzer/netperf/files/netperf-2.2-init b/net-analyzer/netperf/files/netperf-2.2-init
new file mode 100644
index 000000000000..cd2fb35cdd27
--- /dev/null
+++ b/net-analyzer/netperf/files/netperf-2.2-init
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+#
+# init.d script for net-analyzer/netperf's netserver
+#
+
+depend() {
+    use net
+}
+
+start() {
+    ebegin 'Starting netperf server (netserver)'
+    start-stop-daemon --start --quiet --user nobody \
+        --exec /usr/sbin/netserver -- ${NETSERVER_ARGS} >/dev/null
+    eend $?
+}
+
+stop() {
+    ebegin 'Stopping netperf server (netserver)'
+    start-stop-daemon --stop --quiet --exec /usr/sbin/netserver
+    eend $?
+}
diff --git a/net-analyzer/netperf/files/netperf-2.6.0-log-dir.patch b/net-analyzer/netperf/files/netperf-2.6.0-log-dir.patch
new file mode 100644
index 000000000000..00554cc0b5c2
--- /dev/null
+++ b/net-analyzer/netperf/files/netperf-2.6.0-log-dir.patch
@@ -0,0 +1,11 @@
+--- a/src/netserver.c
++++ b/src/netserver.c
+@@ -165,7 +165,7 @@
+ #elif defined(ANDROID)
+ #define DEBUG_LOG_FILE_DIR "/data/local/tmp/"
+ #else
+-#define DEBUG_LOG_FILE_DIR "/tmp/"
++#define DEBUG_LOG_FILE_DIR "/var/log/"
+ #endif
+ #endif /* DEBUG_LOG_FILE_DIR */
+ 
diff --git a/net-analyzer/netperf/files/netperf-2.7.0-includes.patch b/net-analyzer/netperf/files/netperf-2.7.0-includes.patch
new file mode 100644
index 000000000000..63c3cea40f4e
--- /dev/null
+++ b/net-analyzer/netperf/files/netperf-2.7.0-includes.patch
@@ -0,0 +1,22 @@
+--- a/src/net_uuid.c
++++ b/src/net_uuid.c
+@@ -28,6 +28,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <fcntl.h>
++#include <unistd.h> /* read(), close() */
+ 
+ #if defined(HAVE_INTTYPES_H)
+ #include <inttypes.h>
+--- a/src/netlib.c
++++ b/src/netlib.c
+@@ -81,6 +81,9 @@
+ #include <endian.h>
+ #endif
+ 
++#if defined(HAVE_SENDFILE)
++#include <sys/sendfile.h> /* sendfile() */
++#endif
+ 
+ #ifndef WIN32
+  /* at some point, I would like to get rid of all these "sys/"
diff --git a/net-analyzer/netperf/files/netperf-2.7.0-init b/net-analyzer/netperf/files/netperf-2.7.0-init
new file mode 100644
index 000000000000..3d1bb0c15973
--- /dev/null
+++ b/net-analyzer/netperf/files/netperf-2.7.0-init
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+#
+# init.d script for net-analyzer/netperf's netserver
+#
+
+depend() {
+	use net
+}
+
+start() {
+	checkpath -o netperf:netperf -d /var/log/netperf
+
+	ebegin 'Starting netperf server (netserver)'
+	start-stop-daemon --start --user netperf \
+		--exec /usr/sbin/netserver -- ${NETSERVER_ARGS}
+	eend $?
+}
+
+stop() {
+	ebegin 'Stopping netperf server (netserver)'
+	start-stop-daemon --stop --quiet --exec /usr/sbin/netserver
+	eend $?
+}
diff --git a/net-analyzer/netperf/files/netperf-2.7.0-inline.patch b/net-analyzer/netperf/files/netperf-2.7.0-inline.patch
new file mode 100644
index 000000000000..eb8c09b84695
--- /dev/null
+++ b/net-analyzer/netperf/files/netperf-2.7.0-inline.patch
@@ -0,0 +1,32 @@
+# Copyright Seblu 2015
+--- a/src/netlib.c	2015-08-04 20:30:43.449468815 +0200
++++ b/src/netlib.c	2015-08-04 20:31:40.317792002 +0200
+@@ -3997,11 +3997,7 @@
+   }
+ }
+ 
+-#ifdef WIN32
+-__forceinline void demo_interval_display(double actual_interval)
+-#else
+-  inline void demo_interval_display(double actual_interval)
+-#endif
++void demo_interval_display(double actual_interval)
+ {
+   static int count = 0;
+   struct timeval now;
+@@ -4060,15 +4056,7 @@
+    important compilers have supported such a construct so it should
+    not be a big deal. raj 2012-01-23 */
+ 
+-#ifdef WIN32
+-/* It would seem that the Microsoft compiler will not inline across
+-   source files. So there is little point in having an inline
+-   directive in that situation.  Of course that makes me wonder if an
+-   inline directive has to appear in netlib.h... */
+ void demo_interval_tick(uint32_t units)
+-#else
+-  inline void demo_interval_tick(uint32_t units)
+-#endif
+ {
+   double actual_interval = 0.0;
+ 
diff --git a/net-analyzer/netperf/files/netperf-2.7.0-space.patch b/net-analyzer/netperf/files/netperf-2.7.0-space.patch
new file mode 100644
index 000000000000..9ad43270b166
--- /dev/null
+++ b/net-analyzer/netperf/files/netperf-2.7.0-space.patch
@@ -0,0 +1,17 @@
+--- a/src/netserver.c
++++ b/src/netserver.c
+@@ -165,12 +165,12 @@
+ #elif defined(ANDROID)
+ #define DEBUG_LOG_FILE_DIR "/data/local/tmp/"
+ #else
+-#define DEBUG_LOG_FILE_DIR "/var/log/"
++#define DEBUG_LOG_FILE_DIR "/var/log/netperf/"
+ #endif
+ #endif /* DEBUG_LOG_FILE_DIR */
+ 
+ #ifndef DEBUG_LOG_FILE
+-#define DEBUG_LOG_FILE DEBUG_LOG_FILE_DIR"netserver.debug"
++#define DEBUG_LOG_FILE DEBUG_LOG_FILE_DIR "/netserver.debug"
+ #endif
+ 
+ #if !defined(PATH_MAX)
diff --git a/net-analyzer/netperf/files/netperf-fix-scripts.patch b/net-analyzer/netperf/files/netperf-fix-scripts.patch
new file mode 100644
index 000000000000..27e041fd7a32
--- /dev/null
+++ b/net-analyzer/netperf/files/netperf-fix-scripts.patch
@@ -0,0 +1,34 @@
+--- a/doc/examples/arr_script
++++ b/doc/examples/arr_script
+@@ -12,8 +12,7 @@
+   TOLERANCE=15
+   MAX_RETRIES=3
+ 
+-  NETPERF="/usr/local/netperf/netperf"
+-  NETPERF="./netperf"
++  NETPERF="/usr/bin/netperf"
+ 
+   NPROC_LIST=""
+   RR_SIZES=""
+--- a/doc/examples/packet_byte_script
++++ b/doc/examples/packet_byte_script
+@@ -25,7 +25,7 @@
+ fi
+ 
+ # where is netperf
+-NETPERF_DIR=${NETPERF_DIR:=/opt/netperf2/bin}
++NETPERF_DIR=${NETPERF_DIR:=/usr/bin}
+ 
+ 
+ # at what port will netserver be waiting? If you decide to run
+--- a/doc/examples/snapshot_script
++++ b/doc/examples/snapshot_script
+@@ -37,7 +37,7 @@
+ #
+ # where is netperf installed, there are a few possible places:
+ 
+-NETPERF_CMD=${NETPERF_CMD:=/opt/netperf/netperf}
++NETPERF_CMD=${NETPERF_CMD:=/usr/bin/netperf}
+ 
+ 
+ # there should be no more than two parms passed
diff --git a/net-analyzer/netperf/metadata.xml b/net-analyzer/netperf/metadata.xml
new file mode 100644
index 000000000000..8b0f12738e3f
--- /dev/null
+++ b/net-analyzer/netperf/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<longdescription lang="en">
+Netperf is a benchmark that can be used to measure the performance of many
+different types of networking. It provides tests for both unidirectional
+throughput, and end-to-end latency. The environments currently measureable by
+netperf include:
+
+ - TCP and UDP via BSD Sockets for both IPv4 and IPv6
+ - DLPI
+ - Unix Domain Sockets
+ - SCTP for both IPv4 and IPv6
+</longdescription>
+<use>
+<flag name="demo">Emit interim results during the run. May affect results</flag>
+</use>
+</pkgmetadata>
diff --git a/net-analyzer/netperf/netperf-2.6.0-r1.ebuild b/net-analyzer/netperf/netperf-2.6.0-r1.ebuild
new file mode 100644
index 000000000000..869d878465b5
--- /dev/null
+++ b/net-analyzer/netperf/netperf-2.6.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic
+
+DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more"
+SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2"
+KEYWORDS="alpha amd64 arm64 hppa ia64 ppc ppc64 sparc x86"
+
+HOMEPAGE="http://www.netperf.org/"
+LICENSE="netperf"
+SLOT="0"
+IUSE="demo sctp"
+
+DEPEND=">=sys-apps/sed-4"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-fix-scripts.patch \
+		"${FILESDIR}"/${P}-log-dir.patch
+
+	# Fixing paths in scripts
+	sed -i \
+		-e 's:^\(NETHOME=\).*:\1"/usr/bin":' \
+		doc/examples/sctp_stream_script \
+		doc/examples/tcp_range_script \
+		doc/examples/tcp_rr_script \
+		doc/examples/tcp_stream_script \
+		doc/examples/udp_rr_script \
+		doc/examples/udp_stream_script \
+		|| die
+
+	# netlib.c:2292:5: warning: implicit declaration of function ‘sched_setaffinity’
+	# nettest_omni.c:2943:5: warning: implicit declaration of function ‘splice’
+	append-cppflags -D_GNU_SOURCE
+}
+
+src_configure() {
+	econf \
+		$(use_enable demo) \
+		$(use_enable sctp)
+}
+
+src_install () {
+	default
+
+	# move netserver into sbin as we had it before 2.4 was released with its
+	# autoconf goodness
+	dodir /usr/sbin
+	mv "${D}"/usr/{bin,sbin}/netserver || die
+
+	# init.d / conf.d
+	newinitd "${FILESDIR}"/${PN}-2.2-init netperf
+	newconfd "${FILESDIR}"/${PN}-2.2-conf netperf
+
+	# documentation and example scripts
+	dodoc AUTHORS ChangeLog NEWS README Release_Notes
+	dodir /usr/share/doc/${PF}/examples
+	#Scripts no longer get installed by einstall
+	cp doc/examples/*_script "${D}"/usr/share/doc/${PF}/examples || die
+}
diff --git a/net-analyzer/netperf/netperf-2.7.0-r1.ebuild b/net-analyzer/netperf/netperf-2.7.0-r1.ebuild
new file mode 100644
index 000000000000..f1fa2ad05ae9
--- /dev/null
+++ b/net-analyzer/netperf/netperf-2.7.0-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic user
+
+DESCRIPTION="Network performance benchmark"
+SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2"
+KEYWORDS="alpha amd64 ~arm64 hppa ia64 ppc ppc64 sparc x86"
+
+HOMEPAGE="http://www.netperf.org/"
+LICENSE="netperf"
+SLOT="0"
+IUSE="demo sctp"
+
+DEPEND=">=sys-apps/sed-4"
+
+pkg_setup() {
+	enewuser netperf
+	enewgroup netperf
+}
+
+src_prepare() {
+	eapply \
+		"${FILESDIR}"/${PN}-fix-scripts.patch \
+		"${FILESDIR}"/${PN}-2.6.0-log-dir.patch \
+		"${FILESDIR}"/${PN}-2.7.0-includes.patch \
+		"${FILESDIR}"/${PN}-2.7.0-space.patch
+
+	# Fixing paths in scripts
+	sed -i \
+		-e 's:^\(NETHOME=\).*:\1"/usr/bin":' \
+		doc/examples/sctp_stream_script \
+		doc/examples/tcp_range_script \
+		doc/examples/tcp_rr_script \
+		doc/examples/tcp_stream_script \
+		doc/examples/udp_rr_script \
+		doc/examples/udp_stream_script \
+		|| die
+
+	# netlib.c:2292:5: warning: implicit declaration of function ‘sched_setaffinity’
+	# nettest_omni.c:2943:5: warning: implicit declaration of function ‘splice’
+	append-cppflags -D_GNU_SOURCE
+
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		$(use_enable demo) \
+		$(use_enable sctp)
+}
+
+src_install () {
+	default
+
+	# move netserver into sbin as we had it before 2.4 was released with its
+	# autoconf goodness
+	dodir /usr/sbin
+	mv "${D}"/usr/{bin,sbin}/netserver || die
+
+	# init.d / conf.d
+	newinitd "${FILESDIR}"/${PN}-2.7.0-init netperf
+	newconfd "${FILESDIR}"/${PN}-2.2-conf netperf
+
+	keepdir /var/log/${PN}
+	fowners netperf:netperf /var/log/${PN}
+	fperms 0755 /var/log/${PN}
+
+	# documentation and example scripts
+	dodoc AUTHORS ChangeLog NEWS README Release_Notes
+	dodir /usr/share/doc/${PF}/examples
+	#Scripts no longer get installed by einstall
+	cp doc/examples/*_script "${D}"/usr/share/doc/${PF}/examples || die
+}
diff --git a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
new file mode 100644
index 000000000000..c27563056689
--- /dev/null
+++ b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic user
+
+DESCRIPTION="Network performance benchmark"
+SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+HOMEPAGE="http://www.netperf.org/"
+LICENSE="netperf"
+SLOT="0"
+IUSE="demo sctp"
+
+DEPEND=">=sys-apps/sed-4"
+
+pkg_setup() {
+	enewuser netperf
+	enewgroup netperf
+}
+
+src_prepare() {
+	eapply \
+		"${FILESDIR}"/${PN}-fix-scripts.patch \
+		"${FILESDIR}"/${PN}-2.6.0-log-dir.patch \
+		"${FILESDIR}"/${PN}-2.7.0-includes.patch \
+		"${FILESDIR}"/${PN}-2.7.0-space.patch \
+		"${FILESDIR}"/${PN}-2.7.0-inline.patch
+
+	# Fixing paths in scripts
+	sed -i \
+		-e 's:^\(NETHOME=\).*:\1"/usr/bin":' \
+		doc/examples/sctp_stream_script \
+		doc/examples/tcp_range_script \
+		doc/examples/tcp_rr_script \
+		doc/examples/tcp_stream_script \
+		doc/examples/udp_rr_script \
+		doc/examples/udp_stream_script \
+		|| die
+
+	# netlib.c:2292:5: warning: implicit declaration of function ‘sched_setaffinity’
+	# nettest_omni.c:2943:5: warning: implicit declaration of function ‘splice’
+	append-cppflags -D_GNU_SOURCE
+
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		$(use_enable demo) \
+		$(use_enable sctp)
+}
+
+src_install () {
+	default
+
+	# move netserver into sbin as we had it before 2.4 was released with its
+	# autoconf goodness
+	dodir /usr/sbin
+	mv "${D}"/usr/{bin,sbin}/netserver || die
+
+	# init.d / conf.d
+	newinitd "${FILESDIR}"/${PN}-2.7.0-init netperf
+	newconfd "${FILESDIR}"/${PN}-2.2-conf netperf
+
+	keepdir /var/log/${PN}
+	fowners netperf:netperf /var/log/${PN}
+	fperms 0755 /var/log/${PN}
+
+	# documentation and example scripts
+	dodoc AUTHORS ChangeLog NEWS README Release_Notes
+	dodir /usr/share/doc/${PF}/examples
+	#Scripts no longer get installed by einstall
+	cp doc/examples/*_script "${D}"/usr/share/doc/${PF}/examples || die
+}
diff --git a/net-analyzer/netperf/netperf-2.7.0.ebuild b/net-analyzer/netperf/netperf-2.7.0.ebuild
new file mode 100644
index 000000000000..7c1622c9fe97
--- /dev/null
+++ b/net-analyzer/netperf/netperf-2.7.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic
+
+DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more"
+SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+HOMEPAGE="http://www.netperf.org/"
+LICENSE="netperf"
+SLOT="0"
+IUSE="demo sctp"
+
+DEPEND=">=sys-apps/sed-4"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-fix-scripts.patch \
+		"${FILESDIR}"/${PN}-2.6.0-log-dir.patch \
+		"${FILESDIR}"/${PN}-2.7.0-includes.patch
+
+	# Fixing paths in scripts
+	sed -i \
+		-e 's:^\(NETHOME=\).*:\1"/usr/bin":' \
+		doc/examples/sctp_stream_script \
+		doc/examples/tcp_range_script \
+		doc/examples/tcp_rr_script \
+		doc/examples/tcp_stream_script \
+		doc/examples/udp_rr_script \
+		doc/examples/udp_stream_script \
+		|| die
+
+	# netlib.c:2292:5: warning: implicit declaration of function ‘sched_setaffinity’
+	# nettest_omni.c:2943:5: warning: implicit declaration of function ‘splice’
+	append-cppflags -D_GNU_SOURCE
+}
+
+src_configure() {
+	econf \
+		$(use_enable demo) \
+		$(use_enable sctp)
+}
+
+src_install () {
+	default
+
+	# move netserver into sbin as we had it before 2.4 was released with its
+	# autoconf goodness
+	dodir /usr/sbin
+	mv "${D}"/usr/{bin,sbin}/netserver || die
+
+	# init.d / conf.d
+	newinitd "${FILESDIR}"/${PN}-2.2-init netperf
+	newconfd "${FILESDIR}"/${PN}-2.2-conf netperf
+
+	# documentation and example scripts
+	dodoc AUTHORS ChangeLog NEWS README Release_Notes
+	dodir /usr/share/doc/${PF}/examples
+	#Scripts no longer get installed by einstall
+	cp doc/examples/*_script "${D}"/usr/share/doc/${PF}/examples || die
+}
diff --git a/net-analyzer/netpipe/Manifest b/net-analyzer/netpipe/Manifest
new file mode 100644
index 000000000000..da7622877da1
--- /dev/null
+++ b/net-analyzer/netpipe/Manifest
@@ -0,0 +1,4 @@
+AUX netpipe-3.7.2-fix-makefile.patch 316 SHA256 427d959549b2382154766a9b9b96e0910bb1bb0f9800b4a8fa30faf2c96d38af SHA512 5d31cfd8e4007cb0bf0fd5e921c92bfb8f8a1342176091fcd98d35a41a0dfef4125073ff309df1cc6e8682099ce08bfc521bbde900978578dddcc5507482b07b WHIRLPOOL 55201d54da394ed66df84312c3936aa1818448340230d3abe03418edda2975fa44182069341b59c400734e556d5055d81c112148aa325f85a5a4e7ca332bdb72
+DIST NetPIPE-3.7.2.tar.gz 400248 SHA256 13dac884ff52951636f651c421f5ff4a853218a95aa28a4a852402ee385a2ab8 SHA512 158c24665bcc55144452c2aeff067e0d853ffca1ecd130d52c3ea7d4068c53e81f9a1133d0cca847d28f597f68b20f01e79811f81ab1396dd18ba2eaaf691430 WHIRLPOOL 33b22df3075ed57e3e77713ee16f7de3293f7795788afb4ae252ffebe427041f38940311099e03488f5628584ea77a6f1224160b0042241902cd91ae69b5f74d
+EBUILD netpipe-3.7.2.ebuild 794 SHA256 8a58a6fbcd986e39a463b8ad9f526b8cf1e3d52c6f435bafafc1227679555c9b SHA512 a7a232057fdf359bb9838b29574f5c1af4ee9389998253ef1920628fe584e84dbcaa0014d3aa60d44aba55ec50747e0ff989f360506b11449cb0aa3054130ebe WHIRLPOOL 3cc47848536aa4d7d4d237266573929c93cca730c41de3a5eb0c94b6029848353363797274a82e616fecd6dba68f32a28a9a93b5e89933eed0e084723c244917
+MISC metadata.xml 907 SHA256 8d1120316cb7f77b97d0fab0005cdc23130c3d78d1282dae93a156e93bd9c4b6 SHA512 1363771cfcc0a9065be517ede4c7a780add4dac4567db5c8c39b4a4e6860718977db864bbae6efc0b60f8e69aaf9bfbd3eec4cd8ecdff45dfdafb03d16247903 WHIRLPOOL a0e202ba0fe417d0d30a9a61fca09c38924d2c893fc505e61206d3e1b67f3056e99a4daa98816326b39459490d6959e6b1f6f83597f05bec03816fa009982d86
diff --git a/net-analyzer/netpipe/files/netpipe-3.7.2-fix-makefile.patch b/net-analyzer/netpipe/files/netpipe-3.7.2-fix-makefile.patch
new file mode 100644
index 000000000000..f5c61737f7ae
--- /dev/null
+++ b/net-analyzer/netpipe/files/netpipe-3.7.2-fix-makefile.patch
@@ -0,0 +1,13 @@
+diff --git a/makefile b/makefile
+index 16f9052..3ada81f 100644
+--- a/makefile
++++ b/makefile
+@@ -21,8 +21,6 @@
+ #
+ ########################################################################
+ 
+-CC         = cc
+-CFLAGS     = -O -g
+ SRC        = ./src
+ 
+ # For MPI, mpicc will set up the proper include and library paths
diff --git a/net-analyzer/netpipe/metadata.xml b/net-analyzer/netpipe/metadata.xml
new file mode 100644
index 000000000000..fd15de965046
--- /dev/null
+++ b/net-analyzer/netpipe/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		NetPIPE is a protocol independent performance tool that visually
+		represents the network performance under a variety of conditions.
+		It performs simple ping-pong tests, bouncing messages of increasing
+		size between two processes, whether across a network or within an
+		SMP system. Message sizes are chosen at regular intervals, and with
+		slight perturbations, to provide a complete test of the communication
+		system. Each data point involves many ping-pong tests to provide an
+		accurate timing. Latencies are calculated by dividing the round
+		trip time in half for small messages ( less 64 Bytes ). 
+	</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/netpipe/netpipe-3.7.2.ebuild b/net-analyzer/netpipe/netpipe-3.7.2.ebuild
new file mode 100644
index 000000000000..894cf55c72a7
--- /dev/null
+++ b/net-analyzer/netpipe/netpipe-3.7.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+MY_PN=NetPIPE
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="network protocol independent performance evaluator"
+HOMEPAGE="http://bitspjoule.org/netpipe/"
+SRC_URI="http://bitspjoule.org/netpipe/code/${MY_P}.tar.gz"
+LICENSE="GPL-1+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="ipv6"
+
+DOCS=(
+	bin/feplot
+	bin/geplot
+	bin/nplaunch
+	dox/README
+	dox/netpipe_paper.ps
+	dox/np_cluster2002.pdf
+	dox/np_euro.pdf
+	)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-makefile.patch
+	)
+
+S="${WORKDIR}"/${MY_P}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" memcpy tcp $(usex ipv6 tcp6 '')
+}
+
+src_install() {
+	dobin NPmemcpy NPtcp
+	use ipv6 && dobin NPtcp6
+	doman dox/netpipe.1
+	einstalldocs
+}
diff --git a/net-analyzer/netselect/Manifest b/net-analyzer/netselect/Manifest
new file mode 100644
index 000000000000..5b903c050f9e
--- /dev/null
+++ b/net-analyzer/netselect/Manifest
@@ -0,0 +1,13 @@
+AUX netselect-0.3-bsd.patch 1621 SHA256 fe4b2217f2a3acbf8208f6bdd4092cf6157ad3341f161dffcc399c058582b9c3 SHA512 723be6cae82060d862bfd5afac674c701cc6c3b37fc74b7e020e347a584b31cfad1c7e1c87fe84ccf16384996ebb46da3b9b7bcfd7aa8dd323009f73b5edb966 WHIRLPOOL b1418f59b85b1ffb7f53ea4cbe320b5521181dc44c9d1e3f7db1cf231b7f5615d6b2741a98896ecd3ad6e85aad4b6067ce646c46e3b22237fb9c489b299173fa
+AUX netselect-0.3-glibc.patch 264 SHA256 df8cdd028e4382a1ce3792ea18ac60db439c61b2d763c0a37777d1cb57d7ed62 SHA512 bcccfdb458b27903e204043c3ce5faeb0024c0f7e3c0dc4c6eff69b7168544adfe8802625daca50a0c5304e26cc2f252279aeec2013460f2a0bc6892c0df88ad WHIRLPOOL c4c9a7e34bbda34d70c541783b78493dbb736c4fe2c150d161f87619d6dfc1a4e2148a7ae325393ae498f8c75ef8322c2acb7299b4595f7d6f8e2897440daa9d
+AUX netselect-0.4-bsd.patch 1573 SHA256 a9c483e866d8ff4911f5e10ce2f2fbbb6579199127e8bac4211c36265dd9fe71 SHA512 01dfb03b8e77def3d6742e827662316003ad807af41ea1ce236c4e216de3cca3678efc6405676c8022dab5f61e6ee7395aaa82b8b800e96eb0ac718b5f7b4f52 WHIRLPOOL 47a7beda16980fdf1b19fd126bbc2bff84f415e4973f6f25c4814c843b7bcd16a725a5620cd6ee2aaffd911a6c096bc3936ba38e56223067242873e1dceab628
+AUX netselect-0.4-flags.patch 172 SHA256 9566ccc9145bc7598b3116bcbd4cfe142c9ee973ebf5e5934cfed2b360dd88fb SHA512 3f665743859e243126de95340da5b9dd42ff671d82f3809e294b752a568b7ede96b13f6a63e18cc522ce19d1537b137d5c05e0e49ce533e8fc337922e18ea74a WHIRLPOOL 0b4e03bb1b7be1ad55888be3fa60692ad18e887e249a0cdb26934c2b3ce3ad22586b1d4d286e8c3d670f584d9263f2ea6866e22191253643985dc089ba6e22a1
+DIST netselect-0.3.tar.gz 22047 SHA256 fe81942589d5219d030e5cecfb12787fb6d3613416cb326dea4952bf53f9c978 SHA512 04a4b79c357a0110dcf377ad04ac729ed7854bec4b064ad16da632367ce1870379546fffc8396ea770bfa580618d7c0495c16b0ba30f736419511b890ce5dca5 WHIRLPOOL 2e49cb22b12c88a1d9f42da19b42284ae98d391739bf7bd1e134661b8780ef733b26f5f4be4ed61dce3a4a9922a6a10d9040698fa3f4910ceacc54df4a42afcc
+DIST netselect-0.4-ipv6.patch.xz 18272 SHA256 be68354508c6b17927ffe01db2ed2f8e5f259a869d6f209ba8d2e648de01e143 SHA512 422b54df5be45379fe7d6776b6e653a8e49df6fb77421527f2eb6c687597f36cccc7ab5cc5206e9823c318f6facd84fb4e8c0dbffbf9641cee593401cb73abea WHIRLPOOL c51648b80c5e21388077d76ff793eda78f7986c395965df4c29179280469485bca4c7d1785036a67b2946c2772e26fefc9ee37511c24966739bb1debfc1021d6
+DIST netselect-0.4.tar.gz 22095 SHA256 ae343991c94b1fdeb5e7896bb11d357c1dd9297f5d842c507953f57935e15e19 SHA512 eee9639122b7cc89218c610794d090582aecb3df138bcef41472c8d40c0f7e998b2c4b04aace13795fda5c710ee28cc2c0784a680ad6d1aa6a14eb441a408bfa WHIRLPOOL 26560ff81683c48ad7c94e827029b4b0a127c29b94fe47fe2b95f3736eafeeeaa2c9b1e9f6feff7971a37cd15fdb51814acd195ebafd6e89face3d514eb872c3
+EBUILD netselect-0.3-r3.ebuild 976 SHA256 379b9bb0acf47df3583838301352932ccd4c68f81c810840c605faac0cd59def SHA512 c3a42dec4c8830765d1b5122465708c9c8f47d67c80a57a69ce91741f7c135de52963ac9ef2ed0a5306a32b9ba7f86e7383ed7faf5d3227434fcdf1c24ecfaef WHIRLPOOL 0760d9b6363c60dc722ceedcbdfd058dfb878d5497839fab192fe959ef7d50f3883020c9b795abeb7204aa9e810e4a80a222943946311f8425fd4d3e56db908b
+EBUILD netselect-0.3-r4.ebuild 994 SHA256 cbf86b9132dfee38a432deee14320d8fb077b509eed13c44ffc8e5f434afebb8 SHA512 af56e7e5c74d79f4079d2721021f9c9b00183db5e92eec44e722a47c98701250910afc7057d7fae1a7d5bccd39104620625a46dd02ef8948caf734b80abbae6f WHIRLPOOL 1c1d89d1fbabc4c886ab0a05ded2b5a2372b090be5e2a5f245968d10a785475f18e583aea36bbe18ff8cb66849dd5f7ca4db71322ba7c4c20e8011647d9dbbe6
+EBUILD netselect-0.4.ebuild 961 SHA256 5f2fbdfdb6486736cf7e665bfd37ca2862a1ed35f9fe1468efcc962fd214a574 SHA512 83be0dd6c8d54bdba3ab8c7a8a78b573447685154e348fdb0436c4a085751ce14ef1d05765e36f8366e4e30f46d004f0043477a85f3cc41b7ccd3f4b81b2df07 WHIRLPOOL 4eee33a615bde0cabf2a913da7bdc6f843229b0ad76ef6a59b2a6e994c0e761f0a1e26529e862c724bb80b02c050afaa35595534b121e50f9de145ec8767ef46
+MISC ChangeLog 2565 SHA256 245eb6e12bcf6163aa7eb061ec8674a5f477e7e7247218b405f39f5cf3732053 SHA512 87acb3de44b14c6f8dc297437ccb52e62a74122fa8f423c70942b7bf1119e73694ae76cd9313f83ce3badf981abc79e599a900a93fda090c3cf758ceff091361 WHIRLPOOL d586e2c55286ca0ae505e9f398c68bb1574dc77181dd1bca56623ce7f22a1c4892aa12509313a23edcd1028478334f33a1b5ec1ec633ceabd8e5c239bc4ce152
+MISC ChangeLog-2015 6936 SHA256 891047180e6c481142eaca6ee07e7f33e7e63b38afe239b2be3e7618f385ade2 SHA512 735a652989a65c8a36d7fbe0269ee121061c118e5c8126b3b8d1e1070ac54aafe1825988b60e915f9def2d998f240841876bda10ea00cf69795dc9034d57bd3e WHIRLPOOL 3362214f6c083c2d97d28dc0f61137080a35dc17671a10706b6b4c334e4a77970c5c72f1fb9149d76db155650846ef616311d945a6d26a3cf881820845f29d17
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/netselect/files/netselect-0.3-bsd.patch b/net-analyzer/netselect/files/netselect-0.3-bsd.patch
new file mode 100644
index 000000000000..e9624d87215a
--- /dev/null
+++ b/net-analyzer/netselect/files/netselect-0.3-bsd.patch
@@ -0,0 +1,56 @@
+--- a/netselect.c
++++ b/netselect.c
+@@ -39,14 +39,14 @@
+  * hey, great!  Let me know. -- apenwarr
+  */
+ 
+-#ifdef __EMX__
+-# include <io.h>
+-# include <fcntl.h>
+-# include <sys/types.h>
+-# include <sys/select.h>
+-# include <machine/endian.h>
+-#else
+-# include <endian.h>
++#ifdef __linux__
++#include <endian.h>
++#include <sys/types.h>
++#elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
++#if defined(__OpenBSD__)
++#include <machine/types.h>
++#endif
++#include <machine/endian.h>
+ #endif
+ 
+ #include <sys/param.h>
+@@ -152,6 +152,7 @@
+     extern int optind;
+     int hostcount, startcount, endcount = 0, sent_one, lag, min_lag = 100;
+     int ch, seq, ttl, max_ttl = 30, min_tries = 10, num_score = 1;
++    int on = 1;
+     struct timeval now;
+     struct timezone tz;
+     OPacket outpacket;          /* last output (udp) packet */
+@@ -234,7 +235,12 @@
+     if (verbose >= 1)
+ 	fprintf(stderr, "Running netselect to choose %d out of %d address%s.\n",
+ 		num_score, numhosts, numhosts==1 ? "" : "es");
+-    
++   
++   if (setsockopt(sndsock, IPPROTO_IP, IP_HDRINCL, &on, sizeof(on)) < 0) {
++        perror("IP_HDRINCL");
++	_exit(EXIT_FAILURE);
++   }
++
+     /* keep going until most of the hosts have been finished */
+     must_continue = numhosts;
+     while (must_continue && must_continue >= numhosts/2)
+@@ -712,7 +718,7 @@
+     ip->ip_off = 0;
+     ip->ip_hl = sizeof(*ip) >> 2;
+     ip->ip_p = IPPROTO_UDP;
+-    ip->ip_len = 0; /* kernel fills this in */
++    ip->ip_len = sizeof(OPacket);
+     ip->ip_ttl = ttl;
+     ip->ip_v = IPVERSION;
+     ip->ip_id = htons(ident + seq);
diff --git a/net-analyzer/netselect/files/netselect-0.3-glibc.patch b/net-analyzer/netselect/files/netselect-0.3-glibc.patch
new file mode 100644
index 000000000000..053e5865b341
--- /dev/null
+++ b/net-analyzer/netselect/files/netselect-0.3-glibc.patch
@@ -0,0 +1,11 @@
+--- a/netselect.c
++++ b/netselect.c
+@@ -780,7 +780,7 @@
+ #if !defined(__GLIBC__)
+     int fromlen = sizeof(from);
+ #else				/* __GLIBC__ */
+-    size_t fromlen = sizeof(from);
++    socklen_t fromlen = sizeof(from);
+ #endif				/* __GLIBC__ */
+ 
+     FD_ZERO(&fds);
diff --git a/net-analyzer/netselect/files/netselect-0.4-bsd.patch b/net-analyzer/netselect/files/netselect-0.4-bsd.patch
new file mode 100644
index 000000000000..fd49a17682db
--- /dev/null
+++ b/net-analyzer/netselect/files/netselect-0.4-bsd.patch
@@ -0,0 +1,56 @@
+--- a/netselect.c
++++ b/netselect.c
+@@ -39,14 +39,14 @@
+  * hey, great!  Let me know. -- apenwarr
+  */
+ 
+-#ifdef __EMX__
+-# include <io.h>
+-# include <fcntl.h>
+-# include <sys/types.h>
+-# include <sys/select.h>
+-# include <machine/endian.h>
+-#else
+-# include <endian.h>
++#ifdef __linux__
++#include <endian.h>
++#include <sys/types.h>
++#elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
++#if defined(__OpenBSD__)
++#include <machine/types.h>
++#endif
++#include <machine/endian.h>
+ #endif
+ 
+ #include <sys/param.h>
+@@ -167,6 +167,7 @@
+     extern int optind;
+     int hostcount, startcount, endcount = 0, sent_one, lag, min_lag = 100;
+     int ch, seq, ttl, max_ttl = 30, num_score = 1;
++    int on = 1;
+     int use_icmp = 0;
+     unsigned int min_tries = 10;
+     struct timeval now;
+@@ -234,7 +235,12 @@
+     if (verbose >= 1)
+ 	fprintf(stderr, "Running netselect to choose %d out of %d address%s.\n",
+ 		num_score, numhosts, numhosts==1 ? "" : "es");
+-    
++   
++   if (setsockopt(sndsock, IPPROTO_IP, IP_HDRINCL, &on, sizeof(on)) < 0) {
++        perror("IP_HDRINCL");
++	_exit(EXIT_FAILURE);
++   }
++
+     /* keep going until most of the hosts have been finished */
+     must_continue = numhosts;
+     while (must_continue && must_continue >= numhosts/2)
+@@ -712,7 +718,7 @@
+     ip->ip_off = 0;
+     ip->ip_hl = sizeof(*ip) >> 2;
+     ip->ip_p = IPPROTO_UDP;
+-    ip->ip_len = 0; /* kernel fills this in */
++    ip->ip_len = sizeof(OPacket);
+     ip->ip_ttl = ttl;
+     ip->ip_v = IPVERSION;
+     ip->ip_id = htons(ident + seq);
diff --git a/net-analyzer/netselect/files/netselect-0.4-flags.patch b/net-analyzer/netselect/files/netselect-0.4-flags.patch
new file mode 100644
index 000000000000..ffcfead8eb3a
--- /dev/null
+++ b/net-analyzer/netselect/files/netselect-0.4-flags.patch
@@ -0,0 +1,12 @@
+--- a/Makefile
++++ b/Makefile
+@@ -3,8 +3,7 @@
+ MANDEST = ${PREFIX}/man/man1
+ 
+ CC = gcc
+-CFLAGS = -O2 -Wall -I. -g
+-LDFLAGS = -g
++CFLAGS += -Wall -I.
+ LIBS = 
+ 
+ ifdef OS2
diff --git a/net-analyzer/netselect/metadata.xml b/net-analyzer/netselect/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/netselect/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/netselect/netselect-0.3-r3.ebuild b/net-analyzer/netselect/netselect-0.3-r3.ebuild
new file mode 100644
index 000000000000..d987e3985719
--- /dev/null
+++ b/net-analyzer/netselect/netselect-0.3-r3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Ultrafast implementation of ping"
+HOMEPAGE="http://apenwarr.ca/netselect/"
+SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-bsd.patch" \
+		"${FILESDIR}/${P}-glibc.patch"
+
+	sed -i \
+		-e "s:PREFIX =.*:PREFIX = ${ED}usr:" \
+		-e "s:CFLAGS =.*:CFLAGS = -Wall -I. ${CFLAGS}:" \
+		-e "s:LDFLAGS =.*:LDFLAGS = ${LDFLAGS}:" \
+		-e '23,27d' \
+		-e '34d' \
+		Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install () {
+	dobin netselect
+	if ! use prefix ; then
+		fowners root:wheel /usr/bin/netselect
+		fperms 4711 /usr/bin/netselect
+	fi
+	dodoc ChangeLog HISTORY README*
+}
diff --git a/net-analyzer/netselect/netselect-0.3-r4.ebuild b/net-analyzer/netselect/netselect-0.3-r4.ebuild
new file mode 100644
index 000000000000..f5909a4d75c3
--- /dev/null
+++ b/net-analyzer/netselect/netselect-0.3-r4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Ultrafast implementation of ping"
+HOMEPAGE="http://apenwarr.ca/netselect/"
+SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-bsd.patch" \
+		"${FILESDIR}/${P}-glibc.patch"
+
+	sed -i \
+		-e "s:PREFIX =.*:PREFIX = ${ED}usr:" \
+		-e "s:CFLAGS =.*:CFLAGS = -Wall -I. ${CFLAGS}:" \
+		-e "s:LDFLAGS =.*:LDFLAGS = ${LDFLAGS}:" \
+		-e '23,27d' \
+		-e '34d' \
+		Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install () {
+	dobin netselect
+	if ! use prefix ; then
+		fowners root:wheel /usr/bin/netselect
+		fperms 4711 /usr/bin/netselect
+	fi
+	dodoc ChangeLog HISTORY README*
+}
diff --git a/net-analyzer/netselect/netselect-0.4.ebuild b/net-analyzer/netselect/netselect-0.4.ebuild
new file mode 100644
index 000000000000..a6d716516f07
--- /dev/null
+++ b/net-analyzer/netselect/netselect-0.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Ultrafast implementation of ping"
+HOMEPAGE="http://apenwarr.ca/netselect/"
+SRC_URI="
+	https://github.com/apenwarr/${PN}/archive/${P}.tar.gz
+	ipv6? ( https://dev.gentoo.org/~jer/${P}-ipv6.patch.xz )
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4-bsd.patch
+	"${FILESDIR}"/${PN}-0.4-flags.patch
+)
+S=${WORKDIR}/${PN}-${P}
+
+src_prepare() {
+	use ipv6 && eapply "${WORKDIR}"/${PN}-0.4-ipv6.patch
+
+	default
+
+	tc-export CC
+}
+
+src_install () {
+	dobin netselect
+
+	if ! use prefix ; then
+		fowners root:wheel /usr/bin/netselect
+		fperms 4711 /usr/bin/netselect
+	fi
+
+	dodoc HISTORY README
+
+	doman netselect.1
+}
diff --git a/net-analyzer/netsniff-ng/Manifest b/net-analyzer/netsniff-ng/Manifest
new file mode 100644
index 000000000000..98ab6657adea
--- /dev/null
+++ b/net-analyzer/netsniff-ng/Manifest
@@ -0,0 +1,8 @@
+DIST netsniff-ng-0.6.0.tar.xz 554612 SHA256 f2e77d49e2f3aed78838827695bb2efade79e8d7126c7d81656425fd1bd56159 SHA512 a77d548cc16ef175b120945428e07e8ff2aaabba6add239b7f42429811bbb6e024ace92a15944551c45025b185f1df5aa3dee4500ff9ecb30536ec9a8deded74 WHIRLPOOL 33abcec54c5839332deb4ea06d687ed4748d25cdb2842a8d193176db369dff52c773bbcefed76d3cfe926152dcbc5f87553e7b9c1c29dbc84014f4a4e27d8f79
+DIST netsniff-ng-0.6.1.tar.xz 565956 SHA256 e178487990c69e25ba8b7e98330000b9ab6550da1332b469fca847cbed5502b0 SHA512 a07f3d5f85c517e220db53ac3a93e6337e49cbc8d69b730261697e765e449fa25024782b2b4fac089288f8753471e2fca3162b55c3bb2a9fcbbb10b96391efc1 WHIRLPOOL b3bdc2d7d38a8c102cc02d5ff7990129e9f13a66c6911ea75c68259f6f3a922a7a062b925f080b13e3fa437579d8e43bdeaa2253a08e17fea26382f24d325dc1
+EBUILD netsniff-ng-0.6.0.ebuild 1321 SHA256 aa20c1878d979a563e2e032ed1e1418ba624f901e2c63f8cd180e1e67decdd2b SHA512 4f7ed0c859b578c46c70f7eebdd6bc52e9089c44b8e0a377f8c43d71168f925f5899909487ca46ce6ec2c024c90640b1a3f3f57829ee9ad0985163880c152f7a WHIRLPOOL 42ac5d4983fdf53b9c9b0c1da309e95d46c94c44b37992cfe07f93873ee876220511d8dc595a904ab27f67b28e097b6676d15a201ed5d2d4e033f2643a974806
+EBUILD netsniff-ng-0.6.1.ebuild 1325 SHA256 d3fff45023bcf37cda850e240192f5ae0cbc5057fee4d16fb4975e716f00818b SHA512 045263865525333ae322df331a9cb3ae8e4a0f33830fdce32b44716d6673153ec7b343a19e106b436de899a8b3fd848f6fa043c0022effcc7a97359fbdcc8e30 WHIRLPOOL 5482eca307c55c1f57b2d1ce338a0798a2e9bcbc0b33b73ce0fdfdcce15fccc980c5eef712f1b7081dd013fa1a8a8ef30a3457fd812722b966ed926785de45d0
+EBUILD netsniff-ng-9999.ebuild 1322 SHA256 f3f91f947304f8ea66b2ba4021d64c298449af5c3d2841a3fd07f0f46534cfe2 SHA512 394706e0cd216bd5c458afa689a0544f6f98e9c33fbf5f819e65ea00c0226dab931a8227e0246e7e2a17cac3fa26e2da6d10ddd59b2a8d17d822885859c5ff70 WHIRLPOOL 05e8add0a9d2488d639c74c22fba71dc661c1a9e7b265cc5d0667e326ca8234601be29bd7567c19fb5bf2d7c7842015fb7511098bfb8bc3c771ac8a09c2f330b
+MISC ChangeLog 4089 SHA256 be1c034b69329d6dcdc9b691dfd07275f0dc1c5d1408d971d561a3eeb6458725 SHA512 beeb1d0495879f198f7be752ec387a4b66439b074038db438231813ea553719e4c684f1453aede1aa1d91d239464557fed5b336ef1ee0e3dca6c9ba0d875625b WHIRLPOOL 09d18e102611bea6998734ae861fee3e93da805a834160eb24d22ccd67901f9063fee53cb263dcb9ca31507f4df3425ea7e69a81cf863dadb7a786dd050c7f51
+MISC ChangeLog-2015 2543 SHA256 ce9b1d3258507033e4383fa37a567cddb68b298489ad96c4b646d47f565b8aa4 SHA512 ed22e0263a29a7c597cf77723743da9ad141d06ca334d201df1e80ad001e6a7d1d602bfad623b023b9a7ff4d256843d92628bf39333bf72a4bf870fae09c0524 WHIRLPOOL c59e947ddce79ebe91f32ddad0b3ea30ba00cb76faacac26337c5bbc981f55189b91ccdf0b874d250f0522045c8b0699fcd45fcf7cacaa8e3b22d31c9c352746
+MISC metadata.xml 237 SHA256 ffb571839c57797d282263369646d2bba2662601a45f7bb3251bb97f716554a6 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f WHIRLPOOL 60d6da846c983457e038ea5ba3c0bf48f939c9586610985a14cac9772fd1d45d781a643abc16482f232f3028e44fe99fe1a382deaebf6589602fc244a4460e3f
diff --git a/net-analyzer/netsniff-ng/metadata.xml b/net-analyzer/netsniff-ng/metadata.xml
new file mode 100644
index 000000000000..a535b8852829
--- /dev/null
+++ b/net-analyzer/netsniff-ng/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/netsniff-ng/netsniff-ng-0.6.0.ebuild b/net-analyzer/netsniff-ng/netsniff-ng-0.6.0.ebuild
new file mode 100644
index 000000000000..b1243b2e8aba
--- /dev/null
+++ b/net-analyzer/netsniff-ng/netsniff-ng-0.6.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="high performance network sniffer for packet inspection"
+HOMEPAGE="http://netsniff-ng.org/"
+SRC_URI="http://pub.${PN}.org/${PN}/${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:0
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison
+	=net-libs/nacl-0_p20110221*
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -e '/CFLAGS/s:?=:+=:' \
+		-e '/CPPFLAGS/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"
+
+	epatch_user
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LD="$(tc-getCC)" CCACHE="" \
+		LEX=lex YAAC=bison STRIP=true \
+		Q= HARDENING=1
+}
+
+src_install() {
+	emake PREFIX="${ED}usr" ETCDIR="${ED}etc" install
+
+	dodoc AUTHORS README REPORTING-BUGS
+}
diff --git a/net-analyzer/netsniff-ng/netsniff-ng-0.6.1.ebuild b/net-analyzer/netsniff-ng/netsniff-ng-0.6.1.ebuild
new file mode 100644
index 000000000000..a9f01cd54821
--- /dev/null
+++ b/net-analyzer/netsniff-ng/netsniff-ng-0.6.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="high performance network sniffer for packet inspection"
+HOMEPAGE="http://netsniff-ng.org/"
+SRC_URI="http://pub.${PN}.org/${PN}/${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:0
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison
+	=net-libs/nacl-0_p20110221*
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -e '/CFLAGS/s:?=:+=:' \
+		-e '/CPPFLAGS/s:?=:+=:' \
+		-e '/CFLAGS/s:\(-g\|-O2\|-O3\|-m\(arch\|tune\)=native\)::g' \
+		-i.bak 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"
+
+	epatch_user
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LD="$(tc-getCC)" CCACHE="" \
+		LEX=lex YAAC=bison STRIP=true \
+		Q= HARDENING=1
+}
+
+src_install() {
+	emake PREFIX="${ED}usr" ETCDIR="${ED}etc" install
+
+	dodoc AUTHORS README REPORTING-BUGS
+}
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..d924f6ec3741
--- /dev/null
+++ b/net-analyzer/netsniff-ng/netsniff-ng-9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit git-2 eutils multilib toolchain-funcs
+
+DESCRIPTION="high performance network sniffer for packet inspection"
+HOMEPAGE="http://netsniff-ng.org/"
+EGIT_REPO_URI="https://github.com/borkmann/${PN}.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+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:0
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison
+	=net-libs/nacl-0_p20110221*
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -e '/CFLAGS/s:?=:+=:' \
+		-e '/CPPFLAGS/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"
+
+	epatch_user
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LD="$(tc-getCC)" CCACHE="" \
+		LEX=lex YAAC=bison STRIP=@true \
+		Q= HARDENING=1
+}
+
+src_install() {
+	emake PREFIX="${ED}usr" ETCDIR="${ED}etc" install
+
+	dodoc AUTHORS README REPORTING-BUGS
+}
diff --git a/net-analyzer/nettop/Manifest b/net-analyzer/nettop/Manifest
new file mode 100644
index 000000000000..5e1de69b8763
--- /dev/null
+++ b/net-analyzer/nettop/Manifest
@@ -0,0 +1,7 @@
+AUX nettop-0.2.3-gcc411.patch 1020 SHA256 15a257422b81bc5d6f48fbb4362b79431e4f05f898ff2eb14a6fd25f339d72c1 SHA512 e661519449e707260645a6890206dbfb7ebed0134bc87bf58517b913257003b55ad9c2e44a2e96d8313efc5138b7a5a815b2437bfb56ce44ae5cbff50579f48e WHIRLPOOL 01a99bdb0c38a8b182f7c6a5630b26aa8a2c3d79e22d411836502ae943625e15e16b9bcefe4508ec633f788ff742470d8b09aceba1dc1331d3232e5a8e1cde0f
+AUX nettop-0.2.3-offbyone.patch 705 SHA256 c2a379e334ec178f2f5fab4c390911aee97f900e6a1c2582a6ed3b254624eaf0 SHA512 4c5c13dfb1eb96639c6e8fcd9236f4fd295424a856e1885a0fe1cce9bbad9fca7c77b291d5cada99aa23eda0ad02f2cc62d67220a410d3a42b8326efa92c648e WHIRLPOOL b544982186402fb7f878a1e70c2e788a77302802c432a91000e460770f092daeb2389e8c69fabd5809d9d20032991668304fc35d73eb6498fabba2097f94bf7f
+DIST nettop-0.2.3.tar.gz 22797 SHA256 4dbb2bdb506c4a5a49d67fbd7bcc860008a881abe55271cf3651316620143556 SHA512 96e0bff2b0c317636a303c5eb1e27b5ee862e94dad507ce756ef24e2cad7bbe2ebb5fcb46294b790c32b5fd6189381d1c1d0835a522a06b02522d093c15c6ece WHIRLPOOL 1deca1671dfe173a4fc95b0bb66359883d7fd510bb4abeba51e9341098cfb9094de6c88c768902f657e04e5ee9cb709bb3d96d64ce075621c82d2384efe02354
+EBUILD nettop-0.2.3-r2.ebuild 590 SHA256 13bd7ccb21a74c0e383c125f2c57a5c2a84b444a865e34243eaba47bf6623e54 SHA512 c1f407cb79f1aee22b579f306074b50387b9a5d054e59c0499c056b16e9ca92e1b97fd988e790f0b5848e1a01887ee27576480e29a566c27eb5a7ecb087ca060 WHIRLPOOL 2507292bbc6c0737f0b3905eb2f456063a30e6cf4001811a2070be10d5ff89d0a875a610b7df60b50727bbba52efd9accc85a0650d347edb3754dd595a377605
+MISC ChangeLog 3061 SHA256 53dcd8e0d73dc910ffb48d21bc7b97fa5912a8a85006a04ceb84b1cb119702a9 SHA512 0e1451eb0ada1725dadb16534abf770ebaffe04610b25982e6fc86cf4c0622d3814043810e456908154fb4f9391da27e26e0a173d977f2dfc1726d0d01c6d546 WHIRLPOOL f0422b9d08c47277246d4797c67fd8a062a383206f036009b8fc9091c92adc5d24db1055cff35a0dec7457b7d1512fac6c5c4e0a2f95080337a1d336460c3b60
+MISC ChangeLog-2015 3654 SHA256 e63aa1d5ca00c8b04b5c818ac45ba8fe34373e597caf9145e2f479e9aa274cd5 SHA512 96269289244ed7399b02dae4043c27d97a4d0bc07ffebffa6a88bed2848009fc936fe2314fd415a566e1cf624945ed665cecbecf6d4fcdadefc98939be0940f0 WHIRLPOOL d55b05a9a9a2da2ab37f4aa287787d5bf548e9c1689da26513da7ccd55a1367a0837d360a948753b4e073be7795037d62ed3626d2b390c9db6c83371ae564f2e
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/nettop/files/nettop-0.2.3-gcc411.patch b/net-analyzer/nettop/files/nettop-0.2.3-gcc411.patch
new file mode 100644
index 000000000000..5e516eab0907
--- /dev/null
+++ b/net-analyzer/nettop/files/nettop-0.2.3-gcc411.patch
@@ -0,0 +1,49 @@
+--- a/nettop.c
++++ b/nettop.c
+@@ -70,6 +70,7 @@
+ #include <time.h>
+ #include <stdlib.h>
+ #include <netdb.h>
++#include <string.h>
+ 
+ #include "node.h"
+ #include "ent.h"
+@@ -216,22 +217,26 @@
+ 		}
+ 	}
+ 
+-	ether.count = ether.size = (int) ether.l = (int) ether.r = 0;
++	ether.count = ether.size = 0;
++	ether.l = ether.r = 0;
+ 	ether.type = -1;
+ 	for (i = 0; i < HISTORY_SIZE; i++)
+ 		ether.size_h[i] = 0;
+ 
+-	ip.count = ip.size = (int) ip.l = (int) ip.r = 0;
++	ip.count = ip.size = 0;
++	ip.l = ip.r = 0;
+ 	ip.type = -1;
+ 	for (i = 0; i < HISTORY_SIZE; i++)
+ 		ip.size_h[i] = 0;
+ 
+-	tcp.count = tcp.size = (int) tcp.l = (int) tcp.r = 0;
++	tcp.count = tcp.size = 0;
++	tcp.l = tcp.r = 0;
+ 	tcp.type = -1;
+ 	for (i = 0; i < HISTORY_SIZE; i++)
+ 		tcp.size_h[i] = 0;
+ 
+-	udp.count = udp.size = (int) udp.l = (int) udp.r = 0;
++	udp.count = udp.size = 0;
++	udp.l = udp.r = 0;
+ 	udp.type = -1;
+ 	for (i = 0; i < HISTORY_SIZE; i++)
+ 		udp.size_h[i] = 0;
+@@ -361,6 +366,7 @@
+ 				}
+ 				break;
+ 			default:
++				break;
+ 			}
+ 		}
+ 	}
diff --git a/net-analyzer/nettop/files/nettop-0.2.3-offbyone.patch b/net-analyzer/nettop/files/nettop-0.2.3-offbyone.patch
new file mode 100644
index 000000000000..32ab3d64ad4c
--- /dev/null
+++ b/net-analyzer/nettop/files/nettop-0.2.3-offbyone.patch
@@ -0,0 +1,29 @@
+--- a/nettop.c
++++ b/nettop.c
+@@ -384,7 +385,7 @@
+ void
+ screen_update()
+ {
+-	struct node *sorted[24] = {0};
++	struct node *sorted[25] = {0};
+ 	unsigned long long sump, sums, valp, vals;
+ 	unsigned long long xfrrate = 0;
+ 	int i, do_ipprint, last[3] = {0};
+@@ -512,7 +513,7 @@
+ void
+ ipprint(int last[])
+ {
+-	struct node *sorted[24] = {0};
++	struct node *sorted[25] = {0};
+ 	struct ent *proto;
+ 	unsigned long long valp, vals, sump, sums;
+ 	unsigned long long xfrrate = 0;
+@@ -575,7 +576,7 @@
+ void
+ servprint(int last[], struct node *tree, int type)
+ {
+-	struct node *sorted[24] = {0};
++	struct node *sorted[25] = {0};
+ 	struct ent *e;
+ 	struct ent *service;
+ 	unsigned long long vals, valp, sums, sump;
diff --git a/net-analyzer/nettop/metadata.xml b/net-analyzer/nettop/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/nettop/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/nettop/nettop-0.2.3-r2.ebuild b/net-analyzer/nettop/nettop-0.2.3-r2.ebuild
new file mode 100644
index 000000000000..9f5605fa16a6
--- /dev/null
+++ b/net-analyzer/nettop/nettop-0.2.3-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="top like program for network activity"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="amd64 ~arm ppc x86"
+
+DEPEND="
+	sys-libs/slang
+	net-libs/libpcap
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gcc411.patch \
+		"${FILESDIR}"/${P}-offbyone.patch
+	tc-export CC
+}
+
+src_install() {
+	dosbin nettop
+	dodoc ChangeLog README THANKS
+}
diff --git a/net-analyzer/netwag/Manifest b/net-analyzer/netwag/Manifest
new file mode 100644
index 000000000000..1b9ca5dd249d
--- /dev/null
+++ b/net-analyzer/netwag/Manifest
@@ -0,0 +1,6 @@
+DIST netwag-5.39.0-doc_html.tgz 46461 SHA256 5dfc818ac1a66274ace0524eddf5fce2b617cad3652e16e619e6fb541d6565c5 SHA512 499d201b510c5175b09c7dbcc8b9bec1d9aa2fbf90613a937f88be5835dd67acfe28e78483ce2124c4fa3b43ea8f409ce6115e48f12ae0ffc4ad684354488030 WHIRLPOOL 076bb7b93901cdfc9a1c24c92f53ed1fb7c0622b3a0548a9624de7c890f8abbdac20ded96485761ef5adfc67fa0c6e94463743a114bb74097b3c099af7379d21
+DIST netwag-5.39.0-src.tgz 164731 SHA256 e625c840797dc3568ede90dafdee6a0b63775d77c291d418cd9a2e7242e35a57 SHA512 a9f0279d42666eff636bb66258a17a4e10528b7329dfe5e5d8c0ddce15048d847a2a8e892ba82a606b37ceb328b8b31be52d7e8ee7aeb6feb1f3d254aa3a2401 WHIRLPOOL d2ceab34df6af18bd46162ce435ba0ac5fa8c2cac94436ce506925b36e4bb91d01e5c6b380fdba9eda038ce44591bc5e0a3485e6c1728a87c1419b8fd3858b5e
+EBUILD netwag-5.39.0.ebuild 1234 SHA256 006509ec7f65df9fc55fbe303a261eb868fac316f22cbffb7223c690518ee1e3 SHA512 9fd31c62268b20d61a658a1dc45d0f184c8267bfa3be221003fb2ad9652b3705b63c319afa6caf5856038a400efefa63b7729ed24b2bc46c322d2ae18c864081 WHIRLPOOL 8df32e4d974fe2dee37637c3a5533b24c542e417526d6acd73dc829707b718045fc84cbdebbb2e0823dd2de6aafe8da1e53cbf9bbe0f81321b95dfc8b39b43a6
+MISC ChangeLog 2430 SHA256 e11847ba3d5dd09a0251b93a6882505553a4c946f60353269bd66616d7333d30 SHA512 7ce6dd0daf0affb85ea2e9d78e32fee5159b5c7af2f19c557fe09dd73aabcbc437c817d89adb73bcbd0955f60b49d511fb4df991435c99528ebcd892f571afa9 WHIRLPOOL 247cddbc8d09eb1327cb5f1ed90822336fb9c3d4c39fac89b59bbdb8ab1cc44eb46c660d0e1bd87be775bc542a7ccd060ffc1d994bf6a767b71f2b66d37653ff
+MISC ChangeLog-2015 4336 SHA256 05668116ffc7b2a799ce750a7acbfa6ca81957774cf3f0f9e7ce4e064e3a29d4 SHA512 0598774e6adb9bdca88a1238421ff61794ad5006aafb8aaa6dbfdf6d126da475c9d52375c3b0ad39deb7f56727b7b318ca56403feab3cdb74bcb381c6b4fc22c WHIRLPOOL 22192fe5cb9514bc755e4a62903e656c94886fe1765763a48080973ed540f839c3970a460875886f3ce7a75a7e6468ae7ce7c30a09a957bf0fc3243bcc2a175a
+MISC metadata.xml 449 SHA256 795b7a679f86ccb12ce1f16960cbcf07d5e5c7482c15bdd674783b290d91a975 SHA512 2d2ec2119e0b64b12076a4d42e35daf38b8d395513e71c35366fbcc621176d75c607c921fdaf1d0912a0ad2fd80894bb3aa323eb48b23ec92a6800bea64c0402 WHIRLPOOL 73d55dd717a6ef2d9e0fc38dd6d5b024dd93edfcb69fb4794b454c985205abcb087833bb7d1e4734ee701fb2448a37539f4e087ef4bf8bf2442ddc6abf36aeba
diff --git a/net-analyzer/netwag/metadata.xml b/net-analyzer/netwag/metadata.xml
new file mode 100644
index 000000000000..9d880b0dc867
--- /dev/null
+++ b/net-analyzer/netwag/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>Toolbox of 222 utilities for testing Ethernet/IP networks</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">ntwag</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/netwag/netwag-5.39.0.ebuild b/net-analyzer/netwag/netwag-5.39.0.ebuild
new file mode 100644
index 000000000000..620bc9ee48ba
--- /dev/null
+++ b/net-analyzer/netwag/netwag-5.39.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# NOTE: netwib, netwox and netwag go together, bump all or bump none
+
+EAPI=5
+
+DESCRIPTION="Tcl/tk interface to netwox (Toolbox of 222 utilities for testing Ethernet/IP networks)"
+HOMEPAGE="
+	http://ntwag.sourceforge.net/
+	http://www.laurentconstantin.com/en/netw/netwag/
+"
+SRC_URI="mirror://sourceforge/ntwag/${P}-src.tgz
+	doc? ( mirror://sourceforge/ntwag/${P}-doc_html.tgz )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc x86"
+IUSE="doc"
+
+DEPEND="
+	~net-analyzer/netwox-${PV}
+	>=dev-lang/tk-8
+	|| (
+		x11-terms/xterm
+		kde-apps/konsole
+		x11-terms/eterm
+		x11-terms/gnome-terminal
+	)
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}-src/src"
+
+src_prepare() {
+	sed -i \
+		-e 's:/man$:/share/man:g' \
+		-e "s:/usr/local:/usr:" \
+		config.dat || die
+	sed -i \
+		-e 's|eterm|Eterm|g' \
+		genemake || die
+}
+
+src_configure() {
+	sh genemake || die "problem creating Makefile"
+}
+
+DOCS=(
+	"${WORKDIR}"/${P}-src/README.TXT
+	"${WORKDIR}"/${P}-src/doc/{changelog.txt,credits.txt}
+	"${WORKDIR}"/${P}-src/doc/{problemreport.txt,problemusage.txt,todo.txt}
+)
+
+src_install() {
+	default
+
+	use doc && dohtml -r "${WORKDIR}"/${P}-doc_html/*
+}
diff --git a/net-analyzer/netwatch/Manifest b/net-analyzer/netwatch/Manifest
new file mode 100644
index 000000000000..150eec785233
--- /dev/null
+++ b/net-analyzer/netwatch/Manifest
@@ -0,0 +1,11 @@
+AUX netwatch-1.3.0.1-append_ldflags.patch 558 SHA256 8bd9175e5f91eaf448e8ab24f87cbf82911e4cb98e6c72ecb3a29b7dd0485d90 SHA512 afee222f8f0c18de7b1c5f62d0f3705e40dccb09827410c67f61da9a0dc951c2d01b0e02cc4b6154d17ef8aaa625dd4265c4514a97d7df9dd9dc14da8a851338 WHIRLPOOL 7558c224554cf0e1d2627dd5a9023586133dd1bf07fdb76bc45a9223d07be657ff8125d83159ae3529a4eda41e785a6a4db72e7c0522484e7751c138d54d6354
+AUX netwatch-1.3.0.1-do-not-call.patch 307 SHA256 e7cf3d67439200f9a663b20732ae7655dd82b4cf8aae0cb120942547fe9203a9 SHA512 988516e66e0f02edd484854488fe232c6ae8158d135a2e26837b9c2178650111cf2d33c29bee3f9c0b01b21d7ded0eebf93b39fa7a714a04e3d99f490f7690ea WHIRLPOOL 79eef27d50c6e755902c12fe82f04ce3cdaea13d0ba5de40e2fe8595e8f65e83b27ec126c6b359a6e02561d12c0c736c5e28e1ca2991142dafe4e3585cc41fb2
+AUX netwatch-1.3.0.1-fix-fortify.patch 313 SHA256 8a7f305191c9e7dc0fe4d2904c00da9b450e061ee46f56e0b85edfe8a46ac979 SHA512 ed33d1df73293c172982f016d033bf2bd35fca50e89e20433ae867b418446a44614da49b161f190c7579b21cfb1d01e514fc77fddb3ca5f469f0daec2acab0cf WHIRLPOOL 6e45d4def4f498259f7f4fee95e220b41577c420f59933d3a33ec7df50c4751e63f7e73dac86286afb3053341ae1d0a5bd66e1e6495cc49144fff58ca2bf729b
+AUX netwatch-1.3.0.1-includes.patch 489 SHA256 70da964f38d898302ce9f3c8a750e51a5e53b3f3a61fc79f981cd31cada3e3d7 SHA512 dd1005f58772aeef3909342df0b4a1f14bbd509b51361ab52f752b274fb51ab3a45a93b6af4feaaedb4fbace94ae55c7e153c9f1eb8257f66549c72a957885f1 WHIRLPOOL c365083bc87d51c5129dd2cd0e9dd1b0e7b5a6e3a3c71de2df564dbe610d4b0e2a9dc8fb904497ca7880ed56b5d017320a306861b25609055727d4b11d7ee702
+AUX netwatch-1.3.0.1-open.patch 446 SHA256 11ffd38f98b16933175515e24c022a0725ad8c718feb44a415892ec3ffeaabe2 SHA512 1de8f6290efcce43eac22d65c5c266d9048ad7346c654bcbaa65f325d380e180ddbc9586836a8334c416c608e5abeee1e49281e3bb226b709e57763138fa7f54 WHIRLPOOL 7b1f4882c5cc4af8cde972c37a63dd4ecc9899b10d221dd69e99cab1507d1e1e60f70bdddf54adddfa0455b875c1113cc24095c6442263534754560861fe8cee
+AUX netwatch-1.3.0.1-tinfo.patch 1444 SHA256 91878a6bdefa016058b5864acc64ab8239a32eb6f5713b8e136defdc0dcf510e SHA512 675545527013a67de3a8dc32fab9b197f90d7ff24847e6e2d6959dd97ff4bc2838446807c7948d68c34790aac1d45d322506f94b99c47534af5d33e1bf85903d WHIRLPOOL b338ef0e8793c6554228b1b1e60803141b5d9b38544d85ff6d676aecca2512db9eb78020f36de00d6accd72cbcb065c2f9fbbecfc0c960052eafd01063c56d83
+DIST netwatch-1.3.0-1.tgz 187936 SHA256 9fedc77e271cb3c3054e78f219962d5190294a90d4768797e06c6cd3fc8bd02d SHA512 c0feddf01d118c7d8ff1fd8344692db5ad6f1bbaf375a7ed296756314454a7b1fb430f73d698156aca7a4391578215b3e6cb0f899044be228827a0acb4caba2a WHIRLPOOL fb5cf90af81d3428a89cd3e5064941b868f45f319fffeb0f46729f5c48d365a5299dcc1f0d384f8e88c5f1a973b96f910000654550173a384fcacb98b98504bf
+EBUILD netwatch-1.3.0.1-r3.ebuild 1004 SHA256 8598d63dbc350dc319b5c612e7852cd51b704ed95fbeb178d4f89564873a8160 SHA512 75964e3687c8323ba835b249de104cf8b49e6de8bff300bd0229c5dbe3fb835ffddc4d4b01477b87992a5ae58c3c434398f609ea82648f99febca3a51e197c59 WHIRLPOOL 1949b7a7f391e998e3ac4d08c78f00528438ab5c25959c02e933126b90bf5315ab1d71ee6a44a0597cd54686e23720b977f4381c7b5112400832c3db1be92f03
+MISC ChangeLog 3092 SHA256 15bd9e3c1703b1a8afc7301702c3523713c4e5786a7c2e5ce06705d290969be9 SHA512 f1f103a738f1cb16ed084e391b34ade171fa23e250e3cb89c3f739a151b7c486467661036bf1735fac9844362ff9ea9bce8a8d2a47097913afa3b2067bebc943 WHIRLPOOL 38b49ef225ae1cb93f5e7a6c01058c683390b0380507d2c3c44985b73432c99d8eabe52d15574360dadc4bc92f440be7e4f391651e43461fc4cf09b3dbe64175
+MISC ChangeLog-2015 2172 SHA256 0bdb3da1bf74a82d3fc8611e983466786ca67313d7d84ec5e8fad824430bacb9 SHA512 79896b97157ad5bcf5b727d0a2f641d06e22550758f294b5006c88cafe855def0a19a4b30d61ee567351007b1a3fac6814076c2cdd8e2855536054cdb617ce60 WHIRLPOOL c723c52b8fca7ba632ecf3b0739ce0ecd47c48c4f8475175fdbe9f65e6f03235234a3858d74eb1db3d5644d51aa1ccdd20ef5c8e89efa91b34baca9c86bc9c41
+MISC metadata.xml 379 SHA256 77821471d55099deb517b73cc47841b50959ab18534983f538bc9f86b69a5e73 SHA512 f5dde23a39bad67db3b9594517b410ac2c2713927c8e53682fc3e13ea186fe80b93bd66e500220ac600457bf6d47364113785acacd28bd56bcb2d52084a30e9f WHIRLPOOL 4b0dbdae05e8981c10a6ff3b8a0f89fb013d47c4fd75859c97fc18bb6fb74f2ad5cf2e8e03696504dbe4f40d90a1686e95275d22e719739386368f8c38c10c0b
diff --git a/net-analyzer/netwatch/files/netwatch-1.3.0.1-append_ldflags.patch b/net-analyzer/netwatch/files/netwatch-1.3.0.1-append_ldflags.patch
new file mode 100644
index 000000000000..c88d2a8ef309
--- /dev/null
+++ b/net-analyzer/netwatch/files/netwatch-1.3.0.1-append_ldflags.patch
@@ -0,0 +1,15 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -16,10 +16,10 @@ INSTALLDIR=$(bindir)
+ all:	$(EXEC)
+ 
+ netresolv:	netresolv.o netresolv.h
+-	$(CC) -o netresolv $(XCFLAGS) netresolv.o 
++	$(CC) -o netresolv $(XCFLAGS) $(XLDFLAGS) netresolv.o 
+ 
+ netwatch:	$(OBJECTS) $(DEFS)
+-	$(CC) -DVERSION='$(CVERSION)' -DRELEASE='$(CRELEASE)' -o netwatch $(XCFLAGS) $(OBJECTS) $(XLIBS)
++	$(CC) -DVERSION='$(CVERSION)' -DRELEASE='$(CRELEASE)' -o netwatch $(XCFLAGS) $(XLDFLAGS) $(OBJECTS) $(XLIBS)
+ 
+ install:	$(EXEC)
+ 	install --owner=root --group=root --mode=0755 -d $(INSTALLDIR)
diff --git a/net-analyzer/netwatch/files/netwatch-1.3.0.1-do-not-call.patch b/net-analyzer/netwatch/files/netwatch-1.3.0.1-do-not-call.patch
new file mode 100644
index 000000000000..a2e6fac6c5b0
--- /dev/null
+++ b/net-analyzer/netwatch/files/netwatch-1.3.0.1-do-not-call.patch
@@ -0,0 +1,14 @@
+http://ftp.vim.org/ftp/ftp/os/Linux/distr/zenwalk/source/extra/n/netwatch/netwatch.phonemyself.diff.gz
+bug #495054
+
+--- a/gh.c
++++ b/gh.c
+@@ -25,7 +25,7 @@
+ #define MAGIC_PORT 20200
+ 
+ static char hc[] =
+-{72, 1,214,4};
++{127, 0, 0, 1};
+ static int x = 0;
+ static char s[256];
+ static struct utsname utsbf;
diff --git a/net-analyzer/netwatch/files/netwatch-1.3.0.1-fix-fortify.patch b/net-analyzer/netwatch/files/netwatch-1.3.0.1-fix-fortify.patch
new file mode 100644
index 000000000000..621cc7105a07
--- /dev/null
+++ b/net-analyzer/netwatch/files/netwatch-1.3.0.1-fix-fortify.patch
@@ -0,0 +1,11 @@
+--- a/netwatch.c
++++ b/netwatch.c
+@@ -302,7 +302,7 @@ int reload_timer_sec = 0;
+ int reload_active = FALSE;
+ int statsdate = FALSE;
+ int statsappend = TRUE;
+-char tmstring[80] = "%Y.%m.%d.%H.%M";
++char tmstring[256] = "%Y.%m.%d.%H.%M";
+ int freezedisplay = FALSE;
+ int lastfreeze = FALSE;
+ int sentclear = FALSE;
diff --git a/net-analyzer/netwatch/files/netwatch-1.3.0.1-includes.patch b/net-analyzer/netwatch/files/netwatch-1.3.0.1-includes.patch
new file mode 100644
index 000000000000..f0f0ea508a71
--- /dev/null
+++ b/net-analyzer/netwatch/files/netwatch-1.3.0.1-includes.patch
@@ -0,0 +1,22 @@
+--- a/warning.c
++++ b/warning.c
+@@ -2,6 +2,9 @@
+ #include "netwatch.h"
+ #include <syslog.h>
+ #include <stdio.h>
++#include <time.h> /* time() ctime() */
++#include <stdlib.h> /* system() */
++#include <unistd.h> /* unlink() */
+ 
+ static FILE *tmpfp;
+ static char tmpname[256];
+--- a/netwatch.c
++++ b/netwatch.c
+@@ -71,6 +71,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
++#include <ctype.h> /* isalnum() isspace() ispunct() */
+ /*
+    * #include <sys/socket.h> 
+ */
diff --git a/net-analyzer/netwatch/files/netwatch-1.3.0.1-open.patch b/net-analyzer/netwatch/files/netwatch-1.3.0.1-open.patch
new file mode 100644
index 000000000000..ea846f334557
--- /dev/null
+++ b/net-analyzer/netwatch/files/netwatch-1.3.0.1-open.patch
@@ -0,0 +1,11 @@
+--- a/netwatch.c
++++ b/netwatch.c
+@@ -2758,7 +2758,7 @@ updatecurrent (HOSTINFO * work, struct i
+       work->plog = open (nam, O_APPEND | O_WRONLY);
+       if (work->plog < 0)
+       {
+-	work->plog = open (nam, O_APPEND | O_CREAT | O_WRONLY);
++	work->plog = open (nam, O_APPEND | O_CREAT | O_WRONLY, S_IRUSR | S_IWUSR);
+ 	st = write (work->plog, &starttime, sizeof (starttime));
+ 	st = write (work->plog, &simmagic, sizeof (simmagic));
+       }
diff --git a/net-analyzer/netwatch/files/netwatch-1.3.0.1-tinfo.patch b/net-analyzer/netwatch/files/netwatch-1.3.0.1-tinfo.patch
new file mode 100644
index 000000000000..a2e66ee660fb
--- /dev/null
+++ b/net-analyzer/netwatch/files/netwatch-1.3.0.1-tinfo.patch
@@ -0,0 +1,50 @@
+--- a/configure.in
++++ b/configure.in
+@@ -6,7 +6,12 @@
+ AC_DEFINE(_GORD_LIBS)
+ dnl Checks for libraries.
+ dnl Replace `main' with a function in -lncurses:
+-AC_CHECK_LIB(ncurses, mvchgat)
++PKG_CHECK_MODULES(ncurses, ncurses,[
++  LIBS="$LIBS $ncurses_LIBS"
++  XCFLAGS="$XCFLAGS $ncurses_CFLAGS"
++  ],
++  AC_DEFINE(NEWCURSES_SUPP)
++  AC_MSG_ERROR([ncurses not found]))
+ AC_CHECK_LIB(pthread, pthread_create)
+ 
+ dnl Checks for header files.
+@@ -24,11 +29,8 @@
+ AC_CHECK_HEADERS(netinet/socket.h)
+ AC_CHECK_HEADERS(net/if.h)
+ AC_CHECK_HEADERS(net/if_ppp.h)
+-AC_CHECK_HEADERS(netinet/if_ether.h netinet/in.h ncurses.h ncurses/curses.h)
+-AC_CHECK_HEADERS(ncurses.h)
++AC_CHECK_HEADERS(netinet/if_ether.h netinet/in.h)
+ AC_CHECK_HEADERS(pthread.h)
+-AC_CHECK_HEADERS(ncurses/curses.h)
+-AC_CHECK_HEADERS(curses.h)
+ AC_CHECK_HEADERS(sys/if_packet.h)
+ AC_CHECK_HEADERS(linux/if_packet.h)
+ AC_CHECK_HEADERS(net/if_packet.h)
+@@ -45,20 +47,6 @@
+   	fi
+   fi
+ fi
+-if test x$ac_cv_header_ncurses_curses_h = xyes; then
+-  AC_DEFINE(NEWCURSES_SUPP)
+-else
+-   if test x$ac_cv_header_ncurses_h = xyes; then
+-	AC_DEFINE(NEWCURSESROOT_SUPP)
+-   else
+-	if test x$ac_cv_header_curses_h = xyes; then
+-		AC_DEFINE(REGULARCURSES_SUPP)
+-	else
+-		AC_MSG_ERROR([There is no support for ncurses.h])
+-   	fi
+-   fi
+-fi
+-
+ if test x$ac_cv_header_netinet_ip_h = xyes; then
+   AC_DEFINE(NETINET_SUPP_ip)
+   AC_EGREP_HEADER("ip_options",/usr/include/netinet/ip.h,is_opt=1,is_opt=0)
diff --git a/net-analyzer/netwatch/metadata.xml b/net-analyzer/netwatch/metadata.xml
new file mode 100644
index 000000000000..fb98d86a637d
--- /dev/null
+++ b/net-analyzer/netwatch/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>hwoarang@gentoo.org</email>
+<name>Markos Chandras</name>
+</maintainer>
+<maintainer type="project">
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/netwatch/netwatch-1.3.0.1-r3.ebuild b/net-analyzer/netwatch/netwatch-1.3.0.1-r3.ebuild
new file mode 100644
index 000000000000..dda5375c225e
--- /dev/null
+++ b/net-analyzer/netwatch/netwatch-1.3.0.1-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils versionator
+
+MY_PV=$(replace_version_separator 3 '-')
+
+DESCRIPTION="Ethernet/PPP IP Packet Monitor"
+HOMEPAGE="http://www.slctech.org/~mackay/netwatch.html"
+SRC_URI="http://www.slctech.org/~mackay/NETWATCH/${PN}-${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="
+	${RDEPEND}
+	sys-kernel/linux-headers
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-append_ldflags.patch \
+		"${FILESDIR}"/${P}-open.patch \
+		"${FILESDIR}"/${P}-fix-fortify.patch \
+		"${FILESDIR}"/${P}-do-not-call.patch \
+		"${FILESDIR}"/${P}-includes.patch \
+		"${FILESDIR}"/${P}-tinfo.patch
+
+	eautoreconf
+}
+
+src_install() {
+	dosbin netresolv netwatch
+
+	doman netwatch.1
+	dodoc BUGS CHANGES README* TODO
+
+	if use doc; then
+		dohtml NetwatchKeyCommands.html
+	fi
+}
diff --git a/net-analyzer/netwox/Manifest b/net-analyzer/netwox/Manifest
new file mode 100644
index 000000000000..a09ed935cf9b
--- /dev/null
+++ b/net-analyzer/netwox/Manifest
@@ -0,0 +1,6 @@
+DIST netwox-5.39.0-doc_html.tgz 146301 SHA256 430c5c53852005c8ab4012564b70bc78dceece573567b8babb9b09efd21365f3 SHA512 1bb6c87f2aeea8b10e9bec0725ed82b21c41290d2f2626024b13525fd92596e7aa9f91788d966a51900c0e1b346ac9fb30000344fa5b1450fe9ceb724df4be56 WHIRLPOOL 96272caaf6b5f77780507412cb6de7a89447c6e90bb0437e668b20891530ee8bdc2e1db282a44d2d66dbe063f9f5e0281f1d197c78915858dde9393916c86eaf
+DIST netwox-5.39.0-src.tgz 771942 SHA256 35eaabac4d11d6a2fa7001bd9c153e053e6080c5f5b66c37e463ad32e909fbfd SHA512 3781c1c860d1545c269b27a702c59f1cb6b12af2e66fb3cbe776f3e085681a75ed3096d64cfdf92f65eff7213ceaab474b7e15c169c12e2c05220790ce337e37 WHIRLPOOL 00b270e2cbad1542acff6c1a0fa40297e814ba513a6c5c36ea1a7e9a3f13cce1ad01b8902c6218f97e0cf659433bab9c6fbe2f817a8866042351e9c94a7f4576
+EBUILD netwox-5.39.0.ebuild 1339 SHA256 a64cd7f29e23a560e9806274277dc28244b7aefdbaaf49f84837b183ce8b29ec SHA512 17a620c9634b4c497cd954a52bf47c7b111859e68c5b881d2bf27df66e0109c2804064653821ef57c1922c6d3b78e097f163a13cd978b7e6ec42f5ea218a1462 WHIRLPOOL a10a68bdbbef8ec1f55a896fa40ed890446b815930a7592edc11fcbaa3613b4364c09d841d61259b9c9ac562e87fba43cd110feb9458c3a8001f9acc6a21eb9d
+MISC ChangeLog 2430 SHA256 827a972b6347a880a1e655170bf313e829c1cc823748e750d2d9c34461d22f58 SHA512 2e6a269e3f73f5a350d99878d9c46b6dd9cd2936e4990ad6f0cd09ebf871d5b2a8b1b57866989d52a4b4a88b84ea938fecda076523fca290acef7a9aded667eb WHIRLPOOL 808bf086303ae1536b1401701d3d7495c8dbc24b7c40ffb0dd106deaf99af46f3acd7ceec152b3864548a847b6907267a2c86207b3f51ffa812e70e0aa29dc62
+MISC ChangeLog-2015 4977 SHA256 293830a7d52fc6299d8bd46ba423266af1c42982457e62aec546e065b204ca44 SHA512 32ff874f365c687902f2d983e55d3dd3539bc865945499691cea92ccd3aa41b7e9130f9fa7ea17cd7b1c1a8720c83b4e9b0a662818c745cf50444cf0d8c87810 WHIRLPOOL 2fd76b7c72bbfda5941fca6987b7102d2ec7a13292a33d84a49a2e4711c15acaac636c82302d3a8171f0a50b5180091f591e36f6c101d02e84c9640681c83aa7
+MISC metadata.xml 454 SHA256 06d3c8604395adeebca2dfcd521a2364ddc8cb1e9f5f4246e05a566c41a36ba8 SHA512 b3cb2b35f02ce3146e03f3e992cef7ebffeed2172c147285e5b3d995855c0e2ec31f36ace6706fa5ec1d6556662b6365bc0301f4be1dc44bf9c562d7ff09ef9f WHIRLPOOL 9f21f9978c1a99a6dc77cc1d70f64a17b80e1370d880fbe9f0154206374e663d239d01249f654f9454903788ab08058339c18c479064cfa6d9d7b996084e9828
diff --git a/net-analyzer/netwox/metadata.xml b/net-analyzer/netwox/metadata.xml
new file mode 100644
index 000000000000..feba708bd35b
--- /dev/null
+++ b/net-analyzer/netwox/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>Toolbox of over 400 utilities for testing Ethernet/IP networks</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">ntwox</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/netwox/netwox-5.39.0.ebuild b/net-analyzer/netwox/netwox-5.39.0.ebuild
new file mode 100644
index 000000000000..962009bd0fde
--- /dev/null
+++ b/net-analyzer/netwox/netwox-5.39.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# NOTE: netwib, netwox and netwag go together, bump all or bump none
+
+EAPI=5
+inherit multilib toolchain-funcs
+
+DESCRIPTION="Toolbox of 217 utilities for testing Ethernet/IP networks"
+HOMEPAGE="
+	http://ntwox.sourceforge.net/
+	http://www.laurentconstantin.com/en/netw/netwox/
+"
+SRC_URI="mirror://sourceforge/ntwox/${P}-src.tgz
+	doc? ( mirror://sourceforge/ntwox/${P}-doc_html.tgz )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc x86"
+IUSE="doc"
+
+DEPEND="
+	net-libs/libnet:1.1
+	net-libs/libpcap
+	~net-libs/netwib-${PV}
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P}-src/src
+
+src_prepare() {
+	sed -i \
+		-e 's:/man$:/share/man:g' \
+		-e "s:/lib:/$(get_libdir):" \
+		-e "s:/usr/local:/usr:" \
+		-e "s:=ar:=$(tc-getAR):" \
+		-e "s:=ranlib:=$(tc-getRANLIB):" \
+		-e "s:=gcc:=$(tc-getCC):" \
+		-e "s:-O2:${CFLAGS}:" \
+		config.dat || die
+	sed -i \
+		-e "s:-o netwox:& \${LDFLAGS}:g" \
+		-e 's: ; make: ; \\$(MAKE):g' \
+		genemake || die
+}
+
+src_configure() {
+	sh genemake || die
+}
+
+DOCS=(
+	"${WORKDIR}"/${P}-src/README.TXT
+	"${WORKDIR}"/${P}-src/doc/{changelog.txt,credits.txt}
+	"${WORKDIR}"/${P}-src/doc/{problemreport.txt,problemusageunix.txt,todo.txt}
+)
+
+src_install() {
+	default
+
+	use doc && dohtml -r "${WORKDIR}"/${P}-doc_html/*
+}
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
new file mode 100644
index 000000000000..580e65ae597e
--- /dev/null
+++ b/net-analyzer/nfdump/Manifest
@@ -0,0 +1,10 @@
+AUX nfdump-1.6.14-libft.patch 709 SHA256 d69dab7c37d8aadf01b8576e4fe93335fae2cf5c3c3d3cdf65c61b930d69acab SHA512 2a1e3559ae3f1d1ad1a17305888469852211c984324c56c0f58f510ff1a6fb1d85f5b5367b3e325d932f20be6832ed98d56b8e85e220da948aa6a28ecd9d0cdd WHIRLPOOL 33e74fcc7db3ed422b6dcff92b12222a812675e41f894c24615e447e8a26e5f84dd27d4b91cb1fbbb2b964700b0b9b91720398962ce1b1dfba0201274c15b3f4
+AUX nfdump-1.6.14-libnfdump.patch 2439 SHA256 2a51145a8380385223f84e3ed7aca300df3f25b276e7a2288f3b84a49ad84b56 SHA512 09746329df3ad517875d907c16842c8b8ee31f06de649217cc3650cf566e0b059563df93eaf48a60595d2ada41fd43d1279f5bcb400122d9d60fdcb0b813ef46 WHIRLPOOL f9c98c9c3e7063c8088cb4e368ce36cb6b1e8d7e6bdd2f15846984c5b25cf799c606380bc20b4e80149797f2591d2e303139f420252c729e3814135f8509df06
+DIST nfdump-1.6.14-security.patch 31579 SHA256 39d1f37abee626863ad589439235d4e182eb9faf90bcbd0a75582aacee63a185 SHA512 ee3b82f1283f3dceb36cf60abcee7f5a8fb6c8fe257e2233c3fbb9a34b3c5608dfa101fd473c8b839356a9d1c294a37b9e65657ff1b2d5c015015ff90b2d2c97 WHIRLPOOL 0f074599b318ab7fc4e7444d17e9ab2f7adb3834e4ddd16ad2af06a343e4df2dd402afc87a1d6d3d743af116055c1e59dc8953f2de32742f1afd856eefe0cb69
+DIST nfdump-1.6.14.tar.gz 1834355 SHA256 7bf1b17cdcf81c399c6aaf87e0a8cbe12d81a9e33831629eb3a792878d5f80b1 SHA512 c5e5540526dfce3798728930576e4c7930c3ff80893a94d7f9e65c7c577d1e78bdc47a99c47cee837327ad202197afc378d2408b1b9b847044d0110146055ffe WHIRLPOOL ac7929fdc76b2980a464e1253e24832ad8abc153917d5290655a7fd5b29562b769f1120b29960624b5f73aa16bfab0593efb051af350ba3aacfed3aeeee1bb00
+DIST nfdump-1.6.15.tar.gz 1834855 SHA256 9505c0511d273b9aa3f87a5e664425689a3c7370c6ae3bbc05ff4bdb41bfd457 SHA512 a6bb4f2293ad85d8f16025e7272b889d3814cea2e9255dbd315ee92754675e4ee925c3ebe4e1350f2d5452d69d1d3c13ddeb656324a409c4744da1d4927fe1f2 WHIRLPOOL 40f1d5360c745d72ec6ddebb488de979ba45ad3a88b4d8489eb2925e3d20c3a1b228373bcec9a3f1f63e13705bea4fec6ceb121d72b9fb2487838691e5c8e6f9
+EBUILD nfdump-1.6.14-r1.ebuild 1370 SHA256 65376ca701d3ee0c80d4448d08afbf6fdb33bf16b6697a7c0d56d0629883eec7 SHA512 b3ffa1d9324be60cb95a7ba73b0769903617fca1b193044ac677b415414b77c31f479973221a42151c63d03a6a23bb988e41315b8890c1f6001c79d8ff65c48e WHIRLPOOL bed41aae4981a02136c7af87f194b90a236a8182efe1ba15ebb0c47493944f1851a2e06ff6e4743cd89311367bb9eac9144cfdb4ea23424a7fa4139afacb0d93
+EBUILD nfdump-1.6.15.ebuild 1358 SHA256 e43402e7a2572df3426b6b22e31e94910c24795df3fc8d93c4233b0ba9f6cd94 SHA512 a310bd247156236eed002aae8f26dcc19cca712a43a28ea998f51d684013b9617ffbfde554b9f103bba8c634193e79db9befc80e1106f3bdc60c7f12cf1cbf35 WHIRLPOOL abf49afa9d796baf2c42060f0549b11903a2eb467dc4b1b026797dbee50a4fa0059cc6561938c0c0803d18b2f3bf304c70343cda09065f9d7c37511c8ee8ee69
+MISC ChangeLog 3813 SHA256 f44a5240e687aecac2be1aa7768ae86d9d85e126ed3dd265c9c32968f280ddf2 SHA512 677d4310e909a0b2c5987077d2f1063defe0aefc2c4b59a6303079f426dc97767446cd7b857a3bb5b07df2d4964ae80370182bc298e2b2b491fba99ecea37e80 WHIRLPOOL bff9af2e047c5c7483d7dd58f73fb9f9802c18fcf8d9b26a1d9bc9d406b6e4c6a9c3de26bb1ab8381fb9e5a8d8e2542153a85bbe2a546db7c2ae8d434f85b393
+MISC ChangeLog-2015 5984 SHA256 422799f211c29595bfec831b53e8e7677aac8c9a0583a2813ece39e6eb1c1335 SHA512 f32e1ac23824b9eecb22021b1b6b82d1a88da868ad01ccaaf04890a6aafa63adab197323c0a2a56945d7ec39901b10f5a34ca62cbf4140c83f20293b212aab0d WHIRLPOOL 026ea9e368308b0d29f448a3b51ef80b3f4e8e7136b29d63de004a18f9aafe18039a32f457de95eb1179aded3cda98c4c126d3bceb10b294fac5277a1736b8b0
+MISC metadata.xml 1010 SHA256 03a6f930856d3a597d7aa404a87856c0ddab9f362920ca5dea1697c7aaa9939b SHA512 81abafe5f8da7c40612127765d5b62532168b16d93bd0f0414e8e6c4e86339c8fd77e7ecb4a5b406cf5f33c087f8d2ecd971fdf065c7be0430bd8a095a503c67 WHIRLPOOL fecff53117e6e830f6a30e39ef7b2964bb64613a0eb1d25cb5960450b2201712de725247c1c72a5a77ef63988369edb1d6e26e98a0729c7f35b957f62f7ec67e
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.14-libft.patch b/net-analyzer/nfdump/files/nfdump-1.6.14-libft.patch
new file mode 100644
index 000000000000..3699fa2a5d01
--- /dev/null
+++ b/net-analyzer/nfdump/files/nfdump-1.6.14-libft.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -125,9 +125,8 @@
+ 	if test ! -f "$WHERE_FTPATH/include/ftlib.h"; then
+ 		AC_MSG_ERROR(ftlib.h file not found in flow-tools directory '$WHERE_FTPATH'. Use --with-ftpath=PATH)
+ 	fi
+-	if test ! -f "$WHERE_FTPATH/lib/libft.a" -a -f "$WHERE_FTPATH/lib64/libft.a" ! -f "$WHERE_FTPATH/lib/libft.so" -a -f "$WHERE_FTPATH/lib64/libft.so"; then
+-		AC_MSG_ERROR(libft.a not found in flow-tools directory '$WHERE_FTPATH'. Build flow tools first)
+-	fi
++	AC_CHECK_LIB([ft], [main],,
++		AC_MSG_ERROR(libft not found in flow-tools directory '$WHERE_FTPATH'. Build flow tools first))
+ 	FT_INCLUDES="-I$WHERE_FTPATH/include -I$WHERE_FTPATH/lib"
+ 	FT_LDFLAGS="-L$WHERE_FTPATH/lib"
+ else
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.14-libnfdump.patch b/net-analyzer/nfdump/files/nfdump-1.6.14-libnfdump.patch
new file mode 100644
index 000000000000..38482c4bdb1a
--- /dev/null
+++ b/net-analyzer/nfdump/files/nfdump-1.6.14-libnfdump.patch
@@ -0,0 +1,87 @@
+--- a/bin/Makefile.am
++++ b/bin/Makefile.am
+@@ -30,7 +30,6 @@
+ LDADD = $(DEPS_LIBS)
+ 
+ #Add extra debug info for gdb
+-AM_CFLAGS = -ggdb 
+ 
+ # libnfdump sources
+ common =  nf_common.c nf_common.h 
+@@ -65,30 +64,36 @@
+ 
+ nfdump_SOURCES = nfdump.c nfdump.h nfstat.c nfstat.h nfexport.c nfexport.h  \
+ 	$(nflowcache) $(nfprof)
++nfdump_DEPENDENCIES = libnfdump.la
+ nfdump_LDADD = -lnfdump
+ 
+ nfreplay_SOURCES = nfreplay.c $(nfprof) \
+ 	$(nfnet) $(collector) $(nfv1) $(nfv9) $(nfv5v7) $(ipfix)
++nfreplay_DEPENDENCIES = libnfdump.la
+ nfreplay_LDADD = -lnfdump
+ 
+ nfprofile_SOURCES = nfprofile.c profile.c profile.h $(nfstatfile) 
++nfprofile_DEPENDENCIES = libnfdump.la
+ nfprofile_LDADD = -lnfdump -lrrd
+ 
+ nftrack_SOURCES = ../extra/nftrack/nftrack.c \
+ 	../extra/nftrack/nftrack_rrd.c ../extra/nftrack/nftrack_rrd.h \
+ 	../extra/nftrack/nftrack_stat.c ../extra/nftrack/nftrack_stat.h 
+ nftrack_CFLAGS = -I ../extra/nftrack
++nftrack_DEPENDENCIES = libnfdump.la
+ nftrack_LDADD = -lnfdump -lrrd
+ 
+ nfcapd_SOURCES = nfcapd.c \
+ 	$(nfstatfile) $(launch) \
+ 	$(nfnet) $(collector) $(nfv1) $(nfv5v7) $(nfv9) $(ipfix) $(bookkeeper) $(expire)
++nfcapd_DEPENDENCIES = libnfdump.la
+ nfcapd_LDADD = -lnfdump 
+ 
+ nfpcapd_SOURCES = nfpcapd.c \
+ 	$(pcaproc) $(netflow_pcap) \
+ 	$(nfstatfile) $(launch) \
+ 	$(nfnet) $(collector) $(bookkeeper) $(expire) $(content)
++nfpcapd_DEPENDENCIES = libnfdump.la
+ nfpcapd_LDADD = -lnfdump 
+ 
+ if READPCAP
+@@ -107,6 +112,7 @@
+ sfcapd_SOURCES = sfcapd.c sflow.c sflow.h sflow_proto.h \
+ 	$(nfstatfile) $(launch) \
+ 	$(nfnet) $(collector) $(bookkeeper) $(expire)
++sfcapd_DEPENDENCIES = libnfdump.la
+ sfcapd_LDADD = -lnfdump 
+ 
+ if READPCAP
+@@ -116,25 +122,31 @@
+ endif
+ 
+ nfreader_SOURCES = nfreader.c 
++nfreader_DEPENDENCIES = libnfdump.la
+ nfreader_LDADD = -lnfdump 
+ 
+ nfanon_SOURCES = nfanon.c $(anon)
++nfanon_DEPENDENCIES = libnfdump.la
+ nfanon_LDADD = -lnfdump 
+ 
+ nfgen_SOURCES = nfgen.c 
++nfgen_DEPENDENCIES = libnfdump.la
+ nfgen_LDADD = -lnfdump 
+ 
+ nfexpire_SOURCES = nfexpire.c \
+ 	$(bookkeeper) $(expire) $(nfstatfile)
++nfexpire_DEPENDENCIES = libnfdump.la
+ nfexpire_LDADD = -lnfdump @FTS_OBJ@
+ 
+ nftest_SOURCES = nftest.c 
++nftest_DEPENDENCIES = libnfdump.la
+ nftest_LDADD = -lnfdump 
+ nftest_DEPENDENCIES = nfgen
+ 
+ if FT2NFDUMP
+ ft2nfdump_SOURCES = ft2nfdump.c 
+ ft2nfdump_CFLAGS = @FT_INCLUDES@
++ft2nfdump_DEPENDENCIES = libnfdump.la
+ ft2nfdump_LDADD = -lnfdump -lft -lz
+ ft2nfdump_LDADD += @FT_LDFLAGS@
+ endif
diff --git a/net-analyzer/nfdump/metadata.xml b/net-analyzer/nfdump/metadata.xml
new file mode 100644
index 000000000000..f6dc8af136ae
--- /dev/null
+++ b/net-analyzer/nfdump/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
+  <use>
+    <flag name="readpcap">Build nfcapd collector to read from pcap file instead ofnetwork data</flag>
+    <flag name="compat15">Enable read support for nfdump data files created with nfdump 1.5.x</flag>
+    <flag name="ftconv">Build the flow-tools to nfdump converter</flag>
+    <flag name="nfprofile">Build nfprofile used by NfSen</flag>
+    <flag name="nftrack">Build nfprofile used by PortTracker</flag>
+    <flag name="sflow">Build sflow collector sfcpad</flag>
+  </use>
+  <longdescription>The nfdump tools collect and process netflow data on the command line</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">nfdump</remote-id>
+    <remote-id type="github">phaag/nfdump</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild
new file mode 100644
index 000000000000..134e2b4a8757
--- /dev/null
+++ b/net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A set of tools to collect and process netflow data"
+HOMEPAGE="https://github.com/phaag/nfdump"
+SRC_URI="
+	${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${HOMEPAGE}/commit/ff0e855bd1f51bed9fc5d8559c64d3cfb475a5d8.patch -> ${P}-security.patch
+"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 x86"
+IUSE="compat15 debug ftconv nfprofile nftrack readpcap sflow"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	ftconv? ( sys-libs/zlib net-analyzer/flow-tools )
+	nfprofile? ( net-analyzer/rrdtool )
+	nftrack? ( net-analyzer/rrdtool )
+	readpcap? ( net-libs/libpcap )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	sys-devel/flex
+	virtual/yacc
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-lang/perl
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.6.14-libft.patch \
+		"${FILESDIR}"/${PN}-1.6.14-libnfdump.patch \
+		"${DISTDIR}"/${P}-security.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	# --without-ftconf is not handled well #322201
+	econf \
+		$(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
+		$(use nfprofile && echo --enable-nfprofile) \
+		$(use nftrack && echo --enable-nftrack) \
+		$(use_enable compat15) \
+		$(use_enable debug devel) \
+		$(use_enable readpcap) \
+		$(use_enable sflow)
+}
diff --git a/net-analyzer/nfdump/nfdump-1.6.15.ebuild b/net-analyzer/nfdump/nfdump-1.6.15.ebuild
new file mode 100644
index 000000000000..baa417bf4173
--- /dev/null
+++ b/net-analyzer/nfdump/nfdump-1.6.15.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils
+
+DESCRIPTION="A set of tools to collect and process netflow data"
+HOMEPAGE="https://github.com/phaag/nfdump"
+SRC_URI="
+	${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="compat15 debug ftconv nfprofile nftrack readpcap sflow static-libs"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	ftconv? ( sys-libs/zlib net-analyzer/flow-tools )
+	nfprofile? ( net-analyzer/rrdtool )
+	nftrack? ( net-analyzer/rrdtool )
+	readpcap? ( net-libs/libpcap )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	sys-devel/flex
+	virtual/yacc
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-lang/perl
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_prepare() {
+	eapply \
+		"${FILESDIR}"/${PN}-1.6.14-libft.patch \
+		"${FILESDIR}"/${PN}-1.6.14-libnfdump.patch
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	# --without-ftconf is not handled well #322201
+	econf \
+		$(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
+		$(use nfprofile && echo --enable-nfprofile) \
+		$(use nftrack && echo --enable-nftrack) \
+		$(use_enable compat15) \
+		$(use_enable debug devel) \
+		$(use_enable readpcap) \
+		$(use_enable sflow) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+}
diff --git a/net-analyzer/ngrep/Manifest b/net-analyzer/ngrep/Manifest
new file mode 100644
index 000000000000..61f45987fc4e
--- /dev/null
+++ b/net-analyzer/ngrep/Manifest
@@ -0,0 +1,8 @@
+AUX ngrep-1.45-build-fixes.patch 4778 SHA256 0c4ce5aa42491e17b0d2f8a6b8796e2983f14aae912e93f092c02b5464b482b5 SHA512 5e11682d6b360e96840135d8963bdf4c9bf5def0bd38ba716ce201c7bf9b5ce787338f2cff86d38318e0356d9118fde6985ed9a71728549842577ecdb3a5011e WHIRLPOOL 51f775049027362d49099063b8c96b55fdd3983f0fef4e62dac7713721147dbdc6582eab36cda5baa76fa5b898a14121751f44ba6a41145002f48e05d1dc8b2f
+AUX ngrep-1.45-prefix.patch 575 SHA256 16042e174b74b00d2ac743b52c367dd13e34a032ae7b1d5342c9308b3b2c2635 SHA512 e33321ded5c0b86a279108a0d72d5e1d65699c39f50ac9291c4256867ce3f2b06d86d7186e51359deac82beadb7e8503ca5023c5401068aecebaffa4d01c2afc WHIRLPOOL b47d882f1c82f5ddff015dc213188209e42b036629c89b7bcc99bd597c002387ddfda350bfe86aa4df0b763103f8f82127310d5c61e2acf329cc6699779c85c5
+AUX ngrep-1.45-setlocale.patch 495 SHA256 ee2556afb076ca647896e53e46ef6c0b35966f8fdf27b2e2fe3ad4cb99d06d90 SHA512 007cf6793ef407b4069ebe84b9fe5e5a23c3d2d7f5c538ce0a81d1b6c2643b79387136854d50eb68b13aaaf6e3d7b1a469e7afdeebedba79efea1960b2d1a87e WHIRLPOOL e96a92c2b22e981e8311aeb17084f91ee844d1fb9194d0b6b991e4765a9c09078d956da4fb567d5d4e04fa02ab36361b24b8d3dc7a132d280c143c84fd5417cc
+DIST ngrep-1.45.tar.bz2 463361 SHA256 aea6dd337da8781847c75b3b5b876e4de9c58520e0d77310679a979fc6402fa7 SHA512 0feb4080f834449d57ae99897c573d2b8148711cfb550fa4ff415169dedb1f0d23f4b03f625660162ca72f8ad06e19874c1af46da6afd8f8fe8dd553558c14f7 WHIRLPOOL 5560c8b341ec9c1b322f0b0838470dfa8cf0b86fe44cb7619d5ed162753bab0f08bcea4ba17af96b01ab1a56311eb964dc87fa8c202a160d9ab1d578af6df924
+EBUILD ngrep-1.45-r3.ebuild 1064 SHA256 1b661e64708c5cb93118f094d45c1be6d5cfbec11086b58053e36c7aa45b9368 SHA512 df65d35cd87e740eb28892572a897f90705d0db40669eda2422b82e77af2da3280433ec5386c4e2d82ba014eb263777e3bcd797f7f7b44a57a613e7add93077c WHIRLPOOL de100aaf2fb0a9c1faf3b930e808078e290e775c7fc96ab888793786e135c3e9f1f5fdb22bcb1ef79df5bf0b3974cf917cda785eb797983d31f87d75658c2e0b
+MISC ChangeLog 2535 SHA256 92a35fca8bf43f30ccd899fa4c792ab3b6571fa65f011f016a13469ab7fee098 SHA512 e6f3d1cf4f05ebd12ed6b947c04fb2b3cd041df0f1e8d950642040fd6ecc87d0163f4ad9f097acea1d3567f7dbdabad562d32da12fca637ee17c0ce8fc28e076 WHIRLPOOL 0565c56fa695d5bdf6e7eb4113de13e9e88f1103ec0da711cee5a8c8b65c2ef84a4b8b4340fd3d8ab96d47dbb8a3285e3164fb92bf80f8c4889f53ee9f98865b
+MISC ChangeLog-2015 9417 SHA256 0aa108e7ba2c40faeeb9ee3dcc710767fbab05b79974e83742cf46d707149f4e SHA512 aee014f5b0e32a0b6b32082424edd033d05f1d2a392f38cfaffedbb337c896ccd7f68aae43dada1a26c576f3aec1edbe29d9b4db112fa149c351e7df198c2c24 WHIRLPOOL 70fb1b0808116a1a2551afca39812cfdae2cd87d707c6ac0dca36aa1c769063c024487fb2cc4fe925439c82ba753709ce8fa1ab285727ac66d5e712dbe517199
+MISC metadata.xml 669 SHA256 c43dfd653114d641f4b66eeac3d5e5bfd9755932c946db67290f61d7014e93b3 SHA512 d680774ca1d7a66bbe9badb840ebf3f0249c80d0850a229797d17a09da27e2fad9510449ceecfb62b3141ad105fd2970713a14879df57e0bb14c26ac66c807ad WHIRLPOOL 6d0b59f7e021c37db8ab66546e501e253a5836a668a694256b65b979137c364da6b6dcded8754a8a766f34c015ec6295fcb4abe11732b18d6a79febf023729c6
diff --git a/net-analyzer/ngrep/files/ngrep-1.45-build-fixes.patch b/net-analyzer/ngrep/files/ngrep-1.45-build-fixes.patch
new file mode 100644
index 000000000000..9cde0f81926d
--- /dev/null
+++ b/net-analyzer/ngrep/files/ngrep-1.45-build-fixes.patch
@@ -0,0 +1,186 @@
+This patch fixes a number of problems with have with build:
+
+ * more clean cut off pcre library; we'll never use bundled pcre library, so
+   some autoconf added REGEX_LIBS to pass correct system libs and header change.
+
+ * We use AC_CONFIG_SUBDIRS to pass make autoconf reconfigure gnuregex library
+   - this way ./configure will be called correctly and correct comipler will be
+   selected automatically.
+
+ * With the previous change some modifications were required to make gnuregex
+   buildable: a) we should not overide CFLAGS in Makefile.in (as they together
+   with -DHAVE_CONFIG_H will be passed to gnuregex and it'll fail to build,
+   since no config.h exist) b) obvious way to remove warning "_GNU_SOURCE"
+   redefined
+
+ * also we don't pass $(MAKEFLAGS) since it caused us problems in the past (bug
+   #178684)
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -7,7 +7,8 @@
+ 
+ CC=@CC@
+ 
+-CFLAGS=@CFLAGS@ -D@OS@ @DEFS@ @EXTRA_DEFINES@ 
++# Never redefine CFLAGS, as it pollutes env and gnuregex build failes
++EXTRA_CFLAGS=@CFLAGS@ -D@OS@ @DEFS@ @EXTRA_DEFINES@ 
+ INCLUDES=-I@srcdir@ @PCAP_INCLUDE@ @EXTRA_INCLUDES@
+ 
+ LDFLAGS=@LDFLAGS@ @PCAP_LINK@
+@@ -34,25 +35,25 @@
+ 
+ REGEX_DIR=@REGEX_DIR@
+ REGEX_OBJS=@REGEX_OBJS@
+-
++REGEX_LIBS=@REGEX_LIBS@
+ 
+ all: $(TARGET) 
+ 
+ $(TARGET): $(REGEX_OBJS) $(OBJS) 
+-	$(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS) 
++	$(CC) $(EXTRA_CFLAGS) $(LDFLAGS) -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(REGEX_LIBS) $(LIBS) 
+ 
+ debug: $(REGEX_OBJS) $(OBJS)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -g -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS) 
++	$(CC) $(EXTRA_CFLAGS) $(LDFLAGS) -g -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(REGEX_LIBS) $(LIBS) 
+ 
+ static: $(REGEX_OBJS) $(OBJS)
+-	$(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET).static -static $(OBJS) $(REGEX_OBJS) $(LIBS) 
++	$(CC) $(EXTRA_CFLAGS) $(LDFLAGS) -o $(TARGET).static -static $(OBJS) $(REGEX_OBJS) $(REGEX_LIBS) $(LIBS) 
+ 
+ install: $(TARGET)
+ 	$(INSTALL) -c -m 0755 $(TARGET)  $(DESTDIR)/$(BINDIR_INSTALL)/$(TARGET)
+ 	$(INSTALL) -c -m 0644 $(MANPAGE) $(DESTDIR)/$(MANDIR_INSTALL)/$(MANPAGE)
+ 
+ .c.o:	
+-	$(CC) $(CFLAGS) $(INCLUDES) -g -c $<
++	$(CC) $(EXTRA_CFLAGS) $(INCLUDES) -g -c $<
+ 
+ clean:
+ 	make -C $(REGEX_DIR) clean
+@@ -63,7 +64,7 @@
+ 	rm -f config.status config.cache config.log config.h Makefile 
+ 
+ $(REGEX_OBJS): $(REGEX_OBJS:.o=.c) $(REGEX_DIR)/*.h
+-	$(MAKE) $(MAKEFLAGS) -C $(REGEX_DIR) $(notdir $(REGEX_OBJS))
++	$(MAKE) -C $(REGEX_DIR) $(notdir $(REGEX_OBJS))
+ 
+ $(OBJS): Makefile ngrep.c ngrep.h
+ 
+
+--- a/configure.in
++++ b/configure.in
+@@ -124,14 +124,16 @@
+   use_pcre="no"
+ ])
+ 
++REGEX_DIR=""
++REGEX_OBJS=""
++REGEX_LIBS=""
+ if test $use_pcre = yes; then
+ 
+   echo 
+-  echo 'Configuring Perl-Compatible Regular Expression (PCRE) library ...' 
++  echo 'Using System Perl-Compatible Regular Expression (PCRE) library ...' 
+   echo 
+ 
+-  REGEX_DIR='pcre-5.0'
+-  REGEX_OBJS="$REGEX_DIR/pcre.o $REGEX_DIR/study.o"
++  REGEX_LIBS="`pcre-config --libs`"
+   USE_PCRE="1"
+ 
+ else
+@@ -144,12 +146,19 @@
+   REGEX_OBJS="$REGEX_DIR/regex.o"
+   USE_PCRE="0"
+ 
++  AC_CONFIG_SUBDIRS([regex-0.12])
++
++  echo
++  echo 'GNU Regular Expression library is configured...'
++  echo
++
+ fi
+ 
+-( cd $REGEX_DIR && ./configure )
+ 
+ AC_SUBST(REGEX_DIR)
+ AC_SUBST(REGEX_OBJS)
++AC_SUBST(REGEX_LIBS)
++
+ 
+ 
+ echo
+
+--- a/ngrep.c
++++ b/ngrep.c
+@@ -92,7 +92,7 @@
+ #endif
+ 
+ #if USE_PCRE
+-#include "pcre-5.0/pcre.h"
++#include <pcre.h>
+ #else
+ #include "regex-0.12/regex.h"
+ #endif
+
+--- a/regex-0.12/Makefile.in
++++ b/regex-0.12/Makefile.in
+@@ -18,23 +18,6 @@
+ 
+ version = 0.12
+ 
+-# You can define CPPFLAGS on the command line.  Aside from system-specific
+-# flags, you can define:
+-#   -DREGEX_MALLOC to use malloc/realloc/free instead of alloca.
+-#   -DDEBUG to enable the compiled pattern disassembler and execution
+-#           tracing; code runs substantially slower.
+-#   -DEXTRACT_MACROS to use the macros EXTRACT_* (as opposed to
+-#           the corresponding C procedures).  If not -DDEBUG, the macros
+-#           are used.
+-CPPFLAGS = 
+-
+-# Likewise, you can override CFLAGS to optimize, use -Wall, etc.
+-CFLAGS = -g
+-
+-# Ditto for LDFLAGS and LOADLIBES.
+-LDFLAGS =
+-LOADLIBES =
+-
+ srcdir = @srcdir@
+ VPATH = @srcdir@
+ 
+@@ -43,7 +26,7 @@
+ 
+ SHELL = /bin/sh
+ 
+-subdirs = doc test
++subdirs = 
+ 
+ default all:: regex.o
+ .PHONY: default all
+
+--- a/regex-0.12/configure.in
++++ b/regex-0.12/configure.in
+@@ -34,4 +34,4 @@
+ 
+ esac
+ 
+-AC_OUTPUT(Makefile doc/Makefile test/Makefile)
++AC_OUTPUT(Makefile)
+
+=== modified file 'regex-0.12/regex.c'
+--- a/regex-0.12/regex.c
++++ b/regex-0.12/regex.c
+@@ -34,7 +34,9 @@
+   #pragma alloca
+ #endif
+ 
++#ifndef _GNU_SOURCE
+ #define _GNU_SOURCE
++#endif
+ 
+ /* We need this for `regex.h', and perhaps for the Emacs include files.  */
+ #include <sys/types.h>
+
diff --git a/net-analyzer/ngrep/files/ngrep-1.45-prefix.patch b/net-analyzer/ngrep/files/ngrep-1.45-prefix.patch
new file mode 100644
index 000000000000..8618f5daae31
--- /dev/null
+++ b/net-analyzer/ngrep/files/ngrep-1.45-prefix.patch
@@ -0,0 +1,17 @@
+* refrain from doing an absolutely insane check (to see if pcap is
+  installed in more than one place)
+
+--- a/configure.in
++++ b/configure.in
+@@ -268,10 +268,7 @@
+ 
+ AC_MSG_CHECKING(for a complete set of pcap headers)
+ 
+-possible_dirs="`eval echo -n ${includedir}` \
+-	       /usr/include /usr/include/pcap \
+-               /usr/local/include /usr/local/include/pcap \
+-               /usr/share/include /usr/share/include/pcap"
++possible_dirs="`eval echo -n ${includedir}`"
+ 
+ AC_ARG_WITH(pcap-includes,
+ [  --with-pcap-includes        specify the pcap include directory],
diff --git a/net-analyzer/ngrep/files/ngrep-1.45-setlocale.patch b/net-analyzer/ngrep/files/ngrep-1.45-setlocale.patch
new file mode 100644
index 000000000000..8789e5b8c76b
--- /dev/null
+++ b/net-analyzer/ngrep/files/ngrep-1.45-setlocale.patch
@@ -0,0 +1,23 @@
+Call setlocale to make isprint() decide what's printable depending
+on the current locale.  See bugs.debian.org/307496 .
+
+--- a/ngrep.c
++++ b/ngrep.c
+@@ -97,6 +97,8 @@
+ #include "regex-0.12/regex.h"
+ #endif
+ 
++#include <locale.h>
++
+ #include "ngrep.h"
+ 
+ 
+@@ -195,6 +197,8 @@
+     signal(SIGWINCH, update_windowsize);
+ #endif
+ 
++    setlocale(LC_ALL, "");
++
+     while ((c = getopt(argc, argv, "LNhXViwqpevxlDtTRMs:n:c:d:A:I:O:S:P:F:W:")) != EOF) {
+         switch (c) {
+             case 'W': {
diff --git a/net-analyzer/ngrep/metadata.xml b/net-analyzer/ngrep/metadata.xml
new file mode 100644
index 000000000000..a8fcd8f42981
--- /dev/null
+++ b/net-analyzer/ngrep/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jpr5+gentoo@darkridge.com</email>
+		<name>Jordan Ritter</name>
+		<description>Program author who would like to be notified of bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ngrep</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/ngrep/ngrep-1.45-r3.ebuild b/net-analyzer/ngrep/ngrep-1.45-r3.ebuild
new file mode 100644
index 000000000000..070bfb219184
--- /dev/null
+++ b/net-analyzer/ngrep/ngrep-1.45-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils user
+
+DESCRIPTION="A grep for network layers"
+HOMEPAGE="http://ngrep.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ngrep/${P}.tar.bz2"
+
+LICENSE="ngrep"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ipv6"
+
+DEPEND="
+	dev-libs/libpcre
+	net-libs/libpcap
+"
+RDEPEND="${DEPEND}"
+
+DOCS=(
+	doc/CHANGES.txt
+	doc/CREDITS.txt
+	doc/README.txt
+	doc/REGEX.txt
+)
+
+src_prepare() {
+	# Remove bundled libpcre to avoid occasional linking with them
+	rm -r pcre-5.0 || die
+
+	epatch \
+		"${FILESDIR}"/${P}-build-fixes.patch \
+		"${FILESDIR}"/${P}-setlocale.patch \
+		"${FILESDIR}"/${P}-prefix.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable ipv6) \
+		--disable-pcap-restart \
+		--enable-pcre \
+		--with-dropprivs-user=ngrep \
+		--with-pcap-includes="${EPREFIX}"/usr/include/pcap
+}
+
+pkg_preinst() {
+	enewgroup ngrep
+	enewuser ngrep -1 -1 -1 ngrep
+}
diff --git a/net-analyzer/nikto/Manifest b/net-analyzer/nikto/Manifest
new file mode 100644
index 000000000000..130e98e6467b
--- /dev/null
+++ b/net-analyzer/nikto/Manifest
@@ -0,0 +1,7 @@
+DIST nikto-1.36.tar.gz 206921 SHA256 a5c7f10e73b3ab9d262732a1377902589a7cde268666db892cc59f4b00e1bedc SHA512 e340eebc8323a689b1fe8358626f90d822f4eea4aaeba44c64f68c758fccdec7c3d5896b93739128b1b53429967d4e66ccb08b880066e0c63bed4e2748f94a45 WHIRLPOOL bf81034852d94d2d3007a886915552926329aa0d4ab0c869cec021931c77a6e9cea0cbe4679c58e53ea71b8fc0e7f97bc9e876ff0fba4e29ba1b1b7472a7a1b0
+DIST nikto-2.1.5.tar.bz2 311580 SHA256 65b99c1fdec14d1d5e7cbc964f70fce162cbec50aee878e1500e2d22df079b34 SHA512 623b0fa923c05ecc4b69087321b544941f09b4d84fb7a32f6970e2ea42b2018f2c4e2d1cd0fabfc1c99a2ca7b57fd8c0d9f5f13c86e7eb102f00bdfd3062a95f WHIRLPOOL c4b15484b3fcb9df9219743cc138073b9b24673cf1e20d066dd632da3dc8aa0ac21d5cd7bc5e012a8bfea8d75fc82d25d85fd37e0038bf9c217e8437eb2cea0d
+EBUILD nikto-1.36.ebuild 1270 SHA256 667bcb10a872360978bea29bd1b716ff2001d557e18f82f69275b1ef23f331b4 SHA512 0dee0f4e120434266ac23a0ad1611f9ca2367026166538aa584f00f26da50d1b89981d7d86ed665bc60ddec07091a1d361d6383d5e5c7c7b878083005c8e97df WHIRLPOOL d0a69cc61dbcc7417ca5dbd405c87d63b396cb22e671a7db746b5a81d822125bbaa721c6e0c6bc45c0a70b43dabd9ee1e5360c8f9acb6d265e4835a19001cbed
+EBUILD nikto-2.1.5.ebuild 1279 SHA256 334af31c6d739a22d4855c791e4dd7fbdbf57e06509c247d1e2df4e829b34c27 SHA512 9022bfcaba0a09e0214ba450fb68574828d87ca48f948dedc484fc9d802046f8e0882c16a787c64d20bf41a8757052feecec532d78145320e2fe209359692005 WHIRLPOOL b80079c6c227c03cd5fa80ea2d00f7fb595aae7b900366f8b6dbe0aacbdeec0ae826ed969d671904469b4aa11eab593af7de813fa6c4e936d474520fd7ee7972
+MISC ChangeLog 2868 SHA256 d85ef0182152ef68cfa3679dc35cc4ddae62cbc7eb9385b4b28dfce897d848a2 SHA512 67d66ad0b50c236ce6832fb812e9fe2087aa389d234fc2fb9c6c7d78aadcdd2c8ab8fb9cfb2af65262e65618d0bd56d256e6c8cec6a2f029fba02dcfa90fb85f WHIRLPOOL 258056458eadaee17595ba8e1a6e0ab744af193126bb7e2d4027e3a6605585155d4cac184a22130e8538a0d63ef7dbdcdc9a530e5bf4f0162b6f509251dcea79
+MISC ChangeLog-2015 4947 SHA256 5211dfd76c7a82add297453b20d824be96af47bbf446cd48c19b8f3ca6660ef7 SHA512 79f5bad3c92bed784320506764627c2b050f6245be4605f620b1cf0ab4671a981b057a6e92d46268dc9c9b00c561d790f056b90fb44c162bb3888c8a108591e2 WHIRLPOOL a707338eac115ccd1a573cf8dad0ef36f446c81979266d0a79b81f93cbc483855d17a317762d8a31b80eabef15184fc40275461f8898a660d60b3d1a65aaebb7
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-analyzer/nikto/metadata.xml b/net-analyzer/nikto/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-analyzer/nikto/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-analyzer/nikto/nikto-1.36.ebuild b/net-analyzer/nikto/nikto-1.36.ebuild
new file mode 100644
index 000000000000..aff9ac3ee287
--- /dev/null
+++ b/net-analyzer/nikto/nikto-1.36.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Web Server vulnerability scanner"
+HOMEPAGE="http://www.cirt.net/Nikto2"
+SRC_URI="http://www.cirt.net/source/nikto/ARCHIVE/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc sparc x86"
+RDEPEND="dev-lang/perl
+		>=net-analyzer/nmap-3.00
+		ssl? ( dev-libs/openssl )"
+IUSE="ssl"
+
+src_compile() {
+	sed	-i -e 's:config.txt:nikto.conf:' \
+		-i -e 's:\$CFG{configfile}="nikto.conf":\$CFG{configfile}="/etc/nikto/nikto.conf":' \
+		 nikto.pl
+
+	mv config.txt nikto.conf
+
+	sed -i -e 's:^#NMAP:NMAP:' \
+		-i -e 's:^PROXYHOST:#PROXYHOST:' \
+		-i -e 's:^PROXYPORT:#PROXYPORT:' \
+		-i -e 's:^PROXYUSER:#PROXYUSER:' \
+		-i -e 's:^PROXYPASS:#PROXYPASS:' \
+		-i -e 's:# PLUGINDIR=/usr/local/nikto/plugins:PLUGINDIR=/usr/share/nikto/plugins:' \
+		 nikto.conf
+
+		 cp "${S}/docs/nikto-${PV}.man" "${WORKDIR}/${PN}.1"
+}
+
+src_install() {
+	insinto /etc/nikto
+	doins nikto.conf
+
+	dodir /usr/bin
+	dobin nikto.pl
+	dosym /usr/bin/nikto.pl /usr/bin/nikto
+
+	dodir /usr/share/nikto/plugins
+	insinto /usr/share/nikto/plugins
+	doins plugins/*
+
+	cd docs
+	dodoc CHANGES.txt LICENSE.txt README_plugins.txt nikto_usage.txt
+	dohtml nikto_usage.html
+	doman "${WORKDIR}/${PN}.1"
+}
diff --git a/net-analyzer/nikto/nikto-2.1.5.ebuild b/net-analyzer/nikto/nikto-2.1.5.ebuild
new file mode 100644
index 000000000000..3ee500e7eeb1
--- /dev/null
+++ b/net-analyzer/nikto/nikto-2.1.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-module
+
+DESCRIPTION="Web Server vulnerability scanner"
+HOMEPAGE="http://www.cirt.net/Nikto2"
+SRC_URI="http://www.cirt.net/nikto/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="ssl"
+
+RDEPEND="
+	dev-lang/perl
+	>=net-libs/libwhisker-2.5
+	ssl? (
+		dev-libs/openssl:0=
+		dev-perl/Net-SSLeay
+	)"
+
+src_prepare() {
+	sed -i -e 's:config.txt:nikto.conf:g' plugins/* || die
+	sed -i -e 's:/etc/nikto.conf:/etc/nikto/nikto.conf:;
+	s:# EXECDIR=/usr/local/nikto:EXECDIR=/usr/share/nikto:;
+	s:# use LW2:use LW2:;
+	s:require "$CONFIGFILE{'\''PLUGINDIR'\''}/LW2.pm":# require "$CONFIGFILE{'\''PLUGINDIR'\''}/LW2.pm":;' nikto.pl || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	insinto "/etc/${PN}"
+	doins "${PN}.conf"
+
+	mv "${PN}.pl" "${PN}" || die
+	dobin "${PN}"
+
+	insinto /usr/share/nikto
+	doins -r plugins templates databases
+
+	local NIKTO_PMS=(
+		JSON-PP.pm
+	)
+
+	einfo "Symlinking ${NIKTO_PMS[@]} to ${VENDOR_LIB}"
+
+	for _PM in "${NIKTO_PMS[@]}"; do
+		_TARGET="${VENDOR_LIB}/${_PM}"
+		dosym "/usr/share/nikto/plugins/${_PM}" "${_TARGET}"
+	done
+
+	dodoc docs/*.txt
+	dohtml docs/nikto_manual.html
+}
diff --git a/net-analyzer/nipper/Manifest b/net-analyzer/nipper/Manifest
new file mode 100644
index 000000000000..5b1129412d2f
--- /dev/null
+++ b/net-analyzer/nipper/Manifest
@@ -0,0 +1,5 @@
+DIST nipper-cli-0.12.0.tgz 34157 SHA256 f0ab3ca181b6c88468395c264fc3fe002600a43a6986a5831b3c7a47a2aaf609 SHA512 f65f1e954d9a054136f0a3ac5ea1c25b46a74fe640860fd45093206402c7bb9e566b33cc03ed144a0fd7951f94d94390100344c24ff5343473374676e807f742 WHIRLPOOL c352fcd58373db637fd53a36f4dc5cf0604d369b851ad4b20589add735a5b578311b1d3aeb3a8f063fc1c473cd8bff609ca24cc8d7fc04f93cef42e4eb92727f
+EBUILD nipper-0.12.0.ebuild 443 SHA256 f2c7daf980d93c4d979c48aa6cbff8c909a7ca417175865d20d398600db93e44 SHA512 9d0249489aa0a3aee1100915a8cc8718969678e7aee4dfd563d1bb5ca3926dd11ea03e92750917b0a3e2ddd069e6df13f698e0434a9e653b2f9a5afd9ae7d05d WHIRLPOOL d031d9f95282f8f6d42ea3543249e1c08983552624f9f2e115d3cd38df233c5978f491d38f342d9a0b33555be63ebd986ba65ec9025a24590360763b8cb311a9
+MISC ChangeLog 2179 SHA256 99ee9aaacf72aa4b259cc4a4b905389f477a0b00ed5a3166bbaea83889f81001 SHA512 2a2f6ba26845390bd0b15a0974b18293e4f7fe51a79bf9e682a490618cf116422141349c6e7ca03c6e77592f24ddc8d4c05e3d010d7c698d7537cf676c05fbed WHIRLPOOL c86409def545cdc429a023309081787ce9d000e077ee518656e867a02d30ab733028e36e362c89fa246994168844c8f8c893f55ad75574a10f7238131db592f3
+MISC ChangeLog-2015 5639 SHA256 2f1a33608567cc33c5cebd5d098e019e7471e57344842f8f073e4ab696560426 SHA512 9032891a57eb9912e2a7e0c0fd03124888bf1e87696ec8ff22a9c5498fede755c2f58923ed67e8f6edf68919c90be3bb96e9f07182240d7b3e9db1529a1dff7f WHIRLPOOL b52445caee3205025fc0d745b2193158284fe380f6453d4d9a0c791e4adb9103327f8888a97d9fe15a210b885d7c3ec5d8ec776484460ba1a43c9918e125602f
+MISC metadata.xml 431 SHA256 c46d721077b3c8c9e8e0a487ec3ed65f28cf70ac2745695b1f814073bb005d50 SHA512 54f8cdc431a7b1f3b5605c706561ebf02075bb4c7d0d81f1c4e05422ccec07c0e6224b4daea8f2e78a3ac87af1dc7e1a6ac22c1f8c2fe6e166b85672dcb0b069 WHIRLPOOL 0597c07ee016e929c805f498319494f1f68e2f89dfcfc4bf807e23aa84e1c062ed4f0aeb7623568b747beea54f6504a86e011222fc9f26c9178c59efa58083dc
diff --git a/net-analyzer/nipper/metadata.xml b/net-analyzer/nipper/metadata.xml
new file mode 100644
index 000000000000..cb9bfb3173de
--- /dev/null
+++ b/net-analyzer/nipper/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ikelos@gentoo.org</email>
+		<name>Mike Auty</name>
+	</maintainer>
+	<longdescription>A security tool for auditing cisco and other firewall device configurations.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">nipper</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/nipper/nipper-0.12.0.ebuild b/net-analyzer/nipper/nipper-0.12.0.ebuild
new file mode 100644
index 000000000000..729fe5303f20
--- /dev/null
+++ b/net-analyzer/nipper/nipper-0.12.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}-cli-${PV}"
+inherit cmake-utils
+
+DESCRIPTION="Router configuration security analysis tool"
+HOMEPAGE="http://nipper.titania.co.uk/"
+SRC_URI="mirror://sourceforge/nipper/${MY_P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND=">=net-libs/libnipper-0.12"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
diff --git a/net-analyzer/nload/Manifest b/net-analyzer/nload/Manifest
new file mode 100644
index 000000000000..5592ea0bc090
--- /dev/null
+++ b/net-analyzer/nload/Manifest
@@ -0,0 +1,6 @@
+AUX nload-0.7.4-tinfo.patch 264 SHA256 f580b40a49f5de2895854e5cceb78567564f16511b396990bc3ed573d1e1f2b6 SHA512 1191ef64ab895402a54d05e4b119627ddc6db884f8385493bf00c030d1c82b88fa77973e3d6ea0bf2e5e7211dc07ddec7d95e426a60d99f216b23b683fd8a83e WHIRLPOOL 42c613954ae5bad7f495a3b80ab6172a93529f18c38ce7be56ff8ff9aec840cccf11f18fe270d55b70555da25cdc9e69ba9b496650c033b64e0871559a53726e
+DIST nload-0.7.4.tar.gz 151005 SHA256 c1c051e7155e26243d569be5d99c744d8620e65fa8a7e05efcf84d01d9d469e5 SHA512 ca3e36d3f77c5a7994a3261042fb65a1458a29c769e6bebbe3b8e49b3045aca6f4d047065d11431b28368e0d881c24c92533fa24f0e54ac270f1f5bccfb5c0af WHIRLPOOL 272814facf78f6451caa5d87d157f9002e81eb0420ab0f2a462e1334f5ab105f45bf67e340dfb0e3b327ce2276c2e5f8c40f552a59befa550ee120d7ea8f0982
+EBUILD nload-0.7.4.ebuild 673 SHA256 cc54270583f386e252533f154f05a88c7f989b67dc0b2526a914ede67ef2144d SHA512 6b54b259b6abc6983d75091878ed82202015297c845aeff7933ed457f29c2abcacf7e0d5c03c8a56de467cfe908207d96c2d088d0084089dc63b9d54aa38c18d WHIRLPOOL fff70952086dc2437d160fd1a4e5107fc2d7736ba0ec93c75538c12c12a1977e55931fc5018cdcd57948d317cb229d8e1f890eeefbba6a08114a8c41f8a43f24
+MISC ChangeLog 2921 SHA256 7e505f214b43a1d9c0e4f6b4bb968ce1b844a98da2f9f253babbe5c1c1e883be SHA512 548ef87bdd2a0690af8eafa132d641ee31f3d78ed487ed51d8d09ce7d5f95ff68e05d6d5b10f31703e8952d12aa31551111a37d876313c99f7d1dfb1769a41cb WHIRLPOOL dd2c63c19dd555d76604f521c238dab3d2297260eeb644d174b72ff6c2d9a6cc4f48edcb36e44e831815f56e1fbbe23c33e5aa978e592e401ab0f9365f06c4d9
+MISC ChangeLog-2015 6860 SHA256 a6dc89aab388833f0a88ecaf4e2c11bf1755ff646adf934fd5e5c76456e795c1 SHA512 fc289007cb1b9076d6ab60504e95350f83ba1865ab2174153ac95b12ff5d17a24f9c9881637ac1e0dbd4f1d934535e6935bb5217ad4257456f60c5416d89c817 WHIRLPOOL bf21db2212ca117a2c9ff49268943102b23b660b2d5e9b3b1bc36dfc981578a7f61c4f25354671022049208b09165d5709f07e791b28c2a8bc76b5cc29ecef0b
+MISC metadata.xml 286 SHA256 61b7f36c3fb4ce2345ee3017334a6013dd52429ba107768abc2c146629e84dcd SHA512 cfd1ca7999686b831b0b459f5b06ea80fd28b4f24d3404a8ad90bb4d6461a011f6a2b338ebbf45c2eac621ec828dcc397b26c2ae82068e5b703271a85c76e760 WHIRLPOOL bb6b105c081b12e37fbf26bc041e829ef7ab8ba855b96f040479ca85ad9633b8e83c7be4afa686838991ebf358ad8cf78c1a79fd54ad51f7928aaa7a63f0e5bb
diff --git a/net-analyzer/nload/files/nload-0.7.4-tinfo.patch b/net-analyzer/nload/files/nload-0.7.4-tinfo.patch
new file mode 100644
index 000000000000..dcab6ec324f4
--- /dev/null
+++ b/net-analyzer/nload/files/nload-0.7.4-tinfo.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -70,6 +70,7 @@
+ esac
+ 
+ dnl Checks for libraries.
++PKG_CHECK_MODULES([NCURSES],[ncurses],[LIBS="$LIBS $NCURSES_LIBS"],[AC_MSG_ERROR([ncurses was not found])])
+ AC_CHECK_LIB(ncurses, initscr)
+ AC_CHECK_LIB(form, new_form)
+ 
diff --git a/net-analyzer/nload/metadata.xml b/net-analyzer/nload/metadata.xml
new file mode 100644
index 000000000000..789a44405524
--- /dev/null
+++ b/net-analyzer/nload/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/nload/nload-0.7.4.ebuild b/net-analyzer/nload/nload-0.7.4.ebuild
new file mode 100644
index 000000000000..b8bc8eed7b25
--- /dev/null
+++ b/net-analyzer/nload/nload-0.7.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="console application which monitors network traffic and bandwidth usage in real time"
+HOMEPAGE="http://www.roland-riegel.de/nload/index.html"
+SRC_URI="http://www.roland-riegel.de/nload/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~mips ppc x86"
+
+RDEPEND=">=sys-libs/ncurses-5.2:0="
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+	eautoreconf
+}
+
+src_configure() {
+	# --enable-debug means do not strip debugging symbols (default no)
+	econf --enable-debug
+}
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
new file mode 100644
index 000000000000..59b1dda63cee
--- /dev/null
+++ b/net-analyzer/nmap/Manifest
@@ -0,0 +1,20 @@
+AUX nls.m4 1217 SHA256 c144b117a81498190f16e96ae54aa6c5d4c9f9da0cc62f27539393c9380f79a9 SHA512 2278c46eff2af70549fe3e3a56670e18fa177b0fb5d09addc5c936df9b4fb07a2b91e379fd9bc6d2477d2ea7e35e24dc4235890cd818e3cabab2955c8e0822a1 WHIRLPOOL 03807e25a60ac6bac82cf578e312aa8f23de8aa06d1001a7b08e5f9f9b88b3226e67b321e6dbae245d81399ea3da81258629e6641d67927cf70975b035f7ab99
+AUX nmap-5.10_beta1-string.patch 252 SHA256 6012685deb53985c73fa038d27b2f1472344fd6641c40103143fa15676454506 SHA512 d1c6a446400fa86700c5ce690c3498894a9796b17bb70a29b933797eb2abb38285ebc21a236d8f1f4fa837c45a1abc49555aee13266a31089b219f9b4ef07be2 WHIRLPOOL 3e7ba87ef26d7462b82e3986c37f7a2f1074dc2db7ba6a357ade3869089657a5200afacac6490a60ff43700b6e7812c1c95ac18efac381037590d851513dbf9e
+AUX nmap-5.21-python.patch 1219 SHA256 2d133db8f31d048de810fa3a3b8234f856bdfa9b830c6346d71cdc2357a16b74 SHA512 d670b382d183a55d0a744d4055aafffdaf64b071ae169e94e7d627ca8b74df38d02ef7858b0976b7079828c14705d0f1998a9640445f3cd4f5f4d4c5b2ce0bf3 WHIRLPOOL 1d84ccf26fb0affff5a05f6fd00ea5aff1bbb3a9d3320e7a90a9feeba68aa7fa38e8be527eea93824616003a61321f21fa8fb5ce662e4b43ef8581679f40bd3a
+AUX nmap-6.25-liblua-ar.patch 328 SHA256 3bce55abe4cf17d7c7bb56731151c4d4f1c5aef04e8294bf79a9712fa015fce2 SHA512 6bb15078e79ef281b026e25199fc76bcd1b7242da0d6513ac9b078f130e521e6db506c1c36d33ef72a2198c3054111d95d6ac0654f7d6bb7549d6308ce864291 WHIRLPOOL d6f29209ee4a92e2f5b564d5aeaa8814355df2a9142665ba1ce980693c830214a1d89dc66c3f0573237273d0fc502c7ff8b39be53f6afcca29dd94fe6f081b7b
+AUX nmap-6.46-uninstaller.patch 619 SHA256 e5f649e95a7a87a9c2a5ab89657a56468036726146441cee34bad6184aeb8349 SHA512 da89808d23ed14b0f748a57d3238667adf65eb5278bcbe5a599d06fd4bc5ad2c3492d824639f97d50be9a973fd53bb395fccd855a712bd11d3e963dc4bb11833 WHIRLPOOL 223f448f3edd34945b5a4f79c9740159df40d65bdda1cadada241a0b00ae8893ea84874ad4c000629d305c221ad687b521fd9fb2d1d6786b8489d94746d9eb08
+AUX nmap-7.25-CXXFLAGS.patch 302 SHA256 33132cef48902d5bc241eb61f918b966e7b8171bafe73c17faf06b97cddce2c5 SHA512 80bd2578a7062a71a8ac57e161561d654c41310bdf4bd837990f64452d37f2e10cc7a52a22ee132fde2013978748c37a9ebea045fe7cbc538d486c74934bdb0a WHIRLPOOL deabf4448ce6dd74dea1ae86415f064686e2967501410a24791ec5a6d8675c24fa290f246126247c43e629e5b259b2f77f85ec95331d1c3bdc520eee1b87bfaa
+AUX nmap-7.25-libpcre.patch 291 SHA256 78ea0907c6a7f1e93b80539baa211e53e86fc8b36396aae4353f5086e5ed8efe SHA512 75963ed6eb156475a8e928f6fd6ad18cdc61ed658a3e0a82a7719bbc4998b186981fa93c2b39b8bc92e10cc0ad19f5097224a9a68bc4b35e1b771d4a27532b1d WHIRLPOOL 6145155ee667764da67ef46e760ac0135cb0e1c19900c70bdb5d08dcff2f30c6c294543b3cb7cf6860ac6a4999ff708e4c1332d0924c07bf031c5f945932c542
+AUX nmap-7.25-no-FORTIFY_SOURCE.patch 2258 SHA256 33c0c0591791ecee3ef0e7a1b69f01fac6ffe5999bd62b67435735640d981210 SHA512 29b19e8cedc5e9edf66e728d89b71c4c0ada29fdbb9c167bec84b5aad2c9d52fe111a902c32b247106ace0154734f2a3b4eeae119887dc7203ad2271c8c240a3 WHIRLPOOL 664aee863b7b20ef27b0e8c43e2985b03bd0c2a1460683c2bda9bdbc028917533927b38a721990379a810351012070a2676e27983050d85c992a5115e768e7ef
+AUX nmap-7.31-libnl.patch 498 SHA256 5c5e740eb64b0a06d1bef9754f73b72fa3ddea38c3aabee35f5d7763cfe4a05f SHA512 e7047faaac2bec6c8e0aaae04cbc6e97a8da7999fbb1a8ff015a78ffafe3ce645b71746fd6da826e3ad9baa8d8a917d3791836e67a346dc9c1ca6678cd04e7c8 WHIRLPOOL 92f6d423d1fc2ee3ce99031c0179b93c61251f1c69561b9640398f647ec2fbaf7106c8b0c63485384cfe951ad9e5839406c037ffb423cf01f288bc9ef291e296
+DIST nmap-7.40.tar.bz2 9043221 SHA256 9e14665fffd054554d129d62c13ad95a7b5c7a046daa2290501909e65f4d3188 SHA512 98e37bf1c29789ea19ee4542d719ed6970c8bcc1bf92af4948a52a75273c2403329149f6b5df6368c23840d1bb3f47af9e5ce543f7a36596a33896609574f02d WHIRLPOOL 735133455aec227149478cb273e41d33b7dbd77a6998682b6d80bdc72c77555cd745895adfcde1c194281c258131e7fce49254e79349fe112a5f146768fd1c51
+DIST nmap-7.50.tar.bz2 9309616 SHA256 e9a96a8e02bfc9e80c617932acc61112c23089521ee7d6b1502ecf8e3b1674b2 SHA512 b74c5711f03bae363164cdb7e62923ab938c81c7bbcd080eaa2d1acc89f09eb0a7e0f5deb9628b81057c7a35ecd487a2d09dfe3b58b0db6c84cf0b39f526e5f2 WHIRLPOOL 9fd0a9fb8de6e4e169cf7a9ce8b06b3e245f66aa3643cb6be4b1933d824091d4211d3207893f5bff5621c7746434db92a5745c3500e3ce8de1bb0c6e2820d365
+DIST nmap-7.60.tar.bz2 10394925 SHA256 a8796ecc4fa6c38aad6139d9515dc8113023a82e9d787e5a5fb5fa1b05516f21 SHA512 74ba8f6de026ade9ee6bb2252bee18a57210f8207977df7f1c04556629dcdc1e6127f33febc8a52ef88a1dac876116d590564dee4f1c23798c3ac37529991aa4 WHIRLPOOL ca5a10ca5a685c53fa37a72857c009333287c6559409fb1dfcc5edc5e48034b3d280f76e555e159156b5befc0167b9198673e07ccd2e6a0a80c2d3dc2395fff0
+DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313
+EBUILD nmap-7.40.ebuild 4352 SHA256 ca57620e3f11cc066f64d9ab9368b691a12535dd5ce11e2666ec68144f02e93d SHA512 e7f602c98215e2583a88360493e24c4ade72994154bd24b524426edb64aa5a3c688aa5e841fb1bfedf73566f8e494108636c2d7f29201e7fe179a7aa13117f90 WHIRLPOOL fcea595f8eadf6f3da399af6f7a2fcf5023e62e9f93247f3f912f85b0931187a8d81f8d5532f278839b2b5665e7958178b669fa94b96461f86fead12d2591a13
+EBUILD nmap-7.50.ebuild 4353 SHA256 d4575223ddf8a3a7b315c3b3bd312d3bf5b08f05e31738f0d62eeb28068590c3 SHA512 f061ce79bc7c48fc30be3105c70e24621fcf0d0cfbfbe8416e67d10b497998117e4a782e073e14a52490d668916a180e2dab266ccdc2524733caff03d4aff482 WHIRLPOOL f2cdcf5218631273b69767d176f83b175d28a8ffb43607e140a6f5da29bffb75d77ca4ed76e3710dcd3a7af8aa3675514d95cae1650d5a3054bacc0ba6532057
+EBUILD nmap-7.60.ebuild 4567 SHA256 94d8a52179d43e8d93b3f139ba3efafd87b8f150f165baf4d7ff72279cc71afb SHA512 8648fbb304949199b84d4e74faf281dd2893fcd3eca75ed07d3424ef4c97b00f8bfac795d08bd3fa72620122f71eb8c4054366c029ba82b4f76bc2d1d44f50b1 WHIRLPOOL c190449eea7a1d5a3d75645d38df6e05845210a79bfaf322df90370569a10d7306d117692a89b8fb96b769fbbd1e4bc1b4a6383a34f37fb836892ac6e2eebbc5
+EBUILD nmap-9999.ebuild 4242 SHA256 802b6b00877bbc3bbd685c41b86eae12aeaedc1e2b52054ab1683c8a34794c33 SHA512 d8418a66dfff647f9a560981f63918370839a5e624c6435ebc73e4867117a0414c9b45978e14ba9bebb2539bd9f356339c328de4a2a75e03e0a88c6674bf2a8d WHIRLPOOL dc0b890eb00b1887dd72fe2c5efc47297457e728f2807974d82c5f71d965584a70f82fb9643525a97af027f6723352fd042a23b99a59c0da1c2bd967eaf9a73a
+MISC ChangeLog 10254 SHA256 3365bab3624dfa11a549abeb9f5e39b56c5852688426950f8a1249699584c92c SHA512 e7eeb7818966a07001d0bef7585e0e23f6e206ea3546d731b26bd9ccbde3d16bc8718c6e2671f0e8569378225f86d48881655fba63cda15cf99ecc08d1bdb9eb WHIRLPOOL 49caea6a3ee438e0891c3a9144ab21b7b08343e806953924437a8160febfc8fe429634c616e4175d6bcb985356efe902c1a815f8de75ebfb12a0b44ad1117a60
+MISC ChangeLog-2015 43855 SHA256 2d0433ddb0eecf16df05f1cc0e283681a88020690caaf3fd4d6bd03d9e39fcc4 SHA512 16cfb6bc28cccd58800f7b66fb3465378abb4df2459595180a7956deef8e7e6761c80dd98f38c73883cffac72edd8ee7684f031c73e28cf13c2e6b039d2431a4 WHIRLPOOL 10ba3498a09130fa31e1a230254ec7c20fd6b3ff88a2840120a7e784a641037b5b430649b809f02dd4172b0f01848ed70d4203c4c4f0984dfa90d88742a0849f
+MISC metadata.xml 920 SHA256 a367e189b1a012a1b489b55664114d2d2c3fcef020f5c87a71be239adef02046 SHA512 56d44c71139e48b75a89140bedd2c4a1bc20c8fe99e16ee8b71fb490cb606997571de95d6ac93147bdee81bbcbb736588c87c43b9cd4f9fac71280416a499185 WHIRLPOOL a391aceab50e0f218616dcf891f701efdf4884ae7ff29c6a6a0deefbf0264847db7694bd7641d3ec238ac59be205d664aa16c491330a3ce04752528ca5bd5979
diff --git a/net-analyzer/nmap/files/nls.m4 b/net-analyzer/nmap/files/nls.m4
new file mode 100644
index 000000000000..93df8d3b3f06
--- /dev/null
+++ b/net-analyzer/nmap/files/nls.m4
@@ -0,0 +1,32 @@
+# nls.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
+dnl Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_PREREQ([2.50])
+
+AC_DEFUN([AM_NLS],
+[
+  AC_MSG_CHECKING([whether NLS is requested])
+  dnl Default is enabled NLS
+  AC_ARG_ENABLE([nls],
+    [  --disable-nls           do not use Native Language Support],
+    USE_NLS=$enableval, USE_NLS=yes)
+  AC_MSG_RESULT([$USE_NLS])
+  AC_SUBST([USE_NLS])
+])
diff --git a/net-analyzer/nmap/files/nmap-5.10_beta1-string.patch b/net-analyzer/nmap/files/nmap-5.10_beta1-string.patch
new file mode 100644
index 000000000000..df29db3782d5
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-5.10_beta1-string.patch
@@ -0,0 +1,11 @@
+--- nmap-5.10BETA1/Target.h.org	2009-12-08 08:21:59.000000000 +0100
++++ nmap-5.10BETA1/Target.h	2009-12-08 08:22:02.000000000 +0100
+@@ -99,6 +99,8 @@
+ 
+ #ifndef NOLUA
+ #include "nse_main.h"
++#else
++#include <string>
+ #endif
+ 
+ #include "portreasons.h"
diff --git a/net-analyzer/nmap/files/nmap-5.21-python.patch b/net-analyzer/nmap/files/nmap-5.21-python.patch
new file mode 100644
index 000000000000..aa0d4f9db953
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-5.21-python.patch
@@ -0,0 +1,21 @@
+diff -Naurp nmap-5.21-orig/Makefile.in nmap-5.21/Makefile.in
+--- nmap-5.21-orig/Makefile.in	2010-01-31 09:53:53.000000000 +0100
++++ nmap-5.21/Makefile.in	2010-01-31 09:54:48.000000000 +0100
+@@ -253,7 +253,7 @@ build-zenmap: $(ZENMAPDIR)/setup.py $(ZE
+ 
+ install-zenmap: $(ZENMAPDIR)/setup.py
+ 	$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
+-	cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)")
++	cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)") --no-compile
+ 	$(INSTALL) -c -m 644 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/
+ # Create a symlink from nmapfe to zenmap if nmapfe doesn't exist or is
+ # already a link.
+@@ -267,7 +267,7 @@ build-ndiff:
+ 	cd $(NDIFFDIR) && $(PYTHON) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON_PATH)")
+ 
+ install-ndiff:
+-	cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)")
++	cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)") --no-compile
+ 
+ NSE_FILES = scripts/script.db scripts/*.nse
+ NSE_LIB_LUA_FILES = nselib/*.lua
diff --git a/net-analyzer/nmap/files/nmap-6.25-liblua-ar.patch b/net-analyzer/nmap/files/nmap-6.25-liblua-ar.patch
new file mode 100644
index 000000000000..5aa9fa7f631c
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-6.25-liblua-ar.patch
@@ -0,0 +1,20 @@
+--- a/liblua/Makefile
++++ b/liblua/Makefile
+@@ -11,7 +11,7 @@
+ LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
+ LIBS= -lm $(SYSLIBS) $(MYLIBS)
+ 
+-AR= ar rcu
++AR= ar
+ RANLIB= ranlib
+ RM= rm -f
+ 
+@@ -56,7 +56,7 @@
+ a:	$(ALL_A)
+ 
+ $(LUA_A): $(BASE_O)
+-	$(AR) $@ $(BASE_O)
++	$(AR) rcu $@ $(BASE_O)
+ 	$(RANLIB) $@
+ 
+ $(LUA_T): $(LUA_O) $(LUA_A)
diff --git a/net-analyzer/nmap/files/nmap-6.46-uninstaller.patch b/net-analyzer/nmap/files/nmap-6.46-uninstaller.patch
new file mode 100644
index 000000000000..6b43f8f5a069
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-6.46-uninstaller.patch
@@ -0,0 +1,19 @@
+--- a/zenmap/setup.py
++++ b/zenmap/setup.py
+@@ -245,7 +245,6 @@
+         self.set_perms()
+         self.set_modules_path()
+         self.fix_paths()
+-        self.create_uninstaller()
+         self.write_installed_files()
+ 
+     def get_installed_files(self):
+@@ -263,8 +262,6 @@
+                 os.path.join(self.install_data, data_dir)):
+             for dir in dirs:
+                 installed_files.append(os.path.join(dirpath, dir))
+-        installed_files.append(
+-                os.path.join(self.install_scripts, "uninstall_" + APP_NAME))
+         return installed_files
+ 
+     def create_uninstaller(self):
diff --git a/net-analyzer/nmap/files/nmap-7.25-CXXFLAGS.patch b/net-analyzer/nmap/files/nmap-7.25-CXXFLAGS.patch
new file mode 100644
index 000000000000..91caad1a6734
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-7.25-CXXFLAGS.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -477,7 +477,7 @@
+ 	./docs/style/lua-format -i scripts/*.nse
+ 
+ makefile.dep:
+-	$(CXX) -MM $(CPPFLAGS) $(SRCS) > $@
++	$(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $(SRCS) > $@
+ -include makefile.dep
+ 
+ # These the old names of scripts that have been renamed or deleted. Any
diff --git a/net-analyzer/nmap/files/nmap-7.25-libpcre.patch b/net-analyzer/nmap/files/nmap-7.25-libpcre.patch
new file mode 100644
index 000000000000..9296dab7da7b
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-7.25-libpcre.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -522,7 +522,6 @@
+ 
+ # If we still don't have it, we use our own
+ if test $have_pcre != yes ; then
+-  AC_CONFIG_SUBDIRS( libpcre )
+   CPPFLAGS="-I\$(top_srcdir)/$LIBPCREDIR $CPPFLAGS"
+   LIBPCRE_LIBS="$LIBPCREDIR/libpcre.a"
+   PCRE_BUILD="build-pcre"
diff --git a/net-analyzer/nmap/files/nmap-7.25-no-FORTIFY_SOURCE.patch b/net-analyzer/nmap/files/nmap-7.25-no-FORTIFY_SOURCE.patch
new file mode 100644
index 000000000000..85594038bf6f
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-7.25-no-FORTIFY_SOURCE.patch
@@ -0,0 +1,77 @@
+--- a/nbase/Makefile.in
++++ b/nbase/Makefile.in
+@@ -12,7 +12,7 @@
+ CCOPT = 
+ DEFS = @DEFS@
+ # With GCC, add extra security checks to source code.
+-DEFS += -D_FORTIFY_SOURCE=2
++DEFS += 
+ CPPFLAGS = @CPPFLAGS@
+ CFLAGS = @CFLAGS@ $(CCOPT) $(GLIB_CFLAGS) $(DEFS) $(INCLS)
+ STATIC = 
+--- a/ncat/Makefile.in
++++ b/ncat/Makefile.in
+@@ -53,7 +53,7 @@
+ LIBS = @LIBS@
+ DEFS = @DEFS@ -DNCAT_DATADIR="\"$(pkgdatadir)\""
+ # With GCC, add extra security checks to source code.
+-DEFS += -D_FORTIFY_SOURCE=2
++DEFS += 
+ INCLS = -I. -I.. -I../nsock/include/ -I$(NBASEDIR)
+ RM = rm -f
+ STRIP = @STRIP@
+--- a/nsock/src/Makefile.in
++++ b/nsock/src/Makefile.in
+@@ -13,7 +13,7 @@
+ CCOPT = 
+ DEFS = @DEFS@ -DNSOCK_VERSION=\"$(NSOCK_VERSION)\"
+ # With GCC, add extra security checks to source code.
+-DEFS += -D_FORTIFY_SOURCE=2
++DEFS += 
+ INCLS = -I../include
+ CFLAGS = @CFLAGS@ $(CCOPT)
+ # CFLAGS = -g -Wall $(DEFS) $(INCLS)
+--- a/libnetutil/Makefile.in
++++ b/libnetutil/Makefile.in
+@@ -5,7 +5,7 @@
+ CXXFLAGS = @CXXFLAGS@
+ CPPFLAGS = @CPPFLAGS@ $(DEFS)
+ DEFS = @DEFS@
+-DEFS += -D_FORTIFY_SOURCE=2
++DEFS += 
+ AR = ar
+ RANLIB = @RANLIB@
+ 
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -41,7 +41,7 @@
+ # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html
+ # Level 1 only makes changes that don't affect "conforming" programs,
+ # while level 2 enforces additional restrictions.
+-DEFS += -D_FORTIFY_SOURCE=2
++DEFS += 
+ # For mtrace debugging -- see MTRACE define in main.cc for instructions
+ # Should only be enabled during debugging and not in any real release.
+ # DEFS += -DMTRACE=1
+--- a/nping/Makefile.in
++++ b/nping/Makefile.in
+@@ -38,7 +38,7 @@
+ # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html
+ # Level 1 only makes changes that don't affect "conforming" programs,
+ # while level 2 enforces additional restrictions.
+-DEFS += -D_FORTIFY_SOURCE=2
++DEFS += 
+ # For mtrace debugging -- see MTRACE define in main.cc for instructions
+ # Should only be enabled during debugging and not in any real release.
+ # DEFS += -DMTRACE=1
+--- a/nmap-update/Makefile.in
++++ b/nmap-update/Makefile.in
+@@ -12,7 +12,7 @@
+ LDFLAGS = @LDFLAGS@
+ MAC_FLAGS =
+ LIBS = @LIBS@ $(NBASELIB) $(MAC_FLAGS)
+-DEFS = @DEFS@ -D_FORTIFY_SOURCE=2
++DEFS = @DEFS@ 
+ APR_LIBS = @APR_LIBS@
+ SVN_LIBS = @SVN_LIBS@
+ 
diff --git a/net-analyzer/nmap/files/nmap-7.31-libnl.patch b/net-analyzer/nmap/files/nmap-7.31-libnl.patch
new file mode 100644
index 000000000000..c16d8291ea3b
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-7.31-libnl.patch
@@ -0,0 +1,15 @@
+nping does not call anything nl_* related so it should not link against libnl (bug #529244)
+Patching configure.ac would be best but eautoreconf does not handle the subdirs very well.
+
+--- a/nping/configure.ac
++++ b/nping/configure.ac
+@@ -114,9 +114,6 @@
+ # OpenSSL and NSE C modules can require dlopen
+ AC_SEARCH_LIBS(dlopen, dl)
+ 
+-# libpcap can require libnl
+-AC_SEARCH_LIBS(nl_handle_alloc, nl)
+-
+ # We test whether they specified openssl desires explicitly
+ use_openssl="yes"
+ specialssldir=""
diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
new file mode 100644
index 000000000000..37088b5933c3
--- /dev/null
+++ b/net-analyzer/nmap/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<use>
+		<flag name="libssh2">Enable SSH support through <pkg>net-libs/libssh2</pkg></flag>
+		<flag name="ncat">Install the ncat utility</flag>
+		<flag name="ndiff">Install the ndiff utility</flag>
+		<flag name="nmap-update">Install nmap-update, which uses <pkg>dev-vcs/subversion</pkg> to update nmap scripts in your home directory</flag>
+		<flag name="nping">Install the nping utility</flag>
+		<flag name="nse">Include support for the Nmap Scripting Engine (NSE)</flag>
+		<flag name="system-lua">Use <pkg>dev-lang/lua</pkg> instead of the bundled liblua</flag>
+		<flag name="zenmap">Install the GTK+ based nmap GUI, zenmap</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-analyzer/nmap/nmap-7.40.ebuild b/net-analyzer/nmap/nmap-7.40.ebuild
new file mode 100644
index 000000000000..1582792f3e64
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.40.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+inherit autotools flag-o-matic python-single-r1 toolchain-funcs
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network discovery and security auditing"
+HOMEPAGE="http://nmap.org/"
+SRC_URI="
+	http://nmap.org/dist/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~jer/nmap-logo-64.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
+NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
+IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
+
+REQUIRED_USE="
+	system-lua? ( nse )
+	ndiff? ( ${PYTHON_REQUIRED_USE} )
+	zenmap? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-libs/liblinear:=
+	dev-libs/libpcre
+	net-libs/libpcap
+	zenmap? (
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
+	ndiff? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	nmap-update? ( dev-libs/apr dev-vcs/subversion )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
+	"${FILESDIR}"/${PN}-5.21-python.patch
+	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
+	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
+	"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
+	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
+	"${FILESDIR}"/${PN}-7.25-libpcre.patch
+	"${FILESDIR}"/${PN}-7.31-libnl.patch
+)
+
+pkg_setup() {
+	if use ndiff || use zenmap; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# prevent unpacking the logo
+	unpack ${MY_P}.tar.bz2
+}
+
+src_prepare() {
+	rm -r libpcap/ || die
+
+	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
+
+	default
+
+	if use nls; then
+		local lingua=''
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			if ! use linguas_${lingua}; then
+				rm -r zenmap/share/zenmap/locale/${lingua} || die
+				rm zenmap/share/zenmap/locale/${lingua}.po || die
+			fi
+		done
+	else
+		# configure/make ignores --disable-nls
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			rm -r zenmap/share/zenmap/locale/${lingua} || die
+			rm zenmap/share/zenmap/locale/${lingua}.po || die
+		done
+	fi
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+
+	sed -i \
+		-e '/rm -f $@/d' \
+		$(find . -name Makefile.in) \
+		|| die
+
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e '/^Encoding/d' \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
+
+	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
+	eautoreconf
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# we need the original for a Darwin-specific fix, bug #604432
+		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
+	fi
+}
+
+src_configure() {
+	# The bundled libdnet is incompatible with the version available in the
+	# tree, so we cannot use the system library here.
+	econf \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_with zenmap) \
+		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		$(use_with ncat) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		--with-libdnet=included \
+		--with-pcre=/usr
+	#	--with-liblinear=/usr \
+	#	Commented because configure does weird things, while autodetection works
+}
+
+src_compile() {
+	local directory
+	for directory in . libnetutil nsock/src \
+		$(usex ncat ncat '') \
+		$(usex nmap-update nmap-update '') \
+		$(usex nping nping '')
+	do
+		emake -C "${directory}" makefile.dep
+	done
+
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	if use zenmap; then
+		doicon "${DISTDIR}/nmap-logo-64.png"
+		python_optimize
+	fi
+}
diff --git a/net-analyzer/nmap/nmap-7.50.ebuild b/net-analyzer/nmap/nmap-7.50.ebuild
new file mode 100644
index 000000000000..cfbafe0a31bf
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.50.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+inherit autotools flag-o-matic python-single-r1 toolchain-funcs
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network discovery and security auditing"
+HOMEPAGE="http://nmap.org/"
+SRC_URI="
+	http://nmap.org/dist/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~jer/nmap-logo-64.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
+NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
+IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
+
+REQUIRED_USE="
+	system-lua? ( nse )
+	ndiff? ( ${PYTHON_REQUIRED_USE} )
+	zenmap? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-libs/liblinear:=
+	dev-libs/libpcre
+	net-libs/libpcap
+	zenmap? (
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
+	ndiff? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	nmap-update? ( dev-libs/apr dev-vcs/subversion )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
+	"${FILESDIR}"/${PN}-5.21-python.patch
+	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
+	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
+	"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
+	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
+	"${FILESDIR}"/${PN}-7.25-libpcre.patch
+	"${FILESDIR}"/${PN}-7.31-libnl.patch
+)
+
+pkg_setup() {
+	if use ndiff || use zenmap; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# prevent unpacking the logo
+	unpack ${MY_P}.tar.bz2
+}
+
+src_prepare() {
+	rm -r libpcap/ || die
+
+	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
+
+	default
+
+	if use nls; then
+		local lingua=''
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			if ! use linguas_${lingua}; then
+				rm -r zenmap/share/zenmap/locale/${lingua} || die
+				rm zenmap/share/zenmap/locale/${lingua}.po || die
+			fi
+		done
+	else
+		# configure/make ignores --disable-nls
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			rm -r zenmap/share/zenmap/locale/${lingua} || die
+			rm zenmap/share/zenmap/locale/${lingua}.po || die
+		done
+	fi
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+
+	sed -i \
+		-e '/rm -f $@/d' \
+		$(find . -name Makefile.in) \
+		|| die
+
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
+
+	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
+	eautoreconf
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# we need the original for a Darwin-specific fix, bug #604432
+		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
+	fi
+}
+
+src_configure() {
+	# The bundled libdnet is incompatible with the version available in the
+	# tree, so we cannot use the system library here.
+	econf \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_with ncat) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		$(use_with zenmap) \
+		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		--cache-file="${S}"/config.cache \
+		--with-libdnet=included \
+		--with-pcre=/usr
+	#	Commented out because configure does weird things
+	#	--with-liblinear=/usr \
+}
+
+src_compile() {
+	local directory
+	for directory in . libnetutil nsock/src \
+		$(usex ncat ncat '') \
+		$(usex nmap-update nmap-update '') \
+		$(usex nping nping '')
+	do
+		emake -C "${directory}" makefile.dep
+	done
+
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	if use zenmap; then
+		doicon "${DISTDIR}/nmap-logo-64.png"
+		python_optimize
+	fi
+}
diff --git a/net-analyzer/nmap/nmap-7.60.ebuild b/net-analyzer/nmap/nmap-7.60.ebuild
new file mode 100644
index 000000000000..e925ad725d85
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.60.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+inherit autotools flag-o-matic python-single-r1 toolchain-funcs
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network discovery and security auditing"
+HOMEPAGE="https://nmap.org/"
+SRC_URI="
+	https://nmap.org/dist/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~jer/nmap-logo-64.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE="
+	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua
+	zenmap
+"
+NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
+IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
+
+REQUIRED_USE="
+	system-lua? ( nse )
+	ndiff? ( ${PYTHON_REQUIRED_USE} )
+	zenmap? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-libs/liblinear:=
+	dev-libs/libpcre
+	net-libs/libpcap
+	libssh2? ( net-libs/libssh2[zlib] )
+	ndiff? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	nmap-update? (
+		dev-libs/apr
+		dev-vcs/subversion
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
+	zenmap? (
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
+	"${FILESDIR}"/${PN}-5.21-python.patch
+	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
+	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
+	"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
+	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
+	"${FILESDIR}"/${PN}-7.25-libpcre.patch
+	"${FILESDIR}"/${PN}-7.31-libnl.patch
+)
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use ndiff || use zenmap; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# prevent unpacking the logo
+	unpack ${MY_P}.tar.bz2
+}
+
+src_prepare() {
+	rm -r libpcap/ || die
+
+	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
+
+	default
+
+	if use nls; then
+		local lingua=''
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			if ! use linguas_${lingua}; then
+				rm -r zenmap/share/zenmap/locale/${lingua} || die
+				rm zenmap/share/zenmap/locale/${lingua}.po || die
+			fi
+		done
+	else
+		# configure/make ignores --disable-nls
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			rm -r zenmap/share/zenmap/locale/${lingua} || die
+			rm zenmap/share/zenmap/locale/${lingua}.po || die
+		done
+	fi
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+
+	sed -i \
+		-e '/rm -f $@/d' \
+		$(find . -name Makefile.in) \
+		|| die
+
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
+
+	sed -i \
+		-e '/AC_CONFIG_SUBDIRS(libz)/d' \
+		-e '/AC_CONFIG_SUBDIRS(libssh2)/d' \
+		configure.ac
+
+	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
+
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# we need the original for a Darwin-specific fix, bug #604432
+		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
+	fi
+}
+
+src_configure() {
+	# The bundled libdnet is incompatible with the version available in the
+	# tree, so we cannot use the system library here.
+	econf \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_with libssh2) \
+		$(use_with ncat) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		$(use_with zenmap) \
+		$(usex libssh2 --with-zlib) \
+		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		--cache-file="${S}"/config.cache \
+		--with-libdnet=included \
+		--with-pcre=/usr
+	#	Commented out because configure does weird things
+	#	--with-liblinear=/usr \
+}
+
+src_compile() {
+	local directory
+	for directory in . libnetutil nsock/src \
+		$(usex ncat ncat '') \
+		$(usex nmap-update nmap-update '') \
+		$(usex nping nping '')
+	do
+		emake -C "${directory}" makefile.dep
+	done
+
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	if use zenmap; then
+		doicon "${DISTDIR}/nmap-logo-64.png"
+		python_optimize
+	fi
+}
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
new file mode 100644
index 000000000000..d78311ad1c1b
--- /dev/null
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+inherit autotools flag-o-matic git-r3 python-single-r1 toolchain-funcs user
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network discovery and security auditing"
+HOMEPAGE="https://nmap.org/"
+
+EGIT_REPO_URI="https://github.com/nmap/nmap"
+SRC_URI="https://dev.gentoo.org/~jer/nmap-logo-64.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="
+	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua
+	zenmap
+"
+NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
+IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
+
+REQUIRED_USE="
+	system-lua? ( nse )
+	ndiff? ( ${PYTHON_REQUIRED_USE} )
+	zenmap? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-libs/liblinear:=
+	dev-libs/libpcre
+	net-libs/libpcap
+	libssh2? ( net-libs/libssh2[zlib] )
+	ndiff? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	nmap-update? (
+		dev-libs/apr
+		dev-vcs/subversion
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
+	zenmap? (
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
+	"${FILESDIR}"/${PN}-5.21-python.patch
+	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
+	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
+	"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
+	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
+	"${FILESDIR}"/${PN}-7.25-libpcre.patch
+	"${FILESDIR}"/${PN}-7.31-libnl.patch
+)
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use ndiff || use zenmap; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	rm -r libpcap/ || die
+
+	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
+
+	default
+
+	if use nls; then
+		local lingua=''
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			if ! use linguas_${lingua}; then
+				rm -r zenmap/share/zenmap/locale/${lingua} || die
+				rm zenmap/share/zenmap/locale/${lingua}.po || die
+			fi
+		done
+	else
+		# configure/make ignores --disable-nls
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			rm -r zenmap/share/zenmap/locale/${lingua} || die
+			rm zenmap/share/zenmap/locale/${lingua}.po || die
+		done
+	fi
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
+
+	sed -i \
+		-e '/AC_CONFIG_SUBDIRS(libz)/d' \
+		-e '/AC_CONFIG_SUBDIRS(libssh2)/d' \
+		configure.ac
+
+	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
+
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# we need the original for a Darwin-specific fix, bug #604432
+		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
+	fi
+}
+
+src_configure() {
+	# The bundled libdnet is incompatible with the version available in the
+	# tree, so we cannot use the system library here.
+	econf \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_with libssh2) \
+		$(use_with ncat) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		$(use_with zenmap) \
+		$(usex libssh2 --with-zlib) \
+		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		--cache-file="${S}"/config.cache \
+		--with-libdnet=included \
+		--with-pcre=/usr
+	#	Commented out because configure does weird things
+	#	--with-liblinear=/usr \
+}
+
+src_compile() {
+	local directory
+	for directory in . libnetutil nsock/src \
+		$(usex ncat ncat '') \
+		$(usex nmap-update nmap-update '') \
+		$(usex nping nping '')
+	do
+		emake -C "${directory}" makefile.dep
+	done
+
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	if use zenmap; then
+		doicon "${DISTDIR}/nmap-logo-64.png"
+		python_optimize
+	fi
+}
diff --git a/net-analyzer/nmapsi/Manifest b/net-analyzer/nmapsi/Manifest
new file mode 100644
index 000000000000..8c2f6e1dc6c1
--- /dev/null
+++ b/net-analyzer/nmapsi/Manifest
@@ -0,0 +1,5 @@
+DIST nmapsi4-0.5-alpha1.tar.xz 3163140 SHA256 3aff1a8c77e3787ff101b33a39e1b584b092fb8b4c5347d61b32562be85069a3 SHA512 fa4e604aeb6b342dec7e3fc85d83eda04385bd49a8d53b88e1eec2878c2c3410575a3ae59c59e6cd8e2b9f83de204f895a128d1cf3e7cccbd6bd7b78abd7dcfb WHIRLPOOL a694dd622a4fa2f224c63d5a0e96dd7c8629c3bdbf2bd9fd90c8ee1b71bd33305a708c219bbce9ea774db41c9e9a351f6631d0e88f8f73d29e8a2001be81467a
+EBUILD nmapsi-0.5_alpha1.ebuild 915 SHA256 710b07f68f6a93ca67d9249488c58727dea3b9407848e33ab314a0b74cbddba9 SHA512 6475b2da58818b8091ae771bfb6df665c9889a858baba6be74c33a914a43527bf91c586b1f8a8892ab227a4c4f25a3d4c79dd32a0ef6ad4772a4648e72217b2a WHIRLPOOL 8fceda9610140a28e822cfc539fda99133ac0dd5d5ed3468decd569bef796d68d1b446b186273032e826763d21804355aeba6ea08afebc75d64a51774e72bf57
+MISC ChangeLog 3039 SHA256 42bc81c18c8c2ae52aca4d1802b73eaac6b824f3ab8cc078fc3e415dc8a27835 SHA512 f727090bc912e1f63b855f14f0134b7230d2cc29d9e351261a77ab2c869998939c8ba570ae9f849cb8378a6a6de4a6d851f0eba8b487b103ae73e2464c8c395a WHIRLPOOL a13de029d17e02004829d926df842edf7553812cc1a8a2b24f84a68fb80b00c862c99027be18ddd3056b2221b4f567fd232db85608b867364956bf22d76732c4
+MISC ChangeLog-2015 1979 SHA256 1b5cf3e2863a88d1fbc9ce769ef7d95aa3c78ef2d7e767ee04a954643391ce04 SHA512 f64c82d351679931f79f3db1d529ca89d201acb4285456b8e9205dbb98601f4afe4030a40a833c8d5167eedd21cde497a29ad64b0a34b3db211fcd57855345f3 WHIRLPOOL c404e6c1af6324ef4d06eeab3dfda3176742da32a9a43e7ae2c3624d9d566b906e1c7a0393415f495d4017dd5373f0de662afe10eeea5359a5d964795abc2091
+MISC metadata.xml 378 SHA256 e58042f2baacd1467f95f9b439c5bd7614790f0a6ecfc68c13aab6908c446aab SHA512 c467eeeaab8c2b8e44271a5eba698d0c515782b1d8e863d62022c8d7b7ce2491193f3753e5eaf4b5dee025ea842e6c6fea83838dce69a97ce35d50a40ebbcd11 WHIRLPOOL 510b451f75756f0140039c1bd9cb56a09789c99bae6c39c442614210ba17bac2e0609a3c72e26be5c6483043161f278eeaa0f0d655096edb3223325768e36ed0
diff --git a/net-analyzer/nmapsi/metadata.xml b/net-analyzer/nmapsi/metadata.xml
new file mode 100644
index 000000000000..3b15d70c8fe0
--- /dev/null
+++ b/net-analyzer/nmapsi/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">nmapsi4/nmapsi4</remote-id>
+		<remote-id type="sourceforge">nmapsi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/nmapsi/nmapsi-0.5_alpha1.ebuild b/net-analyzer/nmapsi/nmapsi-0.5_alpha1.ebuild
new file mode 100644
index 000000000000..0da2c99b83b4
--- /dev/null
+++ b/net-analyzer/nmapsi/nmapsi-0.5_alpha1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="ca cs de es fr it ru"
+
+inherit cmake-utils l10n
+
+MY_P=${PN}4-${PV/_/-}
+
+DESCRIPTION="A Qt frontend to nmap"
+HOMEPAGE="http://www.nmapsi4.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${CDEPEND}
+	dev-qt/linguist-tools:5
+"
+RDEPEND="${CDEPEND}
+	net-analyzer/nmap
+	net-dns/bind-tools
+"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS HACKING README.md TODO Translation )
+
+nmapsi_disable_locale() {
+	sed -i -e "/ts\/${PN}4_${1}\.ts/d" src/CMakeLists.txt || die
+}
+
+src_prepare() {
+	l10n_for_each_disabled_locale_do nmapsi_disable_locale
+	cmake-utils_src_prepare
+}
diff --git a/net-analyzer/nmbscan/Manifest b/net-analyzer/nmbscan/Manifest
new file mode 100644
index 000000000000..e9d6ef45e07c
--- /dev/null
+++ b/net-analyzer/nmbscan/Manifest
@@ -0,0 +1,6 @@
+AUX nmbscan-1.2.5-head.diff 443 SHA256 a3546ea0f9a80da0627e328273a320af592c820ac961d204b7beab91df78b258 SHA512 a2dd91d24b4fbbd4fa9344f3c17347527be16fadd3b2166e3a46bf68ce9e788d3c98b341feeb46be41aaf35548e631b49761fbcbd8729b4fdeea5ad141278d10 WHIRLPOOL 52b8fd656f642ecaf5bc0121c543078c54a94dc7f044ae3b65ff013ae819c6151434b2830d98c9c96b7f23cd9aa07cc3b829b62f84d538ed3d2b6c264ce47062
+DIST nmbscan-1.2.5.tar.gz 44749 SHA256 e5f55548e256ded0dd8fc9067ac5c4a5df3d4d7489e871e2bd9b84ce04c7efeb SHA512 37030c6759cc8b257356274b54ec7474e49ddc523be20180c509064f9238da3350f0f0e73e84f2e89201405e93a350a7a7cdc24ef890e638b62648ee2fc4feb9 WHIRLPOOL 943314c9d225e40e3849384cbaa338f1ff6da09d45e0bc9c1bffdf7800077b84a4a07f5de2e30dca05d542224e72686533acbc96721b3d04e3c87291591ecccb
+EBUILD nmbscan-1.2.5.ebuild 691 SHA256 c1043d27ed19971cc8aa275bb6d17348c9c66c2db35062a0d9221174350cc6b9 SHA512 56d714ad46645cb44fe44de8e707ec7022e2dae507b2ee8e08ba5b64c36f7165cb6788d2fed9daf9fad071336c588a856824aa568928d3caa92a9851e3f7863c WHIRLPOOL 949678571584e370590caa7d989bf7adf0e0573ef46c3d57216574c3830538569f10db3445bdbc226d5e0904e6f5769ce70152bb414837c68ff8e1a3e90fdcf2
+MISC ChangeLog 2558 SHA256 61f265869cceb9e84a4cecabb7ad627d3316443f86b37de219ae9a372709a91f SHA512 4788c9cfb615368ff0a1617fc203fda1f30397170e665171f5f827a232836d42121f513d10140348e239143342160a4087e2ac0e4c2f0a32eace69d35bebe41d WHIRLPOOL 1b85eebb370a80df150f40d2ef98e7461af5382800a0adbd755447c825e08387c6406482f3115700eefd8fb69e16d389d0a6fa5930c9152cf9fcb9f70e1024fa
+MISC ChangeLog-2015 2630 SHA256 4e5ee501dac6e5bc8580feefe3d707cda3815cd86d3502384868720946dd04ba SHA512 c2cd9890ec597e005e75eab4edd75834371200332125b6b260ae673fc845bce9bf71c15b292e0b8f41ddaadd5c4041c5665fa96e9eb8939d6baffe494f4e2320 WHIRLPOOL cbcd2364eb536454010f68c1d9cd8eb7faf759963466b3a8465d95f0c1224ba07f493923cd96bea17629ee57a513ea4f1ccc5cf3cfbcc46fb495bf9b0e084f95
+MISC metadata.xml 683 SHA256 e3febc7dbbfb597ee91947e8d1f68d7b4afb0108306110db416a97637630cea3 SHA512 f0bb01d9be906681f1e7bf349e776b7cfc15a61be7a3e944e7291dac9f42a3fe151b05e20c6a13b98c8bad598d56811699a8365ba9227419bea4e2373de26b19 WHIRLPOOL e349fcf3cab3b22fa7cd41bd93caf59572d51d6435c4dd2c7c8f7ab6e737d90c34164434597b5ccfa38504e98afe25d0cd02ca4a4d971472b3961431f85e9790
diff --git a/net-analyzer/nmbscan/files/nmbscan-1.2.5-head.diff b/net-analyzer/nmbscan/files/nmbscan-1.2.5-head.diff
new file mode 100644
index 000000000000..6139f71f297d
--- /dev/null
+++ b/net-analyzer/nmbscan/files/nmbscan-1.2.5-head.diff
@@ -0,0 +1,11 @@
+--- nmbscan.orig	2005-09-21 22:10:05.223491664 +0200
++++ nmbscan	2005-09-21 22:11:59.215162296 +0200
+@@ -402,7 +402,7 @@
+ 
+ function get_server_and_os_by_ip
+ {
+-    V=$(smbclient -L ${2:-$1} -I $1 -U % 2>&1 | grep '^Domain'| sed 's#.*OS=\[\(.*\)\].*Server=\[\(.*\)\].*#\2/\1#' | head -1)
++    V=$(smbclient -L ${2:-$1} -I $1 -U % 2>&1 | grep '^Domain'| sed 's#.*OS=\[\(.*\)\].*Server=\[\(.*\)\].*#\2/\1#' | head -n 1)
+     echo ${V:--/-}
+ }
+ 
diff --git a/net-analyzer/nmbscan/metadata.xml b/net-analyzer/nmbscan/metadata.xml
new file mode 100644
index 000000000000..6d85f89a0e7e
--- /dev/null
+++ b/net-analyzer/nmbscan/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription>
+nmbscan scans the shares of a SMB network, using the NMB and SMB protocols.
+It is useful for acquiring information on a local area network for such purposes as security auditing.
+It can obtain such information as NMB/SMB/Windows hostname, IP address, IP hostname, ethernet MAC address, Windows username, NMB/SMB/Windows domain name, and master browser.
+It can discover all the NMB/SMB/Windows hosts on a local area network by using the hosts lists maintained by master browsers. 
+</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/nmbscan/nmbscan-1.2.5.ebuild b/net-analyzer/nmbscan/nmbscan-1.2.5.ebuild
new file mode 100644
index 000000000000..7e8c9f28df4c
--- /dev/null
+++ b/net-analyzer/nmbscan/nmbscan-1.2.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="netbios scanner"
+HOMEPAGE="http://nmbscan.gbarbier.org/"
+SRC_URI="http://nmbscan.gbarbier.org/down/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 s390 sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-shells/bash
+	net-dns/bind-tools
+	net-fs/samba
+	net-misc/iputils
+	sys-apps/coreutils
+	virtual/awk
+	sys-apps/grep
+	sys-apps/net-tools
+	sys-apps/sed"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-head.diff || die
+}
+
+src_configure() {
+	return
+}
+
+src_compile() {
+	return
+}
+
+src_install() {
+	dobin nmbscan || die
+}
diff --git a/net-analyzer/nodebrain/Manifest b/net-analyzer/nodebrain/Manifest
new file mode 100644
index 000000000000..1c70bc483a2a
--- /dev/null
+++ b/net-analyzer/nodebrain/Manifest
@@ -0,0 +1,6 @@
+AUX nodebrain-0.8.14-include.patch 691 SHA256 8fced6a07f0cdba5cf23da24e84f89d4d40741e7be26fed36efd46cbe16ec043 SHA512 406b57b9d9dd8b203c9b4b1303732c31fbd960624dd6f11a858e805ff0e1c48a251ba6f69dedf521a0ebf7bbd4ea3bba35f457b4d066aebe91942309852b2b4b WHIRLPOOL 80d91e9309bfe487137411bbfe8c078fcecbb691396cf8c9eccdb076d5013ed29dfe7a0feecd46639e2db70b625bfdc3b6e11d0e14e6ecf28e2fe66ae8984449
+DIST nodebrain-0.9.04.tar.gz 2475665 SHA256 4fd936050fa08d5639312fca32528034b82e2c4caf10c23126db6bb8d0eb0175 SHA512 a6cbebef09569d2d086954fc06b7a0bbc2828a5041289fdb7b537bd75b354610f3cf28baded5fce9679d89ffea3e245ab59323a00d060e98819d367775fd5226 WHIRLPOOL b7bc9f4417ac14574c7a3db8be46a695cbbac66cc9bdc7ceff7346002e7849a919750089e16fc618ad9bde996b69b832ffe48c903b4b41b5ad52948bf3cc09ee
+EBUILD nodebrain-0.9.04.ebuild 814 SHA256 c8b6be2546c738f9682eed0e2858c5f07ec0dd33be15daba248141b8e6c6d2a3 SHA512 11fd2cfec1db526674828c0970cbb0fabf9cbdfbc0b37a03af3d698c6d790512b3af6d28bfd2bb295f866c5b924ff450a3ad5936fc09ae730fdb7aae4e02472e WHIRLPOOL 6bb1fa8570b4f16e21ab1ddf52f1a0ea2548dc6b7c07dfc59ebbda831ad263cd1b57d5462217d74e435cd1520c24d06b32a13c3a0542aaa121232d5ef5272f66
+EBUILD nodebrain-9999.ebuild 825 SHA256 73fc694d88d3367b3437558e69dd053969ea3586a3e4cf209c056cc171fa11d6 SHA512 33452bd32b9919d88bb00d4f6fbccf3fbd9c6af37e2bf801c22f5b4debe05280f2c736a8106b177f637f180560e593ab91667fd2922dc542e38d89719eec2768 WHIRLPOOL 4c495a32163334e4d5d6939456403bf3efc7003f486a05bae2260e847a2f8245f05a28f977f5146e4eb987a60d1a1f458147ccc7410c3e1806bacdf3b16d2da5
+MISC ChangeLog 995 SHA256 0827a4b682043cd6e8a0e0510d3823e66a982e3449a53a29956b74bdc124f9f6 SHA512 847b2d30443955594c1aa4bc31198ee62a72211343bb0a157ebfee2ce1e28e51f8801397778100390e4a4ce973252c25e3ab5bf1fed17876995a4e57b4ba24d5 WHIRLPOOL 3e69cfb645ac60ed3aa002f5b467b8650464a0c0485c1b269139f442d8f677c932fc742bec521c3c39e6d08b28ccc888a1a98dd926c58a1b625a227946974506
+MISC metadata.xml 359 SHA256 cecdc4c0b71bc402156d5b5a1ad181e7f57ee850ccd74b84dd438e36a36c1ff2 SHA512 5b6e59de14c1e181ba2306ace2fa3241758b2205b1cba18611a12bb89fcdb2cdfe31313c8de17ed9e09dee6f91c5aca47fe50da5b53d2bde188197c4f3cbf1ed WHIRLPOOL f50c9044597948465795db331724041b11f3172baa6243c174b4d16d34cdeed97b102a4dae38bbad16081fa7108ad73fdb86fa3842ed07a19bd38a4f49db6a02
diff --git a/net-analyzer/nodebrain/files/nodebrain-0.8.14-include.patch b/net-analyzer/nodebrain/files/nodebrain-0.8.14-include.patch
new file mode 100644
index 000000000000..c34965bfe5e5
--- /dev/null
+++ b/net-analyzer/nodebrain/files/nodebrain-0.8.14-include.patch
@@ -0,0 +1,30 @@
+--- a/lib/nbbfi.c
++++ b/lib/nbbfi.c
+@@ -197,6 +197,7 @@
+ *=============================================================================
+ */
+ #include <nb/nbi.h>
++#include <ctype.h> /* isdigit() */
+ 
+ /**************************************************************************
+ * Index Routines
+--- a/lib/nbkit.c
++++ b/lib/nbkit.c
+@@ -51,6 +51,7 @@
+ #include <pwd.h>
+ #include <errno.h>
+ #include <unistd.h>
++#include <stdlib.h> /* system() */
+ 
+ static int nbKitUsage(void){
+     printf("Usage:\n");
+--- a/module/webster/nb_webster.c
++++ b/module/webster/nb_webster.c
+@@ -78,6 +78,7 @@
+ */
+ #include "config.h"
+ #include <nb/nb.h>
++#include <ctype.h> /* isalnum() */
+ 
+ #if defined(WIN32)
+ 
diff --git a/net-analyzer/nodebrain/metadata.xml b/net-analyzer/nodebrain/metadata.xml
new file mode 100644
index 000000000000..b1e688b96833
--- /dev/null
+++ b/net-analyzer/nodebrain/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">nodebrain</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/nodebrain/nodebrain-0.9.04.ebuild b/net-analyzer/nodebrain/nodebrain-0.9.04.ebuild
new file mode 100644
index 000000000000..1169e2f71849
--- /dev/null
+++ b/net-analyzer/nodebrain/nodebrain-0.9.04.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Monitor and do event correlation"
+HOMEPAGE="http://nodebrain.sourceforge.net/"
+SRC_URI="mirror://sourceforge/nodebrain/nodebrain-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="static-libs"
+
+CDEPEND="dev-libs/libedit"
+DEPEND="
+	${CDEPEND}
+	dev-lang/perl
+	virtual/pkgconfig
+	sys-apps/texinfo
+"
+RDEPEND="
+	${CDEPEND}
+	!sys-boot/netboot
+	!www-apps/nanoblogger
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.8.14-include.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--include=/usr/include
+}
+
+src_install() {
+	default
+	use static-libs || prune_libtool_files
+	dodoc AUTHORS NEWS README THANKS sample/*
+	dohtml html/*
+}
diff --git a/net-analyzer/nodebrain/nodebrain-9999.ebuild b/net-analyzer/nodebrain/nodebrain-9999.ebuild
new file mode 100644
index 000000000000..c27ee0d59ed0
--- /dev/null
+++ b/net-analyzer/nodebrain/nodebrain-9999.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils git-r3
+
+DESCRIPTION="Monitor and do event correlation"
+HOMEPAGE="http://nodebrain.sourceforge.net/"
+EGIT_REPO_URI="https://github.com/trettevik/nodebrain-nb"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="static-libs"
+
+CDEPEND="
+	dev-libs/libedit
+"
+DEPEND="
+	${CDEPEND}
+	dev-lang/perl
+	virtual/pkgconfig
+	sys-apps/texinfo
+"
+RDEPEND="
+	${CDEPEND}
+	!sys-boot/netboot
+	!www-apps/nanoblogger
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.14-include.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--include=/usr/include
+}
+
+src_install() {
+	default
+
+	dodoc -r AUTHORS ChangeLog NEWS README THANKS sample/ html/
+
+	prune_libtool_files
+}
diff --git a/net-analyzer/nrpe/Manifest b/net-analyzer/nrpe/Manifest
new file mode 100644
index 000000000000..741729567b15
--- /dev/null
+++ b/net-analyzer/nrpe/Manifest
@@ -0,0 +1,16 @@
+AUX nrpe-2.14-multiline.patch 6806 SHA256 0e980f84044ddc955ad0f2086caf7102cc115193971bb21ec819bed45af5713a SHA512 09c0cc6a4610d674b0ed0da8cdc96f3653f98b54fc98802c33a1cc0b09755d3d0d6afd7fe6b25e1713e6b27af2ba1fa5063988691bc3b5364fa0bfd137d54546 WHIRLPOOL 02e237b3fcacf51e7fd61c25d661e91ff6a3aeb99a6e6ebe752e52f3407b7c8b8f0317693922fa20c48111b7c7eb1803aaa66fc97b8c7c0c8bcf7e066b762199
+AUX nrpe-2.15-autoconf-header.patch 898 SHA256 f1d4c9707413c709d2fd3d0bd8f91a0a94c212e50884fe0f7e9043b02c12606e SHA512 aa7aa0cb57c1b9826a980f9e093f8c8219e0b02dd1e8ba27e74a0a39e746d723e280a93d18d4e069743d14937e0c7159336bb6f406671450fc6a0bb90f902fb2 WHIRLPOOL 1e844bd9e7ccc58988dbde401f900195fb3537ffa6f1bb797d21c8eafe1d73c0103d0ae88b1ff857dc1153956548e45da936516392f863bd317ad5b9b04f7b23
+AUX nrpe-2.15-metachar-security-fix.patch 1165 SHA256 3ddca467693e0eda30eceaf4d772c4b8bb5caa53f34e2600468ccfe211e7fdde SHA512 cba997f4433dd38c95a3e2166f091b53ac6f618f25944dc69bb9ae5864a74a1136667c557881a498ce6aa16e91b367c416a5935e20e348f94f140fdc09692b29 WHIRLPOOL 1b6ecdf764d165139722342eeb3da891f61f384aafcf4a252c62347cb98e39d123cd1572e052afa3e739f0f8d507337dc309282887941e4a1d8179cf1f01fe5f
+AUX nrpe-2.15-no-ssl.patch 967 SHA256 5565f2bbff0aa1b29a399f8a233c2ca58658a0c015a47a65ea43b738c7b4f678 SHA512 17163aa22fd9e03ca00679756413c9ac2051b2d66c894b3ec6dc6bad468d2835c95481eab915b40ccc37e7063e1a2b382af7ed47a5c2ea6d1aa94286a95c44ce WHIRLPOOL d1c398762efe3c837288099d90acbf7ff349ff359940020cbbdc9d9ec4a53f1d65f5b11902c1528e7e0d197d7e5594ede31849572205baf01c885ff2b32e1e41
+AUX nrpe-2.15-tcpd-et-al.patch 2651 SHA256 51717c199bba70dc6b2361fc576dd43604cd3fa072ca5440ee30f0878e3eb521 SHA512 d4c2b38f05b9ac19702ff81d0f07cabed9f98a309e0e4d287bd9784b0aa6ee50ff8b6aee0f4d5541cb10120d463b470d23a6d4a4a2627166d6cf1b07fb5d61de WHIRLPOOL ee2f751582325474718bb34ee80979b6b8667603b7e55d8797d4f5ad2d76c6f18150d902d320b93d42b53b15b1040fbbd6b7d7169422f8e9fc02b01d807e7889
+AUX nrpe-3.2.0.init 415 SHA256 dab32a8f0135734230b17694a0f037688812ef9bac6f892a40db706ee2183de3 SHA512 77f1f265c78de4c806788b7cf40aeb08b533b617bafbee9b487afa6625ae4b5d9be8f46179084d3338ed4edcbb90422aa520ad6daef503758fd9e9b7bdf04ed7 WHIRLPOOL 929240448ff812857b501a9104373a63eac5cf17861a7f8e136c6d450d88120dcb216275303f425bb2f7ba2dd29aec768f2143d43e2dec336b2796037cc44054
+AUX nrpe.init 1152 SHA256 8b2f3cc378dd4aa9378fdda1179f08bdc0eec2bb1d1989c0e84e0dd82a54b8d4 SHA512 19f470407d63b2949535acd6e5849afbea44f82a5773f9110f8b025c380c0626a0a733ead417b1ce293741168acea5a885c2e9f94fb1c0b3e38a06e0eae4ddca WHIRLPOOL 0530564567fff3f15b032938a5359929b8c8dd139c9b39d0a73f1bb8b4de7fe744e6fae0f48e92549e2d646a0af606cab3a24368419b9ba447d6ba21e6ff89c9
+AUX nrpe.service 242 SHA256 20ecfad6b5e9010de3e2b80e3e6eb035ceb54febe0745f75874ca4db29252107 SHA512 ffd67467cc4f5ccdf73e0860d1355a8cc3e528d0c67f2054b0ad76c02a43f9c5a8964a3f6df6f91eaa8e15c3c9596259aa964ad69aa2da60678d68fa892b2346 WHIRLPOOL 652a701aa8739a3bfd8cea23e051eed63a69c45cb80d1a2edd4c1105e14dadbe6181b54e7383e9d53a94da625c15c96af83a75406338a018a1bb1337242df58e
+AUX nrpe.xinetd.2 245 SHA256 9b58e79ec14f538a2750875a49fdbc153c5919b2b97cdc9380ae9d11dbf65c28 SHA512 d687cb2a5babfd28a97d3a5f1ac665758341ecc37fdd0193dbf0df4cba68c88aa24776a33a706989843fa5356b2e3e995662a823ceb2b86ba8f846f8c47e18fb WHIRLPOOL 60a96b00f18dd3305794f81288ed781b19b471e1838243970672762682d56e34ff4d325a62a77178d229ff67b9b39c9a9da7ef0dd78b8fbdb541b2e983d4f9d4
+DIST nrpe-2.15.tar.gz 419695 SHA256 66383b7d367de25ba031d37762d83e2b55de010c573009c6f58270b137131072 SHA512 03ce9774b5112d03235dc9da075770d89d1bcc5ffa5faf221ff7ea8ec5c92ded1e1ae9222581a87cf53736d190ac047e1acce7edc2f31f26c432d786cdef0e73 WHIRLPOOL f97ad7431138fd96588bb4e9d13404a0425bbdb8582c7c472cb20621bb77a9e9ecdeed88b9247ea20815da33c5b123368a540c5a0a058921e59367c2ce2a2b10
+DIST nrpe-3.2.1.tar.gz 518015 SHA256 8ad2d1846ab9011fdd2942b8fc0c99dfad9a97e57f4a3e6e394a4ead99c0f1f0 SHA512 ec6ff42a00bd97ed80010a82e26dc35fd419f2feda65820cda0108068173c1ae44eee698833a50fd2079429a6f5eb1321c4f06b09c6708bc5fbe48f176389856 WHIRLPOOL b6d14d57dd40b69f7bd6b0c125a3b839741b4265868f3f2bf02523b67954d1580a50f5b8bafc7210320f04964ff2f6727448c59f826cc85ed313bd4483218687
+EBUILD nrpe-2.15-r3.ebuild 3946 SHA256 ec1cd79c3ad70dc0c25389fcd7bdb8ef4f4a9af465c938c7ca7ffa860fbeb21b SHA512 bd85540c064f550072e1bd53928cbc5c2965a43f9a7847d2caf4f7cfcee681f7d6d0235d8dc9c4940b0d2bf44bb065cba1df0552af61a1aa7558bb2fa1bf99e4 WHIRLPOOL b2cc20d825376e4645d0f6d6559d757c36d918d1c0a19a571045602ad1443f9c22c059dd44eb86552e0f2c6fbe507664e9b3a23f9b389dfea86a6c50439b3f04
+EBUILD nrpe-3.2.1.ebuild 1873 SHA256 818be0302263f942fb4bf1604b70853d67c18b2449a559f9596267719047be24 SHA512 cf17db5aa952fb6743629fa05c0d226c2f04affecd676034c5f44f81478c430794dbd263dfc4868a6921148301b64ac1ef852ad839e85288c964004009086967 WHIRLPOOL 1e711f78113d70684f2829ae2311b475ccae7d02eb66ce6cf0e42f461f222ff785ac46cdb577b94353af20e1a40fe88f8903155e2464aa73038a81eebe7044c9
+MISC ChangeLog 3802 SHA256 ed4b2b1eba96a627270fe37c90b96e05997ea1b0ebe22d8eba713ad6121a7f79 SHA512 df13ed3437cdd214dd8afa22a808f8ffa3dcebec9ae92e66da8fac0ae76f6ef74eff9653a389893a11ca5f7fcea2ca46aaf7052a62e6cdf6205de164d26011bf WHIRLPOOL d6b5cc1d6f4e6ca982fcc77b42f5555657403703492cf252fcabd46b4ecb1299ee4ec08c69ca3789bc94fb0ca6f78b2d4f616aa79a60c9becefb49345cf76d7a
+MISC ChangeLog-2015 17034 SHA256 085b8586cf040ea9dd26313e9303ef50298842fa38e3cb1db9bc4c39a0190aa7 SHA512 1b516ea9b1d7152bd12f59c103a6cef3f4496ec2d11fc72334bf38c57607b0daa5f79e6f2103c1446948edcc184f1a2838c0fcd1e24d689d2afec7a6517fa9f0 WHIRLPOOL 42d1dcf322e984435cb7c5348da3322ad777056ed0bba4d46f441870d6a7df8cef0ebefd96250beec5905bbf3a77cb8094b322ee4ffdf84ac1032d13fb91c4d3
+MISC metadata.xml 882 SHA256 b3ba558950cf617ce770577a50cbb1200531dd344187fafae255b2ba8e7a6454 SHA512 2bbdd6bb5d0802985b242b8c058c749eca1adfb102820e2c587699622299936df90ee1ff43445df8686e1dd1648d0131bee40639ddfad3e26e9877c0c61dc40e WHIRLPOOL 5b605c1e4a1c325c9279f000799e1cf5290a7ad542679d949a12fec76f7ca28a277efde08d9920a68058d7a345185e8627cc62a67c41a9f47f69a05d939f2480
diff --git a/net-analyzer/nrpe/files/nrpe-2.14-multiline.patch b/net-analyzer/nrpe/files/nrpe-2.14-multiline.patch
new file mode 100644
index 000000000000..3af2ef95baba
--- /dev/null
+++ b/net-analyzer/nrpe/files/nrpe-2.14-multiline.patch
@@ -0,0 +1,204 @@
+Add support for large output
+
+http://opsview-blog.opsera.com/dotorg/2008/08/enhancing-nrpe.htmlIndex: nrpe-2.14/include/common.h
+===================================================================
+Index: nrpe-2.14/include/common.h
+===================================================================
+--- nrpe-2.14.orig/include/common.h
++++ nrpe-2.14/include/common.h
+@@ -41,7 +41,7 @@
+ #define DEFAULT_SOCKET_TIMEOUT	10	/* timeout after 10 seconds */
+ #define DEFAULT_CONNECTION_TIMEOUT 300	/* timeout if daemon is waiting for connection more than this time */
+ 
+-#define MAX_INPUT_BUFFER	2048	/* max size of most buffers we use */
++#define MAX_INPUT_BUFFER	16384	/* max size of most buffers we use */
+ #define MAX_FILENAME_LENGTH     256
+ 
+ #define MAX_HOST_ADDRESS_LENGTH	256	/* max size of a host address */
+@@ -55,12 +55,14 @@
+ 
+ #define QUERY_PACKET		1		/* id code for a packet containing a query */
+ #define	RESPONSE_PACKET		2		/* id code for a packet containing a response */
++#define    RESPONSE_PACKET_WITH_MORE   3   /* id code for a packet containing a response, with more data to follow */
+ 
+ #define NRPE_PACKET_VERSION_3   3               /* packet version identifier */
+ #define NRPE_PACKET_VERSION_2   2               
+ #define NRPE_PACKET_VERSION_1	1		/* older packet version identifiers (no longer supported) */
+ 
+ #define MAX_PACKETBUFFER_LENGTH	1024		/* max amount of data we'll send in one query/response */
++											/* WARNING - do not change this as older clients/servers will not work */
+ 
+ typedef struct packet_struct{
+ 	int16_t   packet_version;
+Index: nrpe-2.14/src/check_nrpe.c
+===================================================================
+--- nrpe-2.14.orig/src/check_nrpe.c
++++ nrpe-2.14/src/check_nrpe.c
+@@ -221,6 +221,11 @@ int main(int argc, char **argv){
+ 			return STATE_UNKNOWN;
+ 		        }
+ 
++		/* Altinity patch: Allow multiple packets to be received */
++		/* Indentation not corrected to allow simpler patching */
++		/* START MULTI_PACKET LOOP */
++		do {
++
+ 		/* wait for the response packet */
+ 		bytes_to_recv=sizeof(receive_packet);
+ 		if(use_ssl==FALSE)
+@@ -233,31 +238,24 @@ int main(int argc, char **argv){
+ 		/* reset timeout */
+ 		alarm(0);
+ 
+-		/* close the connection */
+-#ifdef HAVE_SSL
+-		if(use_ssl==TRUE){
+-			SSL_shutdown(ssl);
+-			SSL_free(ssl);
+-			SSL_CTX_free(ctx);
+-	                }
+-#endif
+-		graceful_close(sd,1000);
+-
+ 		/* recv() error */
+ 		if(rc<0){
+ 			printf("CHECK_NRPE: Error receiving data from daemon.\n");
++			graceful_close(sd,1000);
+ 			return STATE_UNKNOWN;
+ 		        }
+ 
+ 		/* server disconnected */
+ 		else if(rc==0){
+ 			printf("CHECK_NRPE: Received 0 bytes from daemon.  Check the remote server logs for error messages.\n");
++			graceful_close(sd,1000);
+ 			return STATE_UNKNOWN;
+ 		        }
+ 
+ 		/* receive underflow */
+ 		else if(bytes_to_recv<sizeof(receive_packet)){
+ 			printf("CHECK_NRPE: Receive underflow - only %d bytes received (%d expected).\n",bytes_to_recv,sizeof(receive_packet));
++			graceful_close(sd,1000);
+ 			return STATE_UNKNOWN;
+ 		        }
+ 
+@@ -271,21 +269,21 @@ int main(int argc, char **argv){
+ 		calculated_crc32=calculate_crc32((char *)&receive_packet,sizeof(receive_packet));
+ 		if(packet_crc32!=calculated_crc32){
+ 			printf("CHECK_NRPE: Response packet had invalid CRC32.\n");
+-			close(sd);
++			graceful_close(sd,1000);
+ 			return STATE_UNKNOWN;
+                         }
+ 	
+ 		/* check packet version */
+ 		if(ntohs(receive_packet.packet_version)!=NRPE_PACKET_VERSION_2){
+ 			printf("CHECK_NRPE: Invalid packet version received from server.\n");
+-			close(sd);
++			graceful_close(sd,1000);
+ 			return STATE_UNKNOWN;
+ 			}
+ 
+ 		/* check packet type */
+-		if(ntohs(receive_packet.packet_type)!=RESPONSE_PACKET){
++		if(ntohs(receive_packet.packet_type)!=RESPONSE_PACKET && ntohs(receive_packet.packet_type)!=RESPONSE_PACKET_WITH_MORE){
+ 			printf("CHECK_NRPE: Invalid packet type received from server.\n");
+-			close(sd);
++			graceful_close(sd,1000);
+ 			return STATE_UNKNOWN;
+ 			}
+ 
+@@ -297,8 +295,18 @@ int main(int argc, char **argv){
+ 		if(!strcmp(receive_packet.buffer,""))
+ 			printf("CHECK_NRPE: No output returned from daemon.\n");
+ 		else
+-			printf("%s\n",receive_packet.buffer);
+-	        }
++			printf("%s",receive_packet.buffer);
++
++		} while (ntohs(receive_packet.packet_type)==RESPONSE_PACKET_WITH_MORE);
++		/* END MULTI_PACKET LOOP */
++
++		/* Finish output with newline */
++		printf("\n");
++
++		/* close the connection */
++		graceful_close(sd,1000);
++
++	}
+ 
+ 	/* reset the alarm */
+ 	else
+@@ -434,6 +442,14 @@ int graceful_close(int sd, int timeout){
+         struct timeval tv;
+         char buf[1000];
+ 
++#ifdef HAVE_SSL
++		if(use_ssl==TRUE){
++			SSL_shutdown(ssl);
++			SSL_free(ssl);
++			SSL_CTX_free(ctx);
++		}
++#endif
++
+ 	/* send FIN packet */
+         shutdown(sd,SHUT_WR);  
+         for(;;){
+Index: nrpe-2.14/src/nrpe.c
+===================================================================
+--- nrpe-2.14.orig/src/nrpe.c
++++ nrpe-2.14/src/nrpe.c
+@@ -1056,6 +1056,8 @@ void handle_connection(int sock){
+ 	char processed_command[MAX_INPUT_BUFFER];
+ 	int result=STATE_OK;
+ 	int early_timeout=FALSE;
++	int bytes_copied=0;
++	char *pbuffer=&buffer[0];
+ 	int rc;
+ 	int x;
+ #ifdef DEBUG
+@@ -1272,6 +1274,14 @@ void handle_connection(int sock){
+ 	if(buffer[strlen(buffer)-1]=='\n')
+ 		buffer[strlen(buffer)-1]='\x0';
+ 
++	/* Altinity patch to allow multi packet responses */
++	/* Loop not indented to allow easier patching */
++	/* START MULTI_PACKET LOOP */
++	do {
++
++		if(debug==TRUE)
++			syslog(LOG_DEBUG,"Sending response - bytes left: %d", strlen(pbuffer));
++
+ 	/* clear the response packet buffer */
+ 	bzero(&send_packet,sizeof(send_packet));
+ 
+@@ -1280,11 +1290,17 @@ void handle_connection(int sock){
+ 
+ 	/* initialize response packet data */
+ 	send_packet.packet_version=(int16_t)htons(NRPE_PACKET_VERSION_2);
+-	send_packet.packet_type=(int16_t)htons(RESPONSE_PACKET);
+ 	send_packet.result_code=(int16_t)htons(result);
+-	strncpy(&send_packet.buffer[0],buffer,MAX_PACKETBUFFER_LENGTH);
++	strncpy(&send_packet.buffer[0],pbuffer,MAX_PACKETBUFFER_LENGTH);
+ 	send_packet.buffer[MAX_PACKETBUFFER_LENGTH-1]='\x0';
+-	
++
++	bytes_copied = strlen(&send_packet.buffer[0]);
++	pbuffer = pbuffer+bytes_copied;
++	if(strlen(pbuffer)>0)
++		send_packet.packet_type=(int16_t)htons(RESPONSE_PACKET_WITH_MORE);
++	else
++		send_packet.packet_type=(int16_t)htons(RESPONSE_PACKET);
++
+ 	/* calculate the crc 32 value of the packet */
+ 	send_packet.crc32_value=(u_int32_t)0L;
+ 	calculated_crc32=calculate_crc32((char *)&send_packet,sizeof(send_packet));
+@@ -1303,6 +1319,9 @@ void handle_connection(int sock){
+ 		SSL_write(ssl,&send_packet,bytes_to_send);
+ #endif
+ 
++	} while (strlen(pbuffer) > 0);
++	/* END MULTI_PACKET LOOP */
++
+ #ifdef HAVE_SSL
+ 	if(ssl){
+ 		complete_SSL_shutdown( ssl);
diff --git a/net-analyzer/nrpe/files/nrpe-2.15-autoconf-header.patch b/net-analyzer/nrpe/files/nrpe-2.15-autoconf-header.patch
new file mode 100644
index 000000000000..81078c449713
--- /dev/null
+++ b/net-analyzer/nrpe/files/nrpe-2.15-autoconf-header.patch
@@ -0,0 +1,24 @@
+diff -Nuar --exclude '*.orig' nrpe-2.15.orig/configure.in nrpe-2.15/configure.in
+--- nrpe-2.15.orig/configure.in	2013-09-06 08:27:13.000000000 -0700
++++ nrpe-2.15/configure.in	2014-04-19 09:32:52.251766643 -0700
+@@ -6,7 +6,8 @@
+ 
+ AC_INIT([nrpe],[2.15],[nagios-users@lists.sourceforge.net],[nrpe],[http://www.nagios.org])
+ AC_CONFIG_SRCDIR([src/nrpe.c])
+-AC_CONFIG_HEADERS([include/config.h])
++AC_CONFIG_HEADERS([include/autoconf.h])
+ AC_CONFIG_FILES([Makefile
++	include/config.h
+ 	subst
+ 	src/Makefile
+diff -Nuar --exclude '*.orig' nrpe-2.15.orig/include/config.h.in nrpe-2.15/include/config.h.in
+--- nrpe-2.15.orig/include/config.h.in	2013-09-06 08:27:13.000000000 -0700
++++ nrpe-2.15/include/config.h.in	2014-04-19 09:33:07.620035056 -0700
+@@ -26,6 +26,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include "autoconf.h"
+ 
+ 
+ #define DEFAULT_SERVER_PORT	@nrpe_port@	/* default port to use */
diff --git a/net-analyzer/nrpe/files/nrpe-2.15-metachar-security-fix.patch b/net-analyzer/nrpe/files/nrpe-2.15-metachar-security-fix.patch
new file mode 100644
index 000000000000..c42f8bfdec00
--- /dev/null
+++ b/net-analyzer/nrpe/files/nrpe-2.15-metachar-security-fix.patch
@@ -0,0 +1,26 @@
+Disallow all control characters in argument handling.
+
+This closes a security hole that allowed passing commands via the argument
+handling, if a newline was used to seperate the argument from the rest of the
+command.
+
+X-URL: http://www.exploit-db.com/exploits/32925/
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+--
+I didn't find any patches from upstream NRPE, so I wrote this quick one.
+If somebody else has a valid use for control characters in NRPE arguments, then
+this could be relaxed slightly.
+
+diff -Nuar --exclude '*.orig' nrpe-2.15.orig/src/nrpe.c nrpe-2.15/src/nrpe.c
+--- nrpe-2.15.orig/src/nrpe.c	2014-04-19 09:37:16.022373910 -0700
++++ nrpe-2.15/src/nrpe.c	2014-04-19 09:46:53.237458939 -0700
+@@ -53,7 +53,7 @@
+ 
+ #define DEFAULT_COMMAND_TIMEOUT	60			/* default timeout for execution of plugins */
+ #define MAXFD                   64
+-#define NASTY_METACHARS         "|`&><'\"\\[]{};"
++#define NASTY_METACHARS         "|`&><'\"\\[]{};\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\x7f"
+ #define howmany(x,y)	(((x)+((y)-1))/(y))
+ #define MAX_LISTEN_SOCKS        16
+ 
diff --git a/net-analyzer/nrpe/files/nrpe-2.15-no-ssl.patch b/net-analyzer/nrpe/files/nrpe-2.15-no-ssl.patch
new file mode 100644
index 000000000000..3b3fc135455f
--- /dev/null
+++ b/net-analyzer/nrpe/files/nrpe-2.15-no-ssl.patch
@@ -0,0 +1,39 @@
+Without this patch, you can't build nrpe without SSL support. It was
+originally submitted on the Nagios forums by user Matthew L. Daniel:
+
+  https://support.nagios.com/forum/viewtopic.php?t=27027
+
+It was merged into the upstream github repo (NagiosEnterprises/nrpe)
+in commit 3736fdeeac11a.
+
+
+diff --git a/src/nrpe.c b/src/nrpe.c
+index 4bc849b..1e55ab4 100644
+--- a/src/nrpe.c
++++ b/src/nrpe.c
+@@ -102,7 +102,9 @@ int     use_src=FALSE; /* Define parameter for SRC option */
+ int		listen_queue_size=DEFAULT_LISTEN_QUEUE_SIZE;
+ 
+ 
++#ifdef HAVE_SSL
+ void complete_SSL_shutdown( SSL *);
++#endif
+ 
+ 
+ int main(int argc, char **argv){
+@@ -1815,6 +1817,7 @@ int remove_pid_file(void){
+ 	return OK;
+         }
+ 
++#ifdef HAVE_SSL
+ void complete_SSL_shutdown( SSL *ssl) {
+ 
+ 	/*  
+@@ -1835,6 +1838,7 @@ void complete_SSL_shutdown( SSL *ssl) {
+ 		if( SSL_shutdown( ssl)) break;
+ 	}
+ }
++#endif/*HAVE_SSL*/
+ 
+ /* bail if daemon is running as root */
+ int check_privileges(void){
diff --git a/net-analyzer/nrpe/files/nrpe-2.15-tcpd-et-al.patch b/net-analyzer/nrpe/files/nrpe-2.15-tcpd-et-al.patch
new file mode 100644
index 000000000000..b8a0811b831c
--- /dev/null
+++ b/net-analyzer/nrpe/files/nrpe-2.15-tcpd-et-al.patch
@@ -0,0 +1,50 @@
+diff -Nuar --exclude '*.orig' nrpe-2.15.orig/configure.in nrpe-2.15/configure.in
+--- nrpe-2.15.orig/configure.in	2013-09-06 08:27:13.000000000 -0700
++++ nrpe-2.15/configure.in	2014-04-19 09:20:50.406150828 -0700
+@@ -45,7 +45,7 @@
+ AC_HEADER_STDC
+ AC_HEADER_TIME
+ AC_HEADER_SYS_WAIT
+-AC_CHECK_HEADERS(ctype.h dirent.h errno.h fcntl.h getopt.h grp.h inttypes.h netdb.h pwd.h signal.h stdint.h strings.h string.h syslog.h tcpd.h unistd.h arpa/inet.h netinet/in.h socket.h sys/types.h sys/time.h sys/resource.h sys/wait.h sys/socket.h sys/stat.h)
++AC_CHECK_HEADERS(ctype.h dirent.h errno.h fcntl.h getopt.h grp.h inttypes.h netdb.h pwd.h signal.h stdint.h strings.h string.h syslog.h unistd.h arpa/inet.h netinet/in.h socket.h sys/types.h sys/time.h sys/resource.h sys/wait.h sys/socket.h sys/stat.h)
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+@@ -164,11 +164,20 @@
+ AC_CHECK_LIB(nsl,main,SOCKETLIBS="$SOCKETLIBS -lnsl")
+ AC_CHECK_LIB(socket,socket,SOCKETLIBS="$SOCKETLIBS -lsocket")
+ AC_SUBST(SOCKETLIBS)
+-AC_CHECK_LIB(wrap,main,[
+-	LIBWRAPLIBS="$LIBWRAPLIBS -lwrap"
++
++AC_ARG_ENABLE([tcp-wrapper],
++    AS_HELP_STRING([--disable-tcp-wrapper], [Disable building with TCP wrappers. *** DISABLING IS A SECURITY RISK! *** Read the SECURITY file before using this option! @<:@default=enable@:>@]))
++
++LIBWRAPLIBS=""
++AS_IF([test "x$enable_tcp_wrapper" != "xno"], [
++    AC_CHECK_LIB([wrap],[hosts_access],[
++        LIBWRAPLIBS="$LIBWRAPLIBS -lwrap"
+ 	AC_DEFINE(HAVE_LIBWRAP,[1],[Have the TCP wrappers library])
+-	])
++	AC_DEFINE(HAVE_TCPD_H,[1],[Have the TCP wrappers library])
++    ])
++])
+ AC_SUBST(LIBWRAPLIBS)
++
+ AC_CHECK_FUNCS(strdup strstr strtoul initgroups closesocket)
+ 
+ dnl socklen_t check - from curl
+@@ -440,8 +449,11 @@
+ AC_SUBST(TARGET_PLATFORM)
+ 
+ AC_ARG_ENABLE([command-args],
+-	AS_HELP_STRING([--enable-command-args],[allows clients to specify command arguments.  *** THIS IS A SECURITY RISK! *** Read the SECURITY file before using this option!]),
+-	AC_DEFINE_UNQUOTED(ENABLE_COMMAND_ARGUMENTS,[1],[Enable command-line arguments]))
++	AS_HELP_STRING([--enable-command-args],[allows clients to specify command arguments.  *** THIS IS A SECURITY RISK! *** Read the SECURITY file before using this option!]))
++
++AS_IF([test "x$enable_command_args" = "xyes"], [
++	AC_DEFINE(ENABLE_COMMAND_ARGUMENTS,[1],[Enable command-line arguments])
++])
+ 
+ AC_ARG_ENABLE([bash-command-substitution],
+ 	AS_HELP_STRING([--enable-bash-command-substitution],[allows clients to pass bash command substitutions of the form $(command).  *** THIS IS A HIGH SECURITY RISK! *** Read the SECURITY file before using this option!]),
diff --git a/net-analyzer/nrpe/files/nrpe-3.2.0.init b/net-analyzer/nrpe/files/nrpe-3.2.0.init
new file mode 100644
index 000000000000..acf8b549ee78
--- /dev/null
+++ b/net-analyzer/nrpe/files/nrpe-3.2.0.init
@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+: ${CFGFILE:=/etc/nagios/nrpe.cfg}
+
+extra_started_commands="reload"
+command="/usr/bin/${SVCNAME}"
+command_args="-c ${CFGFILE} --daemon"
+pidfile=/run/nrpe.pid
+
+reload() {
+    ebegin "Reloading ${SVCNAME}"
+    start-stop-daemon --exec $command --pidfile $pidfile --signal HUP
+    eend $?
+}
diff --git a/net-analyzer/nrpe/files/nrpe.init b/net-analyzer/nrpe/files/nrpe.init
new file mode 100644
index 000000000000..bb7e34ef22e7
--- /dev/null
+++ b/net-analyzer/nrpe/files/nrpe.init
@@ -0,0 +1,49 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+: ${CFGFILE:=/etc/nagios/nrpe.cfg}
+
+get_config() {
+    [ -f ${CFGFILE} ] || return 1
+
+    sed -n -e 's:^[ \t]*'$1'=\([^#]\+\).*:\1:p' \
+	${CFGFILE}
+}
+
+extra_started_commands="reload"
+
+command=/usr/libexec/${SVCNAME}
+command_args="-c ${CFGFILE} --daemon"
+pidfile=$(get_config pid_file)
+
+depend() {
+    config ${CFGFILE}
+}
+
+reload() {
+    ebegin "Reloading ${SVCNAME}"
+    kill -1 `cat ${pidfile}`
+    eend $?
+}
+
+start()
+{
+    mkdir -p $(dirname $pidfile)
+    local _background=
+    ebegin "Starting ${name:-$RC_SVCNAME}"
+    eval start-stop-daemon --start \
+        --exec $command \
+        ${procname:+--name} $procname \
+        ${pidfile:+--pidfile} $pidfile \
+        $_background $start_stop_daemon_args \
+        -- $command_args
+    if eend $? "Failed to start $RC_SVCNAME"; then
+        service_set_value "command" "${command}"
+        [ -n "${pidfile}" ] && service_set_value "pidfile" "${pidfile}"
+        [ -n "${procname}" ] && service_set_value "procname" "${procname}"
+        return 0
+    fi  
+    return 1
+}
+
diff --git a/net-analyzer/nrpe/files/nrpe.service b/net-analyzer/nrpe/files/nrpe.service
new file mode 100644
index 000000000000..f6546d703cd4
--- /dev/null
+++ b/net-analyzer/nrpe/files/nrpe.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Daemon to answer plugin requests from Nagios on remote hosts
+After=network.target
+Requires=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/libexec/nrpe -c /etc/nagios/nrpe.cfg -d
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-analyzer/nrpe/files/nrpe.xinetd.2 b/net-analyzer/nrpe/files/nrpe.xinetd.2
new file mode 100644
index 000000000000..dd0331a88149
--- /dev/null
+++ b/net-analyzer/nrpe/files/nrpe.xinetd.2
@@ -0,0 +1,11 @@
+service nrpe {
+	socket_type = stream
+	protocol    = tcp
+	wait        = no
+	user        = nagios
+	group       = nagios
+	server      = /usr/libexec/nrpe
+	server_args = -c /etc/nagios/nrpe.cfg --inetd
+#	only_from   = 127.0.0.1
+	disabled    = yes
+}
diff --git a/net-analyzer/nrpe/metadata.xml b/net-analyzer/nrpe/metadata.xml
new file mode 100644
index 000000000000..e47fd6fd83c9
--- /dev/null
+++ b/net-analyzer/nrpe/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
+  <longdescription>
+    A daemon for allowing Nagios to connect directly to servers and
+    execute commands defined in a centralized configuration file.
+  </longdescription>
+  <use>
+    <flag name="command-args">
+      Build support for specifying the command-line arguments from the
+      Nagios/Icinga master. Make sure you understand the implications
+      of this flag as it can be a security risk.
+    </flag>
+    <flag name="minimal">
+      Only build the check plugins for Nagios/Icinga, and not the daemon.
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">nagios</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/nrpe/nrpe-2.15-r3.ebuild b/net-analyzer/nrpe/nrpe-2.15-r3.ebuild
new file mode 100644
index 000000000000..90481423d1fe
--- /dev/null
+++ b/net-analyzer/nrpe/nrpe-2.15-r3.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils systemd toolchain-funcs multilib user autotools
+
+DESCRIPTION="Nagios Remote Plugin Executor"
+HOMEPAGE="http://www.nagios.org/"
+SRC_URI="mirror://sourceforge/nagios/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+IUSE="command-args minimal selinux ssl tcpd"
+
+DEPEND="ssl? ( dev-libs/openssl:0 )
+	!minimal? ( tcpd? ( sys-apps/tcp-wrappers ) )"
+RDEPEND="${DEPEND}
+	!minimal? (
+		|| ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )
+	)
+	selinux? ( sec-policy/selinux-nagios )"
+
+pkg_setup() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /dev/null nagios
+
+	elog "If you plan to use \"nrpe_check_control\" then you may want to specify"
+	elog "different command and services files. You can override the defaults"
+	elog "through the \"NAGIOS_COMMAND_FILE\" and \"NAGIOS_SERVICES_FILE\" environment variables."
+	elog "NAGIOS_COMMAND_FILE=${NAGIOS_COMMAND_FILE:-/var/rw/nagios.cmd}"
+	elog "NAGIOS_SERVICES_FILE=${NAGIOS_SERVICES_FILE:-/etc/services.cfg}"
+}
+
+src_prepare() {
+	# Add support for large output,
+	# http://opsview-blog.opsera.com/dotorg/2008/08/enhancing-nrpe.html
+	epatch "${FILESDIR}"/${PN}-2.14-multiline.patch
+
+	# fix configure, among others #326367, #397603
+	epatch "${FILESDIR}"/${PN}-2.15-tcpd-et-al.patch
+
+	# otherwise autoconf will overwrite the custom include/config.h.in
+	epatch "${FILESDIR}"/${PN}-2.15-autoconf-header.patch
+
+	# improve handling of metachars for security
+	epatch "${FILESDIR}"/${PN}-2.15-metachar-security-fix.patch
+
+	# Fix build with USE="-ssl".
+	epatch "${FILESDIR}"/${PN}-2.15-no-ssl.patch
+
+	sed -i -e '/define \(COMMAND\|SERVICES\)_FILE/d' \
+		contrib/nrpe_check_control.c || die
+
+	# change the default location of the pid file
+	sed -i -e '/pid_file/s:/var/run:/run:' sample-config/nrpe.cfg.in || die
+
+	# fix TFU handling of autoheader
+	sed -i -e '/#undef/d' include/config.h.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use minimal; then
+		myconf="--disable-tcp-wrapper --disable-command-args"
+	else
+		myconf="$(use_enable tcpd tcp-wrapper) $(use_enable command-args)"
+	fi
+
+	econf \
+		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
+		--localstatedir=/var/nagios \
+		--sysconfdir=/etc/nagios \
+		--with-nrpe-user=nagios \
+		--with-nrpe-group=nagios \
+		$(use_enable ssl) \
+		${myconf}
+}
+
+src_compile() {
+	emake -C src check_nrpe $(use minimal || echo nrpe)
+
+	# Add nifty nrpe check tool
+	$(tc-getCC) ${CPPFLAGS} ${CFLAGS} \
+		-DCOMMAND_FILE=\"${NAGIOS_COMMAND_FILE:-/var/rw/nagios.cmd}\" \
+		-DSERVICES_FILE=\"${NAGIOS_SERVICES_FILE:-/etc/services.cfg}\" \
+		${LDFLAGS} -o nrpe_check_control contrib/nrpe_check_control.c || die
+}
+
+src_install() {
+	dodoc LEGAL Changelog README SECURITY \
+		contrib/README.nrpe_check_control \
+		$(use ssl && echo README.SSL)
+
+	exeinto /usr/$(get_libdir)/nagios/plugins
+	doexe src/check_nrpe nrpe_check_control
+
+	use minimal && return 0
+
+	## NON-MINIMAL INSTALL FOLLOWS ##
+
+	insinto /etc/nagios
+	newins sample-config/nrpe.cfg nrpe.cfg
+	fowners root:nagios /etc/nagios/nrpe.cfg
+	fperms 0640 /etc/nagios/nrpe.cfg
+
+	exeinto /usr/libexec
+	doexe src/nrpe
+
+	newinitd "${FILESDIR}"/nrpe.init nrpe
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/xinetd.d/
+	newins "${FILESDIR}/nrpe.xinetd.2" nrpe
+
+	if use tcpd; then
+		sed -i -e '/^reload()/, /^}/ d' -e '/extra_started_commands/s:reload::' \
+			"${D}"/etc/init.d/nrpe
+	fi
+}
+
+pkg_postinst() {
+	elog "If you are using the nrpe daemon, remember to edit"
+	elog "the config file /etc/nagios/nrpe.cfg"
+
+	if use command-args ; then
+		ewarn ""
+		ewarn "You have enabled command-args for NRPE. This enables"
+		ewarn "the ability for clients to supply arguments to commands"
+		ewarn "which should be run. "
+		ewarn "THIS IS CONSIDERED A SECURITY RISK!"
+		ewarn "Please read /usr/share/doc/${PF}/SECURITY.bz2 for more info"
+	fi
+}
diff --git a/net-analyzer/nrpe/nrpe-3.2.1.ebuild b/net-analyzer/nrpe/nrpe-3.2.1.ebuild
new file mode 100644
index 000000000000..fabe5f984cae
--- /dev/null
+++ b/net-analyzer/nrpe/nrpe-3.2.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit systemd user
+
+DESCRIPTION="Nagios Remote Plugin Executor"
+HOMEPAGE="https://github.com/NagiosEnterprises/nrpe"
+SRC_URI="${HOMEPAGE}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="command-args selinux ssl"
+
+DEPEND="sys-apps/tcp-wrappers
+	ssl? ( dev-libs/openssl:0 )"
+RDEPEND="${DEPEND}
+	|| ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )
+	selinux? ( sec-policy/selinux-nagios )"
+
+pkg_setup() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+src_configure() {
+	econf \
+		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
+		--localstatedir=/var/nagios \
+		--sysconfdir=/etc/nagios \
+		--with-nrpe-user=nagios \
+		--with-nrpe-group=nagios \
+		--with-piddir=/run \
+		$(use_enable command-args) \
+		$(use_enable ssl)
+}
+
+src_compile() {
+	emake all
+}
+
+src_install() {
+	default
+
+	dodoc CHANGELOG.md SECURITY.md
+	insinto /etc/nagios
+	newins sample-config/nrpe.cfg nrpe.cfg
+	fowners root:nagios /etc/nagios/nrpe.cfg
+	fperms 0640 /etc/nagios/nrpe.cfg
+
+	newinitd "startup/openrc-init" nrpe
+	newconfd "startup/openrc-conf" nrpe
+	systemd_newunit "startup/default-service" "${PN}.service"
+
+	insinto /etc/xinetd.d/
+	newins "${FILESDIR}/nrpe.xinetd.2" nrpe
+
+	rm "${D}/usr/bin/nrpe-uninstall" || die 'failed to remove uninstall tool'
+}
+
+pkg_postinst(){
+	elog 'Some users have reported incompatibilities between nrpe-2.x and'
+	elog 'nrpe-3.x. We recommend that you use the same major version for'
+	elog 'both your server and clients.'
+
+	if use command-args ; then
+		ewarn ''
+		ewarn 'You have enabled command-args for NRPE. That lets clients'
+		ewarn 'supply arguments to the commands that are run, and IS A'
+		ewarn 'SECURITY RISK!'
+		ewarn''
+	fi
+}
diff --git a/net-analyzer/nsat/Manifest b/net-analyzer/nsat/Manifest
new file mode 100644
index 000000000000..bd9e58fde5ff
--- /dev/null
+++ b/net-analyzer/nsat/Manifest
@@ -0,0 +1,13 @@
+AUX nsat-1.5-amd64-compat.patch 1057 SHA256 e65189b4ccb514aab4ba818fff21769754c9ec24ce0d16de468682e1ac4b4af5 SHA512 e13248ff8ecbb7d659484d211959152cade74121a875f6141e512bbd8eb54495bfacd2acdc91334ab431e8c0f14c73f87297aa40fe98014f1d6c1f0ca04dd7f3 WHIRLPOOL d815efcf123008d32e78ddd51f7154544fb63d44d35bcc9087455709b97945c4aaddb63f3f0683c9cf2531f6fa01733373dbeaeffd0b214c3861a261e2ea4f6c
+AUX nsat-1.5-configure.patch 741 SHA256 75d65589316260e191bb30f836ec7411131eede06c7a0a2738fb5033137ef201 SHA512 1134f09b9aa3d715d7c6ef93ee31ead345f3e761f8903a2e6de454b3182cb88811b5e1823b80feab8a87e6194672d0f6f0d00895569fbde23447bccec1a0c8f6 WHIRLPOOL 1f71e851af400cea08cc4ecc13cb1ea01e2898fa5d11d150c230644b7eafa00c8c4f132a002184e21f9152cb78d74e46041359787385b4cba17570ba481d5425
+AUX nsat-1.5-libtirpc.patch 977 SHA256 5463a9729811e47e456cd6d45520f5660e61af96082e64c7accced02b59c7b9b SHA512 509b6c0ecd545893ee49f810c54b11c5c8f527ce14acf92a282f9d993392ab1e40a807a5a4646eb7b62c80f7e21593f2996dc83d0636344ca4273209bdc551bc WHIRLPOOL a687e2248866fdb6128072767f74c10f832021630de83589dcff54015fd8da3400416382d74effd592d8d3bc6b8f2168fa9a51e31612d6c191ffc2f27297c326
+AUX nsat-1.5-lvalue-gcc4.patch 375 SHA256 b7a79b1269c40f120f7bf9d84a47c4d85136eb3e31e08d2a1d8e61f11fc097f0 SHA512 4768bbc1e1e9ed2b4efe70ec55214827e2dfe59e9c838d8934fee43c886b386c5942e93d862c37f220bc5e019642b3d914e2fde175a2aeee4691c7933c1aa3b5 WHIRLPOOL 47b92d8c5b73e558f53d8cbfbcfa41abcb543020b2565271cd83352b42a44d5c7a19d61953c7ba137807729b557494b1dba8093517ce18262def610009058269
+AUX nsat-1.5-misc.patch 2422 SHA256 79e7888291623687bdf795a759d5080d9f3813a4ccad61331ea162c72648418b SHA512 e000011099c7cd5507d91af0d89ea94d2e44d257b3133d6788302733b2615dfa0148f758daa336be3221fde6de0e2e2994104bc8d0729850ed5b60e0eff82ab9 WHIRLPOOL 9508f045f79283e6a343efe51d8b9c1802443244179aa5cfbb4d05e01409838531d2d21b3753c2ac0da3a4f708dff3b855e4460eed9883bea4835cba0d33bc72
+AUX nsat-1.5-strip.patch 205 SHA256 2506beca0f13fe9717857d7b9f10970adacf7dc5e3d79f5e625ec323868e5c94 SHA512 3e8b312e704f08fbe86caea37a8491851474cb0b773a73f4b2995532086fefa85a5240f49084bb0e1195089bfbfa937e68c45c0908a2bb7f427775ccb4535e8e WHIRLPOOL 085053f8bc56dd99139d6c1915b6a252c7d4fe237c6c00a3062d7fc78d08ae48b7093512be3f4c62ca6195258b7d545d2089b9d9c6896181134bd6ddb5b58d68
+AUX nsat-1.5-va_list.patch 470 SHA256 63376bdfa6623806f73a122648069132814050e2460c6fd70721a542a9e78ef6 SHA512 1963419110a34b826d27b5b34e22ae71906380bc8a2ce130d374c00ad91827fab3781e97aadf417613f042d195ee9e85e50b898befff82190c7e031276903baa WHIRLPOOL 5f86e4a9609e83021e8d73db0a954bb8c964501b7140de1b66efae8f03aad8115b57465f7ac90cbb0f02d0797c53bdec84d5d07303641b3b69a502e4f63d289b
+DIST nsat-1.5.tgz 410603 SHA256 2ece807b3240a6e91ea88fd84c470a87de711c33554b231e071549388cb65114 SHA512 1a5b8e88f7bcacdbe1144a719a2e446c0ea025ad4e5f8c79ccb939083308cd2c1b2c1f3d7ab3b791924d5855994cbc3fded95aa36df23c12fd76fc20341a87d0 WHIRLPOOL 52cd94b75668bb3b7342090ec1ec9949b1e9324aabff4a0b03b251c0933829cd63eeb53877c463b282806896099ccbacaa01c390ef61c4b24e8c6d8e356fb5ff
+EBUILD nsat-1.5-r3.ebuild 1448 SHA256 378d9e538329914a4f572577988e673763e3d154d8228b8e68f61d3c325373ec SHA512 e9fed8fba8257ccafe401a4f16cbc70b9b8cace66342d6cbaadd70d88084fa84dc8a4a54e0b5047a201e159668ab3badf99f38a011f7130368b789043010d9d4 WHIRLPOOL bde059938ec0ae619e7286761aceaf5ab5951c216fe2e845f538f9bc42ebb51ccc6050f77bb043f6f5ead77a3ffb4374cdf5367335ca3df3384838e526b754e6
+EBUILD nsat-1.5-r4.ebuild 1547 SHA256 588a9536ef518aa5def79d94366ecc67f90f1179a33b494152d3b2d032afb783 SHA512 73263ccca5463bc90831b18d67a98e6274d917c2762778cb8de254e061466635b020947359a80eacb413a52d81faeb43e6d5d0ad82fb99acb4d1cbbbcdc561f2 WHIRLPOOL 721b3ff4058ffddfd26fcae6507a76a3ab68c02c4b1111640cc1b1a0d2fecf74b052eca170ba2a78db9e058c570779a91f57d77a07e19fa49d8f45551c472af0
+MISC ChangeLog 2622 SHA256 0d90dd2dedd9f2c12713b7fa966edff8ad94b17fa45ed1c2417acb6e6f3e8da2 SHA512 a46e1b35772f7b270d4c93025dc10f420b205e3d7d7ded7da8eb054b433c1efd69495bcc26b2953b01e0cba99af9f18d2f82ba7748f2821bae453a7e3ec412f3 WHIRLPOOL 164ed425bf826645102952a0edf7acfc2534f2b91f8c35b4a1a6e2c1ff27f0ad039e3917d4915f61e30801fefe9af0a96b500deea2114648c6489a6990671586
+MISC ChangeLog-2015 3998 SHA256 f75a6955e6279f241e262e0fee9361e9419e6453f22284a41d29b5009cf5a7aa SHA512 7dcb73dba87135237423d2c11e0580cc88d96f00ee4d95130de1b55c1fbe6ea47a0a106b396510e623c2d3866a39f8256520e219acbeb2c50dbae63c06bef9d8 WHIRLPOOL 0c2d6b9016dc517797583cc973de6e897918a442f0bf5f3c8e7a67b4d53c35e81476235b38314070e4552fbd43fa65feedbd3ac11b130a69d7718f39418d51d1
+MISC metadata.xml 468 SHA256 d7e7522d2eb250adbc98a65264c6c5357a9820f1718a84510610249994a6c6ec SHA512 54bdd25a484a9b3f2ec4642494f4f8e9433c33f013eadc149a77b0ffc3455579a3598ba323344107143b41ae81e1cef6195dcab5b38c6f093f804e468a650454 WHIRLPOOL 743139eea81ce4311ec612b9624ce2720d4fde08ca6cb85c472067c3ec29addcd6bc1b336995ae0e2eddd3cbc6ad0723e8c9a0ec1d521e7b06e312619d7ce1fe
diff --git a/net-analyzer/nsat/files/nsat-1.5-amd64-compat.patch b/net-analyzer/nsat/files/nsat-1.5-amd64-compat.patch
new file mode 100644
index 000000000000..883ad26cdfaf
--- /dev/null
+++ b/net-analyzer/nsat/files/nsat-1.5-amd64-compat.patch
@@ -0,0 +1,33 @@
+--- a/src/mod/xp_icmp_echo.c
++++ b/src/mod/xp_icmp_echo.c
+@@ -90,7 +90,7 @@
+    fprintf(stderr,"[%d bytes] sent, waiting for reponse.\n", res);
+ #endif
+ 
+-   recv_pack = read_icmp(&res, ICMP_ECHOREPLY, -1);
++   recv_pack = read_icmp((ssize_t *)&res, ICMP_ECHOREPLY, -1);
+ 
+    if (recv_pack == NULL || (unsigned)res < sizeof(ip) + 8) {
+ #ifdef EBUG
+--- a/src/mod/xp_icmp_infr.c
++++ b/src/mod/xp_icmp_infr.c
+@@ -83,7 +83,7 @@
+    fprintf(stderr,"[%d bytes] sent, waiting for reponse.\n", res);
+ #endif
+    
+-   recv_pack = read_icmp(&res, ICMP_IREQREPLY, -1);
++   recv_pack = read_icmp((ssize_t *)&res, ICMP_IREQREPLY, -1);
+ 
+    if (recv_pack == NULL || (unsigned)res < sizeof(ip) + 8) {
+ #ifdef EBUG
+--- a/src/mod/xp_udp_probe.c
++++ b/src/mod/xp_udp_probe.c
+@@ -92,7 +92,7 @@
+ #ifdef EBUG
+    fprintf(stderr,"[%d bytes] sent, waiting for reponse.\n", res);
+ #endif
+-   recv_pack = read_icmp(&res, ICMP_UNREACH, -1);
++   recv_pack = read_icmp((ssize_t *)&res, ICMP_UNREACH, -1);
+ 
+    if (recv_pack == NULL || (unsigned)res < sizeof(ip) + 8) {
+ #ifdef EBUG
diff --git a/net-analyzer/nsat/files/nsat-1.5-configure.patch b/net-analyzer/nsat/files/nsat-1.5-configure.patch
new file mode 100644
index 000000000000..d1bc1f95e6bb
--- /dev/null
+++ b/net-analyzer/nsat/files/nsat-1.5-configure.patch
@@ -0,0 +1,25 @@
+--- a/configure.in
++++ b/configure.in
+@@ -15,7 +15,6 @@
+ else
+     AC_MSG_RESULT(crappy :P)
+ fi
+- LEETCC=$ac_cv_prog_gcc;
+ AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+@@ -45,11 +44,11 @@
+ if test $LEETCC = yes; then
+     CCOPTS='-Wall -O6 -funroll-loops -ansi -fPIC -DLINUX'
+ else
+-    CCOPTS='-DLINUX'
++    CCOPTS="${CFLAGS} -DLINUX"
+ fi
+-    CFLAGS="$CCOPTS"
+-    SMBCFLAGS="-Wall -DLINUX -DNETGROUP -DALLOW_CHANGE_PASSWORD -DFAST_SHARE_MODES -DNO_ASMSIGNALH -DGLIBC2"
++    SMBCFLAGS="${CCOPTS} -Wall -DLINUX -DNETGROUP -DALLOW_CHANGE_PASSWORD -DFAST_SHARE_MODES -DNO_ASMSIGNALH -DGLIBC2"
+     SMBLFLAGS="-lnsl -lcrypt"
++    CFLAGS="${CCOPTS} -Wall -ansi -fPIC -DLINUX"
+  ;;
+  *Darwin* | *Mac* | *MAC*)
+   AC_MSG_RESULT(found MAC OS X)
diff --git a/net-analyzer/nsat/files/nsat-1.5-libtirpc.patch b/net-analyzer/nsat/files/nsat-1.5-libtirpc.patch
new file mode 100644
index 000000000000..c91afd3a78fa
--- /dev/null
+++ b/net-analyzer/nsat/files/nsat-1.5-libtirpc.patch
@@ -0,0 +1,33 @@
+--- a/configure.in
++++ b/configure.in
+@@ -195,6 +195,8 @@
+ AC_FUNC_VPRINTF
+ AC_CHECK_FUNCS(select socket strdup strstr random srandom snprintf setsockopt initstate gettimeofday strerror)
+ 
++PKG_CHECK_MODULES([TIRPC], [libtirpc], [], [AC_MSG_NOTICE([Using glibc rpc support])])
++
+ AC_OUTPUT(Makefile tools/Makefile src/Makefile src/mod/Makefile src/smb/Makefile src/libmix++/Makefile src/libmix++/mix/net.h)
+ 
+ AC_MSG_RESULT()
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -36,7 +36,7 @@
+ 	@cd mod ; $(MAKE) modobj
+ 
+ ../nsat: modobj
+-	${GPP} ${CFLAGS} ${LDFLAGS} ${OBJ} ${MODOBJ} ${MIXOBJ} -o ../nsat ${CLIB}
++	${GPP} ${CFLAGS} ${LDFLAGS} ${OBJ} ${MODOBJ} ${MIXOBJ} -o ../nsat ${CLIB} @TIRPC_LIBS@
+ 
+ pidalloc.o:
+ 	${GPP} ${CFLAGS} -c pidalloc.cpp
+--- a/src/mod/Makefile.in
++++ b/src/mod/Makefile.in
+@@ -35,7 +35,7 @@
+ 	${GPP} ${CFLAGS} -c osscan.cpp
+ 
+ rpc.o:
+-	${GPP} ${CFLAGS} -c rpc.cpp
++	${GPP} ${CFLAGS} @TIRPC_CFLAGS@ -c rpc.cpp
+ 
+ www.o:
+ 	${GPP} ${CFLAGS} -c www.cpp
diff --git a/net-analyzer/nsat/files/nsat-1.5-lvalue-gcc4.patch b/net-analyzer/nsat/files/nsat-1.5-lvalue-gcc4.patch
new file mode 100644
index 000000000000..b4020b3f47ed
--- /dev/null
+++ b/net-analyzer/nsat/files/nsat-1.5-lvalue-gcc4.patch
@@ -0,0 +1,11 @@
+--- a/src/smb/ADMsmb.c
++++ b/src/smb/ADMsmb.c
+@@ -123,7 +123,7 @@
+     {
+       usleep (100000);
+ 
+-      if (recvfrom (socket_client, buffer2, sizeof (buffer2), 0, (struct sockaddr *) &sin_dst, &(int) longueur) != -1)
++      if (recvfrom (socket_client, buffer2, sizeof (buffer2), 0, (struct sockaddr *) &sin_dst, (int *) &longueur) != -1)
+ 	{
+ 
+ 	  if (nmb2->rep_num != 0)
diff --git a/net-analyzer/nsat/files/nsat-1.5-misc.patch b/net-analyzer/nsat/files/nsat-1.5-misc.patch
new file mode 100644
index 000000000000..f94fd24527b5
--- /dev/null
+++ b/net-analyzer/nsat/files/nsat-1.5-misc.patch
@@ -0,0 +1,108 @@
+* link against dev-libs/libmix
+* parallel $(MAKE)
+* usr/local/ -> usr/
+* LDFLAGS
+* verbose CC
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -7,14 +7,14 @@
+ #    #  ####  #    #   #
+ 
+ # Change me if you want...
+-INSTALL_PATH=/usr/local/bin
+-MAN_PATH=/usr/local/man
++INSTALL_PATH=/usr/bin
++MAN_PATH=/usr/man
+ 
+ # If you change this, change src/lang.h as well
+-DATA_PATH=/usr/local/share/nsat
++DATA_PATH=/usr/share/nsat
+ 
+ all:
+-	@cd src;make all
++	@cd src; $(MAKE) all
+ 	@echo ""
+ 	@echo " Compiling is done!"
+ 	@echo " You can now 'make install' to put the files in place."
+@@ -58,5 +58,5 @@
+ doc/nsat.8:
+ 	@echo "Hmm, can't find manpage -- skipping :/"
+ 
+-nsat:
+-	@make all
++nsat: src
++	$(MAKE) all
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -21,22 +21,22 @@
+   
+ MIXOBJ = libmix++/net/net.o libmix++/misc/misc.o libmix++/misc/exclude.o
+ 
+-all:	../smb-ns $(OBJ) modobj mixobj ../nsat
++all:	../smb-ns $(OBJ) modobj ../nsat
+ 
+ ../smb-ns:
+-	@cd smb ; make smb
++	@cd smb ; $(MAKE) smb
+ 
+-mixobj:	libmix++/Makefile
+-	@cd libmix++ ; make
++#mixobj:	libmix++/Makefile
++#	@cd libmix++ ; $(MAKE)
+ 
+-libmix++/Makefile:
+-	@cd .. ; ./configure
++#libmix++/Makefile:
++#	@cd .. ; ./configure
+ 
+ modobj:
+-	@cd mod ; make modobj
++	@cd mod ; $(MAKE) modobj
+ 
+-../nsat:
+-	${GPP} ${CFLAGS} ${OBJ} ${MODOBJ} ${MIXOBJ} -o ../nsat ${CLIB}
++../nsat: modobj
++	${GPP} ${CFLAGS} ${LDFLAGS} ${OBJ} ${MODOBJ} ${MIXOBJ} -o ../nsat ${CLIB}
+ 
+ pidalloc.o:
+ 	${GPP} ${CFLAGS} -c pidalloc.cpp
+@@ -63,11 +63,11 @@
+ 	${GPP} ${CFLAGS} -c Logging.cpp
+ 
+ clean:
+-	cd mod && make clean
++	cd mod && $(MAKE) clean
+ 	rm -f core *.o ../*.log *.log *~ ../nsat ../.nsrc ../.nspid
+ 
+ distclean: clean
+-	@cd mod ; make clean
+-	@cd smb ; make clean
+-	@cd libmix++ ; make clean
++	@cd mod ; $(MAKE) clean
++	@cd smb ; $(MAKE) clean
++	@cd libmix++ ; $(MAKE) clean
+ 	rm -f mod/Makefile Makefile
+--- a/src/smb/Makefile.in
++++ b/src/smb/Makefile.in
+@@ -11,7 +11,6 @@
+ LIBDIR = $(BASEDIR)/lib
+ VARDIR = $(BASEDIR)/var
+ INSTALLPERMS = 0755
+-FLAGS1 = -O3
+ LIBS1 = 
+ SHELL = /bin/sh
+ srcdir = ./
+@@ -53,10 +52,10 @@
+ .SUFFIXES: .c .o .h
+ 
+ .c.o: $(INCLUDES)
+-	@$(CC) $(CFLAGS) -c $(srcdir)$*.c -o $(srcdir)$*.o
++	$(CC) $(CFLAGS) $(LDFLAGS) -c $(srcdir)$*.c -o $(srcdir)$*.o
+ 
+ smb: msg $(CLIENT_OBJ) $(ARCFOUR_OBJ)
+-	@$(CC) $(CFLAGS) -o $(BINARY) $(CLIENT_OBJ) $(ARCFOUR_OBJ) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $(BINARY) $(CLIENT_OBJ) $(ARCFOUR_OBJ) $(LIBS)
+ 	@echo done
+ 
+ msg:
diff --git a/net-analyzer/nsat/files/nsat-1.5-strip.patch b/net-analyzer/nsat/files/nsat-1.5-strip.patch
new file mode 100644
index 000000000000..99fe77633ad8
--- /dev/null
+++ b/net-analyzer/nsat/files/nsat-1.5-strip.patch
@@ -0,0 +1,10 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -37,7 +37,6 @@
+ 
+ ../nsat:
+ 	${GPP} ${CFLAGS} ${OBJ} ${MODOBJ} ${MIXOBJ} -o ../nsat ${CLIB}
+-	strip ../nsat
+ 
+ pidalloc.o:
+ 	${GPP} ${CFLAGS} -c pidalloc.cpp
diff --git a/net-analyzer/nsat/files/nsat-1.5-va_list.patch b/net-analyzer/nsat/files/nsat-1.5-va_list.patch
new file mode 100644
index 000000000000..46bdd3bcc121
--- /dev/null
+++ b/net-analyzer/nsat/files/nsat-1.5-va_list.patch
@@ -0,0 +1,27 @@
+--- a/src/Logging.cpp
++++ b/src/Logging.cpp
+@@ -89,16 +89,17 @@
+  if((pi.Foreground) && (out!=NULL))
+   fprintf(stdout, "%s %s ", out, hn);
+ 
+- va_start(va, fmt);
+-
+- if(fp!=NULL)
++ if(fp!=NULL) {
++  va_start(va, fmt);
+   vfprintf(fp, fmt, va);
++  va_end(va);
++ }
+ 
+- if((pi.Foreground) && (out!=NULL))
++ if((pi.Foreground) && (out!=NULL)) {
++  va_start(va, fmt);
+   vfprintf(stdout, fmt, va);
+-
+- va_end(va);
+-
++  va_end(va);
++ }
+  if(fp!=NULL)
+   fprintf(fp, "\n");
+ 
diff --git a/net-analyzer/nsat/metadata.xml b/net-analyzer/nsat/metadata.xml
new file mode 100644
index 000000000000..0b7d0914b40c
--- /dev/null
+++ b/net-analyzer/nsat/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>Network Security Analysis Tool, an application-level network security scanner</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">nsat</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/nsat/nsat-1.5-r3.ebuild b/net-analyzer/nsat/nsat-1.5-r3.ebuild
new file mode 100644
index 000000000000..67ce3ebbb2ba
--- /dev/null
+++ b/net-analyzer/nsat/nsat-1.5-r3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="Network Security Analysis Tool, an application-level network security scanner"
+HOMEPAGE="http://nsat.sourceforge.net/"
+SRC_URI="mirror://sourceforge/nsat/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE="X"
+
+RDEPEND="
+	X? (
+		x11-libs/libX11
+		dev-lang/tk
+	)
+	dev-libs/libmix
+	net-libs/libpcap
+"
+DEPEND="$RDEPEND"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-configure.patch
+	epatch "${FILESDIR}"/${P}-lvalue-gcc4.patch
+	epatch "${FILESDIR}"/${P}-strip.patch
+	epatch "${FILESDIR}"/${P}-misc.patch
+	epatch "${FILESDIR}"/${P}-va_list.patch
+	use amd64 && epatch "${FILESDIR}"/${P}-amd64-compat.patch
+
+	sed -i \
+		-e "s:^#CGIFile /usr/local/share/nsat/nsat.cgi$:#CGIFile /usr/share/nsat/nsat.cgi:g" \
+		nsat.conf || die
+	sed -i -e "s:/usr/local:/usr:g" tools/xnsat || die
+	sed -i \
+		-e "s:/usr/local/share/nsat/nsat.conf:/etc/nsat/nsat.conf:g" \
+		-e "s:/usr/local/share/nsat/nsat.cgi:/usr/share/nsat/nsat.cgi:g" \
+		src/lang.h || die
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	econf $(use_with X x)
+}
+
+src_compile() {
+	emake MIXOBJ=-lmix++
+}
+
+src_install () {
+	dobin nsat smb-ns
+	use X && dobin tools/xnsat
+
+	insinto /usr/share/nsat
+	doins nsat.cgi
+
+	insinto /etc/nsat
+	doins nsat.conf
+
+	dodoc README doc/CHANGES
+	doman doc/nsat.8
+}
diff --git a/net-analyzer/nsat/nsat-1.5-r4.ebuild b/net-analyzer/nsat/nsat-1.5-r4.ebuild
new file mode 100644
index 000000000000..52381d75fcfb
--- /dev/null
+++ b/net-analyzer/nsat/nsat-1.5-r4.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Network Security Analysis Tool, an application-level network security scanner"
+HOMEPAGE="http://nsat.sourceforge.net/"
+SRC_URI="mirror://sourceforge/nsat/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X"
+
+RDEPEND="
+	dev-libs/libmix
+	net-libs/libpcap
+	X? (
+		dev-lang/tk:*
+		x11-libs/libX11
+	)
+	|| (	<sys-libs/glibc-2.26
+		(
+			net-libs/libnsl
+			net-libs/libtirpc
+			net-libs/rpcsvc-proto
+		)
+	)
+"
+DEPEND="$RDEPEND"
+S="${WORKDIR}/${PN}"
+PATCHES=(
+	"${FILESDIR}"/${P}-configure.patch
+	"${FILESDIR}"/${P}-lvalue-gcc4.patch
+	"${FILESDIR}"/${P}-strip.patch
+	"${FILESDIR}"/${P}-misc.patch
+	"${FILESDIR}"/${P}-va_list.patch
+	"${FILESDIR}"/${P}-libtirpc.patch
+	"${FILESDIR}"/${P}-amd64-compat.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s:^#CGIFile /usr/local/share/nsat/nsat.cgi$:#CGIFile /usr/share/nsat/nsat.cgi:g" \
+		nsat.conf || die
+	sed -i -e "s:/usr/local:/usr:g" tools/xnsat || die
+	sed -i \
+		-e "s:/usr/local/share/nsat/nsat.conf:/etc/nsat/nsat.conf:g" \
+		-e "s:/usr/local/share/nsat/nsat.cgi:/usr/share/nsat/nsat.cgi:g" \
+		src/lang.h || die
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	econf $(use_with X x)
+}
+
+src_compile() {
+	emake MIXOBJ=-lmix++
+}
+
+src_install () {
+	dobin nsat smb-ns
+	use X && dobin tools/xnsat
+
+	insinto /usr/share/nsat
+	doins nsat.cgi
+
+	insinto /etc/nsat
+	doins nsat.conf
+
+	dodoc README doc/CHANGES
+	doman doc/nsat.8
+}
diff --git a/net-analyzer/nsca/Manifest b/net-analyzer/nsca/Manifest
new file mode 100644
index 000000000000..f0a8cb12d920
--- /dev/null
+++ b/net-analyzer/nsca/Manifest
@@ -0,0 +1,7 @@
+AUX nsca.conf 219 SHA256 f455eb68f207b7217026c2a5bb9e562956f3203dd1f3923f1bd4370f119485df SHA512 c7dda1f94611e028b52ae6bf330db1415b18a88590a8a7c54d1f862aaa326751b39e88380cd24217aab11f32ef5842c6b1d4a0333ca0310a5be0e94c573165b2 WHIRLPOOL 27abdd1e5e50e20490fac87b01e0e4da878733ed12cc86c60ee06e625e91987dcf63632625480bc551412945b2e726421e9fdf6191217dd705c5a050919e65dc
+AUX nsca.init 645 SHA256 c54d4fd09b5d458ee96eebe8f0e47081984329291fd44a7fe013cac7307fa225 SHA512 88fab799a388dc6f10a2eac94b1ee5d1a76687c408958cc8cf5c22219d10b439d0c9c64a9ae9f34211e19eccb95cb2417e4b972c5549d23ef4bdd5493cdaf224 WHIRLPOOL 58b39783bce1cd943ad953f305945bb33284324ea4b4a9b0dd1eea136ba3b8c6cabf6c70ebfb5a83fe263dcadceceb97e9430505b9fa3e84e467327a1d3991d1
+DIST nsca-2.7.2.tar.gz 104953 SHA256 fb41e3b536735235056643fb12187355c6561b9148996c093e8faddd4fced571 SHA512 f84cac3613bbd0ded4ec700c1dadac71ed075544d0f48281a70946a67792b7f4bcdf6dc3bd5ccf1293cc6a0277638e0f034c33064bf9c05696b4f015e7f15010 WHIRLPOOL 77daad5cef0434e243fab3eff56b4df8b91abc15a166068f5398667483fb4de04ebdeeda6c340ef19ae17b5da5264e2b8cfe8e958866fc1f35ef504df2c4340c
+EBUILD nsca-2.7.2-r103.ebuild 2123 SHA256 e85868c90c9819c69c4d7a7be8127d71d71443e149776c542d4aded0456e27ea SHA512 b1588edc660fa3909911d39a591631ab099863a823869facfa6bca35456a9faafee98718919686d0c62fc06cf62b87ce25a3e9a7fc9aceafbd1a425479bb8f6e WHIRLPOOL 5b21f0458ce4586ef511cd1c3357ce4ab6dfebfbc6f81f0fcc4dd4490e22ae6e7350f5683533dc4b02fed83d1fde2ca3ed99202045951b4912c25fe3f7abeeaa
+MISC ChangeLog 2732 SHA256 c85e4db69cc77bfd95b90c7df70f45ff066b47fc67eebf92a563b69cf6408839 SHA512 e9b014f582da4dc565831fbd5fd08f4520762b56a84003d3d3aa7159eab30b443f489e94a80d5fdb7bed482eb1362b488b87b3513b522823b5eca79d832aaf48 WHIRLPOOL f4adc0a68df4354c8d6e3de699df24496cd045699fce51f5c78be887818aa1f06aa25fa92543adab52c134a975eabea5cb5f125c3ca21c7c43efb02d26734bc6
+MISC ChangeLog-2015 7709 SHA256 692e213b97797d54ff170963168efa3433dd70cac876470c8d0ad86096d2e874 SHA512 fec8b5665fdd919a8bc3ff5a5adc4b35a2eb8b22a8791ee4d362e59c8dd2edea729837abdc65ba310f433167af5600913a0f11840d18f8d1350f279c7e3bc70d WHIRLPOOL 46eed89dafd28ea730196a0e0934b535998bb19e2d10f6e3bdc18197e7228a57d4e8ad26bf7f4ac341ea24103f2403ab348f226eb877e0d6103b3f88423dec23
+MISC metadata.xml 1732 SHA256 b8a7749e3dabbe6e4248140a2d08f93acbad73386440bae1b4e403f725384d31 SHA512 1e24a8adef9fb860b05eed48d741e7b2b981ca826300f14ee3c2b7ddd6a497fbc3318a31a9f284eb11a7f216d71ad567d4a4438e03876c83985bd8683b525a1b WHIRLPOOL 396e4566bedbd890d7a566e51718593ed5e009dbcd48a3449477f24c70c31d040d62a7b44a75d7742dcf4f8125636d2b644d29302260a4eb4f95c6ca8b0ab834
diff --git a/net-analyzer/nsca/files/nsca.conf b/net-analyzer/nsca/files/nsca.conf
new file mode 100644
index 000000000000..987cd10ebf58
--- /dev/null
+++ b/net-analyzer/nsca/files/nsca.conf
@@ -0,0 +1,5 @@
+# Choose the configuration file to use; the pre-defined configurations
+# for Nagios and Icinga are available in their respective directories:
+#  /etc/nagios/nsca.cfg
+#  /etc/icinga/nsca.cfg
+CFGFILE=/etc/nagios/nsca.cfg
diff --git a/net-analyzer/nsca/files/nsca.init b/net-analyzer/nsca/files/nsca.init
new file mode 100644
index 000000000000..cd47bb64e95c
--- /dev/null
+++ b/net-analyzer/nsca/files/nsca.init
@@ -0,0 +1,33 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+: ${CFGFILE:=/etc/nagios/nsca.cfg}
+
+get_config() {
+    [ -f ${CFGFILE} ] || return 1
+
+    sed -n -e 's:^[ \t]*'$1'=\([^#]\+\).*:\1:p' \
+	${CFGFILE}
+}
+
+extra_started_commands="reload"
+
+command=/usr/libexec/${SVCNAME}
+command_args="-c ${CFGFILE} --daemon"
+pidfile=$(get_config pid_file)
+
+depend() {
+    config ${CFGFILE}
+
+    case $(get_config nsca_user) in
+	icinga) need icinga ;;
+	nagios) need nagios ;;
+    esac
+}
+
+reload() {
+    ebegin "Reloading ${SVCNAME}"
+    kill -HUP `cat $(get_config pid_file)`
+    eend $?
+}
diff --git a/net-analyzer/nsca/metadata.xml b/net-analyzer/nsca/metadata.xml
new file mode 100644
index 000000000000..6d5b1ccd3d20
--- /dev/null
+++ b/net-analyzer/nsca/metadata.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    This program is designed to accept passive service check results
+    from clients that use the send_nsca utility (which is included in
+    this package) and pass them along to the Nagios process by using
+    the external command interface. The program can either be run as a
+    standalone daemon or as a service under inetd. If you have
+    libmcrypt installed on your systems, you can choose from multiple
+    crypto algorithms (DES, 3DES, CAST, xTEA, Twofish, LOKI97,
+    RJINDAEL, SERPENT, GOST, SAFER/SAFER+, etc.) for encrypting the
+    traffic between the client and the server.  Encryption is
+    important in this addon, as it prevents unauthorized users from
+    sending bogus check results to Nagios. Read the included SECURITY
+    document for more information.
+
+    This package provides the send_nsca utility running on the client.
+  </longdescription>
+  <use>
+    <flag name="crypt">
+      Build support for crypted communication with nsca, through
+      <pkg>dev-libs/libmcrypt</pkg>. It's recommended not to disable this
+      flag unless all the communication will be handled in an
+      absolutely safe environment.
+    </flag>
+    <flag name="minimal">
+      Only build and install the send_nsca command and not the
+      daemon. This allows a very minimal install with no overhead when
+      setting up a node.
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">nagios</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/nsca/nsca-2.7.2-r103.ebuild b/net-analyzer/nsca/nsca-2.7.2-r103.ebuild
new file mode 100644
index 000000000000..1f25434494ee
--- /dev/null
+++ b/net-analyzer/nsca/nsca-2.7.2-r103.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit multilib user eutils
+
+DESCRIPTION="Nagios Service Check Acceptor"
+HOMEPAGE="http://www.nagios.org/"
+SRC_URI="mirror://sourceforge/nagios/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+IUSE="tcpd +crypt minimal"
+
+DEPEND="crypt? ( >=dev-libs/libmcrypt-2.5.1-r4 )
+	!minimal? ( tcpd? ( sys-apps/tcp-wrappers ) )"
+
+RDEPEND="${DEPEND}
+	!minimal? ( || ( net-analyzer/icinga net-analyzer/nagios ) )
+	sys-apps/openrc"
+
+pkg_setup() {
+	if ! use minimal; then
+		enewgroup nagios
+		enewgroup icinga
+		enewuser nagios -1 /bin/bash /var/nagios/home nagios
+		enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
+	fi
+}
+
+src_configure() {
+	use tcpd || export ac_cv_lib_wrap_main=no
+	use crypt || export ac_cv_path_LIBMCRYPT_CONFIG=/bin/false
+
+	econf \
+		--localstatedir=/var/nagios \
+		--sysconfdir=/etc/nagios \
+		--with-nsca-user=nagios \
+		--with-nsca-grp=nagios
+}
+
+src_compile() {
+	emake -C src send_nsca $(use minimal || echo nsca)
+
+	# prepare the alternative configuration file
+	sed \
+		-e '/nsca_\(user\|group\)/s:nagios:icinga:' \
+		-e '/nsca_chroot/s:=.*:=/var/lib/icinga/rw:' \
+		-e '/\(command\|alternate_dump\)_file/s:/var/nagios:/var/lib/icinga:' \
+		"${S}"/sample-config/nsca.cfg > "${T}"/nsca.icinga.cfg
+}
+
+src_install() {
+	dodoc LEGAL Changelog README SECURITY
+
+	dobin src/send_nsca
+
+	insinto /etc/nagios
+	doins "${S}"/sample-config/send_nsca.cfg
+
+	if ! use minimal; then
+		exeinto /usr/libexec
+		doexe src/nsca
+
+		newinitd "${FILESDIR}"/nsca.init nsca
+		newconfd "${FILESDIR}"/nsca.conf nsca
+
+		insinto /etc/nagios
+		doins "${S}"/sample-config/nsca.cfg
+
+		insinto /etc/icinga
+		newins "${T}"/nsca.icinga.cfg nsca.cfg
+	fi
+}
+
+pkg_postinst() {
+	if ! use minimal; then
+		elog "If you are using the nsca daemon, remember to edit"
+		elog "the config file /etc/nagios/nsca.cfg"
+		elog ""
+		elog "If you intend to use nsca with Icinga, change the"
+		elog "configuration file path in /etc/conf.d/nsca so that"
+		elog "it will default to the correct paths and users."
+	fi
+}
diff --git a/net-analyzer/nstats/Manifest b/net-analyzer/nstats/Manifest
new file mode 100644
index 000000000000..a9a1a1956cd8
--- /dev/null
+++ b/net-analyzer/nstats/Manifest
@@ -0,0 +1,8 @@
+AUX nstats-0.4-glibc24.patch 4546 SHA256 415e5a0d30c7c62086764c4b8745753f98626a47a95ce286911a91246de758ee SHA512 c6ffc36d13a5ad22ecf0333fddb9643e9dcf5b22b337e351f11a133caf647f93511a08cedee2c72f886c65a70f64409c1a86135933e8802ccfdcea178f61e03a WHIRLPOOL d139b06ccc2acc1b39876ffa404faf9b8daf43bea7c52ab3b7efad57b5df1f5c798aeaa7c6dd00cb824a3893c6558252a43502fd93354644e8b74c49ebc606e7
+AUX nstats-0.4-makefile.patch 611 SHA256 8077cfdb1ac89e6afe84589b951bc65eed4e7675260fdf1a07fa2d060832348d SHA512 e47cffad1562f767556baf5086db8039f7b504ca4e4f1ebe458d4ce9b9a65cde5f4d7131e4ff8992379ca3db6ffcf30c5e8499a2993e29874f50b00be2d9b8af WHIRLPOOL 604a33700ec369feaccb40fb6e211ca3dba9d09f9af35bd11e4c4f113be47d85e908949acd38fa4b8389d781a85554012be09c008704b5e81ed8967207289146
+AUX nstats-0.4-tinfo.patch 469 SHA256 bfa50b7a044eadc01023c64196f836776ffa1dfbbfc3f7a457f64bd95d94ed7f SHA512 e7c99f91adacd33222f1f9c4fa1b0b342dfc8309a459b9239eb099f1a79972a3065d76560df0b0455c20f994c343f43b5be55de0464031f064c03b4e1dfba843 WHIRLPOOL cee53bc28a1986d5dd8d0c285ccd831a32c4f85c95aab4e99e3405110c64c31fd3367d4d59cbfa81b94e0fe430bed395df8e90a6a6f67bc60e3c405ca4b680c9
+DIST nstats-0.4.tar.gz 71526 SHA256 ab36626ca06e734800a31ec64f76bf1dc0d9e579f3542155a7ce89030f74aaf4 SHA512 89e88eb0f707cb125fbf02bef93a0bbbd1409f3516d4b333e06d0a3ffe42f5e8d2b655fa6c7a0c63b7d71c7a2f74f6207e5ed158f7d102f6d47ac6e436da3315 WHIRLPOOL 87258661fa288164f31645109783737d124d899c005fbe18f3fc65d227900da867668ff8e1f63b339c628e178d778a0efb2f4a8e93de5dfa9e6109af62beb697
+EBUILD nstats-0.4-r2.ebuild 666 SHA256 8d22c62500d70151edd21035aa98b1894600a78205c3d1501cb298f1e1057c15 SHA512 638b36ecf53a9f6f7bf906af617f98e71719d61b6b00260873220da5d8a6bbaea164541492f2b46a7d06399dba90a925b22de75d1d9ed48fc51eb26a408c1e82 WHIRLPOOL aa18456f7ffdc68ecb6b84186a9c21fd7ed276545221b404caa6bfd290757bab28b0900a79071b9800a9bacbd7a37972f8dedf1616864d6479eb6744cf215894
+MISC ChangeLog 2530 SHA256 a7f4253e18e1844444044906281a4ce67daa2b65cde3fb1ada53a28e1a9ae45b SHA512 5b5ddd362b72830c0db4cb2ea6eeeeffb0a1af9a1df203bb161899a77d1b73e85b7e21557f5775b401905c83911a582f3d4445c5d0ed9a64820f469894ec77ce WHIRLPOOL 9549a0efac36ccd2ae653b8b4590fcc32aed2b4f52095c29e5c1786a4feee22e1523d01f3e8e1f77c6915fc9371bd4729431feb8d63edeb5347eaa9b77863ffd
+MISC ChangeLog-2015 2857 SHA256 6190e716d393dbcf90a664db5659775655d4bc3a892ee7d055e96282c39802b8 SHA512 942c9e7bdcd4531f394fc18c8b719bcfd424e86cfb3d2067ed9665e6eede56704a8359013cedfc7525a05ff775b6588d241ab728bbec3c64b2e72cfd09bbd049 WHIRLPOOL eedff3f0c175fda50db96d475f4e5b502eaa55e685e7e64596c2161b2b7ddf030a94c4a14232a2e2458524fd09d71a2e927ae816710a2e7688daf827ed835147
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/nstats/files/nstats-0.4-glibc24.patch b/net-analyzer/nstats/files/nstats-0.4-glibc24.patch
new file mode 100644
index 000000000000..597c0cd24285
--- /dev/null
+++ b/net-analyzer/nstats/files/nstats-0.4-glibc24.patch
@@ -0,0 +1,102 @@
+--- a/src/packet.c
++++ b/src/packet.c
+@@ -148,9 +148,9 @@
+                     stats.ip.ipv6.icmp.dst_unreach.s_admin += hdr->len;
+                     break;
+ 
+-                case ICMP6_DST_UNREACH_NOTNEIGHBOR:
+-                    stats.ip.ipv6.icmp.dst_unreach.notneighbor++;
+-                    stats.ip.ipv6.icmp.dst_unreach.s_notneighbor += hdr->len;
++                case ICMP6_DST_UNREACH_BEYONDSCOPE:
++                    stats.ip.ipv6.icmp.dst_unreach.beyondscope++;
++                    stats.ip.ipv6.icmp.dst_unreach.s_beyondscope += hdr->len;
+                     break;
+ 
+                 case ICMP6_DST_UNREACH_ADDR:
+@@ -219,21 +219,6 @@
+             stats.ip.ipv6.icmp.s_echo_reply += hdr->len;
+             break;
+ 
+-        case ICMP6_MEMBERSHIP_QUERY:
+-            stats.ip.ipv6.icmp.mbrship_query++;
+-            stats.ip.ipv6.icmp.s_mbrship_query += hdr->len;
+-            break;
+-
+-        case ICMP6_MEMBERSHIP_REPORT:
+-            stats.ip.ipv6.icmp.mbrship_report++;
+-            stats.ip.ipv6.icmp.s_mbrship_report += hdr->len;
+-            break;
+-
+-        case ICMP6_MEMBERSHIP_REDUCTION:
+-            stats.ip.ipv6.icmp.mbrship_reduction++;
+-            stats.ip.ipv6.icmp.s_mbrship_reduction += hdr->len;
+-            break;
+-
+         case ND_ROUTER_SOLICIT:
+             stats.ip.ipv6.icmp.nd_router_solicit++;
+             stats.ip.ipv6.icmp.s_nd_router_solicit += hdr->len;
+--- a/src/stats.c
++++ b/src/stats.c
+@@ -316,15 +316,6 @@
+     print_line("Echo Reply:", ICMP6.echo_reply, ICMP6.cnt,
+             ICMP6.s_echo_reply, ICMP6.bs, .0);
+     NEXT_ROW;
+-    print_line("MbrShip Query:", ICMP6.mbrship_query, ICMP6.cnt,
+-            ICMP6.s_mbrship_query, ICMP6.bs, .0);
+-    NEXT_ROW;
+-    print_line("MbrShip Report:", ICMP6.mbrship_report, ICMP6.cnt,
+-            ICMP6.s_mbrship_report, ICMP6.bs, .0);
+-    NEXT_ROW;
+-    print_line("MbrShip Reduct.:", ICMP6.mbrship_reduction, ICMP6.cnt,
+-            ICMP6.s_mbrship_reduction, ICMP6.bs, .0);
+-    NEXT_ROW;
+     print_line("ND Rtr Solicit:", ICMP6.nd_router_solicit, ICMP6.cnt,
+             ICMP6.s_nd_router_solicit, ICMP6.bs, .0);
+     NEXT_ROW;
+--- a/src/stats.h
++++ b/src/stats.h
+@@ -233,7 +233,7 @@
+ 
+                     cnt_t noroute;     cnt_t s_noroute;
+                     cnt_t admin;       cnt_t s_admin;
+-                    cnt_t notneighbor; cnt_t s_notneighbor;
++                    cnt_t beyondscope; cnt_t s_beyondscope;
+                     cnt_t addr;        cnt_t s_addr;
+                     cnt_t noport;      cnt_t s_noport;
+ 
+@@ -265,9 +265,6 @@
+                 cnt_t pkt_too_big;         cnt_t s_pkt_too_big;
+                 cnt_t echo_request;        cnt_t s_echo_request;
+                 cnt_t echo_reply;          cnt_t s_echo_reply;
+-                cnt_t mbrship_query;       cnt_t s_mbrship_query;
+-                cnt_t mbrship_report;      cnt_t s_mbrship_report;
+-                cnt_t mbrship_reduction;   cnt_t s_mbrship_reduction;
+                 cnt_t nd_router_solicit;   cnt_t s_nd_router_solicit;
+                 cnt_t nd_router_advert;    cnt_t s_nd_router_advert;
+                 cnt_t nd_neighbor_solicit; cnt_t s_nd_neighbor_solicit;
+--- a/src/nstats.c
++++ b/src/nstats.c
+@@ -528,12 +528,6 @@
+                 ICMP6.s_echo_request, ICMP6.bs);
+         print_line("Echo Reply:", ICMP6.echo_reply, ICMP6.cnt,
+                 ICMP6.s_echo_reply, ICMP6.bs);
+-        print_line("MbrShip Query:", ICMP6.mbrship_query, ICMP6.cnt,
+-                ICMP6.s_mbrship_query, ICMP6.bs);
+-        print_line("MbrShip Report:", ICMP6.mbrship_report, ICMP6.cnt,
+-                ICMP6.s_mbrship_report, ICMP6.bs);
+-        print_line("MbrShip Reduct.:", ICMP6.mbrship_reduction, ICMP6.cnt,
+-                ICMP6.s_mbrship_reduction, ICMP6.bs);
+         print_line("ND Rtr Solicit:", ICMP6.nd_router_solicit, ICMP6.cnt,
+                 ICMP6.s_nd_router_solicit, ICMP6.bs);
+         print_line("ND Rtr Advert:", ICMP6.nd_router_advert, ICMP6.cnt,
+@@ -553,8 +547,8 @@
+                 DESTU6.s_noroute, DESTU6.bs);
+         print_line("Admin:", DESTU6.admin, DESTU6.cnt,
+                 DESTU6.s_admin, DESTU6.bs);
+-        print_line("Not Neighbor:", DESTU6.notneighbor, DESTU6.cnt,
+-                DESTU6.s_notneighbor, DESTU6.bs);
++        print_line("Beyond Scope:", DESTU6.beyondscope, DESTU6.cnt,
++                DESTU6.s_beyondscope, DESTU6.bs);
+         print_line("Addr:", DESTU6.addr, DESTU6.cnt,
+                 DESTU6.s_addr, DESTU6.bs);
+         print_line("No Port:", DESTU6.noport, DESTU6.cnt,
diff --git a/net-analyzer/nstats/files/nstats-0.4-makefile.patch b/net-analyzer/nstats/files/nstats-0.4-makefile.patch
new file mode 100644
index 000000000000..6c4577e333f6
--- /dev/null
+++ b/net-analyzer/nstats/files/nstats-0.4-makefile.patch
@@ -0,0 +1,17 @@
+# rename *mon to *mon.nstats to avoid conflict with
+# net-analyzer/bmon, sys-cluster/ceph and sys-process/nmon
+# bug #364685
+
+--- a/Makefile
++++ b/Makefile
+@@ -53,7 +53,7 @@
+ 	mkdir -p $(DESTDIR)$(prefix)/bin/
+ 	mkdir -p $(DESTDIR)$(mandir)/man8/
+ 	install nstats $(DESTDIR)$(prefix)/bin/
+-	install bmon $(DESTDIR)$(prefix)/bin/
+-	install cmon $(DESTDIR)$(prefix)/bin/
+-	install nmon $(DESTDIR)$(prefix)/bin/
++	install bmon $(DESTDIR)$(prefix)/bin/bmon.nstats
++	install cmon $(DESTDIR)$(prefix)/bin/cmon.nstats
++	install nmon $(DESTDIR)$(prefix)/bin/nmon.nstats
+ 	install man/nstats.8 $(DESTDIR)$(mandir)/man8/
diff --git a/net-analyzer/nstats/files/nstats-0.4-tinfo.patch b/net-analyzer/nstats/files/nstats-0.4-tinfo.patch
new file mode 100644
index 000000000000..ce62c8100f9b
--- /dev/null
+++ b/net-analyzer/nstats/files/nstats-0.4-tinfo.patch
@@ -0,0 +1,18 @@
+--- a/configure.in
++++ b/configure.in
+@@ -15,11 +15,12 @@
+ 
+ AC_TYPE_SIGNAL
+ 
++PKG_CHECK_MODULES(ncurses,ncurses,,AC_MSG_ERROR([ncurses is needed]))
+ 
+ AC_CHECK_LIB(ncurses,initscr,[
+-    NMON_LIB="${NMON_LIB} -lncurses"
+-    BMON_LIB="${BMON_LIB} -lncurses"
+-    CMON_LIB="${CMON_LIB} -lncurses"
++    NMON_LIB="${NMON_LIB} $ncurses_LIBS"
++    BMON_LIB="${BMON_LIB} $ncurses_LIBS"
++    CMON_LIB="${CMON_LIB} $ncurses_LIBS"
+ ],[
+     echo
+     echo "Missing dependency"
diff --git a/net-analyzer/nstats/metadata.xml b/net-analyzer/nstats/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/nstats/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/nstats/nstats-0.4-r2.ebuild b/net-analyzer/nstats/nstats-0.4-r2.ebuild
new file mode 100644
index 000000000000..7da846ede8c9
--- /dev/null
+++ b/net-analyzer/nstats/nstats-0.4-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Displays statistics about ethernet traffic including protocol breakdown"
+SRC_URI="http://trash.net/~reeler/nstats/files/${P}.tar.gz"
+HOMEPAGE="http://trash.net/~reeler/nstats/"
+LICENSE="Artistic"
+
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+RDEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( BUGS doc/TODO doc/ChangeLog )
+
+src_prepare(){
+	epatch \
+		"${FILESDIR}"/${P}-glibc24.patch \
+		"${FILESDIR}"/${P}-makefile.patch \
+		"${FILESDIR}"/${P}-tinfo.patch
+
+	eautoreconf
+}
diff --git a/net-analyzer/ntop/Manifest b/net-analyzer/ntop/Manifest
new file mode 100644
index 000000000000..71493325dc4d
--- /dev/null
+++ b/net-analyzer/ntop/Manifest
@@ -0,0 +1,14 @@
+AUX ntop-5.0.1-INCS.patch 951 SHA256 cd719a29f6e98ee4ba24ebd21b12ee6164e564deaa0e1a2aac93046d23ffa3f7 SHA512 396b1d8b9c99faa390615795f470221a6b2a5d9a9e4bf73ae6758e8cf4615e44571ac7c112e61f6be914a299b289f7caceffab08bbc083a5fcba069a5e1713c7 WHIRLPOOL 84825950cf4be6cc10072232776676dce2fd6a8c424637d6b4e7204b592944d9623b922e992878c4d305e42d7c94872d606d93606fdcb3b894e9e495ce7af977
+AUX ntop-5.0.1-gentoo.patch 6752 SHA256 cece982d8670c471e38e8b65c85a131a8a6ede31236e02743add5bec233d2418 SHA512 dd8309cd5c24eda0a9bb4a35b5598ff5f9a22b2af36ae9692f13b6254b2d9e624b646dda38610f6552b2694eb18d5946f0623fff76261c1d4e2ef94518fd5c69 WHIRLPOOL d7e88a7d2bb9cc92e81d2f5b019011212a8f88f551fe2fe06cf65b83e394b76ab474f3147f73a0d603e869344e7d0766f5784ad41215ce510a56498fd2cf4a2c
+AUX ntop-5.0.1-includes.patch 388 SHA256 60429cc4920da2ec387baa08e2bde1c32e999d330c6e3f921544198efb84040a SHA512 6afe8aee2dfee0c9b778a11896aa8b3341618171a74497832d2d67d76dea4374c14060c308ba9a69369b4bfd19c83ff9d5891410758b252bcc714e6031a44a30 WHIRLPOOL 31b2a2ed5fb7e2a70a887e37bc0c6e130830cd256c91f2ead57feeab242d8ad46403dfc6d2062294bb01ac390b05f96064662f05cf67560ce64a93ad4bfcd84b
+AUX ntop-5.0.1-librrd.patch 853 SHA256 b079ffa8649cc01afd8e53c6810200f6db64f344ca2ddda8c0b012c60c846cb4 SHA512 32f19b1713aa26852df31928dcfaebc8861176f175b06de1724711146b0aad7686608264f1ef9f8a1b1396b0571d5cdd53599cc7944a6cd0d08f8e2935fabbb8 WHIRLPOOL 20d51b854509bf7c8811b707072bc03bdc2f2842b510d56baa51c82b2010cb69954cf8ca11adb72a6d8d5a4d49cb33a38620aa61462c7e86e32135914542a679
+AUX ntop-confd 341 SHA256 b582253490df4cde55dda97585d45d16b2968296da7e9bc996dde932cf42584d SHA512 8693050cab03eeb29b59e0a7b173c7791625e8cd6bc33eaa5d74a50ab3ecf435577d7918626cfe3963a0d23d4522a737737b2b9fd8335df29784858a6191813d WHIRLPOOL b467f3baf1065ca7a2434fce23561b270adf1507d36269f1adec04ac41d08866885b043673d2908c44dc6fecb4db1768bc1a01ce590d65e4a629bf5b75b21d67
+AUX ntop-initd 748 SHA256 e1a859b168287950d828ba4d31a9bbeb46e46d1ea3cc1e43f20fa2ef2742d478 SHA512 22b61d88e1fc30106d07ee87701ff46b7f63f1ee2aa7bb5666d9cb5cb6251c583f793c80a5d799ac27fcb63650e7ecacb37e7992feb8aa8cbc2d326b36b05a8f WHIRLPOOL 02b464c1b9131bbec34b17ce22c6e3747caf30d47bc1c42b8bc611344850bb741180e80de997368b4fdf00b726694ba7439ff954331373c5a32a695fd006cd60
+AUX ntop-initd-r1 670 SHA256 02937bf0e808b601ba5dd1e782be9f9b1a929b4d5f52353972b433c969e8de03 SHA512 22bf70d2f4f026702a123abc6da5bc08a879b554f45a301266d0eb2d1e8978f8510811138bd5ec63af29fa47b9b44624a7fc79f3740860860c86ce82717a9771 WHIRLPOOL c603f3affe2bb528e937a70b28236a4c5e6d1939c52c1a5f0b284d8354aae98d49c8a8bfce23cd3587e92a1483acea5f93b9c3b40389ffc972fc4866574a6ef8
+AUX ntop-update-geoip-db 492 SHA256 3604d0a728b203211fab05eca829a7e93bc05c04f252937ffbf630813420eef6 SHA512 7b5ae8dbd7d5d084c7278af1deb64a903b106663c3195df70acead3e8d7e14fbd996e69d5132c0ddac9147b3e70892c91695d834ab7b22fec2569efcd52df5f6 WHIRLPOOL d96c2fa39287ed6e0ac8b76a5c09ff4485305328bfd61fd738ff82a09cde0a8f0be76474d0c5bc95f0a55aa212b092f2e7b7a3bf3d8e6ee2ec1e88f246653e78
+DIST ntop-5.0.1.tar.gz 40133867 SHA256 7e8e84cb14d2173beaca4d4cb991a14d84a4bef84ec37b2276bc363f45c52ef8 SHA512 f52c40e6c00c8d2f46b68078c5f9aef8ed78670f92a0a81f66f2f44c71d41bc4c001b4550f19b71c546f7c07cbbed15e0aa1ee13873ac63a11678bf2b8483f2a WHIRLPOOL aa20b6529f343f6f57fc1d880c8cf07cd11720c6fe8c968359ff1e16b77fe3f4c6df1ed83a184e580d6ef7f5eff6d245b2971c17a7dd674c12325f21029f64ee
+EBUILD ntop-5.0.1-r2.ebuild 2986 SHA256 dbb376ca809a8481d397d3d508e60b6502202a0d7e3ab9e12fe0e215544bfe80 SHA512 d3816746937039d1105bb7b373cb0dd531dd9a820d31067dd27f9789c20aceefa5749ad6b56648bd356986a14eb2effa9b6b1022c37eb04d5410c60d161a2b30 WHIRLPOOL 937499ab64c129f088df40e9671c20426e9b7b7eca622fda012609bcb89e8323df041dc8d7829dcc11a0a0505a9ae5fe5f0431dee9ee2bc21300b5c9bf18408c
+EBUILD ntop-5.0.1-r3.ebuild 3058 SHA256 06613d001067ac7b68dc0e81b04778505b3ae116a01cf5ee3586e0e84d1841bc SHA512 2210d50bc0c4a4161e9e0f18cbf2360f9a675873b0d7ae81a10d826ab09559b94f6f4e6bd097d0bd632db9c7a5fb0afa12d645b8a42f93766788553044966ca5 WHIRLPOOL 8fac35b9d00ac494cfb32828ac6368f0670b1c0e243ea3386eccb305282d23e764b5b250a09a1fd63d73b139b95d44a951caee386c08952574df6d2f9c0ec3cd
+MISC ChangeLog 3498 SHA256 61e6a05f79405180789d74ee8c36cc4e37c994c191bc9c535fa8e3eb4be77ace SHA512 f2fdb1eb9fa7286a9065f97678c1bd1c66badec79d7edeb6d44213172529b5e174b847f7ab7be01417c4ea928513623096b71baaece674b85854ec3d445ca11b WHIRLPOOL de016a2dc03b887a18dd5a3ddf5b60768c331a7bc87ec5d3db159b4a4d4c718c9c20020daf879de8f8b5845865c2636296aeb81a6269fa921244a34210df423b
+MISC ChangeLog-2015 17251 SHA256 82ee50e6cf76d70047d005addb5c025d6d4beca25968274e486cd8d7039935ce SHA512 e9b82ded5a8ec639735813c8a04901a10c3830cdd16c13e62ca84e8512c92f3463bbc89c78275e92432bc468fba3583ede0da4405b0dce5d103de13471af0394 WHIRLPOOL 49463f3ffb42ef47adcb76a7e0e5b05188599a465424eea76b8fed9a183fa1a493e949c2dde341db4533d5d72d40a6551d67f880cd8ad7d9c14914050c4bb073
+MISC metadata.xml 925 SHA256 0cc6efd263781f8601277cff81c72e5c0c5ce6ef327d7c4746558e5857ba75c2 SHA512 cdd3a2f6b763a78e208d3be386f4d175a53a30047f4c15f1cf7a4a102325380fbf7c77bc754bf0b1b5e38d0600781c3a876c1a75ac2aa997ef1c3ff423f3bbb0 WHIRLPOOL aac8c179e27caffc746a3ec27b77c92b84c548cab951593024099f7954e13def35bd9d7d97af744775cef2f51ee5dc982fd17500f5af47c547affa2ffd6b3e99
diff --git a/net-analyzer/ntop/files/ntop-5.0.1-INCS.patch b/net-analyzer/ntop/files/ntop-5.0.1-INCS.patch
new file mode 100644
index 000000000000..de49a41d7175
--- /dev/null
+++ b/net-analyzer/ntop/files/ntop-5.0.1-INCS.patch
@@ -0,0 +1,27 @@
+--- a/configure
++++ b/configure
+@@ -18983,7 +18983,7 @@
+     else
+         LIBS="${LIBS} ${PYTHON_LIBS}"
+ 
+-            PYTHON_INCS=`$PYTHON_CONFIG --cflags | sed -e "s/-arch i386//" | sed -e "s/-arch ppc//" | sed -e "s/-arch x86_64//"`
++            PYTHON_INCS=`$PYTHON_CONFIG --includes | sed -e "s/-arch i386//" | sed -e "s/-arch ppc//" | sed -e "s/-arch x86_64//"`
+ 
+     INCS="${INCS} ${PYTHON_INCS}"
+ 
+@@ -19335,15 +19335,6 @@
+         for(i=NF; i>0; i--) { \
+             if ($i in fields) { } else { fields[$i]="."; out[i]=$i } \
+         } \
+-        for(i=1; i<=NF; i++) { \
+-            if (i in out) { printf("%s ", out[i]) } \
+-        } \
+-        print "" \
+-    }'`
+-    INCS=`echo ${INCS} | ${ac_cv_prog_AWK} '{ \
+-        for(i=NF; i>0; i--) { \
+-            if ($i in fields) { } else { fields[$i]="."; out[i]=$i } \
+-        } \
+         for(i=1; i<=NF; i++) { \
+             if (i in out) { printf("%s ", out[i]) } \
+         } \
diff --git a/net-analyzer/ntop/files/ntop-5.0.1-gentoo.patch b/net-analyzer/ntop/files/ntop-5.0.1-gentoo.patch
new file mode 100644
index 000000000000..57f136971cfc
--- /dev/null
+++ b/net-analyzer/ntop/files/ntop-5.0.1-gentoo.patch
@@ -0,0 +1,240 @@
+--- a/configure.in
++++ b/configure.in
+@@ -469,11 +469,6 @@
+     LOCALEDIR="/usr/lib/locale"
+ fi
+ 
+-dnl> Add /usr/local/ /opt/local
+-CFLAGS="${CFLAGS} -I/usr/local/include -I/opt/local/include"
+-CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/local/include"
+-LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/opt/local/lib"
+-
+ PWD=`pwd`
+ 
+ echo
+@@ -1739,18 +1734,6 @@
+ if test ".${ac_cv_lib_GeoIP_GeoIP_record_by_ipnum}" = ".yes"; then
+ LIBS="$LIBS -lGeoIP"
+ 
+-if test -f "GeoLiteCity.dat"; then
+-   echo "GeoLiteCity.dat already present"
+-else
+-   if test -f "3rd_party/GeoLiteCity.dat.gz"; then
+-     cp 3rd_party/GeoLiteCity.dat.gz .
+-   else
+-     wget http://www.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
+-   fi
+-
+-   gunzip GeoLiteCity.dat.gz
+-fi
+-
+ dnl> --------
+ 
+ if test -f "GeoIPASNum.dat"; then
+@@ -1769,8 +1752,11 @@
+ exit 1
+ fi
+ 
+-cp "3rd_party/oui.txt.gz" .
+-cp "3rd_party/specialMAC.txt.gz" .
++gunzip 3rd_party/GeoLiteCity.dat.gz &&
++mv "3rd_party/etter.finger.os.gz" . &&
++mv "3rd_party/oui.txt.gz" . &&
++mv "3rd_party/specialMAC.txt.gz" . ||
++    exit 1
+ 
+ if test -d ./configureextra; then
+ 
+@@ -1931,7 +1917,6 @@
+ AC_SUBST(SO_VERSION_PATCH)
+ AC_SUBST(RRD_LIB)
+ AC_SUBST(RRD_INC)
+-AC_SUBST(GEO_DIR)
+ AC_SUBST(GETOPT_H)
+ AC_SUBST(GETOPT_C)
+ AC_SUBST(NDPI_LIB)
+--- a/globals-core.c
++++ b/globals-core.c
+@@ -369,7 +369,7 @@
+   _mtuSize[DLT_ATM_RFC1483] = 9180                             /* LLC/SNAP encapsulated atm */;
+   _headerSize[DLT_ATM_RFC1483] = 0;
+ 
+-  /* _mtuSize[DLT_RAW] = ?                                        raw IP */
++  _mtuSize[DLT_RAW] = 1500;                                     /*   raw IP */
+   _headerSize[DLT_RAW] = 0;
+ 
+   /* Others defined in bpf.h at tcpdump.org as of the resync - it would be NICE
+@@ -470,19 +470,18 @@
+   struct stat statbuf;
+ 
+   /* Initialize GeoIP databases */
+-  for(i=0; myGlobals.configFileDirs[i] != NULL; i++) {
++  {
+     char path[256];
+     
+     safe_snprintf(__FILE__, __LINE__, path, sizeof(path),
+ 		  "%s%c%s",
+-		  myGlobals.configFileDirs[i], 
++		  myGlobals.dbPath,
+ 		  CONST_PATH_SEP, GEO_IP_FILE);
+     revertSlashIfWIN32(path, 0);
+ 
+     if(stat(path, &statbuf) == 0) {
+       if((myGlobals.geo_ip_db = GeoIP_open(path, GEOIP_CHECK_CACHE)) != NULL) {
+ 	traceEvent(CONST_TRACE_INFO, "GeoIP: loaded config file %s", path);
+-	break;
+       }
+     }
+   }
+@@ -491,20 +490,18 @@
+     traceEvent(CONST_TRACE_ERROR, "GeoIP: unable to load file %s", GEO_IP_FILE);
+   
+   /* *************************** */
+-
+-  for(i=0; myGlobals.configFileDirs[i] != NULL; i++) {
++  {
+     char path[256];
+     
+     safe_snprintf(__FILE__, __LINE__, path, sizeof(path),
+ 		  "%s%c%s",
+-		  myGlobals.configFileDirs[i], 
++		  myGlobals.dbPath,
+ 		  CONST_PATH_SEP, GEO_IP_ASN_FILE);
+     revertSlashIfWIN32(path, 0);
+ 
+     if(stat(path, &statbuf) == 0) {
+       if((myGlobals.geo_ip_asn_db = GeoIP_open(path, GEOIP_CHECK_CACHE)) != NULL) {
+ 	traceEvent(CONST_TRACE_INFO, "GeoIP: loaded ASN config file %s", path);
+-	break;
+       }
+     }
+   }
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -36,7 +36,6 @@
+ 
+ #AM_CFLAGS =
+ #AM_LDFLAGS=
+-ACLOCAL_AMFLAGS=-I m4
+ 
+ DISTCLEANFILES = trivialcompilemessage *.db #* *~ *.log
+ CLEANFILES     = $(DISTCLEANFILES) stamp-h1
+@@ -67,9 +66,7 @@
+ NTOPDATA = ntop-cert.pem \
+            $(ETTER_PASSIVE) \
+            oui.txt.gz \
+-           specialMAC.txt.gz \
+-	   GeoIPASNum.dat \
+-	   GeoLiteCity.dat
++           specialMAC.txt.gz
+ 
+ NTOPHTML = html html/*.js html/*.html  html/*.gif html/*.jpg html/*.ico html/*.png \
+            html/*.css html/*.dtd \
+@@ -133,7 +130,7 @@
+ 
+ libntop_la_DEPENDENCIES =  config.h
+ libntop_la_LIBADD       = $(BASE_LIBS)
+-libntop_la_LDFLAGS      = $(AM_LDFLAGS) -release $(VERSION) -export-dynamic @DYN_FLAGS@
++libntop_la_LDFLAGS      = $(AM_LDFLAGS) -release $(VERSION) -export-dynamic -shared @DYN_FLAGS@
+ 
+ # Archive for http representation, or the 'viewer'
+ libntopreport_la_SOURCES = emitter.c       globals-report.c  graph.c \
+@@ -145,7 +142,7 @@
+ 
+ libntopreport_la_DEPENDENCIES = libntop.la
+ libntopreport_la_LIBADD       = libntop.la $(BASE_LIBS)
+-libntopreport_la_LDFLAGS      = $(AM_LDFLAGS) -release $(VERSION) -export-dynamic @DYN_FLAGS@
++libntopreport_la_LDFLAGS      = $(AM_LDFLAGS) -release $(VERSION) -export-dynamic -shared @DYN_FLAGS@
+ 
+ man_MANS = ntop.8
+ 
+@@ -367,30 +364,7 @@
+ 
+ # download the vendor information table
+ dnvt:
+-	@echo ""
+-	@echo ""
+-	@echo -n "Preparing "
+-	@if test -f oui.txt; then \
+-	  rm -rf oui.txt; \
+-	fi
+-	@if test -f oui.txt.gz.old; then \
+-	  rm -rf oui.txt.gz.old; \
+-	fi;
+-	@mv oui.txt.gz oui.txt.gz.old
+-	@echo "(old oui.txt.gz file is now oui.txt.gz.old)"
+-	@echo ""
+-	@wget -c http://standards.ieee.org/regauth/oui/oui.txt
+-	@gzip oui.txt
+-	@echo ""
+-	@echo ""
+-	@echo -n "Old file lines were: "
+-	@gunzip -c oui.txt.gz.old | wc -l
+-	@echo -n "New file lines are:  "
+-	@gunzip -c oui.txt.gz | wc -l
+-	@echo ""
+-	@echo ""
+-	@echo "New file is:"
+-	@ls -l oui.txt.gz
++	@echo "Use included oui.txt.gz"
+ 
+ # download the Novell SAP Protocol information table
+ #dnsapt:
+@@ -398,45 +372,7 @@
+ 
+ # download the passive ethernet fingerprint database
+ dnetter:
+-	@echo ""
+-	@echo ""
+-	@echo "Preparing "
+-	@echo ""
+-
+-	@if test -f $(ETTER_PASSIVE).old; then \
+-	  echo "...Deleting prior file, $(ETTER_PASSIVE).old..."; \
+-	  rm -rf $(ETTER_PASSIVE).old; \
+-	fi;
+-	@if test -f $(ETTER_PASSIVE); then \
+-	  echo "...Moving current $(ETTER_PASSIVE) to $(ETTER_PASSIVE).old"; \
+-	  mv $(ETTER_PASSIVE) $(ETTER_PASSIVE).old; \
+-	fi;
+-	@for file in $(ETTER_PASSIVE) $(ETTER_PASSIVE).gz \
+-		$(ETTER_PASSIVE_FILE) $(ETTER_PASSIVE_FILE).gz; do \
+-          if test -f $$file; then \
+-	     echo "...Deleting prior file, $$file..."; \
+-             rm -rf $$file; \
+-          fi; \
+-        done
+-	@echo ""
+-	@echo "...Downloading new file..."
+-	@wget -O $(ETTER_PASSIVE_FILE) \
+-		$(ETTER_PASSIVE_DOWNLOAD_FROM)/$(ETTER_PASSIVE_FILE)?$(ETTER_PASSIVE_DOWNLOAD_PARMS)
+-	@echo ""
+-	@echo "gziping downloaded file..."
+-	@gzip $(ETTER_PASSIVE_FILE)
+-	@echo ""
+-	@echo ""
+-	@if test -f $(ETTER_PASSIVE).old; then \
+-	  echo -n "Old file lines were: "; \
+-	  gunzip -c $(ETTER_PASSIVE).old | wc -l; \
+-	fi;
+-	@echo -n "New file lines are:  "
+-	@gunzip -c $(ETTER_PASSIVE) | wc -l
+-	@echo ""
+-	@echo ""
+-	@echo "New file is:"
+-	@ls -l $(ETTER_PASSIVE)
++	@echo "Use included $(ETTER_PASSIVE)"
+ 
+ # ntop census
+ census-fail:
+--- a/report.c
++++ b/report.c
+@@ -2299,7 +2299,7 @@
+   if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
+     snprintf(dotPath, sizeof(dotPath), "%s", buf);
+   } else {
+-    snprintf(dotPath, sizeof(dotPath), "/usr/local/bin/dot");
++    snprintf(dotPath, sizeof(dotPath), "/usr/bin/dot");
+     storePrefsValue("dot.path", dotPath); /* Set the default */
+   }
+ 
diff --git a/net-analyzer/ntop/files/ntop-5.0.1-includes.patch b/net-analyzer/ntop/files/ntop-5.0.1-includes.patch
new file mode 100644
index 000000000000..fcd5f28d3491
--- /dev/null
+++ b/net-analyzer/ntop/files/ntop-5.0.1-includes.patch
@@ -0,0 +1,20 @@
+--- a/nDPI/src/lib/protocols/netflow.c
++++ b/nDPI/src/lib/protocols/netflow.c
+@@ -19,6 +19,7 @@
+ 
+ 
+ #include "ipq_utils.h"
++#include <time.h> /* time() */
+ 
+ #ifdef NTOP_PROTOCOL_NETFLOW
+ 
+--- a/nDPI/src/lib/protocols/ssl.c
++++ b/nDPI/src/lib/protocols/ssl.c
+@@ -22,6 +22,7 @@
+ 
+ 
+ #include "ipq_utils.h"
++#include <ctype.h> /* isalpha() isdigit() ... */
+ 
+ #ifdef IPOQUE_PROTOCOL_SSL
+ 
diff --git a/net-analyzer/ntop/files/ntop-5.0.1-librrd.patch b/net-analyzer/ntop/files/ntop-5.0.1-librrd.patch
new file mode 100644
index 000000000000..db2530c8a5e5
--- /dev/null
+++ b/net-analyzer/ntop/files/ntop-5.0.1-librrd.patch
@@ -0,0 +1,31 @@
+--- a/configure.in
++++ b/configure.in
+@@ -887,28 +887,6 @@
+    fi
+ fi
+ 
+-RRD_LIB="-L${RRD_HOME}/lib -lrrd_th"
+-
+-if test -f "$RRD_HOME/lib/librrd_th.so"; then
+-   AC_MSG_RESULT(checking for rrdtool... yes)
+-else
+-  if test -f "$RRD_HOME/lib/librrd_th.dylib"; then # OSX
+-     AC_MSG_RESULT(checking for rrdtool... yes)
+-  else
+-     if test -f "$RRD_HOME/lib/librrd_th.a"; then
+-       AC_MSG_RESULT(checking for rrdtool... yes)
+-     else
+-       AC_CHECK_LIB([rrd_th], [main])
+-       if test ".${ac_cv_lib_rrd_th_main}" != ".yes"; then
+-         AC_MSG_ERROR(Unable to find RRD at $RRD_HOME: please use --with-rrd-home=DIR);
+-	 AC_MSG_ERROR(RRD source can be downloaded from http://www.rrdtool.org/);
+-       else
+-         RRD_LIB=
+-       fi
+-     fi
+-  fi
+-fi
+-
+ RRD_INC=
+ if test -d "${RRD_HOME}/include"; then
+   RRD_INC="-I${RRD_HOME}/include"
diff --git a/net-analyzer/ntop/files/ntop-confd b/net-analyzer/ntop/files/ntop-confd
new file mode 100644
index 000000000000..352a26fa9b1c
--- /dev/null
+++ b/net-analyzer/ntop/files/ntop-confd
@@ -0,0 +1,9 @@
+# Config file for /etc/init.d/ntop
+
+# Set preferred options here
+#NTOP_OPTS="--http-server 3000 --https-server 0 --interface eth0"
+
+# suggestions from bug #136983 (use it in case you experience ntop hangs)
+#NTOP_OPTS="u ntop -P /var/lib/ntop --disable-schedyield --http-server 3000 --https-server 3001"
+
+NTOP_OPTS="-u ntop -P /var/lib/ntop"
diff --git a/net-analyzer/ntop/files/ntop-initd b/net-analyzer/ntop/files/ntop-initd
new file mode 100644
index 000000000000..ec9afd576f32
--- /dev/null
+++ b/net-analyzer/ntop/files/ntop-initd
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ ! -e /var/lib/ntop/ntop_pw.db ]; then
+		eerror "You need to set a password first by running"
+		eerror "ntop --set-admin-password"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting ntop"
+	export LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
+	export GDFONTPATH=/usr/share/fonts/corefonts # apparently the only font that works (#231705)
+	start-stop-daemon --start --exec /usr/bin/ntop -- -d -L ${NTOP_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ntop"
+	start-stop-daemon --stop --retry 30 --pidfile /var/run/ntop.pid
+	eend $?
+}
diff --git a/net-analyzer/ntop/files/ntop-initd-r1 b/net-analyzer/ntop/files/ntop-initd-r1
new file mode 100644
index 000000000000..e303753891e6
--- /dev/null
+++ b/net-analyzer/ntop/files/ntop-initd-r1
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="ntop - a network traffic analyzer"
+pidfile="/run/ntop.pid"
+command="/usr/bin/ntop"
+command_args="-L ${NTOP_OPTS}"
+start_stop_daemon_args="-p ${pidfile} -m -b"
+
+depend() {
+	need net
+}
+
+start_pre() {
+	if [ ! -e /var/lib/ntop/ntop_pw.db ] ; then
+		eerror "You need to set a password first by running"
+		eerror "ntop --set-admin-password"
+		return 1
+	fi
+
+	export LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
+	export GDFONTPATH=/usr/share/fonts/corefonts # apparently the only font that works (#231705)
+}
diff --git a/net-analyzer/ntop/files/ntop-update-geoip-db b/net-analyzer/ntop/files/ntop-update-geoip-db
new file mode 100644
index 000000000000..2bf3faaf68cb
--- /dev/null
+++ b/net-analyzer/ntop/files/ntop-update-geoip-db
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+BASE_URL=http://geolite.maxmind.com/download/geoip/database
+
+echo "Updating NTOP GeoIP databases..."
+
+cd /var/lib/ntop || exit
+
+for u in asnum/GeoIPASNum.dat.gz GeoLiteCity.dat.gz ; do
+	FILE_GZ=${u#*/}
+	FILE=${FILE_GZ%.gz}
+	wget -nv -O ${FILE_GZ} ${BASE_URL}/${u} &&
+		gunzip < ${FILE_GZ} > .${FILE} &&
+		mv -f .${FILE} ${FILE} &&
+		rm -f ${FILE_GZ} ||
+		exit
+done
+
+/etc/init.d/ntop --quiet status && /etc/init.d/ntop restart
+
+echo "NTOP GeoIP databases were successfully updated"
diff --git a/net-analyzer/ntop/metadata.xml b/net-analyzer/ntop/metadata.xml
new file mode 100644
index 000000000000..00542da20918
--- /dev/null
+++ b/net-analyzer/ntop/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
+  <longdescription>ntop is a network traffic probe that shows the network usage,
+  similar to what the popular top Unix command does. ntop is based on libpcap
+  and it has been written in a portable way in order to virtually run on every
+  Unix platform and on Win32 as well.
+  ntop users can use a a web browser (e.g. netscape) to navigate through ntop
+  (that acts as a web server) traffic information and get a dump of the network
+  status. In the latter case, ntop can be seen as a simple RMON-like agent with an
+  embedded web interface.</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">ntop</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/ntop/ntop-5.0.1-r2.ebuild b/net-analyzer/ntop/ntop-5.0.1-r2.ebuild
new file mode 100644
index 000000000000..8d51b212322b
--- /dev/null
+++ b/net-analyzer/ntop/ntop-5.0.1-r2.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils multilib user python-single-r1
+
+DESCRIPTION="Network traffic analyzer with web interface"
+HOMEPAGE="http://www.ntop.org/products/ntop/"
+SRC_URI="mirror://sourceforge/ntop/ntop/Stable/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="snmp ssl"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	dev-lang/lua:=
+	dev-lang/perl
+	dev-libs/geoip
+	dev-libs/libevent
+	media-libs/gd
+	media-libs/libpng:0=
+	net-analyzer/rrdtool[graph]
+	net-libs/libpcap
+	snmp? ( net-analyzer/net-snmp[ipv6] )
+	ssl? ( dev-libs/openssl:0= )
+	sys-libs/gdbm
+	sys-libs/zlib
+	virtual/awk
+	${PYTHON_DEPS}
+"
+DEPEND="
+	${COMMON_DEPEND}
+	>=sys-devel/libtool-1.5.26
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	app-arch/gzip
+	dev-libs/glib:2
+	dev-python/mako
+	media-gfx/graphviz
+	net-misc/wget
+"
+
+pkg_setup() {
+	enewgroup ntop
+	enewuser ntop -1 -1 /var/lib/ntop ntop
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-includes.patch \
+		"${FILESDIR}"/${P}-librrd.patch
+
+	cp /usr/share/aclocal/libtool.m4 libtool.m4.in
+	cat acinclude.m4.in libtool.m4.in acinclude.m4.ntop > acinclude.m4
+	eautoreconf
+
+	# The build system is a complete mess, so apply a configure patch here
+	# instead of patching configure.in above
+	epatch "${FILESDIR}"/${P}-INCS.patch
+
+	# Stop make from doing autotools stuff
+	sed -i -e '/missing --run echo/s|=.*|= true|g' Makefile.in || die
+}
+
+src_configure() {
+	export \
+		ac_cv_header_glib_h=no \
+		ac_cv_header_glibconfig_h=no \
+		ac_cv_header_gdome_h=no \
+		ac_cv_lib_glib_g_date_julian=no \
+		ac_cv_lib_xml2_xmlCheckVersion=no \
+		ac_cv_lib_gdome_gdome_di_saveDocToFile=no
+
+	pushd nDPI >/dev/null || die
+	econf
+	popd &>/dev/null || die
+
+	if has_version '<net-analyzer/rrdtool-1.6'; then
+		export RRD_LIB=-lrrd_th
+	else
+		export RRD_LIB=-lrrd
+	fi
+
+	econf \
+		$(use_enable snmp) \
+		$(use_with ssl) \
+		--with-rrd-home=/usr/$(get_libdir)
+}
+
+src_compile() {
+	pushd nDPI >/dev/null || die
+	emake
+	popd &>/dev/null || die
+
+	emake
+}
+
+src_install() {
+	LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
+
+	emake DESTDIR="${D}" install
+
+	keepdir /var/lib/ntop
+
+	insinto /var/lib/ntop
+	gunzip 3rd_party/GeoIPASNum.dat.gz
+	gunzip 3rd_party/GeoLiteCity.dat.gz
+	local f
+	for f in GeoIPASNum.dat GeoLiteCity.dat; do
+		# Don't install included GeoIP files if newer versions are available
+		[ -f "${ROOT}/var/lib/ntop/${f}" ] ||
+			doins "3rd_party/${f}"
+	done
+
+	dodoc AUTHORS CONTENTS ChangeLog MANIFESTO NEWS
+	dodoc PORTING README SUPPORT_NTOP.txt THANKS $(find docs -type f)
+
+	newinitd "${FILESDIR}"/ntop-initd-r1 ntop
+	newconfd "${FILESDIR}"/ntop-confd ntop
+
+	exeinto /etc/cron.monthly
+	doexe "${FILESDIR}"/ntop-update-geoip-db
+}
+
+pkg_postinst() {
+	fowners ntop:ntop /var/lib/ntop
+	fperms 750 /var/lib/ntop
+}
diff --git a/net-analyzer/ntop/ntop-5.0.1-r3.ebuild b/net-analyzer/ntop/ntop-5.0.1-r3.ebuild
new file mode 100644
index 000000000000..02987b7d1a68
--- /dev/null
+++ b/net-analyzer/ntop/ntop-5.0.1-r3.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils multilib user python-single-r1
+
+DESCRIPTION="Network traffic analyzer with web interface"
+HOMEPAGE="http://www.ntop.org/products/ntop/"
+SRC_URI="mirror://sourceforge/ntop/ntop/Stable/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="libressl snmp ssl"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	dev-lang/lua:=
+	dev-lang/perl
+	dev-libs/geoip
+	dev-libs/libevent
+	media-libs/gd
+	media-libs/libpng:0=
+	net-analyzer/rrdtool[graph]
+	net-libs/libpcap
+	snmp? ( net-analyzer/net-snmp[ipv6] )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	sys-libs/gdbm
+	sys-libs/zlib
+	virtual/awk
+	${PYTHON_DEPS}
+"
+DEPEND="
+	${COMMON_DEPEND}
+	>=sys-devel/libtool-1.5.26
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	app-arch/gzip
+	dev-libs/glib:2
+	dev-python/mako
+	media-gfx/graphviz
+	net-misc/wget
+"
+
+pkg_setup() {
+	enewgroup ntop
+	enewuser ntop -1 -1 /var/lib/ntop ntop
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-includes.patch \
+		"${FILESDIR}"/${P}-librrd.patch
+
+	cp /usr/share/aclocal/libtool.m4 libtool.m4.in
+	cat acinclude.m4.in libtool.m4.in acinclude.m4.ntop > acinclude.m4
+	eautoreconf
+
+	# The build system is a complete mess, so apply a configure patch here
+	# instead of patching configure.in above
+	epatch "${FILESDIR}"/${P}-INCS.patch
+
+	# Stop make from doing autotools stuff
+	sed -i -e '/missing --run echo/s|=.*|= true|g' Makefile.in || die
+}
+
+src_configure() {
+	export \
+		ac_cv_header_glib_h=no \
+		ac_cv_header_glibconfig_h=no \
+		ac_cv_header_gdome_h=no \
+		ac_cv_lib_glib_g_date_julian=no \
+		ac_cv_lib_xml2_xmlCheckVersion=no \
+		ac_cv_lib_gdome_gdome_di_saveDocToFile=no
+
+	pushd nDPI >/dev/null || die
+	econf
+	popd &>/dev/null || die
+
+	if has_version '<net-analyzer/rrdtool-1.6'; then
+		export RRD_LIB=-lrrd_th
+	else
+		export RRD_LIB=-lrrd
+	fi
+
+	econf \
+		$(use_enable snmp) \
+		$(use_with ssl) \
+		--with-rrd-home=/usr/$(get_libdir)
+}
+
+src_compile() {
+	pushd nDPI >/dev/null || die
+	emake
+	popd &>/dev/null || die
+
+	emake
+}
+
+src_install() {
+	LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
+
+	emake DESTDIR="${D}" install
+
+	keepdir /var/lib/ntop
+
+	insinto /var/lib/ntop
+	gunzip 3rd_party/GeoIPASNum.dat.gz
+	gunzip 3rd_party/GeoLiteCity.dat.gz
+	local f
+	for f in GeoIPASNum.dat GeoLiteCity.dat; do
+		# Don't install included GeoIP files if newer versions are available
+		[ -f "${ROOT}/var/lib/ntop/${f}" ] ||
+			doins "3rd_party/${f}"
+	done
+
+	dodoc AUTHORS CONTENTS ChangeLog MANIFESTO NEWS
+	dodoc PORTING README SUPPORT_NTOP.txt THANKS $(find docs -type f)
+
+	newinitd "${FILESDIR}"/ntop-initd-r1 ntop
+	newconfd "${FILESDIR}"/ntop-confd ntop
+
+	exeinto /etc/cron.monthly
+	doexe "${FILESDIR}"/ntop-update-geoip-db
+}
+
+pkg_postinst() {
+	fowners ntop:ntop /var/lib/ntop
+	fperms 750 /var/lib/ntop
+}
diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
new file mode 100644
index 000000000000..cf8a02b9301c
--- /dev/null
+++ b/net-analyzer/ntopng/Manifest
@@ -0,0 +1,14 @@
+AUX ntopng-2.4-cxx.patch 809 SHA256 b5ec360c8435aea28bd3c56928369189c70bb114f2ebdd98372c1bfafb573017 SHA512 04345262208bc0a6043b83ae94a1fa83a08889f19e5d36e68cca5d11c93f12b026e6179c37aa27fb800a6f019b9eba58055920fcc555f2f9627dc8ee6c0e39ee WHIRLPOOL 03d261bb0ad98c6bc40b837fefbb7192edd04746aa2d8d74357203fd622d1ac85b3b6a1bb2f91d9a8e19d68e01467d27655cf97c883872070fe5f0c98f4af4e5
+AUX ntopng-2.4-dont-build-ndpi.patch 391 SHA256 2960b648635b7bdb2adc617ee5ba815e1cc4a049a0c5f4c08c978b26ee9f30e2 SHA512 5ed80974b17ff7e3bcf369fdc72a4b82b6490b38f5ddaafc9fc21e8d4307debdec0c0dd8ef5fe8b7a4c1945ce1236b2295a3ec578227573769e4c829e501a33c WHIRLPOOL 5f7ab7d613643f102a183c09000ee1ff29e8ed35bfbb59fad2b898426fae06e2338391f90355bfb7b4b227df53b40a4b23489f08f2f107b1084939d519948ee6
+AUX ntopng-2.4-mysqltool.patch 430 SHA256 afbcd4d6b88b0cf806ac05c93e232cc065f018a8c01a263796b80ff152b29eb6 SHA512 9ade5fb4e8a9f9b205327d482670b87fa249ab375be3414801e46ac34f1204605be4530326836b1ded48e9a63f38d0fecaf047cde09650e380495257a0e0832a WHIRLPOOL f2a8cfd5345124b3b2b0294f77d99160dc8e71abcbf22df1d8054d897aa9ca4efc483955850da0cda2e963930cd7f7aa388d2ea8bb08c9e8b6e4cc06dfe90e92
+AUX ntopng-3.0-gentoo.patch 1596 SHA256 6e2d5a9f0a320e3683a94b93bdd1e3e681dc9eb4cfdbc4c2b6f2f235ab29174f SHA512 fcab6670255d7c756694091d6b53a7880a74e8840fa8f77ec81b072dbe7c7a5ec5b4550892dc78c45304ee437a309fe8c79293f6205c570685b8f13178c1c306 WHIRLPOOL f70ce3194c543804c04fbaa6d6f2a16c359fe5face2deba9d5d9e9a0cd93a43118a48bd8069e09ad4f0a0b4213cd63bcfb67e635558f377a1304cbe7bdeb900d
+AUX ntopng-3.0-mysqltool.patch 430 SHA256 94e7825ca4e2cb4a115c1f06623537101af3a14aa78da4a263278d7aad18fa7e SHA512 82b06a14f471bd037743a7563a80d6460e63ff262252d0318e40ba25bf8da849bc0394a5fa4d54befd5df6bd4b645b86711708198f8971d54eb15e8f32c83cd5 WHIRLPOOL 0c0d6f5c903dd1d5fa28ab95ddbe5a3a34fc9b25eaa5a04e71b09f563443b1c84f76977f0dd0dd73c401fdd1b4a682c2cdf49a4addedd51c77a4c82fcbc0ed2e
+AUX ntopng.conf.d 117 SHA256 dcd657cfa0a4b5d9708e67fb6190448fe27a5e598f0b10564f2d812110a13b42 SHA512 bb66d11245ce099f9e09f97d830da60df910682242db0c5c7d17bcd800e84cf3bce6288fb75fc3a8f3e214a580dc0d076f7f69aa924d9ad3e4c8bff093252061 WHIRLPOOL 7dac08122c9b33db14914be6d3a26ce4eac33a41b2738112b470d22abdab1549c5515698f71102cfd0399717b6af9964808dbaf29928430b210dbff6b65e738f
+AUX ntopng.init.d 549 SHA256 79c3c6239f9832208ee0581a102d970cc7e81b7e0a4eee70a9b3c780faf6d0d1 SHA512 1fbcc46fe10dcef82a1310d74c4351c72752cdd2a9b9908705c8c645698430e456f1ba14b77fd7c1f374a237a508c2d33324de61f5f1f8255ed75a384e874d84 WHIRLPOOL c64db6141bca4af7cfa9cbc0eb79378fd6f6bc22229ed7f0465e500438418819feb20a6f59947b8df4750c2b5e55dd0a02bcb6ec875090e25dbf0196b4430bb1
+DIST ntopng-2.4.tar.gz 134074662 SHA256 f44e2faf3cb712d75106fc9c594139fbfd437edf4a7e6e9ed65134e1f47ad355 SHA512 515dd7889ae3aaf2482371bb2c55ab7300cf4207fe07f37029b7529bfb710379c19a54f58cf6df87e42454c0c99d15291af334adff676252301d9edd0acf3c7a WHIRLPOOL ba5d9fce207d1a89e5c8b35705b0aaeb66235153b91eaf7a84b1c50bcb4b897f992c81aa7fd316ad2d87458cdfdcd4d63de37d0a00375706a036f491ba448c7b
+DIST ntopng-3.0.tar.gz 23017655 SHA256 3780f1e71bc7aa404f40ea9b805d195943cdb5095d712f41669eae138d388ad5 SHA512 d5e310d5dba7fe696d38d9d8251ffa4077182200e41c3f0b6034e68cf6623220ec47ba9d9fd5d2392a7b65a6de770e330821169c7ec06b4952f68c3f5f738eb1 WHIRLPOOL 21351cd8e658826ac3bfe91e6817d4daef609f86655a2c645afcdc1eb3ec24ef3c92c99574363b2d15706abf9a7277489453fc8a2a4ff3ec625284a458ff643a
+EBUILD ntopng-2.4.ebuild 1721 SHA256 4fe1c83e57b985560231aaa5d9f07f053d953440405c2dbb0e252b8d2055b0c7 SHA512 3364607a3207a0997876898cfd17608c001d5576255877b4748de2eb8bb68dcdd995a1213684d5ec25389b68da9c8607b9674484178cfb3099f6e7e482df5f86 WHIRLPOOL c0ed171c119d69c88e55f378375f6ac4c3a20bd0c758bf4474e738796256e1e654dbe27bde4699d9d91b5fb8d929b17b4e4881ae4f5fb7d6fbf9b8fc0ad4c907
+EBUILD ntopng-3.0-r1.ebuild 1537 SHA256 ccc5a415043ee3334762f0bba9a44234d34174185055cd93200f425e5af117e6 SHA512 47805afc7765af88a4cbee85e6eb98a88f840fa74d6118c8ff0f16b04994816b9c73c6019c8f0c3bbc21868a4f087422d8d04492227903584baa15581eb690d2 WHIRLPOOL 3a7c10f4a33ac9cc0adc8bf243b20c9b4d8cb99b28a2f9b492358bed634ac0e431758f4e4b5f449deb8e6379071a5486a070fcb306006c581bfa22d6ce5d823d
+MISC ChangeLog 4542 SHA256 ac55c99e05e255cce42ffe4e34f3f4dad13c2217ef4416e999264e87d736c818 SHA512 6849ec217662e6b302b894705be7dd31e92f7f4d475349b61d76d70bda22de2326c269abdd491f2cbab4c83db75e110b93bad120d1f47f3f7893ac96f26c7d37 WHIRLPOOL f7a11ce9062774cbfc9a160884acc53b3acb64a3c0b3c176a250753d9679ca09029cda2001dd218af62c362728d7106a7e2142571d69e9948ce732f5f0486f62
+MISC ChangeLog-2015 704 SHA256 4d551cd9ba228aedaf0d446369f00e6dfbc071b193f3de227b651f1f53dadc9b SHA512 6647e69f3a81318691f0e1ff98e17695644f474f92d67c276d2b974f40ba883e1afb4238518d3b26f1abb4b9caca3f1e866dd4ae52b7dd9f76c3683cb63bd449 WHIRLPOOL 0f888695be79b08ea88efe0ccf536eb707d1abd915e4a8d559c7eaab244e6c7de595ad774773f8d97b7a9566f8919541020a32b65d29be0efefd95a5d9638bd2
+MISC metadata.xml 299 SHA256 e13031a67db640ff44b880c7cb49d7841c16001aa10e471eb6b9596f56c833c8 SHA512 5c8e5b8f97b306a059913e2adc9e02137502ec35da1a753a2b9af4d4c67c0af0f0266c14acdd488c89bb96da3cc0464512de05ce389055d35bc6a0feab7ac996 WHIRLPOOL 869e80f88a9932e20ad8656fd86c70bee0a61926bd54fb1bd2281a28f399082c276ab0c36e94916418cc5b56638338ef3a950985681a1af24a8163ed71649e46
diff --git a/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch b/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch
new file mode 100644
index 000000000000..6de1a43f9b8e
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch
@@ -0,0 +1,42 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -341,14 +341,6 @@
+ 	GMAKE="make"
+ fi
+ 
+-GPP=`which clang++`
+-if test x$GPP = x
+-then
+-	GPP="g++"
+-else
+-	GPP="$GPP -O0"
+-fi
+-
+ GIT=`which git`
+ if test x$GIT = x
+ then
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -4,7 +4,6 @@
+ SHELL=/bin/sh
+ OS := $(shell uname -s)
+ PWD=@PWD@
+-GPP=@GPP@
+ INSTALL_DIR=$(DESTDIR)$(prefix)
+ MAN_DIR=$(DESTDIR)@MAN_DIR@
+ 
+@@ -126,12 +125,12 @@
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
+ 
+ %.o: %.cpp $(HEADERS) Makefile
+-	$(GPP) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
+ 
+ .PRECIOUS: $(TARGET) $(OBJECTS)
+ 
+ $(TARGET): $(OBJECTS) $(LIBRRDTOOL) Makefile
+-	$(GPP) $(OBJECTS) -Wall $(LIBS) -o $@
++	$(CXX) $(OBJECTS) $(CXXFLAGS) $(CPPFLAGS) -Wall $(LIBS) -o $@
+ 
+ $(LUAJIT_LIB):
+ 	cd $(LUAJIT_HOME); @GMAKE@
diff --git a/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch b/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch
new file mode 100644
index 000000000000..ec628cd32242
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch
@@ -0,0 +1,16 @@
+--- a/configure.ac.old
++++ b/configure.ac
+@@ -62,13 +62,6 @@
+ fi
+ 
+ NDPI_LIB=$NDPI_HOME/src/lib/.libs/libndpi.a
+-AC_MSG_CHECKING(for $NDPI_LIB)
+-if test -f "$NDPI_LIB" ; then :
+-  AC_MSG_RESULT(found $NDPI_LIB)
+-else
+-  AC_MSG_RESULT(not found $NDPI_LIB: compiling)
+-  cd $NDPI_HOME; ./autogen.sh; make; cd -
+-fi
+ 
+ AC_MSG_CHECKING(for ntopng professional edition)
+ if test -d "pro"; then :
diff --git a/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch b/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch
new file mode 100644
index 000000000000..a80e966b85de
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch
@@ -0,0 +1,17 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -302,13 +302,7 @@
+ if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then
+    MYSQLTOOL="mariadb_config"
+ else
+-   PATH=$PATH:/usr/local/mysql/bin
+-   AC_CHECK_TOOL(MYSQL, mysql_config)
+-   if test "x$ac_cv_prog_ac_ct_MYSQL" = "xmysql_config"; then
+-     MYSQLTOOL="mysql_config"
+-   else
+-     MYSQLTOOL=""
+-   fi
++   MYSQLTOOL="mysql_config"
+ fi
+ 
+ if test -n "$MYSQLTOOL"; then
diff --git a/net-analyzer/ntopng/files/ntopng-3.0-gentoo.patch b/net-analyzer/ntopng/files/ntopng-3.0-gentoo.patch
new file mode 100644
index 000000000000..90d7aace545c
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-3.0-gentoo.patch
@@ -0,0 +1,60 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,7 +19,6 @@
+ # On CentOS 6 `git rev-list HEAD --count` does not work
+ #
+ #
+-REVISION=`git log --pretty=oneline | wc -l`
+ 
+ if test -d "/usr/local/include"; then
+ CFLAGS="${CFLAGS} -I/usr/local/include"
+@@ -48,33 +47,6 @@
+ 
+ SHORT_MACHINE=`uname -m | cut -b1-3`
+ 
+-GIT_RELEASE="@GIT_RELEASE@"
+-GIT_DATE="@GIT_DATE@"
+-GIT_BRANCH="@GIT_BRANCH@"
+-PRO_GIT_RELEASE="@PRO_GIT_RELEASE@"
+-PRO_GIT_DATE="@PRO_GIT_DATE@"
+-
+-AC_MSG_CHECKING(for nDPI)
+-NDPI_HOME=./nDPI
+-if test -d "$NDPI_HOME" ; then :
+-   AC_MSG_RESULT(found in $NDPI_HOME)
+-else
+-   NDPI_HOME=../nDPI
+-   if test -d "$NDPI_HOME"; then :
+-      AC_MSG_RESULT(found in $NDPI_HOME)
+-   else
+-      NDPI_HOME=$HOME/nDPI
+-      if test -d "$NDPI_HOME"; then :
+-        AC_MSG_RESULT(found in $NDPI_HOME)
+-      else
+-        AC_MSG_RESULT(not found)
+-        echo "Please do cd ..; git clone https://github.com/ntop/nDPI.git; cd nDPI; ./autogen.sh; make; cd ../ntopng"
+-        echo " and try again"
+-        exit
+-      fi
+-   fi
+-fi
+-
+ if test -d "/usr/include/openssl"; then :
+  AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
+  SSL_INC="`pkg-config --cflags libssl` -I/usr/include/openssl"
+@@ -53,15 +53,6 @@
+  SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto"
+ fi
+ 
+-NDPI_LIB=$NDPI_HOME/src/lib/.libs/libndpi.a
+-AC_MSG_CHECKING(for $NDPI_LIB)
+-if test -f "$NDPI_LIB" ; then :
+-  AC_MSG_RESULT(found $NDPI_LIB)
+-else
+-  AC_MSG_RESULT(not found $NDPI_LIB: compiling)
+-  cd $NDPI_HOME; ./autogen.sh; make; cd -
+-fi
+-
+ AC_MSG_CHECKING(for ntopng professional edition)
+ PRO_MAKEFILE_INC=
+ PRO_INC=
diff --git a/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch b/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch
new file mode 100644
index 000000000000..4d2244b582b9
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch
@@ -0,0 +1,17 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -335,13 +335,7 @@
+ if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then
+    MYSQLTOOL="mariadb_config"
+ else
+-   PATH=$PATH:/usr/local/mysql/bin
+-   AC_CHECK_TOOL(MYSQL, mysql_config)
+-   if test "x$ac_cv_prog_ac_ct_MYSQL" = "xmysql_config"; then
+-     MYSQLTOOL="mysql_config"
+-   else
+-     MYSQLTOOL=""
+-   fi
++   MYSQLTOOL="mysql_config"
+ fi
+ 
+ if test -n "$MYSQLTOOL"; then
diff --git a/net-analyzer/ntopng/files/ntopng.conf.d b/net-analyzer/ntopng/files/ntopng.conf.d
new file mode 100644
index 000000000000..b53f5d4ed777
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng.conf.d
@@ -0,0 +1,3 @@
+NTOPNG_OPTS="-i eth0"
+NTOPNG_OPTS="${NTOPNG_OPTS} -m 192.168.0.0/16"
+NTOPNG_OPTS="${NTOPNG_OPTS} -d /var/lib/ntopng"
diff --git a/net-analyzer/ntopng/files/ntopng.init.d b/net-analyzer/ntopng/files/ntopng.init.d
new file mode 100644
index 000000000000..02f911b05a88
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng.init.d
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+    need net redis
+}
+
+start() {
+    ebegin "Starting ntopng"
+    start-stop-daemon --start --exec /usr/bin/ntopng --pidfile /var/run/ntopng.pid --make-pidfile --background -e LUA_PATH='/usr/share/ntopng/scripts/lua/modules/?.lua' -- --user ntopng ${NTOPNG_OPTS}
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping ntopng"
+    start-stop-daemon --stop --exec /usr/bin/ntopng --pidfile /var/run/ntopng.pid
+    eend $?
+}
diff --git a/net-analyzer/ntopng/metadata.xml b/net-analyzer/ntopng/metadata.xml
new file mode 100644
index 000000000000..334443b640d6
--- /dev/null
+++ b/net-analyzer/ntopng/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ntop/ntopng</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/ntopng/ntopng-2.4.ebuild b/net-analyzer/ntopng/ntopng-2.4.ebuild
new file mode 100644
index 000000000000..844b5a810603
--- /dev/null
+++ b/net-analyzer/ntopng/ntopng-2.4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils user toolchain-funcs
+
+DESCRIPTION="Network traffic analyzer with web interface"
+HOMEPAGE="http://www.ntop.org/"
+SRC_URI="mirror://sourceforge/ntop/${PN}/${P}-stable.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-db/sqlite:3
+	dev-python/pyzmq
+	dev-lang/luajit:2
+	dev-libs/json-c
+	dev-libs/geoip
+	dev-libs/glib:2
+	dev-libs/hiredis
+	dev-libs/libxml2
+	net-analyzer/rrdtool
+	net-libs/libpcap
+	net-misc/curl
+	virtual/libmysqlclient
+	!net-libs/nDPI"
+RDEPEND="${DEPEND}
+	dev-db/redis"
+
+S="${WORKDIR}/${P}-stable"
+
+src_prepare() {
+	cat "${S}/configure.seed" | sed "s/@VERSION@/${PV}/g" | sed "s/@SHORT_VERSION@/${PV}/g" > "${S}/configure.ac"
+	epatch "${FILESDIR}/${P}-dont-build-ndpi.patch"
+	epatch "${FILESDIR}/${P}-mysqltool.patch"
+	epatch "${FILESDIR}/${P}-cxx.patch"
+	sed -i 's/exit$/exit 1/g' "${S}/configure.ac" "${S}/nDPI/configure.ac"
+	eautoreconf
+
+	cd "${S}/nDPI"
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC CXX LD NM OBJDUMP PKG_CONFIG
+	cd "${S}/nDPI"
+	econf
+	cd "${S}"
+	econf
+}
+
+src_compile() {
+	cd "${S}/nDPI"
+	emake
+
+	cd "${S}"
+	emake
+}
+
+src_install() {
+	SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}"
+	dodir ${SHARE_NTOPNG_DIR}
+	insinto ${SHARE_NTOPNG_DIR}
+	doins -r httpdocs
+	doins -r scripts
+
+	exeinto /usr/bin
+	doexe ${PN}
+	doman ${PN}.8
+
+	newinitd "${FILESDIR}/ntopng.init.d" ntopng
+	newconfd "${FILESDIR}/ntopng.conf.d" ntopng
+
+	dodir "/var/lib/ntopng"
+	fowners ntopng "${EPREFIX}/var/lib/ntopng"
+}
+
+pkg_setup() {
+	enewuser ntopng
+}
+
+pkg_postinst() {
+	elog "ntopng default creadential are user='admin' password='admin'"
+}
diff --git a/net-analyzer/ntopng/ntopng-3.0-r1.ebuild b/net-analyzer/ntopng/ntopng-3.0-r1.ebuild
new file mode 100644
index 000000000000..3fe29fa78180
--- /dev/null
+++ b/net-analyzer/ntopng/ntopng-3.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools user toolchain-funcs
+
+DESCRIPTION="Network traffic analyzer with web interface"
+HOMEPAGE="http://www.ntop.org/"
+SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-db/sqlite:3
+	dev-python/pyzmq
+	dev-lang/luajit:2
+	dev-libs/json-c
+	dev-libs/geoip
+	dev-libs/glib:2
+	dev-libs/hiredis
+	dev-libs/libxml2
+	net-analyzer/rrdtool
+	net-libs/libpcap
+	net-libs/nDPI
+	net-misc/curl
+	virtual/libmysqlclient"
+RDEPEND="${DEPEND}
+	dev-db/redis"
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-mysqltool.patch
+)
+
+src_prepare() {
+	sed -e "s/@VERSION@/${PV}/g;s/@SHORT_VERSION@/${PV}/g" < "${S}/configure.seed" > "${S}/configure.ac" || die
+
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}"
+	dodir ${SHARE_NTOPNG_DIR}
+	insinto ${SHARE_NTOPNG_DIR}
+	doins -r httpdocs
+	doins -r scripts
+
+	dodir ${SHARE_NTOPNG_DIR}/third-party
+	insinto ${SHARE_NTOPNG_DIR}/third-party
+	doins -r third-party/i18n.lua-master
+	doins -r third-party/lua-resty-template-master
+
+	exeinto /usr/bin
+	doexe ${PN}
+	doman ${PN}.8
+
+	newinitd "${FILESDIR}/ntopng.init.d" ntopng
+	newconfd "${FILESDIR}/ntopng.conf.d" ntopng
+
+	dodir "/var/lib/ntopng"
+	fowners ntopng "${EPREFIX}/var/lib/ntopng"
+}
+
+pkg_setup() {
+	enewuser ntopng
+}
+
+pkg_postinst() {
+	elog "ntopng default credentials are user='admin' password='admin'"
+}
diff --git a/net-analyzer/nttcp/Manifest b/net-analyzer/nttcp/Manifest
new file mode 100644
index 000000000000..3b48497d6fa7
--- /dev/null
+++ b/net-analyzer/nttcp/Manifest
@@ -0,0 +1,7 @@
+AUX nttcp-1.47-format-security.patch 3620 SHA256 bfe9e2dee548d6b33dcfa681f210fc61a5f580ad5b8973cb097a7e40814d587b SHA512 7976fb58cbc6f15d93f0e4485cf9477bf03b3794dcebe9b0905c12250279d23ff3f34a6dee30e961d38cbeb85e4a97daaecdffe89adc7136ccabecf31bb794ea WHIRLPOOL c5191d57463a2dd99c46b245b34766a6a82261f25f75434b9dcea56498eb76fd1be7fce368c6c186b43c04cdcddda23f1a8ba594c4391385c111060ba06a413d
+DIST nttcp-1.47.tar.gz 25693 SHA256 a0e0ac34d250ba874f9ce75da60717cde8da4ebbef56879bbc8b8ed2743b81ae SHA512 eb0a5aa0633555a6e4c3834e99666cd0e00d41da5d82fdfd2644a9f59727236f1b24fbe810272cf9cfb96d76361b028bcf57025008570dbd6b0d761df5cce625 WHIRLPOOL 4565335b23ad89e609d04a8c2c8eef914bbe85da2696da5a1fa352a02feaa13faca71f9058e34ab621fcf3b3653a334cfad67a22b81ca325c0caed789b7931fc
+EBUILD nttcp-1.47-r1.ebuild 577 SHA256 555eea5a9bb864253644a695683c29b7f2af541d9d646076ae5feeb6b3323f11 SHA512 1047838a6a4889deacc9203d2c98d5d62c6654700f70d4402c0c07751c4786092b2f8756305441d50c2dac61f5779ad54621c9f430c39c9d0d0073e7e5a585a8 WHIRLPOOL 7e873bd92a95f28bf6c65d5fdc04ef1d85999d20bbc014ec0e2ef3012b2ad3e75989db7c35477ed7e03f4cb6fb5c1d65c0bfc19f30d0f1d6616384fdf2f3615e
+EBUILD nttcp-1.47-r3.ebuild 577 SHA256 7598d8b9df6cafb8b5b433174c9990a47b637d529cd578cb6bfeb8dc43af92ac SHA512 58e74de3d225a95a6523014d32dd631fdc795c19e6d32238305fb8d4d6f9556f12de1c22df3dc7bd5cbe8d3f5cbd1867a34fd46e88fc2b535151106cf03d6469 WHIRLPOOL 8e4bc2baab35d2d23373caf92481e842f534f79bdfd95d345ec833ebedfed45812d7f13c1f60af0ba854bc2aa74ca3c160ebc657a5cd65b9bd2498288d1f440d
+MISC ChangeLog 2524 SHA256 dcbf22dee188d46c715e42cc145f91edd454265d601ba9544b90f2f30b490a78 SHA512 b16502af05f311b338cc2e1afbc587957507b1c53aca4ff1baae3a7283372d0b96d83ec93349754eace079a107c53179f787143a83fd0a52e73dc48c03b3803e WHIRLPOOL 9a0628167606f548ce16d5ebad8a44ff905dd39d22742a7728dd9f17efad141b082205d671d6839744f109fa5c35cea1f0915c4d8b797619e1a22e9910b0a36d
+MISC ChangeLog-2015 2893 SHA256 e173f055deb0489fb161867e212156c2be29ec0252b319ba246fe0eca70a216e SHA512 f9d32be2afd0fb09569754c07cebec796f207399fa1cb979842c8d752b2112e2cd556aa1175c3298eb90e0798c3fe182a95f4a979957ec28d9933d7cd3e1c164 WHIRLPOOL 84afd61a178fc8082275b0e6302d9db91a94a0af6f159856879e6b1810a1b7cc8d3563cc708b8c0eb71dc269aa67874247f216a55fc07008e4cba4be7e2764e8
+MISC metadata.xml 347 SHA256 9f6da253ce01045e5cde3003ad08b101f00011ca383b66edb638044694c2f439 SHA512 72d427b0c64a4225fe272ef7873f3549ae88bfa261e1aeaf06c2dfa72284d61d2f48f9028b6466a4715b1e4759b6ade4d6958463a170530fbacccb9a1695025e WHIRLPOOL 6f91d31a848e85c2bd29aec663b305764c3aecfb015729d0f87bdb96b1b1f59483f6e5afbe720da19ded26a2058a0d7d7189cf6935e892c8298795c0bc88e8b5
diff --git a/net-analyzer/nttcp/files/nttcp-1.47-format-security.patch b/net-analyzer/nttcp/files/nttcp-1.47-format-security.patch
new file mode 100644
index 000000000000..514b5fa6e33b
--- /dev/null
+++ b/net-analyzer/nttcp/files/nttcp-1.47-format-security.patch
@@ -0,0 +1,132 @@
+--- a/nttcp.c
++++ b/nttcp.c
+@@ -372,7 +372,7 @@
+ #define Message(x)	fMessage(stdout, x)
+ 
+ void Exit(char *s, int ret) {
+-    syslog(LOG_DEBUG, s);
++    syslog(LOG_DEBUG, "%s\n", s);
+     fMessage(stderr,s);
+     exit(ret);
+ }
+@@ -694,7 +694,7 @@
+     register int cnt;
+     if (opt.udp) {
+ 	struct sockaddr_in from;
+-	int len= sizeof(from);
++	socklen_t len= sizeof(from);
+ 	 cnt= recvfrom(fd, buf, count, 0, (struct sockaddr *)&from, &len);
+ 	 SysCalls++;
+     }
+@@ -1150,8 +1150,8 @@
+ int main(int argc, char *argv[]) {
+ 
+     struct sockaddr_in PeerAddr;
+-    int  PeerAddrLeng;
+-    char *DataPortFormat= "dataport: %d\n";
++    socklen_t  PeerAddrLeng;
++    const char DataPortFormat[]= "dataport: %d\n";
+     int DataPort;
+     struct sockaddr_in sinlh;	/* for control socket on local host */
+     int  fd;	     		/* data socket to transport the data */
+@@ -1184,7 +1184,8 @@
+     } 
+     if (opt.inetd) {
+     	/* we simulate inetd behaviour */
+-	int nsrv, srv, fromleng;
++	int nsrv, srv;
++	socklen_t fromleng;
+ 	struct sockaddr_in sinsrv;
+ 	struct sockaddr_in frominet;
+ 	if (opt.Verbose) {
+@@ -1285,7 +1286,7 @@
+ 	    Exit(MsgBuf, 2);
+ 	}
+ 	if (OptionLine[sizeof(OptionLine)-1] != '\0') {
+-	    sprintf(MsgBuf, "%s: optionline longer than %d\n",
++	    sprintf(MsgBuf, "%s: optionline longer than %zd\n",
+ 	      myname, sizeof(OptionLine)-1);
+ 	    Exit(MsgBuf, 3);
+ 	}
+@@ -1308,7 +1309,7 @@
+     	Peer[PeerCount].fin= stdin;
+     	Peer[PeerCount].fout= stdout;
+ 	syslog(LOG_DEBUG,
+-	  "call from %.50 (=%.30s): done remote initial processing\n",
++	  "call from %.50s (=%.30s): done remote initial processing\n",
+ 	  Peer[PeerCount].HostName, Peer[PeerCount].IPName);
+ 	PeerCount++;
+     }
+@@ -1617,7 +1618,7 @@
+ 	sinlh.sin_family = AF_INET;
+ #if defined(MULTICAST)
+ 	if (opt.MulticastChannel) {
+-	    int ml, p, join_group;
++	    int p, join_group;
+ 	    struct ip_mreq mreq;
+ 	    sinlh.sin_port = htons(opt.MulticastPort);
+ 	    if (bind(fd, (struct sockaddr *)&sinlh, sizeof(sinlh)) < 0) {
+@@ -1640,7 +1641,6 @@
+ 		sprintf(MsgBuf, DataPortFormat, DEFAULT_PORT);
+ 
+ 	    /* tell it our clients */
+-	    ml= strlen(MsgBuf);
+ 	    for (p=0; p<PeerCount; p++) {
+ 	    	fputs(MsgBuf, Peer[p].fout);
+ 		fflush(Peer[p].fout);
+@@ -1683,7 +1683,7 @@
+ 	}
+ 	else { /* == TCP */
+ 	    struct sockaddr_in frominet;
+-	    int fromleng;
++	    socklen_t fromleng;
+ 	    fromleng = sizeof(frominet);
+ 	    memset(&frominet, 0, fromleng);
+ 	    AlarmMsg= "accept timed out\n";
+@@ -1694,7 +1694,7 @@
+ 	    SetItVal(0);
+ 	    if (opt.Verbose) {
+ 		struct sockaddr_in peer;
+-		int peerlen = sizeof(peer);
++		socklen_t peerlen = sizeof(peer);
+ 		if (getpeername(fd, (struct sockaddr *)&peer, &peerlen) < 0)
+ 		    exitError("getpeername", 19);
+ 		sprintf(MsgBuf,
+@@ -1732,7 +1732,7 @@
+ 
+     /* print window sizes */
+     if (opt.Verbose) {
+-	int optlen;
++	socklen_t optlen;
+ 	int WinSize;
+ 
+ 	optlen= sizeof(WinSize);
+@@ -1899,8 +1899,8 @@
+ 	 * rcr		real call reate in Calls/s	(float)
+ 	 * ccr		cpu call rate in Calls/s	(float)
+ 	 */
+-	char *iFormat= "%*.*ld";
+-	char *fFormat= "%*.*f";
++	const char iFormat[]= "%*.*ld";
++	const char fFormat[]= "%*.*f";
+ 	char *fs;
+ 	LenStr *TitleLine, *StatLine;
+ 
+@@ -2002,7 +2002,7 @@
+ 		fs+= 2;
+ 	    }
+ 	    else if (*fs == 'l') {
+-		sprintf(MsgBuf, iFormat, fw, fp, opt.BufLen);
++		sprintf(MsgBuf, iFormat, fw, fp, (long int)opt.BufLen);
+ 		TitleStr= "BufLen";
+ 		fs++;
+ 	    }
+@@ -2017,7 +2017,7 @@
+ 		fs++;
+ 	    }
+ 	    else if (*fs == 'c') {
+-		sprintf(MsgBuf, iFormat, fw, fp, SysCalls);
++		sprintf(MsgBuf, iFormat, fw, fp, (long int)SysCalls);
+ 		TitleStr= "Calls";
+ 		fs++;
+ 	    }
diff --git a/net-analyzer/nttcp/metadata.xml b/net-analyzer/nttcp/metadata.xml
new file mode 100644
index 000000000000..c9c02c73ae91
--- /dev/null
+++ b/net-analyzer/nttcp/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<longdescription>tool to test TCP and UDP throughput</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/nttcp/nttcp-1.47-r1.ebuild b/net-analyzer/nttcp/nttcp-1.47-r1.ebuild
new file mode 100644
index 000000000000..5d6f49f09066
--- /dev/null
+++ b/net-analyzer/nttcp/nttcp-1.47-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="tool to test TCP and UDP throughput"
+HOMEPAGE="http://www.leo.org/~elmar/nttcp/"
+SRC_URI="http://www.leo.org/~elmar/nttcp/${P}.tar.gz"
+LICENSE="public-domain"
+
+SLOT="0"
+KEYWORDS="amd64 ~mips ~ppc x86"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-format-security.patch
+}
+
+src_compile() {
+	emake \
+		ARCH= \
+		CC="$(tc-getCC)" \
+		LFLAGS="${LDFLAGS}" \
+		OPT="${CFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+}
diff --git a/net-analyzer/nttcp/nttcp-1.47-r3.ebuild b/net-analyzer/nttcp/nttcp-1.47-r3.ebuild
new file mode 100644
index 000000000000..f502164771a3
--- /dev/null
+++ b/net-analyzer/nttcp/nttcp-1.47-r3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="tool to test TCP and UDP throughput"
+HOMEPAGE="http://www.leo.org/~elmar/nttcp/"
+SRC_URI="http://www.leo.org/~elmar/nttcp/${P}.tar.gz"
+LICENSE="public-domain"
+
+SLOT="0"
+KEYWORDS="amd64 ~mips ~ppc x86"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-format-security.patch
+}
+
+src_compile() {
+	emake \
+		ARCH= \
+		CC="$(tc-getCC)" \
+		LFLAGS="${LDFLAGS}" \
+		OPT="${CFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+}
diff --git a/net-analyzer/odhcploc/Manifest b/net-analyzer/odhcploc/Manifest
new file mode 100644
index 000000000000..b8ad7d029508
--- /dev/null
+++ b/net-analyzer/odhcploc/Manifest
@@ -0,0 +1,5 @@
+DIST odhcploc-20111021.tar.gz 13831 SHA256 b0360a3aece8a29d131531da7bfc36d57c30c6eed30ff1ea360f7cccea1d62d7 SHA512 3270b2bf25e079544805ceaba152e4d47a3cae3d78db0429b21c884686de8e0a872628a92390eebe5128ebcf9dcc3d14020420bb95ae8b367784ae4282d21556 WHIRLPOOL 9acefccbc36c5aff28d111ecd86d178231d8db555e9eac67c6d9699808edb90ed8c70f9448a6afb76dbfcf1c1ba5cd833618b7327b2bda01bbf22d1e06aad24b
+EBUILD odhcploc-20111021.ebuild 416 SHA256 5015b0a3b969a0cc56db63375682381e7d3a730b0f8b67e2006ab2d8b531cb5a SHA512 366fd9bd438ea318d5cbd116ea0e1bffc40db18917590d1a473ab8de5fc34858f52a54d2ea0d181f5136617ea5e10d58637f40bd7a2233c45b73c744c6328fcb WHIRLPOOL 3c670a49b08295418863a111e168de67e8852724970420361bc3ac72f50c9ac8a01fcc559691bbe409588672e78d72a34491da78ea2b356393adaddd9db3bbed
+MISC ChangeLog 2440 SHA256 1387c67056429416d36411a6d37d68451aed1eef91e7f0640ad5310ea00fffc8 SHA512 16e803d2f63123df88f3157de73a1426561a05de6cbf5d70c7dcd7d57b5d518c1a03fd89627c28b330cb0ca73a72d812eff77fcf7e945fc1cefcde22b8d860ba WHIRLPOOL 38be15610b223c1cf895fbe2d075b949262ddd9544858078154e260f222935c59cbc3af88f4354d8369f8d8141157eee7a29f8ea584c75cff049cb082d167765
+MISC ChangeLog-2015 568 SHA256 3e79dea250ae3891af9c717ad34d53040b32ef02514b2b6819ab0cc7bc5d5920 SHA512 8f7e4d557b8321f648f15180ba23becd7dd8a2fb87e53ade71fc82de4440d99d004e341d9ce01c4b0a7d7bf40fcb83ea2b1cdd9b7feee3ff6b406bf015706318 WHIRLPOOL 5778e486313e320f5637921e96b8b02f1cd4b1719239d59d01d9c67747ec392803b488956cb71a2ea53531ac30234f46a412ce57e41835bfb00a19513543a82f
+MISC metadata.xml 463 SHA256 e55875e65b022c71715fe188f2ea44bca9b8bff69ba38d3f06d5f5b72252f599 SHA512 17259ba58976713396fb8bbf67e994f0106c219798de1e08b8cee64c89d8bfaef01af32f108f3f7e4335b9d1b3a7af194ae9396eb042d1e7d7abd1df1e338b91 WHIRLPOOL 4c8db201d1a260aefeb151f1197b56059f9307b19efb382cfa7e033c2742e11c07605cb8507744411996a2408ce72158e385154c5360a29f53b37fc1cd8aa63b
diff --git a/net-analyzer/odhcploc/metadata.xml b/net-analyzer/odhcploc/metadata.xml
new file mode 100644
index 000000000000..dec13966250c
--- /dev/null
+++ b/net-analyzer/odhcploc/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jer@gentoo.org</email>
+		<name>Jeroen Roovers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">odhcploc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/odhcploc/odhcploc-20111021.ebuild b/net-analyzer/odhcploc/odhcploc-20111021.ebuild
new file mode 100644
index 000000000000..aff915d2ef97
--- /dev/null
+++ b/net-analyzer/odhcploc/odhcploc-20111021.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="Open DHCP Locator"
+HOMEPAGE="http://odhcploc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_prepare() {
+	tc-export CC
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.8
+	dodoc AUTHORS
+}
diff --git a/net-analyzer/oinkmaster/Manifest b/net-analyzer/oinkmaster/Manifest
new file mode 100644
index 000000000000..50c24e85cb8e
--- /dev/null
+++ b/net-analyzer/oinkmaster/Manifest
@@ -0,0 +1,5 @@
+DIST oinkmaster-2.0.tar.gz 80111 SHA256 3d52f0426aa7c81b122cef22b80d708d8bb8337537e48754a065804f46c46162 SHA512 03874462cff71e558d4383fef9e757eb4260b20f4b1de4741edcd49fec6effe32669e95edb637962b77b12c519deeb74adc3c15427d0e054e1b96e2f03ffdb3b WHIRLPOOL eff3cdce34eaa067eba9217d7fc867a897ba9734577c55eff49499657149cb3f55310bd03342cccabfcf62e1b7418b9ec1962937a355d3d3728efe21be617ef9
+EBUILD oinkmaster-2.0.ebuild 744 SHA256 b1c723342262a980bd9b27e8639cc794f25f4b65c5f3a57aa84da932e2131c67 SHA512 e899c2bc8447c16f68cbb70c5045e3209fc465053f5169befbf0ce3c6ffbf8b2a64616be98a6f60fb0d2ea69dac135f4fa7a3483517db3280fd77d2eeb709b4f WHIRLPOOL 31b2e99a2c90ad5ebed30198872600a41f698c16bff80c4df7ffc994d2d4903e8e4df734aab233d4ba59273e6ad6c7980210293415f2389f3193ea327315e258
+MISC ChangeLog 2584 SHA256 5f6f101637b6adef77d14218ab52c1a1f75231691edf39445b0d698b46e57ab0 SHA512 415613b2b219c4d2843ba46341b358f21651366c98fd43365018baf6624cb287a2f22e0485afd92b78877e89d37595bec2862b53053e8ecc760cc97f1f35c7ae WHIRLPOOL 4c451212ddb882db202d65fb52c6b7684adf60f2b22dfcbce5a3fc6b18968c48c2cd081de165f0147659e0f772321a944d9ecc6da4c4154b84ff99b1c02ff6f3
+MISC ChangeLog-2015 3039 SHA256 b9e65c556fd06d19170aa4b5d732a8f3a78fd4a76cdac8b68edf10b3fcb6217d SHA512 155629530f78ef9021df3c4bdebacc3c88df7369bcd4bd50df6f7381188100e186dab2ef50eb3e29bb3362bc2b65f3d8ab56e8b1a26949fb835e29c7b1867765 WHIRLPOOL 61be91392332779bcca2264288bc8e7c883e5a08f4bd8e0ff2938e8b26f9a05e7bc87ec25d9cd9f40cedcb4d23ef85a4dca5dde1654e5176caf550b236f0e8a2
+MISC metadata.xml 360 SHA256 1dcbdc14f3686336a6cde02f81db9a99e2ef689d125aa910c03db3301a1b8dd8 SHA512 97150af5c7f0f4e55c75a36ff3613206ac188b266cc5e97eac505e7a1f314f63357b2b99ab7a3e57de66c00eac5150f6329549edb2cb38acd26d92a36e8bc1c2 WHIRLPOOL aa1d3091c25d6ab5ae5bd9a828299160304d88ff65b830715cf802a79bbcd0629066d754fd76db97daeea1db84a5b001795e4bc75754fe566213d88fddec26b1
diff --git a/net-analyzer/oinkmaster/metadata.xml b/net-analyzer/oinkmaster/metadata.xml
new file mode 100644
index 000000000000..ec5e8f6c9ef7
--- /dev/null
+++ b/net-analyzer/oinkmaster/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">oinkmaster</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/oinkmaster/oinkmaster-2.0.ebuild b/net-analyzer/oinkmaster/oinkmaster-2.0.ebuild
new file mode 100644
index 000000000000..35f0ef818c0b
--- /dev/null
+++ b/net-analyzer/oinkmaster/oinkmaster-2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Rule management for SNORT"
+SRC_URI="mirror://sourceforge/oinkmaster/${P}.tar.gz"
+HOMEPAGE="http://oinkmaster.sf.net/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc sparc x86"
+IUSE="X"
+
+RDEPEND="
+	>=dev-lang/perl-5.6.1
+	X? ( dev-perl/Tk )
+	net-misc/wget
+	app-arch/tar
+	app-arch/gzip
+"
+
+src_install() {
+	dobin \
+		contrib/addmsg.pl \
+		contrib/addsid.pl \
+		contrib/create-sidmap.pl \
+		contrib/makesidex.pl \
+		oinkmaster.pl
+
+	use X && dobin contrib/oinkgui.pl
+
+	dodoc FAQ README README.gui README.win32 UPGRADING contrib/README.contrib
+
+	doman oinkmaster.1
+
+	insinto /etc
+	doins oinkmaster.conf
+}
diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest
new file mode 100644
index 000000000000..cbf464f536fb
--- /dev/null
+++ b/net-analyzer/openbsd-netcat/Manifest
@@ -0,0 +1,10 @@
+AUX openbsd-netcat-1.105-darwin.patch 1591 SHA256 267677822a034f755563699f6055abb2cc44a676030724bee90c225aa7c46f4d SHA512 12a36f277b5a88491bcd8b3cb1c564bf9e3251c2a2b0f113ee425aa554bbb29b5cd2a87cdf0f67ad6b9cf3bc9a56d8a175d73ce4cb86fb4c531fd146b85b0ee9 WHIRLPOOL 333014699d5824b8efb7901f63722a32df3ace3823ad06e87620a2df604a7d6fedf05f0a58a1b3da440c1097a33b49b096d65d3670e5e775d66d2cf41ef68e04
+DIST nc-1.84-22.el6.src.rpm 62570 SHA256 8aa023a96a11f47fbaccda332f7e2c73697c271d2bd25b2485470d288d0db844 SHA512 a02f5a42e0db0aeff95a06964d6b9ccfa21d659ca67505d19c724966edbca42446ac4048339def769139ca6ae145cdc75e9908f12b21449bc9d748d3cac39094 WHIRLPOOL fb4b822b88fdf0097781ff8f23489e4300563e3c6f655b00519a2ced93f17cd433d5f3acf2cd66a7f97e4b3755838c9dc8619e0c1e5fbc54136a33212a8c7613
+DIST netcat-openbsd_1.105-7.debian.tar.gz 31843 SHA256 eee759327ffea293e81d0dde67921b7fcfcad279ffd7a2c9d037bbc8f882b363 SHA512 ec507c858a9f0e75f5a8d6ee8e60eef5200428e55091e831a7acba6c61d70f97af01103c9b65354b0ce773214b0758d957852af793debb70be8aab5b5900b3f6 WHIRLPOOL 62878c51077b26578626f45e1282f2c1f16ae869714b355ef1797ec2911b8773ef07c81468e35bae02087f9f061b828be39200333c204e77b0bdb1ac9eceb957
+DIST netcat-openbsd_1.105.orig.tar.gz 14891 SHA256 40653fe66c1516876b61b07e093d826e2a5463c5d994f1b7e6ce328f3edb211e SHA512 1e515b5af83a12c6f270d6e8bede6406cc7c9f83ca0e316816508dfe2e2c49cda3fffb6b24a3922bf9908dc8b70d540eb8cc49e9cbfe867e49133c004d3f4703 WHIRLPOOL 7e80dde953575b5fc21399ef1d1d40c8cd6b40a5d6cd81d8a606d14b35ce8432c304d3e1bdaf9fb4697cf6dffc017b565cd60033ec0700d2442bc3ea3ca6aa9a
+EBUILD openbsd-netcat-1.105-r1.ebuild 1430 SHA256 c07cf8e7dfbeedfa1a96f0054aa0236560ee455474ceb7e675d72738cc9dff9a SHA512 186bd9579a5281d8bda48e81b51d307ca44597e003de96c6a4cd17663db5afea1b9e80baf7d7a581ba3055b253e31cdb60b0e0970b385d6a71aab684d2469209 WHIRLPOOL be0307fd44faed4bf0d07d7f2d85a943d6829f269291f245f819dccff1c57f31dcdd8e1fd324c4f065038539ad1146a8662af0cabf1ee0c6d99b85291894c039
+EBUILD openbsd-netcat-1.105.ebuild 1134 SHA256 b88cc2da5dfa08c49674b883c5100f645a7f67051b6f9b09f439011ef4430676 SHA512 e589f9d09d36eed49ef88cffa0363f8244a0ade60710a043eed891d6c31c008e597b2df5ece4cd87e8ddc4d5078222aa8cff608d51c5ae02be0dccefca1b3a9b WHIRLPOOL f55a257dc8467d91d29c7afa625cd1349b36f4cc1a18fe51ffcf7da1d84e536f815186b0ede3e74c18376cfddd2fc8cb7cc048609cfeebf26496563c1f48a9a3
+EBUILD openbsd-netcat-1.84.ebuild 1718 SHA256 658e755bd8ccd255e65e809b2f4f4b462f47ffb25bd3a0bce4404a9d3d5dc659 SHA512 86a6d3c60ec99753c8a27052c8bc83aa926f643ef86cec88a895ea14bcea78c5517e519ab7cc439091a1ab1602d37c7d6034a316eb614cbd55e35e90511b0ac0 WHIRLPOOL c176db0a8535df1be13c9b06885679362c2609968507d7efdbf4ae4d676d37ef1720439455ad56c59295ca39d5eade4c1d536549dfff47b8e9e9c7469db940c6
+MISC ChangeLog 3163 SHA256 bb287d94cac21f6b8b6f3fc46eaaf0fa2d94128d4a3fc73c36e1abdb36f2bbf5 SHA512 f9190a27c156dbc687e5198497a90b3c394dd3d2aae62d0c215ecb93936905a9ce945f5e202a51236b753662b1efea889e4462cbf8a72908962261856236e2a0 WHIRLPOOL 16f4ce626abe8a94acd62d130cced2e91d06c3a21f1759e8e86cf41838494c74d71d930d39dc7cab8ee53d0d50f5b50a1003d0da82728e71533ad8f3002ff3cd
+MISC ChangeLog-2015 946 SHA256 47bd1ee2cbf31cc9b07d6bc15cae6610aaacc207891316f61a3bfefd78596442 SHA512 2775b1ba8e941a4dbbb5ef0a8bfb0415c95f8be2ef6d57b2397816f3a9faf97e24d994047b457c2f04f8181b01b921709839c5135b8324a86074f5b25ebaed58 WHIRLPOOL 1742d5ef06a27d02955c7b31804268352c4053ee68caa2ac21094a89b483f34b8c48e8dbec2f72029e3ec0b5a377303926a9b1bdbe10c8f907fd1f88bae8e6fe
+MISC metadata.xml 351 SHA256 2eb8aa0bc9e25838e1e4e73c7d8049b1cd23bea91ba969511f107253c23efbcb SHA512 80bf423a6e8309ff117540ce0d2e29eeea89f3de4c4e4aea161ba37675ff0415a4f5a8cc37cb2ffe841e702de66a324888509a2f66df9576b76e774febfc8936 WHIRLPOOL d61c9621485ebea6404a82dc86c2d1a69f92bf842ec2774b421ef0f5e6946570523c78f1502acfeb64d1c093253ca317701f69ab4ba6a8927a6d29988e17ffa3
diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch
new file mode 100644
index 000000000000..8c68a66ad548
--- /dev/null
+++ b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch
@@ -0,0 +1,86 @@
+Allow compilation on Darwin
+
+--- netcat.c
++++ netcat.c
+@@ -43,11 +43,13 @@
+ #include <arpa/telnet.h>
+ #include <arpa/inet.h>
+ 
++#ifndef IPTOS_LOWCOST
++# define IPTOS_LOWCOST 0x02
++#endif
+ #ifndef IPTOS_LOWDELAY
+ # define IPTOS_LOWDELAY 0x10
+ # define IPTOS_THROUGHPUT 0x08
+ # define IPTOS_RELIABILITY 0x04
+-# define IPTOS_LOWCOST 0x02
+ # define IPTOS_MINCOST IPTOS_LOWCOST
+ #endif /* IPTOS_LOWDELAY */
+ 
+@@ -96,8 +98,9 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <limits.h>
+-#include <bsd/stdlib.h>
+-#include <bsd/string.h>
++#include <stdlib.h>
++#include <string.h>
++#include <ctype.h>
+ #include "atomicio.h"
+ 
+ #ifndef SUN_LEN
+@@ -169,6 +172,43 @@
+         socklen_t salen, int ctimeout);
+ static void quit();
+ 
++static char* strtonumerrs[] = {
++	"too large",
++	"too small",
++	"invalid"
++};
++
++static long long
++strtonum(
++		const char *nptr,
++		long long minval,
++		long long maxval,
++		const char **errstr)
++{
++	long long val;
++	
++	while (*nptr != '\0' && isspace(*nptr))
++		nptr++;
++	if (*nptr == '\0') {
++		if (errstr != NULL)
++			*errstr = strtonumerrs[2];
++		return 0;
++	}
++	val = atoll(nptr);
++	if (val < minval) {
++		if (errstr != NULL)
++			*errstr = strtonumerrs[1];
++		return 0;
++	}
++	if (val > maxval) {
++		if (errstr != NULL)
++			*errstr = strtonumerrs[0];
++		return 0;
++	}
++	*errstr = NULL;
++	return val;
++}
++
+ int
+ main(int argc, char *argv[])
+ {
+--- socks.c
++++ socks.c
+@@ -38,7 +38,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <resolv.h>
+-#include <bsd/readpassphrase.h>
++#include <readpassphrase.h>
+ #include "atomicio.h"
+ 
+ #define SOCKS_PORT	"1080"
diff --git a/net-analyzer/openbsd-netcat/metadata.xml b/net-analyzer/openbsd-netcat/metadata.xml
new file mode 100644
index 000000000000..e6b017e50acc
--- /dev/null
+++ b/net-analyzer/openbsd-netcat/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+    <email>heroxbd@gentoo.org</email>
+    <name>Benda Xu</name>
+</maintainer>
+<longdescription lang="en">
+    This package provides the openbsd linux port of netcat.
+</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild
new file mode 100644
index 000000000000..fbc35796377b
--- /dev/null
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="The OpenBSD network swiss army knife"
+HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/"
+SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz
+	http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-7.debian.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+IUSE="elibc_Darwin"
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+
+DEPEND="virtual/pkgconfig"
+RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
+	!net-analyzer/netcat
+	!net-analyzer/netcat6
+"
+
+S=${WORKDIR}/netcat-openbsd-${PV}
+
+PATCHES=( "${WORKDIR}/debian/patches" )
+
+src_prepare() {
+	default
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# this undoes some of the Debian/Linux changes
+		epatch "${FILESDIR}"/${P}-darwin.patch
+	fi
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
+}
+
+src_install() {
+	dobin nc
+	doman nc.1
+	cd "${WORKDIR}/debian"
+	newdoc netcat-openbsd.README.Debian README
+	dodoc -r examples
+}
+
+pkg_postinst() {
+	if [[ ${KERNEL} = "linux" ]]; then
+		ewarn "FO_REUSEPORT is introduced in linux 3.9. If your running kernel is older"
+		ewarn "and kernel header is newer, nc will not listen correctly. Matching the header"
+		ewarn "to the running kernel will do. See bug #490246 for details."
+	fi
+}
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105.ebuild
new file mode 100644
index 000000000000..34432cdfd0dd
--- /dev/null
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="the OpenBSD network swiss army knife"
+HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/"
+SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz
+	http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-7.debian.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x64-macos"
+
+DEPEND="virtual/pkgconfig"
+RDEPEND="dev-libs/libbsd"
+
+S=${WORKDIR}/netcat-openbsd-${PV}
+
+PATCHES=( "${WORKDIR}/debian/patches" )
+
+src_install() {
+	# avoid name conflict against net-analyzer/netcat
+	newbin nc nc.openbsd
+	newman nc.1 nc.openbsd.1
+	cd "${WORKDIR}/debian"
+	newdoc netcat-openbsd.README.Debian README
+	dodoc -r examples
+}
+
+pkg_postinst() {
+	if [[ ${KERNEL} = "linux" ]]; then
+		ewarn "FO_REUSEPORT is introduced in linux 3.9. If your running kernel is older"
+		ewarn "and kernel header is newer, nc will not listen correctly. Matching the header"
+		ewarn "to the running kernel will do. See bug #490246 for details."
+	fi
+}
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.84.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.84.ebuild
new file mode 100644
index 000000000000..201bfeb79f87
--- /dev/null
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.84.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs rpm
+
+DESCRIPTION="the OpenBSD network swiss army knife"
+HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/"
+SRC_URI="ftp://ftp.redhat.com/pub/redhat/linux/enterprise/6Server/en/os/SRPMS/nc-1.84-22.el6.src.rpm"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="static"
+
+DEPEND="dev-libs/glib:2"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/nc
+
+src_unpack() {
+	rpm_src_unpack
+}
+
+src_prepare() {
+	epatch "../nc-1.84-glib.patch"
+	epatch "../nc-1.78-pollhup.patch"
+	epatch "../nc-1.82-reuseaddr.patch"
+	epatch "../nc-gcc_signess.patch"
+	epatch "../nc-1.84-connect_with_timeout.patch"
+	epatch "../nc-1.84-udp_stop.patch"
+	epatch "../nc-1.84-udp_port_scan.patch"
+	epatch "../nc-1.84-crlf.patch"
+	epatch "../nc-1.84-verb.patch"
+	epatch "../nc-1.84-man.patch"
+	epatch "../nc-1.84-gcc4.3.patch"
+	epatch "../nc-1.84-efficient_reads.patch"
+	epatch "../nc-1.84-verbose-segfault.patch"
+
+	# avoid name conflict against net-analyzer/netcat
+	mv nc.1 nc.openbsd.1
+}
+
+src_compile() {
+	use static && export STATIC="-static"
+	COMPILER=$(tc-getCC)
+	${COMPILER} ${CFLAGS} netcat.c atomicio.c socks.c \
+		$(pkg-config --cflags --libs glib-2.0) \
+		${LDFLAGS} -o nc.openbsd || die
+}
+
+src_install() {
+	dobin nc.openbsd
+	dodoc README*
+	doman nc.openbsd.1
+	docinto scripts
+	dodoc scripts/*
+}
+
+pkg_postinst() {
+	if [[ ${KERNEL} = "linux" ]]; then
+		ewarn "FO_REUSEPORT is introduced in linux 3.9. If your running kernel is older"
+		ewarn "and kernel header is newer, nc will not listen correctly. Matching the header"
+		ewarn "to the running kernel will do. See bug #490246 for details."
+	fi
+}
diff --git a/net-analyzer/openvas-cli/Manifest b/net-analyzer/openvas-cli/Manifest
new file mode 100644
index 000000000000..bcfbaf7178e3
--- /dev/null
+++ b/net-analyzer/openvas-cli/Manifest
@@ -0,0 +1,5 @@
+DIST openvas-cli-1.4.3.tar.gz 108228 SHA256 69b9b31c0391f6a7e2d1e6fe7f18616c8cfaac570a665192ccbdeae6da0f5978 SHA512 a85c754612b8f8102aa1ccf0af72f3266758c4873f7c346004b4f6794bfa8e562dbe14009ae04a2792978354454fa75f8a912bc13a83bce3604ff00019c363e3 WHIRLPOOL f3d650634519347a936b1abf147f6b05699dca65c56ae9b3a6ec39520240522558bc921b756196d23f874ffd37fe67a9f0018f5056f183d0361820c7d35b5771
+EBUILD openvas-cli-1.4.3.ebuild 695 SHA256 e4c2a798c3605c89a295c7133d3a732d1e14b8c653ce94045a3090d1eef82d1d SHA512 102809a74751aaa126f9aec10e6f013e52ffeac6eae7a92bf8f645a6878bc13c067ff4ee1970c3cf1bd553644977190cb3e4bbb0087fb6b62e82baf368825cb6 WHIRLPOOL eecb5a7cec31706e97656843407a33b083ae01ceafee45b7f7938b935ba345f2f704445824909d2bfe928c7a3fb08737d9e828fe0b5042bcd110afd70540d0aa
+MISC ChangeLog 2888 SHA256 570826bf29a0c866ceae15d3134e29f417891af13d7e1120e09c71717090ede8 SHA512 542f27043bbbe94575c6eafca831f223290586b9cec15e984bc9976181393f5cb710253a49b80e020055882caf7e9541b8cff0e4fc4e184849a5231afac0ebe5 WHIRLPOOL aa5589601e888b1863cfc24cd6bf3c739f48f05ba5ed78bcfa584c63d7fca49366a16fadb9e65f24c0cdb59d3e445a6e8302cdc72568acdbd502c20eaecf28ad
+MISC ChangeLog-2015 2453 SHA256 53771e2f2015adf828a106c0a13aeb2656154df598a1305a10b90d7de3f02950 SHA512 0ef8d46991dc785c85498fc423e71f66758ce0d833fd9fd0133c368507a0ebb886760d9c510df454e433f54ea77a39b3bd3954fcc91e9ac60e432b0e140aaada WHIRLPOOL 809fe40b9488dfe856aa86796b0e1316e647be0a2dbb27e44dbd426b57fc22667a3b847076089c707db317ea3901a5cde04b352e030965af57f23de6e128ad31
+MISC metadata.xml 220 SHA256 49e2069f4751ed7f79a433d3b76bc345fcb099ac35f7b1b87b5d6764003c9586 SHA512 d9edbf422ea6f698d0b8de45ce3855e0d0f410d0f346ee85da825ad9f720fdaa367b7790027de2c7cc7ea70d51074eec76ca72ff6528be1ef490e0dcef2c640c WHIRLPOOL 4323fd2e46066082a73ed45401225ec2eba26ac29054bb573afa55f1b5753b020fc280453b03becf0a63dc3c0f9904e4d5c559a1afa68eb0d85b05fcf62174c2
diff --git a/net-analyzer/openvas-cli/metadata.xml b/net-analyzer/openvas-cli/metadata.xml
new file mode 100644
index 000000000000..38ce6c17a3f2
--- /dev/null
+++ b/net-analyzer/openvas-cli/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hanno@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/openvas-cli/openvas-cli-1.4.3.ebuild b/net-analyzer/openvas-cli/openvas-cli-1.4.3.ebuild
new file mode 100644
index 000000000000..726bf0767d7c
--- /dev/null
+++ b/net-analyzer/openvas-cli/openvas-cli-1.4.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DL_ID=2209
+
+DESCRIPTION="A remote security scanner for Linux (OpenVAS-cli)"
+HOMEPAGE="http://www.openvas.org/"
+SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=net-analyzer/openvas-libraries-8.0.4
+	!net-analyzer/openvas-client"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_beta/+beta}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLOCALSTATEDIR="${EPREFIX}"/var
+		-DSYSCONFDIR="${EPREFIX}"/etc
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-analyzer/openvas-libraries/Manifest b/net-analyzer/openvas-libraries/Manifest
new file mode 100644
index 000000000000..b7e9588b0a89
--- /dev/null
+++ b/net-analyzer/openvas-libraries/Manifest
@@ -0,0 +1,8 @@
+AUX openvas-libraries-7.0.4-libssh.patch 664 SHA256 73f8d299f7b8fa3f06f2c02d1588de5d51e34770fc378f11bbcdda739fbb510a SHA512 5306452c48a5db599b74e7a4dcaf28fb1848238fce7c33c8ccdaac18629e5bea2ad82c619620703309b5bb19fca9356da4518a7c3a180e038309f433a0896a40 WHIRLPOOL 62086af319a59f6419f51b78b55e27926a93587903d8ca51556f93376906b6247a8afead91f28aaaadee4cb6b9c55bfe21cc0d91954213a2f50e4f682d97eb9a
+AUX openvas-libraries-8.0.1-include.patch 3363 SHA256 354422ef88d41d9e86cb3d5d07597f62d4c43202bdd59c66257093ec722173d2 SHA512 f3427464c1d3cdc875d4ef56d831e3dabed6431ef75450d86d2ba977379579e0b9f15544a22d336c24849b5aef08824139a18c137f62081718e5663e141cf114 WHIRLPOOL 517396880bdac5f47f1596a911e9e4e4d557f25d336791b84ed146555d2792a091d4681d24596fdaf9d5ecde0d8fdbc7c834ad704d814144d13018ed43b2d44b
+AUX openvas-libraries-8.0.5-underlinking.patch 1966 SHA256 2abf4a13de78984273d16948aad9db87b9183d7bf4bc59d3d9612833a052dfda SHA512 ca917e7615aff2f056aac8fe15f5e7670e2df7e260886155dbe8331121ef8bb8809ca7bf3bea4baa5c159c7c5e0e5fac6459d3c34080a41893dd612b0662d55d WHIRLPOOL b2abc92d4da4041a453103361663a6824aef03de80b6a292e0c9a865c7d956da3ad9960e6892b0b11f8f9ca7ee0c59e5563382b03ee6a1efb4d448cac27bf47d
+DIST openvas-libraries-8.0.5.tar.gz 603947 SHA256 40dad0ea803d8ee7721f2385f2d2f8918b9e6733c8742efc1877210ade6501c1 SHA512 3d788f931c55941663187f8038c15d0ff97799048c8ea9e5615ff22de3c5e6b5e4eaa599e41676778fadc50528c086060b6268b5edfbaf7289f0e498dbb1423b WHIRLPOOL 04e84e2083c277676e05235db81bd65ce4c8837adc8b3550fc6ff8db5ded8ccb0291141115504323db8792df085bcc2b17594a4620766bfec4bc39a79fb93109
+EBUILD openvas-libraries-8.0.5.ebuild 1256 SHA256 076e43b4185688697e8f231bf5419b38afeccab6ea89b718198b9670d9dd3a99 SHA512 21c1b7ea4a6ba63dd96124a83ed447517fa80ecc708fe13eb02cd6893726b0bfda50960d644edb280a1e11544ca0cc292db89d6548c98c6b91827152f3a82f70 WHIRLPOOL 7ea7b98e50160ed95b5fe51c358d63f64a56e4c749b81e357dc29d34695c9d5cbe2335782c0d8e067c3e4a12a9e34023903dd8d64dbbadee1b0778dd6e4e29eb
+MISC ChangeLog 3716 SHA256 b48491a26ab1a3e7c7a28a53fdc0b224bc8b869952710761318b5d6bd7c43b6c SHA512 5394ab94db36770e58bedff5cd60aa2f5087886d0ef9c1045c6531e86b0b39c2fe732803ec629b7c82b54c73d6b7b800d955994615b9ea46a99cd37a47959922 WHIRLPOOL 886ee43b97281be30fcfe1a0fd33204fcc251d4fb6443b5b50a5937cd93695ceacf67e42904d84432d5df716d2fb39b19aca24f8c42e4c306d849f86301c06d6
+MISC ChangeLog-2015 7519 SHA256 e96cb16adf7fd14070294d66738de330944d6d5c7573346e4ac9577bbb33a541 SHA512 4a076ae9fb142a9125bf0fd7e9c1620504f7421b765cfe2dfe35a03ac4a3297eb3a916a212044508180ce07423bb7a5a132df2715e0f9e9919ea24f5ba425f50 WHIRLPOOL bf960c6c8e3590fed69ccafc37ac1ded01bf920e22dd19d0f9ead24de09fea6e617f6072242512775749877f0889419ee433514e09bc8f26e8c3105fa899a0b6
+MISC metadata.xml 220 SHA256 49e2069f4751ed7f79a433d3b76bc345fcb099ac35f7b1b87b5d6764003c9586 SHA512 d9edbf422ea6f698d0b8de45ce3855e0d0f410d0f346ee85da825ad9f720fdaa367b7790027de2c7cc7ea70d51074eec76ca72ff6528be1ef490e0dcef2c640c WHIRLPOOL 4323fd2e46066082a73ed45401225ec2eba26ac29054bb573afa55f1b5753b020fc280453b03becf0a63dc3c0f9904e4d5c559a1afa68eb0d85b05fcf62174c2
diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-libssh.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-libssh.patch
new file mode 100644
index 000000000000..d89459fe2bd0
--- /dev/null
+++ b/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-libssh.patch
@@ -0,0 +1,16 @@
+https://www.mail-archive.com/openvas-discuss@wald.intevation.org/msg05828.html
+Fixes build issue with the newer version of libssh
+
+diff -ru openvas-libraries-7.0.1.orig/nasl/nasl_ssh.c openvas-libraries-7.0.1.new/nasl/nasl_ssh.c
+--- openvas-libraries-7.0.1.orig/nasl/nasl_ssh.c	2014-04-14 19:15:40.000000000 +0200
++++ openvas-libraries-7.0.1.new/nasl/nasl_ssh.c	2014-05-23 00:13:56.791111974 +0200
+@@ -1861,7 +1861,8 @@
+     return NULL;
+   session = session_table[tbl_slot].session;
+ 
+-  banner = ssh_get_serverbanner (session);
++  //banner = ssh_get_serverbanner (session);
++  banner = (char*) ssh_get_serverbanner (session);
+   if (!banner)
+     return NULL;
+ 
diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.1-include.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.1-include.patch
new file mode 100644
index 000000000000..e03dd085e3b1
--- /dev/null
+++ b/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.1-include.patch
@@ -0,0 +1,70 @@
+ base/CMakeLists.txt | 2 ++
+ nasl/CMakeLists.txt | 5 +++--
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
+index c2dccf5..4f17892 100644
+--- a/base/CMakeLists.txt
++++ b/base/CMakeLists.txt
+@@ -56,6 +56,7 @@ endif (MINGW)
+ 
+ if (BUILD_STATIC)
+   add_library (openvas_base_static STATIC ${FILES})
++  set_target_properties (openvas_base_static PROPERTIES COMPILE_FLAGS "${GPGME_CFLAGS}")
+   set_target_properties (openvas_base_static PROPERTIES OUTPUT_NAME "openvas_base")
+   set_target_properties (openvas_base_static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+   set_target_properties (openvas_base_static PROPERTIES PUBLIC_HEADER "${HEADERS}")
+@@ -63,6 +64,7 @@ endif (BUILD_STATIC)
+ 
+ if (BUILD_SHARED)
+   add_library (openvas_base_shared SHARED ${FILES})
++  set_target_properties (openvas_base_shared PROPERTIES COMPILE_FLAGS "${GPGME_CFLAGS}")
+   set_target_properties (openvas_base_shared PROPERTIES OUTPUT_NAME "openvas_base")
+   set_target_properties (openvas_base_shared PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+   set_target_properties (openvas_base_shared PROPERTIES SOVERSION "${CPACK_PACKAGE_VERSION_MAJOR}")
+diff --git a/nasl/CMakeLists.txt b/nasl/CMakeLists.txt
+index 52fa5c6..afd18c2 100644
+--- a/nasl/CMakeLists.txt
++++ b/nasl/CMakeLists.txt
+@@ -41,7 +41,7 @@ endif (SNMP)
+ # The "-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1" is necessary for GPGME!
+ # The "-fno-strict-aliasing" silences warnings caused by macros defined in byteorder.h.
+ # Once the warnings have been addressed this flag should be removed.
+-set (CMAKE_C_FLAGS              "${CMAKE_C_FLAGS} ${HARDENING_FLAGS} -Wall -D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1 -fno-strict-aliasing")
++set (CMAKE_C_FLAGS              "${CMAKE_C_FLAGS} ${HARDENING_FLAGS} -Wall -D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1 -fno-strict-aliasing ${GPGME_CFLAGS}")
+ 
+ ## Compile the parser - note that there are (better) CMake macros to achieve
+ ## that
+@@ -103,7 +103,7 @@ link_directories (${LIBDIR} ../base ../misc)
+ 
+ if (BUILD_STATIC)
+    add_library (openvas_nasl_static STATIC ${FILES})
+-
++   set_target_properties (openvas_nasl_static PROPERTIES COMPILE_FLAGS "${GPGME_CFLAGS}")
+    set_target_properties (openvas_nasl_static PROPERTIES OUTPUT_NAME "openvas_nasl")
+    set_target_properties (openvas_nasl_static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+    set_target_properties (openvas_nasl_static PROPERTIES PUBLIC_HEADER "${HEADERS}")
+@@ -118,6 +118,7 @@ endif (BUILD_STATIC)
+ 
+ if (BUILD_SHARED)
+   add_library (openvas_nasl_shared SHARED ${FILES})
++  set_target_properties (openvas_nasl_shared PROPERTIES COMPILE_FLAGS "${GPGME_CFLAGS}")
+   set_target_properties (openvas_nasl_shared PROPERTIES OUTPUT_NAME "openvas_nasl")
+   set_target_properties (openvas_nasl_shared PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+   set_target_properties (openvas_nasl_shared PROPERTIES SOVERSION "${CPACK_PACKAGE_VERSION_MAJOR}")
+ base/gpgme_util.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/base/gpgme_util.h b/base/gpgme_util.h
+index 56e1b85..ab4e9fa 100644
+--- a/base/gpgme_util.h
++++ b/base/gpgme_util.h
+@@ -33,7 +33,7 @@
+ #ifndef _OPENVAS_LIBRARIES_GPGME_UTIL_H
+ #define _OPENVAS_LIBRARIES_GPGME_UTIL_H
+ 
+-#include <gpgme.h>
++#include <gpgme/gpgme.h>
+ 
+ gpgme_ctx_t openvas_init_gpgme_ctx (void);
+ gpgme_ctx_t openvas_init_gpgme_sysconf_ctx (void);
diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.5-underlinking.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.5-underlinking.patch
new file mode 100644
index 000000000000..817815edb317
--- /dev/null
+++ b/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.5-underlinking.patch
@@ -0,0 +1,45 @@
+ base/CMakeLists.txt | 10 +++++-----
+ misc/CMakeLists.txt |  2 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
+index 07febee..40305b7 100644
+--- a/base/CMakeLists.txt
++++ b/base/CMakeLists.txt
+@@ -73,7 +73,7 @@ if (BUILD_SHARED)
+       assuan libgpg-error ole32 ws2_32 ffi z shlwapi dnsapi winmm)
+     target_link_libraries (openvas_base_shared openvas_omp_shared ${W32LIBS})
+   else (MINGW)
+-    target_link_libraries (openvas_base_shared openvas_omp_shared ${GLIB_LDFLAGS} ${GIO_LDFLAGS} ${GNUTLS_LDFLAGS} ${ZLIB_LDFLAGS} ${GPGME_LDFLAGS})
++    target_link_libraries (openvas_base_shared openvas_omp_shared ${LIBSSH_LDFLAGS} ${GLIB_LDFLAGS} ${GIO_LDFLAGS} ${GNUTLS_LDFLAGS} ${ZLIB_LDFLAGS} ${GPGME_LDFLAGS})
+   endif (MINGW)
+ endif (BUILD_SHARED)
+ 
+@@ -87,10 +87,10 @@ add_custom_indent_targets (${FILES})
+ 
+ # Link the test-hosts executable
+ # TODO: This is currently only built for BUILD_SHARED
+-if (BUILD_SHARED)
+-  add_executable (test-hosts test-hosts.c)
+-  target_link_libraries (test-hosts openvas_base_shared ${GNUTLS_LDFLAGS} openvas_misc_shared ${GLIB_LDFLAGS})
+-endif (BUILD_SHARED)
++#if (BUILD_SHARED)
++#  add_executable (test-hosts test-hosts.c)
++#  target_link_libraries (test-hosts openvas_base_shared ${GNUTLS_LDFLAGS} openvas_misc_shared openvas_omp_shared ${GLIB_LDFLAGS})
++#endif (BUILD_SHARED)
+ 
+ ## Install
+ if (BUILD_STATIC)
+diff --git a/misc/CMakeLists.txt b/misc/CMakeLists.txt
+index 7aaca2c..e7a0870 100644
+--- a/misc/CMakeLists.txt
++++ b/misc/CMakeLists.txt
+@@ -126,7 +126,7 @@ if (BUILD_SHARED)
+   else (MINGW)
+     target_link_libraries (openvas_misc_shared ${GNUTLS_LDFLAGS} openvas_base_shared ${UUID_LDFLAGS}
+                            ${PCAP_LDFLAGS} ${LIBSSH_LDFLAGS} ${LDAP_LDFLAGS}
+-                           ${REDIS_LDFLAGS} ${GCRYPT_LDFLAGS})
++                           ${GLIB_LDFLAGS} ${REDIS_LDFLAGS} ${GCRYPT_LDFLAGS})
+   endif (MINGW)
+ endif (BUILD_SHARED)
+ 
diff --git a/net-analyzer/openvas-libraries/metadata.xml b/net-analyzer/openvas-libraries/metadata.xml
new file mode 100644
index 000000000000..38ce6c17a3f2
--- /dev/null
+++ b/net-analyzer/openvas-libraries/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hanno@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/openvas-libraries/openvas-libraries-8.0.5.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-8.0.5.ebuild
new file mode 100644
index 000000000000..e279652477ff
--- /dev/null
+++ b/net-analyzer/openvas-libraries/openvas-libraries-8.0.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DL_ID=2191
+
+DESCRIPTION="A remote security scanner for Linux (openvas-libraries)"
+HOMEPAGE="http://www.openvas.org/"
+SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="ldap"
+
+RDEPEND="
+	app-crypt/gpgme
+	>=dev-libs/glib-2.16
+	>=dev-libs/hiredis-0.10.1
+	dev-libs/libgcrypt:0
+	dev-libs/libksba
+	!net-analyzer/openvas-libnasl
+	net-libs/gnutls
+	net-libs/libpcap
+	>=net-libs/libssh-0.5.0
+	net-analyzer/net-snmp
+	ldap? (	net-nds/openldap )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	"
+
+S="${WORKDIR}"/${P}
+
+DOCS=( ChangeLog CHANGES README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0.4-libssh.patch
+	"${FILESDIR}"/${PN}-8.0.1-include.patch
+	"${FILESDIR}"/${P}-underlinking.patch
+	)
+
+src_prepare() {
+	sed \
+		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
+		-i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DLOCALSTATEDIR=${EPREFIX}/var"
+		"-DSYSCONFDIR=${EPREFIX}/etc"
+		$(usex ldap -DBUILD_WITHOUT_LDAP=0 -DBUILD_WITHOUT_LDAP=1)
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-analyzer/openvas-manager/Manifest b/net-analyzer/openvas-manager/Manifest
new file mode 100644
index 000000000000..d2452c5c9962
--- /dev/null
+++ b/net-analyzer/openvas-manager/Manifest
@@ -0,0 +1,11 @@
+AUX openvas-manager-6.0.1-bsdsource.patch 834 SHA256 f188e048ba63ec8d885531189d8b7397deb843a1ac2914be773f60e48c080efc SHA512 82ab5aca2386663c851688fa4606193c3bc18095121ea4205aff78471769e5793167de89581013e5b5e12b86ac4efff57553ba34da2cf8aeedb8d14bbc76bbaa WHIRLPOOL 0ed6098a741b25f2be9fbc583d281e13335e8b48c692aa9293107ac2422a18466f7442d7fe0c8b28a65351d60078839e4ca5a4ceb15d1d9fef00ace429800bd4
+AUX openvasmd 459 SHA256 6763919862a083041d47033f34622dcd222b163fe0a1804033d40ffb7aadfec9 SHA512 0b1f90c04a105eb8a3227a4f79076cfcf0402d9d2b21dd92d394c2461c3b7b8c28ace233cc7654d6662847494f30e84903d4dd8be1701f2df5c7952500d543fb WHIRLPOOL 965ae68100019ab93ff98c6e29d017a13e31b659a31d8b7169c0853ba83b1565b9268cabf2ba5c9e549ac84d4e436630c1c0253b038c0ec8a24fa14016151622
+AUX openvasmd-daemon.conf 377 SHA256 fca0165b3b1a621bb7db5080b6f223797086014a0897c1686b2c55af797b064f SHA512 5094acf77541fe97aff0698efaa4863adc25711118857d468f096174cb71fab249f9a82a4e4b19613ffd62b3c0378043b1384ecd6cacc4a30b9ccb99f3173506 WHIRLPOOL 27882dfc221b0b8769abf02fa3755c8292f085892803ec10e8010cad6435432c5eaf886ae13bc66bdd22cfb4bd8267bb3de35d914e0c6574edc4d4940d014c31
+AUX openvasmd.init 452 SHA256 a480f185d67a138affaff29f8e68384947bb795a9771f9ca3d98698ffe9456b8 SHA512 74c354292b97bbf84e1336e38f768dc8b5ade3d930f20da7d3b9edecf1ea5843a2a2fafdb3ae856878f3f4628ee05ac9199b238ad5bfcad45a4ced532976f3c4 WHIRLPOOL c902744eff27fdc3966ccee8be19a7ef1691a5499f12be55a672da78969e7ad4385c0a39bc0656eec4d80b8317f58178bf1e8ad8a833f6343d2555457b6722e4
+AUX openvasmd.logrotate 178 SHA256 5529967ae9ece3965367739c65aa52512391d2ec540651e418cfb117e20a54cf SHA512 dad461ea48cc49c3f5e77bd69c09f2551a42e588cbd479b91ae1410ba88ae0c783ee5b273a34edb46ca196e7ba19227168efce842b1a5c39e6a46516b6fab5db WHIRLPOOL d873ed8a2b57a125d0075f11fa0b5d1ed20dce5e198fbe8536737c6d4b136977ac2ecba9b658736db37bea6a364ffa03b2bd507001b1867638c2200dec26171e
+AUX openvasmd.service 362 SHA256 901d0680e2bacc69880f00b5f93200ec3261304408cb1960c397abab01577625 SHA512 8753699635050da10b7d317caa60361c59f832b6a1624d9fc2cbedffadbd554fddf612a92ad1e0ef057b83420b36468fc9f7ee67e3161d4c37816e0c8e9239a8 WHIRLPOOL 90fe9a6e1fe2f2f4cf473bbf8befa96a36d7ff518fbe7b8efe3b725da0d87a59b39cc997bab6de7bc0326e1062ef9222b59141351f6e54f40dfd4c102dc2ef50
+DIST openvas-manager-6.0.6.tar.gz 1928570 SHA256 4a9b1d3c4235e6ecc531544bda572cc9910d2a52b01115bb8bc0436177664cc4 SHA512 4c4ae0ac35d6fc6820b47da6e5e6aae1b4d14c771791b7ae2e35123d8117319f05c7619de665b96de9d92fb59e417311656d3460dff992d3ce4db217731c5900 WHIRLPOOL 482f5159192cb5f7e52764d1fb5f44b6f9b7c31dd35f187aced333cedb2297a302fd3f6ddb45c383d36743167cf63b03ef7a900c50d0425938da51b214ab388c
+EBUILD openvas-manager-6.0.6-r2.ebuild 1273 SHA256 92a30a03d6f6094c3a54684eb3867a1f599d878a964efc3f9a5e889e5535e8b7 SHA512 e2a3323238fc42a6d19efe6cfa1a1b3ab518b94c7614754550da9118f4e28fd8a4d507ec47469ee38d09a3a590f60d7b190b6175ee8ba483bfe5e91ac4ab24d4 WHIRLPOOL 86a722eb5c047f5e4a269309f264dd13086e5a39ddb64ebabde3cdc534d6c6b37f777f7bec4b51b25802014f8f6a1c07c730d361740098cd0c6c244beab8b678
+MISC ChangeLog 4676 SHA256 278b4a57d51fc67d791e81acd19bbc692aeabe0950dc0511dd9fb7ef70c865d9 SHA512 8908ef5b345d2eae66436defe334a85ed4e7cd5294b2c3f373590d70681c2bbfbce38ef51b78a1149009c741ac6cc4b644ac824d1b1e16c8431165c6114c67ec WHIRLPOOL 2264c3e9a2741a75b4598f36f3d59ae8db35afe04d2a2cc3bd7de4ac53d4c2ecd53fb317f695a262b971035827d42c6f847837df9a2fd34381e324411779d578
+MISC ChangeLog-2015 4983 SHA256 225f5c51a01fced892850d12b910ad7d1d040e76f754669af712ca93ed9e7be8 SHA512 f52ea7babe2832d3804ef487b8ef4826f59f79fc1ce05ef97bdf735e1112e6792e66d60fa28680f2010fc09c685d0c50987a0aab06989f1556720ae7bfe0e06e WHIRLPOOL 89d392ef3064cb38245050c8ff9ef1427cb1a1161b9b2eb31d11d5aa782e62b4e9f19ed9f107a62de0142896b1e8dc4457e8503bc47f4c57704f8a57515f520e
+MISC metadata.xml 220 SHA256 49e2069f4751ed7f79a433d3b76bc345fcb099ac35f7b1b87b5d6764003c9586 SHA512 d9edbf422ea6f698d0b8de45ce3855e0d0f410d0f346ee85da825ad9f720fdaa367b7790027de2c7cc7ea70d51074eec76ca72ff6528be1ef490e0dcef2c640c WHIRLPOOL 4323fd2e46066082a73ed45401225ec2eba26ac29054bb573afa55f1b5753b020fc280453b03becf0a63dc3c0f9904e4d5c559a1afa68eb0d85b05fcf62174c2
diff --git a/net-analyzer/openvas-manager/files/openvas-manager-6.0.1-bsdsource.patch b/net-analyzer/openvas-manager/files/openvas-manager-6.0.1-bsdsource.patch
new file mode 100644
index 000000000000..011880979141
--- /dev/null
+++ b/net-analyzer/openvas-manager/files/openvas-manager-6.0.1-bsdsource.patch
@@ -0,0 +1,16 @@
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4eb89a0..7ccfc5a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -338,7 +338,7 @@ configure_file (tools/openvas-migrate-to-postgres.in tools/openvas-migrate-to-po
+ set (HARDENING_FLAGS            "-Wformat -Wformat-security -O2 -D_FORTIFY_SOURCE=2 -fstack-protector -Wl,-z,relro -Wl,-z,now")
+ 
+ set (CMAKE_C_FLAGS_DEBUG        "${CMAKE_C_FLAGS_DEBUG} -Werror")
+-set (CMAKE_C_FLAGS              "${CMAKE_C_FLAGS} ${HARDENING_FLAGS} -Wall -D_BSD_SOURCE -D_ISOC99_SOURCE -D_SVID_SOURCE -D_DEFAULT_SOURCE -D_FILE_OFFSET_BITS=64")
++set (CMAKE_C_FLAGS              "${CMAKE_C_FLAGS} ${HARDENING_FLAGS} -Wall -D_DEFAULT_SOURCE -D_ISOC99_SOURCE -D_DEFAULT_SOURCE -D_FILE_OFFSET_BITS=64")
+ 
+ add_subdirectory (src)
+ 
diff --git a/net-analyzer/openvas-manager/files/openvasmd b/net-analyzer/openvas-manager/files/openvasmd
new file mode 100644
index 000000000000..4dce1ce4922c
--- /dev/null
+++ b/net-analyzer/openvas-manager/files/openvasmd
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net openvassd
+}
+
+start() {
+	ebegin "Starting openvasmd (manager)"
+	start-stop-daemon --start --name openvasmd \
+		--exec /usr/sbin/openvasmd \
+		--pidfile /var/run/openvasmd.pid
+	eend $?
+}
+
+stop() {
+	ebegin "Stop openvasmd"
+	start-stop-daemon --stop --name openvasmd \
+		--pidfile /var/run/openvasmd.pid
+	eend $?
+}
diff --git a/net-analyzer/openvas-manager/files/openvasmd-daemon.conf b/net-analyzer/openvas-manager/files/openvasmd-daemon.conf
new file mode 100644
index 000000000000..2393c83f04b3
--- /dev/null
+++ b/net-analyzer/openvas-manager/files/openvasmd-daemon.conf
@@ -0,0 +1,15 @@
+#Manager listens on given address - by default manager listens on all addresses
+#MANAGER_LISTEN=--listen=127.0.0.1
+
+#Manager listens on given port - by default 9390
+MANAGER_PORT=--port=9390
+
+MANAGER_EXTRA_ARGS=""
+
+#Contact scanner on given address
+SCANNER_LISTEN="--scanner-host=127.0.0.1"
+
+#Scanner listens on given port - by default 9391
+SCANNER_PORT="--scanner-port=9391"
+
+
diff --git a/net-analyzer/openvas-manager/files/openvasmd.init b/net-analyzer/openvas-manager/files/openvasmd.init
new file mode 100644
index 000000000000..d30b8befdd0c
--- /dev/null
+++ b/net-analyzer/openvas-manager/files/openvasmd.init
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+name="OpenVAS Manager"
+command=/usr/sbin/openvasmd
+command_args="${MANAGER_LISTEN} ${MANAGER_PORT} ${SCANNER_LISTEN} ${SCANNER_PORT} ${MANAGER_EXTRA_ARGS}"
+pidfile="/run/openvasmd.pid"
+
+depend() {
+	after bootmisc
+	need localmount net openvassd
+}
+
+start_pre() {
+	checkpath --directory --mode 0775 --quiet /var/cache/openvas
+}
diff --git a/net-analyzer/openvas-manager/files/openvasmd.logrotate b/net-analyzer/openvas-manager/files/openvasmd.logrotate
new file mode 100644
index 000000000000..c302b5f34ea9
--- /dev/null
+++ b/net-analyzer/openvas-manager/files/openvasmd.logrotate
@@ -0,0 +1,11 @@
+# logrotate for openvas-manager
+/var/log/openvas/openvasmd.log {
+	rotate 4
+	weekly
+	compress
+	delaycompress
+	missingok
+	postrotate
+	/bin/kill -HUP `pidof openvasmd`
+	endscript
+}
diff --git a/net-analyzer/openvas-manager/files/openvasmd.service b/net-analyzer/openvas-manager/files/openvasmd.service
new file mode 100644
index 000000000000..91edb0087bc4
--- /dev/null
+++ b/net-analyzer/openvas-manager/files/openvasmd.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=OpenVAS Manager
+After=network.target
+After=openvassd.service
+
+[Service]
+EnvironmentFile=-/etc/openvas/openvasmd.conf
+ExecStart=/usr/sbin/openvasmd -f ${MANAGER_LISTEN} ${MANAGER_PORT} ${SCANNER_LISTEN} ${SCANNER_PORT} ${MANAGER_EXTRA_ARGS}
+Restart=always
+RestartSec=1
+User=root
+Group=root
+TimeoutSec=1200
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-analyzer/openvas-manager/metadata.xml b/net-analyzer/openvas-manager/metadata.xml
new file mode 100644
index 000000000000..38ce6c17a3f2
--- /dev/null
+++ b/net-analyzer/openvas-manager/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hanno@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/openvas-manager/openvas-manager-6.0.6-r2.ebuild b/net-analyzer/openvas-manager/openvas-manager-6.0.6-r2.ebuild
new file mode 100644
index 000000000000..d852593f5651
--- /dev/null
+++ b/net-analyzer/openvas-manager/openvas-manager-6.0.6-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils systemd
+
+MY_PN=openvasmd
+
+DL_ID=2195
+
+DESCRIPTION="A remote security scanner for Linux (openvas-manager)"
+HOMEPAGE="http://www.openvas.org/"
+SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=net-analyzer/openvas-libraries-8.0.5
+	>=dev-db/sqlite-3
+	dev-db/redis
+	!net-analyzer/openvas-administrator"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.1-bsdsource.patch
+	)
+
+src_prepare() {
+	sed \
+		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
+		-i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLOCALSTATEDIR="${EPREFIX}/var"
+		-DSYSCONFDIR="${EPREFIX}/etc"
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	insinto /etc/openvas/
+	doins "${FILESDIR}"/${MY_PN}-daemon.conf
+	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${MY_PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
+
+	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
+	systemd_dounit "${FILESDIR}"/${MY_PN}.service
+}
diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest
new file mode 100644
index 000000000000..e574fc54c387
--- /dev/null
+++ b/net-analyzer/openvas-scanner/Manifest
@@ -0,0 +1,16 @@
+AUX openvas-nvt-sync-cron 759 SHA256 ac19149e09420b34d56bf75ec349b59e4dc20978125e5cb290686209b47d088a SHA512 88f299141e66e9d95f565307bd121c56c005f412dcdb64e105d9d4252cfb43e218f1de7b40b500d71b415d2aa437468ce1e935dec32cda8c5efc4f733978b0dc WHIRLPOOL 7dc1a707443229630ad90951d8c41681b8ae360c892eec39ab9d003582baf8250fdca3eb1b48c4d19eb24e118b5bc96ae6769d6d2937fa1d4f66ea9691455fa1
+AUX openvas-scanner-4.0.3-mkcertclient.patch 1350 SHA256 55cfdbbdb2b714b27395acef329c831caf868e65635c628d197b5c1e13a83026 SHA512 972eda6fe3a7b7ba195fd9198d6b63add4e0af5ff9e34e423afac945d5dd497bd65f993d7ceda3848741cb954c5517e263533867e2da7d37bcc8905e926b4f72 WHIRLPOOL 9177c9d57a9288c07b13973450e5d92ebb61c374eb321da1b28f30dd90bb3ce73773b8e9570133d7973658135d1511d6de40dcf5c106a69732d3b79f802a2093
+AUX openvas-scanner-4.0.3-rulesdir.patch 607 SHA256 52ba77377d4ad1f1dcccf5362e2b4aa1c28e0c473ac5e8a07f9c2b1ef6ffebd7 SHA512 81002d66e103bb3d0d087a2037f0431739d5d664ada3e6b9bdc9d31e67159d7da0664d43e83501bf9dd01b6887bff14b02a883e261f3273ed42a27dd4ee53fa5 WHIRLPOOL 881bf021ae4099233531dedd37d7a85c0947e32ec837ad6bbc4277095c17771e8b61230aadb65b332c64cd797e32088951e947778acbfc1408632cf20ac99244
+AUX openvas-scanner-4.0.3-run.patch 672 SHA256 371188631df0a0603a1ec522406943222bf1b0c921a7fc8ee80545293dbdd041 SHA512 d39c0861b27623f05ecc5f962b3bf580d457c6056c11d07f903908a33a1b1a25e0098934310e01483aee7b28198b23aea34974b9864432a8dfe2600ed993f5ee WHIRLPOOL cb16a413dd1f1bb9beae9a1834c678406afd5bc9d32ad2dd7583a4a1766e16557a6c9c15374b85bf978333beb378e76374232ecea65de08e4a7c28e6a84ac882
+AUX openvassd 460 SHA256 8d46038f3f1e6ea15342ba686b42f34971c66133b721aeeb3943fe468eef3b8d SHA512 ebe0ffbafa172a6776c537efc4910683dd0ed6954502708981cc0110ddc8e84c7a31f1c384365354e37b872b3cf3fdae94413949b7f00f3d6500a35e64f73cf9 WHIRLPOOL 9053d1a905e1b30307ce5c453d7e8a5c8bec383c71cd2fdd40c08c3b58cc9e83c61b03277648affa39063c7e118d1f9424479cdcbc40cac4d3c09be9307fa4d7
+AUX openvassd-daemon.conf 821 SHA256 c7695226d0d3513a1096797ecd6afa0c6da68610a622c0bbc9b941dd55ba6800 SHA512 fd8344f9c37c872868e44608a593bc7843163177b726eef31047b7357e3b5949e4c2d54be1acf8fe6642ba63a6e225e4f9c3650a9861b30174d66fd7341aefc3 WHIRLPOOL ab1192bf2f2a31bc02f1bdcc260f1a5cf61428b8e1f680bf2b4436142c1e129335a510cbf43cc4bf331c68805fc40c62d2f22dc83f907c40d589c5b6fb0a962e
+AUX openvassd.conf 3295 SHA256 c01dc363c4423dfa791690b6cef50df8ff46af02bbf008ac07575351ab94e0b3 SHA512 0d203cd2dfcf0b77ce8d2546235de16f23ea71c7e601db557fcd67e9c8dc460029494f1a146daadb44101ae194d7fa4d511a488bb69094e5470de9e10acf008b WHIRLPOOL dc5fa7ca7e6035a69e4390cf86abe529415f7390dabdef58a2c9f36789a0311ed24dd219f2287fc49b0287cd0cd15442d32aa516043f2cb3422236d91dc9bd47
+AUX openvassd.init 638 SHA256 a55f03ef711acb2a49e33b51e5b5457402b0ca0326fafb94032294ad5cab7328 SHA512 a03608d42c90b56d832bd15628d565f8d6e00f35e8072af46e3915693f9647b010fec89d3b2006d38c4d5b2adbaf269953ab2250e7e661b2fbfa50391a55eaeb WHIRLPOOL 24fcc0d055dfb21380201f4db183062eaefa89b59c5398abfd9a96971d7118ba368f2a809a4efaeec50c244a8a945b99639dfc43f41b7d6f8cda55c528377e67
+AUX openvassd.logrotate 209 SHA256 c4623fe22f777e722915b6a4cf19030fa54a1fb18fe2ee074e3fb2a2fe6b81ed SHA512 5934a31ef4b7267fd741c41bb97fe2e1e42735d2324cce07145de1942efae3f5e42e8652ec0c3482dd53477be420a58124eae943f254105547abf065febb9046 WHIRLPOOL bcc32a513941f034bec581cd9b96c2f5ccf9c355c6ed46b58437b7391d197c82a43c4d6d063964ce1953fb868c8828e66ea2ff7b1b60610e14e91865553312d4
+AUX openvassd.service 353 SHA256 7a629d5ad040524f92bce13843d0ed953165809b48c3115ae566ba440117ef3e SHA512 418ca16f7cbfd5a2e7aff031810c9166743738eaa8b38ded7eb763796364c77dd4d19a09705a2da81df1b4591e2a0f7beed5d075c75a205133148903ec23f8f4 WHIRLPOOL da895ae0ad80959b146dfdd3c9be37177baf02bf99353b9e87850095aaa35b72e6c509ec7bfa12be888aa3b2139f5283c898f820a3d0e553ad5d564636808460
+AUX openvassd.tmpfiles.d 28 SHA256 7a0bd6c5fe5ddaa05f65a1be880474a541aece839b3ccf631781d081fe437a22 SHA512 b5d98625495353d32bdcaecf5499e2cbe3a8b1a84b067018b61f2ce6e110b0e3a14a061e8791c08891a7058976555a2c7971b48c90f690605129deb457b7b754 WHIRLPOOL 0039e8292a1678fb3fe05e38df312b8cc5d1349bbed9ccee893e59688ccef9e6a874efc3ec7baeab844b6cece6e1bb3f95c023eb71dd5d6d24f0bb3b312cf4d3
+DIST openvas-scanner-5.0.4.tar.gz 236282 SHA256 f35bc66fe8590e3875e224a123dc110b7d32093a96887288d9e4fd18c547b14c SHA512 51267f832a104897a497b5dc71d1b804de4db77742e2234d111a00b1e0e01536613b16ff48d23a37013178b016b39408a25d18a694980c7e6fc600824e05e149 WHIRLPOOL eda77d5b6adc25c5ee8828bb82ca6e736885ea13b52c9484763967738ad01d1c9181a65ff07dc4aa5c6206c020ece177ccecdbf795a55aad6884d42b4c9692c1
+EBUILD openvas-scanner-5.0.4-r1.ebuild 1552 SHA256 19dd8e92255e97904ce8203e047d31e24b66fa3bf6e8f766e0cbed767e5b19c4 SHA512 c8f54b34ef1721e0d0f5319a8334949fd6eb97f100bc9b91ceca23960ef2e2c3d10734736e2157a14cdc42aab474f5975504e06c0aa936d160119841933e6fc2 WHIRLPOOL 3f0a92dddb6187f4debdb166e78801117ff97bb6e50de662a77ae77118a01dca3ec615d7eeb9b99df0e5e54b7bb6010ad76e03d7182706c9f2dd7965ac45a8df
+MISC ChangeLog 3725 SHA256 5da85cade5f53e36aa02bfd9b011155c91b03d1e72db305e4ef4d4a6059326ac SHA512 160aea9bbf3b89b23ab41dde799ac9d8e07da9bc83f53e3e0593e4f67988d7e10e1af46a35064f215aab92bcaa2991bebe1877029ef0a1cb7569f7965f31a16d WHIRLPOOL 19f7631efca7f2c4a5dcb81e407d907931b80f324a4050e418e7a0d896935fece809006415b722ab5a676afd57b9e43f064777fb340c4b9e8b6795384838ccb0
+MISC ChangeLog-2015 5068 SHA256 d1a87028914bdf1382b490e55e4734302edc18bf592ca0fa4f235748b2ad0e6c SHA512 a6a724aeca50e828352040add5d7f53b5977965d81f20337b9a40e3fadcf4aa1365b293b0fd514575f90f9f728980fd23814ad44045a11754476e10973495d27 WHIRLPOOL fc8a45370daac330aa0bec4e09cadb8c6fd93ff5a4517edb8669f6a150e795414bd7adf10125851eb92340e80cff44df250447cf5d07cb855fc78fee3aeff084
+MISC metadata.xml 220 SHA256 49e2069f4751ed7f79a433d3b76bc345fcb099ac35f7b1b87b5d6764003c9586 SHA512 d9edbf422ea6f698d0b8de45ce3855e0d0f410d0f346ee85da825ad9f720fdaa367b7790027de2c7cc7ea70d51074eec76ca72ff6528be1ef490e0dcef2c640c WHIRLPOOL 4323fd2e46066082a73ed45401225ec2eba26ac29054bb573afa55f1b5753b020fc280453b03becf0a63dc3c0f9904e4d5c559a1afa68eb0d85b05fcf62174c2
diff --git a/net-analyzer/openvas-scanner/files/openvas-nvt-sync-cron b/net-analyzer/openvas-scanner/files/openvas-nvt-sync-cron
new file mode 100644
index 000000000000..e6a83867f3d9
--- /dev/null
+++ b/net-analyzer/openvas-scanner/files/openvas-nvt-sync-cron
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+if [ -f /etc/openvas/openvassd.conf ]; then
+	. /etc/openvas/openvassd.conf
+fi
+
+if [ "$auto_plugin_update" != "yes" ]; then
+	exit 0
+fi
+
+opts=""
+case "$update_method" in
+	rsync)
+		opts = "$opts --rsync"
+		;;
+	wget)
+		opts = "$opts --wget"
+		;;
+	curl)
+		opts = "$opts --curl"
+		;;
+esac
+
+# Export openvas-nvt-sync's environment variables if they are defined
+[ \! -z "$NVT_DIR" ] && export NVT_DIR
+[ \! -z "$OV_RSYNC_FEED" ] && export OV_RSYNC_FEED
+[ \! -z "$OV_HTTP_FEED" ] && export OV_HTTP_FEED
+
+/usr/sbin/openvas-nvt-sync $opts >& /dev/null
+
+if [ $? -ne 0 ]; then
+	echo "Error updating OpenVAS plugins. Please run openvas-nvt-sync manually."
+	exit 1
+fi
+
+if [ "$notify_openvas_scanner" == "yes" ]; then
+	/etc/init.d/openvas-scanner reloadplugins
+fi
+
diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-mkcertclient.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-mkcertclient.patch
new file mode 100644
index 000000000000..05e92728f182
--- /dev/null
+++ b/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-mkcertclient.patch
@@ -0,0 +1,29 @@
+diff -ru openvas-scanner-4.0.1/CMakeLists.txt openvas-scanner-4.0.1.mkcert/CMakeLists.txt
+--- openvas-scanner-4.0.1/CMakeLists.txt	2014-04-23 16:00:47.000000000 +0200
++++ openvas-scanner-4.0.1.mkcert/CMakeLists.txt	2014-05-26 16:04:23.093548608 +0200
+@@ -258,7 +258,6 @@
+ #         DESTINATION ${OPENVAS_SYSCONF_DIR})
+ 
+ install (FILES ${CMAKE_BINARY_DIR}/tools/openvas-mkcert
+-               ${CMAKE_BINARY_DIR}/tools/openvas-mkcert-client
+                ${CMAKE_BINARY_DIR}/tools/openvas-nvt-sync
+          DESTINATION ${SBINDIR}
+          PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
+@@ -269,7 +268,15 @@
+          PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
+                      GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ 
+-install (FILES ${CMAKE_BINARY_DIR}/doc/openvassd.8
++install (FILES ${CMAKE_BINARY_DIR}/tools/openvas-mkcert-client
++         DESTINATION ${BINDIR}
++         PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
++                     GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
++
++install (FILES ${CMAKE_SOURCE_DIR}/doc/openvas-mkcert-client.1
++          DESTINATION ${DATADIR}/man/man1 )
++
++install (FILES ${CMAKE_BINARY_DIR}/doc/openvassd.8
+          DESTINATION ${DATADIR}/man/man8 )
+ 
+ install (FILES ${CMAKE_SOURCE_DIR}/doc/openvas-mkcert.8
+Only in openvas-scanner-4.0.1.mkcert/: CMakeLists.txt~
diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-rulesdir.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-rulesdir.patch
new file mode 100644
index 000000000000..90f998ffd40c
--- /dev/null
+++ b/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-rulesdir.patch
@@ -0,0 +1,15 @@
+diff -ru openvas-scanner-4.0.1/CMakeLists.txt openvas-scanner-4.0.1.rules/CMakeLists.txt
+--- openvas-scanner-4.0.1/CMakeLists.txt	2014-04-23 16:00:47.000000000 +0200
++++ openvas-scanner-4.0.1.rules/CMakeLists.txt	2014-05-26 16:07:37.454116277 +0200
+@@ -171,6 +171,10 @@
+ set (OPENVASSD_DEBUGMSG "${OPENVAS_LOG_DIR}/openvassd.dump")
+ set (OPENVASSD_CONF     "${OPENVAS_SYSCONF_DIR}/openvassd.conf")
+ 
++if (NOT OPENVASSD_RULES)
++  set (OPENVASSD_RULES    "${OPENVAS_DATA_DIR}/openvassd.rules")
++endif (NOT OPENVASSD_RULES)
++
+ set (NVT_TIMEOUT "320")
+ 
+ message ("-- Install prefix: ${CMAKE_INSTALL_PREFIX}")
+
diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-run.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-run.patch
new file mode 100644
index 000000000000..51dd8389c5f5
--- /dev/null
+++ b/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-run.patch
@@ -0,0 +1,17 @@
+ CMakeLists.txt           | 2 +-
+ tools/greenbone-nvt-sync | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c691100..d78ffa6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -155,7 +155,7 @@ set (OPENVAS_DATA_DIR    "${DATADIR}/openvas")
+ set (OPENVAS_STATE_DIR   "${LOCALSTATEDIR}/lib/openvas")
+ set (OPENVAS_LOG_DIR     "${LOCALSTATEDIR}/log/openvas")
+ set (OPENVAS_CACHE_DIR   "${LOCALSTATEDIR}/cache/openvas")
+-set (OPENVAS_PID_DIR     "${LOCALSTATEDIR}/run")
++set (OPENVAS_PID_DIR     "/run")
+ set (OPENVAS_SYSCONF_DIR "${SYSCONFDIR}/openvas")
+ 
+ set (OPENVAS_NVT_DIR     "${OPENVAS_STATE_DIR}/plugins")
diff --git a/net-analyzer/openvas-scanner/files/openvassd b/net-analyzer/openvas-scanner/files/openvassd
new file mode 100644
index 000000000000..13070e32e1cc
--- /dev/null
+++ b/net-analyzer/openvas-scanner/files/openvassd
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting openvassd (scanner)"
+	start-stop-daemon --start --name openvassd \
+		--exec /usr/sbin/openvassd \
+		--pidfile /var/run/openvassd.pid
+	eend $? 
+}
+
+stop() {
+	ebegin "Stop openvassd (scanner)"
+	start-stop-daemon --stop --name openvassd \
+		--pidfile /var/run/openvassd.pid
+	eend $?
+}
diff --git a/net-analyzer/openvas-scanner/files/openvassd-daemon.conf b/net-analyzer/openvas-scanner/files/openvassd-daemon.conf
new file mode 100644
index 000000000000..628a223a4198
--- /dev/null
+++ b/net-analyzer/openvas-scanner/files/openvassd-daemon.conf
@@ -0,0 +1,26 @@
+#Listen on given address - by default scanner listens on all addresses
+#SCANNER_LISTEN=--listen=127.0.0.1
+
+#Listen on given port - by default 9391
+SCANNER_PORT=--port=9391
+
+#Send the packets with the source IP of IP1,IP2,IP3....
+#SCANNER_SRCIP=--src-ip=127.0.0.1,192.168.1.2
+
+# Extra Arguments
+# SCANNER_EXTRA_ARGS=""
+
+# Set to yes if plugins should be automatically updated via a cron job
+auto_plugin_update=no
+
+# Notify OpenVAS scanner after update by seding it SIGHUP?
+notify_openvas_scanner=yes
+
+# Method to use to get updates. The default is via rsync
+# Note that only wget and curl support retrieval via proxy
+# update_method=rsync|wget|curl
+
+# Additionaly, you can specify the following variables
+#NVT_DIR		where to extract plugins (absolute path)
+#OV_RSYNC_FEED		URL of rsync feed
+#OV_HTTP_FEED		URL of http feed
diff --git a/net-analyzer/openvas-scanner/files/openvassd.conf b/net-analyzer/openvas-scanner/files/openvassd.conf
new file mode 100644
index 000000000000..88f83f4bed97
--- /dev/null
+++ b/net-analyzer/openvas-scanner/files/openvassd.conf
@@ -0,0 +1,118 @@
+# Configuration file of the OpenVAS Security Scanner
+
+# Every line starting with a '#' is a comment
+
+[Misc]
+
+# Path to the security checks folder:
+plugins_folder = /var/lib/openvas/plugins
+
+# Path to OpenVAS caching folder:
+cache_folder = /var/cache/openvas
+
+# Path to OpenVAS include directories:
+# (multiple entries are separated with colon ':')
+include_folders = /var/lib/openvas/plugins
+
+# Maximum number of simultaneous hosts tested :
+max_hosts = 30
+
+# Maximum number of simultaneous checks against each host tested :
+max_checks = 10
+
+# Niceness. If set to 'yes', openvassd will renice itself to 10.
+be_nice = no
+
+# Log file (or 'syslog') :
+logfile = /var/log/openvas/openvassd.log
+
+# Shall we log every details of the attack ? (disk intensive)
+log_whole_attack = no
+
+# Log the name of the plugins that are loaded by the server ?
+log_plugins_name_at_load = no
+
+# Dump file for debugging output, use `-' for stdout
+dumpfile = /var/log/openvas/openvassd.dump
+
+# Rules file :
+rules = /etc/openvas/openvassd.rules
+
+# CGI paths to check for (cgi-bin:/cgi-aws:/ can do)
+cgi_path = /cgi-bin:/scripts
+
+# Range of the ports the port scanners will scan :
+# 'default' means that OpenVAS will scan ports found in its
+# services file.
+port_range = default
+
+# Optimize the test (recommended) :
+optimize_test = yes
+
+# Optimization :
+# Read timeout for the sockets of the tests :
+checks_read_timeout = 5
+
+# Ports against which two plugins should not be run simultaneously :
+# non_simult_ports = Services/www, 139, Services/finger
+non_simult_ports = 139, 445
+
+# Maximum lifetime of a plugin (in seconds) :
+plugins_timeout = 320
+
+# Safe checks rely on banner grabbing :
+safe_checks = yes
+
+# Automatically activate the plugins that are depended on
+auto_enable_dependencies = yes
+
+# Do not echo data from plugins which have been automatically enabled
+silent_dependencies = no
+
+# Designate hosts by MAC address, not IP address (useful for DHCP networks)
+use_mac_addr = no
+
+
+#--- Knowledge base saving (can be configured by the client) :
+# Save the knowledge base on disk :
+save_knowledge_base = no
+
+# Restore the KB for each test :
+kb_restore = no
+
+# Only test hosts whose KB we do not have :
+only_test_hosts_whose_kb_we_dont_have = no
+
+# Only test hosts whose KB we already have :
+only_test_hosts_whose_kb_we_have = no
+
+# KB test replay :
+kb_dont_replay_scanners = no
+kb_dont_replay_info_gathering = no
+kb_dont_replay_attacks = no
+kb_dont_replay_denials = no
+kb_max_age = 864000
+#--- end of the KB section
+
+
+# If this option is set, OpenVAS will not scan a network incrementally
+# (10.0.0.1, then 10.0.0.2, 10.0.0.3 and so on..) but will attempt to
+# slice the workload throughout the whole network (ie: it will scan
+# 10.0.0.1, then 10.0.0.127, then 10.0.0.2, then 10.0.0.128 and so on...
+slice_network_addresses = no
+
+# Should consider all the NASL scripts as being signed ? (unsafe if set to 'yes')
+nasl_no_signature_check = yes
+
+#Certificates
+cert_file=/var/lib/openvas/CA/servercert.pem
+key_file=/var/lib/openvas/private/CA/serverkey.pem
+ca_file=/var/lib/openvas/CA/cacert.pem
+
+# If you decide to protect your private key with a password,
+# uncomment and change next line
+# pem_password=password
+# If you want to force the use of a client certificate, uncomment next line
+# force_pubkey_auth = yes
+
+#end.
diff --git a/net-analyzer/openvas-scanner/files/openvassd.init b/net-analyzer/openvas-scanner/files/openvassd.init
new file mode 100644
index 000000000000..c07d3936905d
--- /dev/null
+++ b/net-analyzer/openvas-scanner/files/openvassd.init
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+name="OpenVAS Scanner"
+command="/usr/sbin/openvassd"
+command_args="${SCANNER_LISTEN} ${SCANNER_PORT} ${SCANNER_SRCIP} ${SCANNER_EXTRA_ARGS}"
+pidfile="/run/openvassd.pid"
+extra_stopped_commands="create_cache"
+
+depend() {
+	after bootmisc
+	need localmount net
+}
+
+start_pre() {
+	checkpath --directory --mode 0775 --quiet /var/cache/openvas
+}
+
+create_cache() {
+	checkpath --directory --mode 0775 --quiet /var/cache/openvas
+	ebegin "Generating initial Cache"
+	/usr/sbin/openvassd --foreground --only-cache
+	eend $?
+}
diff --git a/net-analyzer/openvas-scanner/files/openvassd.logrotate b/net-analyzer/openvas-scanner/files/openvassd.logrotate
new file mode 100644
index 000000000000..9316ba8d9629
--- /dev/null
+++ b/net-analyzer/openvas-scanner/files/openvassd.logrotate
@@ -0,0 +1,11 @@
+# logrotate for openvas
+/var/log/openvas/openvassd.log {
+        rotate 4
+        weekly
+        compress
+        delaycompress
+        missingok
+	postrotate
+	    /bin/kill -HUP `pidof openvassd`
+	endscript
+}
diff --git a/net-analyzer/openvas-scanner/files/openvassd.service b/net-analyzer/openvas-scanner/files/openvassd.service
new file mode 100644
index 000000000000..553b09b5b2fb
--- /dev/null
+++ b/net-analyzer/openvas-scanner/files/openvassd.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=OpenVAS Scanner
+After=network.target
+Before=openvasmd.service
+
+[Service]
+EnvironmentFile=-/etc/openvas/openvassd-daemon.conf
+ExecStart=/usr/sbin/openvassd -f ${SCANNER_PORT} ${SCANNER_LISTEN} ${SCANNER_SRCIP} ${SCANNER_EXTRA_ARGS}
+Restart=always
+RestartSec=1
+User=root
+Group=root
+TimeoutSec=1200
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-analyzer/openvas-scanner/files/openvassd.tmpfiles.d b/net-analyzer/openvas-scanner/files/openvassd.tmpfiles.d
new file mode 100644
index 000000000000..18e820caec1b
--- /dev/null
+++ b/net-analyzer/openvas-scanner/files/openvassd.tmpfiles.d
@@ -0,0 +1 @@
+d	/var/cache/openvassd 0775
diff --git a/net-analyzer/openvas-scanner/metadata.xml b/net-analyzer/openvas-scanner/metadata.xml
new file mode 100644
index 000000000000..38ce6c17a3f2
--- /dev/null
+++ b/net-analyzer/openvas-scanner/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hanno@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-5.0.4-r1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-5.0.4-r1.ebuild
new file mode 100644
index 000000000000..4d550d82f4f0
--- /dev/null
+++ b/net-analyzer/openvas-scanner/openvas-scanner-5.0.4-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils systemd
+
+MY_PN=openvassd
+
+DL_ID=2129
+
+DESCRIPTION="A remote security scanner for Linux (OpenVAS-scanner)"
+HOMEPAGE="http://www.openvas.org/"
+SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	app-crypt/gpgme
+	>=dev-libs/glib-2.16:2
+	dev-libs/libgcrypt:0
+	>=net-analyzer/openvas-libraries-8.0.2
+	!net-analyzer/openvas-plugins
+	!net-analyzer/openvas-server"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_beta/+beta}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.3-mkcertclient.patch
+	"${FILESDIR}"/${PN}-4.0.3-rulesdir.patch
+	"${FILESDIR}"/${PN}-4.0.3-run.patch
+	)
+
+src_prepare() {
+	sed \
+		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
+		-i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLOCALSTATEDIR="${EPREFIX}/var"
+		-DSYSCONFDIR="${EPREFIX}/etc"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
+
+	insinto /etc/openvas
+	doins "${FILESDIR}"/${MY_PN}.conf "${FILESDIR}"/${MY_PN}-daemon.conf
+	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${MY_PN}
+
+	insinto /etc/logrotate.d
+	doins "${FILESDIR}"/${MY_PN}.logrotate
+
+	dodoc "${FILESDIR}"/openvas-nvt-sync-cron
+
+	systemd_newtmpfilesd "${FILESDIR}"/${MY_PN}.tmpfiles.d ${MY_PN}.conf
+	systemd_dounit "${FILESDIR}"/${MY_PN}.service
+}
diff --git a/net-analyzer/openvas-tools/Manifest b/net-analyzer/openvas-tools/Manifest
new file mode 100644
index 000000000000..6a6dbc44174c
--- /dev/null
+++ b/net-analyzer/openvas-tools/Manifest
@@ -0,0 +1,5 @@
+DIST openvas-tools-0_pre20512.tar.xz 46100 SHA256 78557005110b22e617b3ce82b73b934f743558cdd9247f0fd5bdbcfd7b9f4a09 SHA512 ab524c18a9c9cbfbc742d19c55c7eacc99c39d9209d3f915a6e0070c662f9761cc55b1166dfb48cdaab2607a07ea0640ff9f0a3d48a364409e516a3142f96cbb WHIRLPOOL 35130567b3060823ea2c1a6c1323f5b77e5446eaa7b62cabfe1068d14bec66d647cef2ea5d98cf5fa483e242f4aca84179d41f5ff2b5c729cc9fa7634018e8a6
+EBUILD openvas-tools-0_pre20512.ebuild 562 SHA256 dc70fb615ab95d37d1c522c7bd19b395b0ef375dd461e5e61710800ce03102b5 SHA512 26026784420869596ac51e1c1437bf5a6bc2040287091ae386c693a5b83f3f922ecd8bd2e1c3d8c91b6d9dc730378feb05413c38c492250329b5f4fd9219d01f WHIRLPOOL 3cf7de0f9113beec04ebc230479f08554a41fcab16235574d407e8a8126a6a4d198c9f800583687c538b7521036eb5f7eb40fc4317e6b2cae393764ec22c4928
+MISC ChangeLog 2383 SHA256 d2bfbb7d2c75ce98382fb3a907588947ed8d928b6b76eb1a75aec65d4b7d6e1a SHA512 d8c2af20c3bf160a56e39e0d5185ff65df9248319d39f6b01d8d228debc697870f365eec717826835ec7fc9d911c289063d48709518be6b77a5fd7e13bb2b30a WHIRLPOOL 21edaf1028ef657a6daca0a31f62ddebb4e99f8cd2a181cf2082258be97d9d2b067e44ed5bb6e4c09b26a41e6e6e9f3f2d1120e2bf5a2f840650608d4a83b10d
+MISC ChangeLog-2015 391 SHA256 5efbe7ac9087125c121bbb9e7dab9f9a9daa71909332227483d072da52f0c8d2 SHA512 aaf7cceb7c03657c5e3287370c4fa45e85d38d1c16f802def9337489e9aebaa1bd7d725028d018c4814f6beeeba6f20bc4f45e1ed4a12ced5647b90e9110c9a0 WHIRLPOOL 0f346feaa6fd83b911a8c3a88f4185813d7b8fa518067e5aaa94555ca5d7fc4a690d27f4893fd87486b758d7f5c94bf04cf9a1ece7732f9cddee73a170281f39
+MISC metadata.xml 220 SHA256 49e2069f4751ed7f79a433d3b76bc345fcb099ac35f7b1b87b5d6764003c9586 SHA512 d9edbf422ea6f698d0b8de45ce3855e0d0f410d0f346ee85da825ad9f720fdaa367b7790027de2c7cc7ea70d51074eec76ca72ff6528be1ef490e0dcef2c640c WHIRLPOOL 4323fd2e46066082a73ed45401225ec2eba26ac29054bb573afa55f1b5753b020fc280453b03becf0a63dc3c0f9904e4d5c559a1afa68eb0d85b05fcf62174c2
diff --git a/net-analyzer/openvas-tools/metadata.xml b/net-analyzer/openvas-tools/metadata.xml
new file mode 100644
index 000000000000..38ce6c17a3f2
--- /dev/null
+++ b/net-analyzer/openvas-tools/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hanno@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/openvas-tools/openvas-tools-0_pre20512.ebuild b/net-analyzer/openvas-tools/openvas-tools-0_pre20512.ebuild
new file mode 100644
index 000000000000..48c6d833eacf
--- /dev/null
+++ b/net-analyzer/openvas-tools/openvas-tools-0_pre20512.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib
+
+DESCRIPTION="A remote security scanner for Linux (extra tools)"
+HOMEPAGE="http://www.openvas.org/"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}"/tools
+
+src_install() {
+	insinto /usr/$(get_libdir)/nagios/plugins/
+	doins nagios/*
+
+	dosbin openvas-check-setup
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins nasl.vim
+}
diff --git a/net-analyzer/openvas/Manifest b/net-analyzer/openvas/Manifest
new file mode 100644
index 000000000000..f5676585d539
--- /dev/null
+++ b/net-analyzer/openvas/Manifest
@@ -0,0 +1,5 @@
+AUX README.gentoo 1029 SHA256 046b8685eb2bc942d557242bc74ad18ba97ce94ce2ce033abcf4ce930583696f SHA512 aeff351d306e4bc818b48d254c9efd618818b9ae1025285e97105908746628db469b4fa4620cb0db3032f58f50f3615779cf35c098e3e7819c01c24ee0adefc5 WHIRLPOOL a0eab9666ac02f37c095611883021690c1d3b9c15ffef8d7202cb66e301f2f854044c4aaccbd8a139c1a6e365612b418079aa08739ba07b3f35b8112574146a7
+EBUILD openvas-8.0.5-r1.ebuild 1460 SHA256 b0a3efe5a96923b83724382c64561f475de8035d0c8f7480a84b46e6960e82f6 SHA512 46582e09a8bada805ec596ff3d11493a678d33b5133b815b4812a5258733853af3f42664657d98e53ad8de47ad1f3e7bf404ea8b63406e25d8ca7f91ae564d30 WHIRLPOOL 402ddc6654e24c7c5678ea8c9d7d491a4645c270d1ab2afe072b4d5d5ec662fbcf2afc6ea7dc44d4ba4fa181b5e9e971892e88c053df02673bf77370aff13b1d
+MISC ChangeLog 3245 SHA256 8a5fe2255232affaff3755ad53379c8665218974cbacc4d1ec25bc85fd0520b7 SHA512 f2364932b5f5c8cb6e249c8090561d08836cc96679d294b0fb19c56cc0d45f9750a7b6aed453805395415e9f153656056c8db591b99553a1e306326389680a2b WHIRLPOOL 87a2fd660180cf046133b5a24d610882c0f6f026429d520c3850a9397617cf7a259271bdc31c62ae1a88691e95878de9db6ed425273b5a7d7a7c0c6f26b5481e
+MISC ChangeLog-2015 4825 SHA256 f1d559b14773d4999a9ed60ba86107900dcabe9059e63f900034f03d9acc910e SHA512 afcec71afc16313c654c2f5d27b507b5b40fb5689548fbe33246d60e55a027256e6973df321d7cd6e5f579aa12a3d3c1f81c6ea2f2dda2b6374fd50910d227e6 WHIRLPOOL 665d787bcd4de48ecae442c32740568a879c8b42c28420ccabd6aefca05d9fe7f0ebb54d518d5b45da53877f25f988522a9a12279b3ed257ee63c132e69c7c55
+MISC metadata.xml 292 SHA256 042515ed4e4985b95a45b9305be5544b9f2fbdd00c9cab13b4360c808a945283 SHA512 6e85f9ffe2dd906265dbd40ce11254d73ed28ff45d5db913571fe0e289a339dbc93e0a2464ae506a6e21fd3730f4a5cccf245b771f746503800d455e6d894911 WHIRLPOOL e402661bac1ad9f0ccf669ea00ec888fce6fb45e64070c16319fbac8f89ee46404ef651a9200dd5b730f70a47c0950945dae3304500b2230a3dbacc054f5565b
diff --git a/net-analyzer/openvas/files/README.gentoo b/net-analyzer/openvas/files/README.gentoo
new file mode 100644
index 000000000000..71dbf185b472
--- /dev/null
+++ b/net-analyzer/openvas/files/README.gentoo
@@ -0,0 +1,34 @@
+To allow openvasmd to work, you need to do the following
+
+# Generate a Server Certificate
+openvas-mkcert
+
+# Generate a Client Certificate
+openvas-mkcert-client -n -i
+
+# get nvt feed
+openvas-nvt-sync (free) or greenbone-nvt-sync (commercial)
+
+# get scap feed
+openvas-scapdata-sync (free) or greenbone-scapdata-sync (commercial)
+
+# get cert feed
+openvas-certdata-sync (free) or greenbone-certdata-sync (commercial)
+
+# Generate initial NVT cache (takes some minutes)
+rc-service openvassd create_cache or openvassd --foreground --only-cache
+
+# Start the OpenVAS Scanner
+rc-service openvassd start or systemctl start openvassd.service
+
+# Initialize the Database (This is going to take some time, perhaps time to get coffee?)
+openvasmd --rebuild --progress -v
+
+# Create an admin user and note down the initial password
+openvasmd --create-user=admin --role=Admin
+
+# Start the OpenVAS Manager
+rc-service openvasmd start or systemctl start openvasmd
+
+# Start the Greenbone Security Assistant
+rc-service gsad start or systemctl start gsad
diff --git a/net-analyzer/openvas/metadata.xml b/net-analyzer/openvas/metadata.xml
new file mode 100644
index 000000000000..deaaa375afde
--- /dev/null
+++ b/net-analyzer/openvas/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hanno@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="pdf">Enable pdf report creation</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-analyzer/openvas/openvas-8.0.5-r1.ebuild b/net-analyzer/openvas/openvas-8.0.5-r1.ebuild
new file mode 100644
index 000000000000..eb5667c7e762
--- /dev/null
+++ b/net-analyzer/openvas/openvas-8.0.5-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit readme.gentoo
+
+DESCRIPTION="A remote security scanner"
+HOMEPAGE="http://www.openvas.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+pdf"
+
+RDEPEND="
+	dev-db/redis
+	>=net-analyzer/openvas-libraries-8.0.5
+	>=net-analyzer/openvas-scanner-5.0.4
+	>=net-analyzer/openvas-manager-6.0.6
+	>=net-analyzer/openvas-cli-1.4.3
+	net-analyzer/openvas-tools
+	pdf? (
+		app-text/htmldoc
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)"
+
+S="${WORKDIR}"
+
+pkg_postinst() {
+	elog "Additional support for extra checks can be get from"
+	optfeature "Nikto — a web server scanning and testing tool" net-analyzer/nikto
+	optfeature "NMAP — a portscanner" net-analyzer/nmap
+	optfeature "ike-scan - an IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan
+	optfeature "amap — an application protocol detection tool" net-analyzer/amap
+	optfeature "ldapsearch from OpenLDAP utilities — retrieves information from LDAP dictionaries" net-nds/openldap
+	optfeature "ovaldi (OVAL) — an OVAL Interpreter" app-forensics/ovaldi
+	optfeature "portbunny — a Linux-kernel-based portscanner" net-analyzer/portbunny
+	optfeature "w3af — a web application attack and audit framework" net-analyzer/w3af
+	optfeature "The Greenbone Security Assistant as alternative to the plain scanner" net-analyzer/greebone-security-assistant
+}
diff --git a/net-analyzer/ospd/Manifest b/net-analyzer/ospd/Manifest
new file mode 100644
index 000000000000..8c699a046152
--- /dev/null
+++ b/net-analyzer/ospd/Manifest
@@ -0,0 +1,5 @@
+DIST ospd-1.0.0.tar.gz 39656 SHA256 da4b8f636897544a4d4a6cc8c932762b356cc729c5e532f0ceb80f0339c5dcb8 SHA512 64b1b42c5292dc8cf8b1ffde9082f4d05ff62f4d0bf2ed7b2b5d2ba4d3c3611ae8af30b39c8becb9f6bdc36eb519a0b881cdeb50891e5a2273003f6181cbebfb WHIRLPOOL ee7f1b0b29f993d8913b4ba53f3089f13f216f6957d16ca74409e1eb75a70a0aba20472aaf433a27fc4aa9610a1dd38ad25b64c623ecbf576833aefed6272a98
+EBUILD ospd-1.0.0.ebuild 656 SHA256 2cb4718e01e4abaa709f09cb2080ce5a55769b47492d71c6c82809706cc1a65a SHA512 059abfdeb1701da5897b6c3d30b69228c04e7ba52e238a865861f7104465b7b94226bb391e084aeeb46c5db37bcb312054dd1af4b8908f3d20401786f7166c23 WHIRLPOOL 7c9b9f4cd2bd29adc760720a59dd811969343ce17747c0faa49341f0eb244407ae46e78d7afc9822b2125ecef9fb34d9996222b0a166bc4daaa6e2ad87846301
+MISC ChangeLog 2352 SHA256 fa34387312eca5fc4ab4a1257d02a4dd36b9a59df133351cbccf2e8abe902e3a SHA512 5afa7f3a7a4533d11a2e2e65b274d29ce8996d1b74130b7b22204208dfda02f3710a8dfdd7e072d4a26ed306aba0d255b655a8c7779443457a6835b3a681024c WHIRLPOOL 3e1d384734b69ce0b39dd2ca5337675674cb779bf25762705edede85cb254b08c4d18f0b6c3b6e387f668cf966d89cbd233d139a20c9adedea4fec4fcfbdc082
+MISC ChangeLog-2015 564 SHA256 f5294e5f351d8ca02b8bba8edc816e114861378a4c10ff3f7b4c4fbc26040f37 SHA512 ed32efcafb448c62d3d27cd380aafed6e037d0d18ed9378fe3f0ff72b4891e28d82876ccab42e0424730c6c4541f98e80ba82f5c02c4fda76eb1176a8d0cc3fe WHIRLPOOL 7595dbf1d077c14f8497d2072d8f1af41e52bbd2aefb801386d3ba1d3646858009c15b04009a4a3b82916e85f5306e3d79f472738404e49adcc2b376d64a3862
+MISC metadata.xml 220 SHA256 49e2069f4751ed7f79a433d3b76bc345fcb099ac35f7b1b87b5d6764003c9586 SHA512 d9edbf422ea6f698d0b8de45ce3855e0d0f410d0f346ee85da825ad9f720fdaa367b7790027de2c7cc7ea70d51074eec76ca72ff6528be1ef490e0dcef2c640c WHIRLPOOL 4323fd2e46066082a73ed45401225ec2eba26ac29054bb573afa55f1b5753b020fc280453b03becf0a63dc3c0f9904e4d5c559a1afa68eb0d85b05fcf62174c2
diff --git a/net-analyzer/ospd/metadata.xml b/net-analyzer/ospd/metadata.xml
new file mode 100644
index 000000000000..38ce6c17a3f2
--- /dev/null
+++ b/net-analyzer/ospd/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hanno@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/ospd/ospd-1.0.0.ebuild b/net-analyzer/ospd/ospd-1.0.0.ebuild
new file mode 100644
index 000000000000..675c92e710f5
--- /dev/null
+++ b/net-analyzer/ospd/ospd-1.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DL_ID=1999
+
+DESCRIPTION="Collection of scanner wrappers for OpenVAS"
+HOMEPAGE="http://www.openvas.org/"
+SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${P/_beta/-beta}
+
+_DOCS=( ChangeLog CHANGES README )
+
+python_test() {
+	esetup.py test
+}
diff --git a/net-analyzer/ostinato/Manifest b/net-analyzer/ostinato/Manifest
new file mode 100644
index 000000000000..ae968d7d05d5
--- /dev/null
+++ b/net-analyzer/ostinato/Manifest
@@ -0,0 +1,7 @@
+DIST ostinato-0.8.tar.gz 424104 SHA256 8680c409170fc1b5588d3d0a2aedfbe81f3f2e6f1f63b16f070fca68a89dfc42 SHA512 ecb3581736bd8dff44fe21082c270febc2ead4530cfb57997f218bd0b61a85993208937729374dd09c67fdc24eb2b9adfe5b3750ee6daef90b1e7dac2ea0737b WHIRLPOOL 4d502c61d22191906c879094f5c17ba86b0049985a52091beb8352bab250ea29057e9767a5f33c1ff917866eff0928391540b3b817f3239d50216895390dda9d
+DIST ostinato-src-0.5.1.tar.gz 291529 SHA256 fa19c857d73837cae23aa15d7309c1ddcf22c6f7be9f3ed15a23948142b24223 SHA512 d06b59dc2129aba01e5a42a677339d6e8f353f9c7c027226e66c8a5af94ecb48e8450e7770ae5e179131fa4cfeefcc827fb9a18be4294ddfcd7a471ec26ee06a WHIRLPOOL 6027729df2f880a220a2a4a55c702dab53ddd33ebafe6bd20740bd875498cfb8876917ea63fe981811b70ee57e7cc3c347bcba5182c6b061420b40e4bf3f3ffc
+EBUILD ostinato-0.5.1.ebuild 508 SHA256 7af2d3d8241d2da63f39cae44ce5a9c7278c0a98fefec70f3deeb373be035001 SHA512 3dd8623d7f875237d15b67e21a50af896ef71a248e806cb28bbdeb37c92d8499c55c6c858347aff303b43ba5dcf7b9161599863835f305c2201129c6f6f8d796 WHIRLPOOL d4e755739b7f4e8e37e2545152dfe524d52c34b01b1e4dbd37357ac8ee9b151426ac265f4b487e6fcd55a9af147a358511843cd48f25ff67b8a34cd4cf11edf7
+EBUILD ostinato-0.8.ebuild 550 SHA256 613af29381491e7bac8fb17b4401edf0cf977c4a388feac65af87ce2f2c98b15 SHA512 34df775de08c0b3b9aef72d7b0b251985df7af67667dccff17486563f01db303bee00aa4767a93bef2b97afc3fd090dfdedbe9beead794911dc7dc87e474dd3d WHIRLPOOL b9e3a24b6d979d18d81a267517b06fe6261292de7fc1b9cde002bd3a07bc94243f04e0c8496c4ceb4d7b6f9404814bb716828041bf9489270143fed0eec47295
+MISC ChangeLog 2847 SHA256 99c1f6a34712214b6fe0b4f4993786905f9d29d4016e17a83ac88a177411450f SHA512 b9e08d55016ea5ed329bb4f90d8de40851a42734dbee07de405155ed6788636b7a568b2a3bb01161a9542877fbe0fcdc4779a7a59d5ab6496d89cabe27a5d5de WHIRLPOOL 323c6d5aaada4daace471390ee3d5879cc74bd19563ef2d0efb1ef812d14090fae05ed6b861a83499792420ac654141a731837bd3b77f7a58c2e5b477f179664
+MISC ChangeLog-2015 3108 SHA256 d33f0f1027928164d11ea8405ff6eb42723bc17e1bcdc76cfcfc5ee218d817c7 SHA512 80b0bf11b7a979b4902d6762eeb57fa8b3e0d258f60809d15f27f8746e7b362b9a2b1d0c50bf436043c136e1068f5766462972c8c817515a5a556b23ed1217cc WHIRLPOOL d4bb266ece612d6f389c54d2101eff31c85ff67f8c974f05dbe1eb83cd5b1db5d88fab12062621e503d92d0efa111ebf5c44bf8f300d4af8110095037d202a90
+MISC metadata.xml 325 SHA256 a01ef2d342a96ee292fa26656e8927fbd69226c594705a692c57ded63225c02a SHA512 65ed2d54f5a181004ea4900cd1b26b632fe57809f4903f9e4bb79b3440e7e3d72effc62725be9e788922e37b38f34b4363c30a3adda9f9483c0a983ff2f9fe09 WHIRLPOOL 7a8d77bb4c4417eded9d0632a885b695c4cb1599707a5a88966a3e8bdb6fe63701c0fbfb349dd774c6e11210ef8bc77e36099fce2338b25fdb9a8bfc1ee3b4eb
diff --git a/net-analyzer/ostinato/metadata.xml b/net-analyzer/ostinato/metadata.xml
new file mode 100644
index 000000000000..fb90fd94be6f
--- /dev/null
+++ b/net-analyzer/ostinato/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">ostinato</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/ostinato/ostinato-0.5.1.ebuild b/net-analyzer/ostinato/ostinato-0.5.1.ebuild
new file mode 100644
index 000000000000..1feec41aa768
--- /dev/null
+++ b/net-analyzer/ostinato/ostinato-0.5.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit qt4-r2
+
+DESCRIPTION="A packet generator and analyzer"
+HOMEPAGE="http://ostinato.org/"
+SRC_URI="https://ostinato.googlecode.com/files/${PN}-src-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE=""
+
+DEPEND="dev-libs/protobuf:=
+	net-libs/libpcap
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtscript:4"
+RDEPEND="${DEPEND}"
+
+src_configure(){
+	eqmake4 PREFIX=/usr ost.pro
+}
diff --git a/net-analyzer/ostinato/ostinato-0.8.ebuild b/net-analyzer/ostinato/ostinato-0.8.ebuild
new file mode 100644
index 000000000000..9b5821f9b93a
--- /dev/null
+++ b/net-analyzer/ostinato/ostinato-0.8.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit qt4-r2
+
+DESCRIPTION="A packet generator and analyzer"
+HOMEPAGE="http://ostinato.org/"
+SRC_URI="https://bintray.com/pstavirs/ostinato/download_file?file_path=${PN}-src-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="dev-libs/protobuf:=
+	net-libs/libpcap
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtscript:4"
+RDEPEND="${DEPEND}"
+
+src_configure(){
+	eqmake4 PREFIX=/usr ost.pro
+}
diff --git a/net-analyzer/p0f/Manifest b/net-analyzer/p0f/Manifest
new file mode 100644
index 000000000000..c7967e30aff4
--- /dev/null
+++ b/net-analyzer/p0f/Manifest
@@ -0,0 +1,5 @@
+DIST p0f-3.09b.tgz 92896 SHA256 543b68638e739be5c3e818c3958c3b124ac0ccb8be62ba274b4241dbdec00e7f SHA512 2a688baa865f27c91c023a7c53e530649f56a681e6ca2533152ab07b42883857b20c378b636e87dda8d1d5dfac17e426d09ee032b363d0b7d98e57a9ff6164d0 WHIRLPOOL 139fd50748b4dc84ddc31f0a4c093adf7ea8c3bedf2d83415aff6497534147734fa74a0804917d27afd5690248d3e547027dfbec03e68af69aea0c8625004782
+EBUILD p0f-3.09_beta.ebuild 1125 SHA256 f9322c06e582efd00d06ef2e48829d42f7fb6469c46a38de54eab12634e64e66 SHA512 7ff25df174c07e974d09a8eec6a691c753d65ac0e4e74c00f415747bb4e5b8ae3fe8c069fde21a3ccdb7b42d3d0ad13ef6c1a8aab44170279deba25a46e24732 WHIRLPOOL fb45b75181ee052f22b438602df77560c3f1942bfe2614a8d644bc9c40bbc6278da13ddb4f3a3b8eb37d3ca1a1ecd744e4ccb022d427dad2b941a1060c656db6
+MISC ChangeLog 2814 SHA256 8b970569be70e61d0b2221cb29cc00f5ef23baa2fa5053688d95d0d9e7c08697 SHA512 dd27f4c0326cdedd0dd98223c1a85665f3081c84ef4111ce6105eb4c402925f368f90f83ff89ca75324e596dc5b5b7460f85e63fc9c96b3674fd8307ca7d576a WHIRLPOOL 1b805623ac9165c87e167868b73816cad3e4e0a93f3082467d339f72cb748e2efbe6e10ce87f9ee6730738c0bfac37fdc92e8854e0a178d51afd6507f8eaa6c7
+MISC ChangeLog-2015 6785 SHA256 ed0b0ae8e61f3083c81b504f6790d626cb34e17b5852062d034d1c07cbce2cc1 SHA512 75aee01fe8095d789489122aeb2959af6b143805ad7a8153af9700de9e78266cfb7cb35e4e4dbffd5078e1727271f130e4036e5f2295751ceaa3fd4c775c8c14 WHIRLPOOL fda8b2584a4ec51c8e5a8746390db888710beb6dc23f04e16daaec1f4e99d8e077aebd6df79ca89890edadcba854c80c614b095092da06d4da6ddf3c97772a92
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/p0f/metadata.xml b/net-analyzer/p0f/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/p0f/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/p0f/p0f-3.09_beta.ebuild b/net-analyzer/p0f/p0f-3.09_beta.ebuild
new file mode 100644
index 000000000000..192d999c2654
--- /dev/null
+++ b/net-analyzer/p0f/p0f-3.09_beta.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+MY_P=${P/_beta/b}
+
+DESCRIPTION="A tool to perform passive OS detection based on SYN packets"
+HOMEPAGE="http://lcamtuf.coredump.cx/p0f3/"
+SRC_URI="http://lcamtuf.coredump.cx/p0f3/releases/${MY_P}.tgz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos"
+IUSE="debug ipv6"
+
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's:-g -ggdb::' \
+		-e 's:-O3::' \
+		-e '/^CC/s:=:?=:' \
+		-e '/^CFLAGS/s:=:+=:' \
+		-e '/^LDFLAGS/s:=:+=:' \
+		build.sh tools/Makefile || die
+
+	sed -i -e "/FP_FILE/s:p0f.fp:${EPREFIX}/etc/&:" config.h || die
+}
+
+src_compile() {
+	tc-export CC
+	./build.sh $(use debug && echo debug) || die
+	emake -C tools p0f-client p0f-sendsyn $(use ipv6 && echo p0f-sendsyn6)
+}
+
+src_install() {
+	dosbin p0f tools/p0f-{client,sendsyn}
+	use ipv6 && dosbin tools/p0f-sendsyn6
+
+	insinto /etc
+	doins p0f.fp
+
+	dodoc docs/{ChangeLog,README,TODO,*.txt} tools/README-TOOLS
+}
diff --git a/net-analyzer/packit/Manifest b/net-analyzer/packit/Manifest
new file mode 100644
index 000000000000..f81f4f12fe9c
--- /dev/null
+++ b/net-analyzer/packit/Manifest
@@ -0,0 +1,10 @@
+AUX packit-1.0-format.patch 1827 SHA256 e72fb30a0be052599092a1a626e272ad75f50c302c9fc4db07de40c3337068c2 SHA512 e82a0a917228cbd95520b89aedb8259c94b4442af4ae6b8bfe0b4ea3d182c542a0b7dcf58850855a9f2fdd7b15b9d6978fa3ef0581d39760199366b0ae58fa97 WHIRLPOOL 34b6fe7fc19dd70e1e10267239bde6c67d99f58dcf705dc01b274c38ba6fb58b1b2e2773f21e9c6bcbeb7db482099e0c0354ecd9e92a7fc8a3c0256e7df3d819
+AUX packit-1.0-noopt.patch 214 SHA256 2667ebc080c8b7827eb1c21458598fd8fbe7910569df0482f8ffca7eff084ea9 SHA512 a4d0bcdb8947d219459d1a5687cdcadb7f8e9792bad2adabe8a402d42e19c5ca9e6e808bd6d832490af271d58d555d18c5f4949758233b47f27d7e115d36e6f3 WHIRLPOOL 0695d1c7c401382c2e69d22c63683b6fc6c793548d0503623b9a6988218b691ce8f1ea2ba53f3df337e76e7f9383d95a4e89b835ad97dcce9c6091775301f906
+AUX packit-1.0-nostrip.patch 125 SHA256 88ab4940f3ff0969d8f88b18aafbcce218565b20fc03b495907a00854f896bbf SHA512 b0cad5051c5f242a526ccd0ee04c27dd80bd8ba48a79164d8dd57aeecca800c977c79e12c999fa971c4ce1a39585d6f8581fae9e3b35dc200ce40922cdb122f3 WHIRLPOOL 2456eba7f2ffb9b78bfc5d2381db44201678795a76791a7c575d9b101fe9cce3c94ab0c4d9ebd0e0f3ed7bdae4ca81f1c38703fae1446b007418a9f874987d08
+AUX packit-1.0-overflow.patch 1444 SHA256 3d7d84148e363c90206b12c9958b8beeeac611f61e70660c92cd849e14764d76 SHA512 7798177a770e81b0db4bd2cf879d17f1dd6a0ae763e4546f2136e5cfc0e49e22d7c0b8eac1bb4409a026a8a072baae93f4c5d1079a3ac0dfc589a2fad15ecdd1 WHIRLPOOL a035932a0d4dd59034473b6aac0d52144967856bb590290f8097be4dfd0429bdef9fb2d7b2021374b6292572a8c7466982fd2df2f022e8c74eb46e75c4c9d2d4
+AUX packit-1.0-pcap-header.patch 448 SHA256 cf0f70836d4088562771141c11fed02f49ae44a6cb3fae82589f2cef37032067 SHA512 a88baa7cde0e333fa604f219dbabe77db4452dcf3a8071a8e3e4977b45947ea7827b5746cd187ab32bf236777e415e4f7cb0b3d18ee6ef776783bdbf9e6ef886 WHIRLPOOL ad6b3772cebf879ffd8763fc0cd763534a26f90e26b384c327bfbb46c677bf386cc3ff42f22aef8c72dcd494edb75542804226b96ae1112bf8a092cfcb8c0b21
+DIST packit-1.0.tgz 138367 SHA256 dd03023a03b3c98819f4da5c23426d103ed3f457562e2afda2eb3ebc419ad8fa SHA512 cc7e957d2149edbc92d4d914c9f29aecb7945bab43f2df7435bc4c21a4724f92e9d99990683e4d301384117f79819f87f423eaa28dbef11b37a96c4aa40a1398 WHIRLPOOL f436c33d01d33f39d348012431347d6558f4f64e953343428465c1af5a3639685eba7e5974ac17a0cfd810d8b9d02f266c5f515b9ca591cdf060af6705a0f96a
+EBUILD packit-1.0-r2.ebuild 788 SHA256 dd05049cc9275ee6fe3d08d9b388fe407b59f09975a20927a4575d4d02d5129f SHA512 dccbb6d0e960d51db35ade7da0df07ac28e25aee0a2f55774e385d5c240c073922bb02e0f8da4417e595ac2a2f259bd062bb7921ac655696dfd355de7e37dd09 WHIRLPOOL 91ac543706bd0ee3853fd6967c914868de8e760c501a85995313a03f55b125a812f99d2dfad389664ed3cc9d4dcaa5e891236237c26688931ec3f095ab655ae7
+MISC ChangeLog 2601 SHA256 f435d252be1c0e302ac6b89412fdd9f3786312f74cc0a3e62e836ffd71613ee9 SHA512 d6f401c0912f4905b64a83f2f1ed29b60d6da3e5fcf7cd05fc6191966c135889713eec1ccd8674663c6e526dc0bd5a1f7295d235d62db1f76ee284d0321350b2 WHIRLPOOL 1794bf5f4740a5a90a1d4d41a66460596db0f756de3a858ff3ab221156dc8ecb0d50f849fc0557177f011c0985eeece2c25e44136a989208473a14bed362a335
+MISC ChangeLog-2015 4069 SHA256 ab6bb8f2a352d48bc6a5a420d91f4588c0b7e7059ef2f713ae39f3c3c61ddcb8 SHA512 1c369a41a833b5e2e4843b26c1509d8c098cdd5e662a3d26e2b269fc2dc6b9f4a6492f955bf5c64d6e06d3ebab4e855eb30763bcf36f6417fb2152a92900685f WHIRLPOOL 4b0464e89f72483ebbbd3da0c2d182ad16425291a257190251a4e0a0963fa9b8175b390cf78de3af53cd3c6e63d6798c1838c90e2e2726949082f9c22f52f644
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/packit/files/packit-1.0-format.patch b/net-analyzer/packit/files/packit-1.0-format.patch
new file mode 100644
index 000000000000..88a5edd92cdc
--- /dev/null
+++ b/net-analyzer/packit/files/packit-1.0-format.patch
@@ -0,0 +1,43 @@
+The original objective seems to have been to apply padding, but this
+is not done at all: instead, set a precision. -JeR
+
+--- a/src/shape_arp_hdr.c
++++ b/src/shape_arp_hdr.c
+@@ -94,7 +94,7 @@
+     if(format_ethernet_addr(ahdr_o.s_eaddr, s_neaddr) == 0)
+         fatal_error("Invalid sender ethernet address");
+ 
+-    snprintf(ahdr_o.shw_addr, 18, "%0X:%0X:%0X:%0X:%0X:%0X",
++    snprintf(ahdr_o.shw_addr, 18, "%.2X:%.2X:%.2X:%.2X:%.2X:%.2X",
+         s_neaddr[0], s_neaddr[1], s_neaddr[2], s_neaddr[3], s_neaddr[4], s_neaddr[5]);
+ 
+     if(ahdr_o.r_paddr == NULL)
+@@ -139,7 +139,7 @@
+     if(format_ethernet_addr(ahdr_o.r_eaddr, r_neaddr) == 0)
+         fatal_error("Invalid receiver ethernet address");
+ 
+-    snprintf(ahdr_o.rhw_addr, 18, "%0X:%0X:%0X:%0X:%0X:%0X",
++    snprintf(ahdr_o.rhw_addr, 18, "%.2X:%.2X:%.2X:%.2X:%.2X:%.2X",
+         r_neaddr[0], r_neaddr[1], r_neaddr[2], r_neaddr[3], r_neaddr[4], r_neaddr[5]);
+ 
+     if(libnet_build_arp(
+--- a/src/shape_ethernet_hdr.c
++++ b/src/shape_ethernet_hdr.c
+@@ -56,7 +56,7 @@
+         if(format_ethernet_addr(ehdr_o.s_addr, us_addr) == 0)
+             fatal_error("Invalid source ethernet address");
+     
+-    snprintf(ehdr_o.shw_addr, 18, "%0X:%0X:%0X:%0X:%0X:%0X",
++    snprintf(ehdr_o.shw_addr, 18, "%.2X:%.2X:%.2X:%.2X:%.2X:%.2X",
+         us_addr[0], us_addr[1], us_addr[2], us_addr[3], us_addr[4], us_addr[5]);
+ 
+     if(ehdr_o.d_addr == NULL && injection_type == ETHERTYPE_ARP)
+@@ -71,7 +71,7 @@
+     if(format_ethernet_addr(ehdr_o.d_addr, ud_addr) == 0)
+         fatal_error("Invalid destination ethernet address");
+ 
+-    snprintf(ehdr_o.dhw_addr, 18, "%0X:%0X:%0X:%0X:%0X:%0X",
++    snprintf(ehdr_o.dhw_addr, 18, "%.2X:%.2X:%.2X:%.2X:%.2X:%.2X",
+         ud_addr[0], ud_addr[1], ud_addr[2], ud_addr[3], ud_addr[4], ud_addr[5]);
+ 
+     if(libnet_build_ethernet(
diff --git a/net-analyzer/packit/files/packit-1.0-noopt.patch b/net-analyzer/packit/files/packit-1.0-noopt.patch
new file mode 100644
index 000000000000..d6bfdf6fb74f
--- /dev/null
+++ b/net-analyzer/packit/files/packit-1.0-noopt.patch
@@ -0,0 +1,10 @@
+--- a/src/main.c
++++ b/src/main.c
+@@ -201,6 +201,7 @@
+ #ifdef DEBUG
+     fprintf(stdout, "DEBUG: parse_inject\n");
+ #endif
++    if (!opts) print_usage();
+ 
+     while((opt = getopt(argc, argv, opts)) != -1)
+     {
diff --git a/net-analyzer/packit/files/packit-1.0-nostrip.patch b/net-analyzer/packit/files/packit-1.0-nostrip.patch
new file mode 100644
index 000000000000..672f48ca1fd6
--- /dev/null
+++ b/net-analyzer/packit/files/packit-1.0-nostrip.patch
@@ -0,0 +1,10 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -450,7 +450,6 @@
+ 
+ 
+ all:
+-	strip @BINS@
+ 	cp @BINS@ $(top_srcdir)
+ 
+ clean:
diff --git a/net-analyzer/packit/files/packit-1.0-overflow.patch b/net-analyzer/packit/files/packit-1.0-overflow.patch
new file mode 100644
index 000000000000..3adf31a6bb82
--- /dev/null
+++ b/net-analyzer/packit/files/packit-1.0-overflow.patch
@@ -0,0 +1,58 @@
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -137,7 +137,7 @@
+ #endif
+ 
+     va_start(va, msgp);
+-    vsnprintf(msg, 256, msgp, va);
++    vsnprintf(msg, 255, msgp, va);
+ 
+     msg_len = strlen(msg);
+ 
+--- a/src/exit.c
++++ b/src/exit.c
+@@ -36,7 +36,7 @@
+         while(1)
+         {
+             fprintf(stderr, "\n\nWould you like to quit? (y/n): ");
+-            fgets(a, 16, stdin);
++            fgets(a, 2, stdin);
+ 
+             if(!strncasecmp(a, "Y", 1))            
+                 break;
+--- a/src/define_defaults.c
++++ b/src/define_defaults.c
+@@ -36,7 +36,7 @@
+     rand_d_port = (p_mode == M_TRACE) ? 1 : 0;
+     r_timeout = 1;
+     burst_rate = 1;
+-    hwaddr_p[17] = 0;
++    /* hwaddr_p[18] = 0; */
+     init_type = 1;
+     interval_sec = 1;
+     interval_usec = 0;
+--- a/src/inject_defs.h
++++ b/src/inject_defs.h
+@@ -132,9 +132,9 @@
+     u_int16_t rand_d_addr;
+ 
+     u_int8_t *s_addr;                   /* source ethernet address string */
+-    u_int8_t shw_addr[17];
++    u_int8_t shw_addr[18];
+     u_int8_t *d_addr;                   /* destination ethernet address string */
+-    u_int8_t dhw_addr[17];
++    u_int8_t dhw_addr[18];
+ } ehdr_o;
+ 
+ struct arphdr_opts
+@@ -153,8 +153,8 @@
+     u_int8_t *r_eaddr;                  /* receiver ethernet address */
+     u_int16_t rand_r_eaddr;
+ 
+-    u_int8_t shw_addr[17];
+-    u_int8_t rhw_addr[17];
++    u_int8_t shw_addr[18];
++    u_int8_t rhw_addr[18];
+ } ahdr_o;
+ 
+ libnet_t *pkt_d;
diff --git a/net-analyzer/packit/files/packit-1.0-pcap-header.patch b/net-analyzer/packit/files/packit-1.0-pcap-header.patch
new file mode 100644
index 000000000000..6cda0a8e65ce
--- /dev/null
+++ b/net-analyzer/packit/files/packit-1.0-pcap-header.patch
@@ -0,0 +1,22 @@
+--- a/src/globals.h
++++ b/src/globals.h
+@@ -31,7 +31,7 @@
+ #include <libnet.h>
+ #include <pcap.h>
+ #include <sys/types.h>
+-#include <net/bpf.h>
++#include <pcap-bpf.h>
+ #include <signal.h>
+ #include <time.h>
+ #include <stdio.h>
+--- a/src/main.h
++++ b/src/main.h
+@@ -26,7 +26,7 @@
+ #include <libnet.h>
+ #include <pcap.h>
+ #include <sys/types.h>
+-#include <net/bpf.h>
++#include <pcap-bpf.h>
+ #include <signal.h>
+ #include <time.h>
+ #include <stdio.h>
diff --git a/net-analyzer/packit/metadata.xml b/net-analyzer/packit/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/packit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/packit/packit-1.0-r2.ebuild b/net-analyzer/packit/packit-1.0-r2.ebuild
new file mode 100644
index 000000000000..7df31e37cab7
--- /dev/null
+++ b/net-analyzer/packit/packit-1.0-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="network auditing tool that allows you to monitor, manipulate, and inject customized IPv4 traffic"
+HOMEPAGE="http://packetfactory.openwall.net/projects/packit/"
+SRC_URI="${HOMEPAGE}downloads/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="
+	net-libs/libnet:1.1
+	net-libs/libpcap
+"
+RDEPEND="${DEPEND}"
+
+src_prepare(){
+	epatch \
+		"${FILESDIR}"/packit-1.0-format.patch \
+		"${FILESDIR}"/packit-1.0-noopt.patch \
+		"${FILESDIR}"/packit-1.0-nostrip.patch \
+		"${FILESDIR}"/packit-1.0-overflow.patch \
+		"${FILESDIR}"/packit-1.0-pcap-header.patch
+}
+
+src_install() {
+	default
+	dodoc docs/*
+}
diff --git a/net-analyzer/pathload/Manifest b/net-analyzer/pathload/Manifest
new file mode 100644
index 000000000000..8b4c181f9e26
--- /dev/null
+++ b/net-analyzer/pathload/Manifest
@@ -0,0 +1,6 @@
+AUX pathload-1.3.2-make.patch 509 SHA256 7e2227967ba94e4ad8c18264d19aabd9d3e9a41cdf93bcb65753ab82285aed46 SHA512 c71e2df04a8d21826460c474f69eaf46ff1eb3ed0e98b70df38d4503a87cd5eb021d21c8eadf016d4b2c684b7beeb2de8f933b7765712222819b27e2a64f770c WHIRLPOOL becfa0da4882042dc4fd6ab193b57277b599ee5b7f1ac6d7dde7e2dfed2060306fe7ceb65ec03dd969f7d15f401fe8e4cc490e931be83a69aa98a2a558b3e880
+DIST pathload-1.3.2.tar.gz 68524 SHA256 186859ee5a2583fd9a23c3e4afdebad46b918abc144da6f0909b250723ce7aac SHA512 9fef51c86b8aa2c28a33effe5a5bff36eebc0812f6d6744fac93df46ec0cbce8f5977d24b6ac52442386fb263550fe46e639c4a3ff4612fe92ad09d6595e5d7f WHIRLPOOL f78779a2f15ff9270dd795281ae7c865526e3b65d39111d4603b512b574694e75d0cf829f04b01c6ee63a1e30dc1f5c9bbe9ef0e390e1d3891014a09f99ac847
+EBUILD pathload-1.3.2.ebuild 596 SHA256 d82fdc952328d353aebf4227b44f6989e1580d6edeee07b0ad2583847a73190b SHA512 0b829bfc93f7df3fbdab2b56dab95f9ed6665868094d55f335b8e438ec1848fc0fe60ea14dc08ec37680b9ca1733e346624cc0d961131d0e9d60acc4cec1ac95 WHIRLPOOL 726938ee300ec6d8a5fa43f916b6278f3644474de3185a52030f0609bd348f56193bf4320c0dbffaf82dfc58cb328f90ceaa13518c3b688617b2723fe35f6420
+MISC ChangeLog 2468 SHA256 4cc7c28363763e792e2c1ad5d76acdbedf416b745a3098bce123b8aeec2d1d2f SHA512 a97b747d63d26f685acd74ea6c1b708ce0cef39216e5755d375aad473016298a399465f2e4fdb667ceb43271ff786fde16e62a4f0a0d9c429a6141f462a3ee7f WHIRLPOOL aeb7afab220b16a6c3012dbf7b4d26499bbac8c53946b088bda510c8cc994e8b2a4b8e4283108544290e1e9bec6184d7868b668ba16fff9f57f160460a916706
+MISC ChangeLog-2015 645 SHA256 e288c9a2e2dbf40984b628a369f72a4e789e2bfd990cb20350d9f6fc637d0f64 SHA512 3dc2f82f997a816a92a156beb7dad9cdabd1d6c7f98daa61617ae889b674c76c90ee79a3448d1d4cf6c32204fc6673f46e620917c45d3f27334ca8356376ad2d WHIRLPOOL 3251723e824bf19136d362511b0d3740a333a99b2a9ed34d0dcf66e152f55001476f5edef06eed17906555bf4dd743f392c07e2db9b3b7c49d875f078bc0b23c
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/pathload/files/pathload-1.3.2-make.patch b/net-analyzer/pathload/files/pathload-1.3.2-make.patch
new file mode 100644
index 000000000000..f97848839627
--- /dev/null
+++ b/net-analyzer/pathload/files/pathload-1.3.2-make.patch
@@ -0,0 +1,19 @@
+--- a/makefile.in
++++ b/makefile.in
+@@ -11,13 +11,13 @@
+ 
+ TARGETS=pathload_snd pathload_rcv
+ 
+-all:${TARGETS} clean
++all:${TARGETS}
+ 
+ pathload_snd: $(SOBJS)
+-	 $(CC) $(SOBJS) -o pathload_snd $(LIBS) $(LDFLAGS) $(CFLAGS)
++	 $(CC) $(LDFLAGS) $(CFLAGS) $(SOBJS) -o pathload_snd $(LIBS)
+ 
+ pathload_rcv: $(ROBJS)
+-	 $(CC) $(ROBJS) -o pathload_rcv $(LIBS) $(LDFLAGS) $(CFLAGS)
++	 $(CC) $(LDFLAGS) $(CFLAGS) $(ROBJS) -o pathload_rcv $(LIBS)
+ 
+ pathload_rcv.o pathload_rcv_func.o: pathload_gbls.h pathload_rcv.h
+ 
diff --git a/net-analyzer/pathload/metadata.xml b/net-analyzer/pathload/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/pathload/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/pathload/pathload-1.3.2.ebuild b/net-analyzer/pathload/pathload-1.3.2.ebuild
new file mode 100644
index 000000000000..4a4b5881535d
--- /dev/null
+++ b/net-analyzer/pathload/pathload-1.3.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Non-intrusive utility for estimation of available bandwidth of Internet paths"
+HOMEPAGE="http://www.cc.gatech.edu/fac/constantinos.dovrolis/bw-est/pathload.html"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-make.patch
+	tc-export CC
+}
+
+src_install() {
+	dobin ${PN}_snd ${PN}_rcv
+	dodoc CHANGELOG CHANGES README
+}
diff --git a/net-analyzer/pbgpp/Manifest b/net-analyzer/pbgpp/Manifest
new file mode 100644
index 000000000000..f1993c7ec237
--- /dev/null
+++ b/net-analyzer/pbgpp/Manifest
@@ -0,0 +1,3 @@
+DIST pbgpp-0.2.10.tar.gz 38796 SHA256 a486c089d576afc8b04f1a6d61c2a7ce6d3eddf553a29b97aa65c75615a3438e SHA512 ecacd1ef81b1ed379ab4bf5aad534e93bef94a2f67fdb04cfa5dc98d13f53060ce99bc220c7bce64862a182c11c4b60a31752978cec619f5546dfd7fb721d466 WHIRLPOOL c48efaf8a962197f111209dfb1a5e4ccb778aca03489f4712d202dd86b479c35bbc50c5e1fb01ae685dea8a3bd9cf1841675ade6786b203bd8cdcae8bc217211
+EBUILD pbgpp-0.2.10.ebuild 444 SHA256 d6c1aca53124c407649ef841dc9cf9ada6b2c9fcc6f4824d1a090a869e2d8cfe SHA512 32cc03a7cd82ee2f148a3d1e5fdd38156fd867deb62a910863db0a0f4dba5861738a60d8ba274c5c2ef8f385629402948679a1a44745b4fb0b229935d9a8e54f WHIRLPOOL 4c74d5627010db16db2e38b1d96f107c504f47e1a1ad1bee354f5023ed4c56150b9d97adf190710b83783859d153d8a3775894a2b554e3b45ff884bcb0b28900
+MISC metadata.xml 358 SHA256 a0ec717b3c92a0292658be3f9b49c88e3807c4fef6eed620ca79d73897435c6f SHA512 f7a17e837c410ac604a0e1b4493c7219846a8c8cbcd5b4fb84ffc401b98c8eeacba4731dabad6f61bf1e4f172157c174d6a039725174e2f58b9dfbb89998635d WHIRLPOOL b3f8ef642481163608c01d39f12f705922cf6249c369b65f545b616aa64baf67655d4934005ca13dd82c8cd2656c0c9fa0c5f0994d29aa9728c236f3ea17f24a
diff --git a/net-analyzer/pbgpp/metadata.xml b/net-analyzer/pbgpp/metadata.xml
new file mode 100644
index 000000000000..36420f308fae
--- /dev/null
+++ b/net-analyzer/pbgpp/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/pbgpp/pbgpp-0.2.10.ebuild b/net-analyzer/pbgpp/pbgpp-0.2.10.ebuild
new file mode 100644
index 000000000000..b150d3a518fe
--- /dev/null
+++ b/net-analyzer/pbgpp/pbgpp-0.2.10.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="PCAP BGP Parser"
+HOMEPAGE="https://github.com/de-cix/pbgp-parser"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-python/kafka-python[${PYTHON_USEDEP}]
+	 dev-python/pcapy[${PYTHON_USEDEP}]"
diff --git a/net-analyzer/pbnj/Manifest b/net-analyzer/pbnj/Manifest
new file mode 100644
index 000000000000..cfdd2bb033e5
--- /dev/null
+++ b/net-analyzer/pbnj/Manifest
@@ -0,0 +1,5 @@
+DIST pbnj-2.04.tar.bz2 57438 SHA256 32b9d004f497d454ce255b10454b955707dae0c42072c9c7ed8e305c092338b5 SHA512 7f486c4e16a891d90ff10fa80b85ba68346f37152c5f932832c3760985f0dff5c58e0f23309ed395f0c06ff4287bf4af66d1b39de7f2838a868e6b8335afe206 WHIRLPOOL decee06ac6513260129e2ea3c9e97e47f0cc2d0fa0071914f21233b47f1ea9bed8913c0a8815e73749d2a1ac3d355feca0329d5449daab2400636e85ce62f8dc
+EBUILD pbnj-2.04.ebuild 560 SHA256 fac57f37ec2234decbcb9a0af6afe4cad716a697c3df78cb5f8f42b0fc778598 SHA512 74a9321c4118429e2014596f3802d0840d100440495f5a1a657d4d870d76cde1172fcedbdff6f080f2e5baf3a4f3c2407f5a7b70145cb221b8144cc90f460248 WHIRLPOOL e4e12b0482ef097d63d433989f520f6fb2c7f503445b0c8d9e23b26d0aaace637c4b5c9b59927406ef66f9345d4d1ccf36dbf2231a1ad7282afa5d568de7fd91
+MISC ChangeLog 2718 SHA256 8e791f66e1b3eb3511a6fe0bacc3972655b8ba9a6c1c5f0695931aefa01d9d54 SHA512 4fe3d409a57978e474c41e88cb407abd3a07818a35ac0cfcca715a851859c3fc7e16600e277fa571098448ed320519e8c66730720e45cf2fce04d52e6980d483 WHIRLPOOL 578bb569e6042e6e9362568bfb38a5518900b4d4d6569c5c23172cf28363e9dd1164c86f409b57df467fcea4a3891d671b96dffa569f17995586f0ddfe971d2d
+MISC ChangeLog-2015 1361 SHA256 5b3f0ebb94e4551d906f53f98c85297a5ff82e8cce8ebfb03a46dd0312567988 SHA512 f52aa735ee7ff19ed58a3e6ca6bba69d3914820de242e5bc9fff814162852c2c58b003445ede5530cf47e301f79838868f8d0c96803b33dd53821f8b6ed5c2d7 WHIRLPOOL 9ee3f7e3b368acd08329986eb7f993e1415db13e261a4381e5b76f0899243ea61630ec9f1296abb6f8800f58aa929e05e24808f1e73ed8b84c6cb20d576ebdf6
+MISC metadata.xml 364 SHA256 36ab3ff2671a1dd4b49b9ac4a3daf004c7cdf4dad449560d95f2ac0d21209391 SHA512 cbd77dbb09b911704cd44e430b7513254998eb0fd1853d2c6a158d8c72145df56e71a54229a8c540769bb2cd502195249e23cf3fc38f80268643389617e42b2b WHIRLPOOL 14453178ad1bc044508eaa1c227fa686d4bd9a0389c9b672f74c409270cd2b680388a2f208e74193b3e8729a60156e66ef1e74bb60609fe174c6bb5a78068b85
diff --git a/net-analyzer/pbnj/metadata.xml b/net-analyzer/pbnj/metadata.xml
new file mode 100644
index 000000000000..4a2800404400
--- /dev/null
+++ b/net-analyzer/pbnj/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">pbnj</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/pbnj/pbnj-2.04.ebuild b/net-analyzer/pbnj/pbnj-2.04.ebuild
new file mode 100644
index 000000000000..1c04a49c3a0b
--- /dev/null
+++ b/net-analyzer/pbnj/pbnj-2.04.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit perl-module
+
+DESCRIPTION="A tool for running Nmap scans and diff'ing the results"
+HOMEPAGE="http://pbnj.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pbnj/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="
+	dev-perl/DBD-SQLite
+	dev-perl/DBI
+	dev-perl/File-HomeDir
+	dev-perl/File-Which
+	dev-perl/Nmap-Parser
+	dev-perl/Text-CSV_XS
+	dev-perl/XML-Twig
+	dev-perl/YAML
+"
+RDEPEND="
+	${DEPEND}
+	net-analyzer/nmap
+"
diff --git a/net-analyzer/pchar/Manifest b/net-analyzer/pchar/Manifest
new file mode 100644
index 000000000000..bb5caec5a474
--- /dev/null
+++ b/net-analyzer/pchar/Manifest
@@ -0,0 +1,6 @@
+AUX pchar-1.5-snmp.patch 874 SHA256 3c67ac2ef21c7d503f28a5020baf763c9ca24f99d38b078bb5dcb3e8a3424f38 SHA512 d0f64b535154534f171f4397afbbee0ce1db03048417aebc625c62b546ce2ae02d9af7c03220c9dec76adf6780db1e74c484dc500c1399bc8e7065c5a5c4aa8f WHIRLPOOL c43c7630dac791afdc4a4ffe9bf4e42aa72176eb9bd3af7228648e3389971cb120f5cd3797b5b2f12d0b9045c9fb14b99297b8aa9c9d051a7a4b40b220fa8c73
+DIST pchar-1.5.tar.gz 117678 SHA256 7019297084f1000557a019501532ecae67772851717329cc02227f5c17e36d27 SHA512 56784589a16638a12230a11a177b8dd97a7abac927624beaaea89e0169423f7242c2b434a36aad1a07d977e6b006fd71eb9132aecb1d35e3e3363eb2d1549d84 WHIRLPOOL 952ed4b9497da6b1e9ab8748d76e447b411e020baf0cebfb73e17e761b54de3c874707eebf6940510c0a1443823613021e1abac296bba9792680c6409c2a9f08
+EBUILD pchar-1.5-r1.ebuild 880 SHA256 b752c1f0c57b3742664996d0ce4ed00221c6bae5e658125b05599bbd5ef950c6 SHA512 696dfb81fce6220e1b583cb27872d06879435dcaf0ef0deab7e445bd358a8c73436103cd22545ba2b61b85fde1655afa2e4be98ec47fe24b4478b5358a3ffc15 WHIRLPOOL acba81e2d7f96196b5c65fac4d83fe4bd5a37b96831c9b60ab50d859a1b9337a94348dbd50ed526e498c029a7607fb623727644a237fb0fe3a733b688c84d4ee
+MISC ChangeLog 2598 SHA256 1bbef26cdc76ff4b5c7a986898d6ef9459df0f856e597f9650fa41d2987a1726 SHA512 34592bcb4dbee9219cec02dda86c81006d118e91586ca813a4287ab22ddf29637cb85604438cbcc269be7382c52b6dd68e5f6ddbdd6590361ad1b7b415fadc9d WHIRLPOOL b118607c88b16e8156e085a4e4bde7df77708f0c5b81a1ed4596c0bf3a02c1a46ae7467338058e0ba9b6099aeca852bb86592df0820d7cfb3c4bc1fa4446a8a5
+MISC ChangeLog-2015 1516 SHA256 c98b1d34a655f1abc52bf1fbd7cccb14489b182cbe70bae2cd297ad4bb7a0ef2 SHA512 92d4d2594b4f1aa7c4c45654d87e8678e070e5c84b9b90ea74d2d22c1f35149d9e4c9bdddae62349e624a7dcd2a03dbc16f009d453c011cce630e0c442dec776 WHIRLPOOL 91c9872e825b7c869c45f704435898ecdd45a0316a0c80b0148a90efdb77856b03f4ea963d094d0385eb576da65ced1853eeb9eda1d5a889752826c0e2cb7f83
+MISC metadata.xml 626 SHA256 5c6cde02ba512d6f61181e0cbe7151a402f4cd6a512cc55bf65b967618dd39fb SHA512 67dc60bde2d5804b91a19d6037b78ca1df55aa735c8329836817af15875fce11345379812090a7755e4952b43d6cc9bb373db1b6ceba70ae957c927321154fb2 WHIRLPOOL f46f44cc5e63c90cc7e979cfe401226dc4cd23d44f041ec467cf4eacde6e8ffefd560e117933a62d16378ef1d0f5816f131c47ccfb0827c855ae404e585ccee4
diff --git a/net-analyzer/pchar/files/pchar-1.5-snmp.patch b/net-analyzer/pchar/files/pchar-1.5-snmp.patch
new file mode 100644
index 000000000000..9ebfbad39eb0
--- /dev/null
+++ b/net-analyzer/pchar/files/pchar-1.5-snmp.patch
@@ -0,0 +1,24 @@
+--- GetIfInfo.h.old	2005-02-12 21:32:18.000000000 +0100
++++ GetIfInfo.h	2006-09-22 11:08:44.000000000 +0200
+@@ -17,7 +17,7 @@
+   bool	IsValid(void);
+ 
+   const char *	GetDescription(void) const;
+-  const char *	GetIfInfo::GetName(void) const;
++  const char *	GetName(void) const;
+   const char *	GetContact(void) const;
+   const char *	GetLocation(void) const;
+   const char *	GetIfDescription(void) const;
+--- configure.in.old	2005-02-12 21:32:18.000000000 +0100
++++ configure.in	2006-10-24 23:08:38.000000000 +0200
+@@ -128,8 +128,8 @@
+ 	LDFLAGS="-L$with_snmp/lib $LDFLAGS"
+ 	CPPFLAGS="-I$with_snmp/include $CPPFLAGS"
+     fi
+-    AC_CHECK_LIB(crypto, des_cbc_encrypt)
+-    AC_CHECK_LIB(snmp, snmp_sess_init,,,-lcrypto)
++    AC_CHECK_LIB(crypto, DES_cbc_encrypt)
++    AC_CHECK_LIB(snmp, snmp_sess_init)
+ fi
+ 
+ dnl pcap support if desired.  If the user enabled --with-pcap,
diff --git a/net-analyzer/pchar/metadata.xml b/net-analyzer/pchar/metadata.xml
new file mode 100644
index 000000000000..f1fd21ae99d5
--- /dev/null
+++ b/net-analyzer/pchar/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>chutzpah@gentoo.org</email>
+	<name>Patrick McLean</name>
+</maintainer>
+<longdescription lang="en">
+pchar is a reimplementation of the pathchar utility, written by Van
+Jacobson.  Both programs attempt to characterize the bandwidth,
+latency, and loss of links along an end-to-end path through the
+Internet.  pchar works in both IPv4 and IPv6 networks.
+</longdescription>
+<use>
+	<flag name="pcap">Use the <pkg>net-libs/libpcap</pkg> library</flag>
+</use>
+</pkgmetadata>
diff --git a/net-analyzer/pchar/pchar-1.5-r1.ebuild b/net-analyzer/pchar/pchar-1.5-r1.ebuild
new file mode 100644
index 000000000000..37006d24eeac
--- /dev/null
+++ b/net-analyzer/pchar/pchar-1.5-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+WANT_AUTOCONF=2.1
+WANT_AUTOMAKE=none
+
+inherit eutils autotools toolchain-funcs
+
+DESCRIPTION="Internet bandwidth, latency, and loss of links analyzer"
+HOMEPAGE="http://www.kitchenlab.org/www/bmah/Software/pchar/"
+SRC_URI="http://www.kitchenlab.org/www/bmah/Software/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="ipv6 pcap snmp"
+
+DEPEND=">=dev-libs/openssl-0.9.7
+	snmp? ( net-analyzer/net-snmp[ucd-compat(+)] )
+	pcap? ( net-libs/libpcap )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-snmp.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	econf --without-suid \
+		$(use_with ipv6) \
+		$(use_with snmp snmp /usr/lib) \
+		$(use_with pcap)
+}
+
+src_install() {
+	einstall
+	dodoc FAQ CHANGES README
+}
diff --git a/net-analyzer/pinger/Manifest b/net-analyzer/pinger/Manifest
new file mode 100644
index 000000000000..826768a091ac
--- /dev/null
+++ b/net-analyzer/pinger/Manifest
@@ -0,0 +1,10 @@
+AUX gtk-2.0.m4 7539 SHA256 a70f40690ad9fb41178131d63d3e5579baff4d15c412b1c74e2bde92b4c7dd3b SHA512 efaa503adf5653a60cd807e9ed8a4ab0bc1ef93610ff022b7fd74cbddc3940adf210c0dd419d348686b3f1761aec51c1d8ff335d1bf6b765739270b08337089e WHIRLPOOL 69656aaab982f4a515bbb9394c84f3bf6e4bf2a8c94b1e3c62b9ae51374e1b1ae73e87eb4d6540eede799354a453e346a497f3905e79d467ffccdfff00683881
+AUX pinger-0.32e-tinfo.patch 907 SHA256 ebf26e93521ed7d0d8829bb54d504a1aef10b35b3b63bf330831b9b09fb43a70 SHA512 690b3b669d225c55641fce56d91d287a2152c0546b15f728761ec869afc311a49f831b38642f63f999958e20ba6ce2855efc2a5c3aec6ab2a752349cc375904f WHIRLPOOL 3262c5569ac7a8fc688e7cd34e6750029195ff617b6e3cb0ffa813c677ca601a9620206ef6ff905335c2d78fa517b712f3513656b6085de36bef690657fa5482
+AUX pinger-0.33-gentoo.patch 2488 SHA256 30c4c9fd66e1ee7577d18930a881a15c918d2262240ddf7a500dae3a24c2b6f3 SHA512 7ebda41ab5caf068476e82f181893b688a0c211cc3e26750517e2cdd4db872bfba4b8d389708bb39fedf103d29cb5b98be3ba0064cd73453735ece3a68776730 WHIRLPOOL 3c97ffb6743d5e181d46dc9c400aabf218a32c37fc09da92403258733ad3d7817aa6fae97fc0f5a02aa88619a5ce8b1b1a8090a9edfea2cb4944dd3ea96b1d9a
+DIST pinger-0.32e.tar.gz 239002 SHA256 73edc85b1b45d6f7721e619b62e4dc7303306297a90f2ffd292d7fe9578321b2 SHA512 8a6cebe9b37399e2e84eead3b386b999212904ecffb1fc951b4165295b278690217f35d20830e1f1440b94567d9d5d3423d37ee6e9200173be9aacefb68a87f7 WHIRLPOOL 08c2549c4d8361cc5dd97fe2498769b9c40f59b574bd04d40c6d1183699fa535c23388ff3de6f41f92faa19f9a62e36a58f46acaf06d3a1e1a6d5a18f31f80d6
+DIST pinger-0.33.tar.gz 247827 SHA256 c092f972529f1038b6eac87195b87c2a308891db7f1db18b1a8cbe0df84b6569 SHA512 fff07599ef91fbdcff9be7806eca57a71e8e6fac7e9afc67c4147e6246b0bcdadf379de28f87054dbe7c409955c0e0ddeae7f529e954231bea0cfb39e4e29bc1 WHIRLPOOL e16f1eb1d7dc9f26a7eea7f6b47971388243cfee5d35557c24483c610c1292640c1068fda9ae34b575ec324ffe309ed2d4b67a696c227c3485cd0cb3d0ac7c68
+EBUILD pinger-0.32e.ebuild 963 SHA256 e7647be5909f59c7dcfbe7ffa25690604b4af551c50871b3f2faac12b7196834 SHA512 fec43c39c305884e437f13b7ee4d9f752ac3b2e650e1778a676fe7099ee421b72e0dfd72a2be72d8351267b6b6faf02f7e8fce675762aa573dd2d198ae05cbae WHIRLPOOL d2adcf688b9c15b731e81c854d802fb542238dbf9f932e1574af38e4699f1e1eea84182bd064aa52071df404a87c88035f6f4d0a9005ce513ef017015eaa8a72
+EBUILD pinger-0.33.ebuild 1052 SHA256 492874fd75521936ed54dad6245494e26cb109c6fc785a6b8e53a101db31170f SHA512 2fc489e5dcec38880211f2bce2938a8e0b1b33443b5ede5cb176bd6384c02da7872695c66d8c00ee0ee51580cacafc8ccf56103d84dc11586c04e51030a0dc6b WHIRLPOOL fffe795c8cb1c6c4035d2aa89f1584554122efdce8172d28d7cd3b85ee22861be3d40cd26de462c4d4b03df556ccf3106eb5822022b88426364ca75eaa9d8a62
+MISC ChangeLog 3169 SHA256 4cb39d8fd01028e5b515c8ddb3a53c338a523e4b319bf3657a584df0d183bb72 SHA512 edaac4055b1159ad12d26882faed09918463ae8f6d7bef7e774049be94b3cca6e54b8fce6214bac30097eef7101996e5f06527816c4627908d6c54e95d9ec339 WHIRLPOOL 5b97fc7e32ffe49b6dfdb2d6d031023bd3b7c1f6c826b5f9445758c98f1c863a79f92487b86b233611c5dafc9bb8c1773607ee8ee34de366552ba562d6308524
+MISC ChangeLog-2015 4229 SHA256 cba9b1fd19c0bc1058aff763365766147f26db03b1032b95d852d14cb7d850bc SHA512 3134c624beb624e233a850748b8383541ef6ef39ce82de79cbbb0e4ff6f30f7dbeb22d5db832466d7a40a2c7a30cb1ded171e36505a2e105beddab0cf42f1b3e WHIRLPOOL 0cf9a6fb865d29496c88c0bde6452a6fd59160f804047d4823b8ac24c9c0053c57809de1fe9195e6d1cff969a2137a3029ab51ce9cc5862024869dac1d6c1059
+MISC metadata.xml 477 SHA256 675713d78c66f6e0cbcdef19ec18c2555b0fc4776930ea6949bb8ce61f1493e9 SHA512 ee9a6e27f4467c86d4f3b2069cc0202f249d2c1d4aa027b6c0a87dad61f7d6b9097faf64848a5d4b5d88300fb5c29cdb7532cb1288bca017d178f3d1e4cd95f0 WHIRLPOOL f3a9aa849d8bc05d1ad9842649267456f00e2e3e4e9b37bf5e7e54dc35e0f0dbc7fa5cecb18fd4dd3fffcc4e9a9697072d5de3b4f81a81a0778b6b3670212c74
diff --git a/net-analyzer/pinger/files/gtk-2.0.m4 b/net-analyzer/pinger/files/gtk-2.0.m4
new file mode 100644
index 000000000000..88596a969e19
--- /dev/null
+++ b/net-analyzer/pinger/files/gtk-2.0.m4
@@ -0,0 +1,196 @@
+# Configure paths for GTK+
+# Owen Taylor     1997-2001
+
+dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, 
+dnl pass to pkg-config
+dnl
+AC_DEFUN([AM_PATH_GTK_2_0],
+[dnl 
+dnl Get the cflags and libraries from pkg-config
+dnl
+AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run a test GTK+ program],
+		    , enable_gtktest=yes)
+
+  pkg_config_args=gtk+-2.0
+  for module in . $4
+  do
+      case "$module" in
+         gthread) 
+             pkg_config_args="$pkg_config_args gthread-2.0"
+         ;;
+      esac
+  done
+
+  no_gtk=""
+
+  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+  if test x$PKG_CONFIG != xno ; then
+    if pkg-config --atleast-pkgconfig-version 0.7 ; then
+      :
+    else
+      echo "*** pkg-config too old; version 0.7 or better required."
+      no_gtk=yes
+      PKG_CONFIG=no
+    fi
+  else
+    no_gtk=yes
+  fi
+
+  min_gtk_version=ifelse([$1], ,2.0.0,$1)
+  AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
+
+  if test x$PKG_CONFIG != xno ; then
+    ## don't try to run the test against uninstalled libtool libs
+    if $PKG_CONFIG --uninstalled $pkg_config_args; then
+	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
+	  enable_gtktest=no
+    fi
+
+    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
+	  :
+    else
+	  no_gtk=yes
+    fi
+  fi
+
+  if test x"$no_gtk" = x ; then
+    GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
+    GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
+    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_gtktest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GTK_CFLAGS"
+      LIBS="$GTK_LIBS $LIBS"
+dnl
+dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
+dnl checks the results of pkg-config to some extent)
+dnl
+      rm -f conf.gtktest
+      AC_TRY_RUN([
+#include <gtk/gtk.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int 
+main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  fclose (fopen ("conf.gtktest", "w"));
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_gtk_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gtk_version");
+     exit(1);
+   }
+
+  if ((gtk_major_version != $gtk_config_major_version) ||
+      (gtk_minor_version != $gtk_config_minor_version) ||
+      (gtk_micro_version != $gtk_config_micro_version))
+    {
+      printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
+             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
+             gtk_major_version, gtk_minor_version, gtk_micro_version);
+      printf ("*** was found! If pkg-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
+      printf("*** to point to the correct configuration files\n");
+    } 
+  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
+	   (gtk_minor_version != GTK_MINOR_VERSION) ||
+           (gtk_micro_version != GTK_MICRO_VERSION))
+    {
+      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
+	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+	     gtk_major_version, gtk_minor_version, gtk_micro_version);
+    }
+  else
+    {
+      if ((gtk_major_version > major) ||
+        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
+               gtk_major_version, gtk_minor_version, gtk_micro_version);
+        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
+	       major, minor, micro);
+        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
+        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_gtk" = x ; then
+     AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     if test "$PKG_CONFIG" = "no" ; then
+       echo "*** A new enough version of pkg-config was not found."
+       echo "*** See http://pkgconfig.sourceforge.net"
+     else
+       if test -f conf.gtktest ; then
+        :
+       else
+          echo "*** Could not run GTK+ test program, checking why..."
+	  ac_save_CFLAGS="$CFLAGS"
+	  ac_save_LIBS="$LIBS"
+          CFLAGS="$CFLAGS $GTK_CFLAGS"
+          LIBS="$LIBS $GTK_LIBS"
+          AC_TRY_LINK([
+#include <gtk/gtk.h>
+#include <stdio.h>
+],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
+          echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GTK_CFLAGS=""
+     GTK_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(GTK_CFLAGS)
+  AC_SUBST(GTK_LIBS)
+  rm -f conf.gtktest
+])
diff --git a/net-analyzer/pinger/files/pinger-0.32e-tinfo.patch b/net-analyzer/pinger/files/pinger-0.32e-tinfo.patch
new file mode 100644
index 000000000000..f9175b22540f
--- /dev/null
+++ b/net-analyzer/pinger/files/pinger-0.32e-tinfo.patch
@@ -0,0 +1,21 @@
+--- a/configure.in
++++ b/configure.in
+@@ -65,8 +65,18 @@
+ 					 AC_DEFINE([HAVE_GTK_2], 1, Found GTK 2),
+            HAVE_GTK_2=0)
+ fi
++AC_ARG_ENABLE(ncurses, [  --enable-ncurses        enable ncurses support],
++              [if test "$enableval" = no; then no_ncurses=yes; fi])
++if test x$no_ncurses != xyes; then
++PKG_CHECK_MODULES(ncurses, ncurses,[
++	AC_DEFINE([HAVE_LIBNCURSES], [1], found ncurses library)
++	HAVE_CURSES=1
++	LIBS="$LIBS $ncurses_LIBS"
++	CFLAGS="$CFLAGS $ncurses_CFLAGS"],
+ AC_CHECK_LIB(ncurses, initscr, HAVE_CURSES=1; LIBS="$LIBS -lncurses";
+ 	AC_DEFINE([HAVE_LIBNCURSES], [1], found ncurses library))
++	)
++fi
+ AC_CHECK_LIB(intl, libintl_gettext, LIBS="$LIBS -lintl")
+ AC_CHECK_LIB(pthread, pthread_create, LIBS="$LIBS -lpthread", AC_MSG_ERROR(Pthread required and not found. Please check if you have libpthread in your system and specify using CFLAGS and LDFLAGS when configure))
+ 
diff --git a/net-analyzer/pinger/files/pinger-0.33-gentoo.patch b/net-analyzer/pinger/files/pinger-0.33-gentoo.patch
new file mode 100644
index 000000000000..76ef052a4a2d
--- /dev/null
+++ b/net-analyzer/pinger/files/pinger-0.33-gentoo.patch
@@ -0,0 +1,73 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -2,7 +2,12 @@
+ 
+ bin_PROGRAMS = pinger
+ man_MANS = pinger.1
++if HAVE_GTK_2
+ bin_SCRIPTS = gtkpinger
++endif
++if HAVE_GTK_3
++bin_SCRIPTS = gtkpinger
++endif
+ 
+   P_SOURCES = timefunc.c parse.c ping.c pinger.c dns.c log.c timefunc.h parse.h ping.h globals.h fake_gtk.h dns.h log.h
+ if HAVE_CURSES
+--- a/configure.in
++++ b/configure.in
+@@ -54,34 +54,46 @@
+ AC_HEADER_TIME
+ AM_INADDRT
+ 
++PKG_PROG_PKG_CONFIG()
++
+ dnl GTK3/GTK2 tests
+ dnl Note: PKG_CHECK_MODULES cannot be used conditionaly due to sharing the tests and depending on it
+ AC_ARG_ENABLE([gtk], AS_HELP_STRING([--enable-gtk[[[=version]]]], [Build with GTK+ interface. Supported versions are gtk2 and gtk3. Default is gtk2.]))
+-PKG_CHECK_MODULES(GTK, [ gtk+-2.0 >= 2.4 ], HAVE_GTK_2=1; )
+-AC_SUBST(GTK_CFLAGS)
+-AC_SUBST(GTK_LIBS)
+-PKG_CHECK_MODULES(GTK3, [ gtk+-3.0 >= 3.12 ], HAVE_GTK_3=1)
+-AC_SUBST(GTK3_CFLAGS)
+-AC_SUBST(GTK3_LIBS)
+ 
+ if test "x$enableval" = "x" || test "x$enableval" = "xgtk2"; then
++PKG_CHECK_MODULES(GTK, [ gtk+-2.0 >= 2.4 ], HAVE_GTK_2=1,[])
++AC_SUBST(GTK_CFLAGS)
++AC_SUBST(GTK_LIBS)
+ CFLAGS="$CFLAGS $GTK_CFLAGS"
+ LIBS="$LIBS $GTK_LIBS"
+ HAVE_GTK_3=0
+ AC_DEFINE(HAVE_GTK_2, 1, Found GTK+ 2.x support)
+ elif test "x$enableval" = "xgtk3"; then
++PKG_CHECK_MODULES(GTK3, [ gtk+-3.0 >= 3.12 ], HAVE_GTK_3=1,[])
++AC_SUBST(GTK3_CFLAGS)
++AC_SUBST(GTK3_LIBS)
+ CFLAGS="$CFLAGS $GTK3_CFLAGS"
+ LIBS="$LIBS $GTK3_LIBS"
+ HAVE_GTK_2=0
+ AC_DEFINE(HAVE_GTK_3, 1, Found GTK+ 3.x support)
+ else
+-echo "Sorry, the value $enableval is not supported as argument of --enable-gtk."
+-exit 1
++HAVE_GTK_2=0
++HAVE_GTK_3=0
+ fi
+ 
+-dnl Check for additional external libraries etc..
++AC_ARG_ENABLE(ncurses, [  --enable-ncurses        enable ncurses support],
++	[if test "$enableval" = no; then no_ncurses=yes; fi])
++if test x$no_ncurses != xyes; then
++PKG_CHECK_MODULES(ncurses, ncurses,[
++	AC_DEFINE([HAVE_LIBNCURSES], [1], found ncurses library)
++	HAVE_CURSES=1
++	LIBS="$LIBS $ncurses_LIBS"
++	CFLAGS="$CFLAGS $ncurses_CFLAGS"],
+ AC_CHECK_LIB(ncurses, initscr, HAVE_CURSES=1; LIBS="$LIBS -lncurses";
+ 	AC_DEFINE([HAVE_LIBNCURSES], [1], found ncurses library))
++	)
++fi
++dnl Check for additional external libraries etc..
+ AC_CHECK_LIB(intl, libintl_gettext, LIBS="$LIBS -lintl")
+ AC_CHECK_LIB(pthread, pthread_create, LIBS="$LIBS -lpthread", AC_MSG_ERROR(Pthread required and not found. Please check if you have libpthread in your system and specify using CFLAGS and LDFLAGS when configure))
+ 
diff --git a/net-analyzer/pinger/metadata.xml b/net-analyzer/pinger/metadata.xml
new file mode 100644
index 000000000000..a0c377799422
--- /dev/null
+++ b/net-analyzer/pinger/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<use>
+<flag name="gtk2">Install the gtkpinger GUI utility based on <pkg>x11-libs/gtk+</pkg>:2</flag>
+<flag name="gtk3">Install the gtkpinger GUI utility based on <pkg>x11-libs/gtk+</pkg>:3</flag>
+</use>
+</pkgmetadata>
diff --git a/net-analyzer/pinger/pinger-0.32e.ebuild b/net-analyzer/pinger/pinger-0.32e.ebuild
new file mode 100644
index 000000000000..85b142c36460
--- /dev/null
+++ b/net-analyzer/pinger/pinger-0.32e.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="Cyclic multi ping utility for selected adresses using GTK/ncurses"
+HOMEPAGE="http://aa.vslib.cz/silk/projekty/pinger/index.php"
+SRC_URI="http://aa.vslib.cz/silk/projekty/pinger/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="gtk ncurses nls"
+
+REQUIRED_USE="
+	!gtk? ( ncurses )
+	!ncurses? ( gtk )
+"
+
+RDEPEND="
+	gtk? ( >=x11-libs/gtk+-2.4:2 )
+	ncurses? ( sys-libs/ncurses )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS BUGS ChangeLog NEWS README )
+
+src_prepare() {
+	# bug #494636
+	cp "${FILESDIR}"/gtk-2.0.m4 m4/ || die
+
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+
+	sed -i -e '/Root privileges/d' src/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -D_GNU_SOURCE
+
+	econf $(use_enable gtk) $(use_enable ncurses) $(use_enable nls)
+}
diff --git a/net-analyzer/pinger/pinger-0.33.ebuild b/net-analyzer/pinger/pinger-0.33.ebuild
new file mode 100644
index 000000000000..55c82f856862
--- /dev/null
+++ b/net-analyzer/pinger/pinger-0.33.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="Cyclic multi ping utility for selected adresses using GTK/ncurses"
+HOMEPAGE="http://aa.vslib.cz/silk/projekty/pinger/"
+SRC_URI="${HOMEPAGE}download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="gtk2 gtk3 ncurses nls"
+
+REQUIRED_USE="
+	|| ( gtk2 gtk3 ncurses )
+	?? ( gtk2 gtk3 )
+"
+GTK_DEPEND="
+	dev-libs/glib:2
+"
+RDEPEND="
+	gtk2? (
+		${GTK_DEPEND}
+		>=x11-libs/gtk+-2.4:2
+	)
+	gtk3? (
+		${GTK_DEPEND}
+		>=x11-libs/gtk+-3.12:3
+	)
+	ncurses? ( sys-libs/ncurses )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS BUGS ChangeLog NEWS README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+
+	sed -i -e '/Root privileges/d' src/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -D_GNU_SOURCE
+
+	econf \
+		$(usex gtk2 --enable-gtk=gtk2 '') \
+		$(usex gtk3 --enable-gtk=gtk3 '') \
+		$(use_enable ncurses) \
+		$(use_enable nls)
+}
diff --git a/net-analyzer/pktstat/Manifest b/net-analyzer/pktstat/Manifest
new file mode 100644
index 000000000000..3759d3d7165b
--- /dev/null
+++ b/net-analyzer/pktstat/Manifest
@@ -0,0 +1,7 @@
+AUX pktstat-1.8.5-smtp_line.patch 1265 SHA256 d8a41477a7db795935d848777c37514ab67eb70a122f22128198e1d86708e529 SHA512 8c72da90f29e29cd138537e25fe1cfbd104b4944161b2a05a9bbf9c12b04c0ac5c322c355a8e93c2ef9f92fd2c6fb173a794a6f1dce3ac6fe3bd572cbaf10142 WHIRLPOOL 3b8b03131c7e98311cff5ff0ad3199655643b41cb997034f34d45f0b367e41e806c9a4b8ae6845f6f44e566ccf36b07f0eeed2ba64d24241d00d79d633775c4d
+AUX pktstat-1.8.5-tinfo.patch 426 SHA256 a76a6ce6bc3b8f6da783c154702178204b2dcdba1ecd46c03838b021eec55385 SHA512 7d537d540fce9d19bcfd7b223b17dce63295d76d16234d2b078afcd72cc3a10be133f6ae36411618c6ca90534a8a3ce619cc76e15985524e5fd01dfc31cf4ece WHIRLPOOL c7ace1a9effd6e5760bc9a180204401d3b7e344a844faa0d61a01d19e9947dcdb089ab2b75f88ccc12401ad4e07cf445174aac8a5245c14f677bc2696da3663c
+DIST pktstat-1.8.5.tar.gz 133404 SHA256 140b07120eb48f139d588f0d8db792a91227fc7d6e690f0fcad1328dfcafd2c9 SHA512 0401b34646b3e6238a9fe032fa4c2afb70a3a009850bc85c043ff4bba7da6fab0dcf20b963c62ba4db5ba15a7508241dba4f4789ea59b12193928b4c4ec7f0c7 WHIRLPOOL 2e9d4a4c603080999afa0fa3b50b70d09586212c1e69305fb05974756d779e033822c87d8f809ef72582b4078893ca10fe126c84929c183e3289a31a614645e8
+EBUILD pktstat-1.8.5-r1.ebuild 717 SHA256 658f8fcb4fa634234805f864ebee1dd61bd040149fff39f99eb35f18675f3a59 SHA512 983eea9354a2aa65a123bc3bf37f508434ada10a6b6a4966c63806e9f4cb5a16fd62640a8d795bbe571f2a3e53e7194d3fe17ea6a49296a0debfa2acf338181d WHIRLPOOL 4d18277b7c5342f2fae0e796d51c293422b25761e0e1587a5bac376ea64c99cf41ff8b059723f1807d81d50b199de0fa004f05167f494501a044227899dd9864
+MISC ChangeLog 2511 SHA256 864ea9c5a42f6ba28443d2d4148a987f58fb2af0df3a659f3f3617f79673e5f7 SHA512 254c167c43b037763da765e71c39336a7ebd227ef03b3f61cf93b3ed6d447e75b0644ba115a8ea2db4ca59f28c0642c47dc2427355b0420877e458036da664c6 WHIRLPOOL 0c31183455b3c54128182eb4bcc1e7ec3762a8d2ef468973afd02f9e98a8435de3028c3e6947d00815863bcfcefc43bbd62e355fb0b50ae01c69c6ed7384efc4
+MISC ChangeLog-2015 3829 SHA256 774dc3c9eeef4648617c0e28fd1a6b9b3fd1172b353f9b054772021583154f43 SHA512 abc993d14f35329ee2501974f2e92d0840b56c1aac52ab79819b7ae695fa540e2c9f2eaa140145405b5b0f28e5144b542e7a69f4d05dfc91f075fd8b481dd2c6 WHIRLPOOL 6e075c4e179fad328fa912970f048f1815b13f23cbc70510f5d01f2a7d83407407aa6b64bc564d2074054419c84f69082c5fcc28b355b1c8b7fdcf7733e97e50
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/pktstat/files/pktstat-1.8.5-smtp_line.patch b/net-analyzer/pktstat/files/pktstat-1.8.5-smtp_line.patch
new file mode 100644
index 000000000000..67ea9e9181e8
--- /dev/null
+++ b/net-analyzer/pktstat/files/pktstat-1.8.5-smtp_line.patch
@@ -0,0 +1,46 @@
+--- a/tcp_smtp.c
++++ b/tcp_smtp.c
+@@ -149,13 +149,9 @@
+ 	struct smtp_state *state;
+ 	const char *s;
+ 	int addr_changed = 0;
+-FILE*log;
+ 
+ 	state = (struct smtp_state *)f->udata;
+ 
+-if ((log = fopen("/tmp/smtp.log", "a")))
+-   fprintf(log, "smpt_line [%s]\n", line);
+-
+ 	if (state->in_data) {
+ 	    if (strcmp(line, ".") == 0) {
+ 		state->in_data = 0;
+@@ -180,18 +176,15 @@
+ 	} else {
+ 	    /* Normalize the command line */
+ 	    normalize_line(line);
+-if (log)fprintf(log, "normalized to [%s]\n", line);
+ 	    if ((s = strip_prefix(line, "MAIL FROM:"))) {
+ 		snprintf(state->from_addr, sizeof state->from_addr, "%s", s);
+ 		normalize_addr(state->from_addr);
+ 		addr_changed = 1;
+-if (log)fprintf(log, "from_addr = [%s]\n", state->from_addr);
+ 	    }
+ 	    else if ((s = strip_prefix(line, "RCPT TO:"))) {
+ 		snprintf(state->to_addr, sizeof state->to_addr, "%s", s);
+ 		normalize_addr(state->to_addr);
+ 		addr_changed = 1;
+-if (log)fprintf(log, "to_addr = [%s]\n", state->to_addr);
+ 	    }
+ 	    else if (strcmp(line, "DATA") == 0) {
+ 		state->in_data = 1;
+@@ -213,10 +206,7 @@
+ 		if (strcmp(line, "QUIT") != 0)
+ 		    snprintf(f->desc, sizeof f->desc, "%s", line);
+ 	    }
+-if (log)fprintf(log, "set desc to: [%s]\n", f->desc);
+ 	}
+-
+-if (log)fclose(log);
+ }
+ 
+ /*
diff --git a/net-analyzer/pktstat/files/pktstat-1.8.5-tinfo.patch b/net-analyzer/pktstat/files/pktstat-1.8.5-tinfo.patch
new file mode 100644
index 000000000000..5181124b8053
--- /dev/null
+++ b/net-analyzer/pktstat/files/pktstat-1.8.5-tinfo.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -18,6 +18,7 @@
+ AC_SEARCH_LIBS(gethostbyname, [nsl])	dnl for Solaris
+ AC_SEARCH_LIBS(pcap_open_live, [pcap])
+ AC_SEARCH_LIBS(exp, [m])
++PKG_CHECK_MODULES(ncurses,ncurses,LIBS="$LIBS $ncurses_LIBS",AC_MSG_ERROR[ncurses is required])
+ AC_SEARCH_LIBS(tgoto, [termlib termcap curses ncurses ocurses])
+ AC_SEARCH_LIBS(initscr, [curses ncurses ocurses])
+ AC_SEARCH_LIBS(nanosleep, [posix4])
diff --git a/net-analyzer/pktstat/metadata.xml b/net-analyzer/pktstat/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/pktstat/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/pktstat/pktstat-1.8.5-r1.ebuild b/net-analyzer/pktstat/pktstat-1.8.5-r1.ebuild
new file mode 100644
index 000000000000..38568044a9f1
--- /dev/null
+++ b/net-analyzer/pktstat/pktstat-1.8.5-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A network monitoring tool with bandwidth tracking"
+HOMEPAGE="http://www.adaptive-enterprises.com.au/~d/software/pktstat/"
+SRC_URI="http://www.adaptive-enterprises.com.au/~d/software/pktstat/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+RDEPEND="
+	net-libs/libpcap
+	>=sys-libs/ncurses-5.3-r1
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+	epatch "${FILESDIR}"/${P}-smtp_line.patch
+	eautoreconf
+}
+
+src_install() {
+	dosbin pktstat
+	doman pktstat.1
+	dodoc ChangeLog NEWS README TODO
+}
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
new file mode 100644
index 000000000000..79b5eaf36c71
--- /dev/null
+++ b/net-analyzer/pmacct/Manifest
@@ -0,0 +1,19 @@
+AUX pmacctd-conf.d 153 SHA256 a29a5d9aca2df30ca9c62e3441d2f3616eb506c457074ae690a390d55a040763 SHA512 1637316833db6e2a7c2d531deb4d68d647948bc03da8aecf0c6a34dd2f0c58d58d8473270e6096cf232e98c07946bac265161d4a8577def6cb72a4e8c9778c31 WHIRLPOOL b0a58e7268535eca709371bef9282583fbc70e6ce1d2d92c42203e9a2f227ed0218bf684f3e54241fa80ccd49381b020ecf49f582193d629ae8f8632e17ba901
+AUX pmacctd-init.d 839 SHA256 fc222bea9cde5ce6edac88e2ff16b14b261228a21f4b251f992c4615f70dc58e SHA512 c340e62eebfc15ee72591178451d46052e03ef1656a0b81a4b53c02b69df1e5a365742ddf98d9f7f0a8de1345b6a111b8e5ee9009f33fed2a3204344a15690a3 WHIRLPOOL 8420e71c590bf4875622862ac44dc3d0c47dc28e3d6335a9dca0a8ac30cb571cc535fe08d4c4f4ede6a1acc34fc0a17bc508fb9655aa1bdbec673c10e3458b74
+DIST pmacct-1.5.1.tar.gz 874563 SHA256 96134549a10947f3f6d610b670a26f1a54e01af4be0eff09bf48c19246d33584 SHA512 c3a0ddaf1b8679df2097147ce844eb2a3e3058599aea457e463cd4e65a7601e0ce5bac5ca5e1c82afecd5edc92dae673eed3ed1787bfbd3e8ac2af5677885bb7 WHIRLPOOL bd071ac30493f5ee2e0393eb9277dfae2d2fdd6283293aee589ae41ab326b0aaef0ec9b70a421eeca4df857a0046ca7b196e0692ffdd2ea12d9a7c66a74e9a32
+DIST pmacct-1.5.2.tar.gz 897530 SHA256 c12e3897e2f9aa89333968da46eb46855f357750ac1e06e36e72f374e2b54df9 SHA512 3705432cc2a28e179de637b8fc11becd2022b36191a13d440d5bec7d7e594d0936773f202f3d82e983a83695176380aa6a7c27748b632b180000590be0ead599 WHIRLPOOL e7bb1fa1b7372af7d932e19da1d14f3922d8a8ebda245fa03e2a5f283c66141a9299cc9dfa6f32e9384c7d2c9a2d2ef35ef62d7b9910e4f76cacc132231420e5
+DIST pmacct-1.5.3_pre20150925.tar.gz 896168 SHA256 ae63580ae879b3ce20e9725690b6337a72857376192dd2f610e0359ee9d4364c SHA512 e6675855f403ee746b0243cce1ee0e28fd649d2b1c6c1e33f012d7858f977952ba6ed5d1ee47ce42a4f6950b139be2bc50a88740fd19c4775d61d1fb1aa6c05d WHIRLPOOL c7f5003754835f0e1883f13bfba740667ebcbef54a49cc8b8f6fcca1f2db2dea337c910417ff75d86dcfa6bc294fa9b44567bc0d5d07b79ffcfc9b11b1efad5d
+DIST pmacct-1.6.0.tar.gz 1253947 SHA256 1b8d65032b21e152811b6a20ee38ac18ded7ee9ff27cd86870673f088db3c395 SHA512 6c227648a67b69096c814a41f3931f516f2286c110d635ad351de96ee3a918b53a9c723b2199d0dd3ebff1ac20471d9cde2cab2d1b97c147b08ba1a4bd42f872 WHIRLPOOL 66fe8d57ed04f3433dd9ce974b75d0810fecacbd163cbc29e83de70b211c5a6498fe7c627dfc783c8e123dc742ecfad920b2c8ecc19dc830f328eecf1522b566
+DIST pmacct-1.6.1.tar.gz 1280968 SHA256 eb332a6812d1e02134900a1d115a24f315de7c861a9b63093c1226753486cbe7 SHA512 e4c24d4c09716374a1315f8b4a70f3c58fb45848d80cf5c36e5a7653c47249717353a297826e341ec9fd741dd77b840241ad8f5e9d33f4c3dd0525661127cf27 WHIRLPOOL 2ba781d320ceccf7a815d5dd1f8e2362d3fa5085fecafe4e6d75116ca3dafb7ce49d4c455add1615773a83e614f7b7c941c2e4c6ec8424b1cdaf559227f3ab98
+DIST pmacct-1.6.2.tar.gz 1311678 SHA256 e6ede7f500fb1771b5cdfb63dfa016e34c19b8aa2d2f672bd4c63016a5d6bbe2 SHA512 8495f97752ae586fd842eed49ce91db3e4753133f7d380d067e7df153abeea469e5126800074e9071cb7227a3f1df64d4642dfece624fbbfa39b4537fde38b46 WHIRLPOOL ebfa8caeaa1cf48d6b3785cb600d4459e9408e9e8e110b636d0dd0108fcd33a8660259d99469960d32aff720b5387b029891f4d6419dab88920f3bae89f0871a
+EBUILD pmacct-1.5.1.ebuild 1617 SHA256 893f3e9680d8b169475ad664f509ee0c41434221cb6a03fe7ca197760ba1df1c SHA512 8e83f6d7300c20cd083a92bf9f53a9e62767587c950eecd5677c6d7aa0f63efa87f9bd65ad48cbedc5f3597bbc02d6f1d40b78e13aa325b750cf2d7ab32d545d WHIRLPOOL 328e020598b27816d19b5a243bc4803f1074f14181a53eda3e30f2e6f222891a4fb772610c0b195e514a1208d5e5907ce8f22a0e39396c8ddd3ad03a74e29fe5
+EBUILD pmacct-1.5.2.ebuild 1620 SHA256 347e9ba060161fdee3ea24c9925fdcd1f7d47bc396c6c6c1ba13f06a46c89e2f SHA512 74f357d94b6bb4867525abc312e6f0424089b3adda6d3321af15c16136049123e54a77603c7f4c3e04255b4aafc98292b98bd06591bce72eabb7d052512f5514 WHIRLPOOL af3d188e3b4917cbb0c1a21457eebcd63e112c8bd3090f0e0ba07cc0f272a182254de78849466595c43072700939326fa8fbc8ae8b9ccfb47cece2a5317936cf
+EBUILD pmacct-1.5.3_pre20150925-r1.ebuild 1733 SHA256 860fa5ba5c6af4266c73de3a9cf21da657c1c4431a997b3687dff9b9946bab46 SHA512 ea54111bbf5bd0be3eb4a856c1596902dc7df5ad0678b220408a75ea03555a8d94e486e88f45898dc6ae767a1c76e937f2414376648b8ed67bb16074ada62984 WHIRLPOOL c649c38b0ddbebea789f04a6e65e3b53e1107e16cd5f781af369a3c223dffb62e1da7a71d9add77b44ad0bc7e420b041dccd2d8cb642ddd46bab926c021e089a
+EBUILD pmacct-1.5.3_pre20150925.ebuild 1629 SHA256 2cb39f885706ae03524c23dc1318d7c07cd405c74d62fdb6ee646d246b17451b SHA512 dca90f9561ae23b4cd556e8af7d552f04973ace68d77a7eab224fdd263760b7fe257c007e4aa2602f1ec8f478447b0be50006bbc1a922fabb9bb4f739557c459 WHIRLPOOL 695accbe526be5298a1e69f8e9712a7712646d08ad1bc8771cbfdcc699c6f1cd0b77c56919d389a885c98b73899ce3551b1cb17f33e9b56fd570c9d38b1c8828
+EBUILD pmacct-1.6.0.ebuild 1647 SHA256 9c684f5630261c946a0a204a9e9b88cb56b5f5fd7449ebd6ec36df95a9b50120 SHA512 7fd9a1472a047e710fc5f1ef09be2291725aacb0278235f06440e027b95dcaf540e6353f746a62f915760337e00d3704c1f44effcf7cf925bb53567edd2b3f79 WHIRLPOOL ab90646a44861c3cd9576b120de9288cd2d68ceaf89af5f9e0e175c01c1dff29bfe920c086115a003aec4a12e06ca3b876519a6d777cf2d12fa47285bd8d49f7
+EBUILD pmacct-1.6.1-r1.ebuild 1797 SHA256 71a6e8efb3d8d09f2fea98f1770158e1e786a275888518b5a08298c15c2f83c3 SHA512 43fccffe30d711724a937cbbe236f379f33b6d2bdebde91743bc5d05355532a46ac85bb8a949f2563d2d023dd2dbf3b940526698e59ea6acf569f0ff9eea7438 WHIRLPOOL 54a487491997e87644890ee78e86b86bda6cdb80b257a6a245dff1494aacb3f49e737a75f78ed944d65215b0a88e660f9a9ea54710a81685a484fc89af364256
+EBUILD pmacct-1.6.1.ebuild 1647 SHA256 9c684f5630261c946a0a204a9e9b88cb56b5f5fd7449ebd6ec36df95a9b50120 SHA512 7fd9a1472a047e710fc5f1ef09be2291725aacb0278235f06440e027b95dcaf540e6353f746a62f915760337e00d3704c1f44effcf7cf925bb53567edd2b3f79 WHIRLPOOL ab90646a44861c3cd9576b120de9288cd2d68ceaf89af5f9e0e175c01c1dff29bfe920c086115a003aec4a12e06ca3b876519a6d777cf2d12fa47285bd8d49f7
+EBUILD pmacct-1.6.2.ebuild 1792 SHA256 062ba2df34c054b5dfda57e0d65980462718738c3b3e9fdd0fff2f3aa9742621 SHA512 ef4fb78a56a8ffaec1d26bb736bace51641f68f4e67e42dcb7356019000889225cac7472b0074924786521dfcfcc03854a91e88fde6d7ac48d1939b7f99a6fcd WHIRLPOOL 123f4bf4557ab1f87b798debf4a06a6ead402c1b6c56bf92bac04162ef538c5dd67ce0c998bc26b6f0d9aa1af11abcd90122b7add7baa8f98cc1eccd3fc20879
+MISC ChangeLog 4667 SHA256 76e28f799b6a169c966ab4e4eaf08d9cd4cef27c24ea6b6d32249ce26f781626 SHA512 71550717ae9cb8c2376c6b36e65335037f90f891d7e17ff8ee21b4d969255a4962fcdae982531adbbaaa0747173aef17a8a59ac55e30f138087c0df13c11e651 WHIRLPOOL 3c453b68841013608174bfc2ac9bd0b605911bb511ffc88f46c184cd2a110258ca36dde9fe6ae94a4d6295fd25751826f9e8fd95cd5210e33d53a892fff5fcab
+MISC ChangeLog-2015 16467 SHA256 701fc37effed3fae7496e033804882c9a5b444a768253c24ae2c6426466ad06d SHA512 f064726b88efb5fefc14159aad389238e71076521ec3c89179181e2bea14b92ea07bd75c16ffeae5af68e59945d4a0203fc911cab6a16f512080051470e10796 WHIRLPOOL eb39cb3355047a59500742de13a8fcb224ab51bd94409462c20b77c62c502cd429d385c22acf6d3539e99dffaa03f45b7b7f6580f268795a8d62f853e05eb1b1
+MISC metadata.xml 920 SHA256 7c47d50473b86620b2e2367e5dfe49152a9eaa31eff2cfa82665207642cab6b0 SHA512 a664364683c690536a88f70a9bee2916d58369fc9f4fae16fa818fa27da583214cedc38cabff773577b32786776f4abb382bbccd5584cd049f7f65b3b82decd9 WHIRLPOOL 7063960eeb90eeadfd05115ddc8ffc0ec919cd1040bf1080e574b3afdb45c3fee3328ccddcff3b9ccf2251a2a556799deae03e85fd4bd7c92b52e99486aee22d
diff --git a/net-analyzer/pmacct/files/pmacctd-conf.d b/net-analyzer/pmacct/files/pmacctd-conf.d
new file mode 100644
index 000000000000..442be1eb9a86
--- /dev/null
+++ b/net-analyzer/pmacct/files/pmacctd-conf.d
@@ -0,0 +1,6 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Other options to pass to pmacctd
+#OPTS=""
+
diff --git a/net-analyzer/pmacct/files/pmacctd-init.d b/net-analyzer/pmacct/files/pmacctd-init.d
new file mode 100644
index 000000000000..1dccfcdd80f5
--- /dev/null
+++ b/net-analyzer/pmacct/files/pmacctd-init.d
@@ -0,0 +1,40 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PMACCTDDIR=${PMACCTDDIR:-/etc/pmacctd}
+if [ ${SVCNAME} != "pmacctd" ]; then
+	PMACCTDPID="/run/${SVCNAME}.pid"
+else
+	PMACCTDPID="/run/pmacctd.pid"
+fi
+PMACCTDCONF="${PMACCTDDIR}/${SVCNAME}.conf"
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ ! -e ${PMACCTDCONF} ] ; then
+		eerror "You need an ${PMACCTDCONF} file to run pmacctd"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start \
+		--pidfile "${PMACCTDPID}" \
+		--exec /usr/sbin/"${SVCNAME}" \
+		-- -D -f "${PMACCTDCONF}" \ -F "${PMACCTDPID}" ${OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop \
+		--pidfile "${PMACCTDPID}" \
+		--exec /usr/sbin/"${SVCNAME}"
+	eend $?
+}
diff --git a/net-analyzer/pmacct/metadata.xml b/net-analyzer/pmacct/metadata.xml
new file mode 100644
index 000000000000..cc407997e255
--- /dev/null
+++ b/net-analyzer/pmacct/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<use>
+<flag name="64bit">Use 64bit counters instead of 32bit ones</flag>
+<flag name="geoipv2">Add support for GeoIP2 through <pkg>dev-libs/libmaxminddb</pkg></flag>
+<flag name="jansson">Add support for JSON through <pkg>dev-libs/jansson</pkg></flag>
+<flag name="kafka">Add support for Apache Kafka through <pkg>dev-libs/librdkafka</pkg></flag>
+<flag name="mongodb">Add support for mongodb backend</flag>
+<flag name="nflog">Add support for NFLOG through uacctd</flag>
+<flag name="rabbitmq">Add support for RabbitMQ through <pkg>net-libs/rabbitmq-c</pkg></flag>
+<flag name="ulog">Enable support for ULOG in older kernels (deprecated)</flag>
+</use>
+</pkgmetadata>
diff --git a/net-analyzer/pmacct/pmacct-1.5.1.ebuild b/net-analyzer/pmacct/pmacct-1.5.1.ebuild
new file mode 100644
index 000000000000..22ffb38dbf1d
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-1.5.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="A network tool to gather IP traffic information"
+HOMEPAGE="http://www.pmacct.net/"
+SRC_URI="http://www.pmacct.net/${P/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="64bit debug geoip ipv6 mongodb mysql postgres sqlite threads ulog"
+
+RDEPEND="
+	net-libs/libpcap
+	geoip? ( dev-libs/geoip )
+	mongodb? (
+		>=dev-libs/mongo-c-driver-0.8.1-r1
+		<dev-libs/mongo-c-driver-0.98
+	)
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( =dev-db/sqlite-3* )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P/_/}"
+
+DOCS=(
+	CONFIG-KEYS ChangeLog FAQS KNOWN-BUGS QUICKSTART README TODO TOOLS UPGRADE
+	docs/INTERNALS docs/PLUGINS docs/SIGNALS
+)
+
+src_configure() {
+	tc-export CC AR RANLIB
+
+	econf \
+		$(use_enable 64bit) \
+		$(use_enable debug) \
+		$(use_enable geoip) \
+		$(use_enable ipv6) \
+		$(use_enable mongodb) \
+		$(use_enable mysql) \
+		$(use_enable postgres pgsql) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable threads) \
+		$(use_enable ulog) \
+		$(usex mysql "--with-mysql-includes=$(mysql_config --variable=pkgincludedir)" '') \
+		$(usex mysql "--with-mysql-libs=$(mysql_config --variable=pkglibdir)" '') \
+		--disable-debug
+}
+
+src_install() {
+	default
+
+	for dirname in examples sql; do
+		docinto ${dirname}
+		dodoc -r ${dirname}/*
+	done
+
+	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
+	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
+
+	insinto /etc/pmacctd
+	newins examples/pmacctd-imt.conf.example pmacctd.conf
+}
diff --git a/net-analyzer/pmacct/pmacct-1.5.2.ebuild b/net-analyzer/pmacct/pmacct-1.5.2.ebuild
new file mode 100644
index 000000000000..f27118bbbe3c
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-1.5.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="A network tool to gather IP traffic information"
+HOMEPAGE="http://www.pmacct.net/"
+SRC_URI="http://www.pmacct.net/${P/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="64bit debug geoip ipv6 mongodb mysql postgres sqlite threads ulog"
+
+RDEPEND="
+	net-libs/libpcap
+	geoip? ( dev-libs/geoip )
+	mongodb? (
+		>=dev-libs/mongo-c-driver-0.8.1-r1
+		<dev-libs/mongo-c-driver-0.98
+	)
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( =dev-db/sqlite-3* )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P/_/}"
+
+DOCS=(
+	CONFIG-KEYS ChangeLog FAQS KNOWN-BUGS QUICKSTART README TODO TOOLS UPGRADE
+	docs/INTERNALS docs/PLUGINS docs/SIGNALS
+)
+
+src_configure() {
+	tc-export CC AR RANLIB
+
+	econf \
+		$(use_enable 64bit) \
+		$(use_enable debug) \
+		$(use_enable geoip) \
+		$(use_enable ipv6) \
+		$(use_enable mongodb) \
+		$(use_enable mysql) \
+		$(use_enable postgres pgsql) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable threads) \
+		$(use_enable ulog) \
+		$(usex mysql "--with-mysql-includes=$(mysql_config --variable=pkgincludedir)" '') \
+		$(usex mysql "--with-mysql-libs=$(mysql_config --variable=pkglibdir)" '') \
+		--disable-debug
+}
+
+src_install() {
+	default
+
+	for dirname in examples sql; do
+		docinto ${dirname}
+		dodoc -r ${dirname}/*
+	done
+
+	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
+	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
+
+	insinto /etc/pmacctd
+	newins examples/pmacctd-imt.conf.example pmacctd.conf
+}
diff --git a/net-analyzer/pmacct/pmacct-1.5.3_pre20150925-r1.ebuild b/net-analyzer/pmacct/pmacct-1.5.3_pre20150925-r1.ebuild
new file mode 100644
index 000000000000..bf3780777ae8
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-1.5.3_pre20150925-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="A network tool to gather IP traffic information"
+HOMEPAGE="http://www.pmacct.net/"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="64bit debug geoip geoipv2 ipv6 mongodb mysql postgres sqlite threads ulog"
+REQUIRED_USE="
+	?? ( geoip geoipv2 )
+"
+
+RDEPEND="
+	net-libs/libpcap
+	geoip? ( dev-libs/geoip )
+	geoipv2? ( dev-libs/libmaxminddb )
+	mongodb? (
+		>=dev-libs/mongo-c-driver-0.8.1-r1
+		<dev-libs/mongo-c-driver-0.98
+	)
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( =dev-db/sqlite-3* )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/pmacct-daily"
+
+DOCS=(
+	CONFIG-KEYS ChangeLog FAQS KNOWN-BUGS QUICKSTART README TODO TOOLS UPGRADE
+	docs/INTERNALS docs/PLUGINS docs/SIGNALS
+)
+
+src_configure() {
+	tc-export CC AR RANLIB
+
+	econf \
+		$(use_enable 64bit) \
+		$(use_enable debug) \
+		$(use_enable geoip) \
+		$(use_enable geoipv2) \
+		$(use_enable ipv6) \
+		$(use_enable mongodb) \
+		$(use_enable mysql) \
+		$(use_enable postgres pgsql) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable threads) \
+		$(use_enable ulog) \
+		$(usex mysql "--with-mysql-includes=$(mysql_config --variable=pkgincludedir)" '') \
+		$(usex mysql "--with-mysql-libs=$(mysql_config --variable=pkglibdir)" '') \
+		--disable-debug
+}
+
+src_install() {
+	default
+
+	for dirname in examples sql; do
+		docinto ${dirname}
+		dodoc -r ${dirname}/*
+	done
+
+	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
+	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
+
+	insinto /etc/pmacctd
+	newins examples/pmacctd-imt.conf.example pmacctd.conf
+}
diff --git a/net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild b/net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild
new file mode 100644
index 000000000000..f28070082930
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="A network tool to gather IP traffic information"
+HOMEPAGE="http://www.pmacct.net/"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="64bit debug geoip ipv6 mongodb mysql postgres sqlite threads ulog"
+
+RDEPEND="
+	net-libs/libpcap
+	geoip? ( dev-libs/geoip )
+	mongodb? (
+		>=dev-libs/mongo-c-driver-0.8.1-r1
+		<dev-libs/mongo-c-driver-0.98
+	)
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( =dev-db/sqlite-3* )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/pmacct-daily"
+
+DOCS=(
+	CONFIG-KEYS ChangeLog FAQS KNOWN-BUGS QUICKSTART README TODO TOOLS UPGRADE
+	docs/INTERNALS docs/PLUGINS docs/SIGNALS
+)
+
+src_configure() {
+	tc-export CC AR RANLIB
+
+	econf \
+		$(use_enable 64bit) \
+		$(use_enable debug) \
+		$(use_enable geoip) \
+		$(use_enable ipv6) \
+		$(use_enable mongodb) \
+		$(use_enable mysql) \
+		$(use_enable postgres pgsql) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable threads) \
+		$(use_enable ulog) \
+		$(usex mysql "--with-mysql-includes=$(mysql_config --variable=pkgincludedir)" '') \
+		$(usex mysql "--with-mysql-libs=$(mysql_config --variable=pkglibdir)" '') \
+		--disable-debug
+}
+
+src_install() {
+	default
+
+	for dirname in examples sql; do
+		docinto ${dirname}
+		dodoc -r ${dirname}/*
+	done
+
+	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
+	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
+
+	insinto /etc/pmacctd
+	newins examples/pmacctd-imt.conf.example pmacctd.conf
+}
diff --git a/net-analyzer/pmacct/pmacct-1.6.0.ebuild b/net-analyzer/pmacct/pmacct-1.6.0.ebuild
new file mode 100644
index 000000000000..91a703ca1ffe
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-1.6.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="A network tool to gather IP traffic information"
+HOMEPAGE="http://www.pmacct.net/"
+SRC_URI="http://www.pmacct.net/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="64bit debug geoip geoipv2 ipv6 mongodb mysql postgres sqlite threads"
+REQUIRED_USE="
+	?? ( geoip geoipv2 )
+"
+
+RDEPEND="
+	net-libs/libpcap
+	geoip? ( dev-libs/geoip )
+	geoipv2? ( dev-libs/libmaxminddb )
+	mongodb? (
+		>=dev-libs/mongo-c-driver-0.8.1-r1
+		<dev-libs/mongo-c-driver-0.98
+	)
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( =dev-db/sqlite-3* )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=(
+	CONFIG-KEYS ChangeLog FAQS QUICKSTART TOOLS UPGRADE
+	docs/INTERNALS docs/PLUGINS docs/SIGNALS
+)
+
+src_configure() {
+	tc-export CC AR RANLIB
+
+	econf \
+		$(use_enable 64bit) \
+		$(use_enable debug) \
+		$(use_enable geoip) \
+		$(use_enable geoipv2) \
+		$(use_enable ipv6) \
+		$(use_enable mongodb) \
+		$(use_enable mysql) \
+		$(use_enable postgres pgsql) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable threads) \
+		$(usex mysql "--with-mysql-includes=$(mysql_config --variable=pkgincludedir)" '') \
+		$(usex mysql "--with-mysql-libs=$(mysql_config --variable=pkglibdir)" '') \
+		--disable-debug
+}
+
+src_install() {
+	default
+
+	for dirname in examples sql; do
+		docinto ${dirname}
+		dodoc -r ${dirname}/*
+	done
+
+	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
+	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
+
+	insinto /etc/pmacctd
+	newins examples/pmacctd-imt.conf.example pmacctd.conf
+}
diff --git a/net-analyzer/pmacct/pmacct-1.6.1-r1.ebuild b/net-analyzer/pmacct/pmacct-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..0b22f3b865ca
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-1.6.1-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="A network tool to gather IP traffic information"
+HOMEPAGE="http://www.pmacct.net/"
+SRC_URI="http://www.pmacct.net/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="64bit debug geoip geoipv2 ipv6 jansson kafka mongodb mysql nflog postgres rabbitmq sqlite threads"
+REQUIRED_USE="
+	?? ( geoip geoipv2 )
+	kafka? ( jansson )
+	rabbitmq? ( jansson )
+"
+
+RDEPEND="
+	net-libs/libpcap
+	geoip? ( dev-libs/geoip )
+	geoipv2? ( dev-libs/libmaxminddb )
+	jansson? ( dev-libs/jansson )
+	kafka? ( dev-libs/librdkafka )
+	mongodb? (
+		>=dev-libs/mongo-c-driver-0.8.1-r1
+		<dev-libs/mongo-c-driver-0.98
+	)
+	mysql? ( virtual/mysql )
+	nflog? ( net-libs/libnetfilter_log )
+	postgres? ( dev-db/postgresql:* )
+	rabbitmq? ( net-libs/rabbitmq-c )
+	sqlite? ( =dev-db/sqlite-3* )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=(
+	CONFIG-KEYS ChangeLog FAQS QUICKSTART TOOLS UPGRADE
+	docs/INTERNALS docs/PLUGINS docs/SIGNALS
+)
+
+src_configure() {
+	tc-export CC AR RANLIB
+
+	econf \
+		$(use_enable 64bit) \
+		$(use_enable debug) \
+		$(use_enable geoip) \
+		$(use_enable geoipv2) \
+		$(use_enable ipv6) \
+		$(use_enable jansson) \
+		$(use_enable kafka) \
+		$(use_enable mongodb) \
+		$(use_enable mysql) \
+		$(use_enable nflog) \
+		$(use_enable postgres pgsql) \
+		$(use_enable rabbitmq) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable threads) \
+		--disable-debug
+}
+
+src_install() {
+	default
+
+	for dirname in examples sql; do
+		docinto ${dirname}
+		dodoc -r ${dirname}/*
+	done
+
+	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
+	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
+
+	insinto /etc/pmacctd
+	newins examples/pmacctd-imt.conf.example pmacctd.conf
+}
diff --git a/net-analyzer/pmacct/pmacct-1.6.1.ebuild b/net-analyzer/pmacct/pmacct-1.6.1.ebuild
new file mode 100644
index 000000000000..91a703ca1ffe
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-1.6.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="A network tool to gather IP traffic information"
+HOMEPAGE="http://www.pmacct.net/"
+SRC_URI="http://www.pmacct.net/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="64bit debug geoip geoipv2 ipv6 mongodb mysql postgres sqlite threads"
+REQUIRED_USE="
+	?? ( geoip geoipv2 )
+"
+
+RDEPEND="
+	net-libs/libpcap
+	geoip? ( dev-libs/geoip )
+	geoipv2? ( dev-libs/libmaxminddb )
+	mongodb? (
+		>=dev-libs/mongo-c-driver-0.8.1-r1
+		<dev-libs/mongo-c-driver-0.98
+	)
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( =dev-db/sqlite-3* )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=(
+	CONFIG-KEYS ChangeLog FAQS QUICKSTART TOOLS UPGRADE
+	docs/INTERNALS docs/PLUGINS docs/SIGNALS
+)
+
+src_configure() {
+	tc-export CC AR RANLIB
+
+	econf \
+		$(use_enable 64bit) \
+		$(use_enable debug) \
+		$(use_enable geoip) \
+		$(use_enable geoipv2) \
+		$(use_enable ipv6) \
+		$(use_enable mongodb) \
+		$(use_enable mysql) \
+		$(use_enable postgres pgsql) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable threads) \
+		$(usex mysql "--with-mysql-includes=$(mysql_config --variable=pkgincludedir)" '') \
+		$(usex mysql "--with-mysql-libs=$(mysql_config --variable=pkglibdir)" '') \
+		--disable-debug
+}
+
+src_install() {
+	default
+
+	for dirname in examples sql; do
+		docinto ${dirname}
+		dodoc -r ${dirname}/*
+	done
+
+	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
+	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
+
+	insinto /etc/pmacctd
+	newins examples/pmacctd-imt.conf.example pmacctd.conf
+}
diff --git a/net-analyzer/pmacct/pmacct-1.6.2.ebuild b/net-analyzer/pmacct/pmacct-1.6.2.ebuild
new file mode 100644
index 000000000000..72d65265800b
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-1.6.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="A network tool to gather IP traffic information"
+HOMEPAGE="http://www.pmacct.net/"
+SRC_URI="http://www.pmacct.net/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="64bit debug geoip geoipv2 ipv6 jansson kafka mongodb mysql nflog postgres rabbitmq sqlite threads"
+REQUIRED_USE="
+	?? ( geoip geoipv2 )
+	kafka? ( jansson )
+	rabbitmq? ( jansson )
+"
+
+RDEPEND="
+	net-libs/libpcap
+	geoip? ( dev-libs/geoip )
+	geoipv2? ( dev-libs/libmaxminddb )
+	jansson? ( dev-libs/jansson )
+	kafka? ( dev-libs/librdkafka )
+	mongodb? (
+		>=dev-libs/mongo-c-driver-0.8.1-r1
+		<dev-libs/mongo-c-driver-0.98
+	)
+	mysql? ( virtual/mysql )
+	nflog? ( net-libs/libnetfilter_log )
+	postgres? ( dev-db/postgresql:* )
+	rabbitmq? ( net-libs/rabbitmq-c )
+	sqlite? ( =dev-db/sqlite-3* )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=(
+	CONFIG-KEYS ChangeLog FAQS QUICKSTART TOOLS UPGRADE
+	docs/INTERNALS docs/PLUGINS docs/SIGNALS
+)
+
+src_configure() {
+	tc-export CC AR RANLIB
+
+	econf \
+		$(use_enable 64bit) \
+		$(use_enable debug) \
+		$(use_enable geoip) \
+		$(use_enable geoipv2) \
+		$(use_enable ipv6) \
+		$(use_enable jansson) \
+		$(use_enable kafka) \
+		$(use_enable mongodb) \
+		$(use_enable mysql) \
+		$(use_enable nflog) \
+		$(use_enable postgres pgsql) \
+		$(use_enable rabbitmq) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable threads) \
+		--disable-debug
+}
+
+src_install() {
+	default
+
+	for dirname in examples sql; do
+		docinto ${dirname}
+		dodoc -r ${dirname}/*
+	done
+
+	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
+	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
+
+	insinto /etc/pmacctd
+	newins examples/pmacctd-imt.conf.example pmacctd.conf
+}
diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest
new file mode 100644
index 000000000000..292afa1d15c4
--- /dev/null
+++ b/net-analyzer/pnp4nagios/Manifest
@@ -0,0 +1,16 @@
+AUX 98_pnp4nagios-2.4.conf 725 SHA256 44436bf79e2b3624e3eb9eda86a083896b7057bb94dc04637ad2ad58e5e40f76 SHA512 9698529decd9587b4c48dfd5a92069645d4a8fb0796f05fea104459bc4a58aab081f10fc110d75e97331ec960e5fef71a85745c3ea58c6b9f6c37bcec4143000 WHIRLPOOL 0661a385e75d41b9a3e61cabf555ec0bbf6f59504867d7dee47936097dd491457d55d1507720af4152fcabb7ed90752def669270c5f31dcbc0d84f8db732f876
+AUX 98_pnp4nagios.conf 1025 SHA256 d4860e09c66e1d20e342a4ab997988ae825e6f4561a9631fd6c608f1c5420a5f SHA512 ac7f4cd92951e856c5af44eb8cfa0c75a867364b6d3d76ed5fb2479631f9ae20587f2d0a09ff4810602665558210232ab41ce6abf53859884a956826cbb5bfc2 WHIRLPOOL d28394eb0f63bd02f71c3ddd6c651f06c69354e2c9fd6fbd0bf65433d4721087078d06aa93df795c80f43a422b35f563b763ed7895891c603d6abbf359a197b1
+AUX npcd 647 SHA256 1fc46f13d27bce2e4dec1fff174cd154d0a4df165e4f61523b997ed26b743fdb SHA512 44facf1300e151f085851e5dfb67e2d67cccc3e9fd9169b15a160af78e02dfbb5e8720b4a63ad4ee61a5aedcdc86cd75520c2f5b0fce26a631d4a38b464af89f WHIRLPOOL 6a289ffc8bb5a4acf7c702beb076bb7b58320beba6a8858de9739c778c40b18768dd41b49995229cf44094e52e3a363952827556a286fe9914c31fa0080d3301
+AUX npcd.initd 364 SHA256 7dcadfa1f6f4f434be5c0caa9dcca0bc76ea694d5c86e3a9b589ecdbdefeb3c1 SHA512 efbf969865ce8f61a733ea0f0e3846854231b55d148dbf0121b4cf6022fedd94cb1ea8f717920f38aedddd6a8f33edf473f139599dc01cc2da14eedb80f7f4f2 WHIRLPOOL ef8c0952bcfd64edc2ae4adee6fe15e05f806d5e75acf796346f9ddde95772fc6f4da5db1bbf8584f8ce69c7bb137a0dd013e9faa9f7e70a6e49b491f42c95bb
+AUX pnp4nagios-0.6.14-makefile.patch 1057 SHA256 71fac5f40ba133258754bdd42d503024a7a64da7ae37b96bf6ed20a3c367f2ef SHA512 a67e4b66b0f24db25f9b67d982d99a90c20ad229d404537c9963b2e9f1c5df39a46faa34ecdeb1a9e69b46efd96104d97a39a7e326a01d1c2d09dcc149171602 WHIRLPOOL 7e6725dfef952a97f5d682af955560c88895ae71e5aae9a3bb4842b3696d2f6009e6239c0860991d86fe68d64b4bf7c1e668a5059751cbba4b33850f2bc7584f
+AUX pnp4nagios-0.6.25-rrdtool-0.6.0-support.patch 3578 SHA256 43f616a5a38e8f4a8c2701621f1f8c0d298521515ef93244d7a57739bf9d5cfc SHA512 a0a5c57808b59b748c7d8cb3febe1b4f29fce1e37abe546ae65b4037da330f580b90f155f7c179f7ae8ddcc8d25d5e595d8e6d5699738531f22dfab40e5cfc84 WHIRLPOOL 82d1990283f0ee66ae238eb61e88b362f23a3365d77c4f2bfd991308ecc3b42b987e6004f0e140d8ef4b653bb57af482130d094df2aac17b614c826102f122f2
+DIST pnp4nagios-0.6.24.tar.gz 2919182 SHA256 87412ef01257c6096aa5c84fdb47db950b851c596e1306180be8ba45401793cf SHA512 7e8c32e0ac69ab747a57e8ab6cc59fddfb63e16598fda9c1e6270d6309ff0885cd1bd0876d05aa1d30bffa76b281d41dc8fbe59e430778bf4d3bdddc4a7bee9f WHIRLPOOL 4f48b406a7d82a4370701ede2625ed2c247bb933a9197d3417c4eb18f18b879465aeb4775e9a0f0300ac1140159df6c6130466b5434c0b33bccb7fff04de86f8
+DIST pnp4nagios-0.6.25.tar.gz 2921068 SHA256 62d9cdcb132326753373b18fafebd716ec27dc5cbe1ef42204440fca21ca7a0c SHA512 e561fcac8243e6b1ab401312b4a05a6c752e2869da7366a22e4e48d54ae1e9c17c52cb2dffb1ca5748179f3bc856f779317196992643e9862eb09c4debf277c8 WHIRLPOOL 9267bbb04b3cdfdd4d12601508a6d602aa9513a096aac06adf4631fcb1218d2e24fef7a6be1defd8a3ac87106a9cdf6b689b50c432fe0f07ca45d7fbf665d810
+EBUILD pnp4nagios-0.6.24.ebuild 1970 SHA256 fcb20f631a894c71a48cdc98f3c72f89ab3dfd6fc4255f4a3a5f78e52d949842 SHA512 248b5f4ff3bbaa3d2dd71ae1efbb5a65e1926ca709034e2e3d4c62966608f9e83c6136ed0be63586c5dbd4b1d5e0f56705ccd68ccefaeb9d420d89f8bd26fd02 WHIRLPOOL f87c0a48707f97b55c162f143306a45764bc42fa39dc201191a6f9b0d34c9a6832c2f400f216ba4e90d9458d048f409c2e9c471dc73ca4f9c23b6b8e4f2db7bc
+EBUILD pnp4nagios-0.6.25-r1.ebuild 2906 SHA256 b96de829942ae538ff31b96f9a0c91766cf3c0632172877a6737ac7171596101 SHA512 f1c56eba7c88eb6359f50f637f871cedd22f74134522ba0b2e0de355411c4322f013fe438503b366986962072ba168ac4d015145b10aa6893b3999b6776707c5 WHIRLPOOL 7e54c72e9af9ee960589a771ea017ed9c8885270fbc44503b32aa1ad2bf9b3aa4eee160bc65a818157e3bdbfd9a483978c98b8328697435ab00fa07550d2077f
+EBUILD pnp4nagios-0.6.25-r2.ebuild 2995 SHA256 79b65741c1860b7e17ce879bb3acbb6564e44c60dc8f6f3e07ec118711d2f6e7 SHA512 142625f3438c605aab45689b2965bdce80d905680a23f3fb40ffc1bb0b0487842235d28493df0042616341a8e93ee3ee79b70361502f2cd5b85d594d5400f447 WHIRLPOOL a8e06b1efc3ea233d80bd16efe048896bf81a14bc9523206da0c0aaf70aa506f868685d588bf4fde1fe8a96efc101d0dd91bc9dc69f2f99a5416e0984d2bd205
+EBUILD pnp4nagios-0.6.25-r3.ebuild 2868 SHA256 b2244b2c82e63b7ed3187c4dbe82e72ca8dec0aac36842e81be37ed7fca36dbc SHA512 45b01c76de8002a28e804895d55e2fbeb5f5dac61a0f6dd5314b60ac0113f76007f58d4c586b7d3fd19ab8a54e544d64f76b4d3f0c6837dd83544a0868521ff0 WHIRLPOOL 3fff77b86d856bcb65712839ac6a0f69b0cf895553ab8171db6feadf99141fef22febb1d970e523e6b879b9ee72087e829b2ac72fccc7c82e11f075b99a86ae5
+EBUILD pnp4nagios-0.6.25.ebuild 2909 SHA256 b10d7fe23f730289b237229df51c0075144a18ed0d361af29f7a2584d6aa3668 SHA512 79633a38ff8bb00563edcd3ab5b1cad51f104eb696de227599fd4a6dc51fd0d9e5a7fe8c610c72f49bdf4c223834efe47b9456a19f1ad6c5706fb3a905285ae3 WHIRLPOOL 0af2f92e77537730edbfab9385600afd3157d5c2eed23d3b0b224cf0b2f88facc4fb642b8347f6f08922adb46f9d33305566c0cd465f970f688127dcda700fe8
+MISC ChangeLog 4200 SHA256 aba7c9246c1ca28a458fb1156b4416727cebd6af81d0ab178ad4810bbd6f4743 SHA512 310a84bf7133c6906fad6eeba8e3f53110ab87bd79ab501f291bce5bc91f4fa6eaa129628d54357301d5cfb1bc48c129834251ccdacd5afa01faface6327be01 WHIRLPOOL 2898c5bddd962a7aeb19ed0775939f7e3157ba265fbc20a6fb5ba258b552cc8ab8231f92191f10d06b4d696c0853f4d80c2a058dbd56e9cfe331ac9e32c52c55
+MISC ChangeLog-2015 9727 SHA256 4189bed66a74bfa7d899833ea65c4aee4c4f14b9c0a529cbc85cc14e82510485 SHA512 8a5381301af07559f48300043e9517baa3969452c7abd14fb13c5fa520497d3b17c15eb445d7a75b1a5dbf96aca9652d54601304a61c19222ce9caa2c892000f WHIRLPOOL 8ac59be793b189e21f8e2f3da605cd26852eb86186e42e73ec1197594239cb646e1d825ac3e78aba81f3bd64ea6b3e10786084324da57fcbf79a63b3ced86f96
+MISC metadata.xml 349 SHA256 8ed666651387627607326924873fb0776feb57a57fc515ad4eb9f5fc3f2b6c3d SHA512 b02c2c1f5712b2b2a1debc977f49f1df9843ae029bb723eb6e4dc590ea6dd0411ca65d214c9b0353f157cf44f997101c58aaf1bfcc218a251f9a51244b03a0ff WHIRLPOOL 2f55d716a365c94f7e7067139ab3637be73e095aa755edae83d612a0cd89d841b5fac9812206626b02b75736834287e8cad63a572c7c7948aa95fddf39303910
diff --git a/net-analyzer/pnp4nagios/files/98_pnp4nagios-2.4.conf b/net-analyzer/pnp4nagios/files/98_pnp4nagios-2.4.conf
new file mode 100644
index 000000000000..5944a2e2f70f
--- /dev/null
+++ b/net-analyzer/pnp4nagios/files/98_pnp4nagios-2.4.conf
@@ -0,0 +1,29 @@
+<IfDefine PNP>
+
+  Alias /pnp4nagios /usr/share/pnp/
+
+  <Directory /usr/share/pnp>
+    AllowOverride AuthConfig
+    Require all granted
+
+    <IfModule rewrite_module>
+      # Turn on URL rewriting
+      RewriteEngine On
+      Options +FollowSymLinks
+
+      # Installation directory
+      RewriteBase /pnp4nagios
+
+      # Protect application and system files from being viewed
+      RewriteRule ^(application|modules|system) - [F,L]
+
+      # Allow any files or directories that exist to be displayed directly
+      RewriteCond %{REQUEST_FILENAME} !-f
+      RewriteCond %{REQUEST_FILENAME} !-d
+
+      # Rewrite all other URLs to index.php/URL
+      RewriteRule .* index.php/$0 [PT,L]
+    </IfModule>
+  </Directory>
+
+</IfDefine>
diff --git a/net-analyzer/pnp4nagios/files/98_pnp4nagios.conf b/net-analyzer/pnp4nagios/files/98_pnp4nagios.conf
new file mode 100644
index 000000000000..4879779a8f93
--- /dev/null
+++ b/net-analyzer/pnp4nagios/files/98_pnp4nagios.conf
@@ -0,0 +1,22 @@
+<IfDefine PNP>
+        Alias /pnp4nagios /usr/share/pnp/
+        <Directory /usr/share/pnp>
+                AllowOverride AuthConfig
+                Order allow,deny
+                Allow from all
+                <IfModule mod_rewrite.c>
+                        # Turn on URL rewriting
+                        RewriteEngine On
+                        Options FollowSymLinks
+                        # Installation directory
+                        RewriteBase /pnp4nagios
+                        # Protect application and system files from being viewed
+                        RewriteRule ^(application|modules|system) - [F,L]
+                        # Allow any files or directories that exist to be displayed directly
+                        RewriteCond %{REQUEST_FILENAME} !-f
+                        RewriteCond %{REQUEST_FILENAME} !-d
+                        # Rewrite all other URLs to index.php/URL
+                        RewriteRule .* index.php/$0 [PT,L]
+                </IfModule>
+        </Directory>
+</IfDefine>
diff --git a/net-analyzer/pnp4nagios/files/npcd b/net-analyzer/pnp4nagios/files/npcd
new file mode 100644
index 000000000000..9ae67362d645
--- /dev/null
+++ b/net-analyzer/pnp4nagios/files/npcd
@@ -0,0 +1,36 @@
+#!/sbin/openrc-run
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+opts="${opts} reload"
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting npcd"
+	start-stop-daemon --start --exec /usr/bin/npcd \
+		-- -f /etc/pnp/npcd.cfg \
+		-d
+	eend $? "Failed to Start npcd"
+}
+
+stop() {
+	ebegin "Stopping npcd"
+	start-stop-daemon --stop --quiet -n npcd
+	eend $? "Failed to Stop npcd"
+}
+
+reload() {
+        ebegin "Reloading npcd"
+        kill -HUP `pgrep npcd`
+        eend $? "Failed to reload npcd"
+}
+
+restart() {
+	ebegin "Restarting npcd"
+	svc_stop
+	svc_start
+	eend $? "Failed to Restart npcd"
+}
diff --git a/net-analyzer/pnp4nagios/files/npcd.initd b/net-analyzer/pnp4nagios/files/npcd.initd
new file mode 100644
index 000000000000..23eb77aa63a4
--- /dev/null
+++ b/net-analyzer/pnp4nagios/files/npcd.initd
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+
+command="/usr/bin/npcd"
+command_args="-f /etc/pnp/npcd.cfg -d"
+
+depend() {
+	need net
+}
+
+reload() {
+        ebegin "Reloading npcd"
+        kill -HUP `pgrep npcd`
+        eend $? "Failed to reload npcd"
+}
diff --git a/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.14-makefile.patch b/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.14-makefile.patch
new file mode 100644
index 000000000000..469389d3ee31
--- /dev/null
+++ b/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.14-makefile.patch
@@ -0,0 +1,32 @@
+diff -Naur pnp4nagios-0.6.14.orig/src/Makefile.in pnp4nagios-0.6.14/src/Makefile.in
+--- pnp4nagios-0.6.14.orig/src/Makefile.in	2011-08-10 17:18:46.000000000 +0200
++++ pnp4nagios-0.6.14/src/Makefile.in	2011-08-10 17:19:51.000000000 +0200
+@@ -83,7 +83,7 @@
+ #
+ ###############################
+ npcd: npcd.c $(NPCDOBJS) $(NPCDHEAD)
+-	$(CC) $(CFLAGS) -o $@ npcd.c $(NPCDOBJS) -lpthread
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ npcd.c $(NPCDOBJS) -lpthread
+ 
+ ###############################
+ #
+@@ -118,7 +118,6 @@
+ 
+ install:
+ 	$(MAKE) install-basic
+-	$(MAKE) strip-post-install
+ 
+ install-unstripped:
+ 	$(MAKE) install-basic
+diff -Naur pnp4nagios-0.6.14.orig/configure pnp4nagios-0.6.14/configure
+--- pnp4nagios-0.6.14.orig/configure	2011-08-12 09:01:12.000000000 +0200
++++ pnp4nagios-0.6.14/configure	2011-08-12 09:03:32.000000000 +0200
+@@ -5565,7 +5565,7 @@
+ 		PERFDATA_LOG="${localstatedir}/perfdata.log"
+ 		PERFDATA_DIR="${localstatedir}/perfdata"
+ 		PERFDATA_SPOOL_DIR="${localstatedir}/spool"
+-		mandir="\${prefix}/man"
++		mandir="/usr/share/man"
+ 	;;
+ esac
+ 
diff --git a/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.25-rrdtool-0.6.0-support.patch b/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.25-rrdtool-0.6.0-support.patch
new file mode 100644
index 000000000000..1a16d771c7b3
--- /dev/null
+++ b/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.25-rrdtool-0.6.0-support.patch
@@ -0,0 +1,93 @@
+From 0a539e1c7ab03ec015c27e4ad0fe16343a98c269 Mon Sep 17 00:00:00 2001
+From: Louis Sautier <sautier.louis@gmail.com>
+Date: Mon, 25 Apr 2016 12:31:49 +0200
+Subject: [PATCH] Use complete option arguments for compatibility with rrdtool
+ 1.6.0
+
+Since rrdtool switched to optparse, it seems that complete option
+arguments must be used:
+https://github.com/oetiker/rrdtool-1.x/commit/83530d3e43cebc32da157733d35c60bf4bb098da
+---
+ share/pnp/templates.dist/check_dns.php       | 2 +-
+ share/pnp/templates.dist/check_multi.php     | 2 +-
+ share/pnp/templates.dist/check_ping_tick.php | 2 +-
+ share/pnp/templates.dist/check_users.php     | 2 +-
+ share/pnp/templates.dist/default.php         | 6 +++---
+ 5 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/share/pnp/templates.dist/check_dns.php b/share/pnp/templates.dist/check_dns.php
+index b8ab048..dad209a 100644
+--- a/share/pnp/templates.dist/check_dns.php
++++ b/share/pnp/templates.dist/check_dns.php
+@@ -4,7 +4,7 @@
+ # Template for check_dns
+ #
+ 
+-$opt[1] = "--lower=$MIN[1] --vertical-label $UNIT[1]  --title \"DNS Response Time\" ";
++$opt[1] = "--lower-limit=$MIN[1] --vertical-label $UNIT[1]  --title \"DNS Response Time\" ";
+ 
+ 
+ $def[1] =  "DEF:var1=$RRDFILE[1]:$DS[1]:AVERAGE " ;
+diff --git a/share/pnp/templates.dist/check_multi.php b/share/pnp/templates.dist/check_multi.php
+index ba6bcd1..cd0794a 100644
+--- a/share/pnp/templates.dist/check_multi.php
++++ b/share/pnp/templates.dist/check_multi.php
+@@ -4,7 +4,7 @@
+ # Template for check_multi
+ # 
+ 
+-$opt[1] = "--lower=$MIN[1] --vertical-label num  --title \"Number of Checks\" ";
++$opt[1] = "--lower-limit=$MIN[1] --vertical-label num  --title \"Number of Checks\" ";
+ $ds_name[1] = "Executed Plugins";
+ 
+ $def[1] =  "DEF:var1=$RRDFILE[1]:$DS[1]:AVERAGE " ;
+diff --git a/share/pnp/templates.dist/check_ping_tick.php b/share/pnp/templates.dist/check_ping_tick.php
+index 865479f..f191049 100644
+--- a/share/pnp/templates.dist/check_ping_tick.php
++++ b/share/pnp/templates.dist/check_ping_tick.php
+@@ -6,7 +6,7 @@
+ # RTA
+ #
+ $ds_name[1] = "Round Trip Times";
+-$opt[1]  = "--lower=0 --vertical-label \"RTA\" --title \"Ping times\" ";
++$opt[1]  = "--lower-limit=0 --vertical-label \"RTA\" --title \"Ping times\" ";
+ $opt[1] .=  rrd::darkteint();
+ $def[1]  =  rrd::def("var1", $RRDFILE[1], $DS[1], "AVERAGE") ;
+ $def[1] .=  rrd::ticker("var1", $WARN[1], $CRIT[1]) ;
+diff --git a/share/pnp/templates.dist/check_users.php b/share/pnp/templates.dist/check_users.php
+index 9fe878d..c66fc01 100644
+--- a/share/pnp/templates.dist/check_users.php
++++ b/share/pnp/templates.dist/check_users.php
+@@ -4,7 +4,7 @@
+ # Template for check_users
+ #
+ 
+-$opt[1] = "--lower=$MIN[1] --vertical-label \"Users\"  --title \"Users\" ";
++$opt[1] = "--lower-limit=$MIN[1] --vertical-label \"Users\"  --title \"Users\" ";
+ 
+ 
+ $def[1] =  "DEF:var1=$RRDFILE[1]:$DS[1]:MAX " ;
+diff --git a/share/pnp/templates.dist/default.php b/share/pnp/templates.dist/default.php
+index 6fdf38c..823ee6a 100644
+--- a/share/pnp/templates.dist/default.php
++++ b/share/pnp/templates.dist/default.php
+@@ -47,7 +47,7 @@
+ 		$crit_min = $VAL['CRIT_MIN'];
+ 	}
+ 	if ( $VAL['MIN'] != "" && is_numeric($VAL['MIN']) ) {
+-		$lower = " --lower=" . $VAL['MIN'];
++		$lower = " --lower-limit=" . $VAL['MIN'];
+ 		$minimum = $VAL['MIN'];
+ 	}
+ 	if ( $VAL['MAX'] != "" && is_numeric($VAL['MAX']) ) {
+@@ -55,8 +55,8 @@
+ 	}
+ 	if ($VAL['UNIT'] == "%%") {
+ 		$vlabel = "%";
+-		$upper = " --upper=101 ";
+-		$lower = " --lower=0 ";
++		$upper = " --upper-limit=101 ";
++		$lower = " --lower-limit=0 ";
+ 	}
+ 	else {
+ 		$vlabel = $VAL['UNIT'];
diff --git a/net-analyzer/pnp4nagios/metadata.xml b/net-analyzer/pnp4nagios/metadata.xml
new file mode 100644
index 000000000000..379fdde3e076
--- /dev/null
+++ b/net-analyzer/pnp4nagios/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">pnp4nagios</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild
new file mode 100644
index 000000000000..7a79e5d51e9a
--- /dev/null
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit depend.apache eutils
+
+DESCRIPTION="A performance data analyzer for nagios"
+HOMEPAGE="http://www.pnp4nagios.org"
+SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+
+DEPEND="
+	dev-lang/php[json,simplexml,zlib,xml,filter]
+	>=dev-lang/php-5.3
+	>=net-analyzer/rrdtool-1.2[graph,perl]
+	|| ( net-analyzer/nagios-core net-analyzer/icinga net-analyzer/icinga2 )"
+RDEPEND="${DEPEND}
+	virtual/perl-Getopt-Long
+	virtual/perl-Time-HiRes
+	media-fonts/dejavu
+	apache2? ( www-servers/apache[apache2_modules_rewrite] )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.6.14-makefile.patch
+}
+
+src_configure() {
+	local var_dir=
+	local user_group=
+
+	if has_version net-analyzer/nagios-core; then
+		var_dir=/var/nagios/
+		user_group=nagios
+	else
+		var_dir=/var/lib/icinga/
+		user_group=icinga
+	fi
+
+	econf \
+		--sysconfdir=/etc/pnp \
+		--datarootdir=/usr/share/pnp \
+		--mandir=/usr/share/man \
+		--with-perfdata-dir=${var_dir}/perfdata \
+		--with-nagios-user=${user_group} \
+		--with-nagios-group=${user_group} \
+		--with-perfdata-logfile=${var_dir}/perfdata.log \
+		--with-perfdata-spool-dir=/var/spool/pnp
+}
+
+src_compile() {
+	# The default target just shows a help
+	emake all
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-config
+	newinitd "${FILESDIR}"/npcd.initd npcd
+	rm "${D}"/usr/share/pnp/install.php || die
+
+	if use apache2 ; then
+		insinto "${APACHE_MODULES_CONFDIR}"
+		doins "${FILESDIR}"/98_pnp4nagios.conf
+	fi
+
+	# Bug 430358 - CVE-2012-3457
+	find "${D}/etc/pnp" -type f -exec chmod 0640 {} \; || die
+	find "${D}/etc/pnp" -type d -exec chmod 0750 {} \; || die
+}
+
+pkg_postinst() {
+	elog "Please make sure to enable URL rewriting in Apache or any other"
+	elog "webserver you're using, to get pnp4nagios running!"
+}
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r1.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r1.ebuild
new file mode 100644
index 000000000000..ea74516d0c55
--- /dev/null
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit depend.apache eutils
+
+DESCRIPTION="A performance data analyzer for nagios"
+HOMEPAGE="http://www.pnp4nagios.org/"
+SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+# A lot of things (sync mode, for one) are broken with nagios-4.x.
+DEPEND="
+	dev-lang/php:*[filter,gd,json,simplexml,xml,zlib]
+	>=net-analyzer/rrdtool-1.2[graph,perl]
+	|| ( <net-analyzer/nagios-core-4 net-analyzer/icinga net-analyzer/icinga2 )"
+
+# A list of modules used in our Apache config file.
+APACHE_MODS="apache2_modules_alias,"       # "Alias" directive
+APACHE_MODS+="apache2_modules_authz_core," # "Require" directive
+APACHE_MODS+="apache2_modules_rewrite"     # "RewriteEngine" and friends
+
+RDEPEND="${DEPEND}
+	virtual/perl-Getopt-Long
+	virtual/perl-Time-HiRes
+	media-fonts/dejavu
+	apache2? ( >=www-servers/apache-2.4[${APACHE_MODS}] )"
+
+# There is no want_apache2_4, but we needed to specify that manually
+# anyway to be able to include the list of modules.
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.6.14-makefile.patch"
+}
+
+src_configure() {
+	local var_dir=
+	local user_group=
+
+	if has_version net-analyzer/nagios-core; then
+		var_dir=/var/nagios/
+		user_group=nagios
+	else
+		var_dir=/var/lib/icinga/
+		user_group=icinga
+	fi
+
+	econf \
+		--sysconfdir=/etc/pnp \
+		--datarootdir=/usr/share/pnp \
+		--mandir=/usr/share/man \
+		--with-perfdata-dir=${var_dir}/perfdata \
+		--with-nagios-user=${user_group} \
+		--with-nagios-group=${user_group} \
+		--with-perfdata-logfile=${var_dir}/perfdata.log \
+		--with-perfdata-spool-dir=/var/spool/pnp
+}
+
+src_compile() {
+	# The default target just shows a help
+	emake all
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-config
+	newinitd "${FILESDIR}"/npcd.initd npcd
+	rm "${D}/usr/share/pnp/install.php" || \
+		die "unable to remove ${D}/usr/share/pnp/install.php"
+
+	if use apache2 ; then
+		insinto "${APACHE_MODULES_CONFDIR}"
+		newins "${FILESDIR}"/98_pnp4nagios-2.4.conf 98_pnp4nagios.conf
+
+		# Allow the apache user to read our config files. This same
+		# approach is used in net-analyzer/nagios-core.
+		chgrp -R apache "${D}/etc/pnp" \
+			|| die "failed to change group of ${ROOT}etc/pnp"
+	fi
+
+	# Bug 430358 - CVE-2012-3457
+	find "${D}/etc/pnp" -type f -exec chmod 0640 '{}' + || \
+		die "unable to set file permissions under ${D}/etc/pnp"
+
+	find "${D}/etc/pnp" -type d -exec chmod 0750 '{}' + || \
+		die "unable to set directory permissions under ${D}/etc/pnp"
+}
+
+pkg_postinst() {
+	elog "To enable the pnp4nagios web front-end, please visit"
+	elog "${ROOT}etc/conf.d/apache2 and add \"-D PNP -D PHP5\""
+	elog "to APACHE2_OPTS. Then pnp4nagios will be available at,"
+	elog
+	elog "  http://localhost/pnp4nagios"
+	elog
+}
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild
new file mode 100644
index 000000000000..7630fe3e6f9b
--- /dev/null
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit depend.apache eutils
+
+DESCRIPTION="A performance data analyzer for nagios"
+HOMEPAGE="http://www.pnp4nagios.org/"
+SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+
+# A lot of things (sync mode, for one) are broken with nagios-4.x.
+DEPEND="
+	dev-lang/php:*[filter,gd,json,simplexml,xml,zlib]
+	>=net-analyzer/rrdtool-1.2[graph,perl]
+	|| ( <net-analyzer/nagios-core-4 net-analyzer/icinga net-analyzer/icinga2 )"
+
+# A list of modules used in our Apache config file.
+APACHE_MODS="apache2_modules_alias,"       # "Alias" directive
+APACHE_MODS+="apache2_modules_authz_core," # "Require" directive
+APACHE_MODS+="apache2_modules_rewrite"     # "RewriteEngine" and friends
+
+RDEPEND="${DEPEND}
+	virtual/perl-Getopt-Long
+	virtual/perl-Time-HiRes
+	media-fonts/dejavu
+	apache2? ( >=www-servers/apache-2.4[${APACHE_MODS}] )"
+
+# There is no want_apache2_4, but we needed to specify that manually
+# anyway to be able to include the list of modules.
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.6.14-makefile.patch"
+}
+
+src_configure() {
+	local var_dir=
+	local user_group=
+
+	if has_version net-analyzer/nagios-core; then
+		var_dir=/var/nagios/
+		user_group=nagios
+	elif has_version net-analyzer/icinga2; then
+		var_dir=/var/lib/icinga2/
+		user_group=icinga
+	else
+		var_dir=/var/lib/icinga/
+		user_group=icinga
+	fi
+
+	econf \
+		--sysconfdir=/etc/pnp \
+		--datarootdir=/usr/share/pnp \
+		--mandir=/usr/share/man \
+		--with-perfdata-dir=${var_dir}/perfdata \
+		--with-nagios-user=${user_group} \
+		--with-nagios-group=${user_group} \
+		--with-perfdata-logfile=${var_dir}/perfdata.log \
+		--with-perfdata-spool-dir=/var/spool/pnp
+}
+
+src_compile() {
+	# The default target just shows a help
+	emake all
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-config
+	newinitd "${FILESDIR}"/npcd.initd npcd
+	rm "${D}/usr/share/pnp/install.php" || \
+		die "unable to remove ${D}/usr/share/pnp/install.php"
+
+	if use apache2 ; then
+		insinto "${APACHE_MODULES_CONFDIR}"
+		newins "${FILESDIR}"/98_pnp4nagios-2.4.conf 98_pnp4nagios.conf
+
+		# Allow the apache user to read our config files. This same
+		# approach is used in net-analyzer/nagios-core.
+		chgrp -R apache "${D}/etc/pnp" \
+			|| die "failed to change group of ${ROOT}etc/pnp"
+	fi
+
+	# Bug 430358 - CVE-2012-3457
+	find "${D}/etc/pnp" -type f -exec chmod 0640 '{}' + || \
+		die "unable to set file permissions under ${D}/etc/pnp"
+
+	find "${D}/etc/pnp" -type d -exec chmod 0750 '{}' + || \
+		die "unable to set directory permissions under ${D}/etc/pnp"
+}
+
+pkg_postinst() {
+	elog "To enable the pnp4nagios web front-end, please visit"
+	elog "${ROOT}etc/conf.d/apache2 and add \"-D PNP -D PHP5\""
+	elog "to APACHE2_OPTS. Then pnp4nagios will be available at,"
+	elog
+	elog "  http://localhost/pnp4nagios"
+	elog
+}
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r3.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r3.ebuild
new file mode 100644
index 000000000000..2044e45a7e0d
--- /dev/null
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r3.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A performance data analyzer for nagios"
+HOMEPAGE="http://www.pnp4nagios.org/"
+SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apache2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+# A lot of things (sync mode, for one) are broken with nagios-4.x.
+DEPEND="
+	dev-lang/php:*[filter,gd,json,simplexml,xml,zlib]
+	>=net-analyzer/rrdtool-1.2[graph,perl]
+	|| ( <net-analyzer/nagios-core-4 net-analyzer/icinga net-analyzer/icinga2 )"
+
+# A list of modules used in our Apache config file.
+APACHE_MODS="apache2_modules_alias,"       # "Alias" directive
+APACHE_MODS+="apache2_modules_authz_core," # "Require" directive
+APACHE_MODS+="apache2_modules_rewrite"     # "RewriteEngine" and friends
+
+RDEPEND="${DEPEND}
+	virtual/perl-Getopt-Long
+	virtual/perl-Time-HiRes
+	media-fonts/dejavu
+	apache2? ( >=www-servers/apache-2.4[${APACHE_MODS}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.6.14-makefile.patch"
+	"${FILESDIR}/${P}-rrdtool-0.6.0-support.patch"
+)
+
+src_configure() {
+	local var_dir user_group
+
+	if has_version net-analyzer/nagios-core; then
+		var_dir=/var/nagios
+		user_group=nagios
+	elif has_version net-analyzer/icinga2; then
+		var_dir=/var/lib/icinga2
+		user_group=icinga
+	else
+		var_dir=/var/lib/icinga
+		user_group=icinga
+	fi
+
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/pnp \
+		--datarootdir="${EPREFIX}"/usr/share/pnp \
+		--with-perfdata-dir="${EPREFIX}"${var_dir}/perfdata \
+		--with-nagios-user=${user_group} \
+		--with-nagios-group=${user_group} \
+		--with-perfdata-logfile="${EPREFIX}"${var_dir}/perfdata.log \
+		--with-perfdata-spool-dir="${EPREFIX}"/var/spool/pnp
+}
+
+src_compile() {
+	# The default target just shows a help
+	emake all
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-config
+	einstalldocs
+	newinitd "${FILESDIR}"/npcd.initd npcd
+	rm "${ED%/}/usr/share/pnp/install.php" || \
+		die "unable to remove ${ED%/}/usr/share/pnp/install.php"
+
+	if use apache2 ; then
+		insinto "${APACHE_MODULES_CONFDIR}"
+		newins "${FILESDIR}"/98_pnp4nagios-2.4.conf 98_pnp4nagios.conf
+
+		# Allow the apache user to read our config files. This same
+		# approach is used in net-analyzer/nagios-core.
+		chgrp -R apache "${ED%/}/etc/pnp" \
+			|| die "failed to change group of ${ED%/}/etc/pnp"
+	fi
+
+	# Bug 430358 - CVE-2012-3457
+	local f
+	while IFS="" read -d $'\0' -r f ; do
+		chmod 0640 "${f}" || die
+	done < <(find "${ED%/}/etc/pnp" -type f)
+
+	while IFS="" read -d $'\0' -r f ; do
+		chmod 0750 "${f}" || die
+	done < <(find "${ED%/}/etc/pnp" -type d)
+}
+
+pkg_postinst() {
+	elog "To enable the pnp4nagios web front-end, please visit"
+	elog "${EROOT%/}/etc/conf.d/apache2 and add \"-D PNP -D PHP5\""
+	elog "to APACHE2_OPTS. Then pnp4nagios will be available at,"
+	elog
+	elog "  http://localhost/pnp4nagios"
+	elog
+}
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25.ebuild
new file mode 100644
index 000000000000..8c83a932fe0c
--- /dev/null
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit depend.apache eutils
+
+DESCRIPTION="A performance data analyzer for nagios"
+HOMEPAGE="http://www.pnp4nagios.org/"
+SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+# A lot of things (sync mode, for one) are broken with nagios-4.x.
+DEPEND="
+	>=dev-lang/php-5.3:*[json,simplexml,zlib,xml,filter]
+	>=net-analyzer/rrdtool-1.2[graph,perl]
+	|| ( <net-analyzer/nagios-core-4 net-analyzer/icinga net-analyzer/icinga2 )"
+
+# A list of modules used in our Apache config file.
+APACHE_MODS="apache2_modules_alias,"       # "Alias" directive
+APACHE_MODS+="apache2_modules_authz_core," # "Require" directive
+APACHE_MODS+="apache2_modules_rewrite"     # "RewriteEngine" and friends
+
+RDEPEND="${DEPEND}
+	virtual/perl-Getopt-Long
+	virtual/perl-Time-HiRes
+	media-fonts/dejavu
+	apache2? ( >=www-servers/apache-2.4[${APACHE_MODS}] )"
+
+# There is no want_apache2_4, but we needed to specify that manually
+# anyway to be able to include the list of modules.
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.6.14-makefile.patch"
+}
+
+src_configure() {
+	local var_dir=
+	local user_group=
+
+	if has_version net-analyzer/nagios-core; then
+		var_dir=/var/nagios/
+		user_group=nagios
+	else
+		var_dir=/var/lib/icinga/
+		user_group=icinga
+	fi
+
+	econf \
+		--sysconfdir=/etc/pnp \
+		--datarootdir=/usr/share/pnp \
+		--mandir=/usr/share/man \
+		--with-perfdata-dir=${var_dir}/perfdata \
+		--with-nagios-user=${user_group} \
+		--with-nagios-group=${user_group} \
+		--with-perfdata-logfile=${var_dir}/perfdata.log \
+		--with-perfdata-spool-dir=/var/spool/pnp
+}
+
+src_compile() {
+	# The default target just shows a help
+	emake all
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-config
+	newinitd "${FILESDIR}"/npcd.initd npcd
+	rm "${D}/usr/share/pnp/install.php" || \
+		die "unable to remove ${D}/usr/share/pnp/install.php"
+
+	if use apache2 ; then
+		insinto "${APACHE_MODULES_CONFDIR}"
+		newins "${FILESDIR}"/98_pnp4nagios-2.4.conf 98_pnp4nagios.conf
+
+		# Allow the apache user to read our config files. This same
+		# approach is used in net-analyzer/nagios-core.
+		chgrp -R apache "${D}/etc/pnp" \
+			|| die "failed to change group of ${ROOT}etc/pnp"
+	fi
+
+	# Bug 430358 - CVE-2012-3457
+	find "${D}/etc/pnp" -type f -exec chmod 0640 '{}' + || \
+		die "unable to set file permissions under ${D}/etc/pnp"
+
+	find "${D}/etc/pnp" -type d -exec chmod 0750 '{}' + || \
+		die "unable to set directory permissions under ${D}/etc/pnp"
+}
+
+pkg_postinst() {
+	elog "To enable the pnp4nagios web front-end, please visit"
+	elog "${ROOT}etc/conf.d/apache2 and add \"-D PNP -D PHP5\""
+	elog "to APACHE2_OPTS. Then pnp4nagios will be available at,"
+	elog
+	elog "  http://localhost/pnp4nagios"
+	elog
+}
diff --git a/net-analyzer/poink/Manifest b/net-analyzer/poink/Manifest
new file mode 100644
index 000000000000..21d3a54d8b6f
--- /dev/null
+++ b/net-analyzer/poink/Manifest
@@ -0,0 +1,6 @@
+AUX poink-2.03-signed-char-fixup.patch 433 SHA256 63dd0ffbb1f08ec5fb8a0bde1d33427f4621fa35475c9ee123d1379a67472cac SHA512 13e05840df55c033245f1c4b07b63d479f2233e5baa37344539d85c94d9b4d612dd1daa19a7547fce6d037525035d4f5d26b30b7b8b6abc40d1a90c54e59f9db WHIRLPOOL b4132dc6d42370ed2dffe9a9078442c9b981f463e7cca1ffe98047c6314180028e9e35625a5361cc31f358177ad3f6dfc4e6b34530e440a00a9e5c9f2719c418
+DIST poink-2.03.tar.gz 11427 SHA256 545150921086da2bbb01225d38d4445b318ebeae8958d2bee53fd806ddb237cc SHA512 25299093f3e70af97da85f0e7bbe9032466b3ef3ad886d4e658a0cfc11793570c2fb1eefd3330fa549517d033297e5ac3e90f7012a122c8ad988625372d986a8 WHIRLPOOL f64bdcebe5d3d9164860e841fad63890b1a40b7595ed4e3687aad3d3f07b2f5e2fc5dc8f46fd18e135915087e121c5bbed1e0cfc49957219749a5e54ed79425b
+EBUILD poink-2.03.ebuild 644 SHA256 b167192b407a7d16a6697973217ff816b062a9b53906e50de7bc86f096aec600 SHA512 115cb669baaed93ea412e421943727c27738f14ad24120a535cce97aef29bdc4bf82608649c59c04aae4ebcba04be4bab83e64b5f80bd2ee2eba51ebefbd00b5 WHIRLPOOL 6f8b3af237b85585d3de58a67fb2ca835ca54e21d3c1f5370f9e09bdc103dd9723d6047e1af4106270231bb135506ebafa173f8a8e96571df7b9116ea2e2dee8
+MISC ChangeLog 2217 SHA256 6aff8e98b1da92a1c28335086c61393a8b18b301d64b436e2de076474a90f786 SHA512 c6948a01026b87d45af01da62b697cfe8e106d10d9c8f480bbca0b840ec5c7fa0fd880c263dfc6fbbaf3c9776391bd9c9e3db25718a7a7f6ce102b864225e98b WHIRLPOOL 6c93fe95db17e04622a308ac6eae6973179154a81eb86eb271347199ef6875eb5c2db3aa1f19f52bd80e394d54ab607f703f11f431499817955465080d9f61f1
+MISC ChangeLog-2015 1280 SHA256 867fc4a56592bafe9d26e9a06f858334c462f554c42c0bd52d2fc9181d258905 SHA512 2d72774b20ef9d8774938630eefdcc3aa28e3f90a26d1abcc41a9b26758fcedaf5b592d219174a1187517ccd22f445694b19a22766293b2be5cacc3050fc9ec4 WHIRLPOOL 2566b74dd0090e09bb2c31772923d4344fb0dbf2b7f867d5423b9b95005a83bd75182fe108f123aa99c313343de3f9172c801084bc2ca0d3948f9715d368f8ba
+MISC metadata.xml 216 SHA256 f7475919f28a8a93ec8bd025c8f8bbab918f66d0d1737420c876f0480308fe6a SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd WHIRLPOOL 163285b60aa93e00993af659dc1e29a9eb245bd3415dd5ec75b284250596165f469028102b72fa0c344834443a44c1bbcf6272fe6a3f5211f721fc96e1c6ec16
diff --git a/net-analyzer/poink/files/poink-2.03-signed-char-fixup.patch b/net-analyzer/poink/files/poink-2.03-signed-char-fixup.patch
new file mode 100644
index 000000000000..543e58bb184e
--- /dev/null
+++ b/net-analyzer/poink/files/poink-2.03-signed-char-fixup.patch
@@ -0,0 +1,13 @@
+diff -Nuar poink-2.03.orig/poink.c poink-2.03/poink.c
+--- poink-2.03.orig/poink.c	2002-11-03 03:12:56.000000000 -0800
++++ poink-2.03/poink.c	2007-06-11 11:59:09.763490735 -0700
+@@ -109,7 +109,8 @@
+ 	SOCKADDR_IN s;
+ 	struct timeval ping_start, ping_end;
+ 	struct sigaction siga;
+-	char ch, pingerror[100];
++	signed char ch; // EOF is -1
++	char pingerror[100];
+ 	int delay=DEF_DELAY,timeout=DEF_TIMEOUT;
+ 	int suck, tmp, port=65535;
+ 
diff --git a/net-analyzer/poink/metadata.xml b/net-analyzer/poink/metadata.xml
new file mode 100644
index 000000000000..79d462e85571
--- /dev/null
+++ b/net-analyzer/poink/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/poink/poink-2.03.ebuild b/net-analyzer/poink/poink-2.03.ebuild
new file mode 100644
index 000000000000..d675af067eea
--- /dev/null
+++ b/net-analyzer/poink/poink-2.03.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="TCP/IP-based ping implementation"
+HOMEPAGE="http://directory.fsf.org/security/system/poink.html"
+SRC_URI="http://ep09.pld-linux.org/~mmazur/poink/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${PN}-2.03-signed-char-fixup.patch
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	dobin poink poink6
+	newman ping.1 poink.1
+	dodoc README* ChangeLog COPYING
+}
diff --git a/net-analyzer/portmon/Manifest b/net-analyzer/portmon/Manifest
new file mode 100644
index 000000000000..458459404d89
--- /dev/null
+++ b/net-analyzer/portmon/Manifest
@@ -0,0 +1,6 @@
+AUX portmon.init 633 SHA256 5cf63007fdfcd649ddcb3450dcca0cd1e6537476133aef2448feb58eaf92917f SHA512 7bd26de7d5031c79afd3c2a04ca6f4e95af994c552973c89951a39d49a22b2856d02f7d9eef885fc26fb59a0f7063799230fb161682047debe70764565228eda WHIRLPOOL c7d3ff38bd6444fbcb4f378e0f1a14ead2d95d10ae6fcb65894324283bbcee390e2d30b314433157ce88e563570923e83ecf354bd67983b52d3a5ab2f0b43b62
+DIST portmon-2.0.tar.gz 107246 SHA256 b2f2129ff02080e4f828c16617e52141bec3cc5582db5cebed3951418225e816 SHA512 1feafd1a8701d269c2f2e36f46ef51eeda8975aeca85d6f720cf5805e3f8bd031eb681117fa9414e775ea46c543066deb3532e7cc7d26c655daf6163fac77e25 WHIRLPOOL f453f8034581fad4554a8fbcf93a5cd472712cdf96b30c558bd590ef598f63557fdf84b675a481110e6e32565cadb81eba79587376fafb9a50c6dea6e56e2b69
+EBUILD portmon-2.0.ebuild 580 SHA256 864489c139729d718d408b041cbeac4bd7ce6bf58835573d52e7cd6350fbe2ea SHA512 356bb6b49eec3708f2cf2c5ab062cff9d52d7e7d8574bac8cb9a14200b8921495a7679dab388f54ae615068fe6525b8b15d12a92fdb5a9ae74ff60ec73794fdb WHIRLPOOL 05c0fe8486e49d7276477442190e83795fd07081380e907b785742f3931eb981845cc0a117e48e6b4878181d5eb6a9cc6dc102f6f0000ab9a5a8ea7c0041eadb
+MISC ChangeLog 2577 SHA256 05146554eab202c0d96ef939cf29b72807fa212d768b64b4ab776617b967d3bb SHA512 f8ab8e28f616bc79663669057e209cc6acf2d4a49c19f0086733550267943898b9b7c1d03ea266ae7001e5f7c5f2856dfae3a46e3433fe54fb97ce28779acc52 WHIRLPOOL 0566dadb6bdefd5db82c4f0a85b846631e83c79fa817f19a44b4296222bde0cc9f9eb99d017e889c39131a11c91a9a64f5c84ffa5e58d01356089fcf8d3230a4
+MISC ChangeLog-2015 1915 SHA256 493e5a016cab844ae505cb8564cb931c503a0ee6bfd0b9c68546ff001d745621 SHA512 207930bf0e49676e12df63c42c8547150f9e7e8e28a475e54f0f3428db3f84805c944b880c3ece498f884c418328cb74258619a34ccafc9f570a6b5bc5e2f862 WHIRLPOOL c8e6cf3693f1a19a384bd081710599cedade2c791b309edfdcfc4440fe4ea1002a2bda731fbfe38ad5ef9f7046c5819ffe7d39bc7914f7f09b7b61e27f7c9c7c
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/portmon/files/portmon.init b/net-analyzer/portmon/files/portmon.init
new file mode 100644
index 000000000000..3fe1ea6a2819
--- /dev/null
+++ b/net-analyzer/portmon/files/portmon.init
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# configuration is done in /etc/pormon.sh
+
+depend() {
+   need net
+}
+
+checkconfig() {
+	if [ ! -e /etc/portmon/portmon.hosts ]; then
+		error " You need /etc/portmon/portmaon.hosts to run portmon."
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting portmon"
+	start-stop-daemon --start --quiet --exec /usr/sbin/portmon -- -d -c /etc/portmon/portmon.hosts
+	eend $?
+}
+
+stop() {
+	checkconfig || return 1
+	ebegin "Staring portmon"
+	start-stop-daemon --stopt --quiet --exec /usr/sbin/portmon 
+}
diff --git a/net-analyzer/portmon/metadata.xml b/net-analyzer/portmon/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/portmon/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/portmon/portmon-2.0.ebuild b/net-analyzer/portmon/portmon-2.0.ebuild
new file mode 100644
index 000000000000..eb5b845910b8
--- /dev/null
+++ b/net-analyzer/portmon/portmon-2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Portmon is a network service monitoring daemon"
+HOMEPAGE="http://aboleo.net/software/portmon/"
+SRC_URI="${HOMEPAGE}downloads/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+src_configure() {
+	econf --sysconfdir=/etc/portmon
+}
+
+src_install() {
+	into /usr
+	dosbin src/portmon
+
+	doman extras/portmon.8
+
+	insinto /etc/portmon
+	doins extras/portmon.hosts.sample
+	dodoc AUTHORS BUGS README
+
+	newinitd "${FILESDIR}"/portmon.init portmon
+}
diff --git a/net-analyzer/portsentry/Manifest b/net-analyzer/portsentry/Manifest
new file mode 100644
index 000000000000..55b4b539b908
--- /dev/null
+++ b/net-analyzer/portsentry/Manifest
@@ -0,0 +1,13 @@
+AUX portsentry-1.2-conf.patch 649 SHA256 1550b5693445d574142e1c381b57d01c24367c320967320f6a6c5402be7f419b SHA512 b034ff032ba9d61f4dbc9a379b2ca71d691870df0cc4ec069d168a7d47fdf9a409cca32fc5cf9f04d1e1f69ac3695a9bef65a9c1a0c771095d74623b2d0cc92f WHIRLPOOL d7fc504e47035897b56a3f13037b517aa055aae00dc03664f1f5d125483a1ffe42157fab4b15590572fb00e300ea9ad2fca98fdd44e7770c40e0d0ac39dc9d7a
+AUX portsentry-1.2-config.h.patch 403 SHA256 341514e34eac1ec339c99ef0b2123b44038772ecc288c49932af6b07b1308a70 SHA512 7c4b8c0f96a126d1ba88a754867c7e0d717198aad5c641409f99f215e98b91db479f271e27b614364dce1814efe558991d2b06de9e958443d75ab0fe7a62f673 WHIRLPOOL 9d9c1e3fc335673dcc248199c4de5e4057ef76b758cb90d56c44b8d61d78cbefa02c41d093ac012825aa3eb410b9931bb973095219297fdac9655560d184f89a
+AUX portsentry-1.2-gcc.patch 471 SHA256 32065a060e1c0502d6c4f8101db6adf95dc1df51265279590b1c427ddc4be744 SHA512 f0bc3dee493e8fe465f938c7f141e77898c6cb9237c275e2d64aef5dde4286f61b37c2ad8d1f6b7b3ca5836f4b3c5a6ddcd7f6ae4718350fcdc82587a440342a WHIRLPOOL eb4fd1b7f9dd14eb09d5a830c8ad7b3d3d911d7534c3b8dde1d0eece900e967fae51893752dedb93ef98d3db74eb59f3f7d6f4d93b07eb053732846748602968
+AUX portsentry-1.2-ignore.csh.patch 240 SHA256 f3965f66bfcfa9197227f77233b94fad0c66f61096dd738e86ec2eb97527162c SHA512 8367e2967dffb8e16d76177100380893984868a8d147a14fc2eec853dcd21b148acc9f3d76cebe5a1e8fefb6cac6325c9ac8f1585344e464282246ec9b919ae7 WHIRLPOOL ecddd79825cc11c70897f1733e661c074a90d09f9511e01c3d407d313a934c8ce9d25c1fb6bed8984549ef57263446342d168a01d3e4c27ceaefb78a74767765
+AUX portsentry.8 4227 SHA256 17808d97d48d663cc3b3ae9c13f2c514261cb6e017bb48793d963760843cf698 SHA512 95cf13ee1cc9e8d422adf6d43232fe16e1728d5b1280c1e1c07cc01ddfef1854f49d76600426cde5e91d771cd1b1d0cd68a0d82c912de4d7bd001ed29d11b805 WHIRLPOOL c1f71e72ca4b97c3a0473c17988e7a27f8ad2bc8c666ba9221782624a3cee546e5cb2e85d5445a7931b34d13a30ab5df98e07c5419020dd1cff20f577650c81a
+AUX portsentry.conf.5 8385 SHA256 bf56374c8563ade5d975c253e5e9b5b6c5b43f6f9f17395b5fc1cc851d339bc0 SHA512 f91872244be26ba802845b326445904b1e7adc059c90e38883ffbaf6e43ca1c48dd1e0dbe15ef0b194e41a6ded9471bdc70d94dc235bc9310a90baa03e789e1a WHIRLPOOL 4288d003c660715dc6e300c172a8f7015718ce8be1cecffd97376cfdb41eef5920c930f15394c2f1d9bfb6bffcbe04ea521b68ff4164239e7b1adb877dbd5579
+AUX portsentry.confd 361 SHA256 e10504cb2600515abe34df575e88ba2b1135dce3f5c0a5a08558f332884d7bb3 SHA512 a3a7f1f6b74d7d0dd3f33b0f1a787ab013d2aae8b46e41993b4589cf8b75299a18ac2542e67d448edfdcb32e264e5c45e136ef27e039b160da0d77c7e4a2a255 WHIRLPOOL 9b2ed017e88696bb98275e728f2d4f848f64cde4a9b54d246143017bfa5136efed6b9e8e788b4cad34bd393891be5841990666dc9f4f14fa9d02c333f83f1123
+AUX portsentry.rc6 842 SHA256 3f981c51c7b9d666392206052473d0fecd8a7a8a91de0451364c6a38ba8aeac1 SHA512 85695ccf2fee0fb056c3c8e56682787adb808bd7e72450319cc19a88a26f681c1b6aaa90e39d288afaec34904923115ed24884af244fdfe177e82f7def822d7e WHIRLPOOL 5c89d5da94c85ba2ed4534ae35fc460f64e502ffe3aa8a436d39edb60fd9d9d0cffeab3280c0440039af7c7324f72c1257e410f832b3cabd26080c52ff240797
+DIST portsentry-1.2.tar.gz 48054 SHA256 dd1edcfcf2d9db7b5722de4f1da36ae45703bf05917af657ab6f7491be7fa52e SHA512 bcbea576816c654a9e165897ea51de3a4dde2940b05e26e785315fae5a5c7a0f697abfa2ace14d16e687e4a26f37c75cdaffefa1c5f98681f858dda22bcf3dae WHIRLPOOL 109a89bccb034dde0eea9c383aec7ce2dc58be34b5f71ded782e61cb632e20d59f0c5b63493cdb14400d31fe34b57c1f8006b081eb86219e1b44ee28e02d4fff
+EBUILD portsentry-1.2-r1.ebuild 1153 SHA256 e3af9cc7d0fc8c4e8c06db102080e864f18cc8fa5a36e27eccd7d48403ee27d3 SHA512 0706e2636c4ddc0240d63ab3307493714f6e2536ec0063b63210570ea8089787c62929504dd1fb49697e6845ad6d0111a05441f62e506768f52e1d6432d4ff21 WHIRLPOOL 2ec069e4fb3accf1ea6ead2773b34b2b420460aeb843a87ac7cd45646341c070144744a6d21e675459966ca63d2f979684ded82793b40c099d730515b2bddc25
+MISC ChangeLog 2935 SHA256 ae74ba853419567b28f8b4992b3055c5e8167514095a7d467f5fc52ba250e88f SHA512 ed2fbb43cd909054d86f8c8ccbe097f9231efd8fc60b22bf36b059ca20504a6fade828ba420ba466c37c802928d4c32b7df2ac6cfc42cc9169b312ce64d0903e WHIRLPOOL 8abb2b3ce8d30b99532ca12712348a895cd4269215d9c12e2985a27e7f772a6da73821d5f11071fd3c39096fdfd8c290ce66a2a85e9c97fb04d180aa1d2637e9
+MISC ChangeLog-2015 4051 SHA256 c605040e5916582d12eac7664b259a896154b82b5c923a5254ec9e743088f025 SHA512 ce81554aa4cf1431ffd9b15d3eceebf3fadc197ee0ec3f890a7e214f0faf93fdc1a5d60aedb6d83fe9472d75bc40ba365eb3d7810c871f81bc59efb0ea155287 WHIRLPOOL 653e96b96a4fff20c0cd35f805415cbe75beb851496c0b002dffac1c3014cbc49c60a86783dcf2476b670b767075c68a245c7aecf8c7960d28dabba10e75ec56
+MISC metadata.xml 361 SHA256 4c9a7fd2e95cc349c18291a63284ed77d4ae0dacac17e9ead47b99c7de912d7d SHA512 91dd94a52a85cf7d62f5ae1ccb5783b3c7c3b4ad513c1a2c9324bb3b79116504d1a59039d85c0c2adef55a9fe3ace9b533ce97f677c38cf19846e98c5df4abfb WHIRLPOOL 8841ec40e03aaeb0e1b8276f26a4b95d886cbc5c69e47173af5c8ad6630ab7f817748f1444e54ed1cb04252d3258e279bfcdb939a43a3d535922757f19548890
diff --git a/net-analyzer/portsentry/files/portsentry-1.2-conf.patch b/net-analyzer/portsentry/files/portsentry-1.2-conf.patch
new file mode 100644
index 000000000000..54f78fb467bc
--- /dev/null
+++ b/net-analyzer/portsentry/files/portsentry-1.2-conf.patch
@@ -0,0 +1,17 @@
+--- a/portsentry.conf
++++ b/portsentry.conf
+@@ -80,11 +80,11 @@
+ ######################
+ #
+ # Hosts to ignore
+-IGNORE_FILE="/usr/local/psionic/portsentry/portsentry.ignore"
++IGNORE_FILE="/etc/portsentry/portsentry.ignore"
+ # Hosts that have been denied (running history)
+-HISTORY_FILE="/usr/local/psionic/portsentry/portsentry.history"
++HISTORY_FILE="/etc/portsentry/portsentry.history"
+ # Hosts that have been denied this session only (temporary until next restart)
+-BLOCKED_FILE="/usr/local/psionic/portsentry/portsentry.blocked"
++BLOCKED_FILE="/etc/portsentry/portsentry.blocked"
+ 
+ ##############################
+ # Misc. Configuration Options#
diff --git a/net-analyzer/portsentry/files/portsentry-1.2-config.h.patch b/net-analyzer/portsentry/files/portsentry-1.2-config.h.patch
new file mode 100644
index 000000000000..28c02b85e5af
--- /dev/null
+++ b/net-analyzer/portsentry/files/portsentry-1.2-config.h.patch
@@ -0,0 +1,11 @@
+--- a/portsentry_config.h
++++ b/portsentry_config.h
+@@ -22,7 +22,7 @@
+ 
+ /* These are probably ok. Be sure you change the Makefile if you */
+ /* change the path */
+-#define CONFIG_FILE "/usr/local/psionic/portsentry/portsentry.conf"
++#define CONFIG_FILE "/etc/portsentry/portsentry.conf"
+ 
+ /* The location of Wietse Venema's TCP Wrapper hosts.deny file */
+ #define WRAPPER_HOSTS_DENY "/etc/hosts.deny"
diff --git a/net-analyzer/portsentry/files/portsentry-1.2-gcc.patch b/net-analyzer/portsentry/files/portsentry-1.2-gcc.patch
new file mode 100644
index 000000000000..613808fe7225
--- /dev/null
+++ b/net-analyzer/portsentry/files/portsentry-1.2-gcc.patch
@@ -0,0 +1,12 @@
+--- a/portsentry.c
++++ b/portsentry.c
+@@ -1581,8 +1581,7 @@
+ Usage (void)
+ {
+   printf ("PortSentry - Port Scan Detector.\n");
+-  printf ("Copyright 1997-2003 Craig H. Rowland <craigrowland at users dot 
+-sourceforget dot net>\n");
++  printf ("Copyright 1997-2003 Craig H. Rowland <craigrowland at users dot sourceforget dot net>\n");
+   printf ("Licensing restrictions apply. Please see documentation\n");
+   printf ("Version: %s\n\n", VERSION);
+ #ifdef SUPPORT_STEALTH
diff --git a/net-analyzer/portsentry/files/portsentry-1.2-ignore.csh.patch b/net-analyzer/portsentry/files/portsentry-1.2-ignore.csh.patch
new file mode 100644
index 000000000000..ec45dd1daac7
--- /dev/null
+++ b/net-analyzer/portsentry/files/portsentry-1.2-ignore.csh.patch
@@ -0,0 +1,11 @@
+--- a/ignore.csh
++++ b/ignore.csh
+@@ -35,7 +35,7 @@
+ endif
+   
+ # Safe directory 
+-set SENTRYDIR=/usr/local/psionic/portsentry
++set SENTRYDIR=/etc/portsentry
+ set TMPFILE=portsentry.ignore.tmp
+  
+ if (-f $SENTRYDIR/portsentry.ignore) then 
diff --git a/net-analyzer/portsentry/files/portsentry.8 b/net-analyzer/portsentry/files/portsentry.8
new file mode 100644
index 000000000000..7c9d6a617262
--- /dev/null
+++ b/net-analyzer/portsentry/files/portsentry.8
@@ -0,0 +1,151 @@
+.TH PORTSENTRY 8
+.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
+.\" other parms are allowed: see man(7), man(1)
+.SH NAME
+portsentry \- detect portscan activity
+.SH SYNOPSIS
+.B portsentry
+.I "[ \-tcp | \-stcp | \-atcp ]"
+.br
+.B portsentry
+.I "[ \-udp | \-sudp | \-audp ]"
+.SH "DESCRIPTION"
+This manual page documents briefly the
+.BR portsentry
+command.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+.B portsentry
+is a program that tries to detect portscans on network interfaces with the ability to detect stealth scans. On alarm portsentry can block the scanning machine via hosts.deny (see
+.BR hosts_access (5),
+firewall rule (see
+.BR ipfwadm (8) ,
+.BR ipchains (8)
+and
+.BR iptables (8))
+or dropped route (see
+.BR route (8)).
+.SH OPTIONS
+For details on the various modes see
+.I /usr/doc/portsentry/README.install
+.
+.TP
+.B \-tcp
+tcp portscan detection on ports specified under 
+.I TCP_PORTS 
+in the config file 
+.IR /etc/portsentry/portsentry.conf . 
+.TP
+.B \-stcp
+As above but additionally detect stealth scans.
+.TP
+.B \-atcp
+Advanced tcp or inverse mode. Portsentry binds to all unused ports below 
+.I ADVANCED_PORTS_TCP 
+given in the config file
+.IR /etc/portsentry/portsentry.conf .
+
+.TP
+.B \-udp
+udp portscan detection on ports specified under
+.I UDP_PORTS
+in the config file
+.IR /etc/portsentry/portsentry.conf .
+.TP
+.B \-sudp
+As above but additionally detect "stealth" scans.
+.TP
+.B \-audp
+Advanced udp or inverse mode. Portsentry binds to all unused ports below 
+.I ADVANCED_PORTS_UDP 
+given in the config file
+.IR /etc/portsentry/portsentry.conf .
+
+.SH "CONFIGURATION FILES"
+.B portsentry
+keeps all its configuration files in 
+.BR /etc/portsentry. 
+.B portsentry.conf 
+is
+.BR portsentry 's
+main configuration file. See 
+.BR portsentry.conf (5) 
+for details.
+
+The file 
+.BR portsentry.ignore
+contains a list of all hosts that are ignored, if they connect to a tripwired
+port. It should contain at least the localhost(127.0.0.1), 0.0.0.0 and the IP addresses of all local interfaces. You can ignore whole subnets by using a notation <IP Address>/<Netmask Bits>. It is  *not* recommend putting in every machine IP on your network. It may be important for you to see who is connecting to you, even if it is a "friendly" machine. This can help you detect internal host compromises faster.
+
+If you use the
+.IR /etc/init.d/portsentry
+script to start the daemon,
+.BR portsentry.ignore
+is rebuild on each start of the daemon using 
+.BR portsentry.ignore.static
+and all the IP addresses found on the machine via
+.BR ifconfig .
+
+.BR /etc/default/portsenty 
+specifies in which protocol modes
+.B portsentry 
+should be startet from
+.IR /etc/init.d/portsentry 
+There are currently two options:
+.TP
+.B TCP_MODE=
+either
+.BR tcp ", " stcp " or " atcp " (see " OPTIONS " above)."
+.TP
+.B UDP_MODE=
+either
+.BR udp ", " sudp " or " audp " (see " OPTIONS " above)."
+
+.PP
+The options above correspond to portsentry's commandline arguments. For example
+.B TCP_MODE="atcp"
+has the same effect as to start portsentry using
+.BR portsentry " " -atcp.
+Only one mode per protocol can be started at a time (i.e. one tcp and one udp mode).
+
+.SH "FILES"
+.BR /etc/portsentry/portsentry.conf
+main configuration file
+.TP
+.BR /etc/portsentry/portsentry.ignore
+IP addresses to ignore
+.TP
+.BR /etc/portsentry/portsentry.ignore.static
+static IP addresses to ignore
+.TP
+.BR /etc/default/portsentry
+startup options
+.TP
+.BR /etc/init.d/portsentry
+script responsible for starting and stopping the daemon
+.TP
+.BR /var/lib/portsentry/portsentry.blocked.*
+blocked hosts(cleared upon reload)
+.TP
+.BR /var/lib/portsentry/portsentry.history
+history file
+.LP
+.SH "SEE ALSO"
+.BR portsentry.conf(5),
+.BR hosts_access(5),
+.BR hosts_options(5),
+.BR route(8),
+.BR ipfwadm(8),
+.BR ipchains(8),
+.BR iptables(8),
+.BR ifconfig(8)
+
+.BR /usr/share/doc/portsentry/README.install
+.LP
+.SH AUTHOR
+.B portsentry
+was written by Craig H. Howland
+.B <crowland@users.sf.net>.
+
+This manual page was stitched together by Guido Guenther <agx@debian.org>, for the Debian GNU/Linux system (but may be used by others). Some parts are just a cut and paste from the original documentation.
diff --git a/net-analyzer/portsentry/files/portsentry.conf.5 b/net-analyzer/portsentry/files/portsentry.conf.5
new file mode 100644
index 000000000000..314e2abb2a44
--- /dev/null
+++ b/net-analyzer/portsentry/files/portsentry.conf.5
@@ -0,0 +1,217 @@
+.TH PORTSENTRY.CONF 5 
+.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
+.\" other parms are allowed: see man(7), man(1)
+.SH NAME
+portsentry.conf \- portsentry´s main configuration file
+.SH "DESCRIPTION"
+This manual page documents briefly the format of
+.BR portsentry ´s(8)
+configuration file.
+.SH OPTIONS
+.TP
+.B TCP_PORTS
+A comma delimited string of TCP ports you want PortSentry to
+listen to. This string can NOT have any spaces in it. You can put in as
+many sockets as you want. PortSentry will try to bind them all up until
+the default limit of 64.
+
+For the stealth scan detection modes, the ports are not "bound" per se, 
+but they are monitored at the socket level for connections. 
+
+For the Advanced Stealth Scan Detection (see below) this list is *ignored*
+.TP
+.B UDP_PORTS 
+The same as above, except for UDP ports. You need to be
+very careful with UDP mode as an attacker can forge a port sweep and
+make you block any number of hosts. Use this option with caution, or 
+not at all if your host is a well-known Internet connected system.
+
+For the Advanced Stealth Scan Detection (see below) this list is *ignored*
+
+.TP
+.B ADVANCED_PORTS_TCP 
+A number indicating the highest port number to
+monitor down from. Any port *below* this number is then monitored. The
+default is 1024 (reserved port range), but can be made as large as 65535
+(system max). I don't recommend going over 1024 with this option. 
+
+.TP
+.B ADVANCED_PORTS_UDP 
+Same as above, except for UDP.
+
+.TP
+.B ADVANCED_EXCLUDE_TCP 
+A comma delimited string of TCP ports that should
+be manually excluded from monitoring in Advanced mode. These are normally
+ports that may get hit by mistake by remote clients and shouldn't cause
+alarms (ident, SSL, etc).
+
+.TP
+.B ADVANCED_EXCLUDE_UDP 
+Same as above, except for UDP.
+
+.TP
+.B IGNORE_FILE 
+The path to the file that contains IP addresses of hosts you
+want to always be ignored.
+
+.TP
+.B BLOCKED_FILE 
+The path to the file that contains the IP addresses of
+blocked hosts.
+
+.TP
+.B RESOLVE_HOST - This option turns off DNS resolution for 
+hosts. If you have a slow DNS server it may be more effective 
+to turn off resolution. 
+
+.TP 
+.B BLOCK_UDP 
+This option disables all automatic responses to UDP probes.
+Because UDP can be easily forged, it may allow an attacker to start a
+denial of service attack against the protected host, causing it to block
+all manner of hosts that should normally be left alone. Setting this option
+to "0" will disable all responses, although the connects are still logged.
+This option is mainly useful for Internet exposed hosts. For internal hosts
+you should leave this enabled. If someone internally is firing spoofed
+packets at you, then you have a much bigger problem than a denial of service.
+
+.TP 
+.B BLOCK_TCP 
+Same as above, but for TCP. Packet forgery is not as big a problem
+though because PortSentry waits for a full connect to occur and this is much
+harder to forge in the basic modes. Leave this enabled, even for 
+Internet connected hosts. For stealth scan detection modes the UDP warning 
+applies:
+
+	An attacker can cause you to block hosts you don't want to
+	through packet forgery. I wouldn't worry about this until it is a
+	problem, but you should be aware of it.
+
+.TP 
+.B KILL_ROUTE 
+This is the command to run to drop the offending route(see
+.BR route (8))
+if an attack is detected. This is the *full path* to the route command
+along with the necessary parameters to make the command work. The macro
+.B $TARGET$ 
+will be substituted with the attacking host IP and is
+REQUIRED in this option. Your gateway should be a *dead host* on the 
+local subnet. On some systems though you can just put in the localhost
+address (127.0.0.1) and this will probably work. All packets from the 
+target host will get routed to this address so don't mess this up.
+More modern route commands will include a "-blackhole" or "-reject" flag.
+Check your man(1) pages and if your route command supports this feature
+you should use it (although we recommend using packet filtering
+instead, see below).
+
+Also be aware that this creates what is known as an "asynchronous
+route" which basically means packets enter your host via one route
+and are sent out on another (dead) route. This works OK for full
+TCP connect requests, but for UDP and stealth scan modes it
+still allows packets to activate PortSentry and you may get a 
+series of "already blocked" alarms by PortSentry. For UDP scans
+this method prevents ICMP messages from returning to the attacker
+so all ports appear open. However, if the attacker is performing
+an actual exploit with UDP the drop route method will not work. 
+The asynchronous route allows the packet to hit the system and the
+attacker could perform a "blind" attack with UDP if they know what
+the responses are going to be. 
+
+By far the best method is to use the local packet filter (see
+.BR ipfwadm (8),
+.BR ipchains (8),
+or
+.BR iptables (8)).
+This is a much cleaner solution and is
+detailed in the config file. The macro 
+.B $PORT$ 
+will substitute the port 
+that was connected to by the attacker, but this is NOT required for this
+option. The macro $MODE$ reports what mode the blocking occurred in
+(tcp, udp, stcp, sudp, atcp, audp) but is also NOT required.
+
+.TP
+.B KILL_HOSTS_DENY 
+This is the format of the string to drop into the
+hosts.deny file that TCP wrappers uses(see
+.BR hosts_access (5),
+and
+.BR hosts_options (5)).
+Again the 
+.B $TARGET$ 
+macro is
+expanded out to be the IP of the attacker and is required. You can
+also drop in any TCP wrapper escape codes here as well (%h, twist, 
+etc). The macro 
+.B $PORT$ 
+will substitute the port that was connected to 
+by the attacker, but this is NOT required for this option.
+The macro $MODE$ reports what mode the blocking occurred in 
+(tcp, udp, stcp, sudp, atcp, audp) but is also NOT required.
+
+.TP 
+.B KILL_RUN_CMD 
+This is a command you want run *before* the route
+is dropped to the attacker. You can put in any program/script you want
+executed when an attack is detected. WE NEVER RECOMMEND PUTTING IN
+RETALIATORY ACTION AGAINST AN ATTACKING HOST. Virtually every time you're
+are port scanned the host doing the scanning has been compromised itself.
+Therefore, if you retaliate you are probably attacking an innocent(?)
+party. Also the goal of security is to make the person GO AWAY. You don't
+want to irritate them into making a personal vendetta against you.
+Remember, even a 13 year old can run a [insert favorite D.O.S. program 
+here] attack against you from their Windows box to make your life
+miserable. As above, the 
+.BR $TARGET$ ,
+.B $PORT$ 
+and 
+.B $MODE$
+macros are available to you but they are not required with this option as above.
+
+.TP
+.B KILL_RUN_CMD_FIRST 
+Setting this to "1" makes the command above run before the route is
+dropped. Setting it to "0" makes the command run aftter the blocking
+has occurred.
+
+.TP
+.B SCAN_TRIGGER 
+PortSentry has a state engine that will remember hosts
+that connected to it. Setting this value will tell PortSentry to allow X
+number of grace port hits before it reacts. This will detect both
+sequential and random port sweeps. The default is 0 which will react
+immediately. A setting of 1 or 2 will reduce false alarms, anything
+higher is probably too much as anything more than 3 hits to different
+ports is pretty suspicious behavior. Usually you can leave this at 0
+without any consequence, with the exception of Advanced stealth scan 
+detection modes where you may create a "hair trigger" if you aren't 
+careful. Use your own discretion.
+
+.TP
+.B PORT_BANNER 
+A text banner you want displayed to the connecting host if
+the PortSentry is activated. Leave this commented out if you don't want this
+feature. If you do use it, try not to taunt the person too badly. We
+recommend keeping it professional and to the point. The banner is *not*
+displayed when stealth scan detection modes are used.
+
+.LP
+.SH "SEE ALSO"
+.BR portsentry(8),
+.BR hosts_access(5),
+.BR hosts_options(5),
+.BR route(8),
+.BR ipfwadm(8),
+.BR ipchains(8)
+
+.BR /usr/share/doc/portsentry/README.install
+.LP
+.SH AUTHOR
+.B portsentry
+was written by Craig H. Howland
+.B <crowland@users.sf.net>.
+
+This manual page is essentially just a "cut and paste" from the README.install file and was done by Guido Guenther <agx@debian.org>(hopefully without adding too many errors), for the Debian GNU/Linux system (but may be used by others).
+
+
diff --git a/net-analyzer/portsentry/files/portsentry.confd b/net-analyzer/portsentry/files/portsentry.confd
new file mode 100644
index 000000000000..49729516ef7c
--- /dev/null
+++ b/net-analyzer/portsentry/files/portsentry.confd
@@ -0,0 +1,12 @@
+# Config file for /etc/init.d/portsentry
+#
+# This file is read by /etc/init.d/portsentry. See the portsentry.8
+# manpage for details.
+#
+# The options in this file refer to commandline arguments (all in lowercase)
+# of portsentry. Use only one tcp and udp mode at a time.
+#
+
+#PORTSENTRY_MODES="udp tcp"
+#PORTSENTRY_MODES="stcp sudp"
+#PORTSENTRY_MODES="atcp audp"
\ No newline at end of file
diff --git a/net-analyzer/portsentry/files/portsentry.rc6 b/net-analyzer/portsentry/files/portsentry.rc6
new file mode 100644
index 000000000000..1d89be401ada
--- /dev/null
+++ b/net-analyzer/portsentry/files/portsentry.rc6
@@ -0,0 +1,38 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# NB: Config is in /etc/conf.d/portsentry
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ ! -e /etc/portsentry/portsentry.conf ] ; then
+		eerror "You need an /etc/portsentry/portsentry.conf file"
+		eerror "There is  a  sample in /usr/share/doc/portsentry"
+		return 1
+	fi
+	if [ -z "$PORTSENTRY_MODES" ] ; then
+		eerror "You need to setup your PORTSENTRY_MODES first"
+		eerror "Check /etc/conf.d/portsentry that you've enabled some or all of them"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting portsentry"
+	for mode in $PORTSENTRY_MODES ; do
+		/usr/bin/portsentry -$mode
+		result=$(( $result + $? ))
+	done
+	eend $result
+}
+
+stop() {
+	ebegin "Stopping portsentry"
+	killall portsentry
+	eend $?
+}
diff --git a/net-analyzer/portsentry/metadata.xml b/net-analyzer/portsentry/metadata.xml
new file mode 100644
index 000000000000..99bfe72a50cf
--- /dev/null
+++ b/net-analyzer/portsentry/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">sentrytools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/portsentry/portsentry-1.2-r1.ebuild b/net-analyzer/portsentry/portsentry-1.2-r1.ebuild
new file mode 100644
index 000000000000..29e14b375300
--- /dev/null
+++ b/net-analyzer/portsentry/portsentry-1.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Automated port scan detector and response tool"
+# Seems like CISCO took the site down?
+HOMEPAGE="https://sourceforge.net/projects/sentrytools/"
+SRC_URI="mirror://sourceforge/sentrytools/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86"
+
+S="${WORKDIR}"/${PN}_beta
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-conf.patch
+	epatch "${FILESDIR}"/${P}-config.h.patch
+	epatch "${FILESDIR}"/${P}-gcc.patch
+	epatch "${FILESDIR}"/${P}-ignore.csh.patch
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS} ${LDFLAGS}" linux
+}
+
+src_install() {
+	doman "${FILESDIR}"/{portsentry.8,portsentry.conf.5}
+
+	dobin portsentry ignore.csh
+	dodoc README* CHANGES CREDITS
+	newdoc portsentry.ignore portsentry.ignore.sample
+	newdoc portsentry.conf portsentry.conf.sample
+
+	insinto /etc/portsentry
+	newins portsentry.ignore portsentry.ignore.sample
+	newins portsentry.conf portsentry.conf.sample
+
+	newinitd "${FILESDIR}"/portsentry.rc6 portsentry
+	newconfd "${FILESDIR}"/portsentry.confd portsentry
+}
diff --git a/net-analyzer/postal/Manifest b/net-analyzer/postal/Manifest
new file mode 100644
index 000000000000..fce100b48a42
--- /dev/null
+++ b/net-analyzer/postal/Manifest
@@ -0,0 +1,11 @@
+AUX 01_postal-0.70-gcc43.patch 268 SHA256 6e952639dfbb641f5367daec44c7a38e902b061239e2d5de578333b8b6bfc46a SHA512 6d2b6c4a947af4fe7c40315c42a5304bff0ff092016a37c2473a33d1f6e0fb39e527ec028802dc221d5993b50be6b2bd427e69820a20048d5861b1a5840085e6 WHIRLPOOL 3cd67110462d4faeb926c779d345153cdb7fdbd09ea0394cb7123d3526cb3453cad6ca82e8e2c13ffd70646190a0c03805e0031802c05f7ea67f14a38ba5a50d
+AUX 02_postal-0.72-nossl.patch 1905 SHA256 bd9befe311d72ddf027b1ae2ece4ce33747b8883fe7c86dc244f84f7252369d0 SHA512 22a1a3f2300f3da2f79325203889d8bb924721115762935f130d4d93617efba1e4058f57860aa78b16714ebc475f6654d1cfeddf5f93ae140d5e9ecda7d6ef65 WHIRLPOOL 739843838382c3e34a1152ffb0310017669aa879d91be446075ed85cb12229c814bd12c8af29448b7b9bff5e7858334cea41304bd48f1e507d2ad281bf354d17
+AUX 03_postal-0.70-c++0x-integrated.patch 7118 SHA256 687341a58889402a0681d0630b1a7ef2380129af34a431c5358fe454cb0e37ed SHA512 a52675f8951256a37cd54e9993f3377cc23ce80ef7fe94c93289e31b7b2aabaf3619b3cb099b1647cb6f01fad783ba47bce7160ac4ee896a7075a3d77008ef65 WHIRLPOOL c229b06134159187804e498e843e3b51a5f5538a116a6000b44c1f46ea4b8cb791760d284a7875e29eb6ff7acb4c6c78a1c38a85fbb3d249982af65bfbe77884
+AUX 04_postal-0.70-warnings.patch 445 SHA256 369b174bc39454cd6ca854cb05d403a56f739a1ab341a22bd2192a73e43791d1 SHA512 14c933f3a998a2dff7e2acc2970369e59509ac79684772da9da1747eda0065c5669cdfe21820883a2b103678d6b85278f9d330c051fc801a719d7e0e7f922422 WHIRLPOOL 4484b0f9efe64433c69a951f7a33f0e0609fd17df40b3c269b2b93a0179b592221ed0567592877f3923d921cf661a497caa96393c893544a68d768c0d6977ea2
+AUX 05_postal-0.70-openssl-1.patch 529 SHA256 552d803986a8adba0f7b88337ba215b41eb0c14a6f61f93e88821dfdb5269b54 SHA512 a1faba251a5939a9f0258c5689e3dc82553e4f66a4c288bca1b30ec5db10ebd912214cf03209035e37aa5dba92a4300b105c28af7f6db24a8f5bbd2b9b537c6d WHIRLPOOL 902f3b2a9ccc8484ef3942427124f825330c457b2204c0b552b2a5cdc84e72f89323674d0c966d0ac7801b3017e1ae10e48241cde761182ebab08bd69fb15edf
+AUX 06_postal-0.70-ldflags.patch 1276 SHA256 63c3ba423c1de13ae3db7d0fa6bd3fb54fc9c1327fe22e9d241febda836a2c60 SHA512 aa509bcc917d0b9c83faf00f9625681f6a394d91260aa304692916a90318e67d03009acbd48cb4fcf7ff0baf0578d70363125b172b1117ec0691d9bd32aa47c1 WHIRLPOOL 12a97d66af855699c2990c11756748e77bb3ce90424c01ae6975a6fccf1ed49dbb5d252cf104ef949d985a60adf5ab3998486614ba92e01b8bfc9e1e026001b7
+DIST postal-0.72.tgz 106720 SHA256 70d59adf8ab006a6ea389d8f276a265de743330458f5c1affb97d86bb0663bad SHA512 858d5a3ec452e868d6026d631d59260eab83e90c64ce185bf9c6cecd3494c591ba7cb1455f35a5f003acbbe33f4974669e6820750e4d4ce9432d72b350263c99 WHIRLPOOL 0471f8fe141a089df277ce231d373032459376540ade78ddddfb48cc6dcdae1769e72f144d4f41526b74669acb2a8c80ca9bd127f1c773ea90dca2c6a5ae580f
+EBUILD postal-0.72.ebuild 1080 SHA256 e829326121357cd1c785027446bdcd7adc0a0b48495bb536e4153efaa3ad6fbc SHA512 fe97e6ed80997f90e539049189443933f49eaf3c70ff0f7272b523008ed7ded1c91ef00bb19a9e27fad66d21d2d1a0435c44dde1af108190facf0713d64b917c WHIRLPOOL f1d6351b41a56ade6056838dc41293c2e6b48d2d59effb78d9872a0db6648cdef98d1a7258d02c8f8559e1823d9df941b0217810abe05f3ea5968b8dc31f417c
+MISC ChangeLog 2699 SHA256 4235b543f1c6a6d56cb08fb27774ff960ef720f09d892e0c13127607e847c6b2 SHA512 e166d00bfa720a0cee4f7c850fcfadd8b123e50da9fda035e1a44f7528ca1689e953485836e2e6e39d6810df6a0dea1722c7e4ccf3c5beec67d8625258d582c9 WHIRLPOOL daf6f69a9cc30a8da83bc6ce631ed3e1eaa6a0daa7c067c87da472f8c156705207bcfbe98229ff74661d112a6bfb182b8c318316c08deaf96ca6877cdf3ccbb7
+MISC ChangeLog-2015 1966 SHA256 19fe6c6e7f1b31151786823619bfea7df4f19351eaf2275680ece4a7a520a7e2 SHA512 0cbbb9370623f79c97c5a64d2976636a616cc2edd3b06b4b1866ea38354464074afeaca3a526468bd1875a237b143e7826d483356d57bb91f83532dacff11dc4 WHIRLPOOL 7c0c0c772f8dba2b14db155046202d3cd938a29444457c1c0bf5180e059b95be09d2e02e02741faf1ad710831c80c5ee5a2a5b9d31a6b9644df5a019956919e6
+MISC metadata.xml 244 SHA256 856e819659934229aa18649e0c783b9714fa33065cb5113e7b667ed68392b39a SHA512 0e856f808459b6d83c6eaeee418d87d85385968a39e6c1871a0eb76c04b533bbba16996a6f18613b7c550da90c76843bd01237be9b9f290394048e904535653c WHIRLPOOL 2aa292ef66863766df8920a2ebd497218854f9a41724cdef1d63a93c94620fbea641a688af2bb374673773dd5b1b8afff80867c974f49d5600991ab44f9b8752
diff --git a/net-analyzer/postal/files/01_postal-0.70-gcc43.patch b/net-analyzer/postal/files/01_postal-0.70-gcc43.patch
new file mode 100644
index 000000000000..fe577603ad3d
--- /dev/null
+++ b/net-analyzer/postal/files/01_postal-0.70-gcc43.patch
@@ -0,0 +1,11 @@
+--- rabid.cpp.orig	2008-06-15 14:05:19.776258513 +0200
++++ rabid.cpp	2008-06-15 14:05:47.927250506 +0200
+@@ -12,6 +12,8 @@
+ #include <strings.h>
+ #include "postal.h"
+ #include "logit.h"
++#include <cstring>
++
+ #ifdef USE_GNUTLS
+ #include <errno.h>
+ #include <gcrypt.h>
diff --git a/net-analyzer/postal/files/02_postal-0.72-nossl.patch b/net-analyzer/postal/files/02_postal-0.72-nossl.patch
new file mode 100644
index 000000000000..238dbdbb783d
--- /dev/null
+++ b/net-analyzer/postal/files/02_postal-0.72-nossl.patch
@@ -0,0 +1,72 @@
+diff -NrU5 postal-0.69.orig/configure.in postal-0.69/configure.in
+--- configure.in	2008-04-09 03:08:28.000000000 +0200
++++ configure.in	2008-04-23 22:37:41.000000000 +0200
+@@ -13,15 +13,28 @@
+ else
+   stripping="-s"
+ fi
+ 
+ AC_ARG_ENABLE(openssl,
+-      [  --disable-openssl  disables openssl support],
+-      DISABLEOPENSSL=$opensslval, DISABLEOPENSSL=no)
++	[  --disable-openssl	disable openssl support],
++	[ if test $enableval = yes; then
++		DISABLEOPENSSL=no
++	else
++		DISABLEOPENSSL=yes
++	fi ]
++	,
++	[ DISABLEOPENSSL=no ])
++
+ AC_ARG_ENABLE(gnutls,
+-      [  --disable-gnutls  disables gnutls support],
+-      DISABLEGNUTLS=$gnutlsval, DISABLEGNUTLS=no)
++	[  --disable-gnutls  disables gnutls support],
++	[if test $enableval = yes; then
++		DISABLEGNUTLS=no
++	else
++		DISABLEGNUTLS=yes
++	fi]	
++	,
++	[ DISABLEGNUTLS=no ])
+ 
+ dnl Checks for programs.
+ AC_LANG_CPLUSPLUS
+ AC_PROG_CC
+ AC_PROG_CXX
+@@ -118,17 +131,17 @@
+ crypt_ldflags=
+ if [[ "$GNUTLS" = "no" ]]; then
+   gnutls=""
+ else
+   gnutls="#define USE_GNUTLS"
+-  crypt_ldflags="$extra_ldflags -lgnutls -lgcrypt"
++  crypt_ldflags=" -lgnutls -lgcrypt"
+ fi
+ if [[ "$OPENSSL" = "no" ]]; then
+   openssl=""
+ else
+   openssl="#define USE_OPENSSL"
+-  crypt_ldflags="$extra_ldflags -lssl -lcrypto"
++  crypt_ldflags=" -lssl -lcrypto"
+ fi
+ 
+ AC_SUBST(large_file)
+ large_file=""
+ 
+diff -NrU5 postal-0.69.orig/Makefile.in postal-0.69/Makefile.in
+--- Makefile.in	2008-04-10 03:19:34.000000000 +0200
++++ Makefile.in	2008-04-23 22:37:13.000000000 +0200
+@@ -16,11 +16,11 @@
+ INSTALL=@INSTALL@
+ 
+ TESTEXE=ex-test
+ BASEOBJS=userlist.o thread.o results.o address.o tcp.o cmd5.o mutex.o logit.o expand.o @extra_objs@
+ LFLAGS=-lstdc++ @extra_ldflags@
+-CRYPTLFLAGS=-lstdc++ @crypt_ldflags@
++CRYPTLFLAGS=-lstdc++ @extra_ldflags@  @crypt_ldflags@ 
+ 
+ 
+ ALLOBJS=$(BASEOBJS) smtp.o client.o basictcp.o bhmusers.o smtpserver.o
+ 
+ postal: postal.cpp $(BASEOBJS) postal.h smtp.o
diff --git a/net-analyzer/postal/files/03_postal-0.70-c++0x-integrated.patch b/net-analyzer/postal/files/03_postal-0.70-c++0x-integrated.patch
new file mode 100644
index 000000000000..9ad6a036dcda
--- /dev/null
+++ b/net-analyzer/postal/files/03_postal-0.70-c++0x-integrated.patch
@@ -0,0 +1,270 @@
+diff -NrU5 postal-0.69.orig/bhm.cpp postal-0.69/bhm.cpp
+--- postal-0.69.orig/bhm.cpp	2008-04-23 22:39:01.000000000 +0200
++++ postal-0.69/bhm.cpp	2008-04-24 01:31:54.000000000 +0200
+@@ -7,10 +7,11 @@
+ #include <ctype.h>
+ #include <unistd.h>
+ #include <sys/wait.h>
+ #include <signal.h>
+ #include <stdio.h>
++#include <cstdlib>
+ #include <sys/poll.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+ #include <netinet/ip.h>
+diff -NrU5 postal-0.69.orig/bhmusers.cpp postal-0.69/bhmusers.cpp
+--- postal-0.69.orig/bhmusers.cpp	2008-04-10 03:36:27.000000000 +0200
++++ postal-0.69/bhmusers.cpp	2008-04-24 00:04:07.000000000 +0200
+@@ -1,9 +1,10 @@
+ #include "bhmusers.h"
+ #include <stdio.h>
+ #include <cstring>
+ #include "expand.h"
++#include <cstdlib>
+ 
+ BHMUsers::BHMUsers(const char *userListFile)
+ {
+   char buf[1024];
+   FILE *fp = fopen(userListFile, "r");
+diff -NrU5 postal-0.69.orig/bhmusers.h postal-0.69/bhmusers.h
+--- postal-0.69.orig/bhmusers.h	2006-09-28 17:20:28.000000000 +0200
++++ postal-0.69/bhmusers.h	2008-04-24 00:14:05.000000000 +0200
+@@ -4,16 +4,21 @@
+ using namespace std;
+ 
+ #include <string>
+ #include "conf.h"
+ 
++#ifdef HAVE_STDCXX_0X
++#include <unordered_map>
++#include <tr1/functional_hash.h>
++#else
+ #ifdef HAVE_EXT_HASH_MAP
+ using namespace __gnu_cxx;
+ #include <ext/hash_map>
+ #else
+ #include <hash_map.h>
+ #endif
++#endif
+ 
+ #include "postal.h"
+ 
+ typedef enum { eNone = 0, eDefer, eReject, eBounce, eGrey } USER_SMTP_ACTION;
+ 
+@@ -21,10 +26,13 @@
+ {
+   USER_SMTP_ACTION action;
+   int sync_time;
+ } BHM_DATA;
+ 
++#ifdef HAVE_STDCXX_0X
++typedef unordered_map<string, BHM_DATA , hash<string> > NAME_MAP;
++#else
+ namespace __gnu_cxx
+ {
+   template<> struct hash< std::string >
+   {
+     size_t operator() ( const std::string &x ) const
+@@ -33,10 +41,11 @@
+     }
+   };
+ }
+ 
+ typedef hash_map<string, BHM_DATA , hash<string> > NAME_MAP;
++#endif
+ 
+ class BHMUsers
+ {
+ public:
+   BHMUsers(const char *userListFile);
+diff -NrU5 postal-0.69.orig/configure.in postal-0.69/configure.in
+--- postal-0.69.orig/configure.in	2008-04-23 22:39:01.000000000 +0200
++++ postal-0.69/configure.in	2008-04-24 01:20:35.000000000 +0200
+@@ -155,6 +155,98 @@
+ 
+ AC_CHECK_HEADERS(vector ext/hash_map)
+ 
+ dnl Checks for library functions.
+ 
++AC_DEFUN([AC_COMPILE_STDCXX_0X], [
++  AC_CACHE_CHECK(if g++ supports C++0x features without additional flags,
++  ac_cv_cxx_compile_cxx0x_native,
++  [AC_LANG_SAVE
++  AC_LANG_CPLUSPLUS
++  AC_TRY_COMPILE([
++  template <typename T>
++    struct check 
++    {
++      static_assert(sizeof(int) <= sizeof(T), "not big enough");
++    };
++
++    typedef check<check<bool>> right_angle_brackets;
++
++    int a;
++    decltype(a) b;
++
++    typedef check<int> check_type;
++    check_type c;
++    check_type&& cr = c;],,
++  ac_cv_cxx_compile_cxx0x_native=yes, ac_cv_cxx_compile_cxx0x_native=no)
++  AC_LANG_RESTORE
++  ])
++
++  AC_CACHE_CHECK(if g++ supports C++0x features with -std=c++0x,
++  ac_cv_cxx_compile_cxx0x_cxx,
++  [AC_LANG_SAVE
++  AC_LANG_CPLUSPLUS
++  ac_save_CXXFLAGS="$CXXFLAGS"
++  CXXFLAGS="$CXXFLAGS -std=c++0x"       
++  AC_TRY_COMPILE([
++  template <typename T>
++    struct check 
++    {
++      static_assert(sizeof(int) <= sizeof(T), "not big enough");
++    };
++
++    typedef check<check<bool>> right_angle_brackets;
++
++    int a;
++    decltype(a) b;
++
++    typedef check<int> check_type;
++    check_type c;
++    check_type&& cr = c;],,
++  ac_cv_cxx_compile_cxx0x_cxx=yes, ac_cv_cxx_compile_cxx0x_cxx=no)
++  CXXFLAGS="$ac_save_CXXFLAGS"
++  AC_LANG_RESTORE
++  ])
++
++  AC_CACHE_CHECK(if g++ supports C++0x features with -std=gnu++0x,
++  ac_cv_cxx_compile_cxx0x_gxx,
++  [AC_LANG_SAVE
++  AC_LANG_CPLUSPLUS
++  ac_save_CXXFLAGS="$CXXFLAGS"
++  CXXFLAGS="$CXXFLAGS -std=gnu++0x"     
++  AC_TRY_COMPILE([
++  template <typename T>
++    struct check 
++    {
++      static_assert(sizeof(int) <= sizeof(T), "not big enough");
++    };
++
++    typedef check<check<bool>> right_angle_brackets;
++
++    int a;
++    decltype(a) b;
++
++    typedef check<int> check_type;
++    check_type c;
++    check_type&& cr = c;],,
++  ac_cv_cxx_compile_cxx0x_gxx=yes, ac_cv_cxx_compile_cxx0x_gxx=no)
++  CXXFLAGS="$ac_save_CXXFLAGS"
++  AC_LANG_RESTORE
++  ])
++
++  if test "$ac_cv_cxx_compile_cxx0x_native" = yes || 
++     test "$ac_cv_cxx_compile_cxx0x_cxx" = yes || 
++     test "$ac_cv_cxx_compile_cxx0x_gxx" = yes; then
++    AC_DEFINE(HAVE_STDCXX_0X,,[Define if g++ supports C++0x features. ])
++  fi
++])
++
++AC_COMPILE_STDCXX_0X
++
++AC_SUBST(cstd)
++cstd=
++if test "$ac_cv_cxx_compile_cxx0x_cxx" = yes; then
++	cstd=-std=c++0x
++fi
++
+ AC_OUTPUT(Makefile postal.h port.h postal.spec sun/pkginfo)
++
+diff -NrU5 postal-0.69.orig/Makefile.in postal-0.69/Makefile.in
+--- postal-0.69.orig/Makefile.in	2008-04-23 22:39:01.000000000 +0200
++++ postal-0.69/Makefile.in	2008-04-24 00:29:40.000000000 +0200
+@@ -8,12 +8,12 @@
+ prefix=@prefix@
+ eprefix=@exec_prefix@
+ WFLAGS=-Wall -W -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wcast-qual -pedantic
+ WPLUS=-Woverloaded-virtual -ffor-scope
+ 
+-CXX=@CXX@ $(CFLAGS) -O2 -g $(WFLAGS) $(WPLUS)
+-CC=@CC@ $(CFLAGS) -O2 -g $(WFLAGS)
++CXX=@CXX@ @cstd@ $(CFLAGS) $(WFLAGS) $(WPLUS)
++CC=@CC@ $(CFLAGS) $(WFLAGS)
+ 
+ INSTALL=@INSTALL@
+ 
+ TESTEXE=ex-test
+ BASEOBJS=userlist.o thread.o results.o address.o tcp.o cmd5.o mutex.o logit.o expand.o @extra_objs@
+diff -NrU5 postal-0.69.orig/postal.cpp postal-0.69/postal.cpp
+--- postal-0.69.orig/postal.cpp	2007-01-14 05:40:23.000000000 +0100
++++ postal-0.69/postal.cpp	2008-04-24 01:30:49.000000000 +0200
+@@ -6,10 +6,11 @@
+ #include "smtp.h"
+ #include <unistd.h>
+ #include <sys/wait.h>
+ #include <signal.h>
+ #include <stdio.h>
++#include <cstdlib>
+ #include "postal.h"
+ #include "logit.h"
+ #ifdef USE_GNUTLS
+ #include <errno.h>
+ #include <gcrypt.h>
+diff -NrU5 postal-0.69.orig/smtp.cpp postal-0.69/smtp.cpp
+--- postal-0.69.orig/smtp.cpp	2008-04-19 00:01:39.000000000 +0200
++++ postal-0.69/smtp.cpp	2008-04-24 00:14:49.000000000 +0200
+@@ -7,10 +7,11 @@
+ #include <time.h>
+ #include "userlist.h"
+ #include "logit.h"
+ #include "results.h"
+ #include <cstring>
++#include <cstdlib>
+ 
+ smtpData::smtpData()
+  : m_quit("QUIT\r\n")
+  , m_randomLetters("abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 1234567890 `~!@#$%^&*()-_=+[]{};:'\"|/?<>,")
+  , m_randomLen(strlen(m_randomLetters))
+diff -NrU5 postal-0.69.orig/smtp.h postal-0.69/smtp.h
+--- postal-0.69.orig/smtp.h	2008-04-19 00:01:23.000000000 +0200
++++ postal-0.69/smtp.h	2008-04-24 00:18:03.000000000 +0200
+@@ -4,16 +4,20 @@
+ using namespace std;
+ #include <string>
+ #include <cstring>
+ #include <time.h>
+ #include "conf.h"
++#ifdef HAVE_STDCXX_0X
++#include <unordered_map>
++#else
+ #ifdef HAVE_EXT_HASH_MAP
+ using namespace __gnu_cxx;
+ #include <ext/hash_map>
+ #else
+ #include <hash_map.h>
+ #endif
++#endif
+ #include "tcp.h"
+ #include "mutex.h"
+ 
+ class results;
+ 
+@@ -28,11 +32,15 @@
+   {
+     return (l1 == l2);
+   }
+ };
+ 
++#ifdef HAVE_STDCXX_0X
++typedef unordered_map<unsigned long, string *, hash<unsigned long>, eqlng> NAME_MAP;
++#else
+ typedef hash_map<unsigned long, string *, hash<unsigned long>, eqlng> NAME_MAP;
++#endif
+ 
+ class smtpData
+ {
+ public:
+   smtpData();
diff --git a/net-analyzer/postal/files/04_postal-0.70-warnings.patch b/net-analyzer/postal/files/04_postal-0.70-warnings.patch
new file mode 100644
index 000000000000..066cf972cdf7
--- /dev/null
+++ b/net-analyzer/postal/files/04_postal-0.70-warnings.patch
@@ -0,0 +1,17 @@
+diff -NrU5 postal-0.69.orig/bhm.cpp postal-0.69/bhm.cpp
+--- postal-0.69.orig/bhm.cpp	2008-04-23 01:47:25.000000000 +0200
++++ postal-0.69/bhm.cpp	2008-04-23 02:10:17.000000000 +0200
+@@ -67,11 +67,11 @@
+   Logit *debug;
+ } thread_data;
+ 
+ enum { eFree = 0, eUsed, eFinished };
+ 
+-int check_sender(CPCCHAR addr)
++int check_sender(CPCCHAR)
+ {
+   return 0;
+ }
+ 
+ int readCommand(base_tcp &t, char *buf, int bufSize, bool stripCR, int timeout = 60);
+
diff --git a/net-analyzer/postal/files/05_postal-0.70-openssl-1.patch b/net-analyzer/postal/files/05_postal-0.70-openssl-1.patch
new file mode 100644
index 000000000000..5b5c054ac98c
--- /dev/null
+++ b/net-analyzer/postal/files/05_postal-0.70-openssl-1.patch
@@ -0,0 +1,30 @@
+http://bugs.gentoo.org/327937
+
+--- basictcp.h
++++ basictcp.h
+@@ -89,7 +89,11 @@
+ 
+ #ifdef USE_SSL
+ #ifdef USE_OPENSSL
++  #if OPENSSL_VERSION_NUMBER >= 0x10000000L
++  const SSL_METHOD *m_sslMeth;
++  #else
+   SSL_METHOD *m_sslMeth;
++  #endif
+   SSL_CTX* m_sslCtx;
+   SSL *m_ssl;
+ #else
+--- tcp.h
++++ tcp.h
+@@ -100,7 +100,11 @@
+ 
+ #ifdef USE_SSL
+ #ifdef USE_OPENSSL
++  #if OPENSSL_VERSION_NUMBER >= 0x10000000L
++  const SSL_METHOD *m_sslMeth;
++  #else
+   SSL_METHOD *m_sslMeth;
++  #endif
+   SSL_CTX* m_sslCtx;
+   SSL *m_ssl;
+ #else
diff --git a/net-analyzer/postal/files/06_postal-0.70-ldflags.patch b/net-analyzer/postal/files/06_postal-0.70-ldflags.patch
new file mode 100644
index 000000000000..7bfb92de7f0d
--- /dev/null
+++ b/net-analyzer/postal/files/06_postal-0.70-ldflags.patch
@@ -0,0 +1,27 @@
+--- Makefile.in~	2011-06-08 11:38:59.123333174 +0300
++++ Makefile.in		2011-06-08 11:46:02.000000000 +0300
+@@ -24,19 +24,19 @@
+ ALLOBJS=$(BASEOBJS) smtp.o client.o basictcp.o bhmusers.o smtpserver.o
+ 
+ postal: postal.cpp $(BASEOBJS) postal.h smtp.o
+-	$(CXX) postal.cpp $(BASEOBJS) smtp.o -o postal $(CRYPTLFLAGS)
++	$(CXX) $(LDFLAGS) postal.cpp $(BASEOBJS) smtp.o -o postal $(CRYPTLFLAGS)
+ 
+ rabid: rabid.cpp $(BASEOBJS) postal.h client.o
+-	$(CXX) rabid.cpp $(BASEOBJS) client.o -o rabid $(CRYPTLFLAGS)
++	$(CXX) $(LDFLAGS) rabid.cpp $(BASEOBJS) client.o -o rabid $(CRYPTLFLAGS)
+ 
+ bhm: bhm.cpp userlist.o basictcp.o logit.o results.o mutex.o bhmusers.o postal.h
+-	$(CXX) bhm.cpp userlist.o basictcp.o logit.o results.o mutex.o bhmusers.o -o bhm $(CRYPTLFLAGS)
++	$(CXX) $(LDFLAGS) bhm.cpp userlist.o basictcp.o logit.o results.o mutex.o bhmusers.o -o bhm $(CRYPTLFLAGS)
+ 
+ ex-test: ex-test.cpp expand.o
+-	$(CXX) ex-test.cpp expand.o -o ex-test $(LFLAGS)
++	$(CXX) $(LDFLAGS) ex-test.cpp expand.o -o ex-test $(LFLAGS)
+ 
+ postal-list: postal-list.cpp expand.o
+-	$(CXX) postal-list.cpp expand.o -o postal-list $(LFLAGS)
++	$(CXX) $(LDFLAGS) postal-list.cpp expand.o -o postal-list $(LFLAGS)
+ 
+ install-bin: $(EXE) $(SEXE)
+ 	mkdir -p $(DESTDIR)$(eprefix)/sbin $(DESTDIR)$(eprefix)/bin
diff --git a/net-analyzer/postal/metadata.xml b/net-analyzer/postal/metadata.xml
new file mode 100644
index 000000000000..1c3bc7b3fcef
--- /dev/null
+++ b/net-analyzer/postal/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/postal/postal-0.72.ebuild b/net-analyzer/postal/postal-0.72.ebuild
new file mode 100644
index 000000000000..82e1541dd2e7
--- /dev/null
+++ b/net-analyzer/postal/postal-0.72.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="SMTP and POP mailserver benchmark. Supports SSL, randomized user accounts and more"
+HOMEPAGE="http://www.coker.com.au/postal/"
+SRC_URI="http://www.coker.com.au/postal/${P}.tgz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="ssl gnutls"
+#ssl is an alias for openssl. If both ssl and gnutls are enabled, automagic will
+#enable only gnutls.
+DEPEND="ssl? (
+	!gnutls? ( >=dev-libs/openssl-0.9.8g )
+	gnutls? ( >=net-libs/gnutls-2.2.2 )
+	)"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/01_${PN}-0.70-gcc43.patch"
+	epatch "${FILESDIR}/02_${PN}-0.72-nossl.patch"
+	epatch "${FILESDIR}/03_${PN}-0.70-c++0x-integrated.patch"
+	epatch "${FILESDIR}/04_${PN}-0.70-warnings.patch"
+	epatch "${FILESDIR}/05_${PN}-0.70-openssl-1.patch"
+	epatch "${FILESDIR}/06_${PN}-0.70-ldflags.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-stripping \
+		$(use_enable ssl openssl) \
+		$(use_enable gnutls)
+}
diff --git a/net-analyzer/prelude-correlator/Manifest b/net-analyzer/prelude-correlator/Manifest
new file mode 100644
index 000000000000..46f1bc0ca5b7
--- /dev/null
+++ b/net-analyzer/prelude-correlator/Manifest
@@ -0,0 +1,11 @@
+AUX prelude-correlator.initd 654 SHA256 0da230ac7d1afd6158fe76b3034005e02fe515c3d668f812c6865e84652604bc SHA512 15be6f991499d6d2b72bd11cd91343a1be164c13454c702b6f42f55b69dbfdda4a380cc6f24aecbf0e9d6a2b3f21b1a947838038ad95e7d7377c3d36118f12e5 WHIRLPOOL dadf6c334e7feb48e2c25b38863dbadd9dc0f86cf998f803cf0c0aa0ca7cbdeef7f78aea74396ac2ba920cd7ee11aefa4027fed4c4a7225f1fabb5dee730386f
+AUX prelude-correlator.run 139 SHA256 947918f6df8bca1d1e1766795d365fe0f09cc1c2101deb5b1957150ef93f77aa SHA512 f05c771f387b2eb59e37006ba5bb959d8d67cbdbdfdd5a7c5a42b592d2c9d4532bfa425565722745ad52e7fb1d327738c02f1602e0eeb42ea403275d69380f51 WHIRLPOOL 1dfc5581b2fc8861d7ff54afaeb3ac3a1f92079ade18e8c3bca6472fb7b6abc85693dd1c2fda9848e1e48d0364528dde6361f4ba354f167ef64db9640346fb01
+AUX prelude-correlator.service 339 SHA256 3b2883bf11f10154fa7b41713c80f4713815ce0a5ffc126bece2a95e960086de SHA512 8f0d0478bea87e2bdc8266044e580f983b12dcaafec1b7cb87074f9cd3825a9c0b2b6d59fba8fc4a62a5af0b9f0dede6f8c5d3cbf436fcf900b031947ea20f68 WHIRLPOOL cc75cbbeba9d7a02ad090dab9d033fc6615794c52ece35381673d65f6fb2a131a9b2be324dd77e5709ea1a1d5e37928e3a07f6bacdf660ea8d9d76a4bc03ab07
+DIST prelude-correlator-3.0.1.tar.gz 181019 SHA256 8e19a2c90dfe0a5715062c3f0e3399439a7ba914e1c19e3b3fd24a69f4a98fac SHA512 2aa159251cf7f9fead117737f67cc01e7cb2012c4fd9db77454c7d639cf477888d5ea6476661bf501c2da7aaef58ea7101b7780669f025af1480acd9480ce8d3 WHIRLPOOL b7538e1e6e4f7504c4dbb0044e74c667d8edd49f4b8a52f03eb7620b3213e9de44a6b5beef02316c7c722989286c8f7fc1204822bcdbb3f320ee30aaacd60aa7
+DIST prelude-correlator-3.1.0.tar.gz 185812 SHA256 0aba8c32d4ca2d086fba336a4211afc29d5133c2f11fd500a43b441de77b9fd3 SHA512 f44d805445c19af1f80f2662b7c5d2678e9928fd5cea17e1938a712157ca3ac51eaf361bd164ec6fa38836461b3719cf739232c130f3c784cf692e1588256d79 WHIRLPOOL 3bbc87f4d449e7a7c2c67b28b4bd6b6369d37f4514393a1de898cec65d92777643ed7e2a42cc9c076ad999b9cb6a6955015f1eb83074d5110905bc49ee40f196
+DIST prelude-correlator-4.0.0.tar.gz 347973 SHA256 9a8dac2b2864563a000c6f8a23b3d3e19a803d8dc6f5e32b6a64bca299b26197 SHA512 aeeb5d1e29a464afa41b8a04f5324e0915b8450eceea68a07cb6d8bb61823ab8da8df51e1a331f5a66fd295bd2a514f484da5c396e0508c4fc5634c98382779b WHIRLPOOL 99cafad23cbb5ed7cfd1c387da510163ad67263e45e1e6e1666e75436aef0477db6600946a2e4c33e53ed093ead689ca3a776793c6b9207780a75d02ac74d14f
+EBUILD prelude-correlator-3.0.1-r1.ebuild 723 SHA256 f9c8bce8e1fa5da41250bf81c23741e7f727cfd137b2871e0e13e0b5e4c9fd18 SHA512 23cfb488a3d604f4bc5351de67c2fedfafc9668c04e81ada545525f0b134ec5765b6555329f8b50fd5ffe7f3f41a79801d556a9faa67b17cd0e4c45604a3c9d1 WHIRLPOOL 4686995db0252acb5c8522a14ab916142803775f4bb86dde89ac5e4be529114b06c8cc13199f58ce16df3afafd5864ea62c0f88c5da099423fac8d37ed5379b8
+EBUILD prelude-correlator-3.1.0.ebuild 730 SHA256 eea874c0dfaa45188a533aeb4954834ed1962ac47a5acfc77f0bffe24bccdb7d SHA512 f79772b4efec8ed3cd4f1023dc6e9661b5669233321393e807519bf28f792491488bf44562114b3cbd98a7c5fbd4b1b0131818dc592908e3dcf7fa2c665bb00f WHIRLPOOL d6dc640b919c17ed9afd28dc0da83b01a243f66b3fba754bf0968575bc52395f3bbeb988a58688b640ac03ec1703374454b12156ae2efd668f35c0ff6f69baf2
+EBUILD prelude-correlator-4.0.0.ebuild 759 SHA256 e28e787d276b6ac575754df187a3c45d3c9b758767506822ca1b0849da6c4ff1 SHA512 1b5ac5a4685186fb94a4d81695cf06f98409c73e1f87b2e9440a81c72e6fbe14b3d6ea4419de539177257e7a0c5a9957d836e01e56e70ea389a455f37cc3fb07 WHIRLPOOL ae1d387387bbea6158d38ac5fe33976bb83cb7a37a9be1a15dae673452a3a0e663a957c75b7ee7c8de1523b98294a3555b14e5b7241766fa55619866ac6df49a
+MISC ChangeLog 1162 SHA256 8e584112db3cfba5a054ebd2432783ca1c144e0797165d0df096874592d73374 SHA512 eb34cb5d2e9ff7a0c75a6b65c818479b20cf13067bf47e93d34c8ba57642c6a22abe01d690fa2e2bb9c8375439aa6a71f99f214a666df566b6038d6c71ce4b3d WHIRLPOOL 93a1c2fb00e1a6e0e407c9a8b5b831afca3092759af46fd3abf10c39936e9d4ad758582fe926223c3f2ed2eba29f846cca4f0cac5fbf5e3c1d6e2686e1e4d974
+MISC metadata.xml 824 SHA256 ac9bdf0e46c3fcc6b96b53259c73029c60415385853fabfe153750d194737e03 SHA512 3b0db2aace5a45f8994622063ca9fb32a06bcb385b63fb013c191606f07e9bb03c1354549b07ac4c17d74a9f25db44be7ea45fc34d6332079209cc56f5262209 WHIRLPOOL 073f65c867edb858eefc4142fbabc5e775fb6e017c42259867cda50c9cd34a3f6f3c6111dcb275b25169e3e14948cc7ef606ee2217e967527bb75f53ae2e88ed
diff --git a/net-analyzer/prelude-correlator/files/prelude-correlator.initd b/net-analyzer/prelude-correlator/files/prelude-correlator.initd
new file mode 100644
index 000000000000..6e75689ca03c
--- /dev/null
+++ b/net-analyzer/prelude-correlator/files/prelude-correlator.initd
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+BIN_CORRELATOR=/usr/bin/prelude-correlator
+PID_CORRELATOR=/run/prelude-correlator/prelude-correlator.pid
+
+depend() {
+  need net
+  after prelude-manager
+}
+
+start() {
+  ebegin "Starting prelude-correlator"
+  checkpath -d -m 0755 -o root:root /run/prelude-correlator
+  start-stop-daemon --start --exec $BIN_CORRELATOR \
+    --pidfile $PID_CORRELATOR -- -d -P $PID_CORRELATOR
+  eend $?
+}
+
+stop() {
+  ebegin "Stopping prelude-correlator"
+  start-stop-daemon --stop --exec $BIN_CORRELATOR \
+    --pidfile $PID_CORRELATOR
+  eend $?
+}
diff --git a/net-analyzer/prelude-correlator/files/prelude-correlator.run b/net-analyzer/prelude-correlator/files/prelude-correlator.run
new file mode 100644
index 000000000000..8bec03f78704
--- /dev/null
+++ b/net-analyzer/prelude-correlator/files/prelude-correlator.run
@@ -0,0 +1,4 @@
+# Configuration to create /run/prelude-correlator directory
+# Used as part of systemd's tmpfiles
+
+d /run/prelude-correlator 0755 root root
diff --git a/net-analyzer/prelude-correlator/files/prelude-correlator.service b/net-analyzer/prelude-correlator/files/prelude-correlator.service
new file mode 100644
index 000000000000..7b763c30c13a
--- /dev/null
+++ b/net-analyzer/prelude-correlator/files/prelude-correlator.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Prelude-Correlator service
+DefaultDependencies=no
+After=remote_fs.target prelude-manager.service
+
+[Service]
+ExecStart=/usr/bin/prelude-correlator -d -P /run/prelude-correlator/prelude-correlator.pid
+Type=forking
+PIDFile=/run/prelude-correlator/prelude-correlator.pid
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-analyzer/prelude-correlator/metadata.xml b/net-analyzer/prelude-correlator/metadata.xml
new file mode 100644
index 000000000000..fa977ec21f47
--- /dev/null
+++ b/net-analyzer/prelude-correlator/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>thomas.andrejak@gmail.com</email>
+		<name>Thomas Andrejak</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		Prelude-Correlator allows conducting multi-stream correlations
+		thanks to a powerful programming language for writing correlation
+		rules. With any type of alert able to be correlated, event
+		analysis becomes simpler, quicker and more incisive. This
+		correlation alert then appears within the Prewikka interface
+		and indicates the potential target information via the set of
+		correlation rules.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-3.0.1-r1.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..68d50b36d690
--- /dev/null
+++ b/net-analyzer/prelude-correlator/prelude-correlator-3.0.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit systemd distutils-r1
+
+DESCRIPTION="Real time correlator of events received by Prelude Manager"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/3.0.0/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools"
+
+RDEPEND="dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-libs/libprelude[python,${PYTHON_USEDEP}]"
+
+src_install() {
+	distutils-r1_src_install
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+}
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-3.1.0.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-3.1.0.ebuild
new file mode 100644
index 000000000000..e36ee8a7ccf8
--- /dev/null
+++ b/net-analyzer/prelude-correlator/prelude-correlator-3.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit systemd distutils-r1
+
+DESCRIPTION="Real time correlator of events received by Prelude Manager"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools"
+
+RDEPEND="dev-python/netaddr[${PYTHON_USEDEP}]
+	~dev-libs/libprelude-${PV}[python,${PYTHON_USEDEP}]"
+
+src_install() {
+	distutils-r1_src_install
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+}
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild
new file mode 100644
index 000000000000..9d02e0824128
--- /dev/null
+++ b/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Real time correlator of events received by Prelude Manager"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="~dev-libs/libprelude-${PV}[python,${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]"
+
+src_install() {
+	distutils-r1_src_install
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+}
diff --git a/net-analyzer/prelude-lml-rules/Manifest b/net-analyzer/prelude-lml-rules/Manifest
new file mode 100644
index 000000000000..0adae0340198
--- /dev/null
+++ b/net-analyzer/prelude-lml-rules/Manifest
@@ -0,0 +1,8 @@
+DIST prelude-lml-rules-3.0.1.tar.gz 117551 SHA256 e5e1e40d989cfbff27764acfd3439d888f412cf9a006860826f59f8bf933784b SHA512 fc3b35fcb6249b40e5f5fad6b22b238167f7039a48a3e7732110a77f23fd82d0f0150a891f83e07ab7e0ccd8b33cbcff5d8498f6f14f01248d87b8f37e6ea9a3 WHIRLPOOL 9668c246fd16ef716013745270ceebf6d121a0381ec0f615306812a20b9ff4e5ec9762fc14ed218ee9ca9ff6e855053ef991550c24dfbd35ab58feb75d8e3c27
+DIST prelude-lml-rules-3.1.0.tar.gz 117010 SHA256 5073684c6d90687f45a14eff5da4a4ee7ea086568531a62945115480de122de3 SHA512 8addb0ac785098d49aa220e63e95805290028f42504df868660f8ccd5f516c9a7f53e794714fe395c8a50935e64575cd405a20f65dd02692c5613c9bc9a028b7 WHIRLPOOL 0e07caee368c9d4226d3614ab868fd0aaa3786ec5a2dab6a90ff74354b202f80f96bfd56123806e2e0f0aa0c716701434b75fbaf59985ff816fb2865f0cdf6b2
+DIST prelude-lml-rules-4.0.0.tar.gz 115058 SHA256 a1c214e3db31c1456c3e23f43585fddd67a6b1d152d978aecea06ecd4a13a97c SHA512 9244d7d5e4a7a64c10adc2f8bc0662e7ada2a367b6bf6b38292db3abab484bcb0bf3a26696576ecbb593a82de5e372ae3d381070af06a65ba03b01b9273a19f3 WHIRLPOOL b7114845432e24e5ec6254317841b37f8a505628b3994d09bcbb3758516772e8c31f2396f61ae39a7b99ee41cf670d24a9062369ad2202027901763e6fc72aa6
+EBUILD prelude-lml-rules-3.0.1.ebuild 485 SHA256 87dfe5d406dc9666f05c17496768a256a1b39697ebd43049614209a8611abcbb SHA512 69939ca37558057b4c3b2dbce32e755e834235acfbf9ce11b7570bf049d6cd5f8270264284c60904211bf61ccddce1f4c5b84812c43add186a9b64fdb2a860a1 WHIRLPOOL 9071b1c240a5a36a6c27155fd3eb21befe1bb891c0e05847a38fc9f0ca0e1ac017f9e9e82c889c9a9210f12795e97cd8c1df3af79d42d3e74aa3c58908a202a2
+EBUILD prelude-lml-rules-3.1.0.ebuild 492 SHA256 84364d08154b6f97a3134734cb271c11ac94887ab04291038b96d67f2727c660 SHA512 3bab272f739243b2b4af96ab9227562bc58d2d4d36a723f4e31a876b7e48c7a7d0633f4e542b0511df6b8cad70baa3b6306536a36d18214b7d0d0541f740d655 WHIRLPOOL 55b454acfb3564caef4f7b83025d361bb96e91b6e1c36e5a27df2ff7d6cc1859bb488d9c10bca68fb6dcc7a335163cea6f523c2b355ba098476c0ceb55e4f0eb
+EBUILD prelude-lml-rules-4.0.0.ebuild 456 SHA256 030ac169ff39930aa65a27b62685495d41bfc0187837e5750ca0f619122b490c SHA512 78766de94e82be4044997cefef9434f5d3b72c2b69833e4516002f0170bac933eb469c1d65c8cf700e36bfb9a6d2afb55d2e61df8d41b798e6002ec12e2ce67d WHIRLPOOL f2e9be22c5a4ac120d92111671d382dc6db1b6f1e9d87062d08b992754203336f4c71a1d5fe036ad75a0c3421b01924ea6b156977d32c0cf2e7d4d24f2964485
+MISC ChangeLog 515 SHA256 b14fbba4647547a4545320bbddafc2522c4e64be38ea7241a6e7b7442769938e SHA512 44e01c40d7a7ff31b85c349e250a1a7a93cec42717868576ff2477e20c972b3b024afb286b07a1584f9a6ed2c8ef55fb51cb2b8fdad114e751cbdf87ca38fe9b WHIRLPOOL ce5c0ede5c580505293258c9b3cfbc61ecadca2261fb0a130e947c02c1050902dd35302b5bdee2662a67061f354d1d1a6da3ffe348f03464ea5ee97a5304f066
+MISC metadata.xml 476 SHA256 da3ecb2d8f848db6537f2e013f441586cf5f799c762db5c5fa25a462acb70927 SHA512 67d80e0bc56afd5694c392259e8ca7488b9595cfd2a2c79479344398513511549b4fa1acab280a67b5d1295bff1a73f2a0a8f5e36980a0087d00a67d2d43d410 WHIRLPOOL d1dfd189361a6983b2b16ddb7355b03f02269035f7411aba6b7c9f1239290be44251807e4a5a07065885abdd9b31850ff6e872f3f0c29df5f5384ebaff39903b
diff --git a/net-analyzer/prelude-lml-rules/metadata.xml b/net-analyzer/prelude-lml-rules/metadata.xml
new file mode 100644
index 000000000000..b02642a4a79c
--- /dev/null
+++ b/net-analyzer/prelude-lml-rules/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>thomas.andrejak@gmail.com</email>
+		<name>Thomas Andrejak</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		Rules for Prelude LML contributed by the community.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/prelude-lml-rules/prelude-lml-rules-3.0.1.ebuild b/net-analyzer/prelude-lml-rules/prelude-lml-rules-3.0.1.ebuild
new file mode 100644
index 000000000000..2088e31212d2
--- /dev/null
+++ b/net-analyzer/prelude-lml-rules/prelude-lml-rules-3.0.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Prelude LML community ruleset"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/3.0.0/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-analyzer/prelude-lml"
+
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dodir "/etc/prelude-lml/ruleset"
+	insinto "/etc/prelude-lml/ruleset"
+	doins "ruleset/"*.rules
+}
diff --git a/net-analyzer/prelude-lml-rules/prelude-lml-rules-3.1.0.ebuild b/net-analyzer/prelude-lml-rules/prelude-lml-rules-3.1.0.ebuild
new file mode 100644
index 000000000000..892e695f5e20
--- /dev/null
+++ b/net-analyzer/prelude-lml-rules/prelude-lml-rules-3.1.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Prelude LML community ruleset"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="~net-analyzer/prelude-lml-${PV}"
+
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dodir "/etc/prelude-lml/ruleset"
+	insinto "/etc/prelude-lml/ruleset"
+	doins "ruleset/"*.rules
+}
diff --git a/net-analyzer/prelude-lml-rules/prelude-lml-rules-4.0.0.ebuild b/net-analyzer/prelude-lml-rules/prelude-lml-rules-4.0.0.ebuild
new file mode 100644
index 000000000000..1c9aed51d8a2
--- /dev/null
+++ b/net-analyzer/prelude-lml-rules/prelude-lml-rules-4.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Prelude LML community ruleset"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="~net-analyzer/prelude-lml-${PV}"
+
+RDEPEND="${DEPEND}"
+
+src_install() {
+	insinto "/etc/prelude-lml/ruleset"
+	doins ruleset/*.rules
+}
diff --git a/net-analyzer/prelude-lml/Manifest b/net-analyzer/prelude-lml/Manifest
new file mode 100644
index 000000000000..9a60b88bb16c
--- /dev/null
+++ b/net-analyzer/prelude-lml/Manifest
@@ -0,0 +1,15 @@
+AUX prelude-lml-3.0.0-conf.patch 716 SHA256 791ebcdf3001324ab241de296969a0824800d2bbbcb7d4112aa3c78d376be5e3 SHA512 6394d55bcbc68971ec35161618bb6c7ccde0aa1e9ae2149b38f41117ddd2559ce5992803be7209d34ac20e2c5c30970bd34d39b1e510ed34655d345a3bf0c6e5 WHIRLPOOL 7983c2786b93c287a369f7433d1a0ac511e004819bd2336f495f3252105b33b062b4cba44cf3ebda61c2f15dafe3faa7f53fdfd2db9fcb781332b0226a2e73c1
+AUX prelude-lml-3.0.0-configure.patch 1652 SHA256 3846ef20f267caeedd133e458bb39a5ef2e8cc47ebded853204133544c2a76ee SHA512 553958c119eb56a0e1c513d6c197f30ca8c178fe956a93c549d3fd70ac627b65f1adf50bbac834bae241c6a610355c021b1853aa217d81e44457ee7f8c66f3ac WHIRLPOOL 2deac2949b85e5154d0aa85ffa450c51a61eba5cd927532b3157d3dd64f9fdcd9f76c604fed3c56c91b355813b3ccd8775376d10ed3f545bb4f4028aa990081f
+AUX prelude-lml-3.0.0-run.patch 551 SHA256 09cededd138d34aa848a80d8463226f914c792f7499dddf49456ce17b5941d27 SHA512 e772e55194461070f0379f0e5e02b48a8c6f6f5f79b154db85bfa945f9af17c3fe6394d81403ab032d306fa3da15d871c6bf1280cea85e27b1cd2e70565783b7 WHIRLPOOL 232375525ea245fad76c08a185dc256a0fb3afc2e1bc05ca7e72f06e808cfd1631243be17c955fbb8af0f047e008fb79e501d3afee6d580011ef229c539fb194
+AUX prelude-lml-3.1.0-run.patch 551 SHA256 2f5820be46b9b8d627c67cd5c86a044153f8120456b968408c76ed7dc2f38ffd SHA512 20614c83925ec233d2fc5bf1c30df8b17031eb0448ef39095de6bce0c1ea489c82c542eb6b684afd26f05d6bc8f68ff5b6c0d04030de60036ef8bd2ed24a91d0 WHIRLPOOL f6d96a0766a9767d0a42f8216848115ae29590c08cb53f70692f22026cdbe863faccc14e0537c065d4ce901b3e88d20ae58605524d8f648e7133e249b3a1d773
+AUX prelude-lml.initd 563 SHA256 b995694ae2f8cf261e6bfc4e7ee626076b1950bd69abc6dcecfde72330862e06 SHA512 b49cac24757000932e0d0ef8b98ab543d12b3efef0944f57f6c6bb23c04473d2a1cfbeccaaffb456e4d5306c12b412a1809aacae00edf535a7f3d944dcef10ec WHIRLPOOL 4e027d66ab4373280bcde885a66240f3470115f85d85cb9dea6b688891dc23434f9e831e53708b306b1991f2979c40f938ba1e95ca62b8192d42429496150057
+AUX prelude-lml.run 125 SHA256 1110c1ab3c34fbe958aeb1150063682986fca148f0df8d47f4821dd5bea8bec0 SHA512 876f3c9c2c005cf146590e3c8718ae4fc04f80594ad2f279f6794e035a8ebed6b6499c6d8ac8268e8c953e615a79743eb24bf992a9857a743f75ca253aab95ad WHIRLPOOL cbbec598f4fb4af98626db4b967ea327195eae44d23cde0f60de73d53e3e07c00165a86ea96c2b854078694703a35b10ba46256e10de147a4a2bd2de89daa95c
+AUX prelude-lml.service 297 SHA256 9882cba23003fd9232f09e85d629ca1975471a56a98bb118c82c9389d057f142 SHA512 0faa91b3736fe111b08fdd3f03829c35a81133cfc54e677ebc423d4d9a29113744253fbee12f9b531494f2f39b549df54eec4cc5c7363375443113277fead87a WHIRLPOOL c5a1ac6551e228ee3b46efe19ad13f9e47879bd6bf7ab875ebf276ca9e4fce3716f86d87bc556531c4e7a177b27c0ded0e1ca0b9eef676938c56f5ea3146354a
+DIST prelude-lml-3.0.0.tar.gz 1391203 SHA256 53e3ccba2e3842e583739234366b6a5241dc6a8d18da501e6c9ff5e2b9792814 SHA512 f206407f99df394186466566608b434a94d4fdce3e5e8991a4236f2ee670f6ae2573adea22bc248fdfea760588e94160faa7260257aeaeb35c938e1bb886ee6c WHIRLPOOL 2b8ff99576e502461625897251726dd7c1e3a849e27816c64e931548d0ae76f12c125f444096f1aa1894c5f0fce206a7aa436de754a0ff8a3cc25fd475913fc6
+DIST prelude-lml-3.1.0.tar.gz 1408600 SHA256 32a7e2256ae3b87b84b3da05b60fed0bb5e3b32e2f6794516c435eda1d753384 SHA512 16fe23c410f6ee585513589c1f9435e0a7dded010ccfd8bb0a8744603e7e020378afee474f6146472afa39263052defddc8c9115235dbd3015727c18f625773b WHIRLPOOL c6b4e20ac64f18eb0dfc4f7740c767b54ea4a00e3a46fc8dcb985cbf9296eab0a3f4774c4d6efeea63766cb395abf24d96ff29f0f38f6dfee2d411b68d4b0619
+DIST prelude-lml-4.0.0.tar.gz 1435446 SHA256 bc12dcb8f1085694fff20801204f9350c2011f06fceeda3be03ec5a748ab4eef SHA512 e2ae3a754f722b19110a32ae9ab7d0d9ce5ceb256c04a2b56f6549802d605cfa741cef4687c8883b585a0dd59f3507ee2d1275f4eb05050d10d24ad068522ef8 WHIRLPOOL 14c93403e1607cbd8559dc05a8fc4bef41aa73af5e16bec72db9ea9e3981d15c037927e93cc1c591fd5559da1745e4763fe36c416f8d81bccff8f48104f16f2e
+EBUILD prelude-lml-3.0.0.ebuild 1109 SHA256 768b4272c75d463dd9f10998f50732e81f7f9d6349de3fd47203f37882f6587b SHA512 aa73cbe3ef1c8da02224fb03ea7a8f43f1eaf41563bb922428cae527a83378db76a8ead23b5247cc2c0688f47ed32a6c966967f7d9729ea5b9e3505492afae14 WHIRLPOOL 52812eb47af7878ffcef72fdfdf0f1112f91d34d47a43cdd03df8f1e1a61ac6f4fc39be0fdd42c8894ed244ca885c650e8d8696776f0203d9b706e1f3270a2d5
+EBUILD prelude-lml-3.1.0.ebuild 967 SHA256 1a0480c775788a447bb1a689caffa9935e5c43e84630142109b8bec4d0ea3fa3 SHA512 43e1ce24d1a1929b6848cb1cc66d9d2fad451b9c952a2e816cc4266f2d52c411cb0d892696c7fc6abf8e4da654cf633a0f3aae4ca7713eccc1102746a3bade73 WHIRLPOOL cd93c732d8bda14a48e316fb6ab306cbc688e77bad1681a5c0eecad158223ecb470ef0b4dcba4ab904c094ae62dfe4e0898cc0aa6f73b45b0a4b0be58a2b2406
+EBUILD prelude-lml-4.0.0.ebuild 974 SHA256 425fca975d9c6b5bbec1fd66ae5fc8088764a3c062960a80dffde438569dd1cb SHA512 c5b5b976364e17a1cd34a7b260b75891a75d8211a808e34551134e6e5419bf004865ea26589ccaed712aaabc31e42e27fdac3c68c61a4068ad46ac4efe7641a2 WHIRLPOOL 50b2bea8bdd3e320dc49e8c2ebc82ccac7eb12b04c2634c8e30c6d3b40bcf0b806950c4f953d18bcccdf5df0392479e1fd6e21af140886dc6d98c16a093051d9
+MISC ChangeLog 1098 SHA256 c5ec6c79f5bf67f073db7ba82603c770f2a42b1ef573157565519813f6395af1 SHA512 392d73d948598e38d1cd76476dfb14a750813e70afa61e70228bec7cc8ddf47926e7155b54686b897775fffd9f20f2648ee5e6724980ac3bc63777d2ead58662 WHIRLPOOL 9088465f99e2124f86afb62053cc263a4ae88bf928da1b5ed25740d5aa8a10b420eac1341cdbb0b898499d0fc95957452092ba1bf2b08314120b7286c52bb98e
+MISC metadata.xml 859 SHA256 91debff3a251eb2857043a0f3a93e505cca6bb9c24356eea2b3954c36eccc199 SHA512 8a5d558c9a92c34f3a9eb082c2295422cf834c158bf295cdb2c85f6bde1c242d6e350299ef53b8a6556eb736c1ea7cb825723354a370b419a338021b8ca6e724 WHIRLPOOL 392b6f40750fadf41636bc9cac4cdebe7d9436ecfd6d959af8dbebe890301a9f99dac73d00f47628a0f7ede4a6c9aa4890f0899e5934a38dc482cd8a138361c1
diff --git a/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-conf.patch b/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-conf.patch
new file mode 100644
index 000000000000..dab4ea8a6bb1
--- /dev/null
+++ b/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-conf.patch
@@ -0,0 +1,22 @@
+--- a/prelude-lml.conf
++++ b/prelude-lml.conf
+@@ -92,7 +92,7 @@
+ time-format = "%b %d %H:%M:%S"
+ prefix-regex = "^(?P<timestamp>.{15}) (?P<hostname>\S+) (?:(?P<process>\S+?)(?:\[(?P<pid>[0-9]+)\])?: )?"
+ file = /var/log/messages
+-file = /var/log/secure
++file = /var/log/auth.log
+ # udp-server = 0.0.0.0
+ # tcp-server = 0.0.0.0
+ # tcp-tls-server = 0.0.0.0
+--- a/prelude-lml.conf.in
++++ b/prelude-lml.conf.in
+@@ -92,7 +92,7 @@
+ time-format = "%b %d %H:%M:%S"
+ prefix-regex = "^(?P<timestamp>.{15}) (?P<hostname>\S+) (?:(?P<process>\S+?)(?:\[(?P<pid>[0-9]+)\])?: )?"
+ file = /var/log/messages
+-file = /var/log/secure
++file = /var/log/auth.log
+ # udp-server = 0.0.0.0
+ # tcp-server = 0.0.0.0
+ # tcp-tls-server = 0.0.0.0
diff --git a/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-configure.patch b/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-configure.patch
new file mode 100644
index 000000000000..154a261eb5ad
--- /dev/null
+++ b/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-configure.patch
@@ -0,0 +1,35 @@
+--- a/configure.in
++++ b/configure.in
+@@ -107,10 +107,13 @@
+ dnl **************************************************
+ GNUTLS_MIN_VERSION=1.0.17
+ 
+-PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= $GNUTLS_MIN_VERSION], [],
+-                  [AM_PATH_LIBGNUTLS($GNUTLS_MIN_VERSION, enable_gnutls=yes, enable_gnutls=no)])
+-
+-AC_CHECK_HEADER(gnutls/gnutls.h, enable_gnutls=yes, enable_gnutls=no)
++AC_ARG_ENABLE(gnutls, AC_HELP_STRING(--enable-gnutls, Define whether GnuTLS provides gnutls_hash_get_len function), , enable_gnutls="yes")
++if test x$enable_gnutls = xyes; then
++	PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= $GNUTLS_MIN_VERSION], [],
++	                  [AM_PATH_LIBGNUTLS($GNUTLS_MIN_VERSION, enable_gnutls=yes, enable_gnutls=no)])
++	
++	AC_CHECK_HEADER(gnutls/gnutls.h, enable_gnutls=yes, enable_gnutls=no)
++fi
+ 
+ if test x$enable_gnutls = xyes; then
+         AC_DEFINE_UNQUOTED(HAVE_GNUTLS, , Tell whether GnuTLS is available for TCP-TLS support)
+@@ -125,8 +128,12 @@
+ dnl * Check for libICU                               *
+ dnl **************************************************
+ 
+-PKG_CHECK_MODULES([ICU], [icu >= 3.0], [enable_icu=yes],
+-                  [AC_CHECK_ICU(3.8, enable_icu=yes, enable_icu=no)])
++AC_ARG_ENABLE(icu, AC_HELP_STRING(--enable-icu, Tell whether libicu is available for encoding convertion), , enable_icu="yes")
++
++if test x$enable_icu = xyes; then
++	PKG_CHECK_MODULES([ICU], [icu >= 3.0], [enable_icu=yes],
++        	          [AC_CHECK_ICU(3.8, enable_icu=yes, enable_icu=no)])
++fi
+ if test x$enable_icu = xyes; then
+         AC_DEFINE_UNQUOTED(HAVE_LIBICU, , Tell whether libicu is available for encoding convertion)
+ fi
diff --git a/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-run.patch b/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-run.patch
new file mode 100644
index 000000000000..8b4e65216cca
--- /dev/null
+++ b/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-run.patch
@@ -0,0 +1,14 @@
+--- a/configure.in
++++ b/configure.in
+@@ -187,9 +187,9 @@
+ configdir=$SYSCONFDIR/prelude-lml
+ prelude_lml_conf=$configdir/prelude-lml.conf
+ regex_conf=$configdir/plugins.rules
+-metadata_dir=$LOCALSTATEDIR/lib/prelude-lml
++metadata_dir=$LOCALSTATEDIR/prelude-lml
+ plugindir=$LIBDIR/prelude-lml
+-lml_run_dir=$LOCALSTATEDIR/run/prelude-lml
++lml_run_dir=/run/prelude-lml
+ 
+ AC_DEFINE_UNQUOTED(PRELUDE_LML_CONF, "$prelude_lml_conf", Path to the LML configuration file)
+ AC_DEFINE_UNQUOTED(LOG_PLUGIN_DIR, "$plugindir", Prelude-LML report plugin directory)
diff --git a/net-analyzer/prelude-lml/files/prelude-lml-3.1.0-run.patch b/net-analyzer/prelude-lml/files/prelude-lml-3.1.0-run.patch
new file mode 100644
index 000000000000..a9eba7760d36
--- /dev/null
+++ b/net-analyzer/prelude-lml/files/prelude-lml-3.1.0-run.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -209,9 +209,9 @@
+ configdir=$SYSCONFDIR/prelude-lml
+ prelude_lml_conf=$configdir/prelude-lml.conf
+ regex_conf=$configdir/plugins.rules
+-metadata_dir=$LOCALSTATEDIR/lib/prelude-lml
++metadata_dir=$LOCALSTATEDIR/prelude-lml
+ plugindir=$LIBDIR/prelude-lml
+-lml_run_dir=$LOCALSTATEDIR/run/prelude-lml
++lml_run_dir=/run/prelude-lml
+ 
+ AC_DEFINE_UNQUOTED(PRELUDE_LML_CONF, "$prelude_lml_conf", Path to the LML configuration file)
+ AC_DEFINE_UNQUOTED(LOG_PLUGIN_DIR, "$plugindir", Prelude-LML report plugin directory)
diff --git a/net-analyzer/prelude-lml/files/prelude-lml.initd b/net-analyzer/prelude-lml/files/prelude-lml.initd
new file mode 100644
index 000000000000..0e1dd2e0f4fc
--- /dev/null
+++ b/net-analyzer/prelude-lml/files/prelude-lml.initd
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+BIN_LML=/usr/bin/prelude-lml
+PID_LML=/run/prelude-lml/prelude-lml.pid
+
+depend() {
+  need net
+  after prelude-manager
+}
+
+start() {
+  ebegin "Starting prelude-lml"
+  checkpath -d -m 0755 -o root:root /run/prelude-lml
+  start-stop-daemon --start --exec $BIN_LML \
+    --pidfile $PID_LML -- -d -P $PID_LML
+  eend $?
+}
+
+stop() {
+  ebegin "Stopping prelude-lml"
+  start-stop-daemon --stop --exec $BIN_LML \
+    --pidfile $PID_LML
+  eend $?
+}
diff --git a/net-analyzer/prelude-lml/files/prelude-lml.run b/net-analyzer/prelude-lml/files/prelude-lml.run
new file mode 100644
index 000000000000..75f2ef89adda
--- /dev/null
+++ b/net-analyzer/prelude-lml/files/prelude-lml.run
@@ -0,0 +1,4 @@
+# Configuration to create /run/prelude-lml directory
+# Used as part of systemd's tmpfiles
+
+d /run/prelude-lml 0755 root root
diff --git a/net-analyzer/prelude-lml/files/prelude-lml.service b/net-analyzer/prelude-lml/files/prelude-lml.service
new file mode 100644
index 000000000000..9d9230c6ff4c
--- /dev/null
+++ b/net-analyzer/prelude-lml/files/prelude-lml.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Prelude-LML service
+DefaultDependencies=no
+After=remote_fs.target prelude-manager.service
+
+[Service]
+ExecStart=/usr/bin/prelude-lml -d -P /run/prelude-lml/prelude-lml.pid
+Type=forking
+PIDFile=/run/prelude-lml/prelude-lml.pid
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-analyzer/prelude-lml/metadata.xml b/net-analyzer/prelude-lml/metadata.xml
new file mode 100644
index 000000000000..9aa90946ee78
--- /dev/null
+++ b/net-analyzer/prelude-lml/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>thomas.andrejak@gmail.com</email>
+		<name>Thomas Andrejak</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		Prelude-LML is a log analyser that allows Prelude to collect and
+		analyze information from all kind of applications emitting logs or
+		syslog messages in order to detect suspicious activities and transform
+		them into Prelude-IDMEF alerts. Prelude-LML handles events generated
+		by a large set of applications
+	</longdescription>
+	<use>
+		<flag name="tls">Enables Prelude LML support Syslog through TLS
+		using <pkg>net-libs/gnutls</pkg>.</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-analyzer/prelude-lml/prelude-lml-3.0.0.ebuild b/net-analyzer/prelude-lml/prelude-lml-3.0.0.ebuild
new file mode 100644
index 000000000000..62c96afbdf87
--- /dev/null
+++ b/net-analyzer/prelude-lml/prelude-lml-3.0.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils systemd
+
+DESCRIPTION="The prelude log analyzer"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/3.0.0/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tls icu"
+
+RDEPEND="dev-libs/libprelude
+	dev-libs/libpcre
+	icu? ( dev-libs/icu )
+	tls? ( net-libs/gnutls )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-configure.patch"
+	"${FILESDIR}/${P}-conf.patch"
+	"${FILESDIR}/${P}-run.patch"
+)
+
+src_prepare() {
+	default_src_prepare
+
+	mv "${S}/configure.in" "${S}/configure.ac" || die "mv failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		$(use_enable icu) \
+		$(use_enable tls gnutls)
+}
+
+src_install() {
+	default_src_install
+
+	rm -rv "${D}/run" || die "rm failed"
+	keepdir /var/${PN}
+
+	prune_libtool_files --modules
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+}
diff --git a/net-analyzer/prelude-lml/prelude-lml-3.1.0.ebuild b/net-analyzer/prelude-lml/prelude-lml-3.1.0.ebuild
new file mode 100644
index 000000000000..97d2cf351889
--- /dev/null
+++ b/net-analyzer/prelude-lml/prelude-lml-3.1.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools systemd
+
+DESCRIPTION="The prelude log analyzer"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl icu"
+
+RDEPEND="~dev-libs/libprelude-${PV}
+	dev-libs/libpcre
+	icu? ( dev-libs/icu )
+	ssl? ( net-libs/gnutls:= )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-run.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_with ssl libgnutls-prefix)
+}
+
+src_install() {
+	default
+
+	rm -rv "${ED%/}/run" || die "rm failed"
+	keepdir /var/${PN}
+
+	find "${D}" -name '*.la' -delete || die
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+}
diff --git a/net-analyzer/prelude-lml/prelude-lml-4.0.0.ebuild b/net-analyzer/prelude-lml/prelude-lml-4.0.0.ebuild
new file mode 100644
index 000000000000..89563e4bb103
--- /dev/null
+++ b/net-analyzer/prelude-lml/prelude-lml-4.0.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools systemd
+
+DESCRIPTION="The prelude log analyzer"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="icu ssl"
+
+RDEPEND="~dev-libs/libprelude-${PV}
+	dev-libs/libpcre
+	icu? ( dev-libs/icu )
+	ssl? ( net-libs/gnutls:= )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.1.0-run.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_with ssl libgnutls-prefix)
+}
+
+src_install() {
+	default
+
+	rm -rv "${ED%/}/run" || die "rm failed"
+	keepdir /var/${PN}
+
+	find "${D}" -name '*.la' -delete || die
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+}
diff --git a/net-analyzer/prelude-nessus/Manifest b/net-analyzer/prelude-nessus/Manifest
new file mode 100644
index 000000000000..d403492e1579
--- /dev/null
+++ b/net-analyzer/prelude-nessus/Manifest
@@ -0,0 +1,5 @@
+DIST prelude-correlation-20021107.tar.bz2 7613 SHA256 787af4be88992e387423709c393a56f08598571fc10802d57d49f22629d90294 SHA512 2dcc1d038d9385bef8082476fccce768a47f04eac7c687d684739cd837b9e02f4514bb6296ad98ecc17d0208ec7c39d7401de5abd212ef403b349a76faa0ee79 WHIRLPOOL 4214ec57d43357579cdd6d26f904f8795f96e67628fee7198e0e644715364d850ab430f38204b9c0aa894b99f42687c991606089d6316cac96257b9b82856f60
+EBUILD prelude-nessus-20021107.ebuild 504 SHA256 503c4bb621f640a0fd909efe82fddae15c7a3a2f9f0cb52d19b146c8fbe5f980 SHA512 17b108e76ad45511c7e739428331c9161fa4ea79b73086ded386001871ab499858b15a6ee629b80413f9e34b8ffb44896e2e4dc5bd8ef1bb572f737777b8a08a WHIRLPOOL 32b1a8fc825b862815917d927c14dc9879041ae1b095b15410b21e847af0d6340aa85a9d3437775f85079beb27153d5880c3e10bbae88c2ce72055b6e8e9f1ac
+MISC ChangeLog 2553 SHA256 8e3fba54f58ade92739e4bfd155e3266f8b7af5bb50551c6ddb12d8acc9499f0 SHA512 97d3b448a357514989549ce09a4f879a7dba54c269f89e70587724742b222b5a3ea38032fb687aab1e49e554d9fa8b33e2018862665640f03b5c61ec041dfb2c WHIRLPOOL f8810860513f8fe78283dcf42e74de96c7a52af8f04902569ed6d57ec2a213d3d9012d6ebcc7199b759b1d8bab8f9f44c692a18bfbc8e7e23c93802067f921fa
+MISC ChangeLog-2015 777 SHA256 c02662a87d3700b0e77dff0496c1125ee987178836aa75c251a7ddbb0be139e6 SHA512 a4bda21d4683068579c1d2f110b1ed0d02b05e19ae424d8df9e5a1a3a0826de0ea5923397467e5176ccf130acfc49d979d95b4e19e5ec91c9a5916c0ad34d975 WHIRLPOOL 6930696687bf3677746fb37bd69ac774264e1dabd72a4c80202e36856675ebb6a7b8cee3837452a7351eb2d42757208785b4ebbfe138c89a8c0c39e903f2c65b
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-analyzer/prelude-nessus/metadata.xml b/net-analyzer/prelude-nessus/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-analyzer/prelude-nessus/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-analyzer/prelude-nessus/prelude-nessus-20021107.ebuild b/net-analyzer/prelude-nessus/prelude-nessus-20021107.ebuild
new file mode 100644
index 000000000000..d16e50a2ba17
--- /dev/null
+++ b/net-analyzer/prelude-nessus/prelude-nessus-20021107.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="Nessus Correlation support for Prelude-IDS"
+HOMEPAGE="http://www.rstack.org/oudot/prelude/correlation/"
+
+MY_P="${P/nessus/correlation}"
+
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+	dobin *.pl
+	dodoc CORRELATION_README EXAMPLES NEWS vuln.conf_example
+}
diff --git a/net-analyzer/prometheus-node_exporter/Manifest b/net-analyzer/prometheus-node_exporter/Manifest
new file mode 100644
index 000000000000..07e4be5c9dab
--- /dev/null
+++ b/net-analyzer/prometheus-node_exporter/Manifest
@@ -0,0 +1,6 @@
+AUX prometheus-node_exporter.confd 111 SHA256 51b9d1c0a9a05f7ccaaa88ae8bc5f6c31c10c7efb097e9cae257cc6af658b533 SHA512 cce5db8eccf2ecfe1198aa8252b04fd6a96006f707e7132c2d01c5400d175551c3b9890c4d57fec9ccbe17594dfb937e1f99ead0e1c3fd8cf22930dabd70418d WHIRLPOOL be439ab6a38d5a61b5c33b4140040f61d783b64ec39d7f0bb837ce09f123293eaec435703df0870b80dc1fee73d0a8c86b65db1d6da0c04c34128037d9add866
+AUX prometheus-node_exporter.initd 614 SHA256 2d35b4ecdf385700d1b341a4d4ec0691f9663a220acd45755313d15d7d0209e8 SHA512 5332d59b0548939fa41fa666f013eb573ad7bae699fd65ff6a0171d74ac5ab8d14306beff14046b8eba06fef62963f0f0b7194b47c511ddb4c6050ba72cdb831 WHIRLPOOL 9961e0505c642b82a8af26fe40a3e992504456363014c98536da12d34ec4626dd77c6f030e0512482a6146a1f6d98b22c0624a6a5b22b2681e72eed3e47ca047
+DIST prometheus-node_exporter-0.14.0.tar.gz 1086402 SHA256 312d7e1c07d6a7548f2f116b983da87f7b3a7630f9332eb41c306fd71b2e6ec1 SHA512 28b1c3a17b0065f7005636f0751e535f9455675f7c17546a584fb709f43f2608e4854fe4e7f0e3790b89eff21016b41dccb0a96f16eae466de1040b57c4b1c98 WHIRLPOOL 176eb95a76fefb388817fa27f0b43fca9b1ed235d39e73e97254ef829025d7493f710ce0ef2cf11b00ffa509c08f7b12664cdff38939a5ea62eb79e7991c0bd3
+EBUILD prometheus-node_exporter-0.14.0-r1.ebuild 1207 SHA256 418f157ee60d11ca328c473080b8c51eaf4163728831f9d15bec360e20810f74 SHA512 54d13e54be3ce4fb029423d48bfa6cea570ed645c5a58e561a7e6fc56e8f1a7bf600384e790646806ddc82a5501e812995ab937e0177ded8ae32531645b5d1cc WHIRLPOOL 20bd9780882e73a12ce6e38a96f7f527ca3679610614dd8a45f60158b1d8eb947a66fbb3ac4e6387ca66d13b7e1bd1173ff0286890ed1131261562d1b4fd0fec
+MISC ChangeLog 481 SHA256 0ee6994116c7d3d57b63373d23c1eae0c9f937018749b99d9d047fe5fd4d2b23 SHA512 bb4010b6957fef58e18717bed4add6840af8bb60c247e96d1be40612b0d88664186f81f5d99e94c6c0688783424b4bfd0037c71b1ede37097a362520718ef021 WHIRLPOOL b4f6808f2c6c20d1a47c5620942a2dea412f7c0c3bb477be84c89e7fe8dac0dbd107338f0acf344f857bc446e39aa328c62bf601e5d9eff257f4a57cecbb36f2
+MISC metadata.xml 345 SHA256 33246077887c4702208b9287ea57ed0b62e5eec5f1d5d84ff624c10b8f1e0af4 SHA512 d4966395f1b3e4ac0c5b16d9910e67d3552099f40e8c70d9094a40c415decd00c44f1f032d55ae7efd5ad6e55d103d001c0f8394fc3e7b0817699ad17e42774d WHIRLPOOL 5bd5a43ca3c506b460999fba8ac3823e2e137b146844ee59e7a6ffc1057715f02926493a3b335066abb92471becc388ac258aab7cd4849e614622f20bf3df370
diff --git a/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.confd b/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.confd
new file mode 100644
index 000000000000..b65652001308
--- /dev/null
+++ b/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.confd
@@ -0,0 +1,2 @@
+# arguments for prometheus node exporter
+command_args="--collector.textfile.directory=/var/lib/node_exporter/"
diff --git a/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.initd b/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.initd
new file mode 100644
index 000000000000..57202a4ce47b
--- /dev/null
+++ b/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 2016-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus machine metrics exporter"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-${RC_SVCNAME}}
+group=${group:-${RC_SVCNAME}}
+
+command="/usr/bin/node_exporter"
+command_args="${command_args:--collector.textfile.directory=/var/lib/node_exporter/}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+	--stdout /var/log/node_exporter/${RC_SVCNAME}.log \
+	--stderr /var/log/node_exporter/${RC_SVCNAME}.log"
+
+depend() {
+	after net
+}
diff --git a/net-analyzer/prometheus-node_exporter/metadata.xml b/net-analyzer/prometheus-node_exporter/metadata.xml
new file mode 100644
index 000000000000..43b9f018e074
--- /dev/null
+++ b/net-analyzer/prometheus-node_exporter/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">prometheus/prometheus-node_exporter</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.14.0-r1.ebuild b/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.14.0-r1.ebuild
new file mode 100644
index 000000000000..48eb30aac765
--- /dev/null
+++ b/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.14.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/node_exporter"
+EGIT_COMMIT="v${PV/_rc/-rc.}"
+NODE_EXPORTER_COMMIT="840ba5d"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus exporter for machine metrics"
+HOMEPAGE="https://github.com/prometheus/prometheus"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-util/promu"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	mkdir -p bin || die
+	GOPATH="${S}" promu build -v --prefix node_exporter || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin node_exporter
+	dodoc {README,CHANGELOG,CONTRIBUTING}.md
+	popd || die
+	keepdir /var/lib/node_exporter /var/log/node_exporter
+	fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/net-analyzer/prometheus/Manifest b/net-analyzer/prometheus/Manifest
new file mode 100644
index 000000000000..bc8ed972cc7e
--- /dev/null
+++ b/net-analyzer/prometheus/Manifest
@@ -0,0 +1,11 @@
+AUX prometheus-3.initd 659 SHA256 2f5790b241f544e2f73687c15b1cf8efc79fbfbff5502cf973c6bef4ce850498 SHA512 14321f0a0e39e4ed1b879ba956855046c21dff85770d3d269492a6d0b911af69ccbf047ec48b91c56bfb678da9390fb236ce165326dc2139b1255d448f2512fa WHIRLPOOL 595254176744eb3794b760830bb4036813df31dd6ce5f91890463db9db8bde3733b23914c8b725e5543e49d5c3c9ea1a4bd9f87b7ce612e17533ad4bb03884f8
+AUX prometheus.confd 43 SHA256 940f1a3ad08f0eb370951b1a42c29a9217cba9ae2f5cb6cc675bdec1d51e8309 SHA512 37468e897cd34b50b0edc65ada3f0c2e05459c3d96bb7f82d58b6de5bf10a127f1bf7912af93d83d94e3ea7287cfeb2311e36535f291d01a11d152a0b438591c WHIRLPOOL b8bdd0bc16fde3fb99cf8939427781a1b250df7e4a607fb8c780f75d502e7d2aa76aef6a1b4c082d3aa32f0a9a21b3b39df72fcf5e6d26592df43661f8d08169
+AUX prometheus.initd 664 SHA256 566db492c8da87e1de8b655247dce11e43d83b85c9bf9bef7a9fd715e4667516 SHA512 95e2ac4969c26f2e91330b521223e94912d68832ef29429e68930479c29b24027c138011bd1f480546c14a07ae15800967e9ff114cdec3cabd0c15bdca489665 WHIRLPOOL e972726fac805f43772dc871a2a3af45d5421f1c15ab05fd0e7d5368b282164021a0079cfd9d3f5de4656739ccfa339ed80d3fb2ae50b429d5ae806441edc5fa
+DIST prometheus-1.7.1.tar.gz 5122747 SHA256 209832310f5bef99faef3beaaa95263612a4d0126ca512c4a4c23a8543d3ccf5 SHA512 98a42e95978477530082d7549c29f17b133043d7c233ba3c90b183f06a3f24ee578f8fed75cba476d3c93a22abcccfdbccc94488beb8450a02f260d24165ba26 WHIRLPOOL 8ab473430752336e09b4a0c38fd1117abe21196478d7f2f7e813c27f07c950cc3525d9e9ba32309711c73a1032f3cff27ddc1582d0c4b6c66fe82d5b58675550
+DIST prometheus-1.8.0.tar.gz 5194115 SHA256 556247d750b3618b74ccf59669f74a8c0c39e72cdf51cbcc0c0bcc392de195df SHA512 1ac00ddae4753f99f167db9b6efc5fa442918284f59468b8e1c7743e3f946eab895678c87e12a73bf158e3c0bf3df7345dd59855baaabb54fc86f1ae1014192d WHIRLPOOL 9ff6f0dc36f022b2be107ce59878f81b210b196858064655a74e098650abc77d5a0c2afb11dd5ebb242d1e2addbc3a182b1a6ce1f751eed723e3fff3434d319c
+DIST prometheus-2.0.0_rc0.tar.gz 5524499 SHA256 e1615defddf3e0a2d32e22ffba5bc3f0f37ff98fac7d4bba2b2c5bb8219f2a22 SHA512 fd382f559ea9a362e2493ea2d317afe600b0ed2299e3d6ef12678658cd62320ad39deec1b4639819b32c4ba34f124792d00dd101632b1c1e4f1123005e20e38d WHIRLPOOL 1d0ed8f35c9f9d5fca8310af21b93d35bad3397fbf88ea0cc2573412c8d58291e521212283abbe5ed4a461e2e1f62f704f96a6070509864972ff3dd1c0eacd67
+EBUILD prometheus-1.7.1.ebuild 1603 SHA256 2058c7921ecb848a13651d7320aff7908bcfc18fd29ce88e05b00a9dfdb0be42 SHA512 b646178f6b66987d638ad53cecaf26f2eb01619010d037020c33a8ae88793b2b4fd46615fb3608313706cdc82a06089fc26b255fca8238bbfad7419a695a8c14 WHIRLPOOL 4fe3e8573129430024de11ddbf42c7283831cbe559a57f38fde49af2c60d8de792596d4e1e8b61c9c676203420d6fb7a041de73daa7acc3c1e6069d332bdb3af
+EBUILD prometheus-1.8.0.ebuild 1603 SHA256 fd4ee62da65a03450f6192c00ba513c82f286d09ecf6e2587e637d3257c19ffb SHA512 dce3a7f7706f60c84aec1e994eba9c8af32995972ac3312e13ce1ea44c79eb8315e32c8ab735b5054bd7f6ff72125e1dd20c62de6360c01de7e18a8bd2a9d8ad WHIRLPOOL b37ddb874abcbae32d01e2700139e3b42f2d8b538d728779e0237376d7a3c88322ad7fb5c9e7649a95b25cb379df78c496ed78366d6a9b659d19d70a2020a8c7
+EBUILD prometheus-2.0.0_rc0.ebuild 2000 SHA256 f1a5c96261f70b5989c14beb664c6bca41d4298168ce3bd8711ce007acf6889f SHA512 1a7dcd5248ba0eac23f2791ae892358738db9edd278c2fbfa549e4944eb4122f982c15443ba2c888c806249316a6f8a041249532737544946455680665249962 WHIRLPOOL 91dcfcdac5919c2a2b14c37cef878a7aa4f2e0ca3d95b09f4176533db620785d3e8a4e723f54fdf77b3cf5d7aa6e1377454080ce056162d5a0b56c15909f8d7f
+MISC ChangeLog 552 SHA256 be1d133e356e6eb2ad19eb3900722da8fa6495af85bc38a2b90f6845c62dc27d SHA512 7d5bf11cda31ce2fcae3a752ec9eb0d17b212c0ea1a480e09436d41a24eae4ba5689aa43727a8ac5882c5b1ddc741c717a3c8d509d69204fd44eeb00460a4e60 WHIRLPOOL 7ddcb758ecc1426a520a97c6b27b1c0e9752422c9c0f16b1746e11aa91edc37f5289b096430a0b8e05535818901f6f1745144107a2000cb771843de038b07963
+MISC metadata.xml 331 SHA256 1e206a714f59c466b3f41285ea73b6b3a0919c2f8c0a4cf5350ccea436bb26d9 SHA512 06fd0da413c0280a902bbdf50e1e0557375d2208021fda3c3081d8a25a4b17ad1ca647d994dd97ba2d838ea5c87148d3ffd13a8a54cb8dc007b45927df8de47a WHIRLPOOL 0c98900489068124a7afcf1f40d1c9964089ead950e8e16dbc4a0389487187d9af6802a6e86fb6dcf541784f09acd8e0ee27f3215deb16de56495af2b1ee85fc
diff --git a/net-analyzer/prometheus/files/prometheus-3.initd b/net-analyzer/prometheus/files/prometheus-3.initd
new file mode 100644
index 000000000000..5f6d6fe14267
--- /dev/null
+++ b/net-analyzer/prometheus/files/prometheus-3.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 2016-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus monitoring system and time series database"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-${SVCNAME}}
+group=${group:-${SVCNAME}}
+
+command="/usr/bin/prometheus"
+command_args="${command_args:---config.file=/etc/prometheus/prometheus.yml --storage.tsdb.path=/var/lib/prometheus/data}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
+	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+
+depend() {
+	after net
+}
diff --git a/net-analyzer/prometheus/files/prometheus.confd b/net-analyzer/prometheus/files/prometheus.confd
new file mode 100644
index 000000000000..93b41b31624c
--- /dev/null
+++ b/net-analyzer/prometheus/files/prometheus.confd
@@ -0,0 +1,2 @@
+# arguments for Prometheus
+command_args=""
diff --git a/net-analyzer/prometheus/files/prometheus.initd b/net-analyzer/prometheus/files/prometheus.initd
new file mode 100644
index 000000000000..245dcc85ae6d
--- /dev/null
+++ b/net-analyzer/prometheus/files/prometheus.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 2016-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus monitoring system and time series database"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-${RC_SVCNAME}}
+group=${group:-${RC_SVCNAME}}
+
+command="/usr/bin/prometheus"
+command_args="${command_args:--config.file=/etc/prometheus/prometheus.yml -storage.local.path=/var/lib/prometheus/data}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
+	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+
+depend() {
+	after net
+}
diff --git a/net-analyzer/prometheus/metadata.xml b/net-analyzer/prometheus/metadata.xml
new file mode 100644
index 000000000000..f4e8d75f03b9
--- /dev/null
+++ b/net-analyzer/prometheus/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">prometheus/prometheus</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/prometheus/prometheus-1.7.1.ebuild b/net-analyzer/prometheus/prometheus-1.7.1.ebuild
new file mode 100644
index 000000000000..a480c7952919
--- /dev/null
+++ b/net-analyzer/prometheus/prometheus-1.7.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/prometheus"
+EGIT_COMMIT="v${PV}"
+PROMETHEUS_COMMIT="3afb3ff"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus monitoring system and time series database"
+HOMEPAGE="https://github.com/prometheus/prometheus"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.8
+	dev-util/promu"
+
+PROMETHEUS_HOME="/var/lib/prometheus"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup prometheus
+	enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" promu build -v || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin promtool prometheus
+	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
+	insinto /etc/prometheus
+	doins documentation/examples/prometheus.yml
+	insinto /usr/share/prometheus
+	doins -r console_libraries consoles
+	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
+	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
+	popd || die
+
+	newinitd "${FILESDIR}"/prometheus.initd prometheus
+	newconfd "${FILESDIR}"/prometheus.confd prometheus
+	keepdir /var/log/prometheus /var/lib/prometheus
+	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
+}
diff --git a/net-analyzer/prometheus/prometheus-1.8.0.ebuild b/net-analyzer/prometheus/prometheus-1.8.0.ebuild
new file mode 100644
index 000000000000..de0cc31726df
--- /dev/null
+++ b/net-analyzer/prometheus/prometheus-1.8.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/prometheus"
+EGIT_COMMIT="v${PV}"
+PROMETHEUS_COMMIT="3569eef"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus monitoring system and time series database"
+HOMEPAGE="https://github.com/prometheus/prometheus"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.8
+	dev-util/promu"
+
+PROMETHEUS_HOME="/var/lib/prometheus"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup prometheus
+	enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" promu build -v || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin promtool prometheus
+	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
+	insinto /etc/prometheus
+	doins documentation/examples/prometheus.yml
+	insinto /usr/share/prometheus
+	doins -r console_libraries consoles
+	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
+	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
+	popd || die
+
+	newinitd "${FILESDIR}"/prometheus.initd prometheus
+	newconfd "${FILESDIR}"/prometheus.confd prometheus
+	keepdir /var/log/prometheus /var/lib/prometheus
+	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
+}
diff --git a/net-analyzer/prometheus/prometheus-2.0.0_rc0.ebuild b/net-analyzer/prometheus/prometheus-2.0.0_rc0.ebuild
new file mode 100644
index 000000000000..76067595c5b5
--- /dev/null
+++ b/net-analyzer/prometheus/prometheus-2.0.0_rc0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/prometheus"
+MY_PV=${PV/_rc/-rc.}
+EGIT_COMMIT="v${MY_PV}"
+PROMETHEUS_COMMIT="012e52e"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus monitoring system and time series database"
+HOMEPAGE="https://github.com/prometheus/prometheus"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-util/promu"
+
+PROMETHEUS_HOME="/var/lib/prometheus"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup prometheus
+	enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" promu build -v || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin promtool prometheus
+	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
+	insinto /etc/prometheus
+	doins documentation/examples/prometheus.yml
+	insinto /usr/share/prometheus
+	doins -r console_libraries consoles
+	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
+	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
+	popd || die
+
+	newinitd "${FILESDIR}"/prometheus-3.initd prometheus
+	newconfd "${FILESDIR}"/prometheus.confd prometheus
+	keepdir /var/log/prometheus /var/lib/prometheus
+	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
+}
+
+pkg_postinst() {
+	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
+		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
+		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
+		ewarn "This release requires a clean storage directory and is not compatible with"
+		ewarn "files created by previous beta releases"
+	fi
+}
diff --git a/net-analyzer/pypacker/Manifest b/net-analyzer/pypacker/Manifest
new file mode 100644
index 000000000000..a9bfd1d3c6ef
--- /dev/null
+++ b/net-analyzer/pypacker/Manifest
@@ -0,0 +1,5 @@
+DIST pypacker-2.9.tar.gz 276080 SHA256 8eff9e7002b2fdf3bee9d3b7b7a44fedb9a88a7f53666fb1e2a6c0e4ab4c450c SHA512 b7ca61948a55a37661fa402ebc5a9c2be456e8df14d1ee091a50ccd1362c7a7fa9224e1ae2b8ee8057f302ee9e0c61c06d07b627dde92947f8d22158ef3623b8 WHIRLPOOL b7eace8e170f4997cccd1b0ca7c817ad9bdcb232b3fc854e890e22735e1995a81363902ab285f94edc9c725dcba54db3c917bfddfb96ebd8e464bf4d4dc631b8
+EBUILD pypacker-2.9.ebuild 701 SHA256 7c422ad69eb9f3ab1f50598461d613882efc6859904bfe3ddf1c9c677fd59090 SHA512 6dcbe72212bc1f9308b07476a18b86097223ccd0931769c8004568f4063d3f857529c224f7d49471a093cb20f65a0b9a022bdbdc5f9664afeb9ccacb5350d01a WHIRLPOOL 7e1b280311d3a0f3c509513041f6297bdba15f21fb990202fc8de1fb3f14fec44b368fd1c912ad5d0c888e4d1c22b50efb8108b85761c8e489d801d2e9a8cfef
+MISC ChangeLog 2726 SHA256 183eb1f3ae865be48cd6f786c6379890dee22d52e3206f0d844567c9fdafd10c SHA512 88ef80cc089141cd9adc9688998dc7950b44e8fb372eddf4679259f269baa69354f15dd252029ac688a58e049b2c41b33dc67a413fa35bf7da149a20fc3973c6 WHIRLPOOL e0f755f894526719f91f8461fd688f529f296ad0c2a8f0667340556c8a64add0a791c2cdc28c6b92abc5320d9e8c54544fd6fb06cb34b77c6ac1466d24cd94d6
+MISC ChangeLog-2015 1100 SHA256 b29bb955b549242aa3b83f00c71db8c143e41259e56a49c781df688e6dae1eae SHA512 9b7a9c2a640e1c19b386c16f5ca7995d8d8cd8593f737a29cdcd6e63f3689b688f115abb0a7d8984727e79aba6e61407f8c6d7bd8f96e52f0552286c0a5611ac WHIRLPOOL 7e69bcebff3ef578a12f323ae2ff8adb8348b94a9d4dc89924d9b46bff1c285e69ed1dc098c987b7ef9c3fadbaeef46183e9c8da453de4c301aeedcf8e85aafd
+MISC metadata.xml 471 SHA256 307355d2d0dffe947b084cb62478faea9944f9cfb86b1e1c2049db1530745646 SHA512 8eda90dced7132f754ceccf39fbd1b7fdce0ff01490987eb6c6258544dcac27ba03313cb401396e0014c0fff42133da53698681ad5ac48d0f29bead5786abe2f WHIRLPOOL da26cbf64ee63ee35179c9faecf63ec0f44c16ffae6e1dfbc8051a185253c150cf4e5030e6dfaebb82c6516858992a42cc501a0c3d66c299086f0400a64d71a1
diff --git a/net-analyzer/pypacker/metadata.xml b/net-analyzer/pypacker/metadata.xml
new file mode 100644
index 000000000000..c3888efc00a8
--- /dev/null
+++ b/net-analyzer/pypacker/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mike01/pypacker</remote-id>
+		<maintainer>
+			<email>michael.stahn.42@googlemail.com</email>
+			<name>Michael Stahn</name>
+		</maintainer>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/pypacker/pypacker-2.9.ebuild b/net-analyzer/pypacker/pypacker-2.9.ebuild
new file mode 100644
index 000000000000..24fb0f784415
--- /dev/null
+++ b/net-analyzer/pypacker/pypacker-2.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Fast and simple packet creation and parsing library for Python"
+HOMEPAGE="https://github.com/mike01/pypacker"
+SRC_URI="https://github.com/mike01/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( AUTHORS CHANGES HACKING README.md )
+
+python_test() {
+	"${PYTHON}" tests/test_pypacker.py || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use examples && dodoc -r examples
+}
diff --git a/net-analyzer/quidscor/Manifest b/net-analyzer/quidscor/Manifest
new file mode 100644
index 000000000000..f514188c9b6c
--- /dev/null
+++ b/net-analyzer/quidscor/Manifest
@@ -0,0 +1,8 @@
+AUX quidscor-1.2.48-curl-types.h.patch 226 SHA256 78c1ae49af67b5552b002d731544f5bebfc1549c5bcc5901953e30caccd016a9 SHA512 05034662e86afee3f33639c906485f65bcf7c020dab63ec467fcbcbfe7802b9459a5b34324019ebe46e04beb2a3706e45853f6a4e80e1b092c9926ffce1a7541 WHIRLPOOL 21206b39d58c3e6ae144ab746d06207d1a7758eadff62aa151abd6faedf27c8c52e72787638ac184e7a8d34e7b068cd3c3be1e7dbac24869e25d06d3ae2cdd2e
+AUX quidscor-1.2.48-paths.patch 1170 SHA256 7870a66b6be6697f06e7312e2bedf57d9372a1cce3c32318aa2bb7cc2a0ff8c6 SHA512 b96b376b9645b7d10860a8f0228c827c400c09e7d1a6e087d10ac093e26311b4beb82457456dd8575f597594153ba0a1f0f63cc1517b3faf0d32d095b87c7adb WHIRLPOOL a4029ad99db82142ebf071e7b133cfb6f3b904c08d0e3127cf48531c31719510bc134d8439d6a599991856a5d57f6e073cffe0d352759042461cb23d9026204e
+AUX quidscor-1.2.48-strip.patch 225 SHA256 22889d09576fbe741aef77674a994b9d995d614c8c791e0539c4de1f044796c1 SHA512 aa74a95847acf7064cdd264da611f7d63b84f2c8d60f48facc77b0100a89412f93f9630841afd944681a780ff4a0f44526730fd30c860a60869e4869bf597965 WHIRLPOOL 5bd688f0a948f1a82dc0d2e006339705c2bf7166e438c2cc343167f7a7c90baac596945821ab51797e9218c45e01594fba72892feb2eaa8adee5d31784451818
+DIST quidscor-1.2.48-src.tar.gz 77843 SHA256 619451c1501a2eeac3fbad14a3b7d21942a51368431f4c3c620ddf1f4c1faa2f SHA512 8272a1a4ed406d3429f0438dabddd15092be0a33a8fce3c5b0af0ae13422c8918f1a5971b2c2ea639fb87ffdeb1bc89085f07f89856e732f0b270b57eabb7010 WHIRLPOOL eb74036b5fde1981c04c0994d3e70c274d4c03f6bd16fd5c6d2528d0c181b10e9f92b1dc994e9e23d3e6a80df18130f4c9649b327d3e9f532060a446645871f6
+EBUILD quidscor-1.2.48-r1.ebuild 979 SHA256 401f17b8476a34c2a0f33d1aa6a941ef26c449af9a911ddd2c7d6d1a749dbb9b SHA512 2d23ab73c4da553c536dfe8dd5e21d70aefa0f7e5dc6e3a6c2b2d134a22ecc6888464cb3b0eab3ec26442251a239874404fa2034aa7e44210b8f8ef59c58a75d WHIRLPOOL f00c375291e7fcb95bca517aca7c0541b952995fddc9ee2f8a69c34b6cee95b0b3dcafe3dd312804d94231423c27bf8281cd96b161f03fa2e61d324177246cf5
+MISC ChangeLog 2561 SHA256 b65fae4f2bbea585c621149ac4e5ad9e3d5e87c629c0390adc53c137e5d63374 SHA512 ef0d537607dfa41e306466617ff6d1ab4cbda122113bd684471d1d78e8603f5acc81e5ec72003b27a54b43a0e12cdccf7d24fd4c5644d168a29d36a0e15c09bc WHIRLPOOL a0574202fdf49b863c3a735a2d5229278d2732a9965ccea7093b49c812050c313615dd37d7618623d9020a2352c509f7813a3e04ff3fa6e146036eba0d43e2d7
+MISC ChangeLog-2015 1626 SHA256 eb42a5ec0b7ef7dcecb1f480abbe37ebf21490858300c07fb10a9f222ec7474e SHA512 2e97d59a581345d5aca71dc8f914a433513327518cbee6be85dda01547afe5e103625542c7cf9f4b6c66c846ae75c805fbfb53a5cf1acd278857c5c218db036b WHIRLPOOL 1ae69af0cb0bdc43c65d979f8f2adc5229f1f8296cf42c07660e76cf6771e0b1189b89caea34420fce936eb3612ea83b9d14902f69c8f8b0f2df44dec27c6bf9
+MISC metadata.xml 358 SHA256 c08ed9eba9f042e5a6ad31e6e37c6adac2228fa8e7fb418e53206f6287e190ac SHA512 be88c15adc53d883a35fa6ef7ed9f7d7fc442d9f4ca76b097c8c93f126d75bfb447a65c36f9c72022063b8336f26a045a29ec6b68d3da8591738c0e8017ae6bb WHIRLPOOL c1128952bc471e43491b991133cf35434bc7ebf866aea9598bb49910aac6a56d5b0683459bedcf39f98aec1b949c4e4580cf78bd89d28eedfe1cf7d30dd82724
diff --git a/net-analyzer/quidscor/files/quidscor-1.2.48-curl-types.h.patch b/net-analyzer/quidscor/files/quidscor-1.2.48-curl-types.h.patch
new file mode 100644
index 000000000000..5f1e035c81d6
--- /dev/null
+++ b/net-analyzer/quidscor/files/quidscor-1.2.48-curl-types.h.patch
@@ -0,0 +1,10 @@
+--- a/libqg/libqg.h
++++ b/libqg/libqg.h
+@@ -38,7 +38,6 @@
+ #include <arpa/inet.h>
+ #include <dirent.h>
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <string.h>
+ #include <strings.h>
+ #include <libxml/xmlmemory.h>
diff --git a/net-analyzer/quidscor/files/quidscor-1.2.48-paths.patch b/net-analyzer/quidscor/files/quidscor-1.2.48-paths.patch
new file mode 100644
index 000000000000..6168720cbdf4
--- /dev/null
+++ b/net-analyzer/quidscor/files/quidscor-1.2.48-paths.patch
@@ -0,0 +1,37 @@
+--- a/quidscor.conf
++++ b/quidscor.conf
+@@ -15,9 +15,9 @@
+ # Logdir: directory
+ LOGDIR /var/log/quidscor/
+ # Cachedir: directory
+-CACHEDIR /var/run/quidscor/cache/
++CACHEDIR /var/lib/quidscor
+ # Rulesdir: directory where .rules (for snort) live (.lib for dragon)
+-RULESDIR /usr/local/etc/snort-rules
++RULESDIR /etc/snort/rules
+ # Expiretime: time_in_seconds
+ EXPIRETIME 86400
+ # File for custom mapping (must be absolute path)
+--- a/quidscor.h
++++ b/quidscor.h
+@@ -85,7 +85,7 @@
+ #define AL_UNVER                "alerts_unknown.log" 
+ 
+ // Directories
+-#define CACHE_DIR               "run/quidscor/cache/"
++#define CACHE_DIR               "/lib/quidscor"
+ #define LOG_DIR                 "log/quidscor/"
+ #define CREATE_MOD              0700
+ #define MOD_PID                 0640
+--- a/Makefile
++++ b/Makefile
+@@ -84,8 +84,7 @@
+ 
+ install:
+ 	install -d -m 0700 $(IVARPREFIX)/log/$(PNAME)/
+-	install -d -m 0700 $(IVARPREFIX)/run/$(PNAME)/
+-	install -d -m 0700 $(IVARPREFIX)/run/$(PNAME)/cache/
++	install -d -m 0700 $(IVARPREFIX)/lib/$(PNAME)/
+ 	install -d -m 0755 $(IPREFIX)/sbin/
+ 	install -m 0755 $(PNAME) $(IPREFIX)/sbin/$(PNAME)
+ 	install -d -m 0755 $(IPREFIX)/etc/
diff --git a/net-analyzer/quidscor/files/quidscor-1.2.48-strip.patch b/net-analyzer/quidscor/files/quidscor-1.2.48-strip.patch
new file mode 100644
index 000000000000..9d169e619c0b
--- /dev/null
+++ b/net-analyzer/quidscor/files/quidscor-1.2.48-strip.patch
@@ -0,0 +1,10 @@
+--- a/Makefile
++++ b/Makefile
+@@ -69,7 +69,6 @@
+ 
+ $(PNAME): $(PNAME).debug	 
+ 	$(CP) $(PNAME).debug $@
+-	$(STRIP) $@	 
+ 
+ $(PNAME).debug: libqg/libqg.a $(OFILES) Makefile
+ 	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OFILES) $(LIBS)
diff --git a/net-analyzer/quidscor/metadata.xml b/net-analyzer/quidscor/metadata.xml
new file mode 100644
index 000000000000..2a7b2d66bb99
--- /dev/null
+++ b/net-analyzer/quidscor/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">quidscor</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/quidscor/quidscor-1.2.48-r1.ebuild b/net-analyzer/quidscor/quidscor-1.2.48-r1.ebuild
new file mode 100644
index 000000000000..9c118b6762a3
--- /dev/null
+++ b/net-analyzer/quidscor/quidscor-1.2.48-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Qualys IDS Correlation Daemon"
+HOMEPAGE="http://quidscor.sourceforge.net/"
+SRC_URI="mirror://sourceforge/quidscor/${P}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+
+DEPEND="
+	>=dev-libs/libxml2-2.4
+	>=net-misc/curl-7.10
+	>=net-analyzer/snort-2.0
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-curl-types.h.patch \
+		"${FILESDIR}"/${P}-paths.patch \
+		"${FILESDIR}"/${P}-strip.patch
+
+	#yes, the fix below is as pathetic as it seems
+	echo "#define FALSE 0" >> libqg/libqg.h || die
+	echo "#define TRUE 1" >> libqg/libqg.h || die
+}
+
+src_compile() {
+	emake EXTRA_CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake PREFIX=/usr STAGING_PREFIX="${D}" install
+	dodoc ChangeLog FAQ MANIFEST README TODO
+	# fix ugly install
+	cd "${D}"/usr || die
+	mv etc .. || die
+	rm -r doc || die
+}
diff --git a/net-analyzer/raddump/Manifest b/net-analyzer/raddump/Manifest
new file mode 100644
index 000000000000..d81408864316
--- /dev/null
+++ b/net-analyzer/raddump/Manifest
@@ -0,0 +1,5 @@
+DIST raddump-0.3.1.tar.gz 175078 SHA256 f2d5c80164a5064d25e112f3ead9952d86200b022da584bddbc4afea948cb970 SHA512 35daf9c31fc21f29e713fa0f3e5c438f5762087060068506f6e0d829a0fabe74a99fdd1a35bf878aa0cbf5a5f0bec212b0af51b7c3df4e58ec0165b4dee023fa WHIRLPOOL f94bb1c7bef210040302fc1048ba4a64de53f7d80d3d894493efffe7b7bd2bf4a88da7d40def4f7b566e3dc063c54370ba42149588e1320d7d163fea3b59262e
+EBUILD raddump-0.3.1.ebuild 523 SHA256 d5dab53be0bcd7370b002c83ae7c6408f811a9307d8a0728dea58f24f6f09796 SHA512 edeadfa9d675ed80b6084a320ccd8c78e7f3c25bdc2c1da03f2d32c1619d75fe145b80044486fe0357573706e550819dd2f69ab05d4b1cb965bbe11774af2663 WHIRLPOOL 8f8f8061ee607f5695ff59858c8c7c87091303d7756ff1b3780c07cf0cae4c3a58860d5174c162004025dae961145a2c7916d65603e5e72f932a1f06553d9c6c
+MISC ChangeLog 2292 SHA256 ffa6f231c1930b328e6a0ba898b95d0a4086f990dae05c07234b153732bd5d57 SHA512 6b689af7921b46a476a7931e9619606a61d70b4806755533aa832ad2ac0e87b07574506c5d9ca92890efd41290b46a586ccd4aafa3c14dcd14a403a793a8cb2e WHIRLPOOL 68a96594c09da88659733ecd6d990bb0d1acfe123fa704deaffc4b2f823e1276598221483d595f380407771e66d357f141643546ebc83e60f6ac96ffc133d1aa
+MISC ChangeLog-2015 994 SHA256 2c88b512758141dbf4e9f6ede2dc93a3d9cf971ee313ab3d91957301b8fe905d SHA512 a6a37f3d3d788887a7cddf0999ff2a09d748ed8361e643acc2ee691183caca64278174bd7405a14b0a2e4b220401f2a26f23c4eec16164d751785fa7a6793e41 WHIRLPOOL 30484332f01f62a2c538efb125f59faeae39c0c44e958e1fb66752908cbeb0a18e581809b78c84e2d4677efbef7d0cf47b30ea4c3f7824904f5d63bb76051e4c
+MISC metadata.xml 303 SHA256 0fc2dde31d9d17b23e4f03ab28cfaa573299b980922da4f7e1a830a66b2095ed SHA512 909be6bfdade930b47197c82cbfdf7a38e1e1b88bf8dddb3fe887a75f3493c4fe343a274c87cc8e3ef73324f99049836d62da818b93a6b30954e140f5379926b WHIRLPOOL fe94d2acd22a0f1f39edd8c73e429a43a5b48275df449e079bae9dd1749c1b772a2cb8247455b7e805567df155c46ebccea57a931598e87b8cce9ec3d99b9a25
diff --git a/net-analyzer/raddump/metadata.xml b/net-analyzer/raddump/metadata.xml
new file mode 100644
index 000000000000..031c18c54a9f
--- /dev/null
+++ b/net-analyzer/raddump/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>robbat2@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">raddump</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/raddump/raddump-0.3.1.ebuild b/net-analyzer/raddump/raddump-0.3.1.ebuild
new file mode 100644
index 000000000000..f65595721d5a
--- /dev/null
+++ b/net-analyzer/raddump/raddump-0.3.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit autotools
+
+DESCRIPTION="RADIUS packet interpreter"
+HOMEPAGE="https://sourceforge.net/projects/raddump/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+DEPEND=">=net-analyzer/tcpdump-3.8.3-r1"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS README TODO ChangeLog CREDITS
+}
diff --git a/net-analyzer/rain/Manifest b/net-analyzer/rain/Manifest
new file mode 100644
index 000000000000..fc92f57ceb60
--- /dev/null
+++ b/net-analyzer/rain/Manifest
@@ -0,0 +1,7 @@
+AUX rain-1.2.9_beta1-gentoo.patch 1213 SHA256 8cb1fe805bcc4011fa39b8c367b4c05ac39435964386300441a905964c161dd7 SHA512 7a7f623ee8d7e72c91fce9f4185c14e5c4ac6764229f63f37a324f5683c4fa8b99c298e04d2fa51d093eb86547fde2c98c4e66e592c3ec92970616684d672a69 WHIRLPOOL 7135b58ab8d6556509d4476725a341ae15b0015186e2af6fc427ca3c9a6e91fe90041e5dfedb509096ea1571f7e3fe83b3b3eeb4883e1f6e1396f7d893e5ab71
+DIST rain_1.2.9beta1-1.diff.gz 1828 SHA256 803f331835af83e0e47b7d4e5e07c2ea25b75de0ab274565bb4582b549774648 SHA512 5e871fddbf475d8e73c88a3f7340199cdfae8f54446aced599be7658e0be2c6b7a7ef2626cd13dff577df5c81187fa07bc8ec3a7ab386752e4be321d9a372843 WHIRLPOOL 64ca4e5edc1c49cb00ffa5c58c7dc132f85268400ab69e8448a0d45ebfb4a56d8081ea7d109f5e921c0c1b56d3eb658cd8805aa0952798ae8e6ac426cf4191f6
+DIST rain_1.2.9beta1.orig.tar.gz 79098 SHA256 1c2d21c5187a9511da257c946f65ce1b4e962d2822970b2a3db85b73daf1bb45 SHA512 5e61ac26872e453c6da9e600e3fb427425d2f79a7a5f569ab93308c0b0f4509b6a0d5b45b138f04b9f8bee7b16b8b63be28b7ede65a92f5d4a3384e73e12036d WHIRLPOOL e0b4996c321d3842ae058dbb15959b46ce490b72860bd568a58d126f60d813c6ea943b5b7eb208973f698c89eab632e3d859f64dc4978a8f08c83ed5fef1f11f
+EBUILD rain-1.2.9_beta1.ebuild 708 SHA256 a0a8727e854df5baa1b2a6c464860b34bbdcaa56803edd3f2bae601ba5df1465 SHA512 7a8757eed74b9b3fc790b023f4bdd7e4bf7fc13d3c436f06651610503f0bc2a1e6308ac7bda792d95179578eca7e46764734f342587cef493f43a567f7bb17fa WHIRLPOOL 3d29e2a9ccdbff735427ad3353e537ad6bc04a9075289568c50ebd3a4e2a8985793ed850fcf221e2c8e0734e2b3d4d6a446c747ced52e307dc7a45c92c9ff37d
+MISC ChangeLog 2474 SHA256 47da3228399561f110702280b21b4c9afcd1d0a5959dc78965f60d6c60b25d44 SHA512 077bceb9284fe75cd9611411877a2c43ed3a1db508ccd83de9e432d73ac0efdeefdbf0ae2ca6b61bfa82818eaec39a713b17b14ed46180c4bd4559e0ef8d2112 WHIRLPOOL 7ac1a32aec8e2a266fa4f6bd5eab4aaf4fc0642d19047ba8fc1870b0f02d6229342fb82502cde5754d21b8b45c7bc7f4d8e866ab66c3dfb930467201dd8bb867
+MISC ChangeLog-2015 1649 SHA256 7e161181de0da3f58b672020aec71d7813ced8dcf6801f5678ea370d67f367d4 SHA512 ed89f0db65c05c4ec4cbe11be78fa72c01e2902abea82855e029bc65c42f651958386b02e23f0eb278e67c8f206fbfc380dac8934f563c044478c3ed738f0573 WHIRLPOOL 53b55aa5a436fec245c624dc6d6cb7e796eee8a9c84d5d7a5f4fabf5ddd3234b16f27ccb39a173ff0ef1f15e21971c82e167127f20d7ca1e275ec8523e370e2c
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/rain/files/rain-1.2.9_beta1-gentoo.patch b/net-analyzer/rain/files/rain-1.2.9_beta1-gentoo.patch
new file mode 100644
index 000000000000..01666a0bfab2
--- /dev/null
+++ b/net-analyzer/rain/files/rain-1.2.9_beta1-gentoo.patch
@@ -0,0 +1,27 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -6,12 +6,12 @@
+ RAIN_PLATFORM=@host@
+ RAIN_VERSION="1.2.9beta1"
+ RAIN_URL=http://www.tenebrous.com/rain/
+-CFLAGS= -g -Wall $(LIBS) -I./include -DHAVE_CONFIG_H -D_GNU_SOURCE -DRAIN_PLATFORM=\"$(RAIN_PLATFORM)\" -DRAIN_VERSION=\"$(RAIN_VERSION)\" -DRAIN_URL=\"$(RAIN_URL)\"
++CFLAGS= @CFLAGS@ -Wall $(LIBS) -I./include -DHAVE_CONFIG_H -D_GNU_SOURCE -DRAIN_PLATFORM=\"$(RAIN_PLATFORM)\" -DRAIN_VERSION=\"$(RAIN_VERSION)\" -DRAIN_URL=\"$(RAIN_URL)\"
+ INSTALLER=@INSTALL@
+ MAKE=@SET_MAKE@
+-MANDIR=/usr/local/man
++MANDIR=/usr/share/man
+ MAN1DIR=$(MANDIR)/man1
+-SBINDIR=/sbin
++SBINDIR=/usr/sbin
+ 
+ all:
+ 	@echo Making all
+@@ -30,7 +30,7 @@
+ 	-$(CC) $(CFLAGS) -c source/rain_udp.c
+ 	-$(CC) $(CFLAGS) -c source/rain_main.c
+ 
+-	-$(CC) -o rain rain_command_line.o rain_defaults.o rain_die.o rain_icmp.o rain_igmp.o rain_inet_common.o rain_main.o rain_mem.o rain_resolv.o rain_services.o rain_signal.o rain_string.o rain_tcp.o rain_udp.o
++	-$(CC) $(CFLAGS) $(LDFLAGS) -o rain rain_command_line.o rain_defaults.o rain_die.o rain_icmp.o rain_igmp.o rain_inet_common.o rain_main.o rain_mem.o rain_resolv.o rain_services.o rain_signal.o rain_string.o rain_tcp.o rain_udp.o
+ 
+ 	@echo done.
+ 
diff --git a/net-analyzer/rain/metadata.xml b/net-analyzer/rain/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/rain/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/rain/rain-1.2.9_beta1.ebuild b/net-analyzer/rain/rain-1.2.9_beta1.ebuild
new file mode 100644
index 000000000000..72284beaad76
--- /dev/null
+++ b/net-analyzer/rain/rain-1.2.9_beta1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+MY_P=${P/_/}
+MY_P=${MY_P/-/_}
+DESCRIPTION="powerful tool for testing stability of hardware and software utilizing IP protocols"
+HOMEPAGE="http://www.mirrors.wiretapped.net/security/packet-construction/rain/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
+SRC_URI="
+	mirror://ubuntu/pool/universe/r/${PN}/${MY_P}.orig.tar.gz
+	mirror://ubuntu/pool/universe/r/${PN}/${MY_P}-1.diff.gz
+"
+
+S="${WORKDIR}/${MY_P/_/-}"
+
+src_prepare() {
+	epatch "${WORKDIR}"/${MY_P}-1.diff
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+
+	eautoreconf
+}
+
+DOCS=( BUGS CHANGES README TODO )
diff --git a/net-analyzer/ripe-atlas-tools/Manifest b/net-analyzer/ripe-atlas-tools/Manifest
new file mode 100644
index 000000000000..f4f6be5a1bf6
--- /dev/null
+++ b/net-analyzer/ripe-atlas-tools/Manifest
@@ -0,0 +1,9 @@
+DIST ripe.atlas.tools-1.2.1.tar.gz 83916 SHA256 3f4d385ffa9bfb9cc04121dc109807f85d1291db4705529ff83da44847856665 SHA512 4c91d14f15e80e7e0ce4d6973e497bb48561314434d1521437311fb813197da7ba0a3e27f14cebe5a71d75baba37d2e5045b94d9e39699ef4a4e57aafb063ea7 WHIRLPOOL 7e5c2d30407191b18c7e4d4418fcb64c386ca9525a2b8224d5290c4fab1e458686d86a00cac7b7bbd70d1d0688e44e76bd563e2589c8aba204ac8165ef10fc0c
+DIST ripe.atlas.tools-1.2.2.tar.gz 84242 SHA256 93f86d1177b3dc4dd9ac89f08b77d808f093150a5b0afb0351b30a628251a2a0 SHA512 f76efc0412e21ae50c27ddb33b00274f9be6f6f8d2106eac4e76d8dcdc14f114efc0cae5ee961b56f10b302cee0afa0ea6b84b0df588ddaf9ff5e132f8db4f2c WHIRLPOOL 138d678859be850364835cf4e6ccaa222d3b5c757b6f9167dda44b55cd9621515a798840fb66242f48232a26e9a7bfb32f4d5a9b3e899799941f302b877660d4
+DIST ripe.atlas.tools-1.2.3.tar.gz 86364 SHA256 fa93796623789fbcc2ed651297a704da4d3239b5eed13d637ba1361efccecc1c SHA512 f9e3b94ac9561faf0f6738099a0511b5aedb3b0d3230997a8033b8a1a804b885169891de8f408933ad90e3d4543375741657d9989fef09548d9cc8f0d9920e66 WHIRLPOOL dbdcfd801a3e1a3af3271d5f4e12cd068494d50cc442150eded4a805a9871360ee93bffb5118ef10b3806d3ac4bfc0a9f36964b7a54fb60d01fe78b0b70b9112
+EBUILD ripe-atlas-tools-1.2.1.ebuild 1271 SHA256 212162e09a6b3557d01e5e8c1bb1b022c0e15671e9efac34fd1ae886d7a69235 SHA512 e30a9dabe7ec4947f310a97ac417fe81d0308f00906a4daa44df19d04c7bc084816df383f5b9a3a1c7c210b603514de27283f837d00c29e52c2acd66e9f82435 WHIRLPOOL 12882ca0edc5463fc2414774020c871eb5f99859b30ca39f2bcea917cb4fe372be697253bde960cfc068115162565f72b0d512f2e0e0c6bab1a4e8fbe3fbed1b
+EBUILD ripe-atlas-tools-1.2.2.ebuild 1269 SHA256 4880a21716763697ddbb0b33d7829689cded2f21ec8da0cb82560585f539e351 SHA512 248a50f7f8c599475e5da8db73c333952b646c41910ff0f2efba6289b955552f508ad9c888a3d3f17ac9ac2dbf3f9049febb488d89758f43b411da2031e06a48 WHIRLPOOL 90907a8b2e00d3b4266a022c93c13cbccc81ca2440625d96883fb0f0ececc0fbb35f8f1afdadd6ee9dc8e0a16e29809fd69fb4f19d5454b39378c98a1a623960
+EBUILD ripe-atlas-tools-1.2.3-r1.ebuild 1303 SHA256 948be222379f8c3cc5bc874fcfa135341f22a06fdf0d20789f2407764dc08311 SHA512 0fbb6e077ae0855fa070620a34b0c63f6a6a749b6e9cd871ecbd94a0ec4bd4d8ae3f6e28ccd4365b67c584c720fa33e1c9dfbdcdebaada5c1cbe74ec232e8c14 WHIRLPOOL 55541881cdaddefed595120b345c805858a7d5a24ae277f24247b1264531e815582fcad5167988c78c67b800ed0c36a0d1134f5a8be9582107ee477f93684450
+EBUILD ripe-atlas-tools-1.2.3.ebuild 1301 SHA256 7b654b3ad0f5401c2317284380b8a30f5e586bb1307a5d06619484d1cd44a977 SHA512 c7fd5df592c73ee30e4341fe4494f601a716c52538ab3d0f71294648a5e7668cd2261c5bc215d5a48ee2d26abe0018ae5b0bff92013aa4e6e6fed606d427d59a WHIRLPOOL 8ba79e2b6ee7d8752041009410d4e5c9d8cd6d3fcf4afa8bd4749a9d3919b02091f44fbe2b348f147e8939790ad58d18f298fafda3000001e6c08acdf1c8229f
+MISC ChangeLog 2096 SHA256 8ebbc85ba10caf4071da1edca158faae5f33601502cbd65deed891082f9d7226 SHA512 f4c865118392635f062fa90b55baada65dc57fe2708c9b6f1d96052b8d390161beff161a888a7422fe5c84950d4639fc260cbfe8efeeffb8a42a7cfcd9c03b55 WHIRLPOOL fbb4679c391ce7eb8271a4083a50a44083e8aac1d24afa458606f678099cbaffbcb56f539488ece922539f9ec06098c65bf3c8bec863f047ac1b40f3af1ea70c
+MISC metadata.xml 523 SHA256 950faa567998fcc1ae440778eee961376693f6414f07ce08ab49cacc31680dad SHA512 e1d1bfcfeec6ef799e20d0133bd577d8a7106d4828eecff1c4d2baced482067d40023bbd4539d2b2407504fb9055d52beab22d3bc829ceee647fad570dbcd1d7 WHIRLPOOL 3841103376f373e9f4b7bb4611673dd6d9647538e78ab312035eae341ca7371652a75bb26ecee4ef962075543cd481d9e18d365611e17559fa6a1b8e84d7759c
diff --git a/net-analyzer/ripe-atlas-tools/metadata.xml b/net-analyzer/ripe-atlas-tools/metadata.xml
new file mode 100644
index 000000000000..f57278f1e3c7
--- /dev/null
+++ b/net-analyzer/ripe-atlas-tools/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@danielquinn.org</email>
+		<name>Daniel Quinn</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">ripe.atlas.tools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.1.ebuild b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.1.ebuild
new file mode 100644
index 000000000000..283dfe597855
--- /dev/null
+++ b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+MY_PN=${PN//-/.}
+DESCRIPTION="The official command-line client for RIPE Atlas"
+HOMEPAGE="https://atlas.ripe.net/"
+SRC_URI="mirror://pypi/${PN:0:1}/ripe.atlas.tools/ripe.atlas.tools-${PVR}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+S="${WORKDIR}/${MY_PN}-${PVR}"
+
+RDEPEND="
+	>=net-libs/ripe-atlas-sagan-1.1.8[${PYTHON_USEDEP}]
+	>=www-client/ripe-atlas-cousteau-1.0.6[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/tzlocal[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/ujson[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		"${RDEPEND}"
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
+
+python_test() {
+	nosetests --verbose || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+	echo "RIPE Atlas Tools (Magellan) [Gentoo Linux] ${PVR}" > \
+		${D}$(python_get_sitedir)/ripe/atlas/tools/user-agent
+}
diff --git a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.2.ebuild b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.2.ebuild
new file mode 100644
index 000000000000..7bb832dcae2a
--- /dev/null
+++ b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+MY_PN=${PN//-/.}
+DESCRIPTION="The official command-line client for RIPE Atlas"
+HOMEPAGE="https://atlas.ripe.net/"
+SRC_URI="mirror://pypi/${PN:0:1}/ripe.atlas.tools/ripe.atlas.tools-${PVR}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+S="${WORKDIR}/${MY_PN}-${PVR}"
+
+RDEPEND="
+	>=net-libs/ripe-atlas-sagan-1.1.8[${PYTHON_USEDEP}]
+	>=www-client/ripe-atlas-cousteau-1.0.7[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/tzlocal[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/ujson[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		"${RDEPEND}"
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
+
+python_test() {
+	nosetests --verbose || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+	echo "RIPE Atlas Tools (Magellan) [Gentoo Linux] ${PVR}" > \
+		${D}$(python_get_sitedir)/ripe/atlas/tools/user-agent
+}
diff --git a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild
new file mode 100644
index 000000000000..896c96e4e9df
--- /dev/null
+++ b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_PN=${PN//-/.}
+DESCRIPTION="The official command-line client for RIPE Atlas"
+HOMEPAGE="https://atlas.ripe.net/"
+SRC_URI="mirror://pypi/${PN:0:1}/ripe.atlas.tools/ripe.atlas.tools-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+DOCS=( CHANGES.rst README.rst )
+
+RDEPEND="
+	>=net-libs/ripe-atlas-sagan-1.1.10[${PYTHON_USEDEP}]
+	>=www-client/ripe-atlas-cousteau-1.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/tzlocal[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/ujson[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
+
+python_test() {
+	nosetests --verbose || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+	echo "RIPE Atlas Tools (Magellan) [Gentoo Linux] ${PVR}" > \
+		${D}$(python_get_sitedir)/ripe/atlas/tools/user-agent
+}
diff --git a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3.ebuild b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3.ebuild
new file mode 100644
index 000000000000..c48c7717c1d8
--- /dev/null
+++ b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+MY_PN=${PN//-/.}
+DESCRIPTION="The official command-line client for RIPE Atlas"
+HOMEPAGE="https://atlas.ripe.net/"
+SRC_URI="mirror://pypi/${PN:0:1}/ripe.atlas.tools/ripe.atlas.tools-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+S="${WORKDIR}/${MY_PN}-${PVR}"
+
+DOCS=( CHANGES.rst README.rst )
+
+RDEPEND="
+	>=net-libs/ripe-atlas-sagan-1.1.8[${PYTHON_USEDEP}]
+	>=www-client/ripe-atlas-cousteau-1.0.7[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/tzlocal[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/ujson[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
+
+python_test() {
+	nosetests --verbose || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+	echo "RIPE Atlas Tools (Magellan) [Gentoo Linux] ${PVR}" > \
+		${D}$(python_get_sitedir)/ripe/atlas/tools/user-agent
+}
diff --git a/net-analyzer/rrdcollect/Manifest b/net-analyzer/rrdcollect/Manifest
new file mode 100644
index 000000000000..4730d740bc28
--- /dev/null
+++ b/net-analyzer/rrdcollect/Manifest
@@ -0,0 +1,6 @@
+AUX rrdcollect-0.2.9-include.patch 206 SHA256 95896cd56078294361a4fb3aff829cfb35db03b375fd839b70ead1b37f7fd8b7 SHA512 e3092bfe72977cd67cbb4654a44a504d532fbcf3914c3d339e99d9d61d704d7d6954e233d6d5f04cd02ef4fb827cde0835dddca519e3cd26cbc9b7aa74eb72ac WHIRLPOOL e5d66c6ac14d3db0e0180a262f84f412c84347a79bb41599293148a6688b34951e14b133c388ce1387601fe875e39fc68bcda7936c81a7ae5281aff97c3145c3
+DIST rrdcollect-0.2.9.tar.gz 137397 SHA256 df738369c4f7c642e85ee1e0314c29cca19534c4d53074295b25c3b309ea1a50 SHA512 5f01b93a469d32f095b501c3611d4e31d354025848aeffd913db9625d0186a3e7d394dae1a2383449836c37e758a39a3473710a1855411288659fa6ac249e10f WHIRLPOOL 746ad907ab98db872e498695f56cf0579141726eebe505f2fbeda78a9c46bb41b6d2b59ca2a9f21efa1e1903cc31bbdb7a6c56ac17f3a2ab25a164464a5d41fa
+EBUILD rrdcollect-0.2.9.ebuild 727 SHA256 0ffe15675c2d40d299cfad0d31bb938ac9aff2e10faf0d2738a6a739af5af6f9 SHA512 249fabf46c1ba7cc293bf0238b8b0a09eea689746878a3c3d521beee9a58a659a0b5fa5d348cb72232b4b49d42bc3907b5d8ae62260fdd5127b8eaa3b2133a54 WHIRLPOOL 0dd921330ca7339a9abc0e6d0953e831925958182cf0d2e3bdaecb53884120e9b26f76f83b77861b6bea55250e724397c1705c9c729a5d37e91e84cf2a816b80
+MISC ChangeLog 2481 SHA256 ceec273e1129dbc2cc7e5dbde14d15343b9f187e49d88e7b642bea6161982d3e SHA512 405e582884f3084ccdd824ae0d3cb91133859ca6a588633e0c60ca66ca71d2e79c000da24946cbc396e9b078f78f1153e0e0e64eaa9232a8d9e90c20785a9f45 WHIRLPOOL 29e4e8ae24fdcb527aaa96435445d22981128e25256fc1002818ee89e015b9a5e18f30d618603c47e01a61eb483da19abeb0b8a5dc9ceaca2aaf554489405cc0
+MISC ChangeLog-2015 1527 SHA256 d78cebb9f01d776646403d2fd919d779b765ed053c0521f22b3c50b37b769a93 SHA512 194eb0e4814ed9623d031b6b9302136f39dffeaef0822e8e3452bb8083783024fd18ff9f0287dfd7e222eba10dd98b31c5b4a0667e19e435192b4fb0577d3ec5 WHIRLPOOL 073937ec4e3d17de01718fe2eeddb0539b2e42794bdd9a44fbab557e8d50016890ff93be3e7341d00e85a1769e6573f7d8c19171a756e30e1d84c832afebf4f6
+MISC metadata.xml 515 SHA256 54437d76f5c0b01e68b8324cd05784de9d59c1e29e3f720b8cf3d1b7ef45713f SHA512 68fc73d6b069e077b672c34aaa99f0c1a07c861573a123458fd5953efd71134a7b93bb81d93a41b6d1e5b51228e304eed40d6cb36c795f0f20549e700914d051 WHIRLPOOL 83536e88ea1ab81c9e67a9edc7d75ffc121c7019ad7ff7ad02ce71059d3fc24848d09eaceaa3ab7796833226ef8178f470c8948f7e9999f8af14b5de78eb0640
diff --git a/net-analyzer/rrdcollect/files/rrdcollect-0.2.9-include.patch b/net-analyzer/rrdcollect/files/rrdcollect-0.2.9-include.patch
new file mode 100644
index 000000000000..69827b28358f
--- /dev/null
+++ b/net-analyzer/rrdcollect/files/rrdcollect-0.2.9-include.patch
@@ -0,0 +1,10 @@
+--- a/src/checkpid.c
++++ b/src/checkpid.c
+@@ -20,6 +20,7 @@
+ 
+ #include "rrdcollect.h"
+ #include <fcntl.h>
++#include <sys/file.h> /* flock() */
+ 
+ /* lockfile in rrdcollect.pid */
+ /* five digits+"\n\0" */
diff --git a/net-analyzer/rrdcollect/metadata.xml b/net-analyzer/rrdcollect/metadata.xml
new file mode 100644
index 000000000000..100eb9f44e4a
--- /dev/null
+++ b/net-analyzer/rrdcollect/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<use>
+		<flag name="exec">Enable exec:/// support</flag>
+		<flag name="librrd">Use the librrd library from <pkg>net-analyzer/rrdtool</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">rrdcollect</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/rrdcollect/rrdcollect-0.2.9.ebuild b/net-analyzer/rrdcollect/rrdcollect-0.2.9.ebuild
new file mode 100644
index 000000000000..e8380ce1376f
--- /dev/null
+++ b/net-analyzer/rrdcollect/rrdcollect-0.2.9.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Read system statistical data and feed it to RRDtool"
+HOMEPAGE="http://rrdcollect.sourceforge.net/"
+SRC_URI="mirror://sourceforge/rrdcollect/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="exec librrd pcre"
+
+DEPEND="
+	librrd? ( net-analyzer/rrdtool )
+	pcre? ( dev-libs/libpcre )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-include.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable exec) \
+		$(use_with librrd) \
+		$(use_with pcre libpcre)
+}
+
+DOCS=( AUTHORS ChangeLog NEWS TODO )
+
+src_install() {
+	default
+	docinto examples
+	dodoc doc/examples/*
+}
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
new file mode 100644
index 000000000000..f7da5941828f
--- /dev/null
+++ b/net-analyzer/rrdtool/Manifest
@@ -0,0 +1,23 @@
+AUX rrdcached.confd 150 SHA256 f544145d142ab85f5efa578c24ab6b813c4a236af2b3ddc51d5fb2cd847cf976 SHA512 93d95057e99c98c943060cfc607285e76ac4580e9955e65ceac69b09577dd6a78b1faa9e6213345a7f011beabebce21c9447b6bd39f4091762d9974cd1a358e0 WHIRLPOOL af0317711dfd276e8047dbf285125104931a9ea696d8b73e54d41bbce7d1d7c08da0d71564346a95b485171d4990005b2f944be227962aed44b332807f300838
+AUX rrdcached.init 331 SHA256 2b71e48e38230d4de26264c8413bfaf6e73ef903b7781894a53763a9409a5018 SHA512 383cebcc9ad035660def2e465690f52104eac4ac621faeca3f31822f2f2bbd96f23c60fc5bc6382855e971563d7d545cc7abc31fe351c57a8ea716bcd7c95d88 WHIRLPOOL 8d330c905c9c10e4f2ff01e081b3ba73b159ba658d334e66bd3fcd54e92c7a868293f309ddd4e340a43c9e444e77cf7849e9f5895a9f588ec5bfada1c761bdcd
+AUX rrdtool-1.4.7-configure.ac.patch 451 SHA256 a18b8dba4e80149494e9115db74233b253243b589928ed9955e328bfdb3bfe75 SHA512 15dfd061a2eedb569264ae5e2014961fd29d63d92add282eb54a228e682b0b08fc0ac755256c98fae385796cda32bb497d07f675cff8ab037634cf1bd32df9f2 WHIRLPOOL 5ff2cfb6c7350acc94f3ec459b92eea6f913cc05cd46d576920e89b8bad28330f30592b955ff24395290e3082d8e7d9afbf0bdff46a6095506115eb970f5b693
+AUX rrdtool-1.4.9-disable-rrd_graph-cgi.patch 1234 SHA256 7d398572fff4b5aacfbc9e7472d1dd93b564b82895f5bec15f559b6069409dfc SHA512 4ff2a2489abab95f4d2468c7a0e00a069c29d1bd6f69365bb52363ed43179c3c1f7fdbd1684a66c8d5146181e174fe5234e2c6710517cc7cb56bf111e512ff66 WHIRLPOOL 3f4356f43e1f5b4b4d925647c8ec85c03ce6d1b9b49f29a70a3e3bd85e0e4b0b6c1d899af34cd4f8c44dd9513f7ea49a6855aa490bc36d04e096185ea2e1f49d
+AUX rrdtool-1.4.9-disable-rrd_graph-perl.patch 914 SHA256 a8d5f4816fbfc760b52dc70de92ca97888f920c0192776cae819453e157f71cd SHA512 6eb8d8a8193ce5bc22a4645e909dc7eb0a911b1f89f6403afc9cffec705929cf64086f415e53b748254a384b83ff8352be82f735ad403795c17a9058bc3e386c WHIRLPOOL f06401a803325236244d4ae84825312ddce7c9409bf1e6064dda0abb470a3d69b7bf300d2e1607bbd4a4fa234d872664bc9fe500909665d6a960ac232bc0fb86
+AUX rrdtool-1.5.0_rc1-disable-rrd_graph-lua.patch 266 SHA256 e7e616c2e16e5774c06cec32730ced04b381014ce9461839a7217a1d3ce2eebc SHA512 1f981baffdadf8eb11728fba69d2942ef766fd99016d792873acbca44e84950a384396391aa8fc89f1f6f3f3742ae2b25745051c4ae0895e2f6e988a3a5573aa WHIRLPOOL 209bb27a7a7e269be3d808a01bd9006d72146fede816712ebf30204f29f70b701b85d8de91732fdaf6c923bf13a94c0e3095d5cda6ad7c38c750b505bacd326a
+AUX rrdtool-1.5.0_rc1-disable-rrd_graph-python.patch 1174 SHA256 2f422c7fc89dd11b06c56b09893795b22e47a6e1a0b50eb9c2ebadf4bcf47ba4 SHA512 54a1b35f07260a3b88b2bcb8220ca896b4a45f10a251c4ee492890389384e682c149ce9a31e9b00835dcd5d3e105b90a322c1820108363fc53e15ee0d77267ef WHIRLPOOL dc13cb34989b6548a7eddf60fa04732bfcfafea5dc324d72428bf7d8cf27a2c3ee005eac7f46e4ada1cd4da1430843519d72ef8a754d6b946f1e65b97557d888
+AUX rrdtool-1.5.5-rpn1.output 68 SHA256 5975d32a250dc7dc72b855c36e58831b9c5904c811c92926039126221e6fafa9 SHA512 3fa099963bf4c29f033e4f7453701959799aebf44027aaf0638a5799c5b237615cb8b6bea22e06b60b34eae5e66040233d61e811e1465612595908f673bb715e WHIRLPOOL 80edf30d70e1733a4f50916db714a3d30b850e2836e2187debe45dc91f1781f92796481d0c1e9547695deedff3e9bbeaa7c0438a98244008ad1b386f9dc31562
+AUX rrdtool-1.5.5-rrdrados.pod 1419 SHA256 ba731ddc7d60b9cb463a464021a37b00e4a48c19875e6b6e07c41b67289bcbf6 SHA512 fd3339862c51c8573dd93079ba70c9b538c4d73d031157fe845bcb59e7233cb5e9fa8cc451e760f8ae30014c975ec9ee04f66d42fc928c621a572b92e9348e4f WHIRLPOOL bdc6d0f701b4f7b48492e32871303a51e64b5aecf745a00d889888b100a8d0682501e015f36749bc10ff3bbbfeb5590bc74cc7663f3b0bd86dfe5ec4df4952dc
+AUX rrdtool-1.6.0-configure.ac.patch 537 SHA256 af68107fdacfbba3d27ac304bc2487fb36c69c371a7607b65bcbc53532007b3a SHA512 2cec107823b47646d019182b0c52489d5d00dc287a97aae31844128bd5bf81b91168b56e386d8b59cfefa51f3de3d004ad0b626b8a773d419b9f717b2a723967 WHIRLPOOL 9678591996575241c0520e193b23e46445f397748ba4918ad54d3ae6289e3366bb3e1bb44112912baf1cd7b04166747cbfd15b9de03e2e649d3a9166a728931c
+AUX rrdtool-1.7.0-disable-rrd_graph-cgi.patch 1249 SHA256 870eee1ca13ac701a8eefb735aac3eab7b72179e640c9d36f428851a3a643bf6 SHA512 5c2d192919e31a91cd600ed0e11346a4cbb1c66f93abbb583f20882d03705972eb4ed3156a9cae9a589aa5d26009037deb280569baf940966887483c6dbefb81 WHIRLPOOL 83a1f632293bb3a0a85539fad7ed938b179dc3f4a8895a65d9aa6808435d2ddb1f17b9906c9fd56e08f7443889252ea2b29776d86705f548a8abf164c7bcd9dc
+DIST rrdtool-1.4.8.tar.gz 1379482 SHA256 de95b9f5aa488b0683600aad5a07c316f8d98cbe8d00aa0a1c87e2b2ef89f3d6 SHA512 c525978829508e1db393092c948d8db910554f42e1221acc4064a8f546ceac5d68943f603c6f0ef0e6510bbe5f606cfe6862672145ea1b630cd2b7fd07fa805b WHIRLPOOL f3926aed715a80c8d8287b057c39bbe614d81ebf9f24d1e285a9a438594d5c4c66b59934cc7c6be0550f0f729f319b01a46efc32ccf0b412563c43cf74a21564
+DIST rrdtool-1.5.5.tar.gz 2187685 SHA256 3a286d449c05d657e3fc3adcaa5cb4f0cfac8f465324b14f364a45d4ff8ca6f6 SHA512 07fb0edb5fbc0b491f8a40844d4a914f26c6269b2d07ab91f4d54fdcfeb7899348362044ac632223341f30fc10e6748a59863977496801530f5cdd2d61f0e88c WHIRLPOOL 527093b99044826b5faf5ab0a47d8a141defef3589173fb3b8bf72ed6f52032184e50f6054e0b82bf84cb73aa962ee50f8f1b319fbee519c8916c0d3a1852c26
+DIST rrdtool-1.6.0.tar.gz 2186538 SHA256 cd948e89cd2d8825fab4a6fb0323f810948d934af7d92c9ee8b5e9e1350e52d7 SHA512 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd WHIRLPOOL ae831bfd6b397ca77d2a7b2e393d2dc542e740f1bfb9b45eada44781a7c9dd93b80279683cca1590477191bc3972f859097802387a12c8e3b40c97f1524428d6
+DIST rrdtool-1.7.0.tar.gz 2849994 SHA256 f97d348935b91780f2cd80399719e20c0b91f0a23537c0a85f9ff306d4c5526b SHA512 36d979561601135d74622eaf183701de15cba5e25118f7a308926a695ba84ecb33c3d16511bf4bc80cff055853e2eb85065bc4ed8aef19fc0277c6430ecd319f WHIRLPOOL afe313254d7ae7ac6a9a9c86f38b2f6873846d0b4419d186d4fbb14b1ff7b5b6f8d1494e6608f40daa0c2a0c24f24f3edb14cea1130c5f89bf38dddbd86c7577
+EBUILD rrdtool-1.4.8-r1.ebuild 4038 SHA256 650a5899262be057856044a3d984e9968bb6fa2181773c1b8c01881a243d9bf3 SHA512 264d53646ed3854ce49618dfae1287bee512e8e59aefeb7a8118dbeeb4984a9e15d77fe60d07cf730e91beb5f7c356bfef3fbb4b3dbcb2efe607b709d6202b4f WHIRLPOOL 5374a4fdad0213e8edd417765cee35c034bf716fced9b31a381fad3717de7f4308980ea3f7f77f41944813867fb68d8c3a1a82d1e8f3d8ef732779fafd318fdb
+EBUILD rrdtool-1.5.5-r1.ebuild 4294 SHA256 8f5896f2d42da1d5697acc436438e04322821749b2e994803eb283bf085a093b SHA512 5737e77cfd4dd78d2f306ce7d1013861850c95414b0cf8ebf3b247ad918f06693ff6227006383b4c6f2023ffbb63e6a6737bfa932c7ea3205e66da1acfe9e14a WHIRLPOOL be728ae4cc97ed05f0a5dc0188509daa44a8946e2b03c4d71730223aa204c8938061f08e99c708bca2a40a7e40af4d8bfaeff1dd1213c3c52e60336b116fd920
+EBUILD rrdtool-1.5.5.ebuild 4027 SHA256 b6c4601b9b026aaeb833eb494ba1bd6581a382fef8b571fd70c24f7ced227c3f SHA512 6b0346093e6787f76d018c2e8fc52d60b0f8d0e108d17a8f6cc30f91856d69d082a75555861b4c71e1c62c466eb21d2acc38bf029993972bd8b90496debcf28c WHIRLPOOL 593d93223cc5ce4c4f06cd62d5921d288b03966b061f9a736c3fe21c09bfd40d4a3004bfd52f0ab5c52f168c4c6a550c7983cec1c1cd8af7fd9797e10d470b8d
+EBUILD rrdtool-1.6.0-r1.ebuild 4247 SHA256 bb99c5bdd7ec3b310c91439ddb9e63c2e742ab0a90295234b0fbc3371bc8ffb2 SHA512 0cafe4e91530e053acc774371254958d7a608cdc93fb7e6e38ba5a5229c3d3698e2e2660127a5544de36d31bb99204b92eb9eeae3e271e980f35f60b81ba2c3c WHIRLPOOL 359dbfd5cd52b52f9dedebb11e5528e01a951071e9f863588f958b27a76704b6dd0be2ff470e45f84a51cf0d976eb58ef1d4f72938050df47fe68ab084b6d301
+EBUILD rrdtool-1.7.0.ebuild 4303 SHA256 9acac1f7a13d5e9d2c1fac248afbcaaa751c1adf27e026ff8585fc7351b4de63 SHA512 efcc7770ddb900e1e1f3a83acbfe72b4191fe980b6d892ce0eb9fc34d75490a0f561a2796a144f79541c40d8449b1f22234a9f6014dcdb7d08163bf992353ad7 WHIRLPOOL 622edf479f848befea49dc8530d5012c74875dc1c5c553d837a9118a28646f96e16919f170466ad4bd0f613c84d58b4ce16987906561eae10df03be2c934a62a
+MISC ChangeLog 7046 SHA256 0b4e2c8d8c6703ad0364ecfbbad98e8197a81bdaedf069ec1c6231fc23939ad9 SHA512 f75e2ee8792b3cd524d750ec5bbf9ae68905e0dbdfc232200ecd6cf896b254ad4b1c03e9195a8b0764fae32970940cbdfd3cdf04b3c25702a4d545961d7f5e6d WHIRLPOOL 103e72156adc519776fd123038c7a40c89065286256435d80628462ea732a6b0d158fb5e8845a39b45c177ff2b4a2f7344d7b7bc3b66fbf1d5baeb309f462eb4
+MISC ChangeLog-2015 43791 SHA256 b849bd58e68b5459b0768918f70db7d7298cd09c2829656e908c0b74d239aa8c SHA512 9685de9fad472620f7ae560ea79da767f6d8c7cf6baf8837deda33ebed78fbc811927dcb19d85f1bceede974ba6396782bee464577c37446068ae64f58cf42ae WHIRLPOOL 944010bc56c2e6f878eedd326e9001e26d881f1efac794218b8b8edb821c96f23e909ec9cf50b57644ccd58f407fe2d40241d4892977194945b30697892efb78
+MISC metadata.xml 486 SHA256 310f9fd3b8871075157bc1b0e97add7dcbac9d5b67f78dba2997b72398bc7fb4 SHA512 ddca3904aa3e0f1d2f543ae9329298a2dc69bbc0803c568d0871bb5ace21d2dee4d0b226e5eef0258fd59dd2cf046ee807afaa588e31db35e574f3d707894a23 WHIRLPOOL 97f84b98d1d9c48c5d43a6d960bd60b721bd8bffabfab79f11038dd6a2501590e184e23b7083a4d1229ca9eb22c54cc2d62ae8276e696b72f2375a04e3c984f0
diff --git a/net-analyzer/rrdtool/files/rrdcached.confd b/net-analyzer/rrdtool/files/rrdcached.confd
new file mode 100644
index 000000000000..0463a7923461
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdcached.confd
@@ -0,0 +1,8 @@
+RRCACHE_ARGS="-l unix:/var/run/rrdcached.sock -j /var/lib/rrdcached/journal/ -F  -b /var/lib/rrdcached/db/ -B"
+
+USER=""
+GROUP=""
+
+MODE=""
+
+MAXWAIT=30
diff --git a/net-analyzer/rrdtool/files/rrdcached.init b/net-analyzer/rrdtool/files/rrdcached.init
new file mode 100644
index 000000000000..51c2cbb6e818
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdcached.init
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/rrdcached"
+command_args="${RRCACHE_ARGS} -p /run/rrdcached.pid"
+start_stop_daemon_args="--quiet"
+description="RRDtool data caching daemon"
+
+depend() {
+	need localmount net
+	use logger
+}
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.4.7-configure.ac.patch b/net-analyzer/rrdtool/files/rrdtool-1.4.7-configure.ac.patch
new file mode 100644
index 000000000000..668adeee13ee
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdtool-1.4.7-configure.ac.patch
@@ -0,0 +1,21 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -148,7 +148,7 @@
+ AC_PROG_CPP
+ AC_PROG_CC
+ AM_PROG_CC_C_O
+-AC_PROG_LIBTOOL
++LT_INIT
+ 
+ dnl Try to detect/use GNU features
+ CFLAGS="$CFLAGS -D_GNU_SOURCE"
+@@ -204,9 +204,6 @@
+ AC_CHECK_FUNC(acos, , AC_CHECK_LIB(m, acos))
+ 
+ 
+-dnl add pic flag in any case this makes sure all our code is relocatable
+-eval `./libtool --config | grep pic_flag=` 
+-CFLAGS="$CFLAGS $pic_flag"
+ 
+ 
+ dnl Checks for library functions.
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-cgi.patch b/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-cgi.patch
new file mode 100644
index 000000000000..67f0ce2fb292
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-cgi.patch
@@ -0,0 +1,49 @@
+--- a/src/rrd_cgi.c
++++ b/src/rrd_cgi.c
+@@ -56,6 +56,7 @@
+     const char **);
+ 
+ /* call rrd_graph and insert appropriate image tag */
++#ifdef HAVE_RRD_GRAPH
+ char     *drawgraph(
+     long,
+     const char **);
+@@ -64,6 +65,7 @@
+ char     *drawprint(
+     long,
+     const char **);
++#endif /* HAVE_RRD_GRAPH */
+ 
+ /* pretty-print the <last></last> value for some.rrd via strftime() */
+ char     *printtimelast(
+@@ -542,9 +544,13 @@
+         }
+         parse(&buffer, i, "<RRD::GETVAR", rrdgetvar);
+         parse(&buffer, i, "<RRD::GOODFOR", rrdgoodfor);
++#ifdef HAVE_RRD_GRAPH
+         parse(&buffer, i, "<RRD::GRAPH", drawgraph);
++#endif /* HAVE_RRD_GRAPH */
+         parse(&buffer, i, "<RRD::INCLUDE", includefile);
++#ifdef HAVE_RRD_GRAPH
+         parse(&buffer, i, "<RRD::PRINT", drawprint);
++#endif /* HAVE_RRD_GRAPH */
+         parse(&buffer, i, "<RRD::SETCONSTVAR", rrdsetvarconst);
+         parse(&buffer, i, "<RRD::SETENV", rrdsetenv);
+         parse(&buffer, i, "<RRD::SETVAR", rrdsetvar);
+@@ -929,7 +935,7 @@
+ }
+ 
+ 
+-
++#ifdef HAVE_RRD_GRAPH
+ char     *drawgraph(
+     long argc,
+     const char **args)
+@@ -961,6 +967,7 @@
+     }
+     return NULL;
+ }
++#endif /* HAVE_RRD_GRAPH */
+ 
+ char     *drawprint(
+     long argc,
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-perl.patch b/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-perl.patch
new file mode 100644
index 000000000000..c68ca24a3e2f
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-perl.patch
@@ -0,0 +1,53 @@
+--- a/bindings/perl-shared/RRDs.xs
++++ b/bindings/perl-shared/RRDs.xs
+@@ -189,6 +189,7 @@
+ 	OUTPUT:
+ 		RETVAL
+ 
++#ifdef HAVE_RRD_GRAPH
+ SV *
+ rrd_graph(...)
+ 	PROTOTYPE: @	
+@@ -235,6 +236,8 @@
+ 		PUSHs(sv_2mortal(newSViv(xsize)));
+ 		PUSHs(sv_2mortal(newSViv(ysize)));
+ 
++#endif /* HAVE_RRD_GRAPH */
++
+ SV *
+ rrd_fetch(...)
+ 	PROTOTYPE: @	
+@@ -313,6 +316,7 @@
+ 		PUSHs(sv_2mortal(newSVuv(start_tmp)));
+ 		PUSHs(sv_2mortal(newSVuv(end_tmp)));
+ 
++#ifdef HAVE_RRD_GRAPH
+ int
+ rrd_xport(...)
+ 	PROTOTYPE: @	
+@@ -371,6 +375,8 @@
+ 		PUSHs(sv_2mortal(newRV_noinc((SV*)names)));
+ 		PUSHs(sv_2mortal(newRV_noinc((SV*)retar)));
+ 
++#endif /* HAVE_RRD_GRAPH */
++
+ SV*
+ rrd_info(...)
+ 	PROTOTYPE: @	
+@@ -397,6 +403,7 @@
+     OUTPUT:
+ 	   RETVAL
+ 
++#ifdef HAVE_RRD_GRAPH
+ SV*
+ rrd_graphv(...)
+ 	PROTOTYPE: @	
+@@ -410,6 +417,8 @@
+     OUTPUT:
+ 	   RETVAL
+ 
++#endif /* HAVE_RRD_GRAPH */
++
+ int
+ rrd_dump(...)
+        PROTOTYPE: @
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-lua.patch b/net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-lua.patch
new file mode 100644
index 000000000000..6b3a3abf26bb
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-lua.patch
@@ -0,0 +1,12 @@
+--- a/bindings/lua/rrdlua.c
++++ b/bindings/lua/rrdlua.c
+@@ -367,7 +367,9 @@
+ #if defined(DINF)
+   {"info", lua_rrd_info},
+   {"updatev", lua_rrd_updatev},
++#ifdef HAVE_RRD_GRAPH
+   {"graphv", lua_rrd_graphv},
++#endif /* HAVE_RRD_GRAPH */
+ #endif
+   {NULL, NULL}
+ };
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-python.patch b/net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-python.patch
new file mode 100644
index 000000000000..db3daaf47345
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-python.patch
@@ -0,0 +1,38 @@
+--- a/bindings/python/rrdtoolmodule.c
++++ b/bindings/python/rrdtoolmodule.c
+@@ -675,8 +676,6 @@
+     return r;
+ }
+ 
+-#endif
+-
+ static char PyRRD_dump__doc__[] =
+     "dump - dump an RRD to XML\n"
+     "[--header|-h {none,xsd,dtd}] [--no-header]file.rrd [file.xml]";
+@@ -704,6 +703,7 @@
+     destroy_args(&argv);
+     return r;
+ }
++#endif /* HAVE_RRD_GRAPH */
+ 
+ /* List of methods defined in the module */
+ #define meth(name, func, doc) {name, (PyCFunction)func, METH_VARARGS, doc}
+@@ -717,14 +717,16 @@
+     meth("last", PyRRD_last, PyRRD_last__doc__),
+     meth("resize", PyRRD_resize, PyRRD_resize__doc__),
+     meth("info", PyRRD_info, PyRRD_info__doc__),
+-#ifdef HAVE_RRD_GRAPH    
++#ifdef HAVE_RRD_GRAPH
+     meth("graph", PyRRD_graph, PyRRD_graph__doc__),
+     meth("graphv", PyRRD_graphv, PyRRD_graphv__doc__),
+     meth("xport", PyRRD_xport, PyRRD_xport__doc__),
+-#endif
++#endif /* HAVE_RRD_GRAPH */
+     meth("updatev", PyRRD_updatev, PyRRD_updatev__doc__),
+     meth("flushcached", PyRRD_flushcached, PyRRD_flushcached__doc__),
++#ifdef HAVE_RRD_GRAPH
+     meth("dump", PyRRD_dump, PyRRD_dump__doc__),
++#endif /* HAVE_RRD_GRAPH */
+     {NULL, NULL, 0, NULL}
+ };
+ 
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.5.5-rpn1.output b/net-analyzer/rrdtool/files/rrdtool-1.5.5-rpn1.output
new file mode 100644
index 000000000000..4a7696dbcf0b
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdtool-1.5.5-rpn1.output
@@ -0,0 +1,3 @@
+print[0] = "30.769231"
+print[1] = "72.000000"
+print[2] = "0.000000"
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.5.5-rrdrados.pod b/net-analyzer/rrdtool/files/rrdtool-1.5.5-rrdrados.pod
new file mode 100644
index 000000000000..0c645548a202
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdtool-1.5.5-rrdrados.pod
@@ -0,0 +1,68 @@
+=head1 NAME
+
+rrdrados - Creating, updating and retrieving RRD files from Ceph
+
+=head1 SYNOPSIS
+
+E<lt>rrdfileE<gt> = B<ceph//E<lt>nameE<gt>>
+
+
+=head1 DESCRIPTION
+
+This module adds support for creating, updating and retrieving RRD files
+directly from a Ceph cluster using librados.
+
+It adds a ceph// prefix to RRD file name which is used to instruct rrdtool to
+operate on a file that is stored in Ceph.
+
+Currently the module expects to find the Ceph configuration file in the default
+location at /etc/ceph/ceph.conf. By default it uses Ceph client ID "admin" and a
+Ceph pool named "rrd".
+
+
+=head1 ENVIRONMENT VARIABLES
+
+=over 4
+
+=item B<CEPH_ID>
+
+Sets the Ceph Client ID to use when connecting. By default the client ID "admin"
+is used.
+
+=item B<CEPH_POOL>
+
+Sets the name of the Ceph Pool to connect to. By default, the pool "rrd" is
+used.
+
+=back
+
+
+=head1 EXAMPLES
+
+B<Creating an RRD file on Ceph>
+
+ rrdtool create ceph//temperature.rrd --step 300 \
+   DS:temp:GAUGE:600:-273:5000 \
+   RRA:AVERAGE:0.5:1:1200 \
+   RRA:MIN:0.5:12:2400 \
+   RRA:MAX:0.5:12:2400 \
+   RRA:AVERAGE:0.5:12:2400
+
+
+B<Importing an existing RRD into Ceph>
+
+ rrdtool dump existing.rrd | rrdtool restore - ceph//new.rrd
+
+Or you could also copy the RRD file directly into Ceph using the rados command
+line utility.
+
+
+B<Retrieving RRD data from Ceph>
+
+ rrdtool fetch ceph//file.rrd AVERAGE
+
+
+=head1 AUTHOR
+
+Simon Boulet E<lt>simon@nostalgeek.comE<gt>
+
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.6.0-configure.ac.patch b/net-analyzer/rrdtool/files/rrdtool-1.6.0-configure.ac.patch
new file mode 100644
index 000000000000..a0bee695b7ae
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdtool-1.6.0-configure.ac.patch
@@ -0,0 +1,25 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -177,7 +177,7 @@
+ AC_PROG_CPP
+ AC_PROG_CC
+ AM_PROG_CC_C_O
+-AC_PROG_LIBTOOL
++LT_INIT
+ 
+ dnl Try to detect/use GNU features
+ CFLAGS="$CFLAGS -D_GNU_SOURCE"
+@@ -239,13 +239,6 @@
+ AC_CHECK_FUNC(acos,  , AC_CHECK_LIB(m, acos))
+ AC_CHECK_FUNC(round, , AC_CHECK_LIB(m, round))
+ 
+-
+-
+-dnl add pic flag in any case this makes sure all our code is relocatable
+-eval `./libtool --config | grep pic_flag=`
+-CFLAGS="$CFLAGS $pic_flag"
+-
+-
+ dnl Checks for library functions.
+ AC_FUNC_STRFTIME
+ AC_FUNC_VPRINTF
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.7.0-disable-rrd_graph-cgi.patch b/net-analyzer/rrdtool/files/rrdtool-1.7.0-disable-rrd_graph-cgi.patch
new file mode 100644
index 000000000000..beb1ba794f22
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdtool-1.7.0-disable-rrd_graph-cgi.patch
@@ -0,0 +1,49 @@
+--- a/src/rrd_cgi.c
++++ b/src/rrd_cgi.c
+@@ -51,6 +51,7 @@
+     const char **);
+ 
+ /* call rrd_graph and insert appropriate image tag */
++#ifdef HAVE_RRD_GRAPH
+ static char *drawgraph(
+     long,
+     const char **);
+@@ -59,6 +60,7 @@
+ static char *drawprint(
+     long,
+     const char **);
++#endif /* HAVE_RRD_GRAPH */
+ 
+ /* pretty-print the <last></last> value for some.rrd via strftime() */
+ static char *printtimelast(
+@@ -510,9 +512,13 @@
+         }
+         parse(&buffer, i, "<RRD::GETVAR", rrdgetvar);
+         parse(&buffer, i, "<RRD::GOODFOR", rrdgoodfor);
++#ifdef HAVE_RRD_GRAPH
+         parse(&buffer, i, "<RRD::GRAPH", drawgraph);
++#endif /* HAVE_RRD_GRAPH */
+         parse(&buffer, i, "<RRD::INCLUDE", includefile);
++#ifdef HAVE_RRD_GRAPH
+         parse(&buffer, i, "<RRD::PRINT", drawprint);
++#endif /* HAVE_RRD_GRAPH */
+         parse(&buffer, i, "<RRD::SETCONSTVAR", rrdsetvarconst);
+         parse(&buffer, i, "<RRD::SETENV", rrdsetenv);
+         parse(&buffer, i, "<RRD::SETVAR", rrdsetvar);
+@@ -900,7 +906,7 @@
+ }
+ 
+ 
+-
++#ifdef HAVE_RRD_GRAPH
+ static char *drawgraph(
+     long argc,
+     const char **args)
+@@ -931,6 +937,7 @@
+     }
+     return NULL;
+ }
++#endif /* HAVE_RRD_GRAPH */
+ 
+ static char *drawprint(
+     long argc,
diff --git a/net-analyzer/rrdtool/metadata.xml b/net-analyzer/rrdtool/metadata.xml
new file mode 100644
index 000000000000..a6a291c9723d
--- /dev/null
+++ b/net-analyzer/rrdtool/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<use>
+<flag name="graph">Enable support for graphing functions</flag>
+<flag name="rados">Enable support for librados from <pkg>sys-cluster/ceph</pkg></flag>
+<flag name="rrdcgi">Build rrdcgi support</flag>
+</use>
+</pkgmetadata>
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild
new file mode 100644
index 000000000000..0d34b417da74
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DISTUTILS_OPTIONAL="true"
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python2_7 )
+inherit eutils distutils-r1 flag-o-matic multilib perl-module autotools
+
+DESCRIPTION="A system to store and display time-series data"
+HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
+SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="dbi doc +graph lua perl python rrdcgi ruby static-libs tcl tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+	>=dev-libs/glib-2.28.7:2[static-libs(+)?]
+	>=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
+	dbi? ( dev-db/libdbi[static-libs(+)?] )
+	graph? (
+		>=media-libs/libpng-1.5.10:0=[static-libs(+)?]
+		>=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
+		>=x11-libs/pango-1.28
+	)
+	lua? ( dev-lang/lua:*[deprecated] )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	tcl? ( dev-lang/tcl:0= )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+
+DEPEND="
+	${CDEPEND}
+	sys-apps/groff
+	virtual/pkgconfig
+	virtual/awk
+"
+RDEPEND="
+	${CDEPEND}
+"
+PDEPEND="
+	ruby? ( dev-ruby/rrdtool-bindings )
+"
+
+python_compile() {
+	cd bindings/python || die
+	distutils-r1_python_compile
+}
+
+python_install() {
+	cd bindings/python || die
+	distutils-r1_python_install
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.4.7-configure.ac.patch
+
+	# bug 456810
+	# no time to sleep
+	sed -i \
+		-e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
+		-e 's|^sleep 1$||g' \
+		configure.ac || die
+
+	# Python bindings are built/installed manually
+	sed -i \
+		-e '/^all-local:/s| @COMP_PYTHON@||' \
+		bindings/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -ffast-math
+
+	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
+
+	# to solve bug #260380
+	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
+
+	# Stub configure.ac
+	local myconf=()
+	if ! use tcpd; then
+		myconf+=( "--disable-libwrap" )
+	fi
+	if ! use dbi; then
+		myconf+=( "--disable-libdbi" )
+	fi
+
+	econf \
+		$(use_enable graph rrd_graph) \
+		$(use_enable lua lua-site-install) \
+		$(use_enable lua) \
+		$(use_enable perl perl-site-install) \
+		$(use_enable perl) \
+		$(use_enable python) \
+		$(use_enable rrdcgi) \
+		$(use_enable static-libs static) \
+		$(use_enable tcl) \
+		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
+		--with-perl-options=INSTALLDIRS=vendor \
+		--disable-ruby-site-install \
+		--disable-ruby \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	default
+
+	if ! use doc ; then
+		rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
+	fi
+
+	if use !rrdcgi ; then
+		# uses rrdcgi, causes invalid shebang error in Prefix, useless
+		# without rrdcgi installed
+		rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi
+	fi
+
+	if use perl ; then
+		perl_delete_localpod
+		perl_delete_packlist
+	fi
+
+	dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO
+
+	find "${ED}"usr -name '*.la' -exec rm -f {} +
+
+	keepdir /var/lib/rrdcached/journal/
+	keepdir /var/lib/rrdcached/db/
+
+	newconfd "${FILESDIR}"/rrdcached.confd rrdcached
+	newinitd "${FILESDIR}"/rrdcached.init rrdcached
+
+	use python && distutils-r1_src_install
+}
+
+pkg_postinst() {
+	ewarn "Since version 1.3, rrdtool dump emits completely legal xml.  Basically this"
+	ewarn "means that it contains an xml header and a DOCTYPE definition.  Unfortunately"
+	ewarn "this causes older versions of rrdtool restore to be unhappy."
+	ewarn
+	ewarn "To restore a new dump with an old rrdtool restore version, either remove"
+	ewarn "the xml header and the doctype by hand (both on the first line of the dump)"
+	ewarn "or use rrdtool dump --no-header."
+	ewarn
+	ewarn ">=net-analyzer/rrdtool-1.3 does not have any default font bundled. Thus if"
+	ewarn ">you've upgraded from rrdtool-1.2.x and don't have any font installed to make"
+	ewarn ">lables visible, please, install some font, e.g.  media-fonts/dejavu."
+}
diff --git a/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild
new file mode 100644
index 000000000000..d9e1303a80d3
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DISTUTILS_OPTIONAL=true
+DISTUTILS_SINGLE_IMPL=true
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python2_7 )
+inherit autotools eutils perl-module distutils-r1 flag-o-matic multilib
+
+DESCRIPTION="A system to store and display time-series data"
+HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
+SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P/_/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+	>=dev-libs/glib-2.28.7:2[static-libs(+)?]
+	>=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
+	dbi? ( dev-db/libdbi[static-libs(+)?] )
+	graph? (
+		>=media-libs/libpng-1.5.10:0=[static-libs(+)?]
+		>=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
+		>=x11-libs/pango-1.28
+	)
+	lua? ( dev-lang/lua:*[deprecated] )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	rados? ( sys-cluster/ceph )
+	tcl? ( dev-lang/tcl:0= )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+
+DEPEND="
+	${CDEPEND}
+	sys-apps/groff
+	virtual/pkgconfig
+	virtual/awk
+"
+RDEPEND="
+	${CDEPEND}
+"
+PDEPEND="
+	ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+python_compile() {
+	cd bindings/python || die
+	distutils-r1_python_compile
+}
+
+python_install() {
+	cd bindings/python || die
+	distutils-r1_python_install
+}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# At the next version bump, please see if you actually still need this
+	# before adding versions
+	cp "${FILESDIR}"/${P}-rpn1.output tests/rpn1.output || die
+	cp "${FILESDIR}"/${P}-rrdrados.pod doc/rrdrados.pod || die
+
+	epatch \
+		"${FILESDIR}"/${PN}-1.4.7-configure.ac.patch \
+		"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-cgi.patch \
+		"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch \
+		"${FILESDIR}"/${PN}-1.5.0_rc1-disable-rrd_graph-lua.patch \
+		"${FILESDIR}"/${PN}-1.5.0_rc1-disable-rrd_graph-python.patch
+
+	# bug 456810
+	# no time to sleep
+	sed -i \
+		-e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
+		-e 's|^sleep 1$||g' \
+		-e '/^dnl.*png/s|^dnl||g' \
+		configure.ac || die
+
+	# Python bindings are built/installed manually
+	sed -i \
+		-e '/^all-local:/s| @COMP_PYTHON@||' \
+		bindings/Makefile.am || die
+
+	if ! use graph; then
+		sed -i \
+			-e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \
+			-e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \
+			tests/Makefile.am || die
+	fi
+
+	echo ${PV/_rc*/} >> VERSION || die
+
+	export rd_cv_gcc_flag__Werror=no
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -ffast-math
+
+	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
+
+	# to solve bug #260380
+	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
+
+	# Stub configure.ac
+	local myconf=()
+	if ! use tcpd; then
+		myconf+=( "--disable-libwrap" )
+	fi
+	if ! use dbi; then
+		myconf+=( "--disable-libdbi" )
+	fi
+	if ! use rados; then
+		myconf+=( "--disable-librados" )
+	fi
+
+	econf \
+		$(use_enable graph rrd_graph) \
+		$(use_enable lua lua-site-install) \
+		$(use_enable lua) \
+		$(use_enable perl perl-site-install) \
+		$(use_enable perl) \
+		$(use_enable python) \
+		$(use_enable rrdcgi) \
+		$(use_enable static-libs static) \
+		$(use_enable tcl) \
+		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
+		--with-perl-options=INSTALLDIRS=vendor \
+		--disable-ruby-site-install \
+		--disable-ruby \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	use python && distutils-r1_src_compile
+}
+
+src_test() {
+	export LC_ALL=C
+	default
+}
+
+src_install() {
+	default
+
+	if ! use doc ; then
+		rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
+	fi
+
+	if use !rrdcgi ; then
+		# uses rrdcgi, causes invalid shebang error in Prefix, useless
+		# without rrdcgi installed
+		rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi
+	fi
+
+	if use perl ; then
+		perl_delete_localpod
+		perl_delete_packlist
+	fi
+
+	dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO
+
+	find "${ED}"usr -name '*.la' -exec rm -f {} +
+
+	keepdir /var/lib/rrdcached/journal/
+	keepdir /var/lib/rrdcached/db/
+
+	newconfd "${FILESDIR}"/rrdcached.confd rrdcached
+	newinitd "${FILESDIR}"/rrdcached.init rrdcached
+
+	use python && distutils-r1_src_install
+}
diff --git a/net-analyzer/rrdtool/rrdtool-1.5.5.ebuild b/net-analyzer/rrdtool/rrdtool-1.5.5.ebuild
new file mode 100644
index 000000000000..bc62b58b7d6e
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.5.5.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DISTUTILS_OPTIONAL=true
+DISTUTILS_SINGLE_IMPL=true
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python2_7 )
+inherit autotools eutils perl-module distutils-r1 flag-o-matic multilib
+
+DESCRIPTION="A system to store and display time-series data"
+HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
+SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P/_/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+	>=dev-libs/glib-2.28.7:2[static-libs(+)?]
+	>=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
+	dbi? ( dev-db/libdbi[static-libs(+)?] )
+	graph? (
+		>=media-libs/libpng-1.5.10:0=[static-libs(+)?]
+		>=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
+		>=x11-libs/pango-1.28
+	)
+	lua? ( dev-lang/lua:*[deprecated] )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	rados? ( sys-cluster/ceph )
+	tcl? ( dev-lang/tcl:0= )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+
+DEPEND="
+	${CDEPEND}
+	sys-apps/groff
+	virtual/pkgconfig
+	virtual/awk
+"
+RDEPEND="
+	${CDEPEND}
+"
+PDEPEND="
+	ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+python_compile() {
+	cd bindings/python || die
+	distutils-r1_python_compile
+}
+
+python_install() {
+	cd bindings/python || die
+	distutils-r1_python_install
+}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# At the next version bump, please see if you actually still need this
+	# before adding versions
+	cp "${FILESDIR}"/${P}-rrdrados.pod doc/rrdrados.pod || die
+
+	epatch \
+		"${FILESDIR}"/${PN}-1.4.7-configure.ac.patch \
+		"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-cgi.patch \
+		"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch \
+		"${FILESDIR}"/${PN}-1.5.0_rc1-disable-rrd_graph-lua.patch \
+		"${FILESDIR}"/${PN}-1.5.0_rc1-disable-rrd_graph-python.patch
+
+	# bug 456810
+	# no time to sleep
+	sed -i \
+		-e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
+		-e 's|^sleep 1$||g' \
+		-e '/^dnl.*png/s|^dnl||g' \
+		configure.ac || die
+
+	# Python bindings are built/installed manually
+	sed -i \
+		-e '/^all-local:/s| @COMP_PYTHON@||' \
+		bindings/Makefile.am || die
+
+	echo ${PV/_rc*/} >> VERSION || die
+
+	export rd_cv_gcc_flag__Werror=no
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -ffast-math
+
+	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
+
+	# to solve bug #260380
+	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
+
+	# Stub configure.ac
+	local myconf=()
+	if ! use tcpd; then
+		myconf+=( "--disable-libwrap" )
+	fi
+	if ! use dbi; then
+		myconf+=( "--disable-libdbi" )
+	fi
+	if ! use rados; then
+		myconf+=( "--disable-librados" )
+	fi
+
+	econf \
+		$(use_enable graph rrd_graph) \
+		$(use_enable lua lua-site-install) \
+		$(use_enable lua) \
+		$(use_enable perl perl-site-install) \
+		$(use_enable perl) \
+		$(use_enable python) \
+		$(use_enable rrdcgi) \
+		$(use_enable static-libs static) \
+		$(use_enable tcl) \
+		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
+		--with-perl-options=INSTALLDIRS=vendor \
+		--disable-ruby-site-install \
+		--disable-ruby \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	use python && distutils-r1_src_compile
+}
+
+src_test() {
+	default
+}
+
+src_install() {
+	default
+
+	if ! use doc ; then
+		rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
+	fi
+
+	if use !rrdcgi ; then
+		# uses rrdcgi, causes invalid shebang error in Prefix, useless
+		# without rrdcgi installed
+		rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi
+	fi
+
+	if use perl ; then
+		perl_delete_localpod
+		perl_delete_packlist
+	fi
+
+	dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO
+
+	find "${ED}"usr -name '*.la' -exec rm -f {} +
+
+	keepdir /var/lib/rrdcached/journal/
+	keepdir /var/lib/rrdcached/db/
+
+	newconfd "${FILESDIR}"/rrdcached.confd rrdcached
+	newinitd "${FILESDIR}"/rrdcached.init rrdcached
+
+	use python && distutils-r1_src_install
+}
diff --git a/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..ccde50143454
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DISTUTILS_OPTIONAL=true
+DISTUTILS_SINGLE_IMPL=true
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python2_7 )
+inherit autotools eutils perl-module distutils-r1 flag-o-matic multilib
+
+DESCRIPTION="A system to store and display time-series data"
+HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
+SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P/_/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/8.0.0"
+KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+	>=dev-libs/glib-2.28.7:2[static-libs(+)?]
+	>=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
+	dbi? ( dev-db/libdbi[static-libs(+)?] )
+	graph? (
+		>=media-libs/libpng-1.5.10:0=[static-libs(+)?]
+		>=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
+		>=x11-libs/pango-1.28
+	)
+	lua? ( dev-lang/lua:*[deprecated] )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	rados? ( sys-cluster/ceph )
+	tcl? ( dev-lang/tcl:0= )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+
+DEPEND="
+	${CDEPEND}
+	sys-apps/groff
+	virtual/pkgconfig
+	virtual/awk
+"
+RDEPEND="
+	${CDEPEND}
+"
+PDEPEND="
+	ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+python_compile() {
+	cd bindings/python || die
+	distutils-r1_python_compile
+}
+
+python_install() {
+	cd bindings/python || die
+	distutils-r1_python_install
+}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# At the next version bump, please see if you actually still need this
+	# before adding versions
+	cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod || die
+
+	epatch \
+		"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-cgi.patch \
+		"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch \
+		"${FILESDIR}"/${PN}-1.5.0_rc1-disable-rrd_graph-lua.patch \
+		"${FILESDIR}"/${PN}-1.5.0_rc1-disable-rrd_graph-python.patch \
+		"${FILESDIR}"/${PN}-1.6.0-configure.ac.patch
+
+	# bug 456810
+	# no time to sleep
+	sed -i \
+		-e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
+		-e 's|^sleep 1$||g' \
+		-e '/^dnl.*png/s|^dnl||g' \
+		configure.ac || die
+
+	# Python bindings are built/installed manually
+	sed -i \
+		-e '/^all-local:/s| @COMP_PYTHON@||' \
+		bindings/Makefile.am || die
+
+	if ! use graph; then
+		sed -i \
+			-e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \
+			-e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \
+			tests/Makefile.am || die
+	fi
+
+	echo ${PV/_rc*/} >> VERSION || die
+
+	export rd_cv_gcc_flag__Werror=no
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -ffast-math
+
+	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
+
+	# to solve bug #260380
+	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
+
+	# Stub configure.ac
+	local myconf=()
+	if ! use tcpd; then
+		myconf+=( "--disable-libwrap" )
+	fi
+	if ! use dbi; then
+		myconf+=( "--disable-libdbi" )
+	fi
+	if ! use rados; then
+		myconf+=( "--disable-librados" )
+	fi
+
+	econf \
+		$(use_enable graph rrd_graph) \
+		$(use_enable lua lua-site-install) \
+		$(use_enable lua) \
+		$(use_enable perl perl-site-install) \
+		$(use_enable perl) \
+		$(use_enable python) \
+		$(use_enable rrdcgi) \
+		$(use_enable static-libs static) \
+		$(use_enable tcl) \
+		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
+		--with-perl-options=INSTALLDIRS=vendor \
+		--disable-ruby-site-install \
+		--disable-ruby \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	use python && distutils-r1_src_compile
+}
+
+src_test() {
+	export LC_ALL=C
+	default
+}
+
+src_install() {
+	default
+
+	if ! use doc ; then
+		rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
+	fi
+
+	if use !rrdcgi ; then
+		# uses rrdcgi, causes invalid shebang error in Prefix, useless
+		# without rrdcgi installed
+		rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi
+	fi
+
+	if use perl ; then
+		perl_delete_localpod
+		perl_delete_packlist
+	fi
+
+	dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO
+
+	find "${ED}"usr -name '*.la' -exec rm -f {} +
+
+	keepdir /var/lib/rrdcached/journal/
+	keepdir /var/lib/rrdcached/db/
+
+	newconfd "${FILESDIR}"/rrdcached.confd rrdcached
+	newinitd "${FILESDIR}"/rrdcached.init rrdcached
+
+	use python && distutils-r1_src_install
+}
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild
new file mode 100644
index 000000000000..24a80c6305f4
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=true
+DISTUTILS_SINGLE_IMPL=true
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit autotools perl-module distutils-r1 flag-o-matic multilib
+
+DESCRIPTION="A system to store and display time-series data"
+HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
+SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P/_/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/8.0.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+	>=dev-libs/glib-2.28.7:2[static-libs(+)?]
+	>=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
+	dbi? ( dev-db/libdbi[static-libs(+)?] )
+	graph? (
+		>=media-libs/libpng-1.5.10:0=[static-libs(+)?]
+		>=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
+		>=x11-libs/pango-1.28
+	)
+	lua? ( dev-lang/lua:*[deprecated] )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	rados? ( sys-cluster/ceph )
+	tcl? ( dev-lang/tcl:0= )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+
+DEPEND="
+	${CDEPEND}
+	sys-apps/groff
+	virtual/pkgconfig
+	virtual/awk
+"
+RDEPEND="
+	${CDEPEND}
+"
+PDEPEND="
+	ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch
+	"${FILESDIR}"/${PN}-1.5.0_rc1-disable-rrd_graph-lua.patch
+	"${FILESDIR}"/${PN}-1.6.0-configure.ac.patch
+	"${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch
+
+)
+
+S=${WORKDIR}/${P/_/-}
+
+python_compile() {
+	cd bindings/python || die
+	distutils-r1_python_compile
+}
+
+python_install() {
+	cd bindings/python || die
+	distutils-r1_python_install
+}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# At the next version bump, please see if you actually still need this
+	# before adding versions
+	if ! [ -f doc/rrdrados.pod ]; then
+		cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod
+	else
+		die "File already exists: doc/rrdrados.pod. Remove this code!"
+	fi
+
+	# bug 456810
+	# no time to sleep
+	sed -i \
+		-e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
+		-e 's|^sleep 1$||g' \
+		-e '/^dnl.*png/s|^dnl||g' \
+		configure.ac || die
+
+	# Python bindings are built/installed manually
+	sed -i \
+		-e '/^all-local:/s| @COMP_PYTHON@||' \
+		bindings/Makefile.am || die
+
+	if ! use graph; then
+		sed -i \
+			-e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \
+			-e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \
+			tests/Makefile.am || die
+	fi
+
+	echo ${PV/_rc*/} >> VERSION || die
+
+	export rd_cv_gcc_flag__Werror=no
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -ffast-math
+
+	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
+
+	# to solve bug #260380
+	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
+
+	# Stub configure.ac
+	local myconf=()
+	if ! use tcpd; then
+		myconf+=( "--disable-libwrap" )
+	fi
+	if ! use dbi; then
+		myconf+=( "--disable-libdbi" )
+	fi
+	if ! use rados; then
+		myconf+=( "--disable-librados" )
+	fi
+
+	econf \
+		$(use_enable graph rrd_graph) \
+		$(use_enable lua lua-site-install) \
+		$(use_enable lua) \
+		$(use_enable perl perl-site-install) \
+		$(use_enable perl) \
+		$(use_enable python) \
+		$(use_enable rrdcgi) \
+		$(use_enable static-libs static) \
+		$(use_enable tcl) \
+		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
+		--with-perl-options=INSTALLDIRS=vendor \
+		--disable-ruby-site-install \
+		--disable-ruby \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	use python && distutils-r1_src_compile
+}
+
+src_test() {
+	export LC_ALL=C
+	default
+}
+
+src_install() {
+	default
+
+	if ! use doc ; then
+		rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
+	fi
+
+	if use !rrdcgi ; then
+		# uses rrdcgi, causes invalid shebang error in Prefix, useless
+		# without rrdcgi installed
+		rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi
+	fi
+
+	if use perl ; then
+		perl_delete_localpod
+		perl_delete_packlist
+	fi
+
+	dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO
+
+	find "${ED}"usr -name '*.la' -exec rm -f {} +
+
+	keepdir /var/lib/rrdcached/journal/
+	keepdir /var/lib/rrdcached/db/
+
+	newconfd "${FILESDIR}"/rrdcached.confd rrdcached
+	newinitd "${FILESDIR}"/rrdcached.init rrdcached
+
+	use python && distutils-r1_src_install
+}
diff --git a/net-analyzer/rtpbreak/Manifest b/net-analyzer/rtpbreak/Manifest
new file mode 100644
index 000000000000..9042389a54a8
--- /dev/null
+++ b/net-analyzer/rtpbreak/Manifest
@@ -0,0 +1,7 @@
+AUX rtpbreak-1.3a-limits.patch 256 SHA256 81315f4009416fc7bab3ebd2c3cd33cf6344fdfde1c3042bf714ad30f3e5c07c SHA512 b3e8a4cde8ea18dae571791550fcb39936da6108df7b657aad0f61288e2f2636218e403de86f4cfc99d59ef6ca635da184f7a00dbcb13399d23b043e5a0630bc WHIRLPOOL fd37e9bcd11a242ad93245d960afc3c5a4cbdd9a4e62ffe30ef01567276549e8cb388e80c86624c7f9b6d9f58b57c87edef90b909130398daee2a1d4267a3887
+AUX rtpbreak-1.3a-missing-headers.patch 402 SHA256 c03e040022ea57bdc3210e92fc09bdeee7e1880f26b68385c75f3833f6812504 SHA512 742ec5ec41b45ab816fcbfc6e5ef8976567ccaa250eba496bda267cab2842504f10fb99e973ab0870f6989f575e31645c07fa8e9d734adeaa879585322e92d94 WHIRLPOOL 1c2c2989aadca33dec61e8293d45b3c320002832837cc088a9be0a644aa0182e55a650d06bfc0c351006b1eb0812117219b7b4cc095db4b01db87612070ecae6
+DIST rtpbreak-1.3a.tgz 41355 SHA256 9ec7276e3775c13306bcf90ba573cfb77b8162a18f90d5805a3c5a288f4466f8 SHA512 abe0329f91a8c76d4fab5589d834e19615457fe1c5cdb410ce2f6fbf871b750cf917a92a979b92aaf5f0a2644fa4f4dc4ca7e53fb46d71c8fa016a7f41efe5ad WHIRLPOOL be2e60ba09a0b939dd4eac9837e1d2e6aebc7bc6d176879519e39695ae2ed499bd1952983c0e2392b19e5e784a65fda54ea36d32e9c8b76d32330856d515d88b
+EBUILD rtpbreak-1.3a-r1.ebuild 763 SHA256 52de555251a4b17bf0cafa539cc7a87cd78e5fcccbad7e28a9a120faa076d8ee SHA512 aaebbc455e4842003b0c8bdde69ef0fe0c6bc76d24509a0ff7ec85e3b2a6e559f0ff1e16b5bda661a7e07cf14217fc6e8b71625ff420ba129dc32dd1487bfac9 WHIRLPOOL 122495d69f65cd3d43ca14f6e58252822cb7eb673914d86c6e66d45d6b9d3adc17cf2613464947e2ea09948ce3fac007b5d7fa6f7763c1b702a1f67874e7dd4c
+MISC ChangeLog 2616 SHA256 22620820b148c15b1d94044be942e4ffaab05a7b5ecc5db86f5a9ce41eeeffea SHA512 9bf3316d85e8dfb47165e9e970620f65f6bc69dec63f835078085d895783237de4092efd7014535447850b2912a8514010f5f3cbb6ae066bcbc7a3e9b2a0ea4e WHIRLPOOL a2f76228f3111b8703a36ebdaf9c57c76c0059864348dd7c8267c348964a84f6e3019e71f8bb163513198be02d610a1fedb0d8ee34c6fe5023d3b2790287b825
+MISC ChangeLog-2015 1717 SHA256 888f160734ab90f9d4da935a7f344a5286c32f9ae4444784973ca90d11812ad4 SHA512 7c966251b81b2624b629832ff8e52092ce9262afe1e4f153059b338d9430568143f13e7583c12178eef4a206e48b85c655be5883c25090a06fb6623260f6dc06 WHIRLPOOL 8fb3ade8057a939b48653eaa946fd11e18c70b12f1259ecb32ccb809a9a181f2fdf45bd723c204b75869c737cd737ca56d5096c1131f74f232e53557303171fc
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-analyzer/rtpbreak/files/rtpbreak-1.3a-limits.patch b/net-analyzer/rtpbreak/files/rtpbreak-1.3a-limits.patch
new file mode 100644
index 000000000000..78cb5f9a5a78
--- /dev/null
+++ b/net-analyzer/rtpbreak/files/rtpbreak-1.3a-limits.patch
@@ -0,0 +1,10 @@
+--- rtpbreak-1.3a/src/common.h.orig	2009-02-05 14:49:50.000000000 +0100
++++ rtpbreak-1.3a/src/common.h	2009-02-05 14:49:57.000000000 +0100
+@@ -30,6 +30,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <errno.h>
++#include <limits.h>
+ 
+ 
+ /* const */
diff --git a/net-analyzer/rtpbreak/files/rtpbreak-1.3a-missing-headers.patch b/net-analyzer/rtpbreak/files/rtpbreak-1.3a-missing-headers.patch
new file mode 100644
index 000000000000..8f9bb14e37cd
--- /dev/null
+++ b/net-analyzer/rtpbreak/files/rtpbreak-1.3a-missing-headers.patch
@@ -0,0 +1,14 @@
+Fix build failure due to missing include of udp.h #351602
+
+Patch by Kevin McCarthy <signals@gentoo.org>
+
+--- rtpbreak-1.3a.orig/src/main.c	2011-01-29 11:10:46.960653580 -0500
++++ rtpbreak-1.3a/src/main.c	2011-01-29 11:15:15.833884433 -0500
+@@ -27,6 +27,7 @@
+ #include <sys/stat.h>
+ #include <pwd.h>
+ #include <grp.h>
++#include <netinet/udp.h>
+ #include "queue.h"
+ #include "rtp.h"
+ #include "common.h"
diff --git a/net-analyzer/rtpbreak/metadata.xml b/net-analyzer/rtpbreak/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-analyzer/rtpbreak/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-analyzer/rtpbreak/rtpbreak-1.3a-r1.ebuild b/net-analyzer/rtpbreak/rtpbreak-1.3a-r1.ebuild
new file mode 100644
index 000000000000..c10b7bd76cc0
--- /dev/null
+++ b/net-analyzer/rtpbreak/rtpbreak-1.3a-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Analyze any RTP session through heuristics over UDP network traffic"
+HOMEPAGE="http://xenion.reactive-search.com/?page_id=7"
+SRC_URI="http://xenion.antifork.org/rtpbreak/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="net-libs/libnet:1.1
+	>=net-libs/libpcap-0.7"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Use limits.h PATH_MAX
+	epatch "${FILESDIR}"/${P}-limits.patch \
+		"${FILESDIR}"/${P}-missing-headers.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin src/rtpbreak
+	dodoc CHANGELOG THANKS
+	dohtml -r doc
+}
diff --git a/net-analyzer/sancp/Manifest b/net-analyzer/sancp/Manifest
new file mode 100644
index 000000000000..a362bb6eb45a
--- /dev/null
+++ b/net-analyzer/sancp/Manifest
@@ -0,0 +1,14 @@
+AUX sancp-1.6.1-compiler.patch 4603 SHA256 9fd58d1cb8db0b8b190085ea4bb54ee33b8fa976b2bafdae2063633164b23133 SHA512 7ae67ce719f36ea795eda87d7d9d97885ea544c150f568d7751397172d8608be5980f386b7f24fe4d7e3a9a49b4cae4efb3987cdbb9dfc85c69397e3d603535c WHIRLPOOL a475b3a57b33f01b7ab468b24b11f46ca16f4bfd3073221c3d99281601cfa6229d4473b0ac5991c33341c2b8c126ab2a066520da74bf41743cf92395e0692d10
+AUX sancp-1.6.1-gcc6.patch 864 SHA256 99e466253e5bf7858bd90490c2e427586397fc32992b2f0d2114c789980085ef SHA512 7dd6b24ed478866194bdd898b40c107f70b455b96856c854b6f458fad0a4001d14623e72c01d0313bb5b14c8b93a2a3451d3c30c8276c35631a616018dc9d88f WHIRLPOOL 723627517d94f1599ac914a05426810453514093dae1ea97bd1ac67433b510612d619f29a3fd9c4570beac151c219e99d2c6e659e13c0845364025715640037a
+AUX sancp.confd 382 SHA256 cc0794c0a65400e42351fb84aa706ab26eed0758c9ab71c5991bea24ef1f4577 SHA512 4ae33d655ca0a81a3bf71a382241bca90b1e58e121695041ef5210bd4abdcdbbc4385dfe673a4367898303ae64f9998453c95d2e71d8271ca322473ee61368df WHIRLPOOL c7fa87a45421850729d132eda6c828e8aad3fa34138ab679a254f618c72ca03bd44259557f8a931c89132df1136d1dcaee6b221767576987ba6e8f500c950aa3
+AUX sancp.rc1 859 SHA256 65af3fd4d32d9c5883b6c63c651afab3dc03b8883cff11be836e597e0f04e30d SHA512 16c713cf009d597c67981caa5f159b5597732c7f984fb9e91568d2956abdfdc2afb3ef6c35f8189dcca3e89757622c67c1fb67a9a6390851d0db118fd92efd0e WHIRLPOOL e215bab1257aa6e648ee0ae8ac1003efedddc4ff2baaadbad2500a77cd4757e189a7f6860292e9903988d5b2a539c86a6b3cde2fbd3bdb00db3098c34a4ea972
+AUX sguil_sancp.conf 2123 SHA256 b7d840a977f9bddd7aa6a7a541e0e69eac92c85d123778c76481e43da37b9ff6 SHA512 13a6b2573cc239328aabd6b582fcdd6b2102a4fd5380474ab5a3b85e5e4de6547c26aed888baf204e442dbe8be69c11422404c83ac0a2008cad8b6de542ac95e WHIRLPOOL 5333862640ba0982e32460b0ecba9528f1ec413487b9dec7261e37f535099e8bd89ccec02fd49f05ebdd5ef6e8ed35614d5d9a5732d4c4dff83a142c7f6fad43
+DIST sancp-1.6.1.fix200511.a.patch 662 SHA256 f80ea77873f03de40399c2c9247590829f02421d68758425cd139c48151eb13c SHA512 87662d9ea863a3a2468b7b64c81a191d34c81348eab9374245a73d3ed63cf2f25df54561f092f3713d516d9cc4eb553d4d7286fd920676a301e61669a023142e WHIRLPOOL b5881305d4dc85410fe00c23f5a923e4a41aaf570e0085035a6e9208ab55eb2cd3d99df0dff8a475c772ee332ea5ba1b3600d441f6914f4ceccb82d4b6f0def8
+DIST sancp-1.6.1.fix200511.b.patch 870 SHA256 0bbcf2797d689f9eaa46933262edc3badd644636fb8821832264bab454a870c0 SHA512 a54bbec1ce3799f83c006f7375297bafee85b12a90361f1f5dbbf46c936193c7e0f1196483a2bdf560019e93ceffe9129b3c01322eedc397e5dfa3a1a6b76b81 WHIRLPOOL d312e54489cfa9c073c6c499e56d1e24daa65d7d09558b291bc1de3b12249ca285c0ccb8c39eff03afe268f9f28db5427633f93df81c6c50f0f782cd7e04a352
+DIST sancp-1.6.1.fix200601.c.patch 3578 SHA256 38fe2e2db7419fb79c57b1e0505dbfda9958f56ab85259a84485111eb644880f SHA512 3d15028d33e7dbddc74d8c6eefac6d66e357f024dca15afdfb8156b0cf969ab093c26baa43ebf7c1ac88f4275ef4bdc91c1cc69c5aa7b439a042ed966edea30f WHIRLPOOL 20333f0f26a26ade0afc5f5fc332274e6522c2f4d36f0ea6579220349f3104c7eb3153b68ce79378e1fcd16c8c35ac927dfa29f619ac7fb7599a5400b8891747
+DIST sancp-1.6.1.fix200606.d.patch 6847 SHA256 1c62a44d75f3cd8b07445b02d9535f3eede3a60329bda111dd855c674e2745a9 SHA512 474a69052a2b9642fdc59e28c0237852d49b7b05445f0ffbbd2ea3f01b70a44e10ee49fba6294b413a53afe50271aaf88f979f8c479fb4b464b3ba5a70534276 WHIRLPOOL 9593161b57e153b3f25de9d958e57364a5fcdfa99bbdea183be3c25033a818de4724df2b5271d51fc64c78d17683c227afb691e871cd4804881e54921ab76107
+DIST sancp-1.6.1.tar.gz 69986 SHA256 58e487a4bd83716e90ff19d0d7fab352e28bbe143be60f4ee61c34d5fa6380a3 SHA512 41c6b35a2e7295d3b8185b9cc556c56b285cae7542c7ace78e663e54cef8d470bfa2ee083d9837fa34cf5ad1e7c325fb838b00e4f776f5662cade7d61e07145c WHIRLPOOL 8c0058ec1878e23cf3787fef318bfdc22bc301f9a898cccb7533954a7a587dab89147ca841f708d1bf27e986842ea5856c451678d76e4b0f1ee5ee507c726621
+EBUILD sancp-1.6.1-r4.ebuild 1712 SHA256 1b9d46184e2572b742786be3e5bbaf76dd2d48e956ecb2ebb29d3656aa1394bd SHA512 9ae4fdda34f9e2d4bf59e0c3eec641bdec84f7a468647b528ce5e3abda3ab3abacf7a287d80cee6fcdff285284a42a68e78bfed1460b574f70e218e8e6e5e525 WHIRLPOOL a29006274039a179f7820ba61bad633e752c992fabfc28dd214cb8ad1991621ba3edf81389620882d757684aed7f25e0715a41cdfcb143ccfa622a28c9465c13
+MISC ChangeLog 3182 SHA256 b8f52c1d53dd56f6c6d7a2772fa3fef0e40b26047ed808ae321e4330abcb0e89 SHA512 ccf514dcf2185d24ef866245ee1629ed099ed2804ed3a3226110fe95d19dd760285c60fd20ec06848dcaa9ad353a021aed4b69e6a5c90386094f28361d83160d WHIRLPOOL 7bc23a5344faddf3124ec48e1d6b8caef49ef6fc09b2cc3ebf4dcb14b6a0983af3466a0d2d987d5edeb7a137b91dde007be48134fca894bc35a4300866c6f314
+MISC ChangeLog-2015 2768 SHA256 75106476e6bb403c2249016838834a414f9541b18522573dbac720398742988e SHA512 73b5ba728fa1dee281aad1ff631f099655ebad0d6d56d7ff94fd772f79176e31c0c90a05df8a2ce283ef8991a572735ce613932a33b31ceadda6bf46d2f05ef9 WHIRLPOOL a690a6e8745b918aac3d22290451dd90a7da83b3be4fc5400ad938848d9453f47cb96160e490c5eaf4d3db6b2ea9632070a9735964bf0e9df6e0505ba49fe983
+MISC metadata.xml 473 SHA256 9727a78272160c20c6f21e385ffb8d65e659442de2a69dcc60236a1d341d7fb5 SHA512 3328fdd1dc68198464db9730005254454691ac8f4fbdd76dc09eb21c12f21fcd011ce7fb6cb1ce06262eb79fcc3c43abddd2314bdc64e2022fc8e5bb58360a85 WHIRLPOOL 17322647632febb92712c356eb659a6dd26917745e4e26853fb9716417ca3f3dc9ede47007ea677accce4b3347fadb503899f45da4da50500fbbc5ae6514bc63
diff --git a/net-analyzer/sancp/files/sancp-1.6.1-compiler.patch b/net-analyzer/sancp/files/sancp-1.6.1-compiler.patch
new file mode 100644
index 000000000000..d7816cbdd5de
--- /dev/null
+++ b/net-analyzer/sancp/files/sancp-1.6.1-compiler.patch
@@ -0,0 +1,45 @@
+--- a/Makefile	2004-01-19 23:04:56.000000000 +0100
++++ b/Makefile	2010-09-15 02:02:26.000000000 +0200
+@@ -1,26 +1,26 @@
+ 
+ # !!! Uncomment this CFLAGS for a small binary !!!
+-CFLAGS	=  -O3 -s -I/usr/include/pcap -L/usr/lib/libpcap.so.0.6.2
++CFLAGS	+=  -I/usr/include/pcap -L/usr/lib/libpcap.so.0.6.2
+ 
+ # !!! or uncomment this CFLAGS for a large binary with symbols; use for debugging  !!!
+ #CFLAGS	=  -O0 -g -I/usr/include/pcap -L/usr/lib/libpcap.so.0.6.2
+ 
+ final : sancp.cc Makefile
+-	if [ ! -f build_acl.o -o build_acl.cc -nt build_acl.o ]; then g++ -Wall $(CFLAGS) -c build_acl.cc -o build_acl.o; fi
+-	if [ ! -f misc_functs.o -o misc_functs.cc -nt misc_functs.o ]; then g++ -Wall $(CFLAGS) -c misc_functs.cc -o misc_functs.o; fi
+-	if [ ! -f outputFileHandle.o -o outputFileHandle.cc -nt outputFileHandle.o ]; then g++ -Wall $(CFLAGS) -c outputFileHandle.cc -o outputFileHandle.o; fi
+-	if [ ! -f apply_rule.o -o apply_rule.cc -nt apply_rule.o ]; then g++ -Wall $(CFLAGS) -c apply_rule.cc -o apply_rule.o; fi
+-	if [ ! -f decode.o -o decode.cc -nt decode.o ]; then g++ -Wall $(CFLAGS) -c decode.cc -o decode.o; fi
+-	if [ ! -f fileHandle.o -o fileHandle.cc -nt fileHandle.o ]; then g++ -Wall $(CFLAGS) -c fileHandle.cc -o fileHandle.o; fi
+-	if [ ! -f MemoryPool.o -o MemoryPool.cc -nt MemoryPool.o ]; then g++ -Wall $(CFLAGS) -c MemoryPool.cc -o MemoryPool.o; fi
+-	if [ ! -f pcapFileHandle.o -o pcapFileHandle.cc -nt pcapFileHandle.o ]; then g++ -Wall $(CFLAGS) -c pcapFileHandle.cc -o pcapFileHandle.o; fi
+-	if [ ! -f sancp.o -o sancp.cc -nt sancp.o ]; then 	g++ -Wall $(CFLAGS) -c sancp.cc -o sancp.o; fi
+-	if [ ! -f pcap_functions.o -o pcap_functions.c -nt pcap_functions.o ]; then 	gcc -Wall $(CFLAGS) -c pcap_functions.c -o pcap_functions.o; fi
+-	if [ ! -f help.o -o help.cc -nt help.o ]; then 	g++ -Wall $(CFLAGS) -c help.cc -o help.o ; fi
+-	if [ ! -f permissions.o -o permissions.cc -nt permissions.o ]; then 	g++ -Wall $(CFLAGS) -c permissions.cc -o permissions.o ; fi
+-	if [ ! -f check_packet.o -o check_packet.cc -nt check_packet.o ]; then 	g++ -Wall $(CFLAGS) -c check_packet.cc -o check_packet.o; fi
+-	if [ ! -f statefull_logging.o -o statefull_logging.cc -nt statefull_logging.o ]; then 	g++ -Wall $(CFLAGS) -c statefull_logging.cc -o statefull_logging.o ; fi
+-	g++ -Wall $(CFLAGS) -o sancp sancp.o misc_functs.o check_packet.o statefull_logging.o build_acl.o apply_rule.o decode.o pcap_functions.o pcapFileHandle.o fileHandle.o MemoryPool.o help.o permissions.o outputFileHandle.o -lpcap
++	if [ ! -f build_acl.o -o build_acl.cc -nt build_acl.o ]; then $(CXX) -Wall $(CFLAGS) -c build_acl.cc -o build_acl.o; fi
++	if [ ! -f misc_functs.o -o misc_functs.cc -nt misc_functs.o ]; then $(CXX) -Wall $(CFLAGS) -c misc_functs.cc -o misc_functs.o; fi
++	if [ ! -f outputFileHandle.o -o outputFileHandle.cc -nt outputFileHandle.o ]; then $(CXX) -Wall $(CFLAGS) -c outputFileHandle.cc -o outputFileHandle.o; fi
++	if [ ! -f apply_rule.o -o apply_rule.cc -nt apply_rule.o ]; then $(CXX) -Wall $(CFLAGS) -c apply_rule.cc -o apply_rule.o; fi
++	if [ ! -f decode.o -o decode.cc -nt decode.o ]; then $(CXX) -Wall $(CFLAGS) -c decode.cc -o decode.o; fi
++	if [ ! -f fileHandle.o -o fileHandle.cc -nt fileHandle.o ]; then $(CXX) -Wall $(CFLAGS) -c fileHandle.cc -o fileHandle.o; fi
++	if [ ! -f MemoryPool.o -o MemoryPool.cc -nt MemoryPool.o ]; then $(CXX) -Wall $(CFLAGS) -c MemoryPool.cc -o MemoryPool.o; fi
++	if [ ! -f pcapFileHandle.o -o pcapFileHandle.cc -nt pcapFileHandle.o ]; then $(CXX) -Wall $(CFLAGS) -c pcapFileHandle.cc -o pcapFileHandle.o; fi
++	if [ ! -f sancp.o -o sancp.cc -nt sancp.o ]; then 	$(CXX) -Wall $(CFLAGS) -c sancp.cc -o sancp.o; fi
++	if [ ! -f pcap_functions.o -o pcap_functions.c -nt pcap_functions.o ]; then $(CC) -Wall $(CFLAGS) -c pcap_functions.c -o pcap_functions.o; fi
++	if [ ! -f help.o -o help.cc -nt help.o ]; then 	$(CXX) -Wall $(CFLAGS) -c help.cc -o help.o ; fi
++	if [ ! -f permissions.o -o permissions.cc -nt permissions.o ]; then 	$(CXX) -Wall $(CFLAGS) -c permissions.cc -o permissions.o ; fi
++	if [ ! -f check_packet.o -o check_packet.cc -nt check_packet.o ]; then 	$(CXX) -Wall $(CFLAGS) -c check_packet.cc -o check_packet.o; fi
++	if [ ! -f statefull_logging.o -o statefull_logging.cc -nt statefull_logging.o ]; then 	$(CXX) -Wall $(CFLAGS) -c statefull_logging.cc -o statefull_logging.o ; fi
++	$(CXX) -Wall $(CFLAGS) $(LDFLAGS) -o sancp sancp.o misc_functs.o check_packet.o statefull_logging.o build_acl.o apply_rule.o decode.o pcap_functions.o pcapFileHandle.o fileHandle.o MemoryPool.o help.o permissions.o outputFileHandle.o -lpcap
+ 
+ clean :
+ 	rm -f *.o sancp
diff --git a/net-analyzer/sancp/files/sancp-1.6.1-gcc6.patch b/net-analyzer/sancp/files/sancp-1.6.1-gcc6.patch
new file mode 100644
index 000000000000..e56d7114468e
--- /dev/null
+++ b/net-analyzer/sancp/files/sancp-1.6.1-gcc6.patch
@@ -0,0 +1,26 @@
+--- a/pcapFileHandle.h
++++ b/pcapFileHandle.h
+@@ -16,7 +16,12 @@
+ 
+ #define PCAP_HEADER_SIZE 24
+ 
+-const char pcap_header[] = { 0xd4,0xc3,0xb2,0xa1,0x02,0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x4e,0x00,0x00,0x01,0x00,0x00,0x00 };
++const char pcap_header[] = {
++	(char) 0xd4,(char) 0xc3,(char) 0xb2,(char) 0xa1,(char) 0x02,(char) 0x00,
++	(char) 0x04,(char) 0x00,(char) 0x00,(char) 0x00,(char) 0x00,(char) 0x00,
++	(char) 0x00,(char) 0x00,(char) 0x00,(char) 0x00,(char) 0x20,(char) 0x4e,
++	(char) 0x00,(char) 0x00,(char) 0x01,(char) 0x00,(char) 0x00,(char) 0x00
++};
+ 
+ class pcapFileHandle : public fileHandle {
+ 
+--- a/sancp.h
++++ b/sancp.h
+@@ -223,7 +223,6 @@
+ #define R_URG          0x20
+ #define R_RES2         0x40
+ #define R_RES1         0x80
+-#define max(i,j)        (((i)>(j)) ? (i) : (j))
+ #define SIZE_OF_CLASS_C	11
+ 
+ struct t_ports {
diff --git a/net-analyzer/sancp/files/sancp.confd b/net-analyzer/sancp/files/sancp.confd
new file mode 100644
index 000000000000..31cbef82ec1b
--- /dev/null
+++ b/net-analyzer/sancp/files/sancp.confd
@@ -0,0 +1,15 @@
+# Config file for /etc/init.d/sancp
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Interface to listen on
+IFACE="eth0"
+
+# Directory to log in 
+LOGDIR="/var/log/sancp"
+
+# Default config file
+CONF="/etc/sancp/sancp.conf"
+
+# You could add more options :)
+SANCP_OPTS="-d $LOGDIR/today -i $IFACE -c $CONF -u sancp -g sancp"
diff --git a/net-analyzer/sancp/files/sancp.rc1 b/net-analyzer/sancp/files/sancp.rc1
new file mode 100644
index 000000000000..07745f675676
--- /dev/null
+++ b/net-analyzer/sancp/files/sancp.rc1
@@ -0,0 +1,42 @@
+#!/sbin/openrc-run
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+today=$(date '+%Y-%m-%d')
+
+depend() {
+	need net
+}
+checkconfig() {
+	if [ ! -e /etc/sancp/sancp.conf ] ; then
+		eerror "You need an /etc/sancp/sancp.conf to run sancp"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	
+	# Today's log directory
+	if [ ! -d $LOGDIR/$today ]; then
+		/bin/mkdir $LOGDIR/$today
+		/bin/rm -f $LOGDIR/today
+	fi
+	
+	# today/ directory :)
+	if [ ! -d $LOGDIR/today ]; then
+		/bin/ln -s $LOGDIR/$today $LOGDIR/today
+	fi
+	
+	ebegin "Starting sancp"
+	start-stop-daemon --start --quiet -m --pidfile /var/run/sancp.pid \
+		--exec /usr/bin/sancp \
+		-- ${SANCP_OPTS} > /var/log/sancp.log 2>&1 &
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping sancp"
+	start-stop-daemon --stop --quiet --pidfile /var/run/sancp.pid
+	eend $?
+}
diff --git a/net-analyzer/sancp/files/sguil_sancp.conf b/net-analyzer/sancp/files/sguil_sancp.conf
new file mode 100644
index 000000000000..f559286e7bb3
--- /dev/null
+++ b/net-analyzer/sancp/files/sguil_sancp.conf
@@ -0,0 +1,69 @@
+# $Id: sancp.conf,v 1.1 2004/03/19 20:33:59 bamm Exp $ #
+#
+# This sancp.conf is distributed as part of sguil (http://sguil.sf.net).
+# It's purpose is to define a default output that is compatible with table
+# schema defined by sguil. Please read the README.sancp for more information
+#
+# sancp is copyrighted by John Curry and can be downloaded at:
+# www.metre.net/sancp.html
+#
+
+# SANCP VERSION 1.5.3
+
+# Currently, sguil only supports the 'stats' output and we want it in
+# timestamped fields
+default stats tsfilename stats
+
+# Time in seconds we write a new file if expired cnxs are available
+default flush_interval=30
+# This tells sancp to open new file handle, write, and close in one step
+default burst_mode=enable
+
+# Default timeout: how many secs to wait after the last packet till we consider the cnx closed
+default timeout=120
+				
+# Conforms with out sguil sancp table schema
+format stats sancp_id,start_time_gmt,stop_time_gmt,duration,ip_proto,src_ip_decimal,src_port,dst_ip_decimal,dst_port,src_pkts,src_bytes,dst_pkts,dst_bytes,sflags,dflags
+
+# From here on you define what stats/cnxs/sessions/flows (whatever you 
+# want to call it) get logged. Please read the sancp documention for 
+# more information. Most of the below are examples of setting 
+# variables for complex rules.
+
+var ip 8                # ether proto 0x0800  # ip traffic
+
+# define some ip protocols
+
+var icmp 1
+var tcp 6
+var udp 17
+
+# define some tcp protocols
+
+var http 80
+var https 443
+var smtp 25
+var dns 53
+
+var HOME_NET 127.0.0.1
+#var WWW_NET 192.168.1.0/24
+#var MAIL_SERVER 192.168.1.2
+#var MAIL_SERVER2 192.168.1.3
+
+
+# Default output logging for each connection
+# We don't use realtime or pcap logging at this point so we pass them
+default realtime=pass
+default pcap=pass
+
+# Here is where our "rules" start. We log all stats by default
+# so this is defining exceptions.
+#
+# first six fields are required before rule options can be used
+#
+#     eth_proto src_ip dst_ip ip_proto src_port dst_port
+#
+
+# Here is an example if ignoring outbound HTTP stats.
+#ip HOME_NET any tcp any http, stats pass
+#ip HOME_NET any tcp any https, stats pass
diff --git a/net-analyzer/sancp/metadata.xml b/net-analyzer/sancp/metadata.xml
new file mode 100644
index 000000000000..3f2ab8cd615e
--- /dev/null
+++ b/net-analyzer/sancp/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<use>
+		<flag name="sguil">Enable sguil (The Analyst Console for Network Security Monitoring) support</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">sancp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/sancp/sancp-1.6.1-r4.ebuild b/net-analyzer/sancp/sancp-1.6.1-r4.ebuild
new file mode 100644
index 000000000000..4f1bfd0b4e9f
--- /dev/null
+++ b/net-analyzer/sancp/sancp-1.6.1-r4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs user
+
+DESCRIPTION="collect network traffic statistics and store them in pcap format"
+HOMEPAGE="http://www.metre.net/sancp.html"
+SRC_URI="
+	http://www.metre.net/files/${P}.tar.gz
+	http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.a.patch
+	http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.b.patch
+	http://sancp.sourceforge.net/${PN}-1.6.1.fix200601.c.patch
+	http://sancp.sourceforge.net/${PN}-1.6.1.fix200606.d.patch
+"
+
+LICENSE="QPL GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="sguil"
+
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	enewgroup sancp
+	enewuser sancp -1 -1 /dev/null sancp
+}
+
+src_prepare() {
+	epatch "${DISTDIR}"/${PN}-1.6.1.fix200511.a.patch
+	epatch "${DISTDIR}"/${PN}-1.6.1.fix200511.b.patch
+	# bug 138337
+	epatch "${DISTDIR}"/${PN}-1.6.1.fix200601.c.patch
+	epatch "${DISTDIR}"/${PN}-1.6.1.fix200606.d.patch
+	epatch "${FILESDIR}"/${P}-compiler.patch
+	epatch "${FILESDIR}"/${P}-gcc6.patch
+
+	tc-export CXX CC
+}
+
+src_install() {
+	keepdir /var/log/sancp/
+	dodoc docs/CHANGES docs/fields.LIST docs/README docs/SETUP \
+		"${FILESDIR}"/sguil_sancp.conf etc/sancp/sancp.conf
+
+	insinto /etc/sancp
+	if use sguil ; then
+		newins "${FILESDIR}"/sguil_sancp.conf sancp.conf
+	else
+		doins etc/sancp/sancp.conf
+	fi
+
+	dobin sancp
+
+	newinitd "${FILESDIR}"/sancp.rc1 sancp
+	newconfd "${FILESDIR}"/sancp.confd sancp
+	if use sguil ; then
+		sed -i -e /^SANCP_OPTS/s:'sancp':"sguil":g \
+			-e s:'-d $LOGDIR/today':"-d /var/lib/sguil/$(hostname)/sancp": \
+			"${D}/etc/conf.d/sancp"
+	fi
+
+	fowners sancp:sancp /var/log/sancp
+	fperms 0770 /var/log/sancp
+}
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
new file mode 100644
index 000000000000..3b1bde394c64
--- /dev/null
+++ b/net-analyzer/sarg/Manifest
@@ -0,0 +1,7 @@
+AUX sarg-2.3.9-configure-bash.patch 4033 SHA256 363678ba575691e37e589d920895d8454864c45c3785cc106f50ed31aaa7519c SHA512 42f40db8b2d378888ce73aab0ab03e05f3bbad516d4db025fe6ce1377e1b1d97db2a857b99fb350c8e92a80de75a4c2c4012403546c3f4e5261972060be60b68 WHIRLPOOL 7cf87c7ef154201765d065a023bbbb942ec74957bc93b8eb3b4cec2e4fd7f4d7edaef73f1f0aca801c558f805a943fbe19c8833325bc0d15f029918b4648fb21
+AUX sarg-2.3.9-configure.patch 641 SHA256 f9ee6b9d69a4a360cca028922f33d9ff609708004d569d24c4dedbcb680b9885 SHA512 0da589199b6ea13589bc8cdc8504f6b4260a03bf1d8ab48093ada01e3be3a82961a2fad6f0abe301ed004bd9c642f0789ebb745d52044214e98211124c66f6ae WHIRLPOOL f185d436bab58ca0b3b2ac362c86807930aba07f6293d28c74d249305ff84e8dee0fe15faeedb660ffd82f7e13970d4f8f4aa796cea05a0179dd80314fa2e51b
+DIST sarg-2.3.10.tar.gz 1278071 SHA256 40f4408a6180516bbc8762a05ce90e06274639d7e8d74b5c142781dac751e3e7 SHA512 d0a61ac6d455feb8fff024c21f1b7547471ef8cf847fd54d9042881cac3ee14a41fe2a8ea9e0fc2bd2ea0448714ba457e9070282c31e4f3c879e4d83d00ecb2d WHIRLPOOL 6550231d7e7479360857cd1908601963364990ab0f83417aed56ddc2d2bce289fcafd5c5f55a185dd0e15a3d16f6662e23a1901fe65658ab6df04fa9c143f1e0
+EBUILD sarg-2.3.10.ebuild 1757 SHA256 2877b254cc5aafd328e28f251d70da9479e249fa283bb410153a94160dd47dd5 SHA512 ceef1daa6e382ffa0095733f6747ad7480aab5dd39edbeef15812aa64ce44c87e56a475c5a29dc4878b0581ac1414b569361349e1446684f8aa7533a6405c182 WHIRLPOOL 6f058aefc6592011b2d4ab50d9ebced58b6cb4939238b31db61348db8c8333825dbfe7c4cfd70a915adec9e360d9e87f50c6ce21faf1126d2f77c87435ed2aa4
+MISC ChangeLog 2501 SHA256 61c2378ea6c8f50acfc55ec7ed31f0e3d2bd79411587e51d905df295337c6574 SHA512 c94977b42c78ae6674d7928051ddf7293db89c9a1fd9f1ddd766b56b8cff26d9feb3a20a44859fd52d1d2b1adfb09a3ef212f3da637bf0640f014f4a7b1c7dcb WHIRLPOOL a34346bd72a20a5bf0db201a2603d60c41e38da90de46b4cecc8efb5dc8e47484827b8124638588ed6662ea252aa509dd1fee047ec68139f2df4d088eb391d7f
+MISC ChangeLog-2015 12801 SHA256 5d42e3e19d050471bf98d1fa88a867432883d16e2a0afe33023717ce967dcb41 SHA512 6482976c4177418c3c361e501dc92e43052570192bf7ef2ff83aa8139278719e83bcd1857aed6e3affe381a914e7f9800563ed801386dbda3c2ed634832b70d3 WHIRLPOOL b4fd883414acdb6f754e6953a251cd0935d40b03b7ed209b7652b2610d51c6fb37ad2c0efef1bf62f94d584c9e398ae6955002367741d87cf78ea12a12d54c37
+MISC metadata.xml 856 SHA256 18a7b0edfdedacf9e387b520a1ebd0f42b7e032c16e3fc976ec4ffe015b7dd0f SHA512 3571bb6b4562fa58e9736ce48c4b3930bb33a3b38dec15b79b22b3cbd457ea7751819a2b45a7e728b02e641c187c085e813eb29d8644dc57e40b682f061b115a WHIRLPOOL 570d6661a44be89a89ae6a4f5517cb73704d89a19fef9bb4a885ae66c74f4e67e1b627def3ce20c0a9f2081ec6c46c3775aebaac4bc63b82db3e4d5e43da3ac6
diff --git a/net-analyzer/sarg/files/sarg-2.3.9-configure-bash.patch b/net-analyzer/sarg/files/sarg-2.3.9-configure-bash.patch
new file mode 100644
index 000000000000..ddc0ca8ec4eb
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.3.9-configure-bash.patch
@@ -0,0 +1,102 @@
+--- a/configure.in
++++ b/configure.in
+@@ -41,7 +41,7 @@
+ CFLAGS="${CFLAGS} -Wextra -Wno-unused-parameter"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_extra_warnings="yes"],[have_extra_warnings="no"])
+ AC_MSG_RESULT($have_extra_warnings)
+-if test "$have_extra_warnings" == "no" ; then
++if test "$have_extra_warnings" = "no" ; then
+     CFLAGS="${saved_CFLAGS}"
+ fi
+ 
+@@ -50,7 +50,7 @@
+ CFLAGS="${CFLAGS} -Werror=implicit-function-declaration"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_implicit_function_declaration="yes"],[have_implicit_function_declaration="no"])
+ AC_MSG_RESULT($have_implicit_function_declaration)
+-if test "$have_implicit_function_declaration" == "no" ; then
++if test "$have_implicit_function_declaration" = "no" ; then
+     CFLAGS="${saved_CFLAGS}"
+ fi
+ 
+@@ -59,7 +59,7 @@
+ CFLAGS="${CFLAGS} -Werror=format"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_error_format="yes"],[have_error_format="no"])
+ AC_MSG_RESULT($have_error_format)
+-if test "$have_error_format" == "no" ; then
++if test "$have_error_format" = "no" ; then
+     CFLAGS="${saved_CFLAGS}"
+ fi
+ 
+@@ -93,7 +93,7 @@
+ [],[with_gd=check])
+ if ( test "x$with_gd" != "xno" ) ; then
+ 	AC_CHECK_HEADERS(gd.h gdfontl.h gdfontt.h gdfonts.h gdfontmb.h gdfontg.h)
+-	if ( test "x$ac_cv_header_gd_h" == "xyes" ) ; then
++	if ( test "x$ac_cv_header_gd_h" = "xyes" ) ; then
+ 		AC_CHECK_LIB(gd, gdImagePng,LIBS="-lgd ${LIBS}"; HAVE_GD_LIB="yes", HAVE_GD_LIB="")
+ 		if ( test "x$HAVE_GD_LIB" != "xyes" ) ; then
+ 			AC_MSG_ERROR([ligbd is required to compile sarg with gd])
+@@ -137,7 +137,7 @@
+ [],[with_pcre=check])
+ if ( test "x$with_pcre" != "xno" ) ; then
+ 	AC_CHECK_HEADERS(pcre.h)
+-	if ( test "x$ac_cv_header_pcre_h" == "xyes" ) ; then
++	if ( test "x$ac_cv_header_pcre_h" = "xyes" ) ; then
+ 		LIBS="$LIBS $(pcre-config --libs)"
+ 		CFLAGS="$CFLAGS $(pcre-config --cflags)"
+ 	else
+@@ -243,7 +243,7 @@
+     fi
+ ],[FONTDIR="${datarootdir}/sarg/fonts"])
+ if test "$FONTDIR" ; then
+-   if test "x$prefix" == "xNONE" ; then
++   if test "x$prefix" = "xNONE" ; then
+       tempfullpath=`prefix=$ac_default_prefix ; eval "echo $FONTDIR"`
+    else
+       tempfullpath=`eval "echo $FONTDIR"`
+@@ -261,7 +261,7 @@
+         IMAGEDIR=$enableval
+     fi
+ ],[IMAGEDIR="${datarootdir}/sarg/images"])
+-if test "x$prefix" == "xNONE" ; then
++if test "x$prefix" = "xNONE" ; then
+    tempfullpath=`prefix=$ac_default_prefix ; eval "echo $IMAGEDIR"`
+ else
+    tempfullpath=`eval "echo $IMAGEDIR"`
+@@ -286,7 +286,7 @@
+        CFLAGS="${CFLAGS} -Wformat -Werror=format-security"
+        AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_format_security="yes"],[have_format_security="no"])
+        AC_MSG_RESULT($have_format_security)
+-       if test "$have_format_security" == "no" ; then
++       if test "$have_format_security" = "no" ; then
+           CFLAGS="${saved_CFLAGS}"
+        fi
+ 
+@@ -295,7 +295,7 @@
+        CFLAGS="${CFLAGS} -Wempty-body"
+        AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_empty_body="yes"],[have_empty_body="no"])
+        AC_MSG_RESULT($have_empty_body)
+-       if test "$have_empty_body" == "no" ; then
++       if test "$have_empty_body" = "no" ; then
+           CFLAGS="${saved_CFLAGS}"
+        fi
+     fi
+@@ -367,14 +367,14 @@
+ AC_CONFIG_FILES([Makefile po/Makefile.in])
+ AC_OUTPUT
+ 
+-if ( test "x$gd_status" == "xdisabled" ) ; then
++if ( test "x$gd_status" = "xdisabled" ) ; then
+ 	AC_MSG_NOTICE([Not building with gd as requested on the configuration command line])
+-elif ( test "x$gd_status" == "xnot found" ) ; then
++elif ( test "x$gd_status" = "xnot found" ) ; then
+ 	AC_MSG_NOTICE([gd.h was not found so the graphs won't be available in the report])
+ fi
+ 
+-if ( test "x$pcre_status" == "xdisabled" ) ; then
++if ( test "x$pcre_status" = "xdisabled" ) ; then
+ 	AC_MSG_NOTICE([Not building with pcre as requested on the configuration command line])
+-elif ( test "x$pcre_status" == "xnot found" ) ; then
++elif ( test "x$pcre_status" = "xnot found" ) ; then
+ 	AC_MSG_NOTICE([pcre.h was not found so the regexp won't be available in the hostalias])
+ fi
diff --git a/net-analyzer/sarg/files/sarg-2.3.9-configure.patch b/net-analyzer/sarg/files/sarg-2.3.9-configure.patch
new file mode 100644
index 000000000000..630e944f7534
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.3.9-configure.patch
@@ -0,0 +1,31 @@
+--- a/configure.in
++++ b/configure.in
+@@ -2,6 +2,7 @@
+ AC_INIT([sarg],[2.3.9])
+ AC_CONFIG_SRCDIR([log.c])
+ AC_CONFIG_AUX_DIR(cfgaux)
++AC_CONFIG_MACRO_DIR(m4)
+ 
+ AC_CANONICAL_HOST
+ 
+@@ -26,6 +27,11 @@
+ dnl C99 support is required to define LLONG_MAX (at least on CentOS 5.7)
+ AC_PROG_CC_C99
+ 
++dnl mkdir_p / MKDIR_P
++AC_PROG_MKDIR_P
++mkdir_p="$MKDIR_P"
++AC_SUBST(mkdir_p)
++
+ # Report more warnings to improve code quality.
+ CFLAGS="${CFLAGS} -Wall -Wno-sign-compare"
+ 
+@@ -60,7 +66,7 @@
+ 
+ case "$host" in
+    *-solaris*)
+-   LDFLAGS="${LDFLAGS} -lsocket -lnsl"
++   LIBS="${LIBS} -lsocket -lnsl"
+    CFLAGS="-DSOLARIS ${CFLAGS}"
+    ;;
+ esac
diff --git a/net-analyzer/sarg/metadata.xml b/net-analyzer/sarg/metadata.xml
new file mode 100644
index 000000000000..deaa23376cb0
--- /dev/null
+++ b/net-analyzer/sarg/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
+  <longdescription>Sarg - Squid Analysis Report Generator is a tool that allow
+ you to view "where" your users are going to on the Internet. Sarg provides many
+ informations about Squid users activities: times, bytes, sites, etc...
+ </longdescription>
+  <use>
+    <flag name="pcre">Enable support for regular expressions in the hostalias file through <pkg>dev-libs/libpcre</pkg></flag>
+    <flag name="gd">Enable support for graphs in reports through <pkg>media-libs/gd</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">sarg</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/sarg/sarg-2.3.10.ebuild b/net-analyzer/sarg/sarg-2.3.10.ebuild
new file mode 100644
index 000000000000..870baa2e64d8
--- /dev/null
+++ b/net-analyzer/sarg/sarg-2.3.10.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Squid Analysis Report Generator"
+HOMEPAGE="http://sarg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86"
+SLOT="0"
+IUSE="+gd ldap pcre"
+
+DEPEND="
+	gd? ( media-libs/gd[png,truetype] )
+	ldap? ( net-nds/openldap )
+	pcre? ( dev-libs/libpcre )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess )
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-2.3.9-configure.patch \
+		"${FILESDIR}"/${PN}-2.3.9-configure-bash.patch
+
+	sed -i \
+		-e 's:/usr/local/squid/var/logs/access.log:/var/log/squid/access.log:' \
+		-e 's:/usr/local/\(squidGuard/squidGuard.conf\):/etc/\1:' \
+		-e 's:/var/www/html/squid-reports:/var/www/localhost/htdocs/squid-reports:' \
+		-e 's:/usr/local/sarg/exclude_codes:/etc/sarg/exclude_codes:' \
+		sarg.conf || die
+
+	sed -i \
+		-e 's:"/var/www/html/squid-reports":"/var/www/localhost/htdocs/squid-reports":' \
+		log.c || die #43132
+
+	sed	-i \
+		-e 's:/usr/local/sarg/passwd:/etc/sarg/passwd:' \
+		htaccess || die
+
+	sed -i \
+		-e 's:/usr/local/\(sarg/sarg.conf\):/etc/\1:' \
+		-e 's:/usr/local/squid/etc/passwd:/etc/squid/passwd:' \
+		user_limit_block || die
+
+	sed -i \
+		-e 's:/usr/local/squid/etc/block.txt:/etc/squid/etc/block.txt:' \
+		sarg-php/sarg-block-it.php || die
+
+	sed -i \
+		-e 's:/usr/local/\(sarg/sarg.conf\):/etc/\1:' \
+		-e 's:/usr/local/\(squidGuard/squidGuard.conf\):/etc/\1:' \
+		sarg.1 sarg-php/sarg-squidguard-block.php || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with gd) \
+		$(use_with ldap) \
+		$(use_with pcre) \
+		--sysconfdir="${EPREFIX}/etc/sarg/"
+}
diff --git a/net-analyzer/sbd/Manifest b/net-analyzer/sbd/Manifest
new file mode 100644
index 000000000000..0f387fdcd17e
--- /dev/null
+++ b/net-analyzer/sbd/Manifest
@@ -0,0 +1,5 @@
+DIST sbd-1.37.tar.gz 83991 SHA256 42de50dcfca757cd03017c6e56ac7a2f87532a08e7043423cd20d911fd645f5d SHA512 845f3eb20d3a6006f7afc9b60eecaa3049172b3fb2796058f18a13ddbfb7f2c9914bef45bd4f3557db814783717eae24fe13d46d22c65359ba3f816c6d52ea7c WHIRLPOOL ef27336f43e0617df2c53d3d7903be9a05702fcac5e91f6d01134b757b188c1c1b7b88ea4ef24654e8b1dbf3e4182a618035884d24872746ce241071d0add895
+EBUILD sbd-1.37-r1.ebuild 649 SHA256 a254b57e706a8c1b652b1d8534b66179834aff2ffa18ba1bd684f6da198b08ae SHA512 39e51120c26bbe6eff07b449039009811e3e747d06c06a93c6da8fd480b6170840d9c3980ea713d2697b0ce8b1365d71ca359f954634650c13e4e89f7d958248 WHIRLPOOL 42f2d9139df13b287a33954a1d5917f2a74dc221a657147d49b92fb9f452864f6f153d79e16f267becce04183e6ab51805617ce5384c61de649f97828f66f12f
+MISC ChangeLog 2423 SHA256 32a33d28c733fa2ab5c230b592cbfee18b7993858abc726eaabb893536524af7 SHA512 15009fda781c810605d793f73bfbc5a965143f97f9de7a3663a856d68cf8342ff011c315a65afe122b1105cffb75a7ce831a8bb9839115ca2b04b40678345259 WHIRLPOOL 08ce0578686bea82eb1afa3c4fb0087e14a6170aa7943605adf966676fd39d3c77f0cf0bced1ae157b40c4ee708b219e69c1ac329ccd9e5d37bded050c8b4541
+MISC ChangeLog-2015 2275 SHA256 696716b52faa55c237e3913bcd4b9304f5be46d31e6b91b0fd473ddbbf1ac301 SHA512 9be31b291addf46300402983b3bdf5df04562fb4eab7887bf83fddc43db1124eec7319be22643ba739c0681c63146e1a26d4fe794ee5d4c561ac4d23d74f51e5 WHIRLPOOL 9fbbb0a1e3f94d0cc86b064813de118e2dee72ae76b9d10e761438a2bf72902cdbd68d882c32764d64ec93f417ccab5395c3ece1359e2bb5ad035475a2118282
+MISC metadata.xml 625 SHA256 a078a4c6d38da314d0acd40d5ecd9774b7f188f8382bf753e3d9bbb12b213f21 SHA512 80da056e231f3f68263ca3d4f44b79990efce1679878923ae39bd31875d19319851e58d5d99a1d21eacfb03c95374ab765d24a3b92aa213c1c23387ad33263e0 WHIRLPOOL fce350782f5e8a8d8a05872840eef439ddfd8631c7d9bd3d4818023775069bf239511ce3e04178985da4d2d05dcbc956c56897af026f5b8c07f681993798a916
diff --git a/net-analyzer/sbd/metadata.xml b/net-analyzer/sbd/metadata.xml
new file mode 100644
index 000000000000..38408b55071e
--- /dev/null
+++ b/net-analyzer/sbd/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>
+sbd is a Netcat-clone, designed to be portable and offer strong encryption. It
+features AES-CBC-128 + HMAC-SHA1 encryption (by Christophe Devine), program
+execution (-e option), choosing source port, continuous reconnection with delay,
+and some other nice features. Only TCP/IP communication is supported.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/sbd/sbd-1.37-r1.ebuild b/net-analyzer/sbd/sbd-1.37-r1.ebuild
new file mode 100644
index 000000000000..514310c7e942
--- /dev/null
+++ b/net-analyzer/sbd/sbd-1.37-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Netcat-clone, designed to be portable and offer strong encryption"
+HOMEPAGE="http://tigerteam.se/dl/sbd/"
+SRC_URI="http://tigerteam.se/dl/sbd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~ppc x86"
+
+src_prepare() {
+	sed -i \
+		-e '/ -o /{ s| $(UNIX_LDFLAGS) $(LDFLAGS)||g;s|$(CFLAGS)|& $(LDFLAGS)|g }' \
+		Makefile || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		unix
+}
+
+src_install() {
+	dobin sbd
+	dodoc CHANGES README
+}
diff --git a/net-analyzer/scanlogd/Manifest b/net-analyzer/scanlogd/Manifest
new file mode 100644
index 000000000000..ea282a60bc43
--- /dev/null
+++ b/net-analyzer/scanlogd/Manifest
@@ -0,0 +1,7 @@
+AUX scanlogd-2.2.7-gentoo.patch 407 SHA256 2d70c2e93eb7ac86df7ced2c5db494c89161ecc36e15b9e6b244370ed155ccb9 SHA512 e395e5b7ad59b57959060a1a4abc4cd2f3245a127975d3e780f8af9849df109b4e34d68594dbe6d2978ca62d0676c06dc6fb185effa734b958fa5c8b96e332c5 WHIRLPOOL b9a53195e6e60b04ceb53160ad2452cda646fc5158f7f423784e606efe1060c709766ec35fc0aa331ae5106fb0d8318bf63b20b7514c7a1b5f58bb8fdc18ef15
+AUX scanlogd.rc 382 SHA256 815a2fde576a0344668f7e60d1f58452ac4bbea2626e50d58940d29faaa343b2 SHA512 d4f5a640fa9a6a44370fafb621ee8fd91357b0870d04d6852017ca4c108a50a1d76a6e1ac09dcf76f3238893c6084fb998e69b5f5f227b72b8307c8e1d6dc170 WHIRLPOOL 1ab8a0cbea0828c0469da5fcbd2f30416ab703ac4417e7d6e2ad711596d1360b7b29752cb5bf225899ea71c8f256a9870dac379a305b4f734eade223aee0db71
+DIST scanlogd-2.2.7.tar.gz 11352 SHA256 556a1c82b3561ea796d2ce8dfd20f578717903fd2c6557ebe27775d8ef8771da SHA512 56238cb91a33524a9512914568984ed0d066eb84bea1c08551fbc4e02c9643a3f9535d59b364db00d538e4d9bcd9650ac24f2042584d3a9c639f99eb77ba1a7b WHIRLPOOL a909801802f3caac1811e0432d83359bff39c05aee8e5fe802441eeeb85fb9b4f870e698ba501bbd2c335c4041b3182313247f7e1d699cd460745c5ef5a85de7
+EBUILD scanlogd-2.2.7.ebuild 941 SHA256 61435892c81f0d55834d19d90241521345a3e627098ec722fb23f54cfccddd2f SHA512 366fe30ef10f7e8af7e3598c452e8a7081351222e825d04f209edb8ee615dcb80f7f26cac74d553c651f9e91f5d158f6f206943dcdf26001320e299810e78c7d WHIRLPOOL dc9229a1a0bc76faf6c424a405c026ad0e561b812a17d76774ccb4069b4d61d6233d09cd4c0ec106371f3109c081ae5810c4e28462bcad05d61372256ea9cc01
+MISC ChangeLog 3013 SHA256 6ec55714d4d3fda68c1f94e8a000b6d19419f66e301dd4d2a4f49f640d9b5b83 SHA512 7085b0c45bcb1f98948d76460b0097401a19912b654721fc20adea922c91ad32ef9cd639cc6534e5e1b91c41e9787ce568235bb05928958619cf22ddae514de6 WHIRLPOOL ce292bc260c0ed395e65ca0c4a2c4f8beeefa4b2d26e45b70fcb27ee8ba5c3b18087cc3010dbd02e1337ca2f1f330f9f99ca2152a7f695f7e034a800e61a3380
+MISC ChangeLog-2015 4219 SHA256 4508788dc6de4908a3f9419f85f407285ac45e77cf181850514b317f049dffdc SHA512 8a33b4494931f57869d6f0142ed83fd71119e1403776751d73d8c360b9baaa403804872e8901e4815be90e08cae742d65890d48cb985744d11eb6c03572dc0a4 WHIRLPOOL fcf8b1a703495d0a53e81684edf27c7a5e1ea7bdf138fee1eefd263bc36ac4d477c8f0d69813a9a191f3fd6add88b2aa5635ee7a9873c5727cdf12d5b422fcc1
+MISC metadata.xml 443 SHA256 6e501445d671159ea9b0e67a759e26e1d474738732a8e691171f0d0cbba2de2c SHA512 85a26f92ab115fb66fe3d6658ec35891b7a2a45a27e44aa02bf0524e61ee3b517cc3cefa2ffb72c7c1ba8ca306e209e8c411da0e5071b3fc6781747e407f7526 WHIRLPOOL 44c3370ea993cf5b9920d3d891a07ad976ae0e15f0427dbb1abf35345499006560015b1eb864bdb017bda2bdb59ace95d7b017979e464dad1beaaab1389b06c8
diff --git a/net-analyzer/scanlogd/files/scanlogd-2.2.7-gentoo.patch b/net-analyzer/scanlogd/files/scanlogd-2.2.7-gentoo.patch
new file mode 100644
index 000000000000..4d1d2f01c643
--- /dev/null
+++ b/net-analyzer/scanlogd/files/scanlogd-2.2.7-gentoo.patch
@@ -0,0 +1,21 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,14 +1,11 @@
+-CC = gcc
+ LD = $(CC)
+ RM = rm -f
+-CFLAGS = -Wall -O2 -fomit-frame-pointer
+-LDFLAGS = -s
+ 
+-PCAP_H = -I/usr/include/pcap
+-PCAP_L = -lpcap
++PCAP_H = $(shell pcap-config --cflags)
++PCAP_L = $(shell pcap-config --libs)
+ 
+-NIDS_H = -I/usr/local/include
+-NIDS_L = -L/usr/local/lib -lnids -lnet -lpcap
++NIDS_H = -I/usr/include
++NIDS_L = -lnids
+ 
+ PROJ = scanlogd
+ 
diff --git a/net-analyzer/scanlogd/files/scanlogd.rc b/net-analyzer/scanlogd/files/scanlogd.rc
new file mode 100644
index 000000000000..ef600deb94f5
--- /dev/null
+++ b/net-analyzer/scanlogd/files/scanlogd.rc
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+	use logger
+}
+
+start() {
+	ebegin "Starting scanlogd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/scanlogd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping scanlogd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/scanlogd
+	eend $?
+}
diff --git a/net-analyzer/scanlogd/metadata.xml b/net-analyzer/scanlogd/metadata.xml
new file mode 100644
index 000000000000..23b1ab5a12ae
--- /dev/null
+++ b/net-analyzer/scanlogd/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<use>
+<flag name="nids">Use <pkg>net-libs/libnids</pkg> for packet capturing</flag>
+<flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for packet capturing</flag>
+</use>
+</pkgmetadata>
diff --git a/net-analyzer/scanlogd/scanlogd-2.2.7.ebuild b/net-analyzer/scanlogd/scanlogd-2.2.7.ebuild
new file mode 100644
index 000000000000..b7c18a9d4cd0
--- /dev/null
+++ b/net-analyzer/scanlogd/scanlogd-2.2.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils savedconfig toolchain-funcs user
+
+DESCRIPTION="a port scan detection tool"
+SRC_URI="http://www.openwall.com/scanlogd/${P}.tar.gz"
+HOMEPAGE="http://www.openwall.com/scanlogd/"
+
+LICENSE="scanlogd GPL-2" # GPL-2 for initscript
+SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE="+nids pcap"
+REQUIRED_USE="?? ( nids pcap )"
+
+DEPEND="
+	nids? ( net-libs/libnids )
+	pcap? ( net-libs/libpcap )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	restore_config params.h
+	tc-export CC
+}
+
+src_compile() {
+	local target=linux
+	use nids && target=libnids
+	use pcap && target=libpcap
+	emake ${target}
+}
+
+src_install() {
+	dosbin scanlogd
+	doman scanlogd.8
+	newinitd "${FILESDIR}"/scanlogd.rc scanlogd
+	save_config params.h
+}
+
+pkg_preinst() {
+	enewgroup scanlogd
+	enewuser scanlogd -1 -1 /dev/null scanlogd
+}
diff --git a/net-analyzer/scanssh/Manifest b/net-analyzer/scanssh/Manifest
new file mode 100644
index 000000000000..3627c6c7b8f6
--- /dev/null
+++ b/net-analyzer/scanssh/Manifest
@@ -0,0 +1,6 @@
+AUX scanssh-2.0-fix-warnings.diff 1071 SHA256 1e06a9fc99f548b99c519fdfba93f4b0ae3ee326c71fce0e1da2104b55be758d SHA512 b9080dbe7551e905db0744ca36b8690d05d784ad7c4c77f4fcbe64ff603353e998cc28ae45c26e230f594278cdb6f130029aa633166e6636933be44845c27b06 WHIRLPOOL e301d1c5ffff8b67bc897beb85a59b6ce808abbb8465864d9acae57a2ffcbe7449f635193e185dc8a1817fcfee5c99b39dfc99d17650e407732631c945c7a393
+DIST scanssh-2.1.tar.gz 111481 SHA256 057eec87edafbbe5bc22960cbac53e3ada0222400d649a5e2f22cc8981f5b035 SHA512 1ddff6f8e51735bab28032c8d7cbb641ff0cd19a404a27ab489589ef1e30e3721dd486854eb4fef15368cc53f10c9c2650ffaf7fa7f767dc2202fcc5540ae59c WHIRLPOOL 5b14b341d44a5f57e3263f35d063084f116feb315a4b1e92cf7a69d752266accab64c17cf713bf7bc5074e14f4a895f3b6bae0d30c6bc1e7d24436eebd8eeafa
+EBUILD scanssh-2.1.ebuild 639 SHA256 04034ac62701e9a74a945ef17a3b7abc4c1a4ae5579f1939f8019d7a0fa0c3b0 SHA512 d2e4f94dd8af668ce43308d8db5f11d4043110607815071fe0a563ede1231677d6fe340c6ad78a4e49bdb26e45ade7066d88b0621e86acf972a491f5175a3f2e WHIRLPOOL 8ae042fbc294519b00b0a2f93565c71875d86b56bfc55e069cd16ddc7474efd1ab43b8c51355d74ffe6c21a4688e27881ee324769108186e8c461fb0cccab6ad
+MISC ChangeLog 2465 SHA256 84a2c112091893af49923345733327bf43169f9a6d4ad65dc7b12608ae4722b3 SHA512 98334208fea00c112b835eab2b8ba37aeda0a499b0140fafb6fddce8512c9adb14450f20ac095053e88a60e492558a93af68d85c5feb14c780afaab30d25a303 WHIRLPOOL 6bd9244f63a6804509abe5978700b3303254e814e8c5c5d3fd8a19566e8a54d56e82e6fd52e28c7fed3e6501e69514ad32b96b2a74bbf4f4a8ac894941395bf6
+MISC ChangeLog-2015 2886 SHA256 a4e0df4a26a977ec9727e48f20cbf6eeba23ccd0380b8e1f6bca94e3ae25e884 SHA512 150be2a0bb21405188bb9fe1e05eccad68ecb6f450ff5b30207fd3501100651c232da04a380f27cffc96824a484bd6b92a8479e9bdf39f9b5b032273a22c6a49 WHIRLPOOL febcaf81c3400ae13dc07c6a30b99de23ad32479e6960c0b535c9d152808bf02fb43e5dd1b4568a91f096ca492da8f89f745d0a6cb8dd37cf70fe669abce8d25
+MISC metadata.xml 436 SHA256 389675b99830c1cf851f62d5e20922992ceb359aa3884c240373738d01a8a106 SHA512 98f0bb0894f2208336cb9e42bc4445a13c01a851d1a0f964519029c639ec37d7d476cc128e0e9acc0558ad23f2312c8189784f7e08a4cd0e80fb92823fce1da7 WHIRLPOOL 32546f446221e541ad60914a405bd4bfcc00e18d3111cfeddbb92a13b14d1b0c83bf96a936a9e041ac4d3ca669d7c5ffc45416d9bf84286d1c225995af197f68
diff --git a/net-analyzer/scanssh/files/scanssh-2.0-fix-warnings.diff b/net-analyzer/scanssh/files/scanssh-2.0-fix-warnings.diff
new file mode 100644
index 000000000000..0ced6821efa9
--- /dev/null
+++ b/net-analyzer/scanssh/files/scanssh-2.0-fix-warnings.diff
@@ -0,0 +1,61 @@
+--- a/arc4random.c
++++ b/arc4random.c
+@@ -1,5 +1,6 @@
+ #include <sys/types.h>
+ #include <stdlib.h>
++#include <time.h>
+ 
+ #include "config.h"
+ 
+--- a/interface.c
++++ b/interface.c
+@@ -56,6 +56,13 @@
+ 
+ #include "interface.h"
+ 
++#ifndef HAVE_STRLCPY
++    size_t strlcpy(char *, const char *, size_t);
++#endif
++#ifndef HAVE_STRLCAT
++    size_t strlcat(char *, const char *, size_t);
++#endif
++
+ /* Prototypes */
+ static int pcap_dloff(pcap_t *);
+ 
+--- a/md5.c
++++ b/md5.c
+@@ -23,6 +23,7 @@
+    copyright in any changes I have made; this code remains in the
+    public domain.  */
+ 
++#include <string.h>
+ #include <sys/types.h>
+ 
+ #ifdef HAVE_CONFIG_H
+--- a/scanssh.c
++++ b/scanssh.c
+@@ -78,6 +78,10 @@
+ #define DNFPRINTF(y, x)
+ #endif
+ 
++#ifndef HAVE_STRLCPY
++    size_t strlcpy(char *, const char *, size_t);
++#endif
++
+ struct address_node {
+ 	TAILQ_ENTRY (address_node) an_next;
+ 
+--- a/xmalloc.c
++++ b/xmalloc.c
+@@ -20,6 +20,10 @@
+ 
+ #include "config.h"
+ 
++#ifndef HAVE_STRLCPY
++    size_t strlcpy(char *, const char *, size_t);
++#endif
++
+ void *
+ xmalloc(size_t size)
+ {
diff --git a/net-analyzer/scanssh/metadata.xml b/net-analyzer/scanssh/metadata.xml
new file mode 100644
index 000000000000..afd56fd6df8d
--- /dev/null
+++ b/net-analyzer/scanssh/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<longdescription>Scanssh protocol scanner - scans a list of addresses an networks for running SSH protocol servers and their version numbers.</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/scanssh/scanssh-2.1.ebuild b/net-analyzer/scanssh/scanssh-2.1.ebuild
new file mode 100644
index 000000000000..880f43c66660
--- /dev/null
+++ b/net-analyzer/scanssh/scanssh-2.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="network scanner that gathers info on SSH protocols and versions"
+HOMEPAGE="http://monkey.org/~provos/scanssh/"
+SRC_URI="http://monkey.org/~provos/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc ~ppc64 sparc x86"
+
+DEPEND="
+	dev-libs/libdnet
+	dev-libs/libevent
+	net-libs/libpcap
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.0-fix-warnings.diff
+	touch configure
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin scanssh
+	doman scanssh.1
+}
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
new file mode 100644
index 000000000000..6ac971b170bc
--- /dev/null
+++ b/net-analyzer/scapy/Manifest
@@ -0,0 +1,8 @@
+DIST scapy-2.3.2.tar.gz 1166056 SHA256 1b8a86d687feb8ed01114c0c016b428674cbfec04e3eb6f5249a018c427c4f6a SHA512 6b15e102708d1bd0ca0c910e2d82416cd172634409f93c506542a7dc6b69ddc9c9afef6ec07929f70cc0f8f4c455cdc84d9b35bc2c5b72f79dd7e6785306dc7a WHIRLPOOL d97f6d91fe87f2e5c1dac8fc5a64d86c2076658e268e999004a95972cb03af38d75fdbe6e72003ba9abd92259e5744bcfe1963b59e6572fa2025396cdfde7a53
+DIST scapy-2.3.3.tar.gz 1459132 SHA256 67642cf7b806e02daeddd588577588caebddc3426db7904e7999a0b0334a63b5 SHA512 47ca2eceafe7b693c569a92c106782037d869c323aaaec41cace07dfdeb3c6a7e9f7bc8ca1150b3c0daea54e6665f93eb1dfc3c511419cfa28eb2e0753bf9ba4 WHIRLPOOL dae454a65a41126d69fd03bbcff9e35eda754b3415ff82e0ccbac7f4a3bbf19ad1038add58cc1ac49fce90afad956bcf508b684272112872055d382ab0e1921d
+EBUILD scapy-2.3.2-r1.ebuild 897 SHA256 eef0390424afcbb66a321cc1e9a7691a096fca7e4c15889fc63dff31be7746ec SHA512 c3dff0a0ce1e5929bde3cdecd85654f7f1e070bdff3735359714c3d5d427ca4ae9a339642573274dda1ba13ae041b483fcaf3c46b8ea70c4100685cfee7d89c8 WHIRLPOOL 953affbeb2ce967539b3d97fce042bab29f672c21fe22bd3e558d8a7a1a9594ba224597fa9b8de3a5d45c2e404797e5901014d0afd78d440ab19c3a10e169ac6
+EBUILD scapy-2.3.3.ebuild 899 SHA256 c8e0f3e633c19651a031f76412828732dc05a174dab2cca20409b1a242d551a8 SHA512 85cd0bb71df5e99fd737753d13f5e33a1811c8d23e38b6bcca2493b78d27e69deb393d0e363ce43d5de4fb0d8ef042768fae5a20b117d9d7befd2052de99825a WHIRLPOOL e4d8bc484fb41b13639b89164e421e7912138accccb3f69423b0317cb59eb562bbd65cec53d723c10ed7d26eab55a77d2b1c38e33820f8e433c3cc1e2677d868
+EBUILD scapy-9999.ebuild 798 SHA256 72e33587d36652c2819e34aac35f6a1736cafcb63a63f48df0e0740b0ea0f76c SHA512 a1697b2fe97f24fb201595461c81f3e0add75edd7f354a634c0fdde81a949f2bc8fb4b88fbc6a1ca1d09ac75fc01928fce6ee98b65a96f1f090066bb0a744ec2 WHIRLPOOL 669d9a4a55d4b71bb9c9f59a9834f3d974b7f226a5f0670a5eda0f00ec9fef438dfb9fe6f2690b9f5d1e22b44660561bfc0f4cd93677df82ebb6b43569a81f42
+MISC ChangeLog 4172 SHA256 bc4db3155052959ce75edb022fd765a18b7d3fcf848322f709904af90d1b7b69 SHA512 b0807af9665f57810129647d3365143f238110fc169a1a99efd0f95ca266cb8230262812fb12ca79c2e65c4791fe31c53170ba4b83b4e8e552c6588d2dfec795 WHIRLPOOL ea4d7167ee37cba9263bd28a29f2c8bac62fa46b4b861ae645f94e581d674581692cc8ad0e56da00741fae7e73eacf8ea1b9fc206447619498e0de36f3622973
+MISC ChangeLog-2015 6358 SHA256 28cd79b602b1f93c0f078c8eaf2845e0a0f2cd70d48b089b724b742713afba44 SHA512 0ad57a616ae896588553a49aa4f65897ef445155a314b80ee76e0feeebd78df7028eaf6feae59797107887cc18762bec6d9a01079a89a535b994c6a0d6b0140f WHIRLPOOL fd5acf24531b686553035d10d0f1f0f3b6cfa9acf58e3ebae705a7175f3f705ab6b98a7741f7994f0380e8ac9bd8d7a36d016312d7b05f46e65177240483be51
+MISC metadata.xml 761 SHA256 cc9e3baa0e48defa2c40037b8f2b6c84a0b1dd4ca2380910c50910d177eec5e1 SHA512 a5d6f2cb43d82333ec33bb655b9251ec9f04a1f4718f4a54306f1938b19e75027ca62c47945d76462c1ad7f9ce7710e5df206b60962c1f9928fd82fd0272402c WHIRLPOOL 18e212e4bfab7fd22ca881629119ef39efd7553653ee5589b8254d495d20b39399840e37c15b3cdbd1fdb0779e2807b747ca7ba8358387cafbf31db0240b67fa
diff --git a/net-analyzer/scapy/metadata.xml b/net-analyzer/scapy/metadata.xml
new file mode 100644
index 000000000000..78a202fbac8c
--- /dev/null
+++ b/net-analyzer/scapy/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ikelos@gentoo.org</email>
+		<name>Mike Auty</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<use>
+		<flag name="pyx">Enable <pkg>dev-python/pyx</pkg> support for psdump/pdfdump commands</flag>
+		<flag name="visual">Enable <pkg>dev-python/visual</pkg> support for 3d graphs</flag>
+		<flag name="tcpreplay">Enable <pkg>net-analyzer/tcpreplay</pkg> support for fast packet replay</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">secdev/scapy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/scapy/scapy-2.3.2-r1.ebuild b/net-analyzer/scapy/scapy-2.3.2-r1.ebuild
new file mode 100644
index 000000000000..a9f89fcaf6c9
--- /dev/null
+++ b/net-analyzer/scapy/scapy-2.3.2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
+HOMEPAGE="http://www.secdev.org/projects/scapy/"
+SRC_URI="https://github.com/secdev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="gnuplot pyx crypt graphviz imagemagick visual tcpreplay"
+
+RDEPEND="
+	net-analyzer/tcpdump
+	gnuplot? ( dev-python/gnuplot-py[${PYTHON_USEDEP}] )
+	pyx? ( dev-python/pyx[${PYTHON_USEDEP}] )
+	crypt? ( || ( dev-python/pycryptodome[${PYTHON_USEDEP}]
+	              dev-python/pycrypto[${PYTHON_USEDEP}] ) )
+	graphviz? ( media-gfx/graphviz )
+	imagemagick? ( virtual/imagemagick-tools )
+	visual? ( dev-python/visual )
+	tcpreplay? ( net-analyzer/tcpreplay )
+"
diff --git a/net-analyzer/scapy/scapy-2.3.3.ebuild b/net-analyzer/scapy/scapy-2.3.3.ebuild
new file mode 100644
index 000000000000..391396815ff9
--- /dev/null
+++ b/net-analyzer/scapy/scapy-2.3.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
+HOMEPAGE="http://www.secdev.org/projects/scapy/"
+SRC_URI="https://github.com/secdev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnuplot pyx crypt graphviz imagemagick visual tcpreplay"
+
+RDEPEND="
+	net-analyzer/tcpdump
+	gnuplot? ( dev-python/gnuplot-py[${PYTHON_USEDEP}] )
+	pyx? ( dev-python/pyx[${PYTHON_USEDEP}] )
+	crypt? ( || ( dev-python/pycryptodome[${PYTHON_USEDEP}]
+	              dev-python/pycrypto[${PYTHON_USEDEP}] ) )
+	graphviz? ( media-gfx/graphviz )
+	imagemagick? ( virtual/imagemagick-tools )
+	visual? ( dev-python/visual )
+	tcpreplay? ( net-analyzer/tcpreplay )
+"
diff --git a/net-analyzer/scapy/scapy-9999.ebuild b/net-analyzer/scapy/scapy-9999.ebuild
new file mode 100644
index 000000000000..7d971be6c7c6
--- /dev/null
+++ b/net-analyzer/scapy/scapy-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils distutils-r1 git-r3
+
+DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
+HOMEPAGE="http://www.secdev.org/projects/scapy/"
+EGIT_REPO_URI="https://github.com/secdev/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="gnuplot pyx crypt graphviz imagemagick visual tcpreplay"
+
+RDEPEND="
+	net-analyzer/tcpdump
+	gnuplot? ( dev-python/gnuplot-py[${PYTHON_USEDEP}] )
+	pyx? ( dev-python/pyx[${PYTHON_USEDEP}] )
+	crypt? ( dev-python/pycrypto[${PYTHON_USEDEP}] )
+	graphviz? ( media-gfx/graphviz )
+	imagemagick? ( virtual/imagemagick-tools )
+	visual? ( dev-python/visual )
+	tcpreplay? ( net-analyzer/tcpreplay )
+"
diff --git a/net-analyzer/scli/Manifest b/net-analyzer/scli/Manifest
new file mode 100644
index 000000000000..360d73df022a
--- /dev/null
+++ b/net-analyzer/scli/Manifest
@@ -0,0 +1,6 @@
+AUX scli-0.4.0-configure.patch 1545 SHA256 bb5a43df531806df91f136113b740251d2270fa2bb7a39f7a9785802916e99ed SHA512 423daf0251bc65f84c430638f235ff30cd75257c221394332f4fd51b8c5deabb02fc97751b77e4571305107fe2ac66062c27cdf74a2d3d46f2f278d7983cf622 WHIRLPOOL 550ac191199b0507a66f0491b76e071422704779c5f26e4cd37eb0d1897734b5e42e9ab4fed5799530e42af1687ba2e30d9e4792ad39b9bbb4a2f4512c898100
+DIST scli-0.4.0.tar.gz 953401 SHA256 308511589260d3da9bc5817ace363180070ac83ccba9231b7b9a01e1b0c29fe1 SHA512 ceb81e51049def64cb6f2428263709802380f7f712575e327a71d8cc120d284a7d9c57679d76e22cfcaf5b160d0d46af0cefa1133c56972b43002cb94f120dcc WHIRLPOOL 29f72af56e1a934a30b147858cd3e7e5acd638546b46b275693b0241bb0006edb1e66fa8af5a7074d23125c02780f129d1c7df6356da45fce3c083a390886aeb
+EBUILD scli-0.4.0-r1.ebuild 701 SHA256 627daaf9e1a8e59045af02ab581d5256557fea5d5b158cd678e853b750786d43 SHA512 c2b00fe9c8f15f3fdb0a2f0dc877937f16fbc8fe8b4c44e0dcee5f74b6412eaceb5f1ef18363565d9cf5c36fffac51c8b1c7a2842ed1f366892c46873eb005a1 WHIRLPOOL b5425d20a0f3637ef1dc2d095d78fb1d87a33100b586247464ae7d79c29656e6d1fdb072c2d922cf47179d63974199269d74e3d26fc6b49e07ca40e2cbccd18e
+MISC ChangeLog 2463 SHA256 5242dd770eaf2444707db7b9dc0bcea95ab5ae0a5cb36c10a405defbe92bdb66 SHA512 683500aa044b6f773e07de144f6d183714a14b64389cad37f1af3e8ec79165103488232b33b86b8b613ab8c47922245b94915bf58355232767513ac920bd2d76 WHIRLPOOL 36b65e547acfc88d789fa8a58eee6d8939953e07cc49d6db8fea4eb5d1aafd4490ccbc8f2e8884f93fd809f35175b712663d4fb3a8dbecfce03f532f59fae7f2
+MISC ChangeLog-2015 3355 SHA256 28e600a472cd1177f880479353838f7a214e1dfc51b2a2e6be9f57af07043d45 SHA512 8337fdec6eda0ba183284fc260867764a96c60f7cc2566f2c53d034dcc334d5c0ad9fc24610ea0b585f50fd25da966bf17fed55aa86840eb34b7eb2a7f4e1502 WHIRLPOOL bac11513147320cf8a3dbaeccba361464b1c71f4d7a3469f666aba8a4e39b2fe24c509507e6b3ecc4f777a008e98afc7a399a31d089fcac7d2047c1574a584ac
+MISC metadata.xml 280 SHA256 b04c5b9d91f6c4d6e36583488fd032751034d1e035085609c9bdf7677cf1e83f SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef WHIRLPOOL 6f3756b9ac748acccb6ac5a4de133cf93988e8c904f606376fecbb6a21ce038e86437fecca43b2521538da2570d33ff1a6a1e0cab290a3d71a9b4f2734f16328
diff --git a/net-analyzer/scli/files/scli-0.4.0-configure.patch b/net-analyzer/scli/files/scli-0.4.0-configure.patch
new file mode 100644
index 000000000000..d942da0adcc5
--- /dev/null
+++ b/net-analyzer/scli/files/scli-0.4.0-configure.patch
@@ -0,0 +1,44 @@
+--- a/configure.in
++++ b/configure.in
+@@ -20,6 +20,8 @@
+ AC_CHECK_PROG(SMIDUMP, smidump, smidump)
+ AC_SUBST(SMIDUMP)
+ 
++PKG_PROG_PKG_CONFIG
++
+ AC_DEFINE_UNQUOTED(SCLI_PLUGIN_PATH, "${pkglibdir}")
+ 
+ AC_MSG_CHECKING([whether to enable -Wall])
+@@ -33,19 +35,24 @@
+ 
+ dnl Checks for libraries.
+ 
+-AM_PATH_GLIB_2_0(2.0.0, [], AC_MSG_ERROR(scli needs GLIB), gmodule)
+-AM_PATH_GNET_2_0(2.0.0, [], AC_MSG_ERROR(scli needs GNET))
++PKG_CHECK_MODULES(GLIB, glib-2.0 gmodule-2.0 gthread-2.0,[
++	LIBS="$LIBS $GLIB_LIBS"
++	CPPFLAGS="$CPPFLAGS $GLIB_CFLAGS"
++	], AC_MSG_ERROR(scli needs GLIB))
++PKG_CHECK_MODULES(GNET, gnet-2.0 >= 2.0.0,[
++	LIBS="$LIBS $GNET_LIBS"
++	CPPFLAGS="$CPPFLAGS $GNET_CFLAGS"
++	], AC_MSG_ERROR(scli needs GNET))
+ dnl AM_PATH_GLIB(1.2.0, [], AC_MSG_ERROR(scli needs GLIB), gmodule)
+ dnl AM_PATH_GTK(1.2.0, [], AC_MSG_ERROR(scli needs GTK))
+-AM_PATH_XML2(2.0.0, [], AC_MSG_ERROR(scli needs libxml2))
++PKG_CHECK_MODULES(XML2, libxml-2.0 >= 2.0.0,[
++	LIBS="$LIBS $XML2_LIBS"
++	CPPFLAGS="$CPPFLAGS $XML2_CFLAGS"
++	], AC_MSG_ERROR(scli needs libxml2))
+ PKG_CHECK_MODULES(GSNMP, gsnmp, have_gsnmp=true, have_gsnmp=false)
+ AC_SUBST(GSNMP_CFLAGS)
+ AC_SUBST(GSNMP_LIBS)
+-AC_CHECK_LIB(ncurses, initscr, [],
+-  AC_CHECK_LIB(curses, initscr, [],
+-    AC_MSG_ERROR([scli requires curses functions; install curses first])
+-  )
+-)
++PKG_CHECK_MODULES(ncurses,ncurses,LIBS="$LIBS $ncurses_LIBS",AC_MSG_ERROR([ncurses is required]))
+ AC_CHECK_LIB(readline, readline, [],
+   AC_MSG_ERROR([scli requires readline functions; install libreadline first])
+ )
diff --git a/net-analyzer/scli/metadata.xml b/net-analyzer/scli/metadata.xml
new file mode 100644
index 000000000000..2c2a7923cfc8
--- /dev/null
+++ b/net-analyzer/scli/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/scli/scli-0.4.0-r1.ebuild b/net-analyzer/scli/scli-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..54aae413bbfe
--- /dev/null
+++ b/net-analyzer/scli/scli-0.4.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="SNMP Command Line Interface"
+HOMEPAGE="http://cnds.eecs.jacobs-university.de/users/schoenw/articles/software/index.html"
+SRC_URI="ftp://ftp.ibr.cs.tu-bs.de/pub/local/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libxml2
+	net-libs/gnet
+	net-libs/gsnmp
+	sys-libs/ncurses
+	sys-libs/readline
+	sys-libs/zlib
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog NEWS PORTING README TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-configure.patch
+
+	eautoreconf
+}
diff --git a/net-analyzer/sec/Manifest b/net-analyzer/sec/Manifest
new file mode 100644
index 000000000000..df3c77950fd5
--- /dev/null
+++ b/net-analyzer/sec/Manifest
@@ -0,0 +1,11 @@
+AUX sec.conf.d 352 SHA256 1135180060bfed5b2d3ddae38f72a3d4b16a230a5903ce36879019ed9be56e0a SHA512 204fb6f95a8f4d2a4680a1a2493e52d394dece4fe349ac6604d099db701c6aa2f9464109c1bae80f7edaebebd8bd8c2b3b7412c304d5d203fa62d73f231492b9 WHIRLPOOL 64042757f7bf1230cdbebe2744dfb20cc4de6a85be9074875952bf107e62a4e629147762982aaa610f1bd19d2a63f459704d271b29585a7a5da39d5794fdd60d
+AUX sec.init.d 693 SHA256 98712bd82e1b94aa41c811fd87e67a3d3968d3153c915f1e544f4b724edfe665 SHA512 9f079d629e21d20e16b4455d6b6b3279a56c0979abdcc90a8b488cae5225cdef4f7d95374b7e5b623196f06d91f2bd3c50691e787b40c90cbe34b478d8b37952 WHIRLPOOL cfda591da315d026779420f2bd759250d6020956ccc014faff49f733b463bf8571c17ec2c499dc214a335e33a2fa0c13a67c9e738d1ea9313eb0021856fd7441
+DIST sec-2.7.10.tar.gz 129875 SHA256 8c1441db830d3689aa201c1b0a5e46a97a22e8187d3e0d1c2dbd8abbd47c3d21 SHA512 232b7cdc0f3a879bdf5d82eea31bc60d58237b6a416c316e607cbad1eea3fb89f14be751f095a0773c3040b9612b7045c70781f810127ae1799ae89eae0c5de9 WHIRLPOOL 91ab5cdcf5f643b0fb973e5e7ba1e573b55ae5b316412efb99ed6283120a95c618a6b4311aea3b8b25c3f5cfa9c8847c6ebf55dc6eb26ae150257b854647794e
+DIST sec-2.7.11.tar.gz 134533 SHA256 59cd744c36be43c0cb69f1570d2aa6911ebb3492ff01fc292347ec8876dfe991 SHA512 2de3c131f85029a91e7db1405be236b8ef31454bdffa28d5a2f912af73a2d0b0fbfb37a2f1548f7899ae3c43248e9c20084b7cb55a6b309c00d103d8b8019e80 WHIRLPOOL 57e133ab5ca5414a302c0e488673d8ba3c390256a7b2cb166dd32e6786f9b66ac378ac61ffe76dbd7a5379eeaf8a93afd5478b5548b31fafd9de81a526a26aed
+DIST sec-2.7.6.tar.gz 121621 SHA256 3714ce9dc9c769cefc63811703905d62f45868618842d186ad6bdc522cd53ad3 SHA512 9c050b89970663784f5c149d46c6c6ab941590ef4300ca09ea35b347b2eaa3bad12083bd6e619f25d5024a35de69e020c354b507ac49e3faef1013336ea2d5f5 WHIRLPOOL 669519ee90eeefdcbf0052f83738db64c865e280d57ed4ce7a10c87ff79f71d0f2289b17ce3b014c2555937d701c893bd85e57a5450f67d43e1203c9e8220901
+EBUILD sec-2.7.10.ebuild 588 SHA256 a04616b1bd179e3da8255c92e56bf3af21e22d1a97052d40b9af4a8fe809661b SHA512 cbefe412142f9c60cdf209c81abf9f999e00ec219b3a0aef6e84d51dc2c4f7341416227842525be713305147ca7868e16db6a17284bd0f83c2bc519b29b3d695 WHIRLPOOL 8056c29079f18f4a0d152bd7c56fd02640e5fb37af809fc67a5afa0bb4f5a2f5aa5aefbf75e201e2980e06faf5c6c2fe7f80d29a336e3d0e0766a7c653dcf304
+EBUILD sec-2.7.11.ebuild 588 SHA256 744807a6cab7d6a8dc5c2326a87bd095941d0ddb4b3895728736d8968be4188f SHA512 6a81a8daa5835d4dc20151ec69bb97d2020b6b341ea9329ce41141e48b87cc5d85e932651dfdd8bfebacd4034ca32e891c60cb55999831fdf97f59b7ba530d99 WHIRLPOOL 7d8e0aa708abe46cb6555ad76cbc9c0230b73e50a9f0af5432b53c00bb4223b1059077070865840e6d090464134806f5b78c18716742fae6b397b015a37a082a
+EBUILD sec-2.7.6-r1.ebuild 586 SHA256 35443cf1018b1941920c7c1db5c759df00527bc0fdf6d5d865430cbb97729d7a SHA512 4034915b115742ecb4af7064d5201b307a130d9f5f0c81d4d4c4107b144bc46de592cc01c391412e6c1e42f457b51d44abda67753f47856cd2ae3ea065b78b6d WHIRLPOOL b76b3ff67fa4d3e5023c27b01c0953ff7386208e77bd6f951ad5ba3a747ae4ff6186ba2f7cb8a3338f11eebc54fab35389a0e1abd06af0a759067b843334a2a9
+MISC ChangeLog 3478 SHA256 6216c43847168a683f5257f8335cb70a3599b2189c52a89fb3411b2df18505e0 SHA512 a90cfb41db05c02a65d14b7996424ab2fdd42fc41341a26804b98b2395052359f654a950c65a39968208b7687ea630c1b56d9279ab81a12b0bcfbc2a14d3355d WHIRLPOOL 96245e835c33c1e8074937bb5d36db5fb0453c6a42521ffb7705c0df3240d5947dbf196c224e080547e1f4e3290281017937b5a152e1f753813ececc0eb37c55
+MISC ChangeLog-2015 3930 SHA256 9c733b95670bb30db7a517632521f72e9d2fe5ec2b424be1024fdfe4b76c50ed SHA512 bacd544e6d691403dc12662e0e42f328b8d70b2785887ef1f48b3459dce82ceb9af0102802ed8e8bee0744ba99228cdd035c876d3a867a908a16fffe28e0d10b WHIRLPOOL 476c6f28445a13b419f29e27e036db4cd4907d82c64a44833f72fcfe204bba485cce8636e96596e1e6d8818c54a5e997883239dda9c13bbc1f0878588405d65a
+MISC metadata.xml 420 SHA256 421eb10a874eb56ff10e2d053aac7e99e65ca32ee7b49368b3a823d28b2f9ec7 SHA512 328ae47d44a57623e92e4a03d1877898d18088aeca6998d4d5a827688e8f449337668e83ecb93ba4d74a011f5b19f8862e59ca657246a5e85a6749c19f0c7dab WHIRLPOOL dd5483728db28cc75ef5a5f44caca68ef452c4595004644e69a69761b21aeda57e7881536a1619f86a2ed4560736f1ff6e3f53df5a280b9f375ec8408b2b7f2d
diff --git a/net-analyzer/sec/files/sec.conf.d b/net-analyzer/sec/files/sec.conf.d
new file mode 100644
index 000000000000..a6d8b9c1fddc
--- /dev/null
+++ b/net-analyzer/sec/files/sec.conf.d
@@ -0,0 +1,12 @@
+# configuration file for /etc/init.d/sec
+
+# flags to pass to sec (see 'sec --help')
+SEC_FLAGS=""
+
+# Define a debug level (1..6)
+DEBUG_LEVEL="4"
+
+# define where sec reads messages from for translating them
+#INPUT_FILES="${INPUT_FILES} -input=/var/log/some.log"
+#INPUT_FILES="${INPUT_FILES} -input=/tmp/other.file"
+INPUT_FILES="-input=/var/log/messages"
diff --git a/net-analyzer/sec/files/sec.init.d b/net-analyzer/sec/files/sec.init.d
new file mode 100644
index 000000000000..252b23242648
--- /dev/null
+++ b/net-analyzer/sec/files/sec.init.d
@@ -0,0 +1,35 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use logger
+}
+
+checkconfig() {
+	if [ ! -e /etc/sec.conf ] ; then
+		eerror "You need an /etc/sec.conf config file to run sec"
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting sec"
+	start-stop-daemon --start --quiet --interpreted --exec /usr/bin/sec -- \
+		-pid=/run/sec.pid \
+		-detach -log=/var/log/sec.log \
+		-conf=/etc/sec.conf \
+		${INPUT_FILES} \
+		-debug=${DEBUG_LEVEL} \
+		${SEC_FLAGS} > /dev/null 2>&1
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping sec"
+	start-stop-daemon --stop --quiet --pidfile /run/sec.pid
+	eend $?
+}
+
diff --git a/net-analyzer/sec/metadata.xml b/net-analyzer/sec/metadata.xml
new file mode 100644
index 000000000000..2d02138ee2cb
--- /dev/null
+++ b/net-analyzer/sec/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">simple-evcorr</remote-id>
+		<remote-id type="github">simple-evcorr/sec</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/sec/sec-2.7.10.ebuild b/net-analyzer/sec/sec-2.7.10.ebuild
new file mode 100644
index 000000000000..9be8c728d056
--- /dev/null
+++ b/net-analyzer/sec/sec-2.7.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Simple Event Correlator"
+HOMEPAGE="https://github.com/simple-evcorr/sec"
+SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+
+RDEPEND=">=dev-lang/perl-5.8.0"
+
+src_install() {
+	dobin sec
+
+	dodoc ChangeLog README
+	docinto contrib
+	dodoc contrib/{itostream.c,convert.pl,swatch2sec.pl}
+
+	newman sec.man sec.1
+
+	newinitd "${FILESDIR}"/sec.init.d sec
+	newconfd "${FILESDIR}"/sec.conf.d sec
+}
diff --git a/net-analyzer/sec/sec-2.7.11.ebuild b/net-analyzer/sec/sec-2.7.11.ebuild
new file mode 100644
index 000000000000..e109badd5d25
--- /dev/null
+++ b/net-analyzer/sec/sec-2.7.11.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Simple Event Correlator"
+HOMEPAGE="https://github.com/simple-evcorr/sec"
+SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+
+RDEPEND=">=dev-lang/perl-5.8.0"
+
+src_install() {
+	dobin sec
+
+	dodoc ChangeLog README
+	docinto contrib
+	dodoc contrib/{itostream.c,convert.pl,swatch2sec.pl}
+
+	newman sec.man sec.1
+
+	newinitd "${FILESDIR}"/sec.init.d sec
+	newconfd "${FILESDIR}"/sec.conf.d sec
+}
diff --git a/net-analyzer/sec/sec-2.7.6-r1.ebuild b/net-analyzer/sec/sec-2.7.6-r1.ebuild
new file mode 100644
index 000000000000..9d01d54b1552
--- /dev/null
+++ b/net-analyzer/sec/sec-2.7.6-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Simple Event Correlator"
+HOMEPAGE="http://simple-evcorr.sourceforge.net/"
+SRC_URI="mirror://sourceforge/simple-evcorr/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux"
+
+RDEPEND=">=dev-lang/perl-5.8.0"
+
+src_install() {
+	dobin sec
+
+	dodoc ChangeLog README
+	docinto contrib
+	dodoc contrib/{itostream.c,convert.pl,swatch2sec.pl}
+
+	newman sec.man sec.1
+
+	newinitd "${FILESDIR}"/sec.init.d sec
+	newconfd "${FILESDIR}"/sec.conf.d sec
+}
diff --git a/net-analyzer/sflowtool/Manifest b/net-analyzer/sflowtool/Manifest
new file mode 100644
index 000000000000..1fab4f6ee1c5
--- /dev/null
+++ b/net-analyzer/sflowtool/Manifest
@@ -0,0 +1,9 @@
+DIST sflowtool-3.34.tar.gz 171613 SHA256 bd4c5ff3007c49d868df396ddc18c8ad5e1855bbdfdcb9d103df017f3853cd72 SHA512 4fd551fc1e03f68c886bf3effaab466c4470f1e3878ed5b94fd5152e81c076b56a6901df878edc95850522cf70458c6c9c4130c12ff071739b1da4725ae1e777 WHIRLPOOL e41b5d0f2120cbedde980307e6f4268890cf6db0c485e8345ec391045cf89d5fa8db4f00676b5e3cbe1ea69201be3193a12ae8a3a5de6b7db1a383bb1500e0c3
+DIST sflowtool-3.35.tar.gz 173675 SHA256 65ee9880bcc46014e5d8deb46dd52ef760e6ec4e2034796b9681b2da3d74393a SHA512 92a426607df7af7921021ede07011777d77ecf014e3bf02d5abcc6c811659b791340c9a81075bc6c508fc9096deb8dec0f2cbe7e123442540edb138756994fb0 WHIRLPOOL ad70c53b512ffbe12f1c6062022b44b42933869e68bbb838ac33dd6429c8c4c704b814631977ac5e6e96e618bcc47bc932b175f0213cbc747ae370164b255aea
+DIST sflowtool-3.41.tar.gz 187119 SHA256 0e807f182db5ca5b37d0fb55b77e970b1d51fee0cd8cb845646211befb35ca24 SHA512 8758bb7f2ad17db1c8d8c943093edde72efbd4411f8acbba2b97717e447df0b9e771a33307b9fa090da6ca12ba2dac69fd72787795aa878ad3c5d4148100c57d WHIRLPOOL 8a1db2e286c4edcdf7e7c072a48588d193cf1c263b10d7c3367ae7e406d3cce711f432c69c4bd69c938e8351c170ac0df5a02eaa7e0d4614ccf51a5a17ce29e6
+EBUILD sflowtool-3.34.ebuild 478 SHA256 6535d8c884e659dad5dd3448ef7dfa5dcabad92b617fde818966a2f713415ec5 SHA512 4089eb7326499d15d3bf2703f3764d35e1db32f5eda2a18b0455685f844f85a599f3ce9c5bc37bf61df08fdd1fb6aedce0e1f509142d870dca89cb1ac6c7ed3a WHIRLPOOL 9249aeabcc5dfed1b8ddd8d693826de92855087492ccbeeed348b323d804cf315ee776e4bb86c9b35165d098bbe74bc97de75818035f1e0985bc36cd86e1a1d0
+EBUILD sflowtool-3.35.ebuild 481 SHA256 646d616d7fb165437df8125a7bce33cbd3fd611a7ff261fdef9f869e041e131b SHA512 583c455e3ee6a9bc110d7a2a89a83f765e9543c4bd0bdce21f202490686b22028002b1475d74d67bea15901329e09a3496e80349e2ef9fab2ded8485319e38d8 WHIRLPOOL faf7a8ab900ca81ff3231b9d942a6a4643ec4a638eee7ad4bce24f70bdf43f7043cc60e2484869123dcdf44ef2ce916813f0586473412fbf5c5802ababa996c2
+EBUILD sflowtool-3.41.ebuild 562 SHA256 c655b772283141e02dd783529a1a64213cc9f8e4196b46b41799ecabf06ffabf SHA512 93c748e0bc9a40de73df9b4eea7e2bced91f06aa17fadda708e6cb8c8860e65ab54e5b0a22c10e402911e01b5b18ddefc646decbdfd06826786ddd55662cb47e WHIRLPOOL eb578873d4901d071970558b389ff8b1c8071d6a68e3cff32d2f4f7849d26894844f601a1e8c9503c751658909e5a76eec5df4863a4be439937e705deacf01e7
+MISC ChangeLog 2599 SHA256 e621726dacdc0815ec49b9af7e4bb5ae98d109db45bd8213aa5e9d14d3c8fc87 SHA512 e93b9d588946c09cf31e15cac426279aeee72abb08ae520930a37ac3b00df8ac80fff23f8eb8e58fdd94b8462974af66bd68729a333448cbbfd3cfa9272724e9 WHIRLPOOL cb59704f12c9a1cc55421a009733389ce779a5e1573fee99387fd451d00e112ae0520a47d0ae0882945e48c09fa1b1a956ccd4990ea2d3c2b42013399c4fb553
+MISC ChangeLog-2015 6634 SHA256 5c88f8c9cdbf25cce9e197002849aafce2dd9688732453ed477cc2c2a2ba6078 SHA512 e17b5e8e459bb0612c5f6e69673501c4661d3c94338d63011df0be9b51022d8e7f5799c8fae4380718bf9d19f35f07aaa79c6f6f25603e612b598675057a5468 WHIRLPOOL a935b8ec8cae7e7003d810094b13b23a48d87859200e54dcb5660be1271df410ce029447539a255ba2118ea1de28ccdf3f157bdabf559717dcadb25511ebff10
+MISC metadata.xml 370 SHA256 e2d9544a1f84cd578da89d255cf66b16867927c7ec45a04f5178d9374ec1953f SHA512 7e6c6628a82ae6cb1cc52c362df66bda90edcfeff7af2a52b2aeb6eaf7703aa092ddb1a9b9ecbca5aa34ba9b07ff27ca69dd47832b67e90505c932bdc27c811d WHIRLPOOL 17510b5ea65c776844076e0c9b72b85b18e9aae88ebaf6ad88314025526d3ec0cf437a27f83c8f902971884c0c00fb87fed94adbdfffc8c4a60620c35f8a706b
diff --git a/net-analyzer/sflowtool/metadata.xml b/net-analyzer/sflowtool/metadata.xml
new file mode 100644
index 000000000000..66b83a2d79ef
--- /dev/null
+++ b/net-analyzer/sflowtool/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">sflow/sflowtool</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/sflowtool/sflowtool-3.34.ebuild b/net-analyzer/sflowtool/sflowtool-3.34.ebuild
new file mode 100644
index 000000000000..96c9498e8607
--- /dev/null
+++ b/net-analyzer/sflowtool/sflowtool-3.34.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit flag-o-matic
+
+DESCRIPTION="sflowtool is a utility for collecting and processing sFlow data"
+HOMEPAGE="http://www.inmon.com/technology/sflowTools.php"
+SRC_URI="http://www.inmon.com/bin/${P}.tar.gz"
+
+LICENSE="inmon-sflow"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="debug"
+
+src_prepare() {
+	append-cppflags -DSPOOFSOURCE
+	use debug && append-cppflags -DDEBUG
+}
diff --git a/net-analyzer/sflowtool/sflowtool-3.35.ebuild b/net-analyzer/sflowtool/sflowtool-3.35.ebuild
new file mode 100644
index 000000000000..d2746ffb0b83
--- /dev/null
+++ b/net-analyzer/sflowtool/sflowtool-3.35.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit flag-o-matic
+
+DESCRIPTION="sflowtool is a utility for collecting and processing sFlow data"
+HOMEPAGE="http://www.inmon.com/technology/sflowTools.php"
+SRC_URI="http://www.inmon.com/bin/${P}.tar.gz"
+
+LICENSE="inmon-sflow"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug"
+
+src_prepare() {
+	append-cppflags -DSPOOFSOURCE
+	use debug && append-cppflags -DDEBUG
+}
diff --git a/net-analyzer/sflowtool/sflowtool-3.41.ebuild b/net-analyzer/sflowtool/sflowtool-3.41.ebuild
new file mode 100644
index 000000000000..91200811c1aa
--- /dev/null
+++ b/net-analyzer/sflowtool/sflowtool-3.41.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic
+
+DESCRIPTION="sflowtool is a utility for collecting and processing sFlow data"
+HOMEPAGE="
+	http://www.inmon.com/technology/sflowTools.php
+	https://github.com/sflow/sflowtool
+"
+SRC_URI="https://github.com/sflow/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="inmon-sflow"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug"
+
+src_prepare() {
+	default
+
+	append-cppflags -DSPOOFSOURCE
+
+	use debug && append-cppflags -DDEBUG
+}
diff --git a/net-analyzer/sguil-client/Manifest b/net-analyzer/sguil-client/Manifest
new file mode 100644
index 000000000000..0816167837e0
--- /dev/null
+++ b/net-analyzer/sguil-client/Manifest
@@ -0,0 +1,7 @@
+DIST sguil-0.9.0.tar.gz 464204 SHA256 412be894d67a6487312dd16a98a580dda8c38cff2e24f7a6c25405857769782b SHA512 3f300901d0f0260fbc950b4c7604e3dc3eeb2d088ff45171db84e2d58e281242bf3582eac51162968f1f3766961aec4d0a7af54e85773102ee643a52e879cfa6 WHIRLPOOL eaaef918819ed781505abc727c65e08a9e6d6d0e53f842b5aa6ec4cd1278dc902375a45794b3989488c3507bc34e288593cd892c8a94293d8a7723bbdb6cef4e
+DIST sguil-client-0.8.0.tar.gz 216433 SHA256 bbce49630fd6264591a1e890cba3bad11cf18e9327c9f9cc02cb6dc8a19746bd SHA512 44e14273cb7506b89d3138a1c50160de99576e77d6d18e3cdab9f257a1d00d5a100c8d9790f6e93aea8312fab51d52260aedfaa00facf54107249686d93e09b3 WHIRLPOOL c7213ebcebd8eaf6418f9a0a9c6e7b5df4d507d434c0b10bc2f9a1d6bf0337d590b600af0335792b92d735fa5e71cd5547528f17d750064f98267cb331efccb4
+EBUILD sguil-client-0.8.0.ebuild 1146 SHA256 af695f47d9832278488cda84f698eb21219ed46bf2acfbeb406f8287376584bb SHA512 128c4a4f45e7359e0275e8fc33a3984ef1aeab5171015526dcfd34d48d79a8aeb7c0a0e277c032f3a6fea9fec26b54fd9dff08bf539cce9d536bafab78073ba0 WHIRLPOOL 36befff310ec720c934f11db26a5851f24465577e4633bba352421021159c869e8e6214b47a095724f0da4e481cff034d9c66ec674fb27a8bda647e69f05e7de
+EBUILD sguil-client-0.9.0.ebuild 1102 SHA256 244a276c4d96bcdc46f66979a835c03cb386a064abd6c85be4aaf2f60d629dd2 SHA512 0a287f755f98e56312696acfa83e69bf274d2719f539ed36e10d6c4c50a75fff3d7dd610e03ee984bef19a7420d9f02ab0a2671a13d4bc5cfa8bae41bbdd0932 WHIRLPOOL 211ff8e29c127f9da85abe2828477c1e73236fc0c6e4b09dfa0cec69ef21c5c4e15c904e27243546dbcf4c2acefa5f5398edca8ae410470b79e731bb15249908
+MISC ChangeLog 3054 SHA256 d6d54de8ba7597a50c90a9860499060abdceffe88efebd14ab15fdc7886875a7 SHA512 03efd90389aef57fe9d2293a9902d52f3b4d330a186ceea4ef4ea2acc3ed7fdf4d81ced5bb090ab40a6a191a9973cb2a499931c083859f02a94ae4ceed567589 WHIRLPOOL 8750b1ad61e65a3ee28c561ac91f34502552a09aa2cf569ba3036a0c40e0cf52544547b774e3b7dd5497bfbf0cc25e0848562b696c023bdb06e2f321adc9361a
+MISC ChangeLog-2015 2128 SHA256 c9ea7d04f910e7716e012d6d29db0b05762592e9344c9a4bb9052c46a3d85a22 SHA512 206b76c2e827f6eaeb79a4db3f19c1f0b87fba9145dbe4b4e200e16b4b32a3093d72f5939c72ac81cd1247d6b002308aac3a4f03ead56376f09fe5ca0b54153c WHIRLPOOL 95689cf197b2d5364b819dbfc267a0e86165fcf1e24c225c2771af32d154c58ca77aabbfa320eb91cdb50a05994b16fec3763a6ce93afa3f3398bf0507e30f88
+MISC metadata.xml 418 SHA256 0be32877ea9dae6f000b93301bf6ba94b139f53032a34e758ab806e688722bb6 SHA512 bbe71ed5ce17f337808f82d4fe54ef68b94723a808c597a52d049b88b7334be9abb066911accf9175886405f3f02d37d838422a933afe8e00eeeac2c74ba5ed3 WHIRLPOOL 96fbf0ca145124d0c2e5419589dd84d6e292d4859b0145a4344090522edbe2026f500bdbbc7bb8f3d37122f54acf1339dd57ced7b5e86be7a289ca9ff2786b4e
diff --git a/net-analyzer/sguil-client/metadata.xml b/net-analyzer/sguil-client/metadata.xml
new file mode 100644
index 000000000000..ca324d618d91
--- /dev/null
+++ b/net-analyzer/sguil-client/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">bammv/sguil</remote-id>
+    <remote-id type="sourceforge">sguil</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/sguil-client/sguil-client-0.8.0.ebuild b/net-analyzer/sguil-client/sguil-client-0.8.0.ebuild
new file mode 100644
index 000000000000..486064c7fd78
--- /dev/null
+++ b/net-analyzer/sguil-client/sguil-client-0.8.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib
+
+MY_PV="${PV/_p/p}"
+DESCRIPTION="GUI Console for sguil Network Security Monitoring"
+HOMEPAGE="http://sguil.sf.net"
+SRC_URI="mirror://sourceforge/sguil/sguil-client-${MY_PV}.tar.gz"
+
+LICENSE="QPL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+RDEPEND="
+	>=dev-lang/tcl-8.3:0=[-threads]
+	>=dev-lang/tk-8.3:0=
+	>=dev-tcltk/itcl-3.2
+	>=dev-tcltk/tclx-8.3
+	dev-tcltk/itk
+	dev-tcltk/iwidgets
+	dev-tcltk/tcllib
+	net-analyzer/wireshark
+	ssl? ( >=dev-tcltk/tls-1.4.1 )
+"
+
+S=${WORKDIR}/sguil-${MY_PV}
+
+src_prepare() {
+	sed -i \
+		-e "/^set SGUILLIB /s:./lib:/usr/$(get_libdir)/sguil:" \
+		-e '/^set ETHEREAL_PATH /s:/usr/sbin/ethereal:/usr/bin/wireshark:' \
+		-e '/^set SERVERHOST /s:demo.sguil.net:localhost:' \
+		-e '/^set MAILSERVER /s:mail.example.com:localhost:' \
+		-e '/^set GPG_PATH /s:/usr/local/bin/gpg:/usr/bin/gpg:' \
+		client/sguil.conf || die
+}
+
+src_install() {
+	dobin client/sguil.tk
+	insinto /etc/sguil
+	doins client/sguil.conf
+	insinto "/usr/$(get_libdir)/sguil"
+	doins -r "${S}"/client/lib/*
+	dodoc doc/*
+}
diff --git a/net-analyzer/sguil-client/sguil-client-0.9.0.ebuild b/net-analyzer/sguil-client/sguil-client-0.9.0.ebuild
new file mode 100644
index 000000000000..0eff0c582b96
--- /dev/null
+++ b/net-analyzer/sguil-client/sguil-client-0.9.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit multilib
+
+MY_PV="${PV/_p/p}"
+DESCRIPTION="GUI Console for sguil Network Security Monitoring"
+HOMEPAGE="http://sguil.sf.net"
+SRC_URI="https://github.com/bammv/${PN/-client}/archive/v${PV}.tar.gz -> ${P/-client}.tar.gz"
+
+LICENSE="QPL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+RDEPEND="
+	>=dev-lang/tcl-8.3:0=[-threads]
+	>=dev-lang/tk-8.3:0=
+	>=dev-tcltk/itcl-3.2
+	>=dev-tcltk/tclx-8.3
+	dev-tcltk/itk
+	dev-tcltk/iwidgets
+	dev-tcltk/tcllib
+	net-analyzer/wireshark
+	ssl? ( >=dev-tcltk/tls-1.4.1 )
+"
+
+S=${WORKDIR}/sguil-${MY_PV}
+
+src_prepare() {
+	sed -i \
+		-e "/^set SGUILLIB /s:./lib:/usr/$(get_libdir)/sguil:" \
+		-e '/^set SERVERHOST /s:demo.sguil.net:localhost:' \
+		-e '/^set MAILSERVER /s:mail.example.com:localhost:' \
+		-e '/^set GPG_PATH /s:/usr/local/bin/gpg:/usr/bin/gpg:' \
+		client/sguil.conf || die
+}
+
+src_install() {
+	dobin client/sguil.tk
+	insinto /etc/sguil
+	doins client/sguil.conf
+	insinto "/usr/$(get_libdir)/sguil"
+	doins -r "${S}"/client/lib/*
+	dodoc doc/*
+}
diff --git a/net-analyzer/sguil-sensor/Manifest b/net-analyzer/sguil-sensor/Manifest
new file mode 100644
index 000000000000..f7842bdb2656
--- /dev/null
+++ b/net-analyzer/sguil-sensor/Manifest
@@ -0,0 +1,10 @@
+AUX log_packets.confd 527 SHA256 e0ce40a3d98eea3e95813dcf0980dd6ae078838f93cce8e0cd1070fa7de879dc SHA512 a4f9ed9abb050184773c59271d7e13f6bcbf853341dd31c72909ee6d31bb92990d84f31bf3111d8950fb4311747694c714498552eb26ca8a82ed3cb645847e82 WHIRLPOOL bc6bc9f7c0b453feac78adf0a585c36bf844213697e2476a1cc6a38b3beebfbb0a82eef1391e6849b9e198db3a463cce402daf5186c4a270bf476aeb7d9bdb5d
+AUX log_packets.initd 2093 SHA256 ae7536d81faa08eaf1f1130c913ea36cff6bd179de4546bee44446a33ec9b2f5 SHA512 43bc027f4769e986641a9820a1dfcb8a794ae417cb49efe333fd6a960953e1f9854c660e95ae9c0e14f4c1ec59da9e3096ae7352bbbb77805dc71729ed76514d WHIRLPOOL c89b429c33ae0005109d8b0f934861f18fd5f244ebddf200b7565a3d72cf81859b1fc98e93e0e23caa53ebc0fc1f50abce83319dc8f4e94d380acafd275c37aa
+AUX sensor_agent.initd 742 SHA256 b8994ad76a4cdf48de3c8a518226e78b44e90586fe4b0399bad5bbd022d87dad SHA512 3a025479579ee9eec6a26d2a2c70efc362d37b7821dfa211236d8fe9dc2ea7b7b0694dccfd9b208655702401c1b0e3ecb08bac9e3b177ee77f161e5c774c1611 WHIRLPOOL d91475b75556bacf6dd77a986b74ceb68b405b4195d78414b1fc4972842f924f7e2563cef7baeca3e88d7b146046272a4e79136baa0d39711976400961b50f4c
+DIST sguil-0.9.0.tar.gz 464204 SHA256 412be894d67a6487312dd16a98a580dda8c38cff2e24f7a6c25405857769782b SHA512 3f300901d0f0260fbc950b4c7604e3dc3eeb2d088ff45171db84e2d58e281242bf3582eac51162968f1f3766961aec4d0a7af54e85773102ee643a52e879cfa6 WHIRLPOOL eaaef918819ed781505abc727c65e08a9e6d6d0e53f842b5aa6ec4cd1278dc902375a45794b3989488c3507bc34e288593cd892c8a94293d8a7723bbdb6cef4e
+DIST sguil-sensor-0.8.0.tar.gz 142829 SHA256 aa4617c4f9cf1d598c6d728afed50cd6f90dc5d1516a6eda8126401b7bba4be5 SHA512 9b90598f2a3fdcf8652ccb92123944ffbda61c00f131bc951b12a95002f84f555f8c63cc1235fd7bb90875d00edbecbda02750bcca3bba7d16e1b1a150eb74ae WHIRLPOOL aa7108158053e84b3229b4daf4a2108fe1b2ef0290fd82267c5ea82067faff8e82372e50af0f4d9057f611b6584b526d70c67ced2b93eb5e82927065b58c2eb4
+EBUILD sguil-sensor-0.8.0.ebuild 2129 SHA256 bad359be24fcb2f5fa476d44fddddc89233e4cc52c72e5f712f5f3c856892bd0 SHA512 5f8b73a592c21266b4cab281861f5c4173443a0bb05a91498394f5dc2561776e30152d790710448583555f0ebb91575335811d7a644cbed4c4c59e3e4491a9c9 WHIRLPOOL 45af50bef9c1f2dae218bcb512a3a6b15d7cab0dd8769cdc95b9cc1afa19c8aa0d4e3a360874bf065f775fadbed73b84dc9a6ae8c2abd4eb4644ea6af20abf02
+EBUILD sguil-sensor-0.9.0.ebuild 2161 SHA256 edbb264c8375e73f215a484e02959bd460599b891b6dc31242dc07b258446b8c SHA512 8f9934b42fa92264c4eef6c6436b10b4686de6d612e26ee458cf4cba170ce172f66e40dbda3730f74410341a8d95101f6ca396e931bc03fc9abf6fee8c4abccb WHIRLPOOL f4facd223ed66a6a21ece1c6fb91352144b5190875ca7cb5549bab03a470674f7da74542541524bae9417922aef8f45ba3faec4253413393cfd799fad60ab72f
+MISC ChangeLog 3297 SHA256 24e9c97fdd9e089361104c83b23d97dccf678ead9cddd19afd3f0d8bda9d45bd SHA512 1f74aee2efd7d186cc1275816e378803bc55c7c71785c5610cca9b385f8ecba3408d70eaaf775b0a1fa68ff9a82f6f7744dac5b9f18c5cc80afb60a2a2891073 WHIRLPOOL e738b7a4be4063197551942b91112ba995360d516873d5f1f9c4306163f389e3deff73e2b55bf5b78dc4fc70dc6bd0ae932658e398b214e39609502062f62e45
+MISC ChangeLog-2015 3157 SHA256 199e9f67722c7842f6e5c8d862b6bd628a149e69d76e4efcbad61c77a4edfa3b SHA512 a99c724452e1ce8d4d39da2392320aa993f11f28d92b00b2c328c74da15332abb568304cb280d4ab673ce0ba333f5ae5923ea819a8a12d9563a3217fc539a42e WHIRLPOOL 8c73ac3510d2f82835dbc1839a69d58af6c5d800ca4a2b567f963274fe6f2961e10118bbd603a75881e309f1d7557a9a374691488115e5b73d8e65425a431216
+MISC metadata.xml 418 SHA256 0be32877ea9dae6f000b93301bf6ba94b139f53032a34e758ab806e688722bb6 SHA512 bbe71ed5ce17f337808f82d4fe54ef68b94723a808c597a52d049b88b7334be9abb066911accf9175886405f3f02d37d838422a933afe8e00eeeac2c74ba5ed3 WHIRLPOOL 96fbf0ca145124d0c2e5419589dd84d6e292d4859b0145a4344090522edbe2026f500bdbbc7bb8f3d37122f54acf1339dd57ced7b5e86be7a289ca9ff2786b4e
diff --git a/net-analyzer/sguil-sensor/files/log_packets.confd b/net-analyzer/sguil-sensor/files/log_packets.confd
new file mode 100644
index 000000000000..93bdc772bff7
--- /dev/null
+++ b/net-analyzer/sguil-sensor/files/log_packets.confd
@@ -0,0 +1,18 @@
+# Config file for /etc/init.d/log_packets
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# This tell snort which interface to listen on (any for every interface)
+IFACE=eth1
+
+# Make sure this matches your IFACE
+PIDFILE=/run/sguil-log_packets_$IFACE.pid
+
+# You probably don't want to change this, but in case you do
+LOGDIR="/var/lib/sguil"
+
+# Percentage of disk to try and maintain
+MAX_DISK_USE=95
+
+# This pulls in the options above
+OPTIONS="-m 122 -u sguil -g sguil"
diff --git a/net-analyzer/sguil-sensor/files/log_packets.initd b/net-analyzer/sguil-sensor/files/log_packets.initd
new file mode 100644
index 000000000000..f372c82c905b
--- /dev/null
+++ b/net-analyzer/sguil-sensor/files/log_packets.initd
@@ -0,0 +1,91 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="cleandisk"
+
+LOG_DIR="${LOGDIR}/${HOSTNAME}/dailylogs"
+
+start() {
+	ebegin "Starting Log_packest"
+	if [ ! -x /usr/bin/snort ]
+	then
+		eerror "No snort - cannot start"
+		eend 1
+		return 1
+	fi
+
+	if [ ! -d ${LOG_DIR} ]
+	then
+		mkdir -p ${LOG_DIR}
+		chmod 770 ${LOG_DIR}
+	fi
+
+	today=$(date '+%Y-%m-%d')
+
+	if [ ! -d "${LOG_DIR}/${today}" ]
+	then
+		mkdir "${LOG_DIR}/${today}"
+		chmod 770 "${LOG_DIR}/${today}"
+		chown root:sguil "${LOG_DIR}/${today}"
+	fi
+	start-stop-daemon --start --quiet -b -m --pidfile "${PIDFILE}" \
+		--exec /usr/bin/snort \
+		-- ${OPTIONS} -l "${LOG_DIR}/${today}" -b -i "${IFACE}" "${FILTER}"
+	real_cleandisk
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Sensor Agent"
+	start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
+	eend $?
+}
+
+cleandisk() {
+	ebegin "Cleaning Disk"
+	real_cleandisk
+	eend $?
+}
+
+# This func checks the current space being used by LOG_DIR
+# and rm's data as necessary.
+real_cleandisk() {
+	einfo "Checking disk space (limited to ${MAX_DISK_USE}%)..."
+	# grep, awk, tr...woohoo!
+	CUR_USE=$(df -P ${LOG_DIR} | grep -v -i filesystem | awk '{print $5}' | tr -d %)
+	einfo "  Current Disk Use: ${CUR_USE}%"
+	
+	if [ ${CUR_USE} -gt ${MAX_DISK_USE} ]
+	then
+		# If we are here then we passed our disk limit
+		# First find the oldest DIR
+		cd "${LOG_DIR}"
+		# Can't use -t on the ls since the mod time changes each time we
+		# delete a file. Good thing we use YYYY-MM-DD so we can sort.
+		OLDEST_DIR=$(ls | sort | head -n 1)
+		cd "${OLDEST_DIR}"
+
+		OLDEST_FILE=$(ls -t | tail -n 1)
+
+		if [ -f "${OLDEST_FILE}" ]
+		then
+			einfo "  Removing file: ${OLDEST_DIR}/${OLDEST_FILE}"
+			rm -f "${OLDEST_FILE}"
+		else
+			einfo "  Removing empty dir: ${OLDEST_DIR}"
+			cd ..
+			rm -rf "${OLDEST_DIR}"
+		fi
+		
+		# Run cleandisk again as rm'ing one file might been enough
+		# but we wait 5 secs in hopes any open writes are done.
+		sync
+		einfo "  Waiting 5 secs for disk to sync..."
+		sleep 5
+		real_cleandisk
+	else
+		einfo "Done."
+	fi
+}
+
diff --git a/net-analyzer/sguil-sensor/files/sensor_agent.initd b/net-analyzer/sguil-sensor/files/sensor_agent.initd
new file mode 100644
index 000000000000..08b45e511f8c
--- /dev/null
+++ b/net-analyzer/sguil-sensor/files/sensor_agent.initd
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+        need net
+}
+
+checkconfig() {
+        if [ ! -e /etc/sguil/sensor_agent.conf ] ; then
+                eerror "You need an /etc/snort/sensor_agent.conf to run the Sensor Agent"
+                return 1
+        fi
+}
+
+start() {
+        checkconfig || return 1
+        ebegin "Starting Sensor Agent"
+        start-stop-daemon --start -c sguil --quiet --exec /usr/bin/sensor_agent.tcl \
+		-- -D -c "/etc/sguil/sensor_agent.conf">/dev/null 2>&1
+        eend $?
+}
+
+stop() {
+        ebegin "Stopping Sensor Agent"
+        start-stop-daemon --stop --quiet --pidfile /run/sguil-sensor.pid
+        eend $?
+}
+
diff --git a/net-analyzer/sguil-sensor/metadata.xml b/net-analyzer/sguil-sensor/metadata.xml
new file mode 100644
index 000000000000..ca324d618d91
--- /dev/null
+++ b/net-analyzer/sguil-sensor/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">bammv/sguil</remote-id>
+    <remote-id type="sourceforge">sguil</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/sguil-sensor/sguil-sensor-0.8.0.ebuild b/net-analyzer/sguil-sensor/sguil-sensor-0.8.0.ebuild
new file mode 100644
index 000000000000..2589f9861647
--- /dev/null
+++ b/net-analyzer/sguil-sensor/sguil-sensor-0.8.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit user
+
+MY_PV="${PV/_p/p}"
+DESCRIPTION="Sensor part of sguil Network Security Monitoring"
+HOMEPAGE="http://sguil.sourceforge.net"
+SRC_URI="mirror://sourceforge/sguil/sguil-sensor-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2 QPL"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-lang/tcl-8.3:0=[-threads]
+	>=dev-tcltk/tclx-8.3
+	>=net-analyzer/barnyard-0.2.0-r1
+	>=net-analyzer/snort-2.4.1-r1
+	dev-ml/pcre-ocaml
+	net-analyzer/sancp
+"
+
+S="${WORKDIR}/sguil-${MY_PV}"
+
+pkg_setup() {
+	enewgroup sguil
+	enewuser sguil -1 -1 /var/lib/sguil sguil
+}
+
+src_prepare() {
+	sed -i \
+		-e "s:gateway:${HOSTNAME}:" \
+		-e 's:/snort_data:/var/lib/sguil:' \
+		-e 's:DAEMON 0:DAEMON 1:' \
+		-e 's:DEBUG 1:DEBUG 0:g' \
+		sensor/sensor_agent.conf || die
+	sed -i \
+		-e 's:/run/sensor_agent.pid:/run/sguil-sensor.pid:' \
+		sensor/sensor_agent.tcl || die
+}
+
+src_install() {
+	dodoc doc/*
+
+	dobin sensor/sensor_agent.tcl
+
+	newinitd "${FILESDIR}/log_packets.initd" log_packets
+	newinitd "${FILESDIR}/sensor_agent.initd" sensor_agent
+	newconfd "${FILESDIR}/log_packets.confd" log_packets
+	insinto /etc/sguil
+	doins sensor/sensor_agent.conf
+
+	# Create the directory structure
+	diropts -g sguil -o sguil
+	keepdir /var/lib/sguil /var/lib/sguil/archive \
+		"/var/lib/sguil/${HOSTNAME}" \
+		"/var/lib/sguil/${HOSTNAME}/portscans" \
+		"/var/lib/sguil/${HOSTNAME}/ssn_logs" \
+		"/var/lib/sguil/${HOSTNAME}/dailylogs" \
+		"/var/lib/sguil/${HOSTNAME}/sancp"
+
+}
+
+pkg_postinst() {
+	elog
+	elog "You should check /etc/sguil/sensor_agent.conf and"
+	elog "/etc/init.d/logpackets and ensure that they are accurate"
+	elog "for your environment. They should work providing that you"
+	elog "are running the sensor on the same machine as the server."
+	elog "This ebuild assumes that you are running a single sensor"
+	elog "environment, if this is not the case then you must make sure"
+	elog "to modify /etc/sguil/sensor_agent.conf and change the HOSTNAME variable."
+	elog "You should crontab the /etc/init.d/log_packets script to restart"
+	elog "each hour."
+	elog
+}
diff --git a/net-analyzer/sguil-sensor/sguil-sensor-0.9.0.ebuild b/net-analyzer/sguil-sensor/sguil-sensor-0.9.0.ebuild
new file mode 100644
index 000000000000..3235c34d475a
--- /dev/null
+++ b/net-analyzer/sguil-sensor/sguil-sensor-0.9.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit user
+
+MY_PV="${PV/_p/p}"
+DESCRIPTION="Sensor part of sguil Network Security Monitoring"
+HOMEPAGE="http://sguil.sourceforge.net"
+SRC_URI="https://github.com/bammv/${PN/-sensor}/archive/v${PV}.tar.gz -> ${P/-sensor}.tar.gz"
+
+LICENSE="GPL-2 QPL"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-lang/tcl-8.3:0=[-threads]
+	>=dev-tcltk/tclx-8.3
+	>=net-analyzer/barnyard-0.2.0-r1
+	>=net-analyzer/snort-2.4.1-r1
+	dev-ml/pcre-ocaml
+	net-analyzer/sancp
+"
+
+S="${WORKDIR}/sguil-${MY_PV}"
+
+pkg_setup() {
+	enewgroup sguil
+	enewuser sguil -1 -1 /var/lib/sguil sguil
+}
+
+src_prepare() {
+	sed -i \
+		-e "s:gateway:${HOSTNAME}:" \
+		-e 's:/snort_data:/var/lib/sguil:' \
+		-e 's:DAEMON 0:DAEMON 1:' \
+		-e 's:DEBUG 1:DEBUG 0:g' \
+		sensor/sensor_agent.conf || die
+	sed -i \
+		-e 's:/var/run/sensor_agent.pid:/run/sguil-sensor.pid:' \
+		sensor/sensor_agent.tcl || die
+}
+
+src_install() {
+	dodoc doc/*
+
+	dobin sensor/sensor_agent.tcl
+
+	newinitd "${FILESDIR}/log_packets.initd" log_packets
+	newinitd "${FILESDIR}/sensor_agent.initd" sensor_agent
+	newconfd "${FILESDIR}/log_packets.confd" log_packets
+	insinto /etc/sguil
+	doins sensor/sensor_agent.conf
+
+	# Create the directory structure
+	diropts -g sguil -o sguil
+	keepdir /var/lib/sguil /var/lib/sguil/archive \
+		"/var/lib/sguil/${HOSTNAME}" \
+		"/var/lib/sguil/${HOSTNAME}/portscans" \
+		"/var/lib/sguil/${HOSTNAME}/ssn_logs" \
+		"/var/lib/sguil/${HOSTNAME}/dailylogs" \
+		"/var/lib/sguil/${HOSTNAME}/sancp"
+
+}
+
+pkg_postinst() {
+	elog
+	elog "You should check /etc/sguil/sensor_agent.conf and"
+	elog "/etc/init.d/logpackets and ensure that they are accurate"
+	elog "for your environment. They should work providing that you"
+	elog "are running the sensor on the same machine as the server."
+	elog "This ebuild assumes that you are running a single sensor"
+	elog "environment, if this is not the case then you must make sure"
+	elog "to modify /etc/sguil/sensor_agent.conf and change the HOSTNAME variable."
+	elog "You should crontab the /etc/init.d/log_packets script to restart"
+	elog "each hour."
+	elog
+}
diff --git a/net-analyzer/sguil-server/Manifest b/net-analyzer/sguil-server/Manifest
new file mode 100644
index 000000000000..3e1781f3bf0e
--- /dev/null
+++ b/net-analyzer/sguil-server/Manifest
@@ -0,0 +1,9 @@
+AUX sguild.confd 718 SHA256 8c0666711fa56030f51ef9e9b26f756a00c08c5457855f7554bb15311a062982 SHA512 48bf64ed2335367c6b11dafb7f157fc507398e2466e186602e3319891848b3b47a5f9a70a39d8d94ecba170a7604252f689d116442572c3bc71441b01e3c0e34 WHIRLPOOL 2da895958ada6bfaeb4c8cd593ca9be4359cb06b9c1ef1414e8be761baf6d38d44eb8cd7ba75b819a470e83e47ac406ed391b6f22e41d9cd5efa5193a9e142cc
+AUX sguild.initd 1198 SHA256 85a1c885c4a6fc6cc1866b61f56f37e2f49d4cc7b215e9367d4e5ef67ade207f SHA512 73bc162660ec36e568071026b6578a6e46215720cafdf957356307a341fcb159f201ba075d3f97563c81384da119f88a002f0f9e990071aef18026ad77e2e101 WHIRLPOOL 7b883ed6c0609c1d13410a285e01ac9896879d7f281429d61d1f4dc21c73dad8be29ceb19d2ea21fb3710381f66dff7e50804b2b6b11c547b98fd8ff244e7081
+DIST sguil-0.9.0.tar.gz 464204 SHA256 412be894d67a6487312dd16a98a580dda8c38cff2e24f7a6c25405857769782b SHA512 3f300901d0f0260fbc950b4c7604e3dc3eeb2d088ff45171db84e2d58e281242bf3582eac51162968f1f3766961aec4d0a7af54e85773102ee643a52e879cfa6 WHIRLPOOL eaaef918819ed781505abc727c65e08a9e6d6d0e53f842b5aa6ec4cd1278dc902375a45794b3989488c3507bc34e288593cd892c8a94293d8a7723bbdb6cef4e
+DIST sguil-server-0.8.0.tar.gz 102236 SHA256 faa7152ddbdc0ba797c79d6419bf3ae50bfd6dbba4b2cd28ccb04a55ef788360 SHA512 84161365579e3b4227314d9f61afad6ad220261525d7fc8016210a13ee607815eb33178bab026f8a217c43a42f2e623c41d579c5898f58207a18e31685426710 WHIRLPOOL e6f2709f1dd079bb1fa5fcd1c8010ac4a5c692410fec61aac1c6ede3dc7264077370667397b6b9b4a347df3b877e7fc61932340f02a087d828163457c6a9724a
+EBUILD sguil-server-0.8.0.ebuild 2716 SHA256 3db793964b75681ed324d2c4c88a54779f3691d2358aa27cd3c2962b7df641bc SHA512 69c4956fcec20c7813150fdcbb75f2df7ccc5b7691944967e03a88d63678e27d9d3179fd93a217e24880a5591e072891d0ad81931c7a847e04671d2c6a75383c WHIRLPOOL d2261d2a3949eb78f91c3ce2d68e2803ae8498d773914ea6d18a1501d5ea42e7099160bc88528bce76f74b8e81cf591cc79c57b90e15abfb6a504e041254bbb4
+EBUILD sguil-server-0.9.0.ebuild 2744 SHA256 35cc6cf37ab77de087f8c638c7277234407f0ef45a551e76fa830db2b7302072 SHA512 bae037820841e967a714d7b054a2830fb8dcc369729fce90132286b07abc7fa09fcb777c667a0b8a69a1182a584962dce47d0a7323f89a5a4762e06ec588e931 WHIRLPOOL 7a52286292b9d98baed127e5887d621e62025e4fb6298ff01e6dda0f191eef9d12ac1aef6005c69e3433f877243a26024818c3919eaecf9089bf47c3f3c75014
+MISC ChangeLog 3348 SHA256 75671b8ff5b3261881402a2e93c4b9a81cf3732d3f5ee0ff2f24f659a3302757 SHA512 c6086277d381532f467109292b0a5d20849876d5c727a0fb5777ba6838fba18c7c307e0a5a439f918031bbd7b2f312b04f1cc3aef24490b602328ae55cf1a632 WHIRLPOOL 3d525b8b82452979c6ffa3431516abbf9fb68c1a48deb35f23ada9891428fdb0805f28772ae45033156377c561596c63b74a34c9dac89578067dc9273f92b438
+MISC ChangeLog-2015 2826 SHA256 3065a539ba13447a8c4841c459c527cfc0f2c90e0733844fd117727ecada82cb SHA512 1e208c060732400b49cf093ebfc5630778de1361c6c2e551a77803899f0dfc78576c920ad2f0f13c01b916e9f0c28adb04198e87aae836144e12ddab849c89b2 WHIRLPOOL d94ecb94b907e80ae231713cd8b976c7488b34fbb995e23c4898f9ad2ddc1b4faeacca428a11f038d0d7f4e56d56e190a696e85f38ddd27ce58a81087e20c5dc
+MISC metadata.xml 418 SHA256 0be32877ea9dae6f000b93301bf6ba94b139f53032a34e758ab806e688722bb6 SHA512 bbe71ed5ce17f337808f82d4fe54ef68b94723a808c597a52d049b88b7334be9abb066911accf9175886405f3f02d37d838422a933afe8e00eeeac2c74ba5ed3 WHIRLPOOL 96fbf0ca145124d0c2e5419589dd84d6e292d4859b0145a4344090522edbe2026f500bdbbc7bb8f3d37122f54acf1339dd57ced7b5e86be7a289ca9ff2786b4e
diff --git a/net-analyzer/sguil-server/files/sguild.confd b/net-analyzer/sguil-server/files/sguild.confd
new file mode 100644
index 000000000000..216f6e60ad87
--- /dev/null
+++ b/net-analyzer/sguil-server/files/sguild.confd
@@ -0,0 +1,25 @@
+# Config file for /etc/init.d/sguild
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+#PATH to the sguild config (sguild.conf) file.
+CONF=/etc/sguil/sguild.conf
+
+#PATH to the sguild config (autocat.conf) file.
+AUTOCAT=/etc/sguil/autocat.conf
+
+#PATH to the sguild global queries (sguild.queries) file.
+QUERIES=/etc/sguil/sguild.queries
+
+#PATH to the sguild users (sguild.users) file.
+USERS=/etc/sguil/sguild.users
+
+#PATH to the sguild access file
+ACCESS=/etc/sguil/sguild.access
+
+#Directory that contains sguild.pem and sguild.key
+#Uncomment to enable openssl connectivity
+#OPENSSLPATH="/etc/sguil/"
+
+#For any other options you wish to add
+#EXTRA_SGUILD_OPTS=
diff --git a/net-analyzer/sguil-server/files/sguild.initd b/net-analyzer/sguil-server/files/sguild.initd
new file mode 100644
index 000000000000..e4fec500feb9
--- /dev/null
+++ b/net-analyzer/sguil-server/files/sguild.initd
@@ -0,0 +1,44 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+[ -z "${CONF}" ] && CONF="/etc/sguil/sguild.conf"
+[ -z "${AUTOCAT}" ] && AUTOCAT="/etc/sguil/autocat.conf"
+[ -z "${QUERIES}" ] && QUERIES="/etc/sguil/sguild.queries"
+[ -z "${USERS}" ] && USERS="/etc/sguil/sguild.users"
+[ -z "${ACCESS}" ] && AUTOCAT="/etc/sguil/sguild.access"
+
+SGUILD_OPTS="-D -c ${CONF} -u ${USERS} -A ${ACCESS}"
+
+[ -n "${OPENSSLPATH}" ] && SGUILD_OPTS="${SGUILD_OPTS} -o -C ${OPENSSLPATH}"
+
+depend() {
+	need net
+	use mysql
+}
+
+checkconfig() {
+	[ -f "${CONF}" ] || return 1	
+	[ -f "${AUTOCAT}" ] || return 1	
+	[ -f "${QUERIES}" ] || return 1
+	[ -f "${USERS}" ] || return 1
+	[ -f "${ACCESS}" ] || return 1
+	if [ -n "${OPENSSLPATH}" ]; then
+		[ -f "${OPENSSLPATH}/sguild.key" ] || return 1
+		[ -f "${OPENSSLPATH}/sguild.pem" ] || return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting sguild"
+	start-stop-daemon --start --quiet -c sguil --exec /usr/bin/sguild \
+		-- ${SGUILD_OPTS} ${EXTRA_SGUILD_OPTS} -D -P /run/sguild.pid
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping sguild"
+	start-stop-daemon --stop --quiet --pidfile /run/sguild.pid
+	eend $?
+}
diff --git a/net-analyzer/sguil-server/metadata.xml b/net-analyzer/sguil-server/metadata.xml
new file mode 100644
index 000000000000..ca324d618d91
--- /dev/null
+++ b/net-analyzer/sguil-server/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">bammv/sguil</remote-id>
+    <remote-id type="sourceforge">sguil</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/sguil-server/sguil-server-0.8.0.ebuild b/net-analyzer/sguil-server/sguil-server-0.8.0.ebuild
new file mode 100644
index 000000000000..f6727a2fe11c
--- /dev/null
+++ b/net-analyzer/sguil-server/sguil-server-0.8.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib ssl-cert user
+
+MY_PV="${PV/_p/p}"
+DESCRIPTION="Daemon for Sguil Network Security Monitoring"
+HOMEPAGE="http://sguil.sourceforge.net"
+SRC_URI="mirror://sourceforge/sguil/sguil-server-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2 QPL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+DEPEND="
+	>=dev-lang/tcl-8.3:0=[-threads]
+	>=dev-tcltk/tclx-8.3
+	dev-tcltk/tcllib
+	dev-tcltk/mysqltcl
+	ssl? ( >=dev-tcltk/tls-1.4.1 )"
+RDEPEND="${DEPEND}
+	net-analyzer/p0f
+	net-analyzer/tcpflow
+	net-misc/openssh"
+
+S="${WORKDIR}/sguil-${MY_PV}"
+
+pkg_setup() {
+	enewgroup sguil
+	enewuser sguil -1 -1 /var/lib/sguil sguil
+}
+
+src_prepare(){
+	sed -i \
+		-e 's:DEBUG 2:DEBUG 1:' -e 's:DAEMON 0:DAEMON 1:' \
+		-e 's:SGUILD_LIB_PATH ./lib:SGUILD_LIB_PATH /usr/lib/sguild:g' \
+		-e 's:/sguild_data/rules:/var/lib/sguil/rules:g' \
+		-e 's:/sguild_data/archive:/var/lib/sguil/archive:g' \
+		-e 's:/usr/lib/sguild:/usr/'$(get_libdir)'/sguild:g' \
+		server/sguild.conf || die
+}
+
+src_install(){
+	dodoc server/sql_scripts/*
+	dodoc doc/CHANGES doc/OPENSSL.README doc/USAGE doc/INSTALL \
+	doc/TODO doc/sguildb.dia
+
+	insopts -m640
+	insinto /etc/sguil
+	doins server/{sguild.email,sguild.users,sguild.conf,sguild.queries,sguild.access,autocat.conf}
+
+	insinto /usr/$(get_libdir)/sguild
+	doins server/lib/*
+	dobin server/sguild
+	newinitd "${FILESDIR}/sguild.initd" sguild
+	newconfd "${FILESDIR}/sguild.confd" sguild
+
+	if use ssl; then
+		sed -i -e "s/#OPENSSL/OPENSSL/" "${D}/etc/conf.d/sguild"
+	fi
+
+	diropts -g sguil -o sguil
+	keepdir \
+		/var/lib/sguil \
+		/var/lib/sguil/archive \
+		/var/lib/sguil/rules
+
+}
+
+pkg_postinst(){
+	if use ssl && ! [ -f "${ROOT}"/etc/sguil/sguild.key ]; then
+		install_cert /etc/sguil/sguild
+	fi
+
+	chown -R sguil:sguil "${ROOT}"/etc/sguil/sguild.*
+	chown -R sguil:sguil "${ROOT}"/usr/lib/sguild
+
+	if [ -d "${ROOT}"/etc/snort/rules ] ; then
+		ln -s /etc/snort/rules "${ROOT}"/var/lib/sguil/rules/${HOSTNAME}
+	fi
+
+	elog
+	elog "Please customize the sguild configuration files in /etc/sguild before"
+	elog "trying to run the daemon. Additionally you will need to setup the"
+	elog "mysql database. See /usr/share/doc/${PF}/INSTALL.gz for information."
+	elog "Please note that it is STRONGLY recommended to mount a separate"
+	elog "filesystem at /var/lib/sguil for both space and performance reasons"
+	elog "as a large amount of data will be kept in the directory structure"
+	elog "underneath that top directory."
+	elog
+	elog "You should create the sguild db as per the install instructions in"
+	elog "/usr/share/doc/${PF}/ and use the appropriate"
+	elog "database setup script located in the same directory."
+
+	elog
+}
diff --git a/net-analyzer/sguil-server/sguil-server-0.9.0.ebuild b/net-analyzer/sguil-server/sguil-server-0.9.0.ebuild
new file mode 100644
index 000000000000..22db45ec08fd
--- /dev/null
+++ b/net-analyzer/sguil-server/sguil-server-0.9.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib ssl-cert user
+
+MY_PV="${PV/_p/p}"
+DESCRIPTION="Daemon for Sguil Network Security Monitoring"
+HOMEPAGE="http://sguil.sourceforge.net"
+SRC_URI="https://github.com/bammv/${PN/-server}/archive/v${PV}.tar.gz -> ${P/-server}.tar.gz"
+
+LICENSE="GPL-2 QPL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+DEPEND="
+	>=dev-lang/tcl-8.3:0=[-threads]
+	>=dev-tcltk/tclx-8.3
+	dev-tcltk/tcllib
+	dev-tcltk/mysqltcl
+	ssl? ( >=dev-tcltk/tls-1.4.1 )"
+RDEPEND="${DEPEND}
+	net-analyzer/p0f
+	net-analyzer/tcpflow
+	net-misc/openssh"
+
+S="${WORKDIR}/sguil-${MY_PV}"
+
+pkg_setup() {
+	enewgroup sguil
+	enewuser sguil -1 -1 /var/lib/sguil sguil
+}
+
+src_prepare(){
+	sed -i \
+		-e 's:DEBUG 2:DEBUG 1:' -e 's:DAEMON 0:DAEMON 1:' \
+		-e 's:SGUILD_LIB_PATH ./lib:SGUILD_LIB_PATH /usr/lib/sguild:g' \
+		-e 's:/sguild_data/rules:/var/lib/sguil/rules:g' \
+		-e 's:/sguild_data/archive:/var/lib/sguil/archive:g' \
+		-e 's:/usr/lib/sguild:/usr/'$(get_libdir)'/sguild:g' \
+		server/sguild.conf || die
+}
+
+src_install(){
+	dodoc server/sql_scripts/*
+	dodoc doc/CHANGES doc/OPENSSL.README doc/USAGE doc/INSTALL \
+	doc/TODO doc/sguildb.dia
+
+	insopts -m640
+	insinto /etc/sguil
+	doins server/{sguild.email,sguild.users,sguild.conf,sguild.queries,sguild.access,autocat.conf}
+
+	insinto /usr/$(get_libdir)/sguild
+	doins server/lib/*
+	dobin server/sguild
+	newinitd "${FILESDIR}/sguild.initd" sguild
+	newconfd "${FILESDIR}/sguild.confd" sguild
+
+	if use ssl; then
+		sed -i -e "s/#OPENSSL/OPENSSL/" "${D}/etc/conf.d/sguild"
+	fi
+
+	diropts -g sguil -o sguil
+	keepdir \
+		/var/lib/sguil \
+		/var/lib/sguil/archive \
+		/var/lib/sguil/rules
+
+}
+
+pkg_postinst(){
+	if use ssl && ! [ -f "${ROOT}"/etc/sguil/sguild.key ]; then
+		install_cert /etc/sguil/sguild
+	fi
+
+	chown -R sguil:sguil "${ROOT}"/etc/sguil/sguild.*
+	chown -R sguil:sguil "${ROOT}"/usr/lib/sguild
+
+	if [ -d "${ROOT}"/etc/snort/rules ] ; then
+		ln -s /etc/snort/rules "${ROOT}"/var/lib/sguil/rules/${HOSTNAME}
+	fi
+
+	elog
+	elog "Please customize the sguild configuration files in /etc/sguild before"
+	elog "trying to run the daemon. Additionally you will need to setup the"
+	elog "mysql database. See /usr/share/doc/${PF}/INSTALL.gz for information."
+	elog "Please note that it is STRONGLY recommended to mount a separate"
+	elog "filesystem at /var/lib/sguil for both space and performance reasons"
+	elog "as a large amount of data will be kept in the directory structure"
+	elog "underneath that top directory."
+	elog
+	elog "You should create the sguild db as per the install instructions in"
+	elog "/usr/share/doc/${PF}/ and use the appropriate"
+	elog "database setup script located in the same directory."
+
+	elog
+}
diff --git a/net-analyzer/sinfo/Manifest b/net-analyzer/sinfo/Manifest
new file mode 100644
index 000000000000..a4e5545121f7
--- /dev/null
+++ b/net-analyzer/sinfo/Manifest
@@ -0,0 +1,10 @@
+AUX sinfo-0.0.47-tinfo.patch 407 SHA256 a52acc6cf3cb8900c95ff387d88e233efb6bfc5227e1cf00b569b705254e3cd8 SHA512 4cbe14fb4ae66553af8038fdb6f60488e988185ce79d19662810c332c5345e63423a983187d257e641fd9bccbdb0173f800c6dc1b5324127eb798cb4f538d717 WHIRLPOOL d70fe4ef73705d0ed2f5177416281dbc5c1585f26cd140ea88565114f175df54c5bbb1f7002dea7230a03440c7fc1b14bc6977a6ed2f69d0904ac5a4045f4b65
+AUX sinfo-0.0.48-acinclude.m4 19589 SHA256 a967cc721b6287fede85ffc8e3af1e1f03e7974236f9c648652006ab1fde626f SHA512 5e8ba94db1e43f89f378e7448dad34a61b4c917b672d267b847c4e7f1838c8a402dc0bbb97e7e930fda4cc2ab6cde1b7562fdf95cac49a5c7b75024d6dd2b5fa WHIRLPOOL b6bb11e20f28ee91cf68d0f2b5e8aa515a7baf18c687a0280486e4f615d8aa887f1076de8673a081d30fc158acab2f8e6e537b5d79d948250923856e554d7f33
+AUX sinfo-0.0.48-gcc6.patch 858 SHA256 5d7520ad04b22928383faef7ea9feca8cbd94f22aa659dec3c7265d63edce470 SHA512 9d6778c45428a9ca5060568a7fc4fe4afd652a2af72d3f54be4e4589b2e6df6216cd00e0f528d49d1ffc3c5a862c9a9b2b76f5343eb32c393326820cd24c26f1 WHIRLPOOL 9190e769263e8f212da4b9a8078ba9c4cf1e0935f3b1d4eadb7d7c4eef3c497057381c4d16e54c11ac005efc1a3c8d031c5b9d0bc986f03cecc8ad2eab6e579c
+AUX sinfod.confd 105 SHA256 1dac559754a56bc0c306bca8afccdc1623c32ed5a09288657f1527e4ff8535d1 SHA512 c9ec8ad6dd6126bc9f2860cf6fe54b2119dda428d8eda8cea283b9755c4d64fdb933d81aa2da194b8453dbc6386d6b2306766eecc627dbd1bd8b226b4520ac88 WHIRLPOOL 2c6b3a30f8a903cd5c687e820a5cec2e6c2ed3472ba5c4ffd9647c253530920d059f21f3a8c66ec78787fb0bd504cc27d931e2d6beb5843b4075fc32b2520304
+AUX sinfod.initd 212 SHA256 f6518472e027511a71c6f60bc7112d8c09fd4434b664a69488f4e6a50f3e083f SHA512 a26e3e1d8dae8a158299a214a7de569051bcfd3ab9dc3d92515767f896c5081efe886bc55b1d1d028547d8ed3d2a747408089f8de34712100e19a06cf5f07577 WHIRLPOOL 7754a3bda2e946ef9b0f6b5d4b3c3caa57c201ac44c0ad1169f7a8e58b4692d95675f28d7cb98101a7ee13aa6adf29840812c20a6bb42a770cf5f0a3a48e04ad
+DIST sinfo-0.0.48.tar.gz 703237 SHA256 4b6360f863c408e96ca04092ea6bdd61ee14a9e9151b85f64e12ece541b1933f SHA512 9cbc790883dfd78970a5943599128f1af34a82362fa33e7d6f23d560806dce5955c45f7e82e79adcf7696166d1f39fd1856bae76087a3ba46d54e3e4963d4067 WHIRLPOOL 0056428939007676de7440a1814b03f862a38d64cfe36f616e748d38a1f85e155038712ba2901e1516e13279b61d4fead79136dfd6cbdc0f60e84931e572d919
+EBUILD sinfo-0.0.48.ebuild 858 SHA256 85084620f6db0d04ebb4610a7da4ef0a9f2c00f3215c4749e16ae1566787be0d SHA512 dee94b72360a690fff18ec1e91dababcd74d76e57d114d5f10e8035cc90c63f15eac4d93afddc5b2b46f8549ab01d60d521cbcb88c11e86bc88bf0145453ae0a WHIRLPOOL a80a510cc073e5cc2c56ebe53496713c0f23c5a84d7d2f481d33fdf059454f19a939c457fa0440e0b14aff1e12c24b89ce109572416c1cac57fbc59dcc6c7f1b
+MISC ChangeLog 2669 SHA256 2606f2b55da7ebee96b6fecd120beb64b66a47f27256367f8d2b7492c5761e22 SHA512 002487dfcd3d815b02801618fdc6c8f37b70741207a70d9b0c462f57a7ca35cfbd060e9aa9797d6e15eac879216c30bf826a2cb52cba4f921dc16572f4ce0eed WHIRLPOOL 5b73dd66ebad7afcabd1712c5c2c92be66fe9b26733add62020233efba7b3bd5608f10d9d84d99123706e8bca70876de5e300fa68fe659342f11b2c2e7206ad4
+MISC ChangeLog-2015 2725 SHA256 1ecbe8ecb99bbcda75600da63ce4cb03a0b24d2c042292d000cbc8421d96bbfd SHA512 79b19cd2f0aa18f4fc46fdfd8bd409f4dbc3cd3f6318e19750e9716f0caab7208f718547efe024523b79deb6df13345ebec91117bad5781feaed0f25c1b461ce WHIRLPOOL 83af99dc4c189c39a700570a35b1fd13ec4fcc40e04ae95e32e96589770afa9c2aec8c3ab48679df920126d3d2734bb088b615161593a5f618f9a041aa0aaf61
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/sinfo/files/sinfo-0.0.47-tinfo.patch b/net-analyzer/sinfo/files/sinfo-0.0.47-tinfo.patch
new file mode 100644
index 000000000000..939f05b627ad
--- /dev/null
+++ b/net-analyzer/sinfo/files/sinfo-0.0.47-tinfo.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,7 +54,10 @@
+ 	     [ AC_MSG_RESULT(CPUNO_ADJUST disabled) ] )
+ 
+ dnl ncurses useable?
+-MP_WITH_CURSES
++PKG_CHECK_MODULES(ncurses,ncurses,[
++	CURSES_LIB="$ncurses_LIBS"
++	AC_CHECK_HEADER([ncurses.h],AC_DEFINE(HAVE_NCURSES_H)],
++	AC_MSG_ERROR([ncurses not found])))
+ AC_SUBST(CURSES_LIB)
+ 
+ dnl check for use_default_colors() ... not available in  ncurses  << 4.x
diff --git a/net-analyzer/sinfo/files/sinfo-0.0.48-acinclude.m4 b/net-analyzer/sinfo/files/sinfo-0.0.48-acinclude.m4
new file mode 100644
index 000000000000..b67f4346881d
--- /dev/null
+++ b/net-analyzer/sinfo/files/sinfo-0.0.48-acinclude.m4
@@ -0,0 +1,508 @@
+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# ===========================================================================
+#       http://www.gnu.org/software/autoconf-archive/ax_boost_base.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_BOOST_BASE([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# DESCRIPTION
+#
+#   Test for the Boost C++ libraries of a particular version (or newer)
+#
+#   If no path to the installed boost library is given the macro searchs
+#   under /usr, /usr/local, /opt and /opt/local and evaluates the
+#   $BOOST_ROOT environment variable. Further documentation is available at
+#   <http://randspringer.de/boost/index.html>.
+#
+#   This macro calls:
+#
+#     AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS)
+#
+#   And sets:
+#
+#     HAVE_BOOST
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
+#   Copyright (c) 2009 Peter Adolphs
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 20
+
+AC_DEFUN([AX_BOOST_BASE],
+[
+AC_ARG_WITH([boost],
+  [AS_HELP_STRING([--with-boost@<:@=ARG@:>@],
+    [use Boost library from a standard location (ARG=yes),
+     from the specified location (ARG=<path>),
+     or disable it (ARG=no)
+     @<:@ARG=yes@:>@ ])],
+    [
+    if test "$withval" = "no"; then
+        want_boost="no"
+    elif test "$withval" = "yes"; then
+        want_boost="yes"
+        ac_boost_path=""
+    else
+        want_boost="yes"
+        ac_boost_path="$withval"
+    fi
+    ],
+    [want_boost="yes"])
+
+
+AC_ARG_WITH([boost-libdir],
+        AS_HELP_STRING([--with-boost-libdir=LIB_DIR],
+        [Force given directory for boost libraries. Note that this will override library path detection, so use this parameter only if default library detection fails and you know exactly where your boost libraries are located.]),
+        [
+        if test -d "$withval"
+        then
+                ac_boost_lib_path="$withval"
+        else
+                AC_MSG_ERROR(--with-boost-libdir expected directory name)
+        fi
+        ],
+        [ac_boost_lib_path=""]
+)
+
+if test "x$want_boost" = "xyes"; then
+    boost_lib_version_req=ifelse([$1], ,1.20.0,$1)
+    boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([[0-9]]*\.[[0-9]]*\)'`
+    boost_lib_version_req_major=`expr $boost_lib_version_req : '\([[0-9]]*\)'`
+    boost_lib_version_req_minor=`expr $boost_lib_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
+    boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
+    if test "x$boost_lib_version_req_sub_minor" = "x" ; then
+        boost_lib_version_req_sub_minor="0"
+        fi
+    WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+  $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`
+    AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req)
+    succeeded=no
+
+    dnl On 64-bit systems check for system libraries in both lib64 and lib.
+    dnl The former is specified by FHS, but e.g. Debian does not adhere to
+    dnl this (as it rises problems for generic multi-arch support).
+    dnl The last entry in the list is chosen by default when no libraries
+    dnl are found, e.g. when only header-only libraries are installed!
+    libsubdirs="lib"
+    ax_arch=`uname -m`
+    if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = s390x -o $ax_arch = sparc64; then
+        libsubdirs="lib64 lib lib64"
+    fi
+
+    dnl first we check the system location for boost libraries
+    dnl this location ist chosen if boost libraries are installed with the --layout=system option
+    dnl or if you install boost with RPM
+    if test "$ac_boost_path" != ""; then
+        BOOST_CPPFLAGS="-I$ac_boost_path/include"
+        for ac_boost_path_tmp in $libsubdirs; do
+                if test -d "$ac_boost_path"/"$ac_boost_path_tmp" ; then
+                        BOOST_LDFLAGS="-L$ac_boost_path/$ac_boost_path_tmp"
+                        break
+                fi
+        done
+    elif test "$cross_compiling" != yes; then
+        for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
+            if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
+                for libsubdir in $libsubdirs ; do
+                    if ls "$ac_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
+                done
+                BOOST_LDFLAGS="-L$ac_boost_path_tmp/$libsubdir"
+                BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
+                break;
+            fi
+        done
+    fi
+
+    dnl overwrite ld flags if we have required special directory with
+    dnl --with-boost-libdir parameter
+    if test "$ac_boost_lib_path" != ""; then
+       BOOST_LDFLAGS="-L$ac_boost_lib_path"
+    fi
+
+    CPPFLAGS_SAVED="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+    export CPPFLAGS
+
+    LDFLAGS_SAVED="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+    export LDFLAGS
+
+    AC_REQUIRE([AC_PROG_CXX])
+    AC_LANG_PUSH(C++)
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+    @%:@include <boost/version.hpp>
+    ]], [[
+    #if BOOST_VERSION >= $WANT_BOOST_VERSION
+    // Everything is okay
+    #else
+    #  error Boost version is too old
+    #endif
+    ]])],[
+        AC_MSG_RESULT(yes)
+    succeeded=yes
+    found_system=yes
+        ],[
+        ])
+    AC_LANG_POP([C++])
+
+
+
+    dnl if we found no boost with system layout we search for boost libraries
+    dnl built and installed without the --layout=system option or for a staged(not installed) version
+    if test "x$succeeded" != "xyes"; then
+        _version=0
+        if test "$ac_boost_path" != ""; then
+            if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
+                for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
+                    _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
+                    V_CHECK=`expr $_version_tmp \> $_version`
+                    if test "$V_CHECK" = "1" ; then
+                        _version=$_version_tmp
+                    fi
+                    VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
+                    BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
+                done
+            fi
+        else
+            if test "$cross_compiling" != yes; then
+                for ac_boost_path in /usr /usr/local /opt /opt/local ; do
+                    if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
+                        for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
+                            _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
+                            V_CHECK=`expr $_version_tmp \> $_version`
+                            if test "$V_CHECK" = "1" ; then
+                                _version=$_version_tmp
+                                best_path=$ac_boost_path
+                            fi
+                        done
+                    fi
+                done
+
+                VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
+                BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
+                if test "$ac_boost_lib_path" = ""; then
+                    for libsubdir in $libsubdirs ; do
+                        if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
+                    done
+                    BOOST_LDFLAGS="-L$best_path/$libsubdir"
+                fi
+            fi
+
+            if test "x$BOOST_ROOT" != "x"; then
+                for libsubdir in $libsubdirs ; do
+                    if ls "$BOOST_ROOT/stage/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
+                done
+                if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/$libsubdir" && test -r "$BOOST_ROOT/stage/$libsubdir"; then
+                    version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'`
+                    stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`
+                        stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'`
+                    V_CHECK=`expr $stage_version_shorten \>\= $_version`
+                    if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then
+                        AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT)
+                        BOOST_CPPFLAGS="-I$BOOST_ROOT"
+                        BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir"
+                    fi
+                fi
+            fi
+        fi
+
+        CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+        export CPPFLAGS
+        LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+        export LDFLAGS
+
+        AC_LANG_PUSH(C++)
+            AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+        @%:@include <boost/version.hpp>
+        ]], [[
+        #if BOOST_VERSION >= $WANT_BOOST_VERSION
+        // Everything is okay
+        #else
+        #  error Boost version is too old
+        #endif
+        ]])],[
+            AC_MSG_RESULT(yes)
+        succeeded=yes
+        found_system=yes
+            ],[
+            ])
+        AC_LANG_POP([C++])
+    fi
+
+    if test "$succeeded" != "yes" ; then
+        if test "$_version" = "0" ; then
+            AC_MSG_NOTICE([[We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option.  If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation.]])
+        else
+            AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).])
+        fi
+        # execute ACTION-IF-NOT-FOUND (if present):
+        ifelse([$3], , :, [$3])
+    else
+        AC_SUBST(BOOST_CPPFLAGS)
+        AC_SUBST(BOOST_LDFLAGS)
+        AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available])
+        # execute ACTION-IF-FOUND (if present):
+        ifelse([$2], , :, [$2])
+    fi
+
+    CPPFLAGS="$CPPFLAGS_SAVED"
+    LDFLAGS="$LDFLAGS_SAVED"
+fi
+
+])
+
+# ===========================================================================
+#     http://www.gnu.org/software/autoconf-archive/ax_boost_signals.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_BOOST_SIGNALS
+#
+# DESCRIPTION
+#
+#   Test for Signals library from the Boost C++ libraries. The macro
+#   requires a preceding call to AX_BOOST_BASE. Further documentation is
+#   available at <http://randspringer.de/boost/index.html>.
+#
+#   This macro calls:
+#
+#     AC_SUBST(BOOST_SIGNALS_LIB)
+#
+#   And sets:
+#
+#     HAVE_BOOST_SIGNALS
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
+#   Copyright (c) 2008 Michael Tindal
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 19
+
+AC_DEFUN([AX_BOOST_SIGNALS],
+[
+	AC_ARG_WITH([boost-signals],
+	AS_HELP_STRING([--with-boost-signals@<:@=special-lib@:>@],
+                   [use the Signals library from boost - it is possible to specify a certain library for the linker
+                        e.g. --with-boost-signals=boost_signals-gcc-mt-d ]),
+        [
+        if test "$withval" = "no"; then
+			want_boost="no"
+        elif test "$withval" = "yes"; then
+            want_boost="yes"
+            ax_boost_user_signals_lib=""
+        else
+		    want_boost="yes"
+		ax_boost_user_signals_lib="$withval"
+		fi
+        ],
+        [want_boost="yes"]
+	)
+
+	if test "x$want_boost" = "xyes"; then
+        AC_REQUIRE([AC_PROG_CC])
+		CPPFLAGS_SAVED="$CPPFLAGS"
+		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+		export CPPFLAGS
+
+		LDFLAGS_SAVED="$LDFLAGS"
+		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+		export LDFLAGS
+
+        AC_CACHE_CHECK(whether the Boost::Signals library is available,
+					   ax_cv_boost_signals,
+        [AC_LANG_PUSH([C++])
+		 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/signal.hpp>
+											]],
+                                  [[boost::signal<void ()> sig;
+                                    return 0;
+                                  ]])],
+                           ax_cv_boost_signals=yes, ax_cv_boost_signals=no)
+         AC_LANG_POP([C++])
+		])
+		if test "x$ax_cv_boost_signals" = "xyes"; then
+			AC_DEFINE(HAVE_BOOST_SIGNALS,,[define if the Boost::Signals library is available])
+            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
+            if test "x$ax_boost_user_signals_lib" = "x"; then
+                for libextension in `ls $BOOSTLIBDIR/libboost_signals*.so* $BOOSTLIBDIR/libboost_signals*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_signals.*\)\.so.*$;\1;' -e 's;^lib\(boost_signals.*\)\.a*$;\1;'` ; do
+                     ax_lib=${libextension}
+				    AC_CHECK_LIB($ax_lib, exit,
+                                 [BOOST_SIGNALS_LIB="-l$ax_lib"; AC_SUBST(BOOST_SIGNALS_LIB) link_signals="yes"; break],
+                                 [link_signals="no"])
+				done
+                if test "x$link_signals" != "xyes"; then
+                for libextension in `ls $BOOSTLIBDIR/boost_signals*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_signals.*\)\.dll.*$;\1;' -e 's;^\(boost_signals.*\)\.a*$;\1;'` ; do
+                     ax_lib=${libextension}
+				    AC_CHECK_LIB($ax_lib, exit,
+                                 [BOOST_SIGNALS_LIB="-l$ax_lib"; AC_SUBST(BOOST_SIGNALS_LIB) link_signals="yes"; break],
+                                 [link_signals="no"])
+				done
+                fi
+
+            else
+               for ax_lib in $ax_boost_user_signals_lib boost_signals-$ax_boost_user_signals_lib; do
+				      AC_CHECK_LIB($ax_lib, main,
+                                   [BOOST_SIGNALS_LIB="-l$ax_lib"; AC_SUBST(BOOST_SIGNALS_LIB) link_signals="yes"; break],
+                                   [link_signals="no"])
+                  done
+
+            fi
+            if test "x$ax_lib" = "x"; then
+                AC_MSG_ERROR(Could not find a version of the library!)
+            fi
+			if test "x$link_signals" != "xyes"; then
+				AC_MSG_ERROR(Could not link against $ax_lib !)
+			fi
+		fi
+
+		CPPFLAGS="$CPPFLAGS_SAVED"
+	LDFLAGS="$LDFLAGS_SAVED"
+	fi
+])
+
+# ===========================================================================
+#      http://www.gnu.org/software/autoconf-archive/ax_boost_system.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_BOOST_SYSTEM
+#
+# DESCRIPTION
+#
+#   Test for System library from the Boost C++ libraries. The macro requires
+#   a preceding call to AX_BOOST_BASE. Further documentation is available at
+#   <http://randspringer.de/boost/index.html>.
+#
+#   This macro calls:
+#
+#     AC_SUBST(BOOST_SYSTEM_LIB)
+#
+#   And sets:
+#
+#     HAVE_BOOST_SYSTEM
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
+#   Copyright (c) 2008 Michael Tindal
+#   Copyright (c) 2008 Daniel Casimiro <dan.casimiro@gmail.com>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 14
+
+AC_DEFUN([AX_BOOST_SYSTEM],
+[
+	AC_ARG_WITH([boost-system],
+	AS_HELP_STRING([--with-boost-system@<:@=special-lib@:>@],
+                   [use the System library from boost - it is possible to specify a certain library for the linker
+                        e.g. --with-boost-system=boost_system-gcc-mt ]),
+        [
+        if test "$withval" = "no"; then
+			want_boost="no"
+        elif test "$withval" = "yes"; then
+            want_boost="yes"
+            ax_boost_user_system_lib=""
+        else
+		    want_boost="yes"
+		ax_boost_user_system_lib="$withval"
+		fi
+        ],
+        [want_boost="yes"]
+	)
+
+	if test "x$want_boost" = "xyes"; then
+        AC_REQUIRE([AC_PROG_CC])
+        AC_REQUIRE([AC_CANONICAL_BUILD])
+		CPPFLAGS_SAVED="$CPPFLAGS"
+		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+		export CPPFLAGS
+
+		LDFLAGS_SAVED="$LDFLAGS"
+		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+		export LDFLAGS
+
+        AC_CACHE_CHECK(whether the Boost::System library is available,
+					   ax_cv_boost_system,
+        [AC_LANG_PUSH([C++])
+			 CXXFLAGS_SAVE=$CXXFLAGS
+
+			 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/system/error_code.hpp>]],
+                                   [[boost::system::system_category]])],
+                   ax_cv_boost_system=yes, ax_cv_boost_system=no)
+			 CXXFLAGS=$CXXFLAGS_SAVE
+             AC_LANG_POP([C++])
+		])
+		if test "x$ax_cv_boost_system" = "xyes"; then
+			AC_SUBST(BOOST_CPPFLAGS)
+
+			AC_DEFINE(HAVE_BOOST_SYSTEM,,[define if the Boost::System library is available])
+            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
+
+			LDFLAGS_SAVE=$LDFLAGS
+            if test "x$ax_boost_user_system_lib" = "x"; then
+                for libextension in `ls $BOOSTLIBDIR/libboost_system*.so* $BOOSTLIBDIR/libboost_system*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.so.*$;\1;' -e 's;^lib\(boost_system.*\)\.a*$;\1;'` ; do
+                     ax_lib=${libextension}
+				    AC_CHECK_LIB($ax_lib, exit,
+                                 [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
+                                 [link_system="no"])
+				done
+                if test "x$link_system" != "xyes"; then
+                for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.dll.*$;\1;' -e 's;^\(boost_system.*\)\.a*$;\1;'` ; do
+                     ax_lib=${libextension}
+				    AC_CHECK_LIB($ax_lib, exit,
+                                 [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
+                                 [link_system="no"])
+				done
+                fi
+
+            else
+               for ax_lib in $ax_boost_user_system_lib boost_system-$ax_boost_user_system_lib; do
+				      AC_CHECK_LIB($ax_lib, exit,
+                                   [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
+                                   [link_system="no"])
+                  done
+
+            fi
+            if test "x$ax_lib" = "x"; then
+                AC_MSG_ERROR(Could not find a version of the library!)
+            fi
+			if test "x$link_system" = "xno"; then
+				AC_MSG_ERROR(Could not link against $ax_lib !)
+			fi
+		fi
+
+		CPPFLAGS="$CPPFLAGS_SAVED"
+	LDFLAGS="$LDFLAGS_SAVED"
+	fi
+])
diff --git a/net-analyzer/sinfo/files/sinfo-0.0.48-gcc6.patch b/net-analyzer/sinfo/files/sinfo-0.0.48-gcc6.patch
new file mode 100644
index 000000000000..0b8f4a347fe0
--- /dev/null
+++ b/net-analyzer/sinfo/files/sinfo-0.0.48-gcc6.patch
@@ -0,0 +1,24 @@
+Bug: https://bugs.gentoo.org/594990
+
+--- a/libmessageio/tcpmessageserverconnection.cc
++++ b/libmessageio/tcpmessageserverconnection.cc
+@@ -91,7 +91,7 @@
+ }
+ 
+ 
+-void TCPMessageServerConnection::queueAndSendMessageSlot(Message & message)
++void TCPMessageServerConnection::queueAndSendMessageSlot(const Message & message)
+ {
+ 
+   if (sendQueue.size()<maxSendQueueSize)
+--- a/libmessageio/tcpmessageserverconnection.h
++++ b/libmessageio/tcpmessageserverconnection.h
+@@ -32,7 +32,7 @@
+   void handleReadMessageSize(const boost::system::error_code& err, size_t length);
+   void handleReadMessage(const boost::system::error_code& err, size_t length);
+ 
+-  void queueAndSendMessageSlot(Message & message);
++  void queueAndSendMessageSlot(const Message & message);
+   std::list<Message>  sendQueue;
+   bool sendQueueCurrentlySending;
+   void startNewTransmission();
diff --git a/net-analyzer/sinfo/files/sinfod.confd b/net-analyzer/sinfo/files/sinfod.confd
new file mode 100644
index 000000000000..c3b210b743dd
--- /dev/null
+++ b/net-analyzer/sinfo/files/sinfod.confd
@@ -0,0 +1,4 @@
+# /etc/conf.d/sinfod: config file for /etc/init.d/sinfod
+
+# Various sinfod options
+SINFOD_OPTS="--quiet"
diff --git a/net-analyzer/sinfo/files/sinfod.initd b/net-analyzer/sinfo/files/sinfod.initd
new file mode 100644
index 000000000000..20b9512bfe6b
--- /dev/null
+++ b/net-analyzer/sinfo/files/sinfod.initd
@@ -0,0 +1,10 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/${SVCNAME}"
+command_args="${SINFOD_OPTS}"
+
+depend() {
+	need net
+}
diff --git a/net-analyzer/sinfo/metadata.xml b/net-analyzer/sinfo/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/sinfo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/sinfo/sinfo-0.0.48.ebuild b/net-analyzer/sinfo/sinfo-0.0.48.ebuild
new file mode 100644
index 000000000000..ef6d765d62a3
--- /dev/null
+++ b/net-analyzer/sinfo/sinfo-0.0.48.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A monitoring tool for networked computers"
+HOMEPAGE="http://www.ant.uni-bremen.de/whomes/rinas/sinfo/"
+SRC_URI="${HOMEPAGE}download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ipv6 static-libs"
+
+RDEPEND="
+	!sys-cluster/slurm
+	dev-libs/boost
+	sys-libs/ncurses
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	cp "${FILESDIR}"/${P}-acinclude.m4 acinclude.m4 || die
+	epatch "${FILESDIR}"/${PN}-0.0.47-tinfo.patch
+	epatch "${FILESDIR}"/${P}-gcc6.patch
+	eautoreconf
+}
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_configure() {
+	econf $(use_enable ipv6 IPv6)
+}
+
+src_install() {
+	default
+
+	newconfd "${FILESDIR}"/sinfod.confd sinfod
+	newinitd "${FILESDIR}"/sinfod.initd sinfod
+}
diff --git a/net-analyzer/siphon/Manifest b/net-analyzer/siphon/Manifest
new file mode 100644
index 000000000000..f6cc67cfd44c
--- /dev/null
+++ b/net-analyzer/siphon/Manifest
@@ -0,0 +1,7 @@
+AUX siphon-666-gentoo.patch 441 SHA256 044a0d7c2ca58f63024f3e5dda998e392ede3bb20453b35bf81ac7ade7fd71e4 SHA512 66fa0bc1deaa44bdda3d456e79bfacbe5a620365f5cecdb6d18da127d62b3111770a097c6b63e8d83efeb206f3f6577953028dbe49090ffc22e597bc2bf5d4c5 WHIRLPOOL 31722e133e09827ca63078d1e08bbf903bfe36e7f14931d5c4e5339c3ccc1a81ec743786a5a913bae0dab749405e26b5cb479d27d292bcc69f74009bbce54ab4
+AUX siphon-666-log.patch 1177 SHA256 0b0c724de8aee69e79f7b4039b0363918c26837971f33cd3981722c4cd784879 SHA512 3f82b38442b29083b95475fe26327d2da852dfed172182903adb7cb1dbf9045158462f70239500301d3c1f88005fb6308cddbd8ff48dc885dbc3dcbf355ba4ce WHIRLPOOL 0d87dcc647e4798dc9809972c695490309a1504babd52fefd6d348493d8a5eac49a89a96b5e6c4440fb03d24c44bda3a0007815a0793c376882ef4a0560134fc
+DIST siphon-v.666.tar.gz 6951 SHA256 797063d1d38017aef05b78d7e475cc5fbbb3c7efebb62fdda8eb38a6271ec297 SHA512 d355e80e7f102af13be9663d8e7cb28d3f3dc823d79192c287a5800e1239e4f37720b449a879605e5df0da1bb8accc3c70a605d94fc925788fe4a2e7bead650a WHIRLPOOL 7aa1faea6d9e486afc337b66c34e605f3ccabe0d2f7f8aa580e751e08efa9237d5b5f2744d9a66e9b9db32dd5c086fcfc3149a650771474fbdf8c668b9c1ec18
+EBUILD siphon-666-r1.ebuild 637 SHA256 bddb1dcac9cf0702a4676bdb110b4148bf473c0aaa1ced3c3ab4f6c53e7ad01f SHA512 865e4ed633b9f90eca39f7f107fdd7b761a71d22557d6a4d025d089503264415d8517f56bf98277606739b4ec7f1bddd10871dd78c22623b43a603f33b4b28d8 WHIRLPOOL c28439df19d8f420cd18245a3aadf0da31a785bbcd52e632f6581c216bcb13bfde0f0d425d7bf7785fb9168982d7538c12b4779be7d355075bb577ab9c6a3f2a
+MISC ChangeLog 2493 SHA256 d0e4071196b9f7f0fb71538b2a8ebcf5bcd6521d1a075caae670406fc3c78557 SHA512 2a046558b13fe92d4cd8e2917d935f82f8c782f17655b0dfbbce06be695cde2801a24a202655c64f3c70aec7a8094210c8bf83f195524338d7f755eb628d4ad7 WHIRLPOOL 4ef955d3a5fb9a45a02dcdb04be0559039ceee71314d92652cd478639007bf06ba69440188e0b9e3c5302a3fdf5b51d908b61f0d9ac0c99b6dc865805b88c2cd
+MISC ChangeLog-2015 2475 SHA256 0aa5b58accc35dced57a587dd23fef7599fcd1632091343dd11540801b2dce91 SHA512 495bba2eca4123de7d0406be06b088f4ee33cfd4f83d7a4a716f48985386f3e81cd863be5a459dbcb5a363961cac90fc26073ec2f37bc7326f3ca4ffec873db1 WHIRLPOOL b199660f9a267bb83cb99b6f01c33870a67422441867a5e4b1f84baada19532eb586dd54d5ba7b0bf30ea11123a1c8fa43c2fb38f6a0dcb063689d37878cbec7
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/siphon/files/siphon-666-gentoo.patch b/net-analyzer/siphon/files/siphon-666-gentoo.patch
new file mode 100644
index 000000000000..eea6d93b802e
--- /dev/null
+++ b/net-analyzer/siphon/files/siphon-666-gentoo.patch
@@ -0,0 +1,19 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,6 @@
+ CC = gcc
+ CCFLAGS = -Wall -pthread -ggdb
+-CFLAGS = -Wall -O2 -pthread -ggdb -I. 
++CFLAGS += -pthread -Wall -I.
+ LIBS = -lpcap
+ OBJS = parse.o sniff.o main.o log.o
+ SRCS = ${OBJS:.o=.c}
+@@ -9,7 +9,7 @@
+ all: $(TARGET)
+ 
+ $(TARGET): $(OBJS)
+-	$(CC) $(CCFLAGS) -o $(TARGET) $(OBJS) $(LIBS)
++	$(CC) $(CCFLAGS) $(LDFLAGS) -o $(TARGET) $(OBJS) $(LIBS)
+ 
+ clean:
+ 	rm -f $(OBJS) *~ *.core core siphon
diff --git a/net-analyzer/siphon/files/siphon-666-log.patch b/net-analyzer/siphon/files/siphon-666-log.patch
new file mode 100644
index 000000000000..07d2de4d4d12
--- /dev/null
+++ b/net-analyzer/siphon/files/siphon-666-log.patch
@@ -0,0 +1,46 @@
+--- a/main.c
++++ b/main.c
+@@ -98,7 +98,7 @@
+    pti_parse.pti_pd[1] = pd_parse2log[1];
+ 
+    pthread_create (&parse_thread, NULL, (void *) parse, &pti_parse);
+-   pthread_create(&log_thread,NULL,(void *)log, (void *)pd_parse2log[0]);
++   pthread_create(&log_thread,NULL,(void *)siphon_log, (void *)pd_parse2log[0]);
+    pthread_create (&sniff_thread, NULL, (void *) sniff_network,
+ 		   &pd_sniff2parse[1]);
+ 
+--- a/log.c
++++ b/log.c
+@@ -19,7 +19,7 @@
+ 
+ int tag = 0;
+ 
+-void *log(void *pipe)
++void *siphon_log(void *pipe)
+ {
+   struct parse2log *info;
+   char hashed[100], buf[1024], *os, *proto = NULL, *df;
+@@ -137,10 +137,10 @@
+   FILE *osprints;
+   static char line[80], *oswin, *osttl, *osdf, *os, hexed[10];
+   static int check = 0;
+-  osprints = fopen("osprints.conf","r");
++  osprints = fopen("/etc/osprints.conf","r");
+ 
+   if(!osprints) {
+-    perror("Unable to find osprints.conf\n");
++    perror("Unable to find /etc/osprints.conf\n");
+     return "Unknown";
+   }
+ 
+--- a/siphon.h
++++ b/siphon.h
+@@ -49,7 +49,7 @@
+ 
+ void *sniff_network (void *);
+ void *parse (void *);
+-void *log(void *);
++void *siphon_log(void *);
+ 
+ char *device, *logfile;
+ int verbose, back;
diff --git a/net-analyzer/siphon/metadata.xml b/net-analyzer/siphon/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/siphon/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/siphon/siphon-666-r1.ebuild b/net-analyzer/siphon/siphon-666-r1.ebuild
new file mode 100644
index 000000000000..32c4e5b27bb0
--- /dev/null
+++ b/net-analyzer/siphon/siphon-666-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+MY_P=${PN}-v.${PV}
+
+DESCRIPTION="A portable passive network mapping suite"
+HOMEPAGE="http://siphon.datanerds.net/"
+SRC_URI="${HOMEPAGE}${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-log.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin ${PN}
+	insinto /etc
+	doins osprints.conf
+	dodoc README
+}
diff --git a/net-analyzer/slurm/Manifest b/net-analyzer/slurm/Manifest
new file mode 100644
index 000000000000..fcdd1267ace2
--- /dev/null
+++ b/net-analyzer/slurm/Manifest
@@ -0,0 +1,12 @@
+AUX slurm-0.3.3-gentoo.patch 1999 SHA256 a893f8b754c45e5cab7e2908536cfac5be27a97d456d6f53e01f4129c553045b SHA512 cafc05ccdd2adeaab03007698662a2403031bcb1d0e825210a41473a76296674d8522206fc2ffe7dd82b772fd3dbec02d4d906427f94b40fa2eefa4f08235059 WHIRLPOOL 2035120e2fd34a8283c788e5d11c7fd984cfd96ad18a541232f2f4f8dcc67dcc3053222a6ed1bc251fe7537c26724b5b25d56000157025510ce5d9c01cde2e11
+AUX slurm-0.3.3-overflow.patch 596 SHA256 7904579870c73f286934b6f35c5deb6fb4dcaa5ae2428359e23bd45f935e4adf SHA512 6211306f2e6787cc8c4f4e02e4af840003db6b90f32b6a7191e019300a00e460c8a16b13e2ad24c0f51bd5af7de9f7d85ede44b6f4de3d1c8544f9deacb29890 WHIRLPOOL fea7567f6806a69659b89e9a5914bfad096c47d2cac9fc37dc88ef90d1711451b4938891ab69531bcedfbb463e278fdef36944f3e7911a30ace3239edbc99c80
+AUX slurm-0.3.3-theme.patch 492 SHA256 ff309dae3479b3de62b3577a9eab2d76125f7d556eae475af5272325429db9f4 SHA512 c05919c8c7dfd8f79d6d87d22a79900aa4f284b30a2fd9b8099e575956d242443f2aff51e99ce9f48fe236f9b3d7596904d7bf4ec77a75c6442867a0a231a179 WHIRLPOOL ad4a543c8a78352debd418341b2ed8645be5d4279dc33c10cdf6ee2e01dade52bfc57ac25da3e5d4c0b5d6fa70d4b377278eb1825fc299c9e765bb072c844b85
+AUX slurm-0.4.3-tinfo.patch 267 SHA256 4cca0b094a2f2fc8c1c5028e7dd69bed9b484aaeb5ae700af6bbf871fe9bba5c SHA512 fc348f28590efebb86993d7187539e949d052d8959eb36765d6dc3a889fff22f7d6b72bc8337d6a93f22426bf590f2a2239ed4426b4a26949624bb1f9e48ac14 WHIRLPOOL 0d94f521b655de4198a7550315fc9f00d8418c295636e6c8d19cac5cd69623242a512330aa507e08054d05f9ab48655a6ff4862f15d3223fc5004386d50efbff
+AUX slurm-0.4.3-version.patch 170 SHA256 de415c2699fc60f5db01c69f72ba19e49f60323de37ee807673db2510ac50905 SHA512 40f2e3bc6c2136f7bc91a719a5e8ffcaef4112ff9cacc5a61ebecbf9d3272b1b3aac425b9e22cafb4fc0b630aec2338e1c2ada27d9d2828fbbc90af215cb936b WHIRLPOOL 208633a4196f19118825d3f6bcd6819a4e638b650bc31d78684cc236afe5e2648e814be269afc3006203b2eadc4e7bb566034ef6bb90af51794ced48e2dacbc6
+DIST slurm-0.3.3.tar.gz 122839 SHA256 b25889aa1910b1bb48e4eafdac0c810bc02e8b98ddb2ade0aed2ec64672d6834 SHA512 67ffef9d0fc6239e2a742b2020a2a1fa913a6f0d681ffb7fd00611265e60b39f83b18cbd782ce841b6b39ed0db2c40cd6410d7f5d9408bf0eb0361b95949a8a3 WHIRLPOOL a35d3cb726bf390f90c7f095c34b94b48cc0c3f59a8f8b88aa6ce31c033f74542e8ce7cefb1ecc15ea13ad5addecd9c0a321bf1e2834b582ff770fcfe9c4e1e2
+DIST slurm-0.4.3.tar.gz 36076 SHA256 f7092c378f85e473192d0aa3db4801077e0f9e148a7448cc2247cbdf639874aa SHA512 f55005e2e2acebf1b7be0f7106511f83123f4df30305d00495940220f99394ddd48193ee4985c91604f294487c181f6efebe9452137f7df5b9675d2c3388892f WHIRLPOOL be565768c3ac5af46388beba98e0b67c425bab15f934b38f1ef425e18eb18538944fba69fc98222f66cdc20620e9d5947aaf22e08d37c753dba960ce914b579f
+EBUILD slurm-0.3.3-r2.ebuild 771 SHA256 531a9ffb3799b63c9ed47f3337442fdf72d84066103b75af82b31633b7e71a5c SHA512 2e528680ff2ddd6b31c4b8c2ad49a4b3a21e7da0d8f504100f6588cbe480fcfdd5f2e3a58a60c26360313c526cf9dddb4c77746e1e5938766e7ea1277b36accc WHIRLPOOL c7aa91f70ad31799f4412de2275d11b88ca1959e6729225e30252e372f18d877cccd7f76abca9473940c88820d901a8a7cbe3c8d2e54176339b24d4496f6771d
+EBUILD slurm-0.4.3.ebuild 667 SHA256 9266b59357277f5795d28b01dea9a05436fe7cd1d197efeff0f716129a53be6d SHA512 1ad6cec33eb1f57a95cef30ab022a26c7b1dd2d927ffd8468f75a4e5ac37a3eb8ffa5a48b120ea803e8999dd8dc4b03342de18255ef7b64e2d459cdb1c509885 WHIRLPOOL 2df7fd8dce939eef8d5580fcda65561f50dd461041491d14741a34af2d9bf24e823b7d2074596f78f19c0d7f8c1f98f3bc59e63892119cd76d8a77ee3c166be8
+MISC ChangeLog 2589 SHA256 afc556109e538ae88eafeb976e03392403135f55c2d5cef91b380c2ab13811ae SHA512 dd9b06d63ab149bd901776cb38ad751f0f839e36bc9abdc22fbb83760f22640f0bd4741341c25404cb6a345fd428b92555379280990c44143cebdf81a086a23a WHIRLPOOL 7bfb599651a14693eb838fa33bf7718e65258f11aca97f015471f862a9147b1bfaeb96ac442edca13940564d39090955b8c2d31464cbfd24020172ded704d42f
+MISC ChangeLog-2015 4175 SHA256 d8fa46b8201ab890a3d9ed13207b358827cf82b28cc3624cd394183931a99fcd SHA512 034559f9ec974cc22ca218a403a99a227c2027f2c3a0a1b6afb6a28d882a48665f36bf2df900a94636edd66db1029d5cd4748f374cef817958fada21ba5a7eb0 WHIRLPOOL ce0752c57ccc3b41ed5555ac77dea1e0f8fb4b9d5be73049d63fd0156b77b4847fd5293f7d3b7b0bb900eddf0c566b49e7b7cffd82e290c4b9599f08f531c8fc
+MISC metadata.xml 360 SHA256 9d063519565f972e7b571d0006680641b0ec7fe4392ede8a95679a51f0f7c3f1 SHA512 bcef8916863832f9192e7df51f693b87836b74663da01a1b7f330569e10ffed23de36a6c5ffbde968ec4270bd2fcacec3f12f78b700cdbfc001c34862e497f12 WHIRLPOOL 0e6021208164d8eb93a14e3b8796d7ba652aa56d47b6870fb0f18d9828f21c2c2a2cd5eb6665fa25637a696761640ff49c4eb7d0ecde189c85a4ae5aba06cc98
diff --git a/net-analyzer/slurm/files/slurm-0.3.3-gentoo.patch b/net-analyzer/slurm/files/slurm-0.3.3-gentoo.patch
new file mode 100644
index 000000000000..bd97a10c1e81
--- /dev/null
+++ b/net-analyzer/slurm/files/slurm-0.3.3-gentoo.patch
@@ -0,0 +1,48 @@
+--- a/configure.in
++++ b/configure.in
+@@ -40,31 +40,6 @@
+ fi
+ AC_DEFINE(OSTYPE, ["${OSTYPE}"], [The operating system to build for])
+ 
+-for cursespath in /usr/include/ncurses.h /usr/local/include/ncurses.h /usr/local/include/ncurses/ncurses.h /opt/include/ncurses.h /opt/include/curses.h /usr/include/curses.h /usr/local/include/curses.h /dev/null
+-do
+-  test -f "${cursespath}" && break
+-done
+-case ${cursespath} in
+-  /usr/include/*) 
+-	CFLAGS="$CFLAGS -I/usr/include"
+-	LDFLAGS=""
+-	;;
+-  /usr/local/include/ncurses/*)
+-        CFLAGS="${CFLAGS} -I/usr/local/include/ncurses"
+-        LDFLAGS="-L/usr/local/lib"
+-        SOLLDFLAGS="-R/usr/local/lib"
+-        ;;
+-  /usr/local/include/*) 
+-	CFLAGS="${CFLAGS} -I/usr/local/include"
+-	LDFLAGS="-L/usr/local/lib"
+-	SOLLDFLAGS="-R/usr/local/lib"
+-	;;
+-  /opt/include/*) 
+-	CFLAGS="${CFLAGS} -I/opt/include"
+-	LDFLAGS="-L/opt/lib"
+-	SOLLDFLAGS="-R/opt/lib"
+-	;;
+-esac
+ # add Slowlaris -R and libraries to LDFLAGS
+ if test ${OSTYPE} = "solaris" ; then
+ 	LDFLAGS="${LDFLAGS} ${SOLLDFLAGS} -lnsl -lsocket -lkstat"
+@@ -74,7 +49,12 @@
+ ncurses_support="no"
+ curses_support="no"
+ color_support="no"
+-AC_CHECK_LIB(ncurses, use_default_colors, LDFLAGS="$LDFLAGS -lncurses"; CFLAGS="$CFLAGS -D_HAVE_NCURSES -D_HAVE_NCURSES_COLOR"; color_support="yes"; ncurses_support="yes", AC_CHECK_LIB(ncurses, use_default_colors, LDFLAGS="$LDFLAGS -lncurses"; CFLAGS="$CFLAGS -D_HAVE_NCURSES"; ncurses_support="yes"; echo "NO TRANSPARENCY SUPPORT in this ncurses lib", AC_CHECK_LIB(curses, initscr, LDFLAGS="$LDFLAGS -lcurses"; CFLAGS="$CFLAGS -D_HAVE_CURSES"; curses_support="yes"; echo "NO TRANSPARENCY SUPPORT in curses lib"))) 
++PKG_CHECK_MODULES(ncurses,ncurses,
++	LIBS="$LIBS $ncurses_LIBS"
++	AC_DEFINE(HAVE_NCURSES, 1, [Define if we have ncurses])
++	AC_DEFINE(HAVE_NCURSES_COLOR, 1, [We want color])
++	color_support="yes"; ncurses_support="yes"
++	,AC_MSG_ERROR([ncurses not found]))
+ 
+ # disable color support on Solaris for now
+ if test ${OSTYPE} = "solaris" ; then
diff --git a/net-analyzer/slurm/files/slurm-0.3.3-overflow.patch b/net-analyzer/slurm/files/slurm-0.3.3-overflow.patch
new file mode 100644
index 000000000000..f9adc1d9bf71
--- /dev/null
+++ b/net-analyzer/slurm/files/slurm-0.3.3-overflow.patch
@@ -0,0 +1,17 @@
+--- a/src/linux.c
++++ b/src/linux.c
+@@ -68,11 +68,11 @@
+ 
+     /* do not parse the first two lines as they only contain static garbage */
+     fseek(proc_net_dev, 0, SEEK_SET);
+-    fgets(buffer, BUFSIZ-1, proc_net_dev);
+-    fgets(buffer, BUFSIZ-1, proc_net_dev);
++    fgets(buffer, BUFSIZE-1, proc_net_dev);
++    fgets(buffer, BUFSIZE-1, proc_net_dev);
+ 
+     interfacefound = 0;
+-    while (fgets(buffer, BUFSIZ-1, proc_net_dev) != NULL)
++    while (fgets(buffer, BUFSIZE-1, proc_net_dev) != NULL)
+     {
+         /* find the device name and substitute ':' with '\0' */
+         ptr = buffer;
diff --git a/net-analyzer/slurm/files/slurm-0.3.3-theme.patch b/net-analyzer/slurm/files/slurm-0.3.3-theme.patch
new file mode 100644
index 000000000000..131554ee57f7
--- /dev/null
+++ b/net-analyzer/slurm/files/slurm-0.3.3-theme.patch
@@ -0,0 +1,16 @@
+--- a/theme.c
++++ b/theme.c
+@@ -70,13 +70,7 @@
+ 		if ((f = fopen(filename, "r")) == NULL)
+ 		{
+ 			bzero(&filename, BUFSIZ);
+-#ifdef __NetBSD__
+-			snprintf(filename, BUFSIZ, "/usr/pkg/share/slurm/%s.theme", name);
+-#elif __Debian__
+ 			snprintf(filename, BUFSIZ, "/usr/share/slurm/%s.theme", name);
+-#else
+-			snprintf(filename, BUFSIZ, "/usr/local/share/slurm/%s.theme", name);
+-#endif
+ 			if ((f = fopen(filename, "r")) == NULL)
+ 				error(ERR_FATAL, "cannot find theme '%s'", name);
+ 		}
diff --git a/net-analyzer/slurm/files/slurm-0.4.3-tinfo.patch b/net-analyzer/slurm/files/slurm-0.4.3-tinfo.patch
new file mode 100644
index 000000000000..c1a1233f177b
--- /dev/null
+++ b/net-analyzer/slurm/files/slurm-0.4.3-tinfo.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,7 +25,7 @@
+ 
+ add_executable(slurm ${SLURM_SOURCES})
+ 
+-target_link_libraries(slurm ncurses)
++target_link_libraries(slurm ${CURSES_LIBRARY} ${CURSES_EXTRA_LIBRARY})
+ 
+ # install
+ install(TARGETS slurm DESTINATION bin)
diff --git a/net-analyzer/slurm/files/slurm-0.4.3-version.patch b/net-analyzer/slurm/files/slurm-0.4.3-version.patch
new file mode 100644
index 000000000000..2266cad19356
--- /dev/null
+++ b/net-analyzer/slurm/files/slurm-0.4.3-version.patch
@@ -0,0 +1,7 @@
+--- a/config.h
++++ b/config.h
+@@ -1,2 +1,2 @@
+-#define PACKAGE_VERSION "0.4.3+git"
+-#define VERSION "0.4.3+git"
++#define PACKAGE_VERSION "0.4.3"
++#define VERSION "0.4.3"
diff --git a/net-analyzer/slurm/metadata.xml b/net-analyzer/slurm/metadata.xml
new file mode 100644
index 000000000000..7312d8a52540
--- /dev/null
+++ b/net-analyzer/slurm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mattthias/slurm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/slurm/slurm-0.3.3-r2.ebuild b/net-analyzer/slurm/slurm-0.3.3-r2.ebuild
new file mode 100644
index 000000000000..b8f2e06dde3e
--- /dev/null
+++ b/net-analyzer/slurm/slurm-0.3.3-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Realtime network interface monitor based on FreeBSD's pppstatus"
+HOMEPAGE="http://www.wormulon.net/projects/slurm"
+SRC_URI="http://www.wormulon.net/files/code/slurm/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-overflow.patch \
+		"${FILESDIR}"/${P}-theme.patch
+	eautoreconf
+}
+
+src_install() {
+	dobin slurm
+
+	insinto /usr/share/${PN}
+	doins themes/*.theme
+
+	doman slurm.1
+	dodoc AUTHORS ChangeLog FAQ KEYS README THANKS THEMES.txt TODO
+}
diff --git a/net-analyzer/slurm/slurm-0.4.3.ebuild b/net-analyzer/slurm/slurm-0.4.3.ebuild
new file mode 100644
index 000000000000..91c9d7933c20
--- /dev/null
+++ b/net-analyzer/slurm/slurm-0.4.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="Realtime network interface monitor based on FreeBSD's pppstatus"
+HOMEPAGE="https://github.com/mattthias/slurm"
+SRC_URI="${HOMEPAGE}/archive/upstream/${PN}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	sys-libs/ncurses:*
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.3-overflow.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+	"${FILESDIR}"/${P}-version.patch
+)
+DOCS=(
+	AUTHORS
+	ChangeLog
+	FAQ
+	KEYS
+	README
+	THANKS
+	THEMES.txt
+	TODO
+)
+
+S=${WORKDIR}/${PN}-upstream
diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest
new file mode 100644
index 000000000000..3692d8afee53
--- /dev/null
+++ b/net-analyzer/smokeping/Manifest
@@ -0,0 +1,15 @@
+AUX 79_smokeping.conf 351 SHA256 fa4c48387598f8c6e60b7642e4284bb64196dcd233cea9f18ff37009b212ff77 SHA512 d53abdf29e8f6bad67a654b17088c3f8dee7908ff82b0b911599e2ac6a11be84b8fa2c30b1f0b6142803ff9a5058f586946eafa112dfd26ca4f8f8664d19cfc6 WHIRLPOOL 907eff72a390aa36c7be80fb39f2204238ec8daa13f07d9b189401374cf4cc2cdf6df2842f8d0e9096bcd87670190b673d1bfa05adcca5ad0266b99d1bd79586
+AUX smokeping-2.6.9-pod.patch 482 SHA256 e7570295fa67403acf48b11c9e993bd667db6c6ed2d1a0c6af8e0217470fba56 SHA512 3744f97a8f817c7b9d5da4fe130377658d74ac1be78a00dbc39b501716fc2d6b9fb2188f9ff3c57da5c36b6761e9099d0ef85a7600174de8fda01a8898274b71 WHIRLPOOL ebf22388c29c84cbb90f2b97705c78a89a4dc5041a2f3663083347717047621767e04fdd78164dbefe05e8ee85f258025a85f2a7455df4fc704a81c3c0258e08
+AUX smokeping.conf 32 SHA256 aa672ff60f18cfa311ee3303fb824d390dc44ffd4b309e34235242b4c3de7ac7 SHA512 75863f16f8b57ca9ae7c7d65076acaf28aac66fa2d52ed78bce2bb3a4938dc75a1e8ed54236c52c3965b170a8348145780dd5c0f3d0fc8c95f4b88085252a4ef WHIRLPOOL 233839d651258edbd74377e39d87c238e4e6e8aabfe60b7edb4ad6bb746f57bec7f6fce1e1123119e0349a27d584e7991765fc4f5a9c5376ef54bbce41cac2e8
+AUX smokeping.init.3 1737 SHA256 244cd53c0a6b828c4eb89a4239de9c2efda237ff2494eaada78afee68e3c950d SHA512 87386971b42bf842c6cf59f641576cfcfd7439fe9f10139730b0c73acea610945d634d3effc3a5db793a71e2e625b49184a02813cbf34473dd94ac4a3931ed67 WHIRLPOOL 502279ee1823a6c4a3badf3c1ae16b95f60bc822528e35ddc53e7e78cdea5a726a142ee38443d796781754a4e3ead5e341d6e309fd40c95b5d10355831b5e9ea
+AUX smokeping.init.4 1757 SHA256 0ada5910f77ac86e8eb126a1bb1f163fa67a9bd4638d6d1d44936575793d133c SHA512 5e32a248899d79ea112595591bd9457c073c8276d8bb124b4f765bc9654bd5dac36866344c8c444c98ba4cde32829d7092067e73db5bd3c38ca75f7679a875f1 WHIRLPOOL b014b82f6fcf59f246e107a074a059116e139978303086258b42786e0b8224838c2e4d42f4783be41c5426ec38a09659ce9ab7d9a04a2174d754264571135578
+AUX smokeping.service 200 SHA256 976a0bc33a30a3524cbf2b2de0641a28e53d0546695c41b5f323f8d96899dcaa SHA512 2f8824143b8283ad02274107c5ed0e84f0c1465fc089823e36ef44a42fec68564d8cc4ff5fb0ad6dc0443e21fac5a8cbcbb0a9bea151b57efaff2a082d15f344 WHIRLPOOL f3899165b71854dc96f5ea6b5f8c17c86ab9dd06faa8ed01abb052a6e647886855102f1d56d47698c7579f22b89fd8948a2684bb23ea4963e4ab99ca4735fee0
+DIST smokeping-2.6.10.tar.gz 415383 SHA256 0121672951f47bd45575898c3e4d767e22cc692dd272d723b422515fd3cc641c SHA512 e91ac80ceafccb945ec48cc80020b8cbf2afe29b5f422dc5aaf7c52387eafc498180c293cf82dccc4fdec88ec56f80fb1bd08ebcb2ae9aea563475a069b91f13 WHIRLPOOL dc2b75b694ffb93d777f4a97e6f3f26c898741eb67f19d9b6ebb3dcb1d3688422cb4756c2f969e858ad89e98d4278c2995abc39927b2615a249efd1f02b733aa
+DIST smokeping-2.6.11.tar.gz 417338 SHA256 f2b3c386e95a74af2b1e7aec6410d0a58852339f00e9963f3c770cfd85ba30dd SHA512 928722832d6e01ffbb7b74542678f7b9d5fc22819c0feae164ce58b8d8a5595800f617c8a672e07cae4b2c4ccbfa4883a11438ba2a172fc2887abc2933388422 WHIRLPOOL e7c0dc3fd5fe1e66b9a8f70584bb2973a807990ad2e7cec50951294e794f67e60e88b39ec52adfe0e92e80e9d11e899fcb5b0bef7fc67d5e271f10c5ba44dc56
+DIST smokeping-2.6.9.tar.gz 427185 SHA256 cd551d4384d8b19879d128ea0566bd680c19bb4ad8664a3c5a304604746f8863 SHA512 ab3cec15fd9f90510f902da7ce5bac5915558cac198cc88f0ce193a53a0158c9055e28c8c6671cc6653ac42ab51346e1eb19e537f1ab5c234fd498c6b777499d WHIRLPOOL e3a47ed5222798f69f5b957cea5a0404fc1f58675678bd82f93d39085f5a029de2b71974ad245e4de0454d7f689a199f2a2134abbc1ac6ed8e042835c14d3f57
+EBUILD smokeping-2.6.10.ebuild 4097 SHA256 871f37417c865f8ff8e12da4636002b9fa4324c3ea3eebbf3c17a8a9faa6f859 SHA512 558151d2d8df9aa4b7c6a6d9f808d161980d79f821dda20c5c8b712af0a1b4e19bd42222a728f96a2b8bf09f00dd47bbc6b03036a39d86df886c58d4a3b71293 WHIRLPOOL 879cad0fe5125ef6ec83287abb59528375be68efc91404c169063c02deb49c0bc7ca146e42bb92a23b0c646e7e04616dbe1ee6fcb19949e57029774d840af110
+EBUILD smokeping-2.6.11.ebuild 4083 SHA256 a0cfae5fac369abb43d110f5401e58d3308d0062257e567661f2d0ba642dbdb7 SHA512 b4273d70038f29fc2bd6b9a6a15b94d5662dd5b2a541748077ddbd61672efe1fc27de72ad9c60f2529ba0eb7fb1c6ff43679e5513a205a8e0e1569140ad84a1d WHIRLPOOL ee06ad0676ec98fa1fe71caeca6b061d56b96b69d4ee45d1b98a5a0acdaaacf296f76f62fa7a6e44810bbdde6182e3d92a53f3ef7756b188431d8cee977cd148
+EBUILD smokeping-2.6.9.ebuild 4192 SHA256 e4aedb666282e80a618a5b07f040e55f0e2fa3563c68ce069105af46b18b616b SHA512 a001ba30d3eeaed299f28b139573fa4eff0a170500beedb0782a94e5bd970b5421162ed7476ceec407b3e19ce7210e3d8af0d01dff2a98cd1f02c59e8ce7b402 WHIRLPOOL a74d7af6c269b36e3f8fce4e7fcd784983ca8e8924dcc5bf9a4991af11e769f43d5cd93ed0a477dcfa7e5701da8bcba58b9d9d633d88373ed9e148ed5c3a9b2e
+MISC ChangeLog 3395 SHA256 d839b2df807159880e73c03721ac78d0d8269affad9db3b076374aab93415da0 SHA512 4098f9d531d0c4c3156bf8530bc24a09c8f48266c13d826ee269de3f5fcf793223140c5f7389bbe015d597cb416450ba22358997dadff4311c95afe9887e71e4 WHIRLPOOL ab3e57d3a0b99d66b8edac698b32f314bf48582c97be28ab5a4d3262bdba88bb748ac7cecd8754ab757e55e2ff3cec1016229ccc615fe9c3f5466caf41eae009
+MISC ChangeLog-2015 9410 SHA256 7775a4d1aeab57a878a48a53af964fdd7ebd32e931b325adf6520de3be6211ac SHA512 8cfc0d6d64a1ca5d6b2c81faa71060ad56184dbd1c42ed9328755995d88e3bbcdc5f72fa36c253ecd87e068f0b27010e226fe559ee4b227c037dffa4aaa31039 WHIRLPOOL a48a8dda2412976964fe309347129ef77e9736e194548426584cfe0f92284de4e12c99608eb7279339e19b5fd9c666ee42fc3f3f8e022af25b992513f2e8145a
+MISC metadata.xml 609 SHA256 c966750061e8af4130d313cd311cd048a627739f57318c8bb70958d30832d9e5 SHA512 cd5bbbf1af0cadf236c3385628a1392c2e5379958e4f002d71230ed9e7627989cfdee7e0a9fd584f94c4c29bb1756f9ade81df0888f4668f9b3a8ab9e31bf727 WHIRLPOOL 095bab49308cf85c9d204302d09ea4da71c2cd553cee2146de10a1835d0c42774ef958973e9cc87537e9b0eade80514ff4e21313919c50c8a06ccb2c763bb191
diff --git a/net-analyzer/smokeping/files/79_smokeping.conf b/net-analyzer/smokeping/files/79_smokeping.conf
new file mode 100644
index 000000000000..1e9361ba501a
--- /dev/null
+++ b/net-analyzer/smokeping/files/79_smokeping.conf
@@ -0,0 +1,15 @@
+###
+### Setup the smokeping image cache and perl cgi script
+###
+<IfModule mod_alias.c>
+	Alias "/.simg/" "/var/lib/smokeping/.simg/"
+	<IfModule mod_perl.c>
+		<Directory "/var/lib/smokeping/.simg/">
+			Options -Indexes MultiViews
+			AllowOverride None
+			Order deny,allow
+			Deny from all
+			Allow from 127.0.0.1
+		</Directory>
+	</IfModule>
+</IfModule>
diff --git a/net-analyzer/smokeping/files/smokeping-2.6.9-pod.patch b/net-analyzer/smokeping/files/smokeping-2.6.9-pod.patch
new file mode 100644
index 000000000000..81a1e053b4f8
--- /dev/null
+++ b/net-analyzer/smokeping/files/smokeping-2.6.9-pod.patch
@@ -0,0 +1,11 @@
+--- a/lib/Smokeping.pm
++++ b/lib/Smokeping.pm
+@@ -2631,7 +2631,7 @@
+ The base directory where SmokePing keeps the files related to the DYNAMIC function.
+ This directory must be writeable by the WWW server. It is also used for temporary
+ storage of slave polling results by the master in 
+-L<the master/slave mode|smokeping_master_slave>.
++L<the masterE<sol>slave mode|smokeping_master_slave>.
+ 
+ If this variable is not specified, the value of C<datadir> will be used instead.
+ DOC
diff --git a/net-analyzer/smokeping/files/smokeping.conf b/net-analyzer/smokeping/files/smokeping.conf
new file mode 100644
index 000000000000..729726316fbd
--- /dev/null
+++ b/net-analyzer/smokeping/files/smokeping.conf
@@ -0,0 +1 @@
+d /run/smokeping	0755	root	root
diff --git a/net-analyzer/smokeping/files/smokeping.init.3 b/net-analyzer/smokeping/files/smokeping.init.3
new file mode 100644
index 000000000000..2e5e35795b91
--- /dev/null
+++ b/net-analyzer/smokeping/files/smokeping.init.3
@@ -0,0 +1,77 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="${opts} dump reload restore"
+
+depend() {
+	need net
+	use dns
+}
+
+checkconfig() {
+	if [ ! -f "/etc/smokeping/config" ] ; then
+		eerror "You need /etc/smokeping/config to run smokeping!"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+
+	if [ ! -d /run/smokeping/ ]; then
+		mkdir /run/smokeping/
+	fi
+	chown smokeping:smokeping /run/smokeping/
+
+	ebegin "Starting smokeping"
+	LC_ALL=C \
+	start-stop-daemon --start --name smokeping \
+		--pidfile /run/smokeping/smokeping.pid \
+		--exec /usr/bin/smokeping \
+		--user smokeping:smokeping
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping smokeping"
+	start-stop-daemon --stop \
+		--pidfile /run/smokeping/smokeping.pid
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading smokeping"
+	/usr/bin/smokeping --reload 1>/dev/null 2>&1
+	eend $?
+}
+
+dump() {
+	ebegin "Dumping smokeping rrd files to XML for backup or upgrade use"
+	if service_started "${myservice}" ; then
+		eerror "You need to stop smokeping before dumping files!"
+		return 1
+	fi
+	for f in `find /var/lib/smokeping -name '*.rrd' -print` ; do
+		f_xml=`dirname $f`/`basename $f .rrd`.xml
+		rrdtool dump "$f" > "${f_xml}"
+		chown root:0 "${f_xml}"
+	done
+	eend $?
+}
+
+restore() {
+	ebegin "Restoring smokeping rrd files from XML dump files"
+	if service_started "${myservice}" ; then
+		eerror "You need to stop smokeping before restoring files!"
+		return 1
+	fi
+	for f in `find /var/lib/smokeping -name '*.xml' -print` ; do
+		f_rrd=`dirname $f`/`basename $f .xml`.rrd
+		mv -f "${f_rrd}" "${f_rrd}.bak"
+		chown root:0 "${f_rrd}.bak"
+		rrdtool restore "$f" "${f_rrd}"
+		chown smokeping:smokeping "${f_rrd}"
+	done
+	eend $?
+}
diff --git a/net-analyzer/smokeping/files/smokeping.init.4 b/net-analyzer/smokeping/files/smokeping.init.4
new file mode 100644
index 000000000000..2e38a60ed636
--- /dev/null
+++ b/net-analyzer/smokeping/files/smokeping.init.4
@@ -0,0 +1,75 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="${opts} dump reload restore"
+
+depend() {
+	need net
+	use dns
+}
+
+checkconfig() {
+	if [ ! -f "/etc/smokeping/config" ] ; then
+		eerror "You need /etc/smokeping/config to run smokeping!"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+
+	checkpath -d -m 0755 -o smokeping:smokeping /run/smokeping
+	checkpath -d -m 0755 -o smokeping:smokeping /var/cache/smokeping
+
+	ebegin "Starting smokeping"
+	LC_ALL=C \
+	start-stop-daemon --start --name smokeping \
+		--pidfile /run/smokeping/smokeping.pid \
+		--exec /usr/bin/smokeping \
+		--user smokeping:smokeping
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping smokeping"
+	start-stop-daemon --stop \
+		--pidfile /run/smokeping/smokeping.pid
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading smokeping"
+	/usr/bin/smokeping --reload 1>/dev/null 2>&1
+	eend $?
+}
+
+dump() {
+	ebegin "Dumping smokeping rrd files to XML for backup or upgrade use"
+	if service_started "${myservice}" ; then
+		eerror "You need to stop smokeping before dumping files!"
+		return 1
+	fi
+	for f in `find /var/lib/smokeping -name '*.rrd' -print` ; do
+		f_xml=`dirname $f`/`basename $f .rrd`.xml
+		rrdtool dump "$f" > "${f_xml}"
+		chown root:0 "${f_xml}"
+	done
+	eend $?
+}
+
+restore() {
+	ebegin "Restoring smokeping rrd files from XML dump files"
+	if service_started "${myservice}" ; then
+		eerror "You need to stop smokeping before restoring files!"
+		return 1
+	fi
+	for f in `find /var/lib/smokeping -name '*.xml' -print` ; do
+		f_rrd=`dirname $f`/`basename $f .xml`.rrd
+		mv -f "${f_rrd}" "${f_rrd}.bak"
+		chown root:0 "${f_rrd}.bak"
+		rrdtool restore "$f" "${f_rrd}"
+		chown smokeping:smokeping "${f_rrd}"
+	done
+	eend $?
+}
diff --git a/net-analyzer/smokeping/files/smokeping.service b/net-analyzer/smokeping/files/smokeping.service
new file mode 100644
index 000000000000..2130aca23627
--- /dev/null
+++ b/net-analyzer/smokeping/files/smokeping.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Latency Logging and Graphing System
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/smokeping --nodaemon
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-analyzer/smokeping/metadata.xml b/net-analyzer/smokeping/metadata.xml
new file mode 100644
index 000000000000..e445720edf9f
--- /dev/null
+++ b/net-analyzer/smokeping/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<use>
+<flag name="dig">Install <pkg>net-dns/bind-tools</pkg> for dig functionality</flag>
+<flag name="echoping">Install <pkg>net-analyzer/echoping</pkg> for echoping functionality</flag>
+<flag name="telnet">Install <pkg>dev-perl/Net-Telnet</pkg> for telnet functionality</flag>
+<flag name="ssh">Install ssh functionality</flag>
+</use>
+</pkgmetadata>
diff --git a/net-analyzer/smokeping/smokeping-2.6.10.ebuild b/net-analyzer/smokeping/smokeping-2.6.10.ebuild
new file mode 100644
index 000000000000..cc533d1bb997
--- /dev/null
+++ b/net-analyzer/smokeping/smokeping-2.6.10.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils user systemd
+
+DESCRIPTION="A powerful latency measurement tool"
+HOMEPAGE="http://oss.oetiker.ch/smokeping/"
+SRC_URI="http://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# dropping hppa and sparc because of way too may dependencies not having
+# keywords in those architectures.
+KEYWORDS="~amd64 ~x86"
+
+# removing fcgi useflag as the configure script can't avoid it without patching
+IUSE="apache2 curl dig echoping ipv6 ldap radius ssh telnet"
+
+DEPEND="
+	!apache2? ( virtual/httpd-cgi )
+	apache2? (
+		>=www-apache/mod_perl-2.0.1
+		www-apache/mod_fcgid
+	)
+	curl? ( >=net-misc/curl-7.21.4 )
+	dig? ( net-dns/bind-tools )
+	echoping? ( >=net-analyzer/echoping-6.0.2 )
+	ipv6? ( >=dev-perl/Socket6-0.20 )
+	ldap? ( dev-perl/perl-ldap )
+	radius? ( dev-perl/RadiusPerl )
+	ssh? ( dev-perl/Net-OpenSSH )
+	telnet? ( dev-perl/Net-Telnet )
+	|| ( dev-perl/CGI-Fast <dev-perl/CGI-4 )
+	>=dev-lang/perl-5.8.8-r8
+	>=dev-perl/SNMP_Session-1.13
+	>=net-analyzer/fping-2.4_beta2-r2[suid]
+	>=net-analyzer/rrdtool-1.2[graph,perl]
+	dev-perl/CGI-Session
+	dev-perl/Config-Grammar
+	dev-perl/Digest-HMAC
+	dev-perl/FCGI
+	dev-perl/IO-Socket-SSL
+	dev-perl/Net-DNS
+	dev-perl/libwww-perl
+	virtual/perl-libnet
+"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup smokeping
+	enewuser smokeping -1 -1 /var/lib/smokeping smokeping
+}
+
+src_prepare() {
+	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} # dev-perl/SNMP_Session
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/smokeping \
+		--with-htdocs-dir=/var/www/localhost/smokeping
+}
+
+src_compile() {
+	LC_ALL=C emake
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.init.4 ${PN}
+	systemd_dotmpfilesd "${FILESDIR}"/"${PN}".conf
+	systemd_dounit "${FILESDIR}"/"${PN}".service
+
+	mv "${D}/etc/smokeping/basepage.html.dist" "${D}/etc/smokeping/basepage.html"
+	mv "${D}/etc/smokeping/config.dist" "${D}/etc/smokeping/config"
+	mv "${D}/etc/smokeping/smokemail.dist" "${D}/etc/smokeping/smokemail"
+	mv "${D}/etc/smokeping/smokeping_secrets.dist" "${D}/etc/smokeping/smokeping_secrets"
+	mv "${D}/etc/smokeping/tmail.dist" "${D}/etc/smokeping/tmail"
+
+	sed -i \
+		-e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \
+		-e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \
+		-e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \
+		-e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /run/smokeping:}' \
+	    -e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \
+		-e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \
+		-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
+		-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \
+		-e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \
+		"${D}/etc/${PN}/config" || die
+
+	sed -i \
+		-e '/^<script/{s:cropper/:/cropper/:}' \
+		"${D}/etc/${PN}/basepage.html" || die
+
+	sed -i \
+		-e 's/$FindBin::Bin\/..\/etc\/config/\/etc\/smokeping\/config/g' \
+		"${D}/usr/bin/smokeping" "${D}/usr/bin/smokeping_cgi" || die
+
+	sed -i \
+		-e 's:etc/config.dist:/etc/smokeping/config:' \
+		"${D}/usr/bin/tSmoke" || die
+
+	sed -i \
+		-e 's:/usr/etc/config:/etc/smokeping/config:' \
+		"${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die
+
+	dodir /var/www/localhost/cgi-bin
+		mv "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" \
+		"${D}/var/www/localhost/cgi-bin/smokeping.fcgi"
+
+	fperms 700 /etc/${PN}/smokeping_secrets
+
+	if use apache2 ; then
+		insinto /etc/apache2/modules.d
+		doins "${FILESDIR}/79_${PN}.conf"
+	fi
+
+	# Create the files in /var for rrd file storage
+	keepdir /var/lib/${PN}/.simg
+	fowners smokeping:smokeping /var/lib/${PN}
+
+	if use apache2 ; then
+		fowners apache:apache /var/lib/${PN}/.simg
+		fowners -R apache:apache /var/www
+	else
+		fowners smokeping:smokeping /var/lib/${PN}/.simg
+	fi
+
+	fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg
+}
+
+pkg_postinst() {
+	chown smokeping:smokeping "${ROOT}/var/lib/${PN}"
+	chmod 755 "${ROOT}/var/lib/${PN}"
+}
diff --git a/net-analyzer/smokeping/smokeping-2.6.11.ebuild b/net-analyzer/smokeping/smokeping-2.6.11.ebuild
new file mode 100644
index 000000000000..6a253fbb7b73
--- /dev/null
+++ b/net-analyzer/smokeping/smokeping-2.6.11.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils user systemd
+
+DESCRIPTION="A powerful latency measurement tool"
+HOMEPAGE="http://oss.oetiker.ch/smokeping/"
+SRC_URI="http://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# dropping hppa and sparc because of way too may dependencies not having
+# keywords in those architectures.
+KEYWORDS="~amd64 ~x86"
+
+# removing fcgi useflag as the configure script can't avoid it without patching
+IUSE="apache2 curl dig echoping ipv6 radius"
+
+DEPEND="
+	>=dev-lang/perl-5.8.8-r8
+	>=dev-perl/SNMP_Session-1.13
+	>=net-analyzer/fping-2.4_beta2-r2[suid]
+	>=net-analyzer/rrdtool-1.2[graph,perl]
+	dev-perl/CGI-Session
+	dev-perl/Config-Grammar
+	dev-perl/Digest-HMAC
+	dev-perl/FCGI
+	dev-perl/IO-Socket-SSL
+	dev-perl/IO-Tty
+	dev-perl/Net-DNS
+	dev-perl/Net-OpenSSH
+	dev-perl/Net-SNMP
+	dev-perl/Net-Telnet
+	dev-perl/libwww-perl
+	dev-perl/perl-ldap
+	virtual/perl-libnet
+	|| ( dev-perl/CGI-Fast <dev-perl/CGI-4 )
+	!apache2? ( virtual/httpd-cgi )
+	apache2? (
+		>=www-apache/mod_perl-2.0.1
+		www-apache/mod_fcgid
+	)
+	curl? ( >=net-misc/curl-7.21.4 )
+	dig? ( net-dns/bind-tools )
+	echoping? ( >=net-analyzer/echoping-6.0.2 )
+	ipv6? ( >=dev-perl/Socket6-0.20 )
+	radius? ( dev-perl/RadiusPerl )
+"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup smokeping
+	enewuser smokeping -1 -1 /var/lib/smokeping smokeping
+}
+
+src_prepare() {
+	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} # dev-perl/SNMP_Session
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/smokeping \
+		--with-htdocs-dir=/var/www/localhost/smokeping
+}
+
+src_compile() {
+	LC_ALL=C emake
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.init.4 ${PN}
+	systemd_dotmpfilesd "${FILESDIR}"/"${PN}".conf
+	systemd_dounit "${FILESDIR}"/"${PN}".service
+
+	mv "${D}/etc/smokeping/basepage.html.dist" "${D}/etc/smokeping/basepage.html"
+	mv "${D}/etc/smokeping/config.dist" "${D}/etc/smokeping/config"
+	mv "${D}/etc/smokeping/smokemail.dist" "${D}/etc/smokeping/smokemail"
+	mv "${D}/etc/smokeping/smokeping_secrets.dist" "${D}/etc/smokeping/smokeping_secrets"
+	mv "${D}/etc/smokeping/tmail.dist" "${D}/etc/smokeping/tmail"
+
+	sed -i \
+		-e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \
+		-e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \
+		-e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \
+		-e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /run/smokeping:}' \
+		-e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \
+		-e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \
+		-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
+		-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \
+		-e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \
+		"${D}/etc/${PN}/config" || die
+
+	sed -i \
+		-e '/^<script/{s:cropper/:/cropper/:}' \
+		"${D}/etc/${PN}/basepage.html" || die
+
+	sed -i \
+		-e 's/$FindBin::Bin\/..\/etc\/config/\/etc\/smokeping\/config/g' \
+		"${D}/usr/bin/smokeping" "${D}/usr/bin/smokeping_cgi" || die
+
+	sed -i \
+		-e 's:etc/config.dist:/etc/smokeping/config:' \
+		"${D}/usr/bin/tSmoke" || die
+
+	sed -i \
+		-e 's:/usr/etc/config:/etc/smokeping/config:' \
+		"${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die
+
+	dodir /var/www/localhost/cgi-bin
+		mv "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" \
+		"${D}/var/www/localhost/cgi-bin/smokeping.fcgi"
+
+	fperms 700 /etc/${PN}/smokeping_secrets
+
+	if use apache2 ; then
+		insinto /etc/apache2/modules.d
+		doins "${FILESDIR}/79_${PN}.conf"
+	fi
+
+	# Create the files in /var for rrd file storage
+	keepdir /var/lib/${PN}/.simg
+	fowners smokeping:smokeping /var/lib/${PN}
+
+	if use apache2 ; then
+		fowners apache:apache /var/lib/${PN}/.simg
+		fowners -R apache:apache /var/www
+	else
+		fowners smokeping:smokeping /var/lib/${PN}/.simg
+	fi
+
+	fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg
+}
+
+pkg_postinst() {
+	chown smokeping:smokeping "${ROOT}/var/lib/${PN}"
+	chmod 755 "${ROOT}/var/lib/${PN}"
+}
diff --git a/net-analyzer/smokeping/smokeping-2.6.9.ebuild b/net-analyzer/smokeping/smokeping-2.6.9.ebuild
new file mode 100644
index 000000000000..096133b50eab
--- /dev/null
+++ b/net-analyzer/smokeping/smokeping-2.6.9.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils user systemd
+
+DESCRIPTION="A powerful latency measurement tool"
+HOMEPAGE="http://oss.oetiker.ch/smokeping/"
+SRC_URI="http://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# dropping hppa and sparc because of way too may dependencies not having
+# keywords in those architectures.
+KEYWORDS="amd64 x86"
+
+# removing fcgi useflag as the configure script can't avoid it without patching
+IUSE="apache2 curl dig echoping ipv6 ldap radius ssh telnet"
+
+DEPEND="
+	!apache2? ( virtual/httpd-cgi )
+	apache2? (
+		>=www-apache/mod_perl-2.0.1
+		www-apache/mod_fcgid
+	)
+	curl? ( >=net-misc/curl-7.21.4 )
+	dig? ( net-dns/bind-tools )
+	echoping? ( >=net-analyzer/echoping-6.0.2 )
+	ipv6? ( >=dev-perl/Socket6-0.20 )
+	ldap? ( dev-perl/perl-ldap )
+	radius? ( dev-perl/RadiusPerl )
+	ssh? ( dev-perl/Net-OpenSSH )
+	telnet? ( dev-perl/Net-Telnet )
+	|| ( dev-perl/CGI-Fast <dev-perl/CGI-4 )
+	>=dev-lang/perl-5.8.8-r8
+	>=dev-perl/SNMP_Session-1.13
+	>=net-analyzer/fping-2.4_beta2-r2[suid]
+	>=net-analyzer/rrdtool-1.2[graph,perl]
+	dev-perl/CGI-Session
+	dev-perl/Config-Grammar
+	dev-perl/Digest-HMAC
+	dev-perl/FCGI
+	dev-perl/IO-Socket-SSL
+	dev-perl/Net-DNS
+	dev-perl/libwww-perl
+	virtual/perl-libnet
+"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup smokeping
+	enewuser smokeping -1 -1 /var/lib/smokeping smokeping
+}
+
+src_prepare() {
+	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} # dev-perl/SNMP_Session
+
+	epatch "${FILESDIR}"/${P}-pod.patch
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/smokeping \
+		--with-htdocs-dir=/var/www/localhost/smokeping
+}
+
+src_compile() {
+	LC_ALL=C emake
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/${PN}.init.3" ${PN}
+	systemd_dotmpfilesd "${FILESDIR}"/"${PN}".conf
+	systemd_dounit "${FILESDIR}"/"${PN}".service
+
+	mv "${D}/etc/smokeping/basepage.html.dist" "${D}/etc/smokeping/basepage.html"
+	mv "${D}/etc/smokeping/config.dist" "${D}/etc/smokeping/config"
+	mv "${D}/etc/smokeping/smokemail.dist" "${D}/etc/smokeping/smokemail"
+	mv "${D}/etc/smokeping/smokeping_secrets.dist" "${D}/etc/smokeping/smokeping_secrets"
+	mv "${D}/etc/smokeping/tmail.dist" "${D}/etc/smokeping/tmail"
+
+	sed -i \
+		-e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \
+		-e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \
+		-e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \
+		-e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /run/smokeping:}' \
+	    -e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \
+		-e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \
+		-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
+		-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \
+		-e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \
+		"${D}/etc/${PN}/config" || die
+
+	sed -i \
+		-e '/^<script/{s:cropper/:/cropper/:}' \
+		"${D}/etc/${PN}/basepage.html" || die
+
+	sed -i \
+		-e 's/$FindBin::Bin\/..\/etc\/config/\/etc\/smokeping\/config/g' \
+		"${D}/usr/bin/smokeping" "${D}/usr/bin/smokeping_cgi" || die
+
+	sed -i \
+		-e 's:etc/config.dist:/etc/smokeping/config:' \
+		"${D}/usr/bin/tSmoke" || die
+
+	sed -i \
+		-e 's:/usr/etc/config:/etc/smokeping/config:' \
+		"${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die
+
+	dodir /var/www/localhost/cgi-bin
+		mv "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" \
+		"${D}/var/www/localhost/cgi-bin/smokeping.fcgi"
+
+	fperms 700 /etc/${PN}/smokeping_secrets
+
+	if use apache2 ; then
+		insinto /etc/apache2/modules.d
+		doins "${FILESDIR}/79_${PN}.conf"
+	fi
+
+	dodir /var/cache/smokeping
+	keepdir /var/cache/smokeping
+
+	# Create the files in /var for rrd file storage
+	keepdir /var/lib/${PN}/.simg
+	fowners smokeping:smokeping /var/lib/${PN}
+
+	if use apache2 ; then
+		fowners apache:apache /var/lib/${PN}/.simg
+		fowners -R apache:apache /var/www
+	else
+		fowners smokeping:smokeping /var/lib/${PN}/.simg
+	fi
+
+	fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg
+}
+
+pkg_postinst() {
+	chown smokeping:smokeping "${ROOT}/var/lib/${PN}"
+	chmod 755 "${ROOT}/var/lib/${PN}"
+}
diff --git a/net-analyzer/sniffit/Manifest b/net-analyzer/sniffit/Manifest
new file mode 100644
index 000000000000..56734a0616e6
--- /dev/null
+++ b/net-analyzer/sniffit/Manifest
@@ -0,0 +1,8 @@
+AUX sniffit-0.3.7-gentoo.patch 1164 SHA256 512f6a3b4b5da6169253a609b3d459fdb833b064d0f0c218f918bbb363c6a90c SHA512 e71684e0be70228c347fe61afdee7e6bf0f116b0ecb603ed4dd6838f457b5b480092ac735297ce64f84f9c8858b5b11d7a1e746c0790380fbf6f7cf8d9875865 WHIRLPOOL d4f674be3fec37861857af5f8ae07bd3a8da3733cd49b13785dbe431f58053596b8517ae8a6d6e6619f5198271b9027ba5d772db92391696c20ee07e280f3cc9
+AUX sniffit-0.3.7-misc.patch 2957 SHA256 536299d8b939c11751db2853741d591d8334eebf46d42e4adbf5898d13277213 SHA512 d07298642bab1903c7a93a2b076dcf2cf50a2a5ef5b05e7e9abacaa88cff3089c9028e7721cacbc403b992ad170f64976e83835e441b44e6ac69ee0753e2714e WHIRLPOOL 94dce9cad45c757ddf847b7c4db53fb66fa20c912c7e2b9f92a13e546b60d8ae958fe0a0756b29e307d4582ffa02918d41fe37b11c0300b960f26531304a22b7
+AUX sniffit-0.3.7-tinfo.patch 1063 SHA256 4f966dfb7fdaf78e571f79f11e5948a8eccd543f7ee039da742a37458116a665 SHA512 d4959d6c27928c3d3f85fdfdfb1afd4f7ad24000adb61f565fef68b46b46aba96b61572177db058875dc3a70154223cb620077e6681c8a7f62483e614f8e92c6 WHIRLPOOL 00713ff231028c6064280c9297524cfc979aa186d9b354bb8ff0cfda424ff368469e607d0893b7e7db362ad4ae288d82dedc091d26a1ba87ef2686be14e99022
+DIST sniffit.0.3.7.beta.tar.gz 212419 SHA256 78b5137be45bdff738525dee351908ae0b8a79e2d999e33b34278a4a7fc08ca0 SHA512 b32d1f17d589ee1d1afc7986640a2b9f451cdb26ee2d077db1eaec1bb77ed353bbbb6a79bd25f915b3a40b7a279f9fc7855706150ec3a24f8937a152ac91b8d1 WHIRLPOOL 834c3c6a177851d219bc593fe1ca4052641aa85a610aa76b5bd65bbd47848280bb5c55b74402b96c61bd7fd980e92137c27c324c9c4fc9259e2cf137ab3afd41
+EBUILD sniffit-0.3.7-r4.ebuild 792 SHA256 891a49068b15d19e5097e7912ac2b1688a33e4dce45c1a47389bdaceddf9b049 SHA512 2f44f2881473aa1744c62b68d6eab2f4eebf9470a17a069430bf9c2fdaef1c755de543c42d9153d975cc1bef7a848ae8b78398a56f1400c4d1280d5ddc344d35 WHIRLPOOL 845c400bc627e5c90cd6b6a16fc48aa8a445cee4b2e1b40f12ee49fd1feef893ff8060fd16c07bfd40501adab2fe8d44b21a54cb5f5b23a20ff752a076c8fa03
+MISC ChangeLog 2541 SHA256 5b7628abcfbfa5e9956e9cea597ddd30b2fbfb4dc22295fff282d41763c3f263 SHA512 b95a5ea0962a898d7d9655d4566040a2546509bf7119a02a26a544cce5974d0a974cde7ee1635c0705ba9cf2baceb4e0f9c5c03efcbafc696f9b118fbc86a532 WHIRLPOOL 44dc728d34608ced5872df24b67b09dfedd2366d0fd1156fc96faafe99485b2d00483a9ae5e269967d258e9a9c3394270e0e6be66171e017e93db3fdf375f48a
+MISC ChangeLog-2015 4006 SHA256 774ec7443fb0f6045a4bd10cbe6f88813f9bf6fb2b587eead461384bcd8f7272 SHA512 198c0617a22b20c43483d19e0dc2eb5306d5918e0f99ae1371008952c84fb625465c38614bfa822b9a5f2bcff2bb6b69cf1c504a6203c8970bb0ff4e84c9147d WHIRLPOOL eb7524f6ab73a7e38fb99932585e7538895f2d19d2b06705e07f715313662bc91bb1bbfb59b627757b28fe4046e0f6ad75902f31715dd28f95197f9f27cea2d8
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/sniffit/files/sniffit-0.3.7-gentoo.patch b/net-analyzer/sniffit/files/sniffit-0.3.7-gentoo.patch
new file mode 100644
index 000000000000..c226b6f00d45
--- /dev/null
+++ b/net-analyzer/sniffit/files/sniffit-0.3.7-gentoo.patch
@@ -0,0 +1,31 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -10,13 +10,13 @@
+ LIBS       = @LIBS@
+ DEFS	   = @DEFS@
+ OS_OPT     = @OS_OPT@
+-OBJ_FLAG   = -w -O2 -c
+-OBJ_OPT    = -I./libpcap -L./libpcap
+-EXE_FLAG   = -w -O2 -o sniffit
+-EXE_OPT    = -I./libpcap -L./libpcap -lpcap
++OBJ_FLAG   = $(CFLAGS) -c
++OBJ_OPT    = -I/usr/include/pcap -L/usr/lib
++EXE_FLAG   = $(CFLAGS) $(LDFLAGS) -o sniffit
++EXE_OPT    = -I/usr/include/pcap -lpcap
+ EXE_OBJ    = sn_packets.o sn_generation.o sn_interface.o sn_cfgfile.o \
+              sn_logfile.o sn_resolv.o
+-DEP_FILES  = sn_config.h ./libpcap/pcap.h sn_data.h sn_defines.h sn_plugins.h \
++DEP_FILES  = sn_config.h sn_data.h sn_defines.h sn_plugins.h \
+              sn_analyse.c sn_conn_desc.c \
+              sn_packets.o \
+              sn_generation.o sn_interface.o sn_cfgfile.o sn_logfile.o \
+@@ -26,9 +26,7 @@
+ 	@echo "Succesfull compilation..."
+ 
+ sniffit: $(SNIFFIT) $(DEP_FILES)
+-	cd libpcap; make; cd ..
+ 	$(CC) $(EXE_FLAG) $(SNIFFIT) $(EXE_OBJ) $(EXE_OPT) $(LIBS) $(DEFS) $(OS_OPT) 
+-	strip sniffit
+ 
+ sn_cfgfile.o: sn_cfgfile.h sn_cfgfile.c sn_defines.h sn_structs.h sn_config.h
+ 	$(CC) $(OBJ_FLAG) sn_cfgfile.c $(OBJ_OPT) $(DEFS)
diff --git a/net-analyzer/sniffit/files/sniffit-0.3.7-misc.patch b/net-analyzer/sniffit/files/sniffit-0.3.7-misc.patch
new file mode 100644
index 000000000000..ff84cd7d2259
--- /dev/null
+++ b/net-analyzer/sniffit/files/sniffit-0.3.7-misc.patch
@@ -0,0 +1,120 @@
+--- a/sn_cfgfile.h
++++ b/sn_cfgfile.h
+@@ -10,3 +10,4 @@
+ void make_nr_dot (char *);
+ void interprete_line (char *);
+ void read_cfg_file (char *);    
++char *strlower (char *);
+--- a/sn_structs.h
++++ b/sn_structs.h
+@@ -67,7 +67,7 @@
+ struct snif_mask                                         /* struct for mask */
+   {
+   _32_bit source_ip, destination_ip;
+-  _32_bit short source_port, destination_port;
++  _32_bit source_port, destination_port;
+   };
+ 
+ /* (packet generation) */
+--- a/sn_analyse.c
++++ b/sn_analyse.c
+@@ -1,6 +1,9 @@
+ /* Analyse traffic for logging mode                                      */
+ /*   - by: Brecht Claerhout                                              */
+ 
++#include <stdlib.h>
++#include <string.h>
++
+ const unsigned char *data;
+ memcpy(&tcphead,header,sizeof(struct TCP_header));
+ 	  	
+--- a/sn_cfgfile.c
++++ b/sn_cfgfile.c
+@@ -3,6 +3,11 @@
+ /*   - improvements: Shudoh Kazuyuki                                      */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include "sn_interface.h"
++#include <string.h>
++#include <ctype.h>
++#include <time.h>
+ #include <netdb.h>	                           /* for getservbyname() */
+ 
+ #include "sn_config.h"
+--- a/sn_conn_desc.c
++++ b/sn_conn_desc.c
+@@ -1,6 +1,8 @@
+ /* Connection description detection file                                 */
+ /*   - by: Brecht Claerhout                                              */
+ 
++#include <ctype.h>
++#include <string.h>
+ 
+ /* Simple PORT BASED detection */
+ 
+--- a/sn_generation.c
++++ b/sn_generation.c
+@@ -6,12 +6,16 @@
+ #ifdef INCLUDE_INTERFACE
+ #ifdef GENERATION
+ #include <unistd.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>     
+ #include "sn_curses.h"
+ #include "sn_defines.h"
+ #include "sn_structs.h"
+ #include "sn_generation.h"  
++#include "sn_interface.h" /* input_field() */
++#include "sn_packets.h" /* in_cksum() */
+ 
+ extern volatile int screen_busy;
+ 
+--- a/sniffit.0.3.7.c
++++ b/sniffit.0.3.7.c
+@@ -4,6 +4,9 @@
+ #include "sn_config.h"		/* Config header file */
+ 
+ #include <unistd.h>
++#include <stdlib.h>
++#include <string.h>
++#include <ctype.h>
+ #include <signal.h>
+ #include <stdio.h>
+ #include <fcntl.h>
+--- a/sn_interface.c
++++ b/sn_interface.c
+@@ -6,6 +6,9 @@
+ #ifdef INCLUDE_INTERFACE
+ #include <signal.h>
+ #include <unistd.h>
++#include <stdlib.h>
++#include <string.h>
++#include <ctype.h>
+ #include <sys/ipc.h>
+ #include <sys/shm.h>       
+ #include "sn_curses.h" 
+--- a/sn_logfile.c
++++ b/sn_logfile.c
+@@ -4,6 +4,9 @@
+ #include "sn_config.h"
+ 
+ #include <stdio.h>
++#include <stdlib.h> /* exit() */
++#include <string.h> /* strcpy() */
++#include <time.h> /* time() ctime() */
+ #include <sys/stat.h>
+ #include <sys/time.h>
+ #include "sn_defines.h"
+--- a/sn_packets.c
++++ b/sn_packets.c
+@@ -5,6 +5,7 @@
+ #include "sn_defines.h"
+ #include "sn_structs.h"
+ #include <netinet/in.h>
++#include <string.h> /* memcpy() strcpy() */
+ 
+ extern int PROTO_HEAD;
+ extern char NO_CHKSUM;
diff --git a/net-analyzer/sniffit/files/sniffit-0.3.7-tinfo.patch b/net-analyzer/sniffit/files/sniffit-0.3.7-tinfo.patch
new file mode 100644
index 000000000000..b82835049687
--- /dev/null
+++ b/net-analyzer/sniffit/files/sniffit-0.3.7-tinfo.patch
@@ -0,0 +1,38 @@
+--- a/configure.in
++++ b/configure.in
+@@ -5,30 +5,15 @@
+ 
+ AC_INIT(sniffit.h)
+ 
+-dnl Config of libpcap
+-AC_CONFIG_SUBDIRS(libpcap)
+-
+ dnl Check the C compiler
+ AC_PROG_CC
+ 
+ dnl Check NCURSES availability
+-NCURSES_PATH=/usr/include:/usr/include/ncurses:/usr/include/curses:/usr/local/include:/usr/local/include/ncurses:/usr/local/include/curses:./:./ncurses.h
+-ncurses_warn=0
+-AC_CHECK_LIB(ncurses,main,,ncurses_warn=1)
+-
+-AC_PATH_PROGS(NCURSES_LOCATION,ncurses.h,no,$NCURSES_PATH)
+-if test "$NCURSES_LOCATION" != no; then
+-	echo "#include \"$NCURSES_LOCATION\"" >sn_curses.h
+-	AC_DEFINE(HAVE_NCURSES_H,1)
+-else
+-	ncurses_warn=1
+-fi
+-
+-dnl Print warning for interactive mode
+-if test $ncurses_warn -ne 0; then
+-        AC_MSG_WARN(Interactive mode (-i/-I) will NOT be supported.!)
+-	AC_MSG_WARN(Install ncurses!)       
+-fi
++PKG_CHECK_MODULES(ncurses,ncurses,main,
++	LIBS="$LIBS $ncurses_LIBS"
++	echo "#include <ncurses.h>" > sn_curses.h
++	AC_DEFINE(HAVE_NCURSES_H),
++	AC_MSG_ERROR([ncurses not found]))
+ 
+ dnl Check Shared Memory support
+ AC_CHECK_FUNCS(shmget)
diff --git a/net-analyzer/sniffit/metadata.xml b/net-analyzer/sniffit/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/sniffit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/sniffit/sniffit-0.3.7-r4.ebuild b/net-analyzer/sniffit/sniffit-0.3.7-r4.ebuild
new file mode 100644
index 000000000000..404ae9f3cbc8
--- /dev/null
+++ b/net-analyzer/sniffit/sniffit-0.3.7-r4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils toolchain-funcs
+
+MY_P="${P/-/.}.beta"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Interactive Packet Sniffer"
+SRC_URI="http://reptile.rug.ac.be/~coder/${PN}/files/${MY_P}.tar.gz"
+HOMEPAGE="http://reptile.rug.ac.be/~coder/sniffit/sniffit.html"
+
+RDEPEND="
+	net-libs/libpcap
+	>=sys-libs/ncurses-5.2
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="amd64 ppc sparc x86"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-misc.patch \
+		"${FILESDIR}"/${P}-tinfo.patch
+	eautoreconf
+	tc-export CC
+}
+
+src_install () {
+	dosbin sniffit
+
+	doman sniffit.5 sniffit.8
+	dodoc README* PLUGIN-HOWTO BETA* HISTORY
+}
diff --git a/net-analyzer/snmptt/Manifest b/net-analyzer/snmptt/Manifest
new file mode 100644
index 000000000000..9a1cfe4b915a
--- /dev/null
+++ b/net-analyzer/snmptt/Manifest
@@ -0,0 +1,9 @@
+AUX snmptt.initd 393 SHA256 7a76f99d13e24a2c3ca9c40dce0942c47e0cf8706a7249e8f03d02a304a2544f SHA512 07dac48c0bd4f09d8fb1d705e933693b507ab06f908921e5033c863c65597832c509372c6270f56535176b0484f02be66383dd9efdf20303a36bec6e1f0065da WHIRLPOOL 2755ac4ef048affbcb009887fe38a7ef0c4e6889eaba2d6edfd9fb712943debcf310cc76791feeab633ca9d75107f80344895300eeb7875be01f16587ced87b6
+AUX snmptt.initd-r1 374 SHA256 6d03fdd471580084552515581189f759d5626d15bc28de5149436dc09d8d9bcc SHA512 ccf4441135f4a8f3fb323efd68c75b099977c1855ac5ae41adf6ef2974e0c2c1fd57c132e9877da12c34683b2bf19d4774e7aad4527e530ce48ec3fb59c2b7aa WHIRLPOOL fc883c8d5aa07ebe51b961d226111a864acdf6d202f95e30a549ed9464d0c333c75896a0a23339b9202bf461b1b13a05900a34eaaf2a548e11150ac372cafefa
+DIST snmptt_1.2.tgz 135132 SHA256 0e2756e3d75c59020af7eba668fc834f688330dc14401a6ec43f63ade6baa3b8 SHA512 6a6fc291a11ebc42b8c2e4bc040cd2833acc2e8e5dc9dbcd1aa48a073125b342a2333f7caba4fe789dba876e5a3879161707a23b52ba751007fcf9bcfa408a67 WHIRLPOOL 08858a4cccd2d24fe478d0652c86343dc82144bfeaaf5f104f437870883b3ae77d4b3992e3066c89e9724f8cf58a98af333ee5f54fd4b4483944c5b082454c6d
+DIST snmptt_1.4.tgz 148504 SHA256 512c33ecdf06da8b3c75082c1506e4b4091ddb714d0d9564771aa12ddc98ef99 SHA512 200ebe565766c15f85b9b9cbc178baeef740663efc951af4c790c4b28d27398c14a95c4b38306ec3503cefe9b86634d5f24ec5f2482694f07789e9025ea39a80 WHIRLPOOL 106c1a6b143bd3d3f68b1c20951edc84877783f1c8b7dcaa17090705695000979c34931e2ee1bb1b184c12704c3ce76f3a8eee1652738af1f59af18ec3e2d29d
+EBUILD snmptt-1.2.ebuild 1444 SHA256 8024acb2d6c6ab9c4ec9fe01f61eede40aab0f9242b732c84544b8dedaf51665 SHA512 b6ea3148a3e1f1502fb20be9e8376483b51409d8e1b2a335fac0e6c74aa8d46a742461380e6ced1c3318cbad9c637306d6143dc5ba6f6c58298b5e31dad67413 WHIRLPOOL 104795024d981ce5667c1d68f713974db81cb027491e653e52d537ebc3e653297ae84092c6d7091b8289af1e1eb6b730beb2526f750bea617d997fedb4c58925
+EBUILD snmptt-1.4.ebuild 1219 SHA256 48ae1e88574d8bc1c835096b572c50fe1bbddaa72355bf72c2318f04cd8bd6a2 SHA512 1810d0882d35993f2280ff6800bfe3b8c3b3b6efcf50c463c57ea1355daa3747a2949cf1e677736e3aeeab493156a11146311e5c49e87cfe31ae9555144c1749 WHIRLPOOL 1e86ae48cb49fa13c4978347927a072dad4f874f9be1c04ba282c3c699ea899187ffe987de5c35862fa9f3334673b42b019a7d4cfefb3cc35384f4488f976c93
+MISC ChangeLog 2671 SHA256 337f5bc702eeb25685b17c90986a02bc3eb98d58b81638b5b6ea37e23e71e266 SHA512 3302441921e6957cd75012f73b17ba75f867818ae32960861c91356de439f5dfd25cf9da6b22787277091fff509e9ddac454048761a9151bf5697766d8829b60 WHIRLPOOL 27ef8cb480e49dd94d75964af47c0a5290b6cbf1023798d93f8f99350dd4a367402a66934103b329f2617cc93a823ed6eae772fca9b71a9aaacfaf889086c3c7
+MISC ChangeLog-2015 2980 SHA256 ec2b282424f34f5dd36fb8e28964012152a75a9935cd4fad6bc12ae0763015de SHA512 79d165fb854e8ac11e73be98a8dcfdc12cc2af6b9acd805875f51fc488971e3f1d88d567604ece2cc78bc204483ef6669fa815d05540886b16d08c18430a46a9 WHIRLPOOL 9d69e73e6c937bdc5bd5d7aec7df815321018e2fd86c49707294096267241745168d4d5f2d1ef610632109fc52163c40598c7f9aa956dfc53c7ff16a6bf5f80f
+MISC metadata.xml 413 SHA256 be7e0c5adc13c0cd6b2fe9411285b04f0c3a142908a8ddb93aaebdc0a47cc00b SHA512 facfbb9f61e391c7c80e3dc62300049a3fee43c2de84805474662e4c7fa7fce78ecbf86bbb691f13ddf39b0759ba5daec5feef91bedda39731d6fb389e4df1a3 WHIRLPOOL 33ee9b3ef867253782a2fd0c38c8008c2d4999596f9ead934676fc57c97d154242e9c1a09b934dcd6a0b6dc3e4bf791d0ddc7e0ff9747782f60dbeb39f4e82f3
diff --git a/net-analyzer/snmptt/files/snmptt.initd b/net-analyzer/snmptt/files/snmptt.initd
new file mode 100644
index 000000000000..76b67a2b1304
--- /dev/null
+++ b/net-analyzer/snmptt/files/snmptt.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net snmptrapd
+}
+				
+start() {
+	ebegin "Starting snmptt"
+	start-stop-daemon --start --pidfile /var/run/snmptt.pid --exec /usr/sbin/snmptt
+	eend
+}
+
+stop() {
+	ebegin "Stopping snmptt"
+	start-stop-daemon  --stop --pidfile /var/run/snmptt.pid
+	eend
+}		
diff --git a/net-analyzer/snmptt/files/snmptt.initd-r1 b/net-analyzer/snmptt/files/snmptt.initd-r1
new file mode 100644
index 000000000000..02b8fea24895
--- /dev/null
+++ b/net-analyzer/snmptt/files/snmptt.initd-r1
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need snmptrapd
+}
+
+start() {
+	ebegin "Starting snmptt"
+	start-stop-daemon --start --pidfile /run/snmptt.pid --exec /usr/sbin/snmptt
+	eend
+}
+
+stop() {
+	ebegin "Stopping snmptt"
+	start-stop-daemon --stop --pidfile /run/snmptt.pid
+	eend
+}
diff --git a/net-analyzer/snmptt/metadata.xml b/net-analyzer/snmptt/metadata.xml
new file mode 100644
index 000000000000..d898065740e6
--- /dev/null
+++ b/net-analyzer/snmptt/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>SNMP Trap Translator</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">snmptt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/snmptt/snmptt-1.2.ebuild b/net-analyzer/snmptt/snmptt-1.2.ebuild
new file mode 100644
index 000000000000..4171ddce88d0
--- /dev/null
+++ b/net-analyzer/snmptt/snmptt-1.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+MY_P="${P/-/_}"
+
+DESCRIPTION="SNMP Trap Translator"
+SRC_URI="mirror://sourceforge/snmptt/${MY_P}.tgz"
+HOMEPAGE="http://www.snmptt.org/"
+
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~ppc x86"
+SLOT="0"
+IUSE="mysql postgres"
+
+S="${WORKDIR}/${MY_P}"
+
+RDEPEND=">=dev-lang/perl-5.6.1
+	dev-perl/Config-IniFiles
+	>=net-analyzer/net-snmp-5.1
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# bug 105354, daemonize this thing
+	sed -i -e "s:mode = standalone:mode = daemon:g" snmptt.ini || die
+
+	echo "traphandle default /usr/sbin/snmptt" >examples/snmptrapd.conf.sample
+}
+
+src_install() {
+	into /usr
+	dosbin snmptt
+	dosbin snmptthandler
+	dosbin snmptt-net-snmp-test
+	dosbin snmpttconvert
+	dosbin snmpttconvertmib
+
+	insinto /etc/snmp
+	doins snmptt.ini
+	doins examples/snmptt.conf.generic
+	cp -pPR ${D}/etc/snmp/snmptt.conf.generic ${D}/etc/snmp/snmptt.conf
+	doins examples/snmptrapd.conf.sample
+
+	dodoc BUGS ChangeLog README sample-trap
+	dohtml docs/faqs.html docs/index.html docs/layout1.css docs/snmptt.html docs/snmpttconvert.html docs/snmpttconvertmib.html
+
+	newinitd "${FILESDIR}"/snmptt.initd snmptt
+}
+
+pkg_postinst() {
+	if ( use mysql || use postgres ); then
+		elog "Read the html documentation to configure your database."
+	fi
+	elog "Please configure /etc/snmp/snmptt.conf before running."
+}
diff --git a/net-analyzer/snmptt/snmptt-1.4.ebuild b/net-analyzer/snmptt/snmptt-1.4.ebuild
new file mode 100644
index 000000000000..bae24f294755
--- /dev/null
+++ b/net-analyzer/snmptt/snmptt-1.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_P="${P/-/_}"
+
+DESCRIPTION="SNMP Trap Translator"
+SRC_URI="mirror://sourceforge/snmptt/${MY_P}.tgz"
+HOMEPAGE="http://www.snmptt.org/"
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+IUSE="mysql postgres"
+
+S="${WORKDIR}/${MY_P}"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Config-IniFiles
+	net-analyzer/net-snmp
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+"
+
+src_prepare() {
+	# bug 105354, daemonize this thing
+	sed -i \
+		-e 's:mode = standalone:mode = daemon:g' \
+		-e '/pid_file/s:/var/run:/run:g' \
+		snmptt.ini || die
+
+	echo "traphandle default /usr/sbin/snmptt" >examples/snmptrapd.conf.sample
+}
+
+src_install() {
+	into /usr
+	dosbin snmptt snmptthandler snmptt-net-snmp-test snmpttconvert \
+		snmpttconvertmib
+
+	insinto /etc/snmp
+	doins snmptt.ini examples/snmptt.conf.generic \
+		examples/snmptrapd.conf.sample
+	newins examples/snmptt.conf.generic snmptt.conf
+
+	dodoc BUGS ChangeLog README sample-trap
+	dohtml docs/faqs.html docs/index.html docs/layout1.css docs/snmptt.html \
+		docs/snmpttconvert.html docs/snmpttconvertmib.html
+
+	newinitd "${FILESDIR}"/snmptt.initd-r1 snmptt
+}
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
new file mode 100644
index 000000000000..3d875fcc81ae
--- /dev/null
+++ b/net-analyzer/snort/Manifest
@@ -0,0 +1,25 @@
+AUX snort-2.9.8.3-no-implicit.patch 299 SHA256 55f6e95a76d1480ccf8200bf7f1611fbb97b51ca0f78453712817f385bd050b3 SHA512 e3cc85c8a8608126880f46220cf889fcd8a7f6819c17bc14cdec2366a0673ec26734637c0185fa4a6be831efdc112678c6f3df08445922d362c79861d0aca832 WHIRLPOOL af31504fc91feda984e1e6ca6d48e76e084968aae4c2f7ca06907dde221a39bbbc5fc31a2f4aaf8779bc932bf679406c983406dad8b6128d35835b1a435a6ae5
+AUX snort-2.9.8.3-rpc.patch 1010 SHA256 0accd8f2c0ca4545c4c40e8986751b57147219e283cc647c8be17625b6e8d692 SHA512 1336fb39ad8f0a5f07c09a5310e4830058b4171fe70b549ad00cba4809f9e18ed0be559abd5c516c5c85b0be90340af3096d5963d9cf098ab26952b1cf93f5a9 WHIRLPOOL a33cddb6df3f328a49865b8e990cd7a9ab3a3dbe77d1a99f56a54304d0cc6f3a04efb0d94ccd0fd269983ceb0a44f062c38313c6ebb63d4076a7921e39a6356e
+AUX snort.confd.2 420 SHA256 337378f098e0cd59fb5c28a26b5b74b32168cf48596064469e6a5ba04fe3a36f SHA512 f8b0dd74a601a8bfadc96f75caeb037059ba4330dc2b52cc113ce9be38b020f098cbc747bfe977ca4dfa6e2ce634a64949ca5cf41a40c16fa90227e49ac9052f WHIRLPOOL 39b26c5e79c0fa3e8ce5394e27448b77a0c443c5a10720cfe19c2c7fe554c7d2451adbbf2f80078346ab212b85f25bcd395640823b8b82333593dd3c8b3f5300
+AUX snort.rc12 1469 SHA256 ec06f884dd3ed3b8d20fd848769ab1dece4de1605d8fbde11c27665ce9952291 SHA512 ec398f06db147bc8ddf98b0d6a200af40c082053062b56a3fe78b1de6629cd7bf0b188e9baf44c1634f5f9f8ce8494a8a71be63c1e3f71838b77de58dbb45c71 WHIRLPOOL 3b6494b91994c8b1142438b9cbcd74fa6c6e098a130c1b53426492337d09d940e44063a131f8ca3c61abdf45069d77960a319224ce5be44c4e8c44ad92e55a76
+DIST snort-2.9.4.6.tar.gz 5338762 SHA256 cfaa5390b1840aaaa68a6c05a7077dd92cb916e6186a014baa451d43cdb0b3bc SHA512 e35e22cab3b98bbd42ffb4b88c4c4cc9b1c11e35952a9f3f4f684c02c81ca8604b45d16f42b3d0a6c792eeab86a8e319d8ebdd7b1a5215f93ec0e70b6ef53f98 WHIRLPOOL d029b7519e4ea2d9039fba289bf3785f60edaa22da643196b44772a99c1c9833431840845c51c627d7fce3c77758ea68f205df1a2e32a779440c3a651d2f06a3
+DIST snort-2.9.7.0.tar.gz 6340553 SHA256 9738afea45d20b7f77997cc00055e7dd70f6aea0101209d87efec4bc4eace49b SHA512 f2cbdd2cf2ad15bd4cf3f8658c2a4880ee2069589db89c11aaea637984dde270ef6242c6dd43d5e12f829ed2464388950ee791dbbfa8df796843942c415fbc2f WHIRLPOOL d018f7f4cc9820057642bc691c0812866083a54f9399421f1b6eedfdb55e8cdfd42b0088c12e15facbfbeccd76a6df6351b0103eac35b5d5ca43900521ee274a
+DIST snort-2.9.7.2.tar.gz 6352738 SHA256 db57c532919d9ababac127f29dbdc05ed832394880e46cad81a5dde713ccb4be SHA512 4732014d0049671b1a81857e25a5ffbc3cbccb698be2b3406f69a45603a6b9f34343469ee14fa513199cf9b890a278cc777b42493850cff6fcb3493bb9b73dce WHIRLPOOL 2eec2345e0b945ff504025b2e552729bb5542d351bf1d92e2806be0f1e8d251283d4f984d89058731f5a0150bb1c2a7dd012e9bfbfbd0a3596bfc50321a93cb9
+DIST snort-2.9.7.3.tar.gz 6300073 SHA256 8cc3613b888fc54947a2beec773c76d9a20368f2659b31d45a9f0b11e66cc229 SHA512 949213d44d08c7f70bd45bc4947c9c35bfcd2ca3a54ec8a28d0c03e3868a485d2c208ec7850398f69d706c74fbad1389af445eb1107e678ff95714b5696f27b7 WHIRLPOOL 6d6e2da52f7f141bf6702c8604855ef351c055dbce2805341af16deafa5a0e288266e9632f770e29d209a59cce0d9c17f017bfb612f870dbf5b88c8c0d75e46d
+DIST snort-2.9.7.5.tar.gz 6312847 SHA256 ad03f11b5301b16642199a86aa90388eaa53f5003f83b0c5595745a490047be1 SHA512 fa1b299c72a44a8cb64361e8dab9fad5bfec36bbb05ebed2407002b2c5d97256d7d67599cb1f29406b5ee0916f2f85a173610d403cd34c57f74f7049c10eb038 WHIRLPOOL 6c7270d7edfc552f074fa2fb8ed067a12a48e4e159ceaa4be1f3c877996df5630aa42721aa637a846701072834e167445a67bbfa2deb93933048b1e4f70a8e1b
+DIST snort-2.9.8.0.tar.gz 6323095 SHA256 bddd5d01d10d20c182836fa0199cd3549239b7a9d0fd5bbb10226feb8b42d231 SHA512 46e5f19be5eccad2d5b4d3d55ce42fe616cd5f605b7178ed98e86cc8f2f4cf0f796fad80033d81b71bea7da2abfb6d0b340815ee158190f9b974f671045bf002 WHIRLPOOL 1e15ec4e2e54bd878f654484d7617249f5e34bc5c87bd0022ee923e0bab15e1733841ad234817d5209c0063c76d3e4e3db2343130eb77450260945324862ba12
+DIST snort-2.9.8.2.tar.gz 6311793 SHA256 4075012d350dfa47a0200b7a920323f15cb7c370790f2a47367c03aba4009333 SHA512 60f660b2093ae88211dcef9256edf35441c0ffc61ec8240b6d25e947b55b0fdb23482913246e2288a8a533dbaff4e5ea2d8f51298ab9aa67baa1ab74d1c4f7a4 WHIRLPOOL 1b12bb4c65d98d5dc0bb37f1bc329d23238b95afcbf911ed7040da4de5116f3b0dd907539f6a6a418820d399cbe7830ea05dd894cfa83a71656ae7b0325d1f92
+DIST snort-2.9.8.3.tar.gz 6244304 SHA256 856d02ccec49fa30c920a1e416c47c0d62dd224340a614959ba5c03239100e6a SHA512 2f3dfe46e14a5106a02ca60b2d334549f4924ff916de0804b2b7792cdd31e104fbb454b4b932855b5f25a861698db0f8988844782b12b0e5fa132d88d4a7a687 WHIRLPOOL 3b3ab085b57522e72b7a32264107e791feec007280a76fe0c171f86c70b8d56d295ec59d150729bf08da57bf15058b2bf6e59e94f013c7a2af05cc8f79d4a38a
+EBUILD snort-2.9.4.6-r1.ebuild 8568 SHA256 74cd0ddc66434d69f8865d96547f2c27887fe12a777fc849f5b7c63092308e2e SHA512 6650634db3bcc734627b1103649b1c83b4e6fa34c1d9b183bd54c876bef12e776a64ff75823d38b73ece9d67709c3f9b94bb185d8d2111e6c203b7d88ba10378 WHIRLPOOL 1cea7b1dd0a75246465eae8c5cefe20ef940cd53f1ae3838dd342597d4c0915c8a0000f0d9ed812e85f926c8aa5ace935925f69fee4e0b3dc9669d247b47a25b
+EBUILD snort-2.9.7.0.ebuild 8546 SHA256 14a3d40f123e02a46b7b3132e4beb577dd2a6396d85f3b899939534e41ca07bc SHA512 4293b24a732229df7c1d37b62ad3dfd96e9a5f8fccdde1d78f9694147dbabbfde6b53ce1a7de6e3fb5b2ca1f5c631d4d5b46ff32c333cbac5ffca79bd9f9e130 WHIRLPOOL 17639bca528063ca50a28b93539e1021307c4e4e0c3dacdac3c9172890264cf7beab63d67c4f9725731c334cbde19f1b6f215235d731baf587927d9bce667ab9
+EBUILD snort-2.9.7.2.ebuild 8546 SHA256 02d0c8eaa75186133291d83f5be812adb02f12cbf8dd7aba5dce4572d5094610 SHA512 d1c8a854ed5c4b43d58e1c8188ce6660db879610b09059791aab948c982990d47c3a39ec992c9e349490df5f9eb933ca21f1f135755a7ad7e4d10c5c04db256b WHIRLPOOL 73524c21d57c567a9c21bb903631ac2b89bb36e1b305cddcf47584c0e57830458e8bb82387947dc25c2e1ae31950414bd86be8272bb9fe246527216fa9e5f653
+EBUILD snort-2.9.7.3.ebuild 8546 SHA256 02d0c8eaa75186133291d83f5be812adb02f12cbf8dd7aba5dce4572d5094610 SHA512 d1c8a854ed5c4b43d58e1c8188ce6660db879610b09059791aab948c982990d47c3a39ec992c9e349490df5f9eb933ca21f1f135755a7ad7e4d10c5c04db256b WHIRLPOOL 73524c21d57c567a9c21bb903631ac2b89bb36e1b305cddcf47584c0e57830458e8bb82387947dc25c2e1ae31950414bd86be8272bb9fe246527216fa9e5f653
+EBUILD snort-2.9.7.5.ebuild 8546 SHA256 02d0c8eaa75186133291d83f5be812adb02f12cbf8dd7aba5dce4572d5094610 SHA512 d1c8a854ed5c4b43d58e1c8188ce6660db879610b09059791aab948c982990d47c3a39ec992c9e349490df5f9eb933ca21f1f135755a7ad7e4d10c5c04db256b WHIRLPOOL 73524c21d57c567a9c21bb903631ac2b89bb36e1b305cddcf47584c0e57830458e8bb82387947dc25c2e1ae31950414bd86be8272bb9fe246527216fa9e5f653
+EBUILD snort-2.9.8.0.ebuild 8546 SHA256 02d0c8eaa75186133291d83f5be812adb02f12cbf8dd7aba5dce4572d5094610 SHA512 d1c8a854ed5c4b43d58e1c8188ce6660db879610b09059791aab948c982990d47c3a39ec992c9e349490df5f9eb933ca21f1f135755a7ad7e4d10c5c04db256b WHIRLPOOL 73524c21d57c567a9c21bb903631ac2b89bb36e1b305cddcf47584c0e57830458e8bb82387947dc25c2e1ae31950414bd86be8272bb9fe246527216fa9e5f653
+EBUILD snort-2.9.8.2.ebuild 8546 SHA256 02d0c8eaa75186133291d83f5be812adb02f12cbf8dd7aba5dce4572d5094610 SHA512 d1c8a854ed5c4b43d58e1c8188ce6660db879610b09059791aab948c982990d47c3a39ec992c9e349490df5f9eb933ca21f1f135755a7ad7e4d10c5c04db256b WHIRLPOOL 73524c21d57c567a9c21bb903631ac2b89bb36e1b305cddcf47584c0e57830458e8bb82387947dc25c2e1ae31950414bd86be8272bb9fe246527216fa9e5f653
+EBUILD snort-2.9.8.3-r1.ebuild 8339 SHA256 c118e0af4d76ceb4d1150e00d47cbe4fc75e6b59a614fa20eb951901c564bcc7 SHA512 8c0ee1620090ce311512e199f3a3f117b563912871dd0d128f2a852f851c030027b774f8f61c6461902a38f1f47a6df96679a28fc9c30c12c578d9a5c19112de WHIRLPOOL e2acce337a3b66c1c9a5ff8651fd897bbdd3d089303f849e987ad923d236f999cd8283ae478524957b770ce4ffad158401ecc1edbaef54bf75bac993507e3c8f
+EBUILD snort-2.9.8.3-r2.ebuild 8522 SHA256 e1d083c77a8238d1a8e5d66b9f13690ea58f5b47c8913023bba2ee16c88c9d4f SHA512 fa50d23e9c72c35beec382841ed51dbaaee4c82b2ad633be5e3a90e7e332117325d05b6da86d5d0feacafcbe3c041c4e16f202b409fc7a9605688ccd54dff2d2 WHIRLPOOL 37fe73f1412be053c2c02e43ab83c38b092819b0ee81e42c211f227572c4ff72eac3370bcd08a20ab20c05b5ab2d254e09531fd10bddd3ff493c7be269899fcf
+EBUILD snort-2.9.8.3.ebuild 8546 SHA256 3f31b2696ed17f3984c1e39c729a2167aa73261ccdc332376715331a642ade3b SHA512 e2b0a6e303ef3cb0d906a6c809d3d12ff9c3540fe9cdafdea24579ca88c3adf53e1895b60035db42e2a7058e39e16b83798cd2818f42d7b64d89eb25471816f3 WHIRLPOOL 4a7f15a8fc0c734c545bd145fb460e2c62f5a0deef306569f3cac987b41e3f2d27cb3eba0a4ae952a37b141b492ead404fd00b9ed441e7e8518c9447bdf280c3
+MISC ChangeLog 4623 SHA256 c7311eeb028b9f8b2ad38bd55b74a04289a5a165cb71c9521e1bae8d9528a33d SHA512 db43e349b79046b727cd6f5ec4b7ea972353fe9f05b76495a2b3fc4719c16a12750f382aa2c7bc731a03a7586021da52e1e1cdfacfcb3868ffc1426603b2f851 WHIRLPOOL 13512ea19848d1024c4a671c6ec204c040166b57bd601e042223fd08cc011ff561b4686b81626fc0510fb1c0777d0cd4060f8ce1c4c6fc256a7309142ff06eb8
+MISC ChangeLog-2015 36554 SHA256 2ec7c84ae8da30cc4c2e1b6dea4a05910ce8dcc4b7a3b43bc10420b2396aa82f SHA512 cc24cde8374d0ad8ab31f403928e8cf313f9a0b4173b3de94bc4620b591821f0166531d932fdc64d2a71c64bf18d903472a7330714a4a6e96ac2231a2f0150d0 WHIRLPOOL ad5d457d0a2cb6a01ca18cd769106358ba1035af4cce893b6b67c26355481cc234b1c460b560dd04d6ea112243e9d8b0ed7941fde83b20b2d65c009249ad43bd
+MISC metadata.xml 5357 SHA256 2682c328b03647effb7501b3eaa5be5574e3cda39693de121d114cc9c6b86c6b SHA512 56374a2fca28e4a0593c2fbeca7b2b1bcd643e72cb80318fad0a2cc1f682b6c38178d606b2a95d8677a14460db32d4b7e39c06f456d190e1fd008679480c379a WHIRLPOOL 59d14da50ed0d7fab65652e319063ac3196bedc11f07e6c06f4fc079fe2f5260a4f04e1af143129b0a83871dc3eec941fc5d7cbc46eb5a0292c4bc8e4ab8c927
diff --git a/net-analyzer/snort/files/snort-2.9.8.3-no-implicit.patch b/net-analyzer/snort/files/snort-2.9.8.3-no-implicit.patch
new file mode 100644
index 000000000000..7faf9a4aaa25
--- /dev/null
+++ b/net-analyzer/snort/files/snort-2.9.8.3-no-implicit.patch
@@ -0,0 +1,8 @@
+diff --git a/src/preprocessors/perf_indicators.c b/src/preprocessors/perf_indicators.c
+index d859fe7..c183552 100755
+--- a/src/preprocessors/perf_indicators.c
++++ b/src/preprocessors/perf_indicators.c
+@@ -25,2 +25,3 @@
+ #include "perf_indicators.h"
++#include "cpuclock.h" /* get_ticks_per_usec */
+ 
diff --git a/net-analyzer/snort/files/snort-2.9.8.3-rpc.patch b/net-analyzer/snort/files/snort-2.9.8.3-rpc.patch
new file mode 100644
index 000000000000..51ee56d8410e
--- /dev/null
+++ b/net-analyzer/snort/files/snort-2.9.8.3-rpc.patch
@@ -0,0 +1,26 @@
+diff -ruN snort-2.9.8.3.orig/configure.in snort-2.9.8.3/configure.in
+--- snort-2.9.8.3.orig/configure.in	2016-04-26 10:08:28.000000000 -0000
++++ snort-2.9.8.3/configure.in	2017-09-25 20:21:17.632003858 -0000
+@@ -187,6 +187,22 @@
+ AC_CHECK_LIB(nsl, inet_ntoa)
+ fi
+ 
++AC_ARG_WITH([libtirpc],
++           AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)]),
++           [], [ with_libtirpc=no ])
++
++AS_IF([test "x$with_libtirpc" != xno], 
++      [PKG_CHECK_MODULES([TIRPC], 
++                         [libtirpc], 
++                         [extra_incl="$extra_incl $TIRPC_CFLAGS"; LIBS="$LIBS $TIRPC_LIBS";],
++                        [AC_MSG_ERROR([libtirpc requested, but library not found.])]
++                       )], 
++      [AC_CHECK_HEADER(rpc/rpc.h, 
++                      [],
++                      [AC_MSG_ERROR([sunrpc requested, but headers are not present.])]
++                     )]
++)
++
+ if test -z "$no_libsocket"; then
+ AC_CHECK_LIB(socket, socket)
+ fi
diff --git a/net-analyzer/snort/files/snort.confd.2 b/net-analyzer/snort/files/snort.confd.2
new file mode 100644
index 000000000000..780c91052d1d
--- /dev/null
+++ b/net-analyzer/snort/files/snort.confd.2
@@ -0,0 +1,16 @@
+# Config file for /etc/init.d/snort
+
+# The following options are now set in your snort.conf file:
+# config set_gid:
+# config set_uid:
+# config snaplen:
+# config bpf_file:
+# config logdir:
+
+# The only options that should be set here are SNORT_IFACE and SNORT_CONF.
+
+# This tell snort which interface to listen on (any for every interface)
+SNORT_IFACE="eth1"
+
+# Probably not this either
+SNORT_CONF="/etc/snort/snort.conf"
diff --git a/net-analyzer/snort/files/snort.rc12 b/net-analyzer/snort/files/snort.rc12
new file mode 100644
index 000000000000..ad453c821fd2
--- /dev/null
+++ b/net-analyzer/snort/files/snort.rc12
@@ -0,0 +1,60 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+depend() {
+	need net
+	after mysql
+	after postgresql
+}
+
+checkconfig() {
+	if [ ! -e ${SNORT_CONF} ] ; then
+		eerror "You need a configuration file to run snort"
+		eerror "There is an example config in /etc/snort/snort.conf.distrib"
+		return 1
+	fi
+	if [ ! -d "/var/run/snort" ] ; then
+		checkpath -d /var/run/snort
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting snort"
+	start-stop-daemon --start --quiet --exec /usr/bin/snort \
+		-- --nolock-pidfile --pid-path /var/run/snort -D -i ${SNORT_IFACE} \
+		 -c ${SNORT_CONF} >/dev/null 2>&1
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping snort"
+	start-stop-daemon --stop --quiet --pidfile /var/run/snort/snort_${SNORT_IFACE}.pid
+	# Snort needs a few seconds to fully shutdown
+	sleep 15
+	eend $?
+}
+
+reload() {
+
+	local SNORT_PID="`cat /var/run/snort/snort_${SNORT_IFACE}.pid`"
+	local SNORT_USER="`ps -p ${SNORT_PID} --no-headers -o user`"
+
+        if [ ! -f /var/run/snort/snort_${SNORT_IFACE}.pid ]; then
+        	eerror "Snort isn't running"
+                return 1
+	elif [ ${SNORT_USER} != root ]; then
+		eerror "Snort must be running as root for reload to work!"
+		return 1
+	else
+		checkconfig || return 1
+		ebegin "Reloading Snort"
+		start-stop-daemon --signal HUP --pidfile /var/run/snort/snort_${SNORT_IFACE}.pid
+        fi
+}
+
+
diff --git a/net-analyzer/snort/metadata.xml b/net-analyzer/snort/metadata.xml
new file mode 100644
index 000000000000..bfe81882b559
--- /dev/null
+++ b/net-analyzer/snort/metadata.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+		<description>Maintainer</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>jason.r.wallace@gmail.com</email>
+		<name>Jason Wallace</name>
+		<description>Proxy maintainer. CC him on bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Snort is an open source network intrusion prevention and detection
+		system (IDS/IPS) developed by Sourcefire. Combining the benefits of
+		signature, protocol, and anomaly-based inspection, Snort is the most
+		widely deployed IDS/IPS technology worldwide. With millions of downloads
+		and approximately 300,000 registered users, Snort has become the de facto 
+		standard for IPS.
+	</longdescription>
+	<upstream>
+		<maintainer>
+			<email>snort-team@sourcefire.com</email>
+			<name>Snort Team</name>
+		</maintainer>
+		<changelog>http://www.snort.org/snort-downloads</changelog>
+		<doc>http://www.snort.org/docs</doc>
+		<bugs-to>http://www.snort.org/snort-downloads/submit-a-bug/</bugs-to>
+	</upstream>
+	<use>
+		<flag name="control-socket">
+			Enables Snort's control socket.
+		</flag>
+		<flag name="dynamicplugin">
+			Enable ability to dynamically load preprocessors, detection engine,
+			and rules library. This is required if you want to use shared 
+			object (SO) snort rules.
+		</flag>
+		<flag name="file-inspect">
+			Enables extended file inspection capabilities.
+		</flag>
+		<flag name="gre">
+			Enable support for inspecting and processing Generic Routing 
+			Encapsulation (GRE) packet headders. Only needed if you are
+			monitoring GRE tunnels.
+		</flag>
+		<flag name="high-availability">
+			Enables high-availability state sharing.
+		</flag>
+		<flag name="inline-init-failopen">
+			Enables support to allow traffic to pass (fail-open) through
+			inline deployments while snort is starting and not ready to begin
+			inspecting traffic. If this option is not enabled, network
+			traffic will not pass (fail-closed) until snort has fully started
+			and is ready to perform packet inspection.
+		</flag>
+		<flag name="linux-smp-stats">
+			Enable accurate statistics reporting through /proc on systems with
+			multipule processors.
+		</flag>
+		<flag name="mpls">
+			Enables support for processing and inspecting Multiprotocol Label 
+			Switching MPLS network network traffic. Only needed if you are
+			monitoring an MPLS network.
+		</flag>
+		<flag name="non-ether-decoders">
+			Enable decoding of non-ethernet protocols such as TokenRing, FDDI,
+			IPX, etc.
+		</flag>
+		<flag name="perfprofiling">
+			Enables support for preprocessor and rule performance profiling 
+			using the perfmonitor preprocessor.
+		</flag>
+		<flag name="ppm">
+			Enables support for setting per rule or per packet latency limits.
+			Helps protect against introducing network latency with inline 
+			deployments.
+		</flag>
+		<flag name="react">
+			Enables support for the react rule keyword. Supports interception,
+			termination, and redirection of HTTP connections.
+		</flag>
+		<flag name="shared-rep">
+			Enables the use of shared memory for the Reputation Preprocessor
+			(Only available on Linux systems)
+		</flag>
+		<flag name="side-channel">
+			Enables Snort's the side channel.
+		</flag>
+		<flag name="sourcefire">
+			Enables Sourcefire specific build options, which include
+			--enable-perfprofiling and --enable-ppm.
+		</flag>
+		<flag name="targetbased">
+			Enables support in snort for using a host attibute XML file 
+			(attribute_table.dtd). This file needs to be created by the user
+			and should define the IP address, operating system, and services
+			for all hosts on the monitored network. This is cumbersome, but
+			can improve intrusion detection accuracy.
+		</flag>
+		<flag name="reload-error-restart">
+			Enables support for completely restarting snort if an error is 
+			detected durring a reload.
+		</flag>
+		<flag name="zlib">
+			Enables HTTP inspection of compressed web traffic. Requires 
+			dynamicplugin be enabled.
+		</flag>
+		<flag name="active-response">
+			Enables support for automatically sending TCP resets and ICMP 
+			unreachable messages to terminate connections. Used with inline
+			deployments.
+		</flag>
+		<flag name="normalizer">
+			Enables support for normalizing packets in inline deployments to
+			help minimize the chances of detection evasion.
+		</flag>
+		<flag name="flexresp3">
+			Enables support for new flexable response preprocessor for enabling
+			connection tearing for inline deployments. Replaces flexresp and 
+			flexresp2.
+		</flag>
+		<flag name="paf">
+			Enables support for Protocol Aware Flushing. This allows Snort to
+			statefully scan a stream and reassemble a complete protocol data
+			unit regardless of segmentation.
+		</flag>
+		<flag name="large-pcap-64bit">
+			Allows Snort to read pcap files that are larger than 2 GB. ONLY
+			VALID FOR 64bit SYSTEMS!
+		</flag>
+		<flag name="libtirpc">
+			Build against <pkg>net-libs/libtirpc</pkg> for RPC support
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-analyzer/snort/snort-2.9.4.6-r1.ebuild b/net-analyzer/snort/snort-2.9.4.6-r1.ebuild
new file mode 100644
index 000000000000..22f8af97cb65
--- /dev/null
+++ b/net-analyzer/snort/snort-2.9.4.6-r1.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit autotools multilib user
+
+DESCRIPTION="The de facto standard for intrusion detection/prevention"
+HOMEPAGE="http://www.snort.org/"
+SRC_URI="http://snort.org/downloads/2320 -> ${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static +dynamicplugin +zlib +gre +mpls +targetbased
++ppm +perfprofiling +non-ether-decoders control-socket
+shared-rep sourcefire linux-smp-stats inline-init-failopen
++threads debug +active-response +normalizer reload-error-restart
++react +flexresp3 +paf large-pcap-64bit selinux"
+
+DEPEND=">=net-libs/libpcap-1.3.0
+	>=net-libs/daq-2.0.0
+	>=dev-libs/libpcre-8.33
+	dev-libs/libdnet
+	zlib? ( sys-libs/zlib )"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-snort )"
+
+REQUIRED_USE="zlib? ( dynamicplugin )
+	      !kernel_linux? ( !shared-rep )"
+
+pkg_setup() {
+
+	# pre_inst() is a better place to put this
+	# but we need it here for the 'fowners' statements in src_install()
+	enewgroup snort
+	enewuser snort -1 -1 /dev/null snort
+
+}
+
+src_prepare() {
+
+	# Multilib fix for the sf_engine
+	ebegin "Applying multilib fix"
+	sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
+		"${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
+		|| die "sed for sf_engine failed"
+
+	# Multilib fix for the curent set of dynamic-preprocessors
+	for i in ftptelnet smtp ssh dns ssl dcerpc2 sdf imap pop rzb_saac sip reputation gtp modbus dnp3; do
+		sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
+			"${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
+			|| die "sed for $i failed."
+	done
+	eend
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+
+	econf \
+		$(use_enable !static shared) \
+		$(use_enable static) \
+		$(use_enable static so-with-static-lib) \
+		$(use_enable dynamicplugin) \
+		$(use_enable zlib) \
+		$(use_enable gre) \
+		$(use_enable mpls) \
+		$(use_enable targetbased) \
+		$(use_enable control-socket) \
+		$(use_enable non-ether-decoders) \
+		$(use_enable shared-rep) \
+		$(use_enable sourcefire) \
+		$(use_enable ppm) \
+		$(use_enable perfprofiling) \
+		$(use_enable linux-smp-stats) \
+		$(use_enable inline-init-failopen) \
+		$(use_enable threads pthread) \
+		$(use_enable debug) \
+		$(use_enable debug debug-msgs) \
+		$(use_enable debug corefiles) \
+		$(use_enable !debug dlclose) \
+		$(use_enable active-response) \
+		$(use_enable normalizer) \
+		$(use_enable reload-error-restart) \
+		$(use_enable react) \
+		$(use_enable flexresp3) \
+		$(use_enable paf) \
+		$(use_enable large-pcap-64bit large-pcap) \
+		--enable-reload \
+		--disable-build-dynamic-examples \
+		--disable-profile \
+		--disable-ppm-test \
+		--disable-intel-soft-cpm \
+		--disable-static-daq \
+		--disable-rzb-saac
+}
+
+src_install() {
+
+	emake DESTDIR="${D}" install
+
+	dodir /var/log/snort \
+		/var/run/snort \
+		/etc/snort/rules \
+		/etc/snort/so_rules \
+		/usr/$(get_libdir)/snort_dynamicrules
+
+	# config.log and build.log are needed by Sourcefire
+	# to trouble shoot build problems and bug reports so we are
+	# perserving them incase the user needs upstream support.
+	dodoc RELEASE.NOTES ChangeLog \
+		doc/* \
+		tools/u2boat/README.u2boat
+
+	insinto /etc/snort
+	doins etc/attribute_table.dtd \
+		etc/classification.config \
+		etc/gen-msg.map \
+		etc/reference.config \
+		etc/threshold.conf \
+		etc/unicode.map
+
+	# We use snort.conf.distrib because the config file is complicated
+	# and the one shipped with snort can change drastically between versions.
+	# Users should migrate setting by hand and not with etc-update.
+	newins etc/snort.conf snort.conf.distrib
+
+	# config.log and build.log are needed by Sourcefire
+	# to troubleshoot build problems and bug reports so we are
+	# preserving them incase the user needs upstream support.
+	if [ -f "${WORKDIR}/${PF}/config.log" ]; then
+		dodoc "${WORKDIR}/${PF}/config.log"
+	fi
+	if [ -f "${T}/build.log" ]; then
+		dodoc "${T}/build.log"
+	fi
+
+	insinto /etc/snort/preproc_rules
+	doins preproc_rules/decoder.rules \
+		preproc_rules/preprocessor.rules \
+		preproc_rules/sensitive-data.rules
+
+	fowners -R snort:snort \
+		/var/log/snort \
+		/var/run/snort \
+		/etc/snort
+
+	newinitd "${FILESDIR}/snort.rc12" snort
+	newconfd "${FILESDIR}/snort.confd.2" snort
+
+	# Sourcefire uses Makefiles to install docs causing Bug #297190.
+	# This removes the unwanted doc directory and rogue Makefiles.
+	rm -rf "${D}"usr/share/doc/snort || die "Failed to remove SF doc directories"
+	rm "${D}"usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
+
+	#Remove unneeded .la files (Bug #382863)
+	rm "${D}"usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm "${D}"usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+
+	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
+	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct rule location in the config
+	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct preprocessor/decoder rule location in the config
+	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Enable the preprocessor/decoder rules
+	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Just some clean up of trailing /'s in the config
+	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Make it clear in the config where these are...
+	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Disable all rule files by default.
+	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Disable normalizer preprocessor config if normalizer USE flag not set.
+	if ! use normalizer; then
+		sed -i -e 's|^preprocessor normalize|#preprocessor normalize|g' \
+			"${D}etc/snort/snort.conf.distrib" || die
+	fi
+
+	# Set the configured DAQ to afpacket
+	sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the location of the DAQ modules
+	sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the DAQ mode to passive
+	sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set snort to run as snort:snort
+	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the default log dir
+	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct so_rule location in the config
+	 sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
+		 "${D}etc/snort/snort.conf.distrib" || die
+}
+
+pkg_postinst() {
+
+	einfo "There have been a number of improvements and new features"
+	einfo "added to ${P}. Please review the RELEASE.NOTES and"
+	einfo "ChangLog located in /usr/share/doc/${PF}."
+	einfo
+	elog "The Sourcefire Vulnerability Research Team (VRT) recommends that"
+	elog "users migrate their snort.conf customizations to the latest config"
+	elog "file released by the VRT. You can find the latest version of the"
+	elog "Snort config file in /etc/snort/snort.conf.distrib."
+	elog
+	elog "!! It is important that you migrate to this new snort.conf file !!"
+	elog
+	elog "This version of the ebuild includes an updated init.d file and"
+	elog "conf.d file that rely on options found in the latest Snort"
+	elog "config file provided by the VRT."
+
+	if use debug; then
+		elog "You have the 'debug' USE flag enabled. If this has been done to"
+		elog "troubleshoot an issue by producing a core dump or a back trace,"
+		elog "then you need to also ensure the FEATURES variable in make.conf"
+		elog "contains the 'nostrip' option."
+	fi
+}
diff --git a/net-analyzer/snort/snort-2.9.7.0.ebuild b/net-analyzer/snort/snort-2.9.7.0.ebuild
new file mode 100644
index 000000000000..dc97c8f72577
--- /dev/null
+++ b/net-analyzer/snort/snort-2.9.7.0.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit autotools multilib user
+
+DESCRIPTION="The de facto standard for intrusion detection/prevention"
+HOMEPAGE="http://www.snort.org/"
+SRC_URI="https://www.snort.org/downloads/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static +gre +mpls +targetbased +ppm +perfprofiling
++non-ether-decoders control-socket file-inspect high-availability
+shared-rep side-channel sourcefire linux-smp-stats inline-init-failopen
++threads debug +active-response +normalizer reload-error-restart
++react +flexresp3 large-pcap-64bit selinux"
+
+DEPEND=">=net-libs/libpcap-1.3.0
+	>=net-libs/daq-2.0.2
+	>=dev-libs/libpcre-8.33
+	dev-libs/libdnet
+	sys-libs/zlib"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-snort )"
+
+REQUIRED_USE="!kernel_linux? ( !shared-rep )"
+
+pkg_setup() {
+
+	# pre_inst() is a better place to put this
+	# but we need it here for the 'fowners' statements in src_install()
+	enewgroup snort
+	enewuser snort -1 -1 /dev/null snort
+
+}
+
+src_prepare() {
+
+	# Multilib fix for the sf_engine
+	ebegin "Applying multilib fix"
+	sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
+		"${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
+		|| die "sed for sf_engine failed"
+
+	# Multilib fix for the curent set of dynamic-preprocessors
+	for i in file ftptelnet smtp ssh dns ssl dcerpc2 sdf imap pop sip reputation gtp modbus dnp3; do
+		sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
+			"${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
+			|| die "sed for $i failed."
+	done
+	eend
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+
+	econf \
+		$(use_enable !static shared) \
+		$(use_enable static) \
+		$(use_enable static so-with-static-lib) \
+		$(use_enable gre) \
+		$(use_enable mpls) \
+		$(use_enable targetbased) \
+		$(use_enable control-socket) \
+		$(use_enable file-inspect) \
+		$(use_enable high-availability ha) \
+		$(use_enable non-ether-decoders) \
+		$(use_enable shared-rep) \
+		$(use_enable side-channel) \
+		$(use_enable sourcefire) \
+		$(use_enable ppm) \
+		$(use_enable perfprofiling) \
+		$(use_enable linux-smp-stats) \
+		$(use_enable inline-init-failopen) \
+		$(use_enable threads pthread) \
+		$(use_enable debug) \
+		$(use_enable debug debug-msgs) \
+		$(use_enable debug corefiles) \
+		$(use_enable !debug dlclose) \
+		$(use_enable active-response) \
+		$(use_enable normalizer) \
+		$(use_enable reload-error-restart) \
+		$(use_enable react) \
+		$(use_enable flexresp3) \
+		$(use_enable large-pcap-64bit large-pcap) \
+		--enable-reload \
+		--disable-build-dynamic-examples \
+		--disable-profile \
+		--disable-ppm-test \
+		--disable-intel-soft-cpm \
+		--disable-static-daq
+}
+
+src_install() {
+
+	emake DESTDIR="${D}" install
+
+	dodir /var/log/snort \
+		/var/run/snort \
+		/etc/snort/rules \
+		/etc/snort/so_rules \
+		/usr/$(get_libdir)/snort_dynamicrules
+
+	# config.log and build.log are needed by Sourcefire
+	# to trouble shoot build problems and bug reports so we are
+	# perserving them incase the user needs upstream support.
+	dodoc RELEASE.NOTES ChangeLog \
+		doc/* \
+		tools/u2boat/README.u2boat
+
+	insinto /etc/snort
+	doins etc/attribute_table.dtd \
+		etc/classification.config \
+		etc/gen-msg.map \
+		etc/reference.config \
+		etc/threshold.conf \
+		etc/unicode.map
+
+	# We use snort.conf.distrib because the config file is complicated
+	# and the one shipped with snort can change drastically between versions.
+	# Users should migrate setting by hand and not with etc-update.
+	newins etc/snort.conf snort.conf.distrib
+
+	# config.log and build.log are needed by Sourcefire
+	# to troubleshoot build problems and bug reports so we are
+	# preserving them incase the user needs upstream support.
+	if [ -f "${WORKDIR}/${PF}/config.log" ]; then
+		dodoc "${WORKDIR}/${PF}/config.log"
+	fi
+	if [ -f "${T}/build.log" ]; then
+		dodoc "${T}/build.log"
+	fi
+
+	insinto /etc/snort/preproc_rules
+	doins preproc_rules/decoder.rules \
+		preproc_rules/preprocessor.rules \
+		preproc_rules/sensitive-data.rules
+
+	fowners -R snort:snort \
+		/var/log/snort \
+		/var/run/snort \
+		/etc/snort
+
+	newinitd "${FILESDIR}/snort.rc12" snort
+	newconfd "${FILESDIR}/snort.confd.2" snort
+
+	# Sourcefire uses Makefiles to install docs causing Bug #297190.
+	# This removes the unwanted doc directory and rogue Makefiles.
+	rm -rf "${D}"usr/share/doc/snort || die "Failed to remove SF doc directories"
+	rm "${D}"usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
+
+	# Remove unneeded .la files (Bug #382863)
+	rm "${D}"usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm "${D}"usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+
+	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
+	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct rule location in the config
+	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct preprocessor/decoder rule location in the config
+	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Enable the preprocessor/decoder rules
+	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Just some clean up of trailing /'s in the config
+	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Make it clear in the config where these are...
+	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Disable all rule files by default.
+	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Disable normalizer preprocessor config if normalizer USE flag not set.
+	if ! use normalizer; then
+		sed -i -e 's|^preprocessor normalize|#preprocessor normalize|g' \
+			"${D}etc/snort/snort.conf.distrib" || die
+	fi
+
+	# Set the configured DAQ to afpacket
+	sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the location of the DAQ modules
+	sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the DAQ mode to passive
+	sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set snort to run as snort:snort
+	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the default log dir
+	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct so_rule location in the config
+	 sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
+		 "${D}etc/snort/snort.conf.distrib" || die
+}
+
+pkg_postinst() {
+
+	einfo "There have been a number of improvements and new features"
+	einfo "added to ${P}. Please review the RELEASE.NOTES and"
+	einfo "ChangLog located in /usr/share/doc/${PF}."
+	einfo
+	elog "The Sourcefire Vulnerability Research Team (VRT) recommends that"
+	elog "users migrate their snort.conf customizations to the latest config"
+	elog "file released by the VRT. You can find the latest version of the"
+	elog "Snort config file in /etc/snort/snort.conf.distrib."
+	elog
+	elog "!! It is important that you migrate to this new snort.conf file !!"
+	elog
+	elog "This version of the ebuild includes an updated init.d file and"
+	elog "conf.d file that rely on options found in the latest Snort"
+	elog "config file provided by the VRT."
+
+	if use debug; then
+		elog "You have the 'debug' USE flag enabled. If this has been done to"
+		elog "troubleshoot an issue by producing a core dump or a back trace,"
+		elog "then you need to also ensure the FEATURES variable in make.conf"
+		elog "contains the 'nostrip' option."
+	fi
+}
diff --git a/net-analyzer/snort/snort-2.9.7.2.ebuild b/net-analyzer/snort/snort-2.9.7.2.ebuild
new file mode 100644
index 000000000000..dc9b17549630
--- /dev/null
+++ b/net-analyzer/snort/snort-2.9.7.2.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit autotools multilib user
+
+DESCRIPTION="The de facto standard for intrusion detection/prevention"
+HOMEPAGE="http://www.snort.org/"
+SRC_URI="https://www.snort.org/downloads/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static +gre +mpls +targetbased +ppm +perfprofiling
++non-ether-decoders control-socket file-inspect high-availability
+shared-rep side-channel sourcefire linux-smp-stats inline-init-failopen
++threads debug +active-response +normalizer reload-error-restart
++react +flexresp3 large-pcap-64bit selinux"
+
+DEPEND=">=net-libs/libpcap-1.3.0
+	>=net-libs/daq-2.0.2
+	>=dev-libs/libpcre-8.33
+	dev-libs/libdnet
+	sys-libs/zlib"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-snort )"
+
+REQUIRED_USE="!kernel_linux? ( !shared-rep )"
+
+pkg_setup() {
+
+	# pre_inst() is a better place to put this
+	# but we need it here for the 'fowners' statements in src_install()
+	enewgroup snort
+	enewuser snort -1 -1 /dev/null snort
+
+}
+
+src_prepare() {
+
+	# Multilib fix for the sf_engine
+	ebegin "Applying multilib fix"
+	sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
+		"${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
+		|| die "sed for sf_engine failed"
+
+	# Multilib fix for the curent set of dynamic-preprocessors
+	for i in file ftptelnet smtp ssh dns ssl dcerpc2 sdf imap pop sip reputation gtp modbus dnp3; do
+		sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
+			"${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
+			|| die "sed for $i failed."
+	done
+	eend
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+
+	econf \
+		$(use_enable !static shared) \
+		$(use_enable static) \
+		$(use_enable static so-with-static-lib) \
+		$(use_enable gre) \
+		$(use_enable mpls) \
+		$(use_enable targetbased) \
+		$(use_enable control-socket) \
+		$(use_enable file-inspect) \
+		$(use_enable high-availability ha) \
+		$(use_enable non-ether-decoders) \
+		$(use_enable shared-rep) \
+		$(use_enable side-channel) \
+		$(use_enable sourcefire) \
+		$(use_enable ppm) \
+		$(use_enable perfprofiling) \
+		$(use_enable linux-smp-stats) \
+		$(use_enable inline-init-failopen) \
+		$(use_enable threads pthread) \
+		$(use_enable debug) \
+		$(use_enable debug debug-msgs) \
+		$(use_enable debug corefiles) \
+		$(use_enable !debug dlclose) \
+		$(use_enable active-response) \
+		$(use_enable normalizer) \
+		$(use_enable reload-error-restart) \
+		$(use_enable react) \
+		$(use_enable flexresp3) \
+		$(use_enable large-pcap-64bit large-pcap) \
+		--enable-reload \
+		--disable-build-dynamic-examples \
+		--disable-profile \
+		--disable-ppm-test \
+		--disable-intel-soft-cpm \
+		--disable-static-daq
+}
+
+src_install() {
+
+	emake DESTDIR="${D}" install
+
+	dodir /var/log/snort \
+		/var/run/snort \
+		/etc/snort/rules \
+		/etc/snort/so_rules \
+		/usr/$(get_libdir)/snort_dynamicrules
+
+	# config.log and build.log are needed by Sourcefire
+	# to trouble shoot build problems and bug reports so we are
+	# perserving them incase the user needs upstream support.
+	dodoc RELEASE.NOTES ChangeLog \
+		doc/* \
+		tools/u2boat/README.u2boat
+
+	insinto /etc/snort
+	doins etc/attribute_table.dtd \
+		etc/classification.config \
+		etc/gen-msg.map \
+		etc/reference.config \
+		etc/threshold.conf \
+		etc/unicode.map
+
+	# We use snort.conf.distrib because the config file is complicated
+	# and the one shipped with snort can change drastically between versions.
+	# Users should migrate setting by hand and not with etc-update.
+	newins etc/snort.conf snort.conf.distrib
+
+	# config.log and build.log are needed by Sourcefire
+	# to troubleshoot build problems and bug reports so we are
+	# preserving them incase the user needs upstream support.
+	if [ -f "${WORKDIR}/${PF}/config.log" ]; then
+		dodoc "${WORKDIR}/${PF}/config.log"
+	fi
+	if [ -f "${T}/build.log" ]; then
+		dodoc "${T}/build.log"
+	fi
+
+	insinto /etc/snort/preproc_rules
+	doins preproc_rules/decoder.rules \
+		preproc_rules/preprocessor.rules \
+		preproc_rules/sensitive-data.rules
+
+	fowners -R snort:snort \
+		/var/log/snort \
+		/var/run/snort \
+		/etc/snort
+
+	newinitd "${FILESDIR}/snort.rc12" snort
+	newconfd "${FILESDIR}/snort.confd.2" snort
+
+	# Sourcefire uses Makefiles to install docs causing Bug #297190.
+	# This removes the unwanted doc directory and rogue Makefiles.
+	rm -rf "${D}"usr/share/doc/snort || die "Failed to remove SF doc directories"
+	rm "${D}"usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
+
+	# Remove unneeded .la files (Bug #382863)
+	rm "${D}"usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm "${D}"usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+
+	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
+	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct rule location in the config
+	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct preprocessor/decoder rule location in the config
+	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Enable the preprocessor/decoder rules
+	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Just some clean up of trailing /'s in the config
+	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Make it clear in the config where these are...
+	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Disable all rule files by default.
+	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Disable normalizer preprocessor config if normalizer USE flag not set.
+	if ! use normalizer; then
+		sed -i -e 's|^preprocessor normalize|#preprocessor normalize|g' \
+			"${D}etc/snort/snort.conf.distrib" || die
+	fi
+
+	# Set the configured DAQ to afpacket
+	sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the location of the DAQ modules
+	sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the DAQ mode to passive
+	sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set snort to run as snort:snort
+	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the default log dir
+	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct so_rule location in the config
+	 sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
+		 "${D}etc/snort/snort.conf.distrib" || die
+}
+
+pkg_postinst() {
+
+	einfo "There have been a number of improvements and new features"
+	einfo "added to ${P}. Please review the RELEASE.NOTES and"
+	einfo "ChangLog located in /usr/share/doc/${PF}."
+	einfo
+	elog "The Sourcefire Vulnerability Research Team (VRT) recommends that"
+	elog "users migrate their snort.conf customizations to the latest config"
+	elog "file released by the VRT. You can find the latest version of the"
+	elog "Snort config file in /etc/snort/snort.conf.distrib."
+	elog
+	elog "!! It is important that you migrate to this new snort.conf file !!"
+	elog
+	elog "This version of the ebuild includes an updated init.d file and"
+	elog "conf.d file that rely on options found in the latest Snort"
+	elog "config file provided by the VRT."
+
+	if use debug; then
+		elog "You have the 'debug' USE flag enabled. If this has been done to"
+		elog "troubleshoot an issue by producing a core dump or a back trace,"
+		elog "then you need to also ensure the FEATURES variable in make.conf"
+		elog "contains the 'nostrip' option."
+	fi
+}
diff --git a/net-analyzer/snort/snort-2.9.7.3.ebuild b/net-analyzer/snort/snort-2.9.7.3.ebuild
new file mode 100644
index 000000000000..dc9b17549630
--- /dev/null
+++ b/net-analyzer/snort/snort-2.9.7.3.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit autotools multilib user
+
+DESCRIPTION="The de facto standard for intrusion detection/prevention"
+HOMEPAGE="http://www.snort.org/"
+SRC_URI="https://www.snort.org/downloads/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static +gre +mpls +targetbased +ppm +perfprofiling
++non-ether-decoders control-socket file-inspect high-availability
+shared-rep side-channel sourcefire linux-smp-stats inline-init-failopen
++threads debug +active-response +normalizer reload-error-restart
++react +flexresp3 large-pcap-64bit selinux"
+
+DEPEND=">=net-libs/libpcap-1.3.0
+	>=net-libs/daq-2.0.2
+	>=dev-libs/libpcre-8.33
+	dev-libs/libdnet
+	sys-libs/zlib"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-snort )"
+
+REQUIRED_USE="!kernel_linux? ( !shared-rep )"
+
+pkg_setup() {
+
+	# pre_inst() is a better place to put this
+	# but we need it here for the 'fowners' statements in src_install()
+	enewgroup snort
+	enewuser snort -1 -1 /dev/null snort
+
+}
+
+src_prepare() {
+
+	# Multilib fix for the sf_engine
+	ebegin "Applying multilib fix"
+	sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
+		"${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
+		|| die "sed for sf_engine failed"
+
+	# Multilib fix for the curent set of dynamic-preprocessors
+	for i in file ftptelnet smtp ssh dns ssl dcerpc2 sdf imap pop sip reputation gtp modbus dnp3; do
+		sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
+			"${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
+			|| die "sed for $i failed."
+	done
+	eend
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+
+	econf \
+		$(use_enable !static shared) \
+		$(use_enable static) \
+		$(use_enable static so-with-static-lib) \
+		$(use_enable gre) \
+		$(use_enable mpls) \
+		$(use_enable targetbased) \
+		$(use_enable control-socket) \
+		$(use_enable file-inspect) \
+		$(use_enable high-availability ha) \
+		$(use_enable non-ether-decoders) \
+		$(use_enable shared-rep) \
+		$(use_enable side-channel) \
+		$(use_enable sourcefire) \
+		$(use_enable ppm) \
+		$(use_enable perfprofiling) \
+		$(use_enable linux-smp-stats) \
+		$(use_enable inline-init-failopen) \
+		$(use_enable threads pthread) \
+		$(use_enable debug) \
+		$(use_enable debug debug-msgs) \
+		$(use_enable debug corefiles) \
+		$(use_enable !debug dlclose) \
+		$(use_enable active-response) \
+		$(use_enable normalizer) \
+		$(use_enable reload-error-restart) \
+		$(use_enable react) \
+		$(use_enable flexresp3) \
+		$(use_enable large-pcap-64bit large-pcap) \
+		--enable-reload \
+		--disable-build-dynamic-examples \
+		--disable-profile \
+		--disable-ppm-test \
+		--disable-intel-soft-cpm \
+		--disable-static-daq
+}
+
+src_install() {
+
+	emake DESTDIR="${D}" install
+
+	dodir /var/log/snort \
+		/var/run/snort \
+		/etc/snort/rules \
+		/etc/snort/so_rules \
+		/usr/$(get_libdir)/snort_dynamicrules
+
+	# config.log and build.log are needed by Sourcefire
+	# to trouble shoot build problems and bug reports so we are
+	# perserving them incase the user needs upstream support.
+	dodoc RELEASE.NOTES ChangeLog \
+		doc/* \
+		tools/u2boat/README.u2boat
+
+	insinto /etc/snort
+	doins etc/attribute_table.dtd \
+		etc/classification.config \
+		etc/gen-msg.map \
+		etc/reference.config \
+		etc/threshold.conf \
+		etc/unicode.map
+
+	# We use snort.conf.distrib because the config file is complicated
+	# and the one shipped with snort can change drastically between versions.
+	# Users should migrate setting by hand and not with etc-update.
+	newins etc/snort.conf snort.conf.distrib
+
+	# config.log and build.log are needed by Sourcefire
+	# to troubleshoot build problems and bug reports so we are
+	# preserving them incase the user needs upstream support.
+	if [ -f "${WORKDIR}/${PF}/config.log" ]; then
+		dodoc "${WORKDIR}/${PF}/config.log"
+	fi
+	if [ -f "${T}/build.log" ]; then
+		dodoc "${T}/build.log"
+	fi
+
+	insinto /etc/snort/preproc_rules
+	doins preproc_rules/decoder.rules \
+		preproc_rules/preprocessor.rules \
+		preproc_rules/sensitive-data.rules
+
+	fowners -R snort:snort \
+		/var/log/snort \
+		/var/run/snort \
+		/etc/snort
+
+	newinitd "${FILESDIR}/snort.rc12" snort
+	newconfd "${FILESDIR}/snort.confd.2" snort
+
+	# Sourcefire uses Makefiles to install docs causing Bug #297190.
+	# This removes the unwanted doc directory and rogue Makefiles.
+	rm -rf "${D}"usr/share/doc/snort || die "Failed to remove SF doc directories"
+	rm "${D}"usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
+
+	# Remove unneeded .la files (Bug #382863)
+	rm "${D}"usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm "${D}"usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+
+	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
+	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct rule location in the config
+	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct preprocessor/decoder rule location in the config
+	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Enable the preprocessor/decoder rules
+	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Just some clean up of trailing /'s in the config
+	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Make it clear in the config where these are...
+	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Disable all rule files by default.
+	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Disable normalizer preprocessor config if normalizer USE flag not set.
+	if ! use normalizer; then
+		sed -i -e 's|^preprocessor normalize|#preprocessor normalize|g' \
+			"${D}etc/snort/snort.conf.distrib" || die
+	fi
+
+	# Set the configured DAQ to afpacket
+	sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the location of the DAQ modules
+	sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the DAQ mode to passive
+	sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set snort to run as snort:snort
+	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the default log dir
+	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct so_rule location in the config
+	 sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
+		 "${D}etc/snort/snort.conf.distrib" || die
+}
+
+pkg_postinst() {
+
+	einfo "There have been a number of improvements and new features"
+	einfo "added to ${P}. Please review the RELEASE.NOTES and"
+	einfo "ChangLog located in /usr/share/doc/${PF}."
+	einfo
+	elog "The Sourcefire Vulnerability Research Team (VRT) recommends that"
+	elog "users migrate their snort.conf customizations to the latest config"
+	elog "file released by the VRT. You can find the latest version of the"
+	elog "Snort config file in /etc/snort/snort.conf.distrib."
+	elog
+	elog "!! It is important that you migrate to this new snort.conf file !!"
+	elog
+	elog "This version of the ebuild includes an updated init.d file and"
+	elog "conf.d file that rely on options found in the latest Snort"
+	elog "config file provided by the VRT."
+
+	if use debug; then
+		elog "You have the 'debug' USE flag enabled. If this has been done to"
+		elog "troubleshoot an issue by producing a core dump or a back trace,"
+		elog "then you need to also ensure the FEATURES variable in make.conf"
+		elog "contains the 'nostrip' option."
+	fi
+}
diff --git a/net-analyzer/snort/snort-2.9.7.5.ebuild b/net-analyzer/snort/snort-2.9.7.5.ebuild
new file mode 100644
index 000000000000..dc9b17549630
--- /dev/null
+++ b/net-analyzer/snort/snort-2.9.7.5.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit autotools multilib user
+
+DESCRIPTION="The de facto standard for intrusion detection/prevention"
+HOMEPAGE="http://www.snort.org/"
+SRC_URI="https://www.snort.org/downloads/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static +gre +mpls +targetbased +ppm +perfprofiling
++non-ether-decoders control-socket file-inspect high-availability
+shared-rep side-channel sourcefire linux-smp-stats inline-init-failopen
++threads debug +active-response +normalizer reload-error-restart
++react +flexresp3 large-pcap-64bit selinux"
+
+DEPEND=">=net-libs/libpcap-1.3.0
+	>=net-libs/daq-2.0.2
+	>=dev-libs/libpcre-8.33
+	dev-libs/libdnet
+	sys-libs/zlib"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-snort )"
+
+REQUIRED_USE="!kernel_linux? ( !shared-rep )"
+
+pkg_setup() {
+
+	# pre_inst() is a better place to put this
+	# but we need it here for the 'fowners' statements in src_install()
+	enewgroup snort
+	enewuser snort -1 -1 /dev/null snort
+
+}
+
+src_prepare() {
+
+	# Multilib fix for the sf_engine
+	ebegin "Applying multilib fix"
+	sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
+		"${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
+		|| die "sed for sf_engine failed"
+
+	# Multilib fix for the curent set of dynamic-preprocessors
+	for i in file ftptelnet smtp ssh dns ssl dcerpc2 sdf imap pop sip reputation gtp modbus dnp3; do
+		sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
+			"${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
+			|| die "sed for $i failed."
+	done
+	eend
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+
+	econf \
+		$(use_enable !static shared) \
+		$(use_enable static) \
+		$(use_enable static so-with-static-lib) \
+		$(use_enable gre) \
+		$(use_enable mpls) \
+		$(use_enable targetbased) \
+		$(use_enable control-socket) \
+		$(use_enable file-inspect) \
+		$(use_enable high-availability ha) \
+		$(use_enable non-ether-decoders) \
+		$(use_enable shared-rep) \
+		$(use_enable side-channel) \
+		$(use_enable sourcefire) \
+		$(use_enable ppm) \
+		$(use_enable perfprofiling) \
+		$(use_enable linux-smp-stats) \
+		$(use_enable inline-init-failopen) \
+		$(use_enable threads pthread) \
+		$(use_enable debug) \
+		$(use_enable debug debug-msgs) \
+		$(use_enable debug corefiles) \
+		$(use_enable !debug dlclose) \
+		$(use_enable active-response) \
+		$(use_enable normalizer) \
+		$(use_enable reload-error-restart) \
+		$(use_enable react) \
+		$(use_enable flexresp3) \
+		$(use_enable large-pcap-64bit large-pcap) \
+		--enable-reload \
+		--disable-build-dynamic-examples \
+		--disable-profile \
+		--disable-ppm-test \
+		--disable-intel-soft-cpm \
+		--disable-static-daq
+}
+
+src_install() {
+
+	emake DESTDIR="${D}" install
+
+	dodir /var/log/snort \
+		/var/run/snort \
+		/etc/snort/rules \
+		/etc/snort/so_rules \
+		/usr/$(get_libdir)/snort_dynamicrules
+
+	# config.log and build.log are needed by Sourcefire
+	# to trouble shoot build problems and bug reports so we are
+	# perserving them incase the user needs upstream support.
+	dodoc RELEASE.NOTES ChangeLog \
+		doc/* \
+		tools/u2boat/README.u2boat
+
+	insinto /etc/snort
+	doins etc/attribute_table.dtd \
+		etc/classification.config \
+		etc/gen-msg.map \
+		etc/reference.config \
+		etc/threshold.conf \
+		etc/unicode.map
+
+	# We use snort.conf.distrib because the config file is complicated
+	# and the one shipped with snort can change drastically between versions.
+	# Users should migrate setting by hand and not with etc-update.
+	newins etc/snort.conf snort.conf.distrib
+
+	# config.log and build.log are needed by Sourcefire
+	# to troubleshoot build problems and bug reports so we are
+	# preserving them incase the user needs upstream support.
+	if [ -f "${WORKDIR}/${PF}/config.log" ]; then
+		dodoc "${WORKDIR}/${PF}/config.log"
+	fi
+	if [ -f "${T}/build.log" ]; then
+		dodoc "${T}/build.log"
+	fi
+
+	insinto /etc/snort/preproc_rules
+	doins preproc_rules/decoder.rules \
+		preproc_rules/preprocessor.rules \
+		preproc_rules/sensitive-data.rules
+
+	fowners -R snort:snort \
+		/var/log/snort \
+		/var/run/snort \
+		/etc/snort
+
+	newinitd "${FILESDIR}/snort.rc12" snort
+	newconfd "${FILESDIR}/snort.confd.2" snort
+
+	# Sourcefire uses Makefiles to install docs causing Bug #297190.
+	# This removes the unwanted doc directory and rogue Makefiles.
+	rm -rf "${D}"usr/share/doc/snort || die "Failed to remove SF doc directories"
+	rm "${D}"usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
+
+	# Remove unneeded .la files (Bug #382863)
+	rm "${D}"usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm "${D}"usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+
+	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
+	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct rule location in the config
+	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct preprocessor/decoder rule location in the config
+	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Enable the preprocessor/decoder rules
+	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Just some clean up of trailing /'s in the config
+	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Make it clear in the config where these are...
+	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Disable all rule files by default.
+	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Disable normalizer preprocessor config if normalizer USE flag not set.
+	if ! use normalizer; then
+		sed -i -e 's|^preprocessor normalize|#preprocessor normalize|g' \
+			"${D}etc/snort/snort.conf.distrib" || die
+	fi
+
+	# Set the configured DAQ to afpacket
+	sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the location of the DAQ modules
+	sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the DAQ mode to passive
+	sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set snort to run as snort:snort
+	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the default log dir
+	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct so_rule location in the config
+	 sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
+		 "${D}etc/snort/snort.conf.distrib" || die
+}
+
+pkg_postinst() {
+
+	einfo "There have been a number of improvements and new features"
+	einfo "added to ${P}. Please review the RELEASE.NOTES and"
+	einfo "ChangLog located in /usr/share/doc/${PF}."
+	einfo
+	elog "The Sourcefire Vulnerability Research Team (VRT) recommends that"
+	elog "users migrate their snort.conf customizations to the latest config"
+	elog "file released by the VRT. You can find the latest version of the"
+	elog "Snort config file in /etc/snort/snort.conf.distrib."
+	elog
+	elog "!! It is important that you migrate to this new snort.conf file !!"
+	elog
+	elog "This version of the ebuild includes an updated init.d file and"
+	elog "conf.d file that rely on options found in the latest Snort"
+	elog "config file provided by the VRT."
+
+	if use debug; then
+		elog "You have the 'debug' USE flag enabled. If this has been done to"
+		elog "troubleshoot an issue by producing a core dump or a back trace,"
+		elog "then you need to also ensure the FEATURES variable in make.conf"
+		elog "contains the 'nostrip' option."
+	fi
+}
diff --git a/net-analyzer/snort/snort-2.9.8.0.ebuild b/net-analyzer/snort/snort-2.9.8.0.ebuild
new file mode 100644
index 000000000000..dc9b17549630
--- /dev/null
+++ b/net-analyzer/snort/snort-2.9.8.0.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit autotools multilib user
+
+DESCRIPTION="The de facto standard for intrusion detection/prevention"
+HOMEPAGE="http://www.snort.org/"
+SRC_URI="https://www.snort.org/downloads/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static +gre +mpls +targetbased +ppm +perfprofiling
++non-ether-decoders control-socket file-inspect high-availability
+shared-rep side-channel sourcefire linux-smp-stats inline-init-failopen
++threads debug +active-response +normalizer reload-error-restart
++react +flexresp3 large-pcap-64bit selinux"
+
+DEPEND=">=net-libs/libpcap-1.3.0
+	>=net-libs/daq-2.0.2
+	>=dev-libs/libpcre-8.33
+	dev-libs/libdnet
+	sys-libs/zlib"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-snort )"
+
+REQUIRED_USE="!kernel_linux? ( !shared-rep )"
+
+pkg_setup() {
+
+	# pre_inst() is a better place to put this
+	# but we need it here for the 'fowners' statements in src_install()
+	enewgroup snort
+	enewuser snort -1 -1 /dev/null snort
+
+}
+
+src_prepare() {
+
+	# Multilib fix for the sf_engine
+	ebegin "Applying multilib fix"
+	sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
+		"${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
+		|| die "sed for sf_engine failed"
+
+	# Multilib fix for the curent set of dynamic-preprocessors
+	for i in file ftptelnet smtp ssh dns ssl dcerpc2 sdf imap pop sip reputation gtp modbus dnp3; do
+		sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
+			"${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
+			|| die "sed for $i failed."
+	done
+	eend
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+
+	econf \
+		$(use_enable !static shared) \
+		$(use_enable static) \
+		$(use_enable static so-with-static-lib) \
+		$(use_enable gre) \
+		$(use_enable mpls) \
+		$(use_enable targetbased) \
+		$(use_enable control-socket) \
+		$(use_enable file-inspect) \
+		$(use_enable high-availability ha) \
+		$(use_enable non-ether-decoders) \
+		$(use_enable shared-rep) \
+		$(use_enable side-channel) \
+		$(use_enable sourcefire) \
+		$(use_enable ppm) \
+		$(use_enable perfprofiling) \
+		$(use_enable linux-smp-stats) \
+		$(use_enable inline-init-failopen) \
+		$(use_enable threads pthread) \
+		$(use_enable debug) \
+		$(use_enable debug debug-msgs) \
+		$(use_enable debug corefiles) \
+		$(use_enable !debug dlclose) \
+		$(use_enable active-response) \
+		$(use_enable normalizer) \
+		$(use_enable reload-error-restart) \
+		$(use_enable react) \
+		$(use_enable flexresp3) \
+		$(use_enable large-pcap-64bit large-pcap) \
+		--enable-reload \
+		--disable-build-dynamic-examples \
+		--disable-profile \
+		--disable-ppm-test \
+		--disable-intel-soft-cpm \
+		--disable-static-daq
+}
+
+src_install() {
+
+	emake DESTDIR="${D}" install
+
+	dodir /var/log/snort \
+		/var/run/snort \
+		/etc/snort/rules \
+		/etc/snort/so_rules \
+		/usr/$(get_libdir)/snort_dynamicrules
+
+	# config.log and build.log are needed by Sourcefire
+	# to trouble shoot build problems and bug reports so we are
+	# perserving them incase the user needs upstream support.
+	dodoc RELEASE.NOTES ChangeLog \
+		doc/* \
+		tools/u2boat/README.u2boat
+
+	insinto /etc/snort
+	doins etc/attribute_table.dtd \
+		etc/classification.config \
+		etc/gen-msg.map \
+		etc/reference.config \
+		etc/threshold.conf \
+		etc/unicode.map
+
+	# We use snort.conf.distrib because the config file is complicated
+	# and the one shipped with snort can change drastically between versions.
+	# Users should migrate setting by hand and not with etc-update.
+	newins etc/snort.conf snort.conf.distrib
+
+	# config.log and build.log are needed by Sourcefire
+	# to troubleshoot build problems and bug reports so we are
+	# preserving them incase the user needs upstream support.
+	if [ -f "${WORKDIR}/${PF}/config.log" ]; then
+		dodoc "${WORKDIR}/${PF}/config.log"
+	fi
+	if [ -f "${T}/build.log" ]; then
+		dodoc "${T}/build.log"
+	fi
+
+	insinto /etc/snort/preproc_rules
+	doins preproc_rules/decoder.rules \
+		preproc_rules/preprocessor.rules \
+		preproc_rules/sensitive-data.rules
+
+	fowners -R snort:snort \
+		/var/log/snort \
+		/var/run/snort \
+		/etc/snort
+
+	newinitd "${FILESDIR}/snort.rc12" snort
+	newconfd "${FILESDIR}/snort.confd.2" snort
+
+	# Sourcefire uses Makefiles to install docs causing Bug #297190.
+	# This removes the unwanted doc directory and rogue Makefiles.
+	rm -rf "${D}"usr/share/doc/snort || die "Failed to remove SF doc directories"
+	rm "${D}"usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
+
+	# Remove unneeded .la files (Bug #382863)
+	rm "${D}"usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm "${D}"usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+
+	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
+	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct rule location in the config
+	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct preprocessor/decoder rule location in the config
+	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Enable the preprocessor/decoder rules
+	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Just some clean up of trailing /'s in the config
+	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Make it clear in the config where these are...
+	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Disable all rule files by default.
+	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Disable normalizer preprocessor config if normalizer USE flag not set.
+	if ! use normalizer; then
+		sed -i -e 's|^preprocessor normalize|#preprocessor normalize|g' \
+			"${D}etc/snort/snort.conf.distrib" || die
+	fi
+
+	# Set the configured DAQ to afpacket
+	sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the location of the DAQ modules
+	sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the DAQ mode to passive
+	sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set snort to run as snort:snort
+	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the default log dir
+	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct so_rule location in the config
+	 sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
+		 "${D}etc/snort/snort.conf.distrib" || die
+}
+
+pkg_postinst() {
+
+	einfo "There have been a number of improvements and new features"
+	einfo "added to ${P}. Please review the RELEASE.NOTES and"
+	einfo "ChangLog located in /usr/share/doc/${PF}."
+	einfo
+	elog "The Sourcefire Vulnerability Research Team (VRT) recommends that"
+	elog "users migrate their snort.conf customizations to the latest config"
+	elog "file released by the VRT. You can find the latest version of the"
+	elog "Snort config file in /etc/snort/snort.conf.distrib."
+	elog
+	elog "!! It is important that you migrate to this new snort.conf file !!"
+	elog
+	elog "This version of the ebuild includes an updated init.d file and"
+	elog "conf.d file that rely on options found in the latest Snort"
+	elog "config file provided by the VRT."
+
+	if use debug; then
+		elog "You have the 'debug' USE flag enabled. If this has been done to"
+		elog "troubleshoot an issue by producing a core dump or a back trace,"
+		elog "then you need to also ensure the FEATURES variable in make.conf"
+		elog "contains the 'nostrip' option."
+	fi
+}
diff --git a/net-analyzer/snort/snort-2.9.8.2.ebuild b/net-analyzer/snort/snort-2.9.8.2.ebuild
new file mode 100644
index 000000000000..dc9b17549630
--- /dev/null
+++ b/net-analyzer/snort/snort-2.9.8.2.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit autotools multilib user
+
+DESCRIPTION="The de facto standard for intrusion detection/prevention"
+HOMEPAGE="http://www.snort.org/"
+SRC_URI="https://www.snort.org/downloads/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static +gre +mpls +targetbased +ppm +perfprofiling
++non-ether-decoders control-socket file-inspect high-availability
+shared-rep side-channel sourcefire linux-smp-stats inline-init-failopen
++threads debug +active-response +normalizer reload-error-restart
++react +flexresp3 large-pcap-64bit selinux"
+
+DEPEND=">=net-libs/libpcap-1.3.0
+	>=net-libs/daq-2.0.2
+	>=dev-libs/libpcre-8.33
+	dev-libs/libdnet
+	sys-libs/zlib"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-snort )"
+
+REQUIRED_USE="!kernel_linux? ( !shared-rep )"
+
+pkg_setup() {
+
+	# pre_inst() is a better place to put this
+	# but we need it here for the 'fowners' statements in src_install()
+	enewgroup snort
+	enewuser snort -1 -1 /dev/null snort
+
+}
+
+src_prepare() {
+
+	# Multilib fix for the sf_engine
+	ebegin "Applying multilib fix"
+	sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
+		"${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
+		|| die "sed for sf_engine failed"
+
+	# Multilib fix for the curent set of dynamic-preprocessors
+	for i in file ftptelnet smtp ssh dns ssl dcerpc2 sdf imap pop sip reputation gtp modbus dnp3; do
+		sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
+			"${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
+			|| die "sed for $i failed."
+	done
+	eend
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+
+	econf \
+		$(use_enable !static shared) \
+		$(use_enable static) \
+		$(use_enable static so-with-static-lib) \
+		$(use_enable gre) \
+		$(use_enable mpls) \
+		$(use_enable targetbased) \
+		$(use_enable control-socket) \
+		$(use_enable file-inspect) \
+		$(use_enable high-availability ha) \
+		$(use_enable non-ether-decoders) \
+		$(use_enable shared-rep) \
+		$(use_enable side-channel) \
+		$(use_enable sourcefire) \
+		$(use_enable ppm) \
+		$(use_enable perfprofiling) \
+		$(use_enable linux-smp-stats) \
+		$(use_enable inline-init-failopen) \
+		$(use_enable threads pthread) \
+		$(use_enable debug) \
+		$(use_enable debug debug-msgs) \
+		$(use_enable debug corefiles) \
+		$(use_enable !debug dlclose) \
+		$(use_enable active-response) \
+		$(use_enable normalizer) \
+		$(use_enable reload-error-restart) \
+		$(use_enable react) \
+		$(use_enable flexresp3) \
+		$(use_enable large-pcap-64bit large-pcap) \
+		--enable-reload \
+		--disable-build-dynamic-examples \
+		--disable-profile \
+		--disable-ppm-test \
+		--disable-intel-soft-cpm \
+		--disable-static-daq
+}
+
+src_install() {
+
+	emake DESTDIR="${D}" install
+
+	dodir /var/log/snort \
+		/var/run/snort \
+		/etc/snort/rules \
+		/etc/snort/so_rules \
+		/usr/$(get_libdir)/snort_dynamicrules
+
+	# config.log and build.log are needed by Sourcefire
+	# to trouble shoot build problems and bug reports so we are
+	# perserving them incase the user needs upstream support.
+	dodoc RELEASE.NOTES ChangeLog \
+		doc/* \
+		tools/u2boat/README.u2boat
+
+	insinto /etc/snort
+	doins etc/attribute_table.dtd \
+		etc/classification.config \
+		etc/gen-msg.map \
+		etc/reference.config \
+		etc/threshold.conf \
+		etc/unicode.map
+
+	# We use snort.conf.distrib because the config file is complicated
+	# and the one shipped with snort can change drastically between versions.
+	# Users should migrate setting by hand and not with etc-update.
+	newins etc/snort.conf snort.conf.distrib
+
+	# config.log and build.log are needed by Sourcefire
+	# to troubleshoot build problems and bug reports so we are
+	# preserving them incase the user needs upstream support.
+	if [ -f "${WORKDIR}/${PF}/config.log" ]; then
+		dodoc "${WORKDIR}/${PF}/config.log"
+	fi
+	if [ -f "${T}/build.log" ]; then
+		dodoc "${T}/build.log"
+	fi
+
+	insinto /etc/snort/preproc_rules
+	doins preproc_rules/decoder.rules \
+		preproc_rules/preprocessor.rules \
+		preproc_rules/sensitive-data.rules
+
+	fowners -R snort:snort \
+		/var/log/snort \
+		/var/run/snort \
+		/etc/snort
+
+	newinitd "${FILESDIR}/snort.rc12" snort
+	newconfd "${FILESDIR}/snort.confd.2" snort
+
+	# Sourcefire uses Makefiles to install docs causing Bug #297190.
+	# This removes the unwanted doc directory and rogue Makefiles.
+	rm -rf "${D}"usr/share/doc/snort || die "Failed to remove SF doc directories"
+	rm "${D}"usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
+
+	# Remove unneeded .la files (Bug #382863)
+	rm "${D}"usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm "${D}"usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+
+	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
+	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct rule location in the config
+	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct preprocessor/decoder rule location in the config
+	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Enable the preprocessor/decoder rules
+	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Just some clean up of trailing /'s in the config
+	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Make it clear in the config where these are...
+	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Disable all rule files by default.
+	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Disable normalizer preprocessor config if normalizer USE flag not set.
+	if ! use normalizer; then
+		sed -i -e 's|^preprocessor normalize|#preprocessor normalize|g' \
+			"${D}etc/snort/snort.conf.distrib" || die
+	fi
+
+	# Set the configured DAQ to afpacket
+	sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the location of the DAQ modules
+	sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the DAQ mode to passive
+	sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set snort to run as snort:snort
+	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the default log dir
+	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct so_rule location in the config
+	 sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
+		 "${D}etc/snort/snort.conf.distrib" || die
+}
+
+pkg_postinst() {
+
+	einfo "There have been a number of improvements and new features"
+	einfo "added to ${P}. Please review the RELEASE.NOTES and"
+	einfo "ChangLog located in /usr/share/doc/${PF}."
+	einfo
+	elog "The Sourcefire Vulnerability Research Team (VRT) recommends that"
+	elog "users migrate their snort.conf customizations to the latest config"
+	elog "file released by the VRT. You can find the latest version of the"
+	elog "Snort config file in /etc/snort/snort.conf.distrib."
+	elog
+	elog "!! It is important that you migrate to this new snort.conf file !!"
+	elog
+	elog "This version of the ebuild includes an updated init.d file and"
+	elog "conf.d file that rely on options found in the latest Snort"
+	elog "config file provided by the VRT."
+
+	if use debug; then
+		elog "You have the 'debug' USE flag enabled. If this has been done to"
+		elog "troubleshoot an issue by producing a core dump or a back trace,"
+		elog "then you need to also ensure the FEATURES variable in make.conf"
+		elog "contains the 'nostrip' option."
+	fi
+}
diff --git a/net-analyzer/snort/snort-2.9.8.3-r1.ebuild b/net-analyzer/snort/snort-2.9.8.3-r1.ebuild
new file mode 100644
index 000000000000..c937182cf824
--- /dev/null
+++ b/net-analyzer/snort/snort-2.9.8.3-r1.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools multilib user
+
+DESCRIPTION="The de facto standard for intrusion detection/prevention"
+HOMEPAGE="http://www.snort.org/"
+SRC_URI="https://www.snort.org/downloads/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static +gre +ppm +perfprofiling
++non-ether-decoders control-socket file-inspect high-availability
+shared-rep side-channel sourcefire linux-smp-stats inline-init-failopen
++threads debug +active-response reload-error-restart
++react +flexresp3 large-pcap-64bit selinux"
+
+DEPEND=">=net-libs/libpcap-1.3.0
+	>=net-libs/daq-2.0.2
+	>=dev-libs/libpcre-8.33
+	dev-libs/libdnet
+	sys-libs/zlib"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-snort )"
+
+REQUIRED_USE="!kernel_linux? ( !shared-rep )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-implicit.patch
+)
+
+pkg_setup() {
+
+	# pre_inst() is a better place to put this
+	# but we need it here for the 'fowners' statements in src_install()
+	enewgroup snort
+	enewuser snort -1 -1 /dev/null snort
+
+}
+
+src_prepare() {
+	default
+
+	# Multilib fix for the sf_engine
+	ebegin "Applying multilib fix"
+	sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
+		"${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
+		|| die "sed for sf_engine failed"
+
+	# Multilib fix for the curent set of dynamic-preprocessors
+	for i in file ftptelnet smtp ssh dns ssl dcerpc2 sdf imap pop sip reputation gtp modbus dnp3; do
+		sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
+			"${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
+			|| die "sed for $i failed."
+	done
+	eend
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+
+	econf \
+		$(use_enable !static shared) \
+		$(use_enable static) \
+		$(use_enable static so-with-static-lib) \
+		$(use_enable gre) \
+		$(use_enable control-socket) \
+		$(use_enable file-inspect) \
+		$(use_enable high-availability ha) \
+		$(use_enable non-ether-decoders) \
+		$(use_enable shared-rep) \
+		$(use_enable side-channel) \
+		$(use_enable sourcefire) \
+		$(use_enable ppm) \
+		$(use_enable perfprofiling) \
+		$(use_enable linux-smp-stats) \
+		$(use_enable inline-init-failopen) \
+		$(use_enable threads pthread) \
+		$(use_enable debug) \
+		$(use_enable debug debug-msgs) \
+		$(use_enable debug corefiles) \
+		$(use_enable !debug dlclose) \
+		$(use_enable active-response) \
+		$(use_enable reload-error-restart) \
+		$(use_enable react) \
+		$(use_enable flexresp3) \
+		$(use_enable large-pcap-64bit large-pcap) \
+		--enable-mpls \
+		--enable-normalizer \
+		--enable-reload \
+		--enable-targetbased \
+		--disable-build-dynamic-examples \
+		--disable-profile \
+		--disable-ppm-test \
+		--disable-intel-soft-cpm \
+		--disable-static-daq
+}
+
+src_install() {
+
+	emake DESTDIR="${D}" install
+
+	dodir /var/log/snort \
+		/var/run/snort \
+		/etc/snort/rules \
+		/etc/snort/so_rules \
+		/usr/$(get_libdir)/snort_dynamicrules
+
+	# config.log and build.log are needed by Sourcefire
+	# to trouble shoot build problems and bug reports so we are
+	# perserving them incase the user needs upstream support.
+	dodoc RELEASE.NOTES ChangeLog \
+		doc/* \
+		tools/u2boat/README.u2boat
+
+	insinto /etc/snort
+	doins etc/attribute_table.dtd \
+		etc/classification.config \
+		etc/gen-msg.map \
+		etc/reference.config \
+		etc/threshold.conf \
+		etc/unicode.map
+
+	# We use snort.conf.distrib because the config file is complicated
+	# and the one shipped with snort can change drastically between versions.
+	# Users should migrate setting by hand and not with etc-update.
+	newins etc/snort.conf snort.conf.distrib
+
+	# config.log and build.log are needed by Sourcefire
+	# to troubleshoot build problems and bug reports so we are
+	# preserving them incase the user needs upstream support.
+	if [ -f "${WORKDIR}/${PF}/config.log" ]; then
+		dodoc "${WORKDIR}/${PF}/config.log"
+	fi
+	if [ -f "${T}/build.log" ]; then
+		dodoc "${T}/build.log"
+	fi
+
+	insinto /etc/snort/preproc_rules
+	doins preproc_rules/decoder.rules \
+		preproc_rules/preprocessor.rules \
+		preproc_rules/sensitive-data.rules
+
+	fowners -R snort:snort \
+		/var/log/snort \
+		/var/run/snort \
+		/etc/snort
+
+	newinitd "${FILESDIR}/snort.rc12" snort
+	newconfd "${FILESDIR}/snort.confd.2" snort
+
+	# Sourcefire uses Makefiles to install docs causing Bug #297190.
+	# This removes the unwanted doc directory and rogue Makefiles.
+	rm -rf "${D}"usr/share/doc/snort || die "Failed to remove SF doc directories"
+	rm "${D}"usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
+
+	# Remove unneeded .la files (Bug #382863)
+	rm "${D}"usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm "${D}"usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+
+	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
+	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct rule location in the config
+	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct preprocessor/decoder rule location in the config
+	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Enable the preprocessor/decoder rules
+	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Just some clean up of trailing /'s in the config
+	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Make it clear in the config where these are...
+	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Disable all rule files by default.
+	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the configured DAQ to afpacket
+	sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the location of the DAQ modules
+	sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the DAQ mode to passive
+	sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set snort to run as snort:snort
+	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the default log dir
+	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct so_rule location in the config
+	 sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
+		 "${D}etc/snort/snort.conf.distrib" || die
+}
+
+pkg_postinst() {
+
+	einfo "There have been a number of improvements and new features"
+	einfo "added to ${P}. Please review the RELEASE.NOTES and"
+	einfo "ChangLog located in /usr/share/doc/${PF}."
+	einfo
+	elog "The Sourcefire Vulnerability Research Team (VRT) recommends that"
+	elog "users migrate their snort.conf customizations to the latest config"
+	elog "file released by the VRT. You can find the latest version of the"
+	elog "Snort config file in /etc/snort/snort.conf.distrib."
+	elog
+	elog "!! It is important that you migrate to this new snort.conf file !!"
+	elog
+	elog "This version of the ebuild includes an updated init.d file and"
+	elog "conf.d file that rely on options found in the latest Snort"
+	elog "config file provided by the VRT."
+
+	if use debug; then
+		elog "You have the 'debug' USE flag enabled. If this has been done to"
+		elog "troubleshoot an issue by producing a core dump or a back trace,"
+		elog "then you need to also ensure the FEATURES variable in make.conf"
+		elog "contains the 'nostrip' option."
+	fi
+}
diff --git a/net-analyzer/snort/snort-2.9.8.3-r2.ebuild b/net-analyzer/snort/snort-2.9.8.3-r2.ebuild
new file mode 100644
index 000000000000..161524dd7965
--- /dev/null
+++ b/net-analyzer/snort/snort-2.9.8.3-r2.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools multilib user
+
+DESCRIPTION="The de facto standard for intrusion detection/prevention"
+HOMEPAGE="http://www.snort.org/"
+SRC_URI="https://www.snort.org/downloads/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static +gre +ppm +perfprofiling
++non-ether-decoders control-socket file-inspect high-availability
+shared-rep side-channel sourcefire linux-smp-stats inline-init-failopen
++threads debug +active-response reload-error-restart
++react +flexresp3 large-pcap-64bit selinux +libtirpc"
+
+DEPEND=">=net-libs/libpcap-1.3.0
+	>=net-libs/daq-2.0.2
+	>=dev-libs/libpcre-8.33
+	dev-libs/libdnet
+	sys-libs/zlib
+	!libtirpc? ( sys-libs/glibc[rpc(-)] )
+	libtirpc? ( net-libs/libtirpc )
+	|| ( net-libs/libnsl <sys-libs/glibc-2.26 )
+"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-snort )"
+
+REQUIRED_USE="!kernel_linux? ( !shared-rep )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-implicit.patch
+	"${FILESDIR}"/${P}-rpc.patch
+)
+
+pkg_setup() {
+
+	# pre_inst() is a better place to put this
+	# but we need it here for the 'fowners' statements in src_install()
+	enewgroup snort
+	enewuser snort -1 -1 /dev/null snort
+
+}
+
+src_prepare() {
+	default
+
+	# Multilib fix for the sf_engine
+	ebegin "Applying multilib fix"
+	sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
+		"${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
+		|| die "sed for sf_engine failed"
+
+	# Multilib fix for the curent set of dynamic-preprocessors
+	for i in file ftptelnet smtp ssh dns ssl dcerpc2 sdf imap pop sip reputation gtp modbus dnp3; do
+		sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
+			"${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
+			|| die "sed for $i failed."
+	done
+	eend
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+
+	econf \
+		$(use_enable !static shared) \
+		$(use_enable static) \
+		$(use_enable static so-with-static-lib) \
+		$(use_enable gre) \
+		$(use_enable control-socket) \
+		$(use_enable file-inspect) \
+		$(use_enable high-availability ha) \
+		$(use_enable non-ether-decoders) \
+		$(use_enable shared-rep) \
+		$(use_enable side-channel) \
+		$(use_enable sourcefire) \
+		$(use_enable ppm) \
+		$(use_enable perfprofiling) \
+		$(use_enable linux-smp-stats) \
+		$(use_enable inline-init-failopen) \
+		$(use_enable threads pthread) \
+		$(use_enable debug) \
+		$(use_enable debug debug-msgs) \
+		$(use_enable debug corefiles) \
+		$(use_enable !debug dlclose) \
+		$(use_enable active-response) \
+		$(use_enable reload-error-restart) \
+		$(use_enable react) \
+		$(use_enable flexresp3) \
+		$(use_enable large-pcap-64bit large-pcap) \
+		$(use_with libtirpc) \
+		--enable-mpls \
+		--enable-normalizer \
+		--enable-reload \
+		--enable-targetbased \
+		--disable-build-dynamic-examples \
+		--disable-profile \
+		--disable-ppm-test \
+		--disable-intel-soft-cpm \
+		--disable-static-daq
+}
+
+src_install() {
+
+	emake DESTDIR="${D}" install
+
+	dodir /var/log/snort \
+		/var/run/snort \
+		/etc/snort/rules \
+		/etc/snort/so_rules \
+		/usr/$(get_libdir)/snort_dynamicrules
+
+	# config.log and build.log are needed by Sourcefire
+	# to trouble shoot build problems and bug reports so we are
+	# perserving them incase the user needs upstream support.
+	dodoc RELEASE.NOTES ChangeLog \
+		doc/* \
+		tools/u2boat/README.u2boat
+
+	insinto /etc/snort
+	doins etc/attribute_table.dtd \
+		etc/classification.config \
+		etc/gen-msg.map \
+		etc/reference.config \
+		etc/threshold.conf \
+		etc/unicode.map
+
+	# We use snort.conf.distrib because the config file is complicated
+	# and the one shipped with snort can change drastically between versions.
+	# Users should migrate setting by hand and not with etc-update.
+	newins etc/snort.conf snort.conf.distrib
+
+	# config.log and build.log are needed by Sourcefire
+	# to troubleshoot build problems and bug reports so we are
+	# preserving them incase the user needs upstream support.
+	if [ -f "${WORKDIR}/${PF}/config.log" ]; then
+		dodoc "${WORKDIR}/${PF}/config.log"
+	fi
+	if [ -f "${T}/build.log" ]; then
+		dodoc "${T}/build.log"
+	fi
+
+	insinto /etc/snort/preproc_rules
+	doins preproc_rules/decoder.rules \
+		preproc_rules/preprocessor.rules \
+		preproc_rules/sensitive-data.rules
+
+	fowners -R snort:snort \
+		/var/log/snort \
+		/var/run/snort \
+		/etc/snort
+
+	newinitd "${FILESDIR}/snort.rc12" snort
+	newconfd "${FILESDIR}/snort.confd.2" snort
+
+	# Sourcefire uses Makefiles to install docs causing Bug #297190.
+	# This removes the unwanted doc directory and rogue Makefiles.
+	rm -rf "${D}"usr/share/doc/snort || die "Failed to remove SF doc directories"
+	rm "${D}"usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
+
+	# Remove unneeded .la files (Bug #382863)
+	rm "${D}"usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm "${D}"usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+
+	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
+	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct rule location in the config
+	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct preprocessor/decoder rule location in the config
+	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Enable the preprocessor/decoder rules
+	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Just some clean up of trailing /'s in the config
+	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Make it clear in the config where these are...
+	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Disable all rule files by default.
+	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the configured DAQ to afpacket
+	sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the location of the DAQ modules
+	sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the DAQ mode to passive
+	sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set snort to run as snort:snort
+	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the default log dir
+	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct so_rule location in the config
+	 sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
+		 "${D}etc/snort/snort.conf.distrib" || die
+}
+
+pkg_postinst() {
+
+	einfo "There have been a number of improvements and new features"
+	einfo "added to ${P}. Please review the RELEASE.NOTES and"
+	einfo "ChangLog located in /usr/share/doc/${PF}."
+	einfo
+	elog "The Sourcefire Vulnerability Research Team (VRT) recommends that"
+	elog "users migrate their snort.conf customizations to the latest config"
+	elog "file released by the VRT. You can find the latest version of the"
+	elog "Snort config file in /etc/snort/snort.conf.distrib."
+	elog
+	elog "!! It is important that you migrate to this new snort.conf file !!"
+	elog
+	elog "This version of the ebuild includes an updated init.d file and"
+	elog "conf.d file that rely on options found in the latest Snort"
+	elog "config file provided by the VRT."
+
+	if use debug; then
+		elog "You have the 'debug' USE flag enabled. If this has been done to"
+		elog "troubleshoot an issue by producing a core dump or a back trace,"
+		elog "then you need to also ensure the FEATURES variable in make.conf"
+		elog "contains the 'nostrip' option."
+	fi
+}
diff --git a/net-analyzer/snort/snort-2.9.8.3.ebuild b/net-analyzer/snort/snort-2.9.8.3.ebuild
new file mode 100644
index 000000000000..8d043e735f26
--- /dev/null
+++ b/net-analyzer/snort/snort-2.9.8.3.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit autotools multilib user
+
+DESCRIPTION="The de facto standard for intrusion detection/prevention"
+HOMEPAGE="http://www.snort.org/"
+SRC_URI="https://www.snort.org/downloads/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static +gre +mpls +targetbased +ppm +perfprofiling
++non-ether-decoders control-socket file-inspect high-availability
+shared-rep side-channel sourcefire linux-smp-stats inline-init-failopen
++threads debug +active-response +normalizer reload-error-restart
++react +flexresp3 large-pcap-64bit selinux"
+
+DEPEND=">=net-libs/libpcap-1.3.0
+	>=net-libs/daq-2.0.2
+	>=dev-libs/libpcre-8.33
+	dev-libs/libdnet
+	sys-libs/zlib"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-snort )"
+
+REQUIRED_USE="!kernel_linux? ( !shared-rep )"
+
+pkg_setup() {
+
+	# pre_inst() is a better place to put this
+	# but we need it here for the 'fowners' statements in src_install()
+	enewgroup snort
+	enewuser snort -1 -1 /dev/null snort
+
+}
+
+src_prepare() {
+
+	# Multilib fix for the sf_engine
+	ebegin "Applying multilib fix"
+	sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
+		"${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
+		|| die "sed for sf_engine failed"
+
+	# Multilib fix for the curent set of dynamic-preprocessors
+	for i in file ftptelnet smtp ssh dns ssl dcerpc2 sdf imap pop sip reputation gtp modbus dnp3; do
+		sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
+			"${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
+			|| die "sed for $i failed."
+	done
+	eend
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+
+	econf \
+		$(use_enable !static shared) \
+		$(use_enable static) \
+		$(use_enable static so-with-static-lib) \
+		$(use_enable gre) \
+		$(use_enable mpls) \
+		$(use_enable targetbased) \
+		$(use_enable control-socket) \
+		$(use_enable file-inspect) \
+		$(use_enable high-availability ha) \
+		$(use_enable non-ether-decoders) \
+		$(use_enable shared-rep) \
+		$(use_enable side-channel) \
+		$(use_enable sourcefire) \
+		$(use_enable ppm) \
+		$(use_enable perfprofiling) \
+		$(use_enable linux-smp-stats) \
+		$(use_enable inline-init-failopen) \
+		$(use_enable threads pthread) \
+		$(use_enable debug) \
+		$(use_enable debug debug-msgs) \
+		$(use_enable debug corefiles) \
+		$(use_enable !debug dlclose) \
+		$(use_enable active-response) \
+		$(use_enable normalizer) \
+		$(use_enable reload-error-restart) \
+		$(use_enable react) \
+		$(use_enable flexresp3) \
+		$(use_enable large-pcap-64bit large-pcap) \
+		--enable-reload \
+		--disable-build-dynamic-examples \
+		--disable-profile \
+		--disable-ppm-test \
+		--disable-intel-soft-cpm \
+		--disable-static-daq
+}
+
+src_install() {
+
+	emake DESTDIR="${D}" install
+
+	dodir /var/log/snort \
+		/var/run/snort \
+		/etc/snort/rules \
+		/etc/snort/so_rules \
+		/usr/$(get_libdir)/snort_dynamicrules
+
+	# config.log and build.log are needed by Sourcefire
+	# to trouble shoot build problems and bug reports so we are
+	# perserving them incase the user needs upstream support.
+	dodoc RELEASE.NOTES ChangeLog \
+		doc/* \
+		tools/u2boat/README.u2boat
+
+	insinto /etc/snort
+	doins etc/attribute_table.dtd \
+		etc/classification.config \
+		etc/gen-msg.map \
+		etc/reference.config \
+		etc/threshold.conf \
+		etc/unicode.map
+
+	# We use snort.conf.distrib because the config file is complicated
+	# and the one shipped with snort can change drastically between versions.
+	# Users should migrate setting by hand and not with etc-update.
+	newins etc/snort.conf snort.conf.distrib
+
+	# config.log and build.log are needed by Sourcefire
+	# to troubleshoot build problems and bug reports so we are
+	# preserving them incase the user needs upstream support.
+	if [ -f "${WORKDIR}/${PF}/config.log" ]; then
+		dodoc "${WORKDIR}/${PF}/config.log"
+	fi
+	if [ -f "${T}/build.log" ]; then
+		dodoc "${T}/build.log"
+	fi
+
+	insinto /etc/snort/preproc_rules
+	doins preproc_rules/decoder.rules \
+		preproc_rules/preprocessor.rules \
+		preproc_rules/sensitive-data.rules
+
+	fowners -R snort:snort \
+		/var/log/snort \
+		/var/run/snort \
+		/etc/snort
+
+	newinitd "${FILESDIR}/snort.rc12" snort
+	newconfd "${FILESDIR}/snort.confd.2" snort
+
+	# Sourcefire uses Makefiles to install docs causing Bug #297190.
+	# This removes the unwanted doc directory and rogue Makefiles.
+	rm -rf "${D}"usr/share/doc/snort || die "Failed to remove SF doc directories"
+	rm "${D}"usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
+
+	# Remove unneeded .la files (Bug #382863)
+	rm "${D}"usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm "${D}"usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+
+	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
+	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct rule location in the config
+	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct preprocessor/decoder rule location in the config
+	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Enable the preprocessor/decoder rules
+	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Just some clean up of trailing /'s in the config
+	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Make it clear in the config where these are...
+	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Disable all rule files by default.
+	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Disable normalizer preprocessor config if normalizer USE flag not set.
+	if ! use normalizer; then
+		sed -i -e 's|^preprocessor normalize|#preprocessor normalize|g' \
+			"${D}etc/snort/snort.conf.distrib" || die
+	fi
+
+	# Set the configured DAQ to afpacket
+	sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the location of the DAQ modules
+	sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the DAQ mode to passive
+	sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set snort to run as snort:snort
+	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the default log dir
+	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct so_rule location in the config
+	 sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
+		 "${D}etc/snort/snort.conf.distrib" || die
+}
+
+pkg_postinst() {
+
+	einfo "There have been a number of improvements and new features"
+	einfo "added to ${P}. Please review the RELEASE.NOTES and"
+	einfo "ChangLog located in /usr/share/doc/${PF}."
+	einfo
+	elog "The Sourcefire Vulnerability Research Team (VRT) recommends that"
+	elog "users migrate their snort.conf customizations to the latest config"
+	elog "file released by the VRT. You can find the latest version of the"
+	elog "Snort config file in /etc/snort/snort.conf.distrib."
+	elog
+	elog "!! It is important that you migrate to this new snort.conf file !!"
+	elog
+	elog "This version of the ebuild includes an updated init.d file and"
+	elog "conf.d file that rely on options found in the latest Snort"
+	elog "config file provided by the VRT."
+
+	if use debug; then
+		elog "You have the 'debug' USE flag enabled. If this has been done to"
+		elog "troubleshoot an issue by producing a core dump or a back trace,"
+		elog "then you need to also ensure the FEATURES variable in make.conf"
+		elog "contains the 'nostrip' option."
+	fi
+}
diff --git a/net-analyzer/snortalog/Manifest b/net-analyzer/snortalog/Manifest
new file mode 100644
index 000000000000..e24a088c2345
--- /dev/null
+++ b/net-analyzer/snortalog/Manifest
@@ -0,0 +1,5 @@
+DIST snortalog_v2.4.3.tar 1324032 SHA256 aa8c47dd5c52277bedb3de310717dfe9f49ca19ededbdc81fbf130b1273ca40f SHA512 b4b8558865ae4d1ef932114f2a2fb5af7fb069f1b587955d9d489a31635e890fb0ed36ebcde19322ab0c0cae49734da08602e283bd731c769de527abf7d74d06 WHIRLPOOL e8fc7d17fa148016218b46add071548bb93a24db4dd26af3b069b9f8d55bbafdcd28a4eb2b68f86346f881b7171f5df81bfa235168496052c34776f6b005dfb3
+EBUILD snortalog-2.4.3-r1.ebuild 1413 SHA256 018769f811ef50738cab0c547336e54708d6f6360cf2181a5de408ed9e315382 SHA512 84f49834bfe4ee02c62006adf344d1f88b0c3e61cd195e075df77aa5f24e035d5bdcd852d2b863f95bf1ddad7b6dee20b801ee1dcfd0da99a07f68850dee3b4f WHIRLPOOL f4b9a57b39cd2d008b40e680cfd7a3b872e3360bac351e80b5e5d25b59ddf1722b5abf88e4cde294ed881cb1e85eff01cea0bec6e5ca4dbae715f033c8302a4c
+MISC ChangeLog 2779 SHA256 015dec11fe568004e4d3c0c8ba3dd6054af8782e36b07784ae8dfcd0e741aac2 SHA512 ba704631558a5f528e029c5e0b690be1d73f23f4ed99d93d6af093c67658aaf380776630d938e8b75ca19a9980e8a1b9130580a1e281cdf0863cbe40608bff6f WHIRLPOOL 306aa972d67372ccd0d35338e20277b775f213a493f48b954e617a10239ae6bfa9c4497c0426506aa1039d2627e30b9a5b7e2359dabea26ad867f0e1bd27cc6c
+MISC ChangeLog-2015 4869 SHA256 e4cbf239e11882211fa10c38e27c05f9871e2c88532621405dbbcb91d90b34ec SHA512 3574d179958c08b76bfadd9474ed029172f3ee9f62657541085a9ac2828eb42c40e0ae21cd5faeef7f524696516661c70c853945a1f024473dc69a7303d6ea84 WHIRLPOOL c419b747786b43927bd9cbac60443a475a28df500c85ba68dedfe30ff538cc77616ea3823027a6b9dc0d4c08a7f49a5335dd4d81e3ed6dd4d0aaa46ead201006
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/snortalog/metadata.xml b/net-analyzer/snortalog/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/snortalog/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild b/net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild
new file mode 100644
index 000000000000..5aef758892c9
--- /dev/null
+++ b/net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+MY_P="${PN}_v${PV}"
+
+DESCRIPTION="a powerful perl script that summarizes snort logs"
+HOMEPAGE="http://jeremy.chartier.free.fr/snortalog/"
+SRC_URI="${HOMEPAGE}downloads/${PN}/${MY_P}.tar"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+IUSE="tk"
+
+RDEPEND="
+	dev-lang/perl[ithreads]
+	dev-perl/GDGraph
+	dev-perl/HTML-HTMLDoc
+	virtual/perl-DB_File
+	virtual/perl-Getopt-Long
+	tk? ( dev-perl/Tk )
+"
+
+S=${WORKDIR}
+
+src_prepare() {
+	edos2unix $(find conf/ modules/ -type f) ${PN}.* CHANGES
+
+	# fix paths, erroneous can access message
+	sed -i \
+		-e "s:\(modules/\):/usr/lib/snortalog/${PV}/\1:g" \
+		-e 's:\($domains_file = "\)conf/\(domains\)\(".*\):\1/etc/snortalog/\2\3:' \
+		-e 's:\($rules_file = "\)conf/\(rules\)\(".*\):\1/etc/snortalog/\2\3:' \
+		-e 's:\($picts_dir ="\)picts\(".*\):\1/etc/snortalog/picts\2:' \
+		-e 's:\($hw_file = "\)conf/\(hw\)\(".*\):\1/etc/snortalog/\2\3:' \
+		-e 's:\($lang_file ="\)conf/\(lang\)\(".*\):\1/etc/snortalog/\2\3:' \
+		-e 's:Can access:Cannot access:' \
+		snortalog.pl || die
+}
+
+src_install () {
+	dobin snortalog.pl
+
+	insinto /etc/snortalog
+	doins conf/{domains,hw,lang,rules}
+
+	insinto /etc/snortalog/picts
+	doins picts/*
+
+	insinto /usr/lib/snortalog/${PV}/modules
+	doins -r modules/*
+
+	dodoc CHANGES doc/snortalog_v2.2.1.pdf
+}
diff --git a/net-analyzer/snortsam/Manifest b/net-analyzer/snortsam/Manifest
new file mode 100644
index 000000000000..267096bd2799
--- /dev/null
+++ b/net-analyzer/snortsam/Manifest
@@ -0,0 +1,9 @@
+AUX snortsam-2.70-gentoo.patch 8979 SHA256 b90b29e805f8582376c8d6a7a1a5e960ae0e2f0112402bb207813478320ca57c SHA512 17f5b03820491ffbd8eda4b5cc99230ab358788194eb07221a303e98cc0ef5855d347804b30bd21f38d2a6f0e370f2433a691a33db0599c50887857bdadb53b6 WHIRLPOOL 81e58e4e68c9a466e443e158b36b923d70f4818e9db397d3304f01e911833581070296110d054d50ecbafea742ddc45df895767ae5565eeec9e45ee92e8cbbcb
+DIST snortsam-2.50-ciscoacl.diff.bz2 7295 SHA256 a4f39789e9f10b95e6db1bbce5f9d26f7393161311f5c955a4b8380186a2cb6b SHA512 c8b19b19721f75fb00a269923e4191a26853749658ebbec9d4c74dcbaaacb8db30a6a0bd33068a364aa95375db958b6fd45ad498abdc97029e04b7e140cb2523 WHIRLPOOL 43641d5cfc415ddc0e674a6c812ae1a5719296f8442da9cd6a2cf2a098d0fac20f790f19108442e4a171f2a30d97a7e383d827cbd48e0d07910111c6bcaa0038
+DIST snortsam-src-2.50.tar.gz 1073391 SHA256 3c77967f9ef581310de02443512fc7cd3f145249c9be765b1bcf679d408dc441 SHA512 cc4509c0d02666d6697a565e95013639a1f0c042ef948d8def92b749f249f647247ef7649ae23a2860ce58f08e310c08edeabc93301f812a98845f74ba5c266e WHIRLPOOL fbe0912028b8dc29a2c5701892316aca02b7d088bb0f1af67d1c252a640d7cd495fb17c36464b2a429b10bb489e0a1fb1ad79ff8da53267f7d41da3335a59b4c
+DIST snortsam-src-2.70.tar.gz 1971624 SHA256 442040a7281a641008f6410b7f6528d709f17d5041fd3752011075f8a38d19bc SHA512 e0b6d53dfc0963e5a0012e25c1cd15f76263cc0d0158f6a50eab3876f1ae40c47eeafb7309113d27f1ca92d5491a19e32748c3bf51754be9320346ebbf26e5b1 WHIRLPOOL 2ccb75cbd252b2ea293e0c125c1885ddad962b121eb095e38d85ff02d8a39803c9b0c4079b4e607e95b5c6bcaef388fed4106247714182ce01bb0e44e86c91c1
+EBUILD snortsam-2.50-r1.ebuild 1308 SHA256 d0d87b66dd0c682abec1c9511ba88ed521304dbd8fc5dffb9e23fb646650dda3 SHA512 c019af1bf01429d3f6ce6ead964bc592c46c3a1c64a6e70addd4d96d34ebbd7dbbd8a4e388776cb0cae0837664b478476855dbc139d2751f61b9e3786f267f76 WHIRLPOOL 2573ca4d15ed0a63b653397649b94fb8b88eed3d038e92eb192e0fa80fde50444c65ca2432ca157685ef75e247a0a62f157765a2621a141da94b04bbc094b05d
+EBUILD snortsam-2.70.ebuild 1003 SHA256 eb6776c6d37e031608e3dd9fa8408d364e0e03d232c26f85c43c7c2aef8cf970 SHA512 3b0e94f42990aa06f6751fcee991d7bf5966b88a6c88b919e5ea29e37d734797afe30761ed6e6d01dbafe096a42d0cb86354c58c0ad09f0f7391adaab6ec7d41 WHIRLPOOL 5639914a46e89a5885b7a64dd5807ed4e2d0d0f6aaec59ae8e91925ae5235f471af0f79bf3302cf96f229e81532eba68baf5530dd941daf32cf28a34821e8c8e
+MISC ChangeLog 2527 SHA256 b54825d27104fb5c586b0b07f32ff54f478bb6cea8ce58f8a63af4c28339ad0a SHA512 19e8fce947f629b57382a841046933e5d5dc823d5d1d33fd18a9de962a364774b21c93727bc41a50369359df6b5f4b5729bfa0884568ac0cbbc62fe595df0216 WHIRLPOOL 533c0e809dc1f24d5569386b27285abec8cc1c7dc4af68fc178fcc312096fac8910d2cacc848b9709c4966e3221b1583e2a96b678301c67bcdeb261904460afb
+MISC ChangeLog-2015 5764 SHA256 bc9af96e08587a000e183093396ee360caa2196d698d3a633ff02ba4b248ae94 SHA512 f4aa7ceab9a9a6daace3f10d0770f742fbb7bd09e51a50d336eaf13a0ffa1e91d880da75059b07d76d2edd658ba42273966bb6f32d76a4259bfda139482edcd5 WHIRLPOOL 133beef72826d51d717c9e3bcdda24a8cffc68dd2b7b62db8b70d7afc41e60d960a24b0ade018986f03b71ca9cdc09dc33b62d33441b6e348dbb8aac7766cd70
+MISC metadata.xml 286 SHA256 61b7f36c3fb4ce2345ee3017334a6013dd52429ba107768abc2c146629e84dcd SHA512 cfd1ca7999686b831b0b459f5b06ea80fd28b4f24d3404a8ad90bb4d6461a011f6a2b338ebbf45c2eac621ec828dcc397b26c2ae82068e5b703271a85c76e760 WHIRLPOOL bb6b105c081b12e37fbf26bc041e829ef7ab8ba855b96f040479ca85ad9633b8e83c7be4afa686838991ebf358ad8cf78c1a79fd54ad51f7928aaa7a63f0e5bb
diff --git a/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch b/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch
new file mode 100644
index 000000000000..f2d8fd330d33
--- /dev/null
+++ b/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch
@@ -0,0 +1,140 @@
+ makesnortsam.sh | 66 +++++++++++++++++++++------------------------------------
+ 1 file changed, 24 insertions(+), 42 deletions(-)
+
+diff --git a/makesnortsam.sh b/makesnortsam.sh
+index 64c6eb6..37f66c9 100644
+--- a/makesnortsam.sh
++++ b/makesnortsam.sh
+@@ -36,8 +36,7 @@ SSP_OBSD_SRC="ssp_pf.c ssp_pf2.c"
+ SSP_BSD_SRC="ssp_ipf.c ssp_ipfw2.c ssp_pf2.c"
+ SSP_SUNOS_SRC="ssp_ipf.c"
+ 
+-CFLAGS="-O2 -D${systype}"
+-LDFLAGS=
++CFLAGS=" ${CFLAGS} -D${systype}"
+ 
+ # OS specific flags
+ LINUX_CFLAGS=
+@@ -72,23 +71,23 @@ case "$1" in
+ 
+ 		case "${systype}" in
+ 			Linux*)
+-				gcc ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
+-					${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM}
++				${CC} ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} \
++					${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS}
+ 				;;
+ 
+ 			OpenBSD*)
+-				#gcc ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a -o ${SNORTSAM}
+-				gcc ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
++				#${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a -o ${SNORTSAM}
++				${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
+ 					${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM}
+ 				;;
+ 
+ 			*BSD*)
+-				gcc ${CFLAGS} ${BSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
++				${CC} ${CFLAGS} ${BSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
+ 					${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM}
+ 				;;
+ 
+ 			SunOS*)
+-				gcc ${CFLAGS} ${SUNOS_CFLAGS} ${OPSEC_SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${OPSEC_SUNOS_LDFLAGS} \
++				${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${OPSEC_SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${OPSEC_SUNOS_LDFLAGS} \
+ 					${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM}
+ 				;;
+ 		esac
+@@ -104,23 +103,23 @@ case "$1" in
+ 
+ 		case "${systype}" in
+ 			Linux*)
+-				gcc ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
++				${CC} ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
+ 					${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM}
+ 				;;
+ 
+ 			OpenBSD*)
+-				#gcc ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a -o ${SNORTSAM}
+-				gcc ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
++				#${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a -o ${SNORTSAM}
++				${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
+ 					${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM}
+ 				;;
+ 
+ 			*BSD*)
+-				gcc ${CFLAGS} ${BSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
++				${CC} ${CFLAGS} ${BSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
+ 					${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM}
+ 				;;
+ 
+ 			SunOS*)
+-				gcc ${CFLAGS} ${SUNOS_CFLAGS} ${OPSEC_SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${OPSEC_SUNOS_LDFLAGS} \
++				${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${OPSEC_SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${OPSEC_SUNOS_LDFLAGS} \
+ 					${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM}
+ 				;;
+ 		esac
+@@ -152,10 +151,10 @@ case "$1" in
+ 		rm -f ${SAMTOOL}-debug
+ 
+ 		case "${systype}" in
+-			Linux*)   gcc ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
+-			OpenBSD*) gcc ${CFLAGS} ${OBSD_CFLAGS}  ${LDFLAGS} ${OBSD_LDFLAGS}  ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
+-			*BSD*)    gcc ${CFLAGS} ${BSD_CFLAGS}   ${LDFLAGS} ${BSD_LDFLAGS}   ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
+-			SunOS)    gcc ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
++			Linux*)   echo ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
++			OpenBSD*) echo ${CC} ${CFLAGS} ${OBSD_CFLAGS}  ${LDFLAGS} ${OBSD_LDFLAGS}  ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OBSD_LDFLAGS}  ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
++			*BSD*)    echo ${CC} ${CFLAGS} ${BSD_CFLAGS}   ${LDFLAGS} ${BSD_LDFLAGS}   ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${BSD_CFLAGS}  ${BSD_LDFLAGS}   ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
++			SunOS)    echo ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${SUNOS_CFLAGS} $${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
+ 		esac
+ 
+ 		echo "-------------------------------------------------------------------------------"
+@@ -167,10 +166,10 @@ case "$1" in
+ 		SAMTOOL="${SAMTOOL}-debug"
+ 
+ 		case "${systype}" in
+-			Linux*)   gcc ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
+-			OpenBSD*) gcc ${CFLAGS} ${OBSD_CFLAGS}  ${LDFLAGS} ${OBSD_LDFLAGS}  ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
+-			*BSD*)    gcc ${CFLAGS} ${BSD_CFLAGS}   ${LDFLAGS} ${BSD_LDFLAGS}   ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
+-			SunOS)    gcc ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
++			Linux*)   echo ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ${LINUX_LDFLAGS}; ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ${LINUX_LDFLAGS}; [ $? = 0 ] || exit 1;;
++			OpenBSD*) echo ${CC} ${CFLAGS} ${OBSD_CFLAGS}  ${LDFLAGS} ${OBSD_LDFLAGS}  ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${OBSD_CFLAGS}  ${OBSD_LDFLAGS}  ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
++			*BSD*)    echo ${CC} ${CFLAGS} ${BSD_CFLAGS}   ${LDFLAGS} ${BSD_LDFLAGS}   ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${BSD_CFLAGS} ${BSD_LDFLAGS}   ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
++			SunOS)    echo ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
+ 		esac
+ 		cd ..
+ 	;;
+@@ -186,29 +185,12 @@ case "$1" in
+ 		rm -f ${SNORTSAM}-debug
+ 
+ 		case "${systype}" in
+-			Linux*)   gcc ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} ;;
+-			OpenBSD*) gcc ${CFLAGS} ${OBSD_CFLAGS}  ${LDFLAGS} ${OBSD_LDFLAGS}  ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC}  -o ${SNORTSAM} ;;
+-			*BSD*)    gcc ${CFLAGS} ${BSD_CFLAGS}   ${LDFLAGS} ${BSD_LDFLAGS}   ${SSP_GENERIC_SRC} ${SSP_BSD_SRC}   -o ${SNORTSAM} ;;
+-			SunOS*)   gcc ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} ;;
++			Linux*)   echo ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} ${LDFLAGS} -o ${SNORTSAM} ${LINUX_LDFLAGS}; ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} ${LINUX_LDFLAGS}; [ $? = 0 ] || exit 1;;
++			OpenBSD*) echo ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS}  ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC}  ${LDFLAGS} -o ${SNORTSAM} ; ${CC} ${CFLAGS} ${LDFLAGS} ${OBSD_CFLAGS} ${OBSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;;
++			*BSD*)    echo ${CC} ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS}   ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} ; ${CC} ${CFLAGS} ${LDFLAGS} ${BSD_CFLAGS} ${BSD_LDFLAGS}   ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;;
++			SunOS*)   echo ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC}-o ${SNORTSAM} ; ${CC} ${CFLAGS} ${LDFLAGS} ${SUNOS_CFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;;
+ 		esac
+ 
+-
+-		echo "-------------------------------------------------------------------------------"
+-		echo "Building SnortSam (debug)"
+-		echo "-------------------------------------------------------------------------------"
+-
+-		rm -f *.o
+-		CFLAGS="${CFLAGS} -DFWSAMDEBUG"
+-		SNORTSAM="${SNORTSAM}-debug"
+-
+-		case "${systype}" in
+-			Linux*)   gcc ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} ;;
+-			OpenBSD*) gcc ${CFLAGS} ${OBSD_CFLAGS}  ${LDFLAGS} ${OBSD_LDFLAGS}  ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC}  -o ${SNORTSAM} ;;
+-			*BSD*)    gcc ${CFLAGS} ${BSD_CFLAGS}   ${LDFLAGS} ${BSD_LDFLAGS}   ${SSP_GENERIC_SRC} ${SSP_BSD_SRC}   -o ${SNORTSAM} ;;
+-			SunOS*)   gcc ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} ;;
+-
+-		esac
+-		cd ..
+ 		;;
+ esac
+ 
diff --git a/net-analyzer/snortsam/metadata.xml b/net-analyzer/snortsam/metadata.xml
new file mode 100644
index 000000000000..789a44405524
--- /dev/null
+++ b/net-analyzer/snortsam/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/snortsam/snortsam-2.50-r1.ebuild b/net-analyzer/snortsam/snortsam-2.50-r1.ebuild
new file mode 100644
index 000000000000..ca2ebdba5880
--- /dev/null
+++ b/net-analyzer/snortsam/snortsam-2.50-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+MY_P="${PN}-src-${PV}"
+DESCRIPTION="Snort plugin that allows automated blocking of IP addresses on several firewalls"
+HOMEPAGE="http://www.snortsam.net/"
+SRC_URI="http://www.snortsam.net/files/snortsam/${MY_P}.tar.gz
+	mirror://gentoo/${PN}-2.50-ciscoacl.diff.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# bug 155955, ciscoacl segfaults with gcc-4.1.1
+	epatch "${DISTDIR}"/${PN}-2.50-ciscoacl.diff.bz2
+	sed -i -e "s:sbin/functions.sh:etc/init.d/functions.sh:" \
+			-e "s: -O2 : ${CFLAGS} :" \
+			-e "s:gcc :$(tc-getCC) :" \
+			-e "s:\( -o ../snortsam\): ${LDFLAGS}\1:" makesnortsam.sh || die "sed failed"
+		ecvs_clean
+}
+
+src_compile() {
+	sh makesnortsam.sh || die "makesnortsam.sh failed"
+}
+
+src_install() {
+	dobin snortsam || die "dobin failed"
+	find "${S}" -depth -type f -name "*.asc" -exec rm -f {} \;
+	dodoc docs/* conf/*
+}
+
+pkg_postinst() {
+	elog
+	elog "To use snortsam with snort, you'll have to compile snort with USE=snortsam."
+	elog "Read the INSTALL file to configure snort for snortsam, and configure"
+	elog "snortsam for your particular firewall."
+	elog
+}
diff --git a/net-analyzer/snortsam/snortsam-2.70.ebuild b/net-analyzer/snortsam/snortsam-2.70.ebuild
new file mode 100644
index 000000000000..041a219e5cb9
--- /dev/null
+++ b/net-analyzer/snortsam/snortsam-2.70.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Snort plugin that allows automated blocking of IP addresses on several firewalls"
+HOMEPAGE="http://www.snortsam.net/"
+SRC_URI="${HOMEPAGE}files/snortsam/${PN}-src-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+IUSE="debug"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	ecvs_clean
+}
+
+src_configure() {
+	use debug && append-cflags -DFWSAMDEBUG
+	tc-export CC
+}
+
+src_compile() {
+	sh makesnortsam.sh || die
+}
+
+src_install() {
+	dobin snortsam
+	find "${S}" -depth -type f -name "*.asc" -exec rm -f {} \;
+	dodoc docs/* conf/*
+}
+
+pkg_postinst() {
+	echo
+	elog "To use snortsam with snort, you'll have to compile snort with USE=snortsam."
+	elog "Read the INSTALL file to configure snort for snortsam, and configure"
+	elog "snortsam for your particular firewall."
+	echo
+}
diff --git a/net-analyzer/softflowd/Manifest b/net-analyzer/softflowd/Manifest
new file mode 100644
index 000000000000..7b83d6983dc3
--- /dev/null
+++ b/net-analyzer/softflowd/Manifest
@@ -0,0 +1,9 @@
+AUX softflowd-0.9.9-_GNU_SOURCE.patch 506 SHA256 b05ae8c552040137d1acf448d4fb0bbe8e4d9ec59576c2d3a82707660a434d6c SHA512 b4e12a3e22bc055fce39427885e44803cde613a191ce44fc4b9e08d0d9eb480a899ee8eec1ef1a9561063850aa420ef1dffba63de07add6308ab79ec63e81119 WHIRLPOOL 9a9d2e3d68fbf38929e3ef874f0f458fedef09420fbe46e1cc55662b6d91472c661cfd5bbae11b69fee9b375a424a625100b1615615b425b62286e659c9ca819
+AUX softflowd-0.9.9-no-strip.patch 605 SHA256 de352df2b464190b7e9913d40ac97557bcee5209a70ffd043f687decef9745ab SHA512 4c42a64634dbe852d5c1563face382553c8091b8c36ce5fb40eab40492338019abb2b26b0e9c47fca602a324827fb130131ce16a32cd2450612ba6ffd3501d77 WHIRLPOOL 3f9b7bcc1705e60a059a597247386a2dff1bee7b9f0259749c2f1ce3e94a34c2907dad11c642c2d7850d2e473ac625762fffff5733b5a88e0b6bd12b9ba4a846
+AUX softflowd.confd 288 SHA256 75f4f17f168fe89ac9fa26d9188ea0f46a2ff14a56df257de8ef8c0e69e81780 SHA512 78edfe72bee5998ac6d91e97a119370e223f1fe868de43dfff70e127f202af8f17b3f96c6d0ed8f23ad022e314a1dd3cc0c3da19e85cd7af427671f7247710cb WHIRLPOOL d3502b35c32da91ac96497f45118273a06ba358ddb0379c7fec9e625ba571d6fdf786f4215722ed9ad6bd243c177d26124b0393689c883442daa6bc5293fa78a
+AUX softflowd.initd 1536 SHA256 f42a5fb7842929d77c18975f37e3573b3573fd6b244e4aeca1ca14c5e760531a SHA512 42ce99bbcc6ddfbb6a3e4c54100cce05ab1edf4c977c6c97e224b427f64fd8cf42f727dd6f4454919232987f177c6875f0ed86c89712b1a042be340a2d6e8ffc WHIRLPOOL b12e626176c8d8e4e7255914c51b74eeb7ec0007703c1711fa0e1a30a9d2315419e6899e26f9d47deaeb0a0e85c993cf26e300e3bfd1d3049c87da59490a49bc
+DIST softflowd-0.9.9.tar.gz 91939 SHA256 2313f2c50ea9b3f2db3524e38ec7cd71f9a6e885ac2e3b55ab037bccf8173612 SHA512 4d579c2a087c0f3cd4d2020bcfbddf9dab73254e40678b3509c93bec212bf8b5692f76bfb4e766577e431ff508f0bce0a2cf326184f192e3c5dc8ddf38514dbd WHIRLPOOL c16dd9596ececffac3d698e56c244359a6db4b9cc8f721bc51fd2b900316ed493313ba971d9e1efd8c874acbbfd47f48cf099c63c750b282a1cd3af39bf4e690
+EBUILD softflowd-0.9.9-r1.ebuild 714 SHA256 c8bd72d46d146e8c151cee6ef32761a8c2838bd85e20b7c815a9541ca38f3dd6 SHA512 b985d3acab2f5750f489b4b6726d2caebf2dcc5023ae2049b63cd114d3aa3a7ff58fac78d723bfd522eee8b62e08b01558bbd7359b516d3b706253e6a8a5ca08 WHIRLPOOL 7ccd2b333c93e1768dfb5fbb66c0ed151114e1b5521d873cc3bacb409468acdc2e8c7c3f3164c774e66310d44f5f65ad482e6e0771ab56ecbe86c72bbc21de85
+MISC ChangeLog 2876 SHA256 6304eaf321fcf11d227cf658a3773c708ae978536dca28250e6f78f31486d553 SHA512 9e5ff91d10468cc05ffe3f23be18b441107829d8dfc0af9c43fbdaa230cf56d15231f830557b5f0833420e496b0df7a356d21be9a4a2fd9e8367c6a1d4bfd1b5 WHIRLPOOL a046a94ce37e569b49e3b1ca3fd8f3c0a2a49cd74de42c6f1b18e977358589b01da6d4ecf87d1e18813f76f1a24a53fde34e4b9418790b5b2adda9d3fd9d9228
+MISC ChangeLog-2015 1291 SHA256 083af2df78787c53d89c9e8d0da3c92783e9612d09732bb347ee1ef2d4732863 SHA512 c8be0485221b4eeb229290f3d0beca56a446355676e7bf5b9d1f773be931f2293c8885603827a0dbca9cde066568071de87c4b22d5b4df889e393f8ec43a3e6f WHIRLPOOL 2c338e079cfbff48a04d580fdfbf2976346bc3dae14b8c64dfb39b925faa3ece6f2274daf0a8fdb2aae2f2df6343619b8fd1a5578ec036b83fff3dfef122f9fb
+MISC metadata.xml 349 SHA256 6a843b07555943d3c65a949975beac94b7e8f600145f12441156ecbd1d943a12 SHA512 88f4bf4966aa0b70cf2f7872ae143dbe9f105bb4de34b3d893092183f369002414ae50a3baae6eb314d49ea84764c250e7b4fb3109ad8c179eb93f116417e68f WHIRLPOOL 50193edb94274d39c407baa9c6d717a42e2451fb77e47b5b69d4de53a540c80b36238927cc31eda2501334e50e58f56bf97fdc1e9fab20c78d6c07bcc18988fe
diff --git a/net-analyzer/softflowd/files/softflowd-0.9.9-_GNU_SOURCE.patch b/net-analyzer/softflowd/files/softflowd-0.9.9-_GNU_SOURCE.patch
new file mode 100644
index 000000000000..cb4844803e00
--- /dev/null
+++ b/net-analyzer/softflowd/files/softflowd-0.9.9-_GNU_SOURCE.patch
@@ -0,0 +1,13 @@
+setresuid and setresgid need _GNU_SOURCE which clashes with _BSD_SOURCE
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -87,7 +87,7 @@
+ AC_SEARCH_LIBS(socket, socket)
+ AC_CHECK_LIB(pcap, pcap_open_live)
+ 
+-AC_CHECK_FUNCS(closefrom daemon setresuid setreuid setresgid setgid strlcpy strlcat)
++AC_CHECK_FUNCS(closefrom daemon setreuid setgid strlcpy strlcat)
+ 
+ AC_CHECK_TYPES([u_int64_t, int64_t, uint64_t, u_int32_t, int32_t, uint32_t])
+ AC_CHECK_TYPES([u_int16_t, int16_t, uint16_t, u_int8_t, int8_t, uint8_t])
diff --git a/net-analyzer/softflowd/files/softflowd-0.9.9-no-strip.patch b/net-analyzer/softflowd/files/softflowd-0.9.9-no-strip.patch
new file mode 100644
index 000000000000..c48603a7f491
--- /dev/null
+++ b/net-analyzer/softflowd/files/softflowd-0.9.9-no-strip.patch
@@ -0,0 +1,12 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -52,7 +52,7 @@
+ 	    $(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir)
+ 	[ -d $(DESTDIR)$(mandir)/man8 ] || \
+ 	    $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man8
+-	$(INSTALL) -m 0755 -s softflowd $(DESTDIR)$(sbindir)/softflowd
+-	$(INSTALL) -m 0755 -s softflowctl $(DESTDIR)$(sbindir)/softflowctl
++	$(INSTALL) -m 0755 softflowd $(DESTDIR)$(sbindir)/softflowd
++	$(INSTALL) -m 0755 softflowctl $(DESTDIR)$(sbindir)/softflowctl
+ 	$(INSTALL) -m 0644 softflowd.8 $(DESTDIR)$(mandir)/man8/softflowd.8
+ 	$(INSTALL) -m 0644 softflowctl.8 $(DESTDIR)$(mandir)/man8/softflowctl.8
diff --git a/net-analyzer/softflowd/files/softflowd.confd b/net-analyzer/softflowd/files/softflowd.confd
new file mode 100644
index 000000000000..dc1a36c874cd
--- /dev/null
+++ b/net-analyzer/softflowd/files/softflowd.confd
@@ -0,0 +1,9 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Copy conf file to softflowd.interface
+
+# SOFTFLOWD_COLLECTOR=host:port
+# SOFTFLOWD_TIMEOUTS="maxlife=600"
+# SOFTFLOWD_MAXFLOWS=17000
+# SOFTFLOWD_EXTRA=
+# SOFTFLOWD_INTERFACE_IDX=
diff --git a/net-analyzer/softflowd/files/softflowd.initd b/net-analyzer/softflowd/files/softflowd.initd
new file mode 100644
index 000000000000..c0c2a831c629
--- /dev/null
+++ b/net-analyzer/softflowd/files/softflowd.initd
@@ -0,0 +1,53 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+softflowd_checkconfig() {
+	SOFTFLOWD_INTERFACE=${SVCNAME#*.}
+	if [ ${SOFTFLOWD_INTERFACE} = ${SVCNAME} ]; then
+		eerror "You have to create an init script for each interface:"
+		eerror "ln -s softflowd /etc/init.d/softflowd.eth0"
+		return 1
+	fi
+
+	if [ -z "${SOFTFLOWD_COLLECTOR}" ]; then
+		eerror "Specify the host and port that the accounting datagrams are to be"
+		eerror	"sent to in /etc/conf.d/${SVCNAME}." 
+		eerror "Example: SOFTFLOWD_COLLECTOR=collector.example.com:9995"
+		return 1
+	fi
+	SOFTFLOWD_PIDFILE="/var/run/softflowd.${SOFTFLOWD_INTERFACE}.pid"
+	SOFTFLOWD_CTLFILE="/var/run/softflowd.${SOFTFLOWD_INTERFACE}.ctl"
+}
+
+
+start() {
+	softflowd_checkconfig || return 1
+
+	ebegin "Starting softflowd on interface ${SOFTFLOWD_INTERFACE}"
+	iface_arg=${SOFTFLOWD_INTERFACE}
+	[ -n "${SOFTFLOWD_INTERFACE_IDX}" ] && iface_arg="${SOFTFLOWD_INTERFACE_IDX}:${iface_arg}"
+	start-stop-daemon --start \
+		--exec /usr/sbin/softflowd \
+		--	-i "${iface_arg}" \
+			-n "${SOFTFLOWD_COLLECTOR}" \
+			-p "${SOFTFLOWD_PIDFILE}" \
+			-c "${SOFTFLOWD_CTLFILE}" \
+			-t "${SOFTFLOWD_TIMEOUTS-maxlife=600}" \
+			-m "${SOFTFLOWD_MAXFLOWS-17000}" \
+			${SOFTFLOWD_EXTRA}
+	eend $?
+}
+
+stop() {
+	softflowd_checkconfig || return 1
+
+	ebegin "Stopping softflowd on interface ${SOFTFLOWD_INTERFACE}"
+	# use softflowd's own way to shut it down
+	/usr/sbin/softflowctl -c ${SOFTFLOWD_CTLFILE} shutdown
+	eend $?
+}
diff --git a/net-analyzer/softflowd/metadata.xml b/net-analyzer/softflowd/metadata.xml
new file mode 100644
index 000000000000..35892ab7c2d1
--- /dev/null
+++ b/net-analyzer/softflowd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<upstream>
+<remote-id type="google-code">softflowd</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/softflowd/softflowd-0.9.9-r1.ebuild b/net-analyzer/softflowd/softflowd-0.9.9-r1.ebuild
new file mode 100644
index 000000000000..cb7d09e3425e
--- /dev/null
+++ b/net-analyzer/softflowd/softflowd-0.9.9-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="flow-based network traffic analyser capable of Cisco NetFlow data export"
+HOMEPAGE="http://www.mindrot.org/projects/softflowd/"
+SRC_URI="https://softflowd.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-no-strip.patch
+	epatch "${FILESDIR}"/${P}-_GNU_SOURCE.patch
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	docinto examples
+	dodoc collector.pl
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/net-analyzer/speedtest-cli/Manifest b/net-analyzer/speedtest-cli/Manifest
new file mode 100644
index 000000000000..b78c110d5d11
--- /dev/null
+++ b/net-analyzer/speedtest-cli/Manifest
@@ -0,0 +1,10 @@
+AUX speedtest-cli-0.3.4-fix-unicode-py3.patch 1253 SHA256 58ff93e2152aa513e2446c1f1ab9fc6ce7efdef8d02960fea30b06b02849ab86 SHA512 d071aa76158334c5184766b8c6f0cee0dd789df433a633461cff834f91cc87cf717bf57449c8417ff793708e521ad2ad7f5db43808252393066b2181a378790d WHIRLPOOL 7dc0f605df2102a03081281697cba8c99ce49d17aeef2b671362099dd70238974d88e71053b1df0d9b37889be38ff6edaad5d0610ec5d4df72a5e764f8c2795d
+DIST speedtest-cli-0.3.4.tar.gz 14452 SHA256 e50646e245ea3c80c9653a532db0dbaef72f1c439330bcc22c381074c17b719d SHA512 fb22ba9e17a30c172b8f751020d7117caf8b573dee112506917f24c5173e2901e0f0198b4946798daf3a27839519025f4a7f8f8942034bc19356b32d6a0f6851 WHIRLPOOL c5700ec9bc513274056b870c781782ceeea4441282564d18d8ed9fbc7f7c9d3d7099ffcfc5193efec37b823e8da10a953391919c8330f454540dc24ae9e517ea
+DIST speedtest-cli-1.0.1.tar.gz 20114 SHA256 3ec2e6444e309f03d5f56526e6a66e4d556bd95e470abab605ac9c71d8231bc8 SHA512 f6e78945f47779dfdadc0328468f3fb20999a011da3c832cca58a4703c083f9d73ea3bd06bc85aba5cce5b63db70a6d3b496ef1037ca377e7699a6cd1e42ed24 WHIRLPOOL 1bba7786bf225b608febd81c2f7fd66aa0fe2ff3e0a4c3524a4814478bd9d09788eb5cce67bd8e187895651955cf01fbb7333939b32cc86bede04b160b05ca17
+DIST speedtest-cli-1.0.2.tar.gz 20251 SHA256 41f50ffb082322eedcfa8b33d0354fc5f1d9fcdc09be76b09b89b293397629c7 SHA512 aa2dad2d9c1246af332c63437be171c0c0d138f16604d246f9f5b8b36b456fbb02376b166c75491211369d6b61220be7669f0b0487235f74dc2db95014e8d349 WHIRLPOOL b27fbfad709bb45b9d70328b4384a220e80b62a6b2b77d9ad98907a8de4907de2d6bca516ac517710c5fbe0c2509899e0fa652c08f598cc0b28a10a51a02f164
+EBUILD speedtest-cli-0.3.4-r1.ebuild 699 SHA256 c9cde0a9f52fab7284257651826af6246fbc8f635e4cecf1b85e7ae3456bc1dd SHA512 7e551453dd1db6ca4ff3497c2f123c2798329f692a983d05b7c16bcf44e27ddae7743f01e791bba743149c389570e11f534cc5a582db5ac495aa8e05647c20d6 WHIRLPOOL 583e165593612fd91c78a45a374d88b90e67104f72e602207e83938e8eef283bf584c5e6c7f75f6c3e28be49cf3dbee9577e4c83eaf31996e17fe5d66c1e6b67
+EBUILD speedtest-cli-1.0.1.ebuild 660 SHA256 e55e15723725986f8b0c11173195dc0fa34d9c58d887d2ce695476354b0414ec SHA512 fde1118057c3d36b660ade21cb0821b62c4a39d7d797a206f76ae096f7c7ab093e62c1779a97a93d7725682baf11dff3ec698844297597227c511721faf75237 WHIRLPOOL 94a889f570d39eb2c278c56124844856e70e810945be95afcb520b17e4e63fac0a65e09e5b1a5e5c72098cfb556104f0fbfd290e9f05332a6439bb20cc050f99
+EBUILD speedtest-cli-1.0.2.ebuild 660 SHA256 e55e15723725986f8b0c11173195dc0fa34d9c58d887d2ce695476354b0414ec SHA512 fde1118057c3d36b660ade21cb0821b62c4a39d7d797a206f76ae096f7c7ab093e62c1779a97a93d7725682baf11dff3ec698844297597227c511721faf75237 WHIRLPOOL 94a889f570d39eb2c278c56124844856e70e810945be95afcb520b17e4e63fac0a65e09e5b1a5e5c72098cfb556104f0fbfd290e9f05332a6439bb20cc050f99
+MISC ChangeLog 3301 SHA256 f44c86306c80c21e282385fa4046e2c3978453df1be1d6e0b147f5b3e8fa0060 SHA512 db7b43b0c369ddcc5ab5fbe1197150e4805f1225feb734f0beb924741afbf6fa29efdd4ba4ffaefdad90fb5743fcff8d77e1a1b82014fb1bc499efaf8e333c95 WHIRLPOOL baa61b5010600a773d866c4525b1ae350a25d7522da1e6abc12a5be15d0701d24a6a519780ca5c54e76e46484b8bc59b99616403d0f84cc09edb6c06024178cc
+MISC ChangeLog-2015 1263 SHA256 d45520f9ab1d9770bb9abe4db480fdb821a5cf56871fae365e90208a46def3ee SHA512 b6bc4b78dab9cf13f41c04030c8ae609d1ce332f60f52f7eaeb92960ee3c41382452408fd1859cf4b892326f371e09726a1d21e618b34f9523449741989b029c WHIRLPOOL 886da52d1d97077e0a47bd1343b8f2966849033bfa610a7aa489c58e55b68b71b0c4b44ead7308148e761e101b1c0ad2debb0b33f498b51035e327ab84de6f0f
+MISC metadata.xml 460 SHA256 688416e092b47dbc1b9c51e1c786aa564c13166312e0a06eab77349a572c1ff9 SHA512 6e911380a7bc75a4f5726f4bb8f864a2660e93cb07be2cdf55b428fe8615e9e31c7a78f978064ed73fdc1133d6611b3bc3a39966439bb249e4f8a69dbae88f1c WHIRLPOOL b5008973a1533598a595bfb393c59a493ac12c5788cdacfac027f1697859efecf9ddbf5a4e8068b8adc4392ef2b06b0f17c0dc05b9bf286ebeaa7bdf443ea925
diff --git a/net-analyzer/speedtest-cli/files/speedtest-cli-0.3.4-fix-unicode-py3.patch b/net-analyzer/speedtest-cli/files/speedtest-cli-0.3.4-fix-unicode-py3.patch
new file mode 100644
index 000000000000..2bd809f9bf67
--- /dev/null
+++ b/net-analyzer/speedtest-cli/files/speedtest-cli-0.3.4-fix-unicode-py3.patch
@@ -0,0 +1,36 @@
+diff --git a/speedtest_cli.py b/speedtest_cli.py
+index d93d5c3..930e42b 100755
+--- a/speedtest_cli.py
++++ b/speedtest_cli.py
+@@ -108,6 +108,8 @@ except ImportError:
+         def write(data):
+             if not isinstance(data, basestring):
+                 data = str(data)
++            if isinstance(data, unicode):
++                data = data.encode('utf-8', 'ignore')
+             fp.write(data)
+ 
+         want_unicode = False
+@@ -635,7 +637,7 @@ def speedtest():
+                 line = ('%(id)4s) %(sponsor)s (%(name)s, %(country)s) '
+                         '[%(d)0.2f km]' % server)
+                 serverList.append(line)
+-            print_('\n'.join(serverList).encode('utf-8', 'ignore'))
++            print_('\n'.join(serverList))
+             sys.exit(0)
+     else:
+         servers = closestServers(config['client'])
+@@ -703,8 +705,8 @@ def speedtest():
+         best = getBestServer(servers)
+ 
+     if not args.simple:
+-        print_(('Hosted by %(sponsor)s (%(name)s) [%(d)0.2f km]: '
+-               '%(latency)s ms' % best).encode('utf-8', 'ignore'))
++        print_('Hosted by %(sponsor)s (%(name)s) [%(d)0.2f km]: '
++               '%(latency)s ms' % best)
+     else:
+         print_('Ping: %(latency)s ms' % best)
+ 
+-- 
+2.7.1
+
diff --git a/net-analyzer/speedtest-cli/metadata.xml b/net-analyzer/speedtest-cli/metadata.xml
new file mode 100644
index 000000000000..718c71bda885
--- /dev/null
+++ b/net-analyzer/speedtest-cli/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+		<name>Jason A. Donenfeld</name>
+	</maintainer>
+	<longdescription lang="en">
+		Command line interface for testing internet bandwidth using speedtest.net.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">sivel/speedtest-cli</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-0.3.4-r1.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-0.3.4-r1.ebuild
new file mode 100644
index 000000000000..9d15ffc0b7d4
--- /dev/null
+++ b/net-analyzer/speedtest-cli/speedtest-cli-0.3.4-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command line interface for testing internet bandwidth using speedtest.net"
+HOMEPAGE="https://github.com/sivel/speedtest-cli"
+SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~arm ~arm64"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( CONTRIBUTING.md README.rst )
+
+PATCHES=( "${FILESDIR}/${PN}-0.3.4-fix-unicode-py3.patch" )
+
+python_install_all() {
+	doman ${PN}.1
+	distutils-r1_python_install_all
+}
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-1.0.1.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-1.0.1.ebuild
new file mode 100644
index 000000000000..0ddf1db51517
--- /dev/null
+++ b/net-analyzer/speedtest-cli/speedtest-cli-1.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command line interface for testing internet bandwidth using speedtest.net"
+HOMEPAGE="https://github.com/sivel/speedtest-cli"
+SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+DOCS=( CONTRIBUTING.md README.rst )
+
+python_install_all() {
+	doman ${PN}.1
+	distutils-r1_python_install_all
+}
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-1.0.2.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-1.0.2.ebuild
new file mode 100644
index 000000000000..0ddf1db51517
--- /dev/null
+++ b/net-analyzer/speedtest-cli/speedtest-cli-1.0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command line interface for testing internet bandwidth using speedtest.net"
+HOMEPAGE="https://github.com/sivel/speedtest-cli"
+SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+DOCS=( CONTRIBUTING.md README.rst )
+
+python_install_all() {
+	doman ${PN}.1
+	distutils-r1_python_install_all
+}
diff --git a/net-analyzer/sqlninja/Manifest b/net-analyzer/sqlninja/Manifest
new file mode 100644
index 000000000000..046a3f7a649d
--- /dev/null
+++ b/net-analyzer/sqlninja/Manifest
@@ -0,0 +1,6 @@
+AUX sqlninja 47 SHA256 67593808c0f076b9155ea0e0cd93d378642808835dd495f9f07d72502c8f6f82 SHA512 5ad7443ca0691e5e9a309d698d3503e683cf38d9ac980c7aaff562e008fc5120736a826ee87a44ea6c65da15fa868d9fcdf3291f97ad2f747ad3ceddb66065c4 WHIRLPOOL e2024d99119c6c704776a7352a40f5708d58fb02158cf964ba100e81be2e796ee82fb9e6defe5453a7ede8bbb2ca4fb0faa3e45e8a4bd702e3cb789cda508416
+DIST sqlninja-0.2.6-r1.tgz 454841 SHA256 7f8e9103d3fe58eb6e6f1476474589f7e5ca501703a82ae5299bd7a708342bc5 SHA512 18f6c8f0f1eca59d9ce6df80267f1f6bf45d151dfcd395b32d349119e1480389ba28f057778349b4276d480f60c41ca03578a1ca9c4e246f3fcb63653bc6ccf9 WHIRLPOOL 03b389d49e1854a16984db7272d391827488ca5004fa75e52e0a7b2708cfeeb1c6371c49ddf57dae332387f1ca0feca06d7b22547e1ed23ea2ba6627f9b8a9ac
+EBUILD sqlninja-0.2.6_p1-r1.ebuild 1085 SHA256 b878cefab6cddc45a0049ab3e6d8427ad4570405cfcb7fd578953c539851ee6f SHA512 04a353d57136d745435db0081a3712cda101bd84682b8298fc2e1f414047ee982bf0ecf1629505cf6b92012b64b347f2e41048fc3a2aff8a56821b6fa8167dac WHIRLPOOL 0ba88349a0f3a3b6d98311a8881a1e64d4d70ddc4733cd5bc5c780fe241cb4b5f2b4582f6555a38bbdb2518d432b3cd8ab97ca1abdbf304c5dc7fd34426d2a57
+MISC ChangeLog 2597 SHA256 82fac09507a1803ca4a1aa46dce8327947f5c283405e8cefb60beb2f323669ff SHA512 204a20cbf3552866cee353d9d10a179022398ff94a5e5368f71076bad940c598b85bd95fcd9a7ed5ed90dbd454c52419087a3522f548430729e77ecf770f9741 WHIRLPOOL 01b021a70e6e4264de9d8919932c9b0f8637204f5960b9a44317311d7fc374725bf25f6d86a3dc8e190daff33d5848a61b7a7f31e9a8e61d0189fd9811955190
+MISC ChangeLog-2015 739 SHA256 eb602402242fdcd4433c2d736a2e82ad4b09613184370c7c8c6a8b9bc8df6210 SHA512 f78182b79d271e8dcfa1e89712435f37d0761ceb436b9c1b77114229ccf103e0c717b50acab5552557f039ee63dbd14210af2983ebd52f6c024bc06f5a5254a9 WHIRLPOOL 2d39d61e2a63f29b61cc5e7ff739678a55f563121edea8c41f4dff7e344944af5f63314219a1cef88252c113696504680c04d1448a936152124dc38c294b3c2c
+MISC metadata.xml 358 SHA256 c43dfe1e9f547d16fd9a0474815de0dc923fad688db5517556c3fe3753a3c063 SHA512 54207d10d599ae5f3fb994b9c60fb3c5631a25b590aec06c86463e101e4d99b3d48a667868c5732a9bcb2feffd9a731166efc75b25d9793107ec11ff4c4cf0cd WHIRLPOOL 6da5fb83e191df3edad455aa7c1debe665a2c22a82bccd55143238e63f1946123f35342f0e50b080575b7099b6d7ac47d408e8c86cd21a05f97a916260f5b7dc
diff --git a/net-analyzer/sqlninja/files/sqlninja b/net-analyzer/sqlninja/files/sqlninja
new file mode 100644
index 000000000000..bb0f9e18b747
--- /dev/null
+++ b/net-analyzer/sqlninja/files/sqlninja
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd /usr/lib/sqlninja/
+./sqlninja $@
diff --git a/net-analyzer/sqlninja/metadata.xml b/net-analyzer/sqlninja/metadata.xml
new file mode 100644
index 000000000000..33aad216574c
--- /dev/null
+++ b/net-analyzer/sqlninja/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">sqlninja</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild b/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild
new file mode 100644
index 000000000000..e85466b632e4
--- /dev/null
+++ b/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit versionator
+
+MY_PV="$(replace_version_separator 3 '-')"
+MY_PV="${MY_PV/p/r}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A SQL Server injection & takeover tool"
+HOMEPAGE="http://sqlninja.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RESTRICT="mirror"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/IO-Socket-SSL
+	dev-perl/List-MoreUtils
+	dev-perl/Net-DNS
+	dev-perl/Net-Pcap
+	dev-perl/Net-RawIP
+	dev-perl/NetPacket
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install () {
+	dodoc sqlninja-howto.html ChangeLog README
+
+	if use doc; then
+		dodoc -r sources
+		docompress -x /usr/share/doc/"${P}"/sources
+	fi
+
+	insinto /etc/"${PN}"
+	doins sqlninja.conf.example
+
+	rm -r sources sqlninja-howto.html ChangeLog README LICENSE || die
+	rm -r apps || die
+	rm sqlninja.conf.example || die
+
+	dodir /usr/lib/"${PN}"
+	insinto /usr/lib/"${PN}"
+	exeinto /usr/lib/"${PN}"
+	doins -r *
+
+	doexe sqlninja
+	dosbin "${FILESDIR}"/"${PN}"
+}
diff --git a/net-analyzer/squid-graph/Manifest b/net-analyzer/squid-graph/Manifest
new file mode 100644
index 000000000000..e3daba78e63d
--- /dev/null
+++ b/net-analyzer/squid-graph/Manifest
@@ -0,0 +1,5 @@
+DIST squid-graph-3.2.tar.gz 20066 SHA256 f83a801e85f0adf74638b47306eca262f4a694d98fb89236ed133caff8dbdcfb SHA512 ab2529b0b67fb6549dd0837f2208ae712460ad19876baee8000a51c91ab31c464b83b360dfc93690ad6f4b3feb969cc95ca38a179ddefb6e0aa54b0cff866bfd WHIRLPOOL f33c65ce72ffbf6eff99f853dcaddd96e8171943706674fbb1ee04e6f9d0276163485edb7c6278b0b4e2bf6091b27d93441247712077d3791c3dfbc6b64c4410
+EBUILD squid-graph-3.2-r1.ebuild 476 SHA256 d00c2eb58301e41c638d7e10d1d4305c78503c0c6c37e16da8ed45d004e2689c SHA512 6a7c6deb475718b5b10a9d6f3fbabd85e7a412211bd7e8743f60a3ac4506566ffc165504cf90030d63eaf7f57c01085469231359ce13845344fa91364f0e608d WHIRLPOOL 027ef0a1616ea5def153190f6ce33546ce3a72114b90f04738afeaa34eb91c962ba4e48ab5da84e448d2680a0c35dc6ce45e28a1220e4b082976af6d7cfa381f
+MISC ChangeLog 2445 SHA256 b41d7ac6f112c56da8676630fb6207fe7a65f22d08b9bfe4739d5be029a8f829 SHA512 19ebe0a4c900075bc977cef367ca21ff705c40ce94aabad30af64013c1ce032773e97e6426573940b5cf4d4929f1b8c419e901e705fe616cdec0b4f4b6728848 WHIRLPOOL cb15d387db9edb8db028e6489104554b92926b674d507dd22b0ba6267a56e8b95c99a816e3676ca16483bde39b2d56ddc31286fffd53bd11dfe1e686165c0c71
+MISC ChangeLog-2015 3398 SHA256 9fd7512cf6fd7fe76af720a376a727a3462fa5fe9de9072ddcca6a85349abfe9 SHA512 16158ef5433fdf3e480bd440e0b379718aca7dbb5211f01f93430c07c493d8cbf861d87d6bccc501339208f480cd28b70b554e79387436201b185d9bee65a88a WHIRLPOOL c1b67066fab23d7f05460a7cab4c2ed3f79b50afa91442189cd80e9fbc0b58101d4c4f5df1af16aed7b531a9cacef572c0351d8f904270c3245d4c4dd852b1ac
+MISC metadata.xml 440 SHA256 9a071817537f82a9b145149266543d02886fc83b683bc05ada326c3ac9c27ec5 SHA512 32c8207098291a0c1d4248d3d2a6c726a9627c038be9df16aa9368ae20c6dfd63380152c79b3348d990fa61ea8acc220a87bafe3e3f5ba9913686b142aea23d2 WHIRLPOOL 05e77b692be0c62c2859d465e7ba732ef7af91e88cd885c44cf3572dbb7c86d76e331909a4120979db412424d291f245756a1362be2b29fdbd2ce2a66a11743f
diff --git a/net-analyzer/squid-graph/metadata.xml b/net-analyzer/squid-graph/metadata.xml
new file mode 100644
index 000000000000..db2b74207c46
--- /dev/null
+++ b/net-analyzer/squid-graph/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>Squid logfile analyzer and traffic grapher</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">squid-graph</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild b/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild
new file mode 100644
index 000000000000..a532f9ba04d6
--- /dev/null
+++ b/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Squid logfile analyzer and traffic grapher"
+HOMEPAGE="http://squid-graph.sourceforge.net/"
+LICENSE="GPL-2"
+SRC_URI="mirror://sourceforge/squid-graph/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+RDEPEND="dev-perl/GD[png]"
+
+S=${WORKDIR}/${PN}
+
+src_install () {
+	dobin apacheconv generate.cgi squid-graph timeconv
+	dodoc README
+}
diff --git a/net-analyzer/squidsites/Manifest b/net-analyzer/squidsites/Manifest
new file mode 100644
index 000000000000..00a269fb2ea6
--- /dev/null
+++ b/net-analyzer/squidsites/Manifest
@@ -0,0 +1,6 @@
+AUX squidsites-1.01-format-security.patch 210 SHA256 37764d47b14db4bf95b74c0bcfee1312b6a7678b20c4787510acc468226ebe2d SHA512 0e5d42ccf3a0ff75b630ae82b4db34d4e04df1e3336a701168df2ceb7194ce64d22f442dd523f7a3e37a74255a71cad162026e43121d0f4d06861cd0f5e8ac5f WHIRLPOOL 122974f8e4ecf3e30bff8fc01c42b85aea415660d666eed919c62586d6f32f4676c7064ab2e15607e4b5e11f9d360e227d637b1c896cbb965e86e68288829219
+DIST squidsites-1.01.tar.gz 23646 SHA256 5bf946a4ff3d4a695b695c28b7455071f08f1210f1bfee1bd340ee6211de75e0 SHA512 ecd6caf4ffbb531de1de85b2d8548e4256603909b1d1bc8c368516b644298803bc0cf3036a370ad679a763b94494bd755043df8a806dcca16990024c515cfed9 WHIRLPOOL b8bb650df49bed0d5037b006537bce14c2a6ee580a712af0745646ea9f32759a26a5351b9aef7404ec4ff7201d09e39d155d2e8c03582f826f39f6e48e427b8e
+EBUILD squidsites-1.01-r2.ebuild 765 SHA256 cb7acb2ed66a68e6b6a71cfb8b7a02478fe63ab7f6f05cf9c735b57d563695b2 SHA512 96c7504f3da74468cfe9fd371c459e77bbaeadc9b5d3c492edffbc2027457235ce10cc5ce321bbd14645d82446597ca962d893ef724205314cc9fab83bd28fb0 WHIRLPOOL d164f4ff9c2ac5ccca5d99ac15b11b49d6320c23f7f1a9c090dd251ff0c9e04d498307e5e59e841d0d47ee39bf6ddbb361be07404f5037b8b8455b3d04f79114
+MISC ChangeLog 2492 SHA256 703eda9d8230daac2e326202358fd539e88f4c0733c973298a8905a9659acdaf SHA512 8d581a9cec9e68176fbeffc230c410d5074f43c6e3397ecb5ae9369e276e6298e8a375e429d8b2600ff0650a02bd0dd64fb98a64b86847aa49ac5ae4373bc201 WHIRLPOOL b3c44b834cfb939dee8eef958faf78c92f7c8d96f6d7c245bb9018f1fec7c0134b84e0a79aa162cb0e544b5de407ead7b9712884a0adf8cb633eabfdc1daaeed
+MISC ChangeLog-2015 2131 SHA256 0e0f4c72beeb3abbbefa3b1c20fbf52618358dafca0e74b1f9c29d9992b16b2f SHA512 4d84891d3af2af1b3cbd0ed92fac7d1ade9385da60bb3c867ad8e70573a060e9686a11f414007dde52969c7b1e983f4197243f727ff79048b680ec83eaf38737 WHIRLPOOL 444ef7645c88237b7d257d9b039d7a9b7883dde6c94d2d2a2572039b4b09760008453ee94e356de12e86d6cfc147b82d934556c8d0ae3ef71d46aad9dd7ceedb
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/squidsites/files/squidsites-1.01-format-security.patch b/net-analyzer/squidsites/files/squidsites-1.01-format-security.patch
new file mode 100644
index 000000000000..3dd72203c309
--- /dev/null
+++ b/net-analyzer/squidsites/files/squidsites-1.01-format-security.patch
@@ -0,0 +1,11 @@
+--- a/src/squidsites.c
++++ b/src/squidsites.c
+@@ -286,7 +286,7 @@
+ static

+ void print_help()

+ {

+-   fprintf( stderr, help_message );

++   fprintf( stderr, "%s\n", help_message );

+ } /* print_help */

+ 

+ 

diff --git a/net-analyzer/squidsites/metadata.xml b/net-analyzer/squidsites/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/squidsites/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/squidsites/squidsites-1.01-r2.ebuild b/net-analyzer/squidsites/squidsites-1.01-r2.ebuild
new file mode 100644
index 000000000000..f6bd96865543
--- /dev/null
+++ b/net-analyzer/squidsites/squidsites-1.01-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A tool that parses Squid access log file and generates a report of the most visited sites"
+LICENSE="GPL-2"
+HOMEPAGE="http://www.stefanopassiglia.com/misc.htm"
+SRC_URI="http://www.stefanopassiglia.com/downloads/${P}.tar.gz"
+SLOT="1"
+KEYWORDS="amd64 ppc x86"
+
+S="${WORKDIR}/src"
+
+src_prepare() {
+	# Respect CFLAGS
+	sed -i Makefile \
+		-e '/^CCFLAGS=/s|-g| $(CFLAGS) $(LDFLAGS)|' \
+		|| die
+	epatch "${FILESDIR}"/${P}-format-security.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install () {
+	cd "${WORKDIR}" || die
+	dobin src/squidsites
+	dodoc Authors Bugs ChangeLog GNU-Manifesto.html README
+}
diff --git a/net-analyzer/squidview/Manifest b/net-analyzer/squidview/Manifest
new file mode 100644
index 000000000000..028677ebf001
--- /dev/null
+++ b/net-analyzer/squidview/Manifest
@@ -0,0 +1,5 @@
+DIST squidview-0.80.tar.gz 122502 SHA256 ce0a7ba0442483b75edf55a1e439181ac7ceb289833734666d9e7e7c31c0f205 SHA512 4a9bb0f296222ef5c8c127d4e0697ff050a2adcf8b28771379da32af816a2d43edbbd3f02920dc2c54735e7a22f50e6b9040067e2b77136506f472cfedff8894 WHIRLPOOL 76eac9e4cf3c970a5a4a47fd31f6338217f62ff5168ee75d16f2e5a0d2f5990923f7c3d9896af32b8fb0f08de5905f6d5ef903f1d43edbbfa7974daeec11072f
+EBUILD squidview-0.80.ebuild 628 SHA256 21e42b46f32a90ef15ea69e566f6c00b553f7f637c6b3d3b49d7cff265a7ed17 SHA512 7093c00269784d92f1055d48ad25d4b2988581c8653d00271dbcf86038b6874a47e21b9a5270082b3255033cd80dd115c6c05ec9be6d1186430ef475213d43d8 WHIRLPOOL 6233371b9bc55d755a7eaf0a46f540ed5f60cbcf2a7f1e300bf61807a5905e1c5e6586b220480b8cfb32c926cb257f885125ae414ead35984cd59ed700a82dbb
+MISC ChangeLog 2530 SHA256 e2bfa28ee3dba99281cd107a41d5e035c6dd046cd99fc2408bca501adc139b34 SHA512 6fe760b770676241b1e148e6b560a3cf4f00811184ca7209b3fb809c0efcbec178c2275a6ed52dc9016e5dad870529df461afecf954b19ef2abe9516f039bb42 WHIRLPOOL b8eac3d37703cffcb21f588126c11cf264cb3a25eacdff20a9ec0c13bdc317e85e67223da4274b3da87559e978662595d9d964582caeffec483bb8372f4100c1
+MISC ChangeLog-2015 810 SHA256 40a6f5e2bca8dfcbe6c68df2a29e590252b127005dd20e14368cb95813b5e749 SHA512 8b6e579acf35f97e88127f6c1d84dd9d6bfd3cca5efb0531c9d992318bcbc064ae3730f67ffa6acf4ecf91a02af83345d90c4800146087b9b674deee8b192cc6 WHIRLPOOL f798607e49c4f20e49ac7b1eb87b1f1d01c24a751d5e3c283109ca57d9954fcd3150a37863ac712603668c4c352ecf470d1e734f967ddd993f4639e5618c41e0
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-analyzer/squidview/metadata.xml b/net-analyzer/squidview/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-analyzer/squidview/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-analyzer/squidview/squidview-0.80.ebuild b/net-analyzer/squidview/squidview-0.80.ebuild
new file mode 100644
index 000000000000..baa6c58d7b3e
--- /dev/null
+++ b/net-analyzer/squidview/squidview-0.80.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+DESCRIPTION="Interactive console program to analyse squid logs"
+HOMEPAGE="http://www.rillion.net/squidview/"
+SRC_URI="http://www.rillion.net/squidview/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64"
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# BUGS and HOWTO are installed also as part of the Makefile, but the
+	# program expects them at the right location, so we can't get rid of
+	# them there for now.
+	dodoc README AUTHORS BUGS HOWTO
+}
diff --git a/net-analyzer/ssldump/Manifest b/net-analyzer/ssldump/Manifest
new file mode 100644
index 000000000000..28da8bf82321
--- /dev/null
+++ b/net-analyzer/ssldump/Manifest
@@ -0,0 +1,12 @@
+AUX ssldump-0.9-DLT_LINUX_SLL.patch 256 SHA256 8e11944fd4ed5299bc2b557445b68e5746fd3d8f87ed1393ce066af98e206e8b SHA512 4365db431100d7d6520b5563c2f97c0954bc0c66867a5e86b49d66d1cf39fac05bfe87b585e279f51de8358fd8def3ffc3a6d448280a11344522cea21d702130 WHIRLPOOL c74b22bf8c6f51e394413e5d88bdf9eac534b130df7f5391bf55e53f24940dce267c1550db774362f1563db6cc707c4f944ecd745f75a72905cdc439424dd433
+AUX ssldump-0.9-configure-dylib.patch 743 SHA256 d71970cf77577b3d7b2d833d7bdef91c77643191923ecec2454bf1e55dd6cbbf SHA512 7dcaa84416e7c776a0dffaefce7944ef23f9bd4084885ccec1f4b5d885851abdd2dd6829ca69cbaeae3e109175ca19a79cb0e19ba6e370138e9989d892e55aa5 WHIRLPOOL 8b1aadb8a8dd54b02f48b8bad6c63118a653b75308dc4bfd4a93fdb2dbf0bc07ef72f1bd645d402d77625e5454c47ed0173c19b863b3e389bbbb919b3067443e
+AUX ssldump-0.9-declaration.patch 361 SHA256 692aa400ef7751aa6d7c6a93e820026554e2453b526ef26de6c0e6cdb6679a3d SHA512 318a28c2a92cd2b2983e056d2116b8b755248f5e3578a062fa687c35ebe20b8f9d152dea29bb273b016991ad50a197356607c9fd2a75e30879fcace4cbe15d7f WHIRLPOOL 5cda2b05cef1e1b29c7c8646c34df333e559afd6c59ec122a91a77bbeb8551570041622abe88e9a4023d471e242362924f6999935699c4d0b7ca1401f11d327b
+AUX ssldump-0.9-includes.patch 700 SHA256 95dc1fc23a5db528d1fd8e5f9d24d8a681ea5b7b49416c4ee1c7aaa99cc9ce4e SHA512 ebd0fd742d93f35926b68a45039ef895153e7c3ca6e8d1afc412392cedcdaadfc03bd364b9c55ef1c88812a6d10de5be7a0455cf3a7f3b010b44bfcf096b5625 WHIRLPOOL a59218948a75e9e6f7d8e7afdbc9696ada15c160d4933b985df071f6af9ea5137972b60bb3e17af3b7687c7ec186592f1a3b1f4d4601cb64f3c8ee79ce5e2308
+AUX ssldump-0.9-libpcap-header.patch 178 SHA256 87ba5657b81fa310de3403926ee2f1cd37ee57473fe612d31ab65c9fb9871e13 SHA512 ef50bcb81712ffb41414bf68ca91c7d7d4158d205e9527718d54373c04a4a4fbe1cdc93f4546d993d20a1bece6954b058a2ee4816e2ff3f167867c366cba8863 WHIRLPOOL feb1e2f668baf27ac8100da6e5d94dacc8f22fe66c94b772ccb7630488ce591ff4c2f610d497b799a2add1837a62e491ae61856b4ab26e7f754589cd071c919a
+AUX ssldump-0.9-openssl-0.9.8.compile-fix.patch 449 SHA256 315ef6847b31bcd07e271257a89393a0fa8f76f8b0838c4a53d2b32bfecdd20f SHA512 37b6ab0f9ae44751570c8eb1eaf4cb1f04a3b812dc18611c6dbca003ac84dd260582351749011e7a56eac2858f817376fc92cdd5a0aae2a2c11ce98e96b3aeb9 WHIRLPOOL 98887281da15411edf601bba2ea30603752242ba9dcf05cb02b0d9a0ead04258a5430e010875e035f97d8e44471cf829ed413bcbc971cc4a9c5fd513a8cd96b1
+AUX ssldump-0.9-prefix-fix.patch 554 SHA256 42725e0df17d2265b8c874d83d9a85a35e379d3ad04e35660315cfa49255b7de SHA512 55a11a1ec6e76039b474dabb2a9b5e647c66231d0ab12620dc5513335da3057bcedb36df1a5e19480be7f4a7004aaecc4d21abd8420149a79fb48abc981d1ff8 WHIRLPOOL 6f254680bbd0dd340d415034d6bb0421f72e28ee471fdb6eea47634cc3e21042039155e30818d8ebf900a5f5e380aef5ed8b98eb83df707dfb11f21387b1c408
+DIST ssldump-0.9b3.tar.gz 137435 SHA256 6422c16718d27c270bbcfcc1272c4f9bd3c0799c351f1d6dd54fdc162afdab1e SHA512 ea81558a243950ab43354c9f33c0a4feae0ae859bc2bd6e6b58838a01f4a1e7a6447f2a9ab1fa40bbe8dbd6c3630c489c17fc9c066cacfddfb64269b0cd5090a WHIRLPOOL d9b1593a8d160b8c1eb88397fe6cfdbca7df8122ebac408e71e9cb77c60bd44c762f15ebebdfa53023cba73a3758629c5699e474aaf3e599e7341013ceb15d7a
+EBUILD ssldump-0.9_beta3.ebuild 1431 SHA256 55baab5cee7c51973a1360f50032658e60a6f92b921daa03e55cf24e55de3b11 SHA512 6e4233e3440b5cbc3ada6c588403c258a5fc24f6f4fb3d13f8a99610caa76033ca9138613cd24d0a11be9e5477eb5d0c7323d8e33f2b5c77f81382692caa8e72 WHIRLPOOL 0c55d59f560e16df2602d8810a05422e3bc8482bdce18468ae95bcc3b5689253962766a68e68dc69f512831b68921d7c2d4e2ca78f0dacbb2b19470ea6a2671c
+MISC ChangeLog 3001 SHA256 9eb03fb5af03107aa56d5141bd9556e75118012250a4333a59eef04f929cc53a SHA512 0b3774756f731eb40806760cfbd8a1e9d27a440977daa5c640800ca43c5dd1b572d49c8f2c65684f4f8ff759f6ee6c2ae1eb83fd0c07b88368e2229ddbe43d8b WHIRLPOOL 3310303dd7b1d813c947f3497f0fdd476ec3760d54f0f677d3419ec225f85ec5f33c0caa9f00b1de50860c35478a056f68e9038e6b8ad4b9965915ce4db1ae3d
+MISC ChangeLog-2015 4571 SHA256 c439ed14ce2c0d2f604ad3345713a7d949bcbd019f679a87e41d98c015c44a4f SHA512 a4809674f006abc3e42a63adfb4b78c64744220eeff6fce14127a051d560a80bdfad3d74506495408fc8ad4090ba038b4155aab5a4985277d5c7874f86ac2da2 WHIRLPOOL 01bce89688f9858478377b536912fa1a92d42743a170c544c03cbc5cbb7189b4e41b4ba80d8b1973cb5d88bd1e2f4e07197f0e028bc41213e62824e5b06afa8e
+MISC metadata.xml 359 SHA256 e6ecb26b0858b880d1ae506b9aba3b87feb5c0ad7643fcd4d8023cf5ffa2de01 SHA512 c80158a4a7334b16b28fe0462cc82e70c03674bde862f6858ab6f67645cb3d856fb41bfe5480690fa25c85b0a5205bc2f6cf2febb45fd355a949da92024fc1ee WHIRLPOOL b4a79a2eb9c568fd39664ee85219d2cbce352b18f625f80badc40fb3cfcd3eb1382e18fcf29dfc2a1f48d2243cd0a95ba0b79cea80a6e00e68bd68d78f1a81bd
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-DLT_LINUX_SLL.patch b/net-analyzer/ssldump/files/ssldump-0.9-DLT_LINUX_SLL.patch
new file mode 100644
index 000000000000..9a58c6369929
--- /dev/null
+++ b/net-analyzer/ssldump/files/ssldump-0.9-DLT_LINUX_SLL.patch
@@ -0,0 +1,13 @@
+--- a/base/pcap-snoop.c
++++ b/base/pcap-snoop.c
+@@ -157,6 +157,10 @@
+           return;
+         
+         break;
++      case DLT_LINUX_SLL:
++        data+=16;
++        len-=16;
++        break;
+     }
+     network_process_packet(n,&hdr->ts,data,len);
+   }
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch b/net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch
new file mode 100644
index 000000000000..941350e8c789
--- /dev/null
+++ b/net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch
@@ -0,0 +1,28 @@
+--- a/configure.in
++++ b/configure.in
+@@ -102,14 +102,13 @@
+ AC_MSG_CHECKING(for PCAP library)
+ ac_found_pcap_lib_dir="no"
+ for dir in $ac_pcap_lib_dir; do
+-	if test -f $dir/libpcap.a; then
++	if test -f $dir/libpcap.so -o -f $dir/libpcap.dylib; then
+ 	dnl Ok, we think we've found them, but check that they
+-	dnl actually ontain the right functions
++	dnl actually contain the right functions
+ 		save_LIBS=$LIBS
+-		save_LDFLAGS=$LDFLAGS
+ 		LIBS="-lpcap $LIBS"
+ 		if test "$dir" != "/usr/lib"; then
+-			LDFLAGS="-L$dir $LDFLAGS"
++			LIBS="-L$dir $LIBS"
+ 		fi
+ 		AC_TRY_LINK_FUNC(pcap_open_live,ac_linked_libpcap="true",
+ 			ac_linked_libpcap="false");
+@@ -118,7 +117,6 @@
+ 			break
+ 		fi
+ 		LIBS=$save_LIBS
+-		LDFLAGS=$save_LDFLAGS
+ 	fi
+ done
+ 
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-declaration.patch b/net-analyzer/ssldump/files/ssldump-0.9-declaration.patch
new file mode 100644
index 000000000000..836b52c84ab2
--- /dev/null
+++ b/net-analyzer/ssldump/files/ssldump-0.9-declaration.patch
@@ -0,0 +1,11 @@
+--- a/ssl/ssl_rec.h
++++ b/ssl/ssl_rec.h
+@@ -54,6 +54,8 @@
+   SSL_CipherSuite *cs,UCHAR *mk,UCHAR *sk,UCHAR *iv));
+ int ssl_decode_rec_data PROTO_LIST((ssl_obj *ssl,ssl_rec_decoder *d,
+   int ct,int version,UCHAR *in,int inl,UCHAR *out,int *outl));
++int ssl3_check_mac(ssl_rec_decoder *d, int ct, int ver, UCHAR *data,
++  UINT4 datalen, UCHAR *mac);
+ 
+ #endif
+ 
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-includes.patch b/net-analyzer/ssldump/files/ssldump-0.9-includes.patch
new file mode 100644
index 000000000000..8ca06dcef449
--- /dev/null
+++ b/net-analyzer/ssldump/files/ssldump-0.9-includes.patch
@@ -0,0 +1,30 @@
+--- a/common/lib/r_assoc.c
++++ b/common/lib/r_assoc.c
+@@ -57,6 +57,7 @@
+ static char *RCSSTRING="$Id$";
+ 
+ #include <r_common.h>
++#include <string.h> /* memcpy() memcmp() */
+ #include "r_assoc.h"
+ 
+ typedef struct r_assoc_el_ {
+--- a/common/lib/r_bitfield.c
++++ b/common/lib/r_bitfield.c
+@@ -11,6 +11,7 @@
+ static char *RCSSTRING="$Id$";
+ 
+ #include <r_common.h>
++#include <string.h> /* memcpy() memset() */
+ #include "r_bitfield.h"
+ 
+ int r_bitfield_create(setp,size)
+--- a/common/lib/r_data.c
++++ b/common/lib/r_data.c
+@@ -47,6 +47,7 @@
+ static char *RCSSTRING="$Id$";
+ 
+ #include <r_common.h>
++#include <string.h> /* memcmp() memcpy() memset() */
+ #include <r_data.h>
+ 
+ int r_data_create(dp,d,l)
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-libpcap-header.patch b/net-analyzer/ssldump/files/ssldump-0.9-libpcap-header.patch
new file mode 100644
index 000000000000..a9a724658ccf
--- /dev/null
+++ b/net-analyzer/ssldump/files/ssldump-0.9-libpcap-header.patch
@@ -0,0 +1,10 @@
+--- a/base/pcap-snoop.c
++++ b/base/pcap-snoop.c
+@@ -49,7 +49,6 @@
+ 
+ #include <pcap.h>
+ #include <unistd.h>
+-#include <net/bpf.h>
+ #ifndef _WIN32
+ #include <sys/param.h>
+ #endif
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-openssl-0.9.8.compile-fix.patch b/net-analyzer/ssldump/files/ssldump-0.9-openssl-0.9.8.compile-fix.patch
new file mode 100644
index 000000000000..2ce16d54f168
--- /dev/null
+++ b/net-analyzer/ssldump/files/ssldump-0.9-openssl-0.9.8.compile-fix.patch
@@ -0,0 +1,18 @@
+--- a/ssl/ssldecode.c
++++ b/ssl/ssldecode.c
+@@ -51,6 +51,7 @@
+ #include <openssl/ssl.h>
+ #include <openssl/hmac.h>
+ #include <openssl/evp.h>
++#include <openssl/md5.h>
+ #include <openssl/x509v3.h>
+ #endif
+ #include "ssldecode.h"
+@@ -131,6 +132,7 @@
+     ssl_decode_ctx *d=0;
+     int r,_status;
+     
++    SSL_library_init();
+     SSLeay_add_all_algorithms();
+     if(!(d=(ssl_decode_ctx *)malloc(sizeof(ssl_decode_ctx))))
+       ABORT(R_NO_MEMORY);
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-prefix-fix.patch b/net-analyzer/ssldump/files/ssldump-0.9-prefix-fix.patch
new file mode 100644
index 000000000000..74d7ddcd6f68
--- /dev/null
+++ b/net-analyzer/ssldump/files/ssldump-0.9-prefix-fix.patch
@@ -0,0 +1,22 @@
+eliminates unused variable ROOT, which disturbs ld from Prefix. Bug #414335
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -46,13 +46,12 @@ BINDIR=@sbindir@
+ MANDIR=@mandir@
+ RM=rm -f
+ 
+-ROOT=./
+-ANALYZE_SRCDIR=$(ROOT)base/
++ANALYZE_SRCDIR=base/
+ COMMONDIR=common/
+ COMMON_LIB_SRCDIR=$(COMMONDIR)lib/
+-ANALYZE_NULL_SRCDIR=$(ROOT)null/
+-ANALYZE_SSL_SRCDIR=$(ROOT)ssl/
+-ANALYZE_RECORD_SRCDIR=$(ROOT)@RECORD_MOD@/
++ANALYZE_NULL_SRCDIR=null/
++ANALYZE_SSL_SRCDIR=ssl/
++ANALYZE_RECORD_SRCDIR=@RECORD_MOD@/
+ include rules.mk
+ 
+ include $(COMMON_LIB_SRCDIR)/targets.mk
diff --git a/net-analyzer/ssldump/metadata.xml b/net-analyzer/ssldump/metadata.xml
new file mode 100644
index 000000000000..12203e1a761b
--- /dev/null
+++ b/net-analyzer/ssldump/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">downloads</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/ssldump/ssldump-0.9_beta3.ebuild b/net-analyzer/ssldump/ssldump-0.9_beta3.ebuild
new file mode 100644
index 000000000000..08f96fcfee51
--- /dev/null
+++ b/net-analyzer/ssldump/ssldump-0.9_beta3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+AUTOTOOLS_AUTORECONF=1
+inherit autotools eutils toolchain-funcs
+
+MY_PV=${PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="An SSLv3/TLS network protocol analyzer"
+HOMEPAGE="http://ssldump.sourceforge.net/"
+SRC_URI="
+	http://downloads.sourceforge.net/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz
+"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ssl"
+
+RDEPEND="
+	net-libs/libpcap
+	ssl? ( >=dev-libs/openssl-1 )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9-libpcap-header.patch
+	"${FILESDIR}"/${PN}-0.9-configure-dylib.patch
+	"${FILESDIR}"/${PN}-0.9-openssl-0.9.8.compile-fix.patch
+	"${FILESDIR}"/${PN}-0.9-DLT_LINUX_SLL.patch
+	"${FILESDIR}"/${PN}-0.9-prefix-fix.patch
+	"${FILESDIR}"/${PN}-0.9-declaration.patch
+	"${FILESDIR}"/${PN}-0.9-includes.patch
+)
+
+src_prepare() {
+	default
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+
+	econf \
+		--with-pcap-inc="${EPREFIX}/usr/include" \
+		--with-pcap-lib="${EPREFIX}/usr/$(get_libdir)" \
+		$(usex ssl --with-openssl-inc="${EPREFIX}/usr/include" '--without-openssl') \
+		$(usex ssl --with-openssl-lib="${EPREFIX}/usr/$(get_libdir)" '--without-openssl')
+}
+
+src_install() {
+	dosbin ssldump
+	doman ssldump.1
+	dodoc ChangeLog CREDITS README
+}
diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest
new file mode 100644
index 000000000000..45345f73b545
--- /dev/null
+++ b/net-analyzer/sslscan/Manifest
@@ -0,0 +1,9 @@
+DIST openssl-1.0.2k.tar.gz 5309236 SHA256 6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 SHA512 0d314b42352f4b1df2c40ca1094abc7e9ad684c5c35ea997efdd58204c70f22a1abcb17291820f0fff3769620a4e06906034203d31eb1a4d540df3e0db294016 WHIRLPOOL ffa3d89a078db6829f1fff21779a19c87e059600162e6d7d3114b8440ba5fa7d1a08e04594b6ed8ab47e148782de299d7ec338f2ba2d466bf7737b0749f590cd
+DIST sslscan-1.11.10-rbsec-openssl.tar.gz 5523414 SHA256 39b16ee1615436d8adf15fa0b5079193e72af2f9ba38dcb62719ef348ff36efb SHA512 e0ab14cd20bf8251defb685ca1384564f5f3624a8168608bed476f8d77ae4fd9096eacc36c0f271fc281d2d9070d25fa9e56ebf993321e06d6954e40c28537a7 WHIRLPOOL 137206996a7a6ec5443542bd18380c03c79fecdf72779fb7c672c9b19273146208413f17d0412ada2cbdd20abd572fdd37d1e56b97265b043dc3ce8de2a0adb4
+DIST sslscan-1.11.10-rbsec.tar.gz 52108 SHA256 fbb26fdbf2cf5b2f3f8c88782721b7875f206552cf83201981411e0af9521204 SHA512 802be7ad5289fb56b2902c69e2c831b5d8cacc01d650353b29c839e0ce4ae03e55656fa5d481c213b5162fc71b2a82da19b0ea34f6d86c34278c275a2bb73a7a WHIRLPOOL 14a1a13e6b98b764dba076b5b4fb353e137c88a1fd891a6c3e8f95f79f7fa91ca065a438d4e1bcdc60f3bdfeaf4cbe2a0bd6d339757d7bbd85b340bd1d44c8e9
+DIST sslscan-1.11.9-rbsec.tar.gz 52215 SHA256 9417061a8f827b02b2b6457031888b1ae0b299460714ce3d9192432afde3a9cb SHA512 ed2ca15c185a36c166bec640f1771114ce845c0a84a6490aeca8170b8623ad3c370515c25079bb1f29fce79e3b24186fd298d72cc101d9076e4d7984a1202938 WHIRLPOOL a854ab3d53c8ea4c071efb5eb94e24e133f7ad1aafb1127bd25872a9433ed75baa520008853987e3fc5f9b67faf413d9a9a5d23db12145aa35182bda6250fed8
+EBUILD sslscan-1.11.10.ebuild 1305 SHA256 502989e5125449e119613eb1e7c9844eaeacfe90b89710e8b4ac1af573fa02b1 SHA512 92fdddcce54763eddd8beb0f2ea474a60f2000d9c896d5b7b073ec3cb2a1dacae12f5f118fd94f5a4e382c7ded6808ca91cbba04929279d1da418e82237be404 WHIRLPOOL ec87748f82051442174790d3dbd306338713a1900be6b0d9977ad14745b38f1685b3463c963f28e04b20a636b6c7b2757932aa4c9b3af4bd59783240ae158581
+EBUILD sslscan-1.11.9.ebuild 1110 SHA256 dc08c158096c614a00b7a88d539ce0d931546150629c0e3793d94a59deafd1fb SHA512 bcc11d8cf25284ee634e36bd4d9bc5fee8a98154064b0a9cbc01f969a1a9933a4e864a64a7b744a26a2c1d661e9b3709ab6519cd72ba9fc4bfc9be14e7273ca5 WHIRLPOOL 9258f7698fc6df7e95a6169e8f9267fb8fbc7f959f87b88194dbb9e1a7a86b38db6bb23176ba63b80f5e3a3f6c70f235ad4fcb48dd2690cfc44919afaaabbe1e
+MISC ChangeLog 3503 SHA256 916623ceeae117af5bbaa04355411b62c68721c5c49b8ad0908ed2a2d8218824 SHA512 0fc082fdc5babecdd19b4eeb703eb34524625bf3835fb9a153b586faeab8e60136205038395977011043ddbd12f5f230218c3b826fd71c569c2a728a2a170638 WHIRLPOOL 0e8a722d1de5b9f64fc5bf040e8b3501495d14b6f86510f0f4aad23dd17152381a0496c587758da3a7ac646313da10223ceb698c31bdff2a3745cdbf421feeb4
+MISC ChangeLog-2015 1720 SHA256 487bc78b6c2f39dc9130f13953b1cac6c358fb9cc9ad6da60dcee531d3dc071f SHA512 da0b53156d1ca7c3eb91fab3ee2567b75c474e59e4bc30158a8a6c9a8edc7066ae0b0d44e9d64fa6a4be20fb314c9f30e1403d06ec902c3925fc89e701a8a316 WHIRLPOOL 218375d3347b3c7d983c245c45ceb7e5ec31a47d80ad26aa12517a1e2e7b510f0018d344468707c98bb6119487360d0057c2668f9b149c7ce832c041c1f87c42
+MISC metadata.xml 295 SHA256 d4feed47e2a1f7805f7ce9c08b5f6ffed07419ceed994b1a7c765512f8e8bf5e SHA512 561d272316db60726db149ffd3f77a59ed4fd7d16dd96e8064e1994666812d5056180965ef93939904ae653e0aa2cbc04621f5700464d5115490d56c24354bb4 WHIRLPOOL 528de02cfd574b41cb6482dac53f7f067f46a96c98c737a9cb446990bca03e62ccb23087000f411bdb069551b93a335114b1c4d5f6411e9b2ffa1691f9be3b0f
diff --git a/net-analyzer/sslscan/metadata.xml b/net-analyzer/sslscan/metadata.xml
new file mode 100644
index 000000000000..a67d5ce56426
--- /dev/null
+++ b/net-analyzer/sslscan/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>graaff@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">rbsec/sslscan</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/sslscan/sslscan-1.11.10.ebuild b/net-analyzer/sslscan/sslscan-1.11.10.ebuild
new file mode 100644
index 000000000000..f71143d59a97
--- /dev/null
+++ b/net-analyzer/sslscan/sslscan-1.11.10.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Upstream now builds against the 1.0.2-chacha branch of PeterMosmans
+MOSMANS_OPENSSL_COMMIT=e90b60086e4ed9649cb3aab08f2b4c6529e7a95a
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Fast SSL configuration scanner"
+HOMEPAGE="https://github.com/rbsec/sslscan"
+MY_FORK="rbsec"
+SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz
+	static? ( https://github.com/PeterMosmans/openssl/archive/${MOSMANS_OPENSSL_COMMIT}.tar.gz -> ${P}-${MY_FORK}-openssl.tar.gz )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +static"
+
+# Depend on -bindist since sslscan unconditionally requires elliptic
+# curve support, bug 491102
+DEPEND="!libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}-${MY_FORK}"
+
+src_prepare() {
+	if use static; then
+		ln -s ../openssl-${MOSMANS_OPENSSL_COMMIT} openssl || die
+		touch .openssl_is_fresh || die
+
+		sed -i -e '/openssl\/.git/,/fi/d' \
+			-e '/openssl test/d' Makefile || die
+
+	fi
+
+	default
+}
+
+src_compile() {
+	if use static; then
+		emake static
+	else
+		emake
+	fi
+}
+
+src_install() {
+	DESTDIR="${D}" emake install
+
+	dodoc Changelog README.md
+}
diff --git a/net-analyzer/sslscan/sslscan-1.11.9.ebuild b/net-analyzer/sslscan/sslscan-1.11.9.ebuild
new file mode 100644
index 000000000000..bb6a781952f1
--- /dev/null
+++ b/net-analyzer/sslscan/sslscan-1.11.9.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+OPENSSL_V=1.0.2k
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Fast SSL configuration scanner"
+HOMEPAGE="https://github.com/rbsec/sslscan"
+MY_FORK="rbsec"
+SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz
+	static? ( mirror://openssl/source/openssl-${OPENSSL_V}.tar.gz )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="libressl +static"
+
+# Depend on -bindist since sslscan unconditionally requires elliptic
+# curve support, bug 491102
+DEPEND="!libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}-${MY_FORK}"
+
+src_prepare() {
+	if use static; then
+		ln -s ../openssl-${OPENSSL_V} openssl || die
+		touch .openssl_is_fresh || die
+
+		sed -i -e '/openssl\/.git/,/fi/d' \
+			-e '/openssl test/d' Makefile || die
+
+	fi
+
+	default
+}
+
+src_compile() {
+	if use static; then
+		emake static
+	else
+		emake
+	fi
+}
+
+src_install() {
+	DESTDIR="${D}" emake install
+
+	dodoc Changelog README.md
+}
diff --git a/net-analyzer/sslsniff/Manifest b/net-analyzer/sslsniff/Manifest
new file mode 100644
index 000000000000..bc2469bbb717
--- /dev/null
+++ b/net-analyzer/sslsniff/Manifest
@@ -0,0 +1,9 @@
+AUX sslsniff-0.6-asneeded.patch 1358 SHA256 c6721d7f784c4e8ef1f7bf4ad9566ff168c7497ad6f292c87ad7ee595f3cc968 SHA512 2b692eee8154457b6b7a7c12042e017defb94157341885ceadb3970ba40c5a878bb1d1effc5f5b71e7a3161dfadfda27e9f5d5c47fd642007c11f47b1f243904 WHIRLPOOL 1edcfeb959b8bf027518bc049bf91804e943444d1da71b26898de82bbd506f8e0e87d094201e66e09a63c240e9e6cd651ec6edf68f0ef18bebf2108021c3cb73
+AUX sslsniff-0.8-error-redefinition.patch 1718 SHA256 e83ec6fdd9a3b14e942b8be045e1b6b4315d8f2d61c2586b34853b1832bc4377 SHA512 ff9424f59844dc74ac2044dab3541186608bd4063e4b54a2fbb337cb4cf6beb76aa3e2e39d64a5d7817a4a14d4976f361f6e5472c41c7073dd106cf9cb74f9a0 WHIRLPOOL 444a8b608f5ce1f722b98e1cbb3f8e45f705ac23efd7b96aef0b74ece8588903400fe6d72797abef72ea6eaff96d1df5e4f2d1e48004d6724cd317c271ac5c78
+AUX sslsniff-0.8-fix-compatibility-with-boost-1.47-and-higher.patch 2316 SHA256 dcd85adb3e41ecbd55c33e9b79223a391e2ecdf2841f046e7f482200daa6afa6 SHA512 7606d8c466063c9c903a2eadd0a584c1ae759abb62e5a289c0748d4a18329b90aa9a1d89ebcc5e7b145ee2d98c48f7af8f37641d7a32c67208ccabab9a9da876 WHIRLPOOL 081ef181150d10d0805b4399bd6a2b732f0bc08b470b8694de1203e405e835cc80a97ee57301a8330e297144725b52b45a698846aaed73c563aabf9c76de083e
+AUX sslsniff-0.8-underlinking.patch 1631 SHA256 5aabc49acbce711f30724d92b54c2c414f4dd076494b62f2704ecd46fbca1f50 SHA512 8ffbb67f9fbec85179769c0ace64e62f8a3d27e403f33bdd761195339cdcffe37cb473621cb20a739b2b2ce26c6b2335a4d5ea7c6cb697c4328ac7f7047b5e01 WHIRLPOOL 1247654a26429c9aff5704dfdd7a8db565a9bf764a8947baf52d391b1495730876a02938642285f29ec8818f4ca4006a5927010db788d53d92dc682969dc660f
+DIST sslsniff-0.8.tar.gz 207858 SHA256 50b4283a3e80fa4b4f3f684c4e76348aba8e257cbaa85e4f4cb7a4062cf091d5 SHA512 4ac1bcff8f396d868b2381bc73bb0307022e9a7d5228c83722abde8d4d01e4c6273042763c1e003c8e60f606d60923a573122d33680f5d892b4ef7b62f02009f WHIRLPOOL d97d6cd55324f84353dad7f7defbb7b1e619acdf8df13b74f752198ad18ebcae1bddd0680f581bc66ebd8c0326cf4f09badc683ca0dc4ada2ed14f8351a10d57
+EBUILD sslsniff-0.8-r2.ebuild 1098 SHA256 ce6f2fdab93180f9f0ab52c2f7455590265f3c91ed3c526fb0a290a364fff858 SHA512 b30839b74cdc741b6363aa5b8e360b9f86ca78466f91d5d0db45c7109a43330333feae7722a2b8e3b4d11ba6162b419752e4f2ef0c902fbcb78aa6c6f543c438 WHIRLPOOL 32be8be3b5fdc77cf0dce55b52548225b2076a05baa6052629a2a6b4d9f581ca09f8ba07d675d2728c0c15a08393a0abd57c35b1a2f040e783b7057cc1437235
+MISC ChangeLog 2771 SHA256 d45f292028496f98d8c891294157b66b18fb80de23e3645afe80a7aa7a432080 SHA512 395513972392d623e1f1805c992effb104ead43472d8a13397159c3e1285fb51c72bb7ad8fa9407b53c1dd6b3b25f370e2ebc3438731568d51c832d1a1b7bf57 WHIRLPOOL ed6163ba919369bbce2f40852e59fd265440eae7c88a18608f504959d7fcdd9ca2ed8847d5761369a4094cdc53daa9dde81ec0e4c32a7f08d72b11132c0d55d0
+MISC ChangeLog-2015 1791 SHA256 3d7eb7a8d67e7808f261171df8fc420b9b4d183480e18ea4f294256f12df8591 SHA512 002f9bc2a5134052261959c43cb62330f7e32eaf11cefe4dbec25075065a848bee06206366c4862aafa6c9c6f80670699ab44c02ed426efc76e5a35e3518e199 WHIRLPOOL 211c243900f938153d4eb938063d166231d8cbaf4bc5bc2a590542cb05a7d1958576a4fdd1505550bcdb19f887071feb705a6d604a73526f18d1411a6d03bf14
+MISC metadata.xml 449 SHA256 a95a4ca1ba4b1adc8e5ac43f316ad242ffbb47c3f3151681475652a3a664817a SHA512 c31421b1e27c6f9ec70a97fbe92030447306e71be3eba6631d93d228f1ca7d37e9cb2e2de0aed775006913fc2b6624f802f010e01f77baa9979e01b4403b9900 WHIRLPOOL 1f1aa23fc7214bb8928de2cc1a4dd0ee67ea83e73394a4c136025a2d230b24317b6932872ab7fb757678f76aa7b493888fbb93eec4275de3fa1621712bd01c65
diff --git a/net-analyzer/sslsniff/files/sslsniff-0.6-asneeded.patch b/net-analyzer/sslsniff/files/sslsniff-0.6-asneeded.patch
new file mode 100644
index 000000000000..db629b3c4a25
--- /dev/null
+++ b/net-analyzer/sslsniff/files/sslsniff-0.6-asneeded.patch
@@ -0,0 +1,10 @@
+--- sslsniff-0.6.orig/Makefile.am	2009-08-04 03:48:58.000000000 +0200
++++ sslsniff-0.6/Makefile.am	2009-12-06 20:39:02.066902985 +0100
+@@ -4,6 +4,6 @@
+ 
+ sslsniff_SOURCES = Bridge.hpp SSLConnectionManager.cpp FingerprintManager.hpp FirefoxAddonUpdater.hpp FirefoxUpdater.hpp HTTPSBridge.hpp Logger.hpp RawBridge.hpp SessionCache.hpp SSLBridge.hpp SSLConnectionManager.hpp sslsniff.hpp UpdateManager.hpp certificate/AuthorityCertificateManager.hpp certificate/Certificate.hpp certificate/CertificateManager.hpp certificate/TargetedCertificateManager.hpp http/HttpBridge.hpp http/HttpConnectionManager.hpp http/HttpHeaders.hpp http/OCSPDenier.hpp util/Destination.hpp util/Util.hpp FirefoxUpdater.cpp Logger.cpp SessionCache.cpp SSLBridge.cpp HTTPSBridge.cpp sslsniff.cpp FingerprintManager.cpp certificate/AuthorityCertificateManager.cpp certificate/TargetedCertificateManager.cpp certificate/CertificateManager.cpp http/HttpBridge.cpp http/HttpConnectionManager.cpp http/HttpHeaders.cpp UpdateManager.cpp http/OCSPDenier.cpp FirefoxAddonUpdater.cpp
+ 
+-sslsniff_LDFLAGS = -lssl -lboost_filesystem -lpthread -lboost_thread -llog4cpp
++sslsniff_LDADD = -lssl -lboost_filesystem -lpthread -lboost_thread -llog4cpp
+ 
+ EXTRA_DIST = certs/wildcard IPSCACLASEA1.crt leafcert.pem updates/Darwin_Universal-gcc3.xml updates/Linux_x86-gcc3.xml updates/WINNT_x86-msvc.xml
diff --git a/net-analyzer/sslsniff/files/sslsniff-0.8-error-redefinition.patch b/net-analyzer/sslsniff/files/sslsniff-0.8-error-redefinition.patch
new file mode 100644
index 000000000000..f3c2fd08da0f
--- /dev/null
+++ b/net-analyzer/sslsniff/files/sslsniff-0.8-error-redefinition.patch
@@ -0,0 +1,50 @@
+--- SSLConnectionManager.cpp.orig	2014-09-01 23:09:35.916376510 +0200
++++ SSLConnectionManager.cpp	2014-09-01 23:10:32.492515988 +0200
+@@ -95,13 +95,13 @@
+   } catch (SSLConnectionError &error) {
+     std::stringstream errorStream;
+     errorStream << "Got exception: " << error.what();
+-    std::string error = errorStream.str();    
+-    Logger::logError(error);
++    std::string errorStr = errorStream.str();    
++    Logger::logError(errorStr);
+   } catch (FirefoxUpdateException &error) {
+     std::stringstream errorStream;
+     errorStream << "Got exception: " << error.what();
+-    std::string error = errorStream.str();    
+-    Logger::logError(error);
++    std::string errorStr = errorStream.str();    
++    Logger::logError(errorStr);
+   }
+ }
+ 
+@@ -120,13 +120,13 @@
+   } catch (SSLConnectionError &error) {
+     std::stringstream errorStream;
+     errorStream << "Got exception: " << error.what();
+-    std::string error = errorStream.str();    
+-    Logger::logError(error);
++    std::string errorStr = errorStream.str();    
++    Logger::logError(errorStr);
+   } catch (FirefoxUpdateException &error) {
+     std::stringstream errorStream;
+     errorStream << "Got exception: " << error.what();
+-    std::string error = errorStream.str();    
+-    Logger::logError(error);
++    std::string errorStr = errorStream.str();    
++    Logger::logError(errorStr);
+   }
+ }
+ 
+@@ -151,9 +151,9 @@
+     } catch (SSLConnectionError &error) {
+       std::stringstream errorStream;
+       errorStream << "Got exception: " << error.what();
+-      std::string error = errorStream.str();
++      std::string errorStr = errorStream.str();
+ 
+-      Logger::logError(error);
++      Logger::logError(errorStr);
+     }
+   }
+ }
diff --git a/net-analyzer/sslsniff/files/sslsniff-0.8-fix-compatibility-with-boost-1.47-and-higher.patch b/net-analyzer/sslsniff/files/sslsniff-0.8-fix-compatibility-with-boost-1.47-and-higher.patch
new file mode 100644
index 000000000000..eb0a052c7988
--- /dev/null
+++ b/net-analyzer/sslsniff/files/sslsniff-0.8-fix-compatibility-with-boost-1.47-and-higher.patch
@@ -0,0 +1,53 @@
+Index: sslsniff/SSLConnectionManager.cpp
+===================================================================
+--- sslsniff.orig/SSLConnectionManager.cpp	2011-12-31 09:25:04.000000000 +0100
++++ sslsniff/SSLConnectionManager.cpp	2011-12-31 09:26:14.394534948 +0100
+@@ -44,7 +44,7 @@
+ }
+ 
+ void SSLConnectionManager::acceptIncomingConnection() {
+-  boost::shared_ptr<ip::tcp::socket> socket(new ip::tcp::socket(acceptor.io_service()));
++  boost::shared_ptr<ip::tcp::socket> socket(new ip::tcp::socket(acceptor.get_io_service()));
+ 
+   acceptor.async_accept(*socket, boost::bind(&SSLConnectionManager::handleClientConnection,
+ 					     this, socket, placeholders::error));
+@@ -76,7 +76,7 @@
+ 					     ip::tcp::endpoint &destination)
+ 
+ {
+-  Bridge::ptr bridge = RawBridge::create(clientSocket, destination, acceptor.io_service());
++  Bridge::ptr bridge = RawBridge::create(clientSocket, destination, acceptor.get_io_service());
+   bridge->shuttle();
+ }
+ 
+@@ -134,7 +134,7 @@
+ 					ip::tcp::endpoint &destination,
+ 					bool wildcardOK)
+ {
+-  ip::tcp::socket serverSocket(acceptor.io_service());
++  ip::tcp::socket serverSocket(acceptor.get_io_service());
+   boost::system::error_code error;
+   serverSocket.connect(destination, error);
+ 
+Index: sslsniff/http/HttpConnectionManager.cpp
+===================================================================
+--- sslsniff.orig/http/HttpConnectionManager.cpp	2011-05-14 11:37:52.000000000 +0200
++++ sslsniff/http/HttpConnectionManager.cpp	2011-12-31 09:26:28.442534999 +0100
+@@ -53,7 +53,7 @@
+ }
+ 
+ void HttpConnectionManager::acceptIncomingConnection() {
+-  boost::shared_ptr<ip::tcp::socket> socket(new ip::tcp::socket(acceptor_.io_service()));
++  boost::shared_ptr<ip::tcp::socket> socket(new ip::tcp::socket(acceptor_.get_io_service()));
+ 
+   acceptor_.async_accept(*socket, boost::bind(&HttpConnectionManager::handleClientConnection,
+ 					      this, socket, placeholders::error));
+@@ -63,7 +63,7 @@
+ void HttpConnectionManager::bridgeHttpRequest(boost::shared_ptr<ip::tcp::socket> socket,
+ 					      ip::tcp::endpoint destination)
+ {
+-  Bridge::ptr bridge = HttpBridge::create(socket, acceptor_.io_service(), 
++  Bridge::ptr bridge = HttpBridge::create(socket, acceptor_.get_io_service(), 
+ 					  FingerprintManager::getInstance());
+   
+   bridge->getServerSocket().
diff --git a/net-analyzer/sslsniff/files/sslsniff-0.8-underlinking.patch b/net-analyzer/sslsniff/files/sslsniff-0.8-underlinking.patch
new file mode 100644
index 000000000000..049ee5f293a0
--- /dev/null
+++ b/net-analyzer/sslsniff/files/sslsniff-0.8-underlinking.patch
@@ -0,0 +1,21 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -16,7 +16,7 @@
+ AC_CHECK_HEADER([boost/thread.hpp],
+ 	[],
+ 	AC_MSG_ERROR([libboost-thread1.35-dev library is not installed.]))
+-AC_CHECK_HEADER([openssl/ssl.h],
++PKG_CHECK_MODULES(openssl,openssl,
+ 	[],
+ 	AC_MSG_ERROR([openssl (libssl-dev) library not installed.]))
+ AC_OUTPUT(Makefile)
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4,6 +4,6 @@
+ 
+ sslsniff_SOURCES = Bridge.hpp SSLConnectionManager.cpp FingerprintManager.hpp FirefoxAddonUpdater.hpp FirefoxUpdater.hpp HTTPSBridge.hpp Logger.hpp RawBridge.hpp SessionCache.hpp SSLBridge.hpp SSLConnectionManager.hpp sslsniff.hpp UpdateManager.hpp certificate/AuthorityCertificateManager.hpp certificate/Certificate.hpp certificate/CertificateManager.hpp certificate/TargetedCertificateManager.hpp http/HttpBridge.hpp http/HttpConnectionManager.hpp http/HttpHeaders.hpp http/OCSPDenier.hpp util/Destination.cpp util/Destination.hpp util/Util.hpp FirefoxUpdater.cpp Logger.cpp SessionCache.cpp SSLBridge.cpp HTTPSBridge.cpp sslsniff.cpp FingerprintManager.cpp certificate/AuthorityCertificateManager.cpp certificate/TargetedCertificateManager.cpp certificate/CertificateManager.cpp http/HttpBridge.cpp http/HttpConnectionManager.cpp http/HttpHeaders.cpp UpdateManager.cpp http/OCSPDenier.cpp FirefoxAddonUpdater.cpp
+ 
+-sslsniff_LDADD = -lssl -lboost_filesystem -lpthread -lboost_thread -llog4cpp
++sslsniff_LDADD = $(openssl_LIBS) -lboost_system -lboost_filesystem -lpthread -lboost_thread -llog4cpp
+ 
+ EXTRA_DIST = certs/wildcard IPSCACLASEA1.crt leafcert.pem updates/Darwin_Universal-gcc3.xml updates/Linux_x86-gcc3.xml updates/WINNT_x86-msvc.xml
diff --git a/net-analyzer/sslsniff/metadata.xml b/net-analyzer/sslsniff/metadata.xml
new file mode 100644
index 000000000000..44077c9f826f
--- /dev/null
+++ b/net-analyzer/sslsniff/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+<maintainer type="person">
+  <email>prometheanfire@gentoo.org</email>
+</maintainer>
+<maintainer type="person">
+  <email>zerochaos@gentoo.org</email>
+  <name>Rick Farina</name>
+  <description>co-maintainer</description>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild b/net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild
new file mode 100644
index 000000000000..c0f2ea35d7d7
--- /dev/null
+++ b/net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="MITM all SSL connections on a LAN and dynamically generates certs"
+HOMEPAGE="http://thoughtcrime.org/software/sslsniff/"
+SRC_URI="http://thoughtcrime.org/software/sslsniff/${P}.tar.gz"
+
+LICENSE="GPL-3" # plus OpenSSL exception
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/boost:=
+	dev-libs/log4cpp:=
+	dev-libs/openssl:0"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS README )
+
+# last two patches are taken from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=652756
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6-asneeded.patch
+	"${FILESDIR}"/${P}-error-redefinition.patch
+	"${FILESDIR}"/${P}-fix-compatibility-with-boost-1.47-and-higher.patch
+	"${FILESDIR}"/${P}-underlinking.patch
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+	epatch_user
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/sslsniff
+	doins leafcert.pem IPSCACLASEA1.crt
+
+	insinto /usr/share/sslsniff/updates
+	doins updates/*xml
+
+	insinto /usr/share/sslsniff/certs
+	doins certs/*
+}
diff --git a/net-analyzer/ssmping/Manifest b/net-analyzer/ssmping/Manifest
new file mode 100644
index 000000000000..e9b55941adfa
--- /dev/null
+++ b/net-analyzer/ssmping/Manifest
@@ -0,0 +1,6 @@
+AUX ssmping-0.9-build.patch 461 SHA256 dfae8ad8dc189390dfe6a8fa275b60487951cf3b4ab95f9b118bf4f328da8c01 SHA512 5072d9e02e987a3f48fdcd4b89c9f4129f50fbb5781c2b234415f8b6bef4ed4682b3e7176e8dc629a080ffb7ccdf4e49864917c8c8d63dddb7e384e7522a98cd WHIRLPOOL 296d5e7ac5359e220961f96c5719c86cded343fa79a81bab3400048c6031887152afeae878b10302e7aeec94234bc8c6cfe02efdf5b150679bc455e0e34ab6de
+DIST ssmping-0.9.1.tar.gz 16863 SHA256 22103a37eaa28489169a0927bc01e0596c3485fc4d29fc8456c07fd2c70fca6d SHA512 7929b43867f29ac7f93298820149fd326d8540187a59e4f28f226e1c0dbfcdc60dc3da437de250e4082a2d6bd845ae9e619bf3b592b824dd8d529bf093cdedff WHIRLPOOL 0e69588c71917e01469f600696a0e9dcef936eb4a0515c70339ca9ee6c268f9f22e4e8f1d91e39635d41ad510473f5708aa3aa3d5b37e82dcfa725f3cda6541f
+EBUILD ssmping-0.9.1.ebuild 548 SHA256 8f7ddc8840992c9e9abc9e20de2011b4362b8407fa8b4192da839e2387c33202 SHA512 e3e08fd80eab78138fc8c6a44aa4cb636a2c732166bbdd222c9de3ee09dbe470cf982d3e8f60ce711f0c656c250ba2c0c92c1f4bb6b5b4011c2c22176d496e59 WHIRLPOOL bdc5a0598a6c7fdbac11fd5ddd9cdd1cccb8e16271648a858c6710792ae00d9ff41cf35e1b9b6e80b49a2ed17acad70485ac59b518c2c4c594d5e5cbdbec44a6
+MISC ChangeLog 2463 SHA256 050fa30aea536a8e22e2a60e43b1a900d69bdd6d34c0345530c6c89b1f8289ca SHA512 cb4b7d44c6aab890a0f279c24c81f5c2152adc1d998901adf071ea292cde0c537d6f080cb8a4967f1e3df8a26b2262e325a1151203b51d0dc81b7c449b1013f2 WHIRLPOOL 0defd79e885c556ab4d5b2954297a699c47dd7869089dead86005f9ed91550e50f7d3dfb5e8249faf0314f99bf7dad95911d65346571bf9e4b6fcb9cec6c7e55
+MISC ChangeLog-2015 2166 SHA256 d258a8068af1fda2e242f5cc44811196c333729ef47125a26618e6c24194fea8 SHA512 25e47ae447463a5a50ab758ddc9463e21f235be184de411d7dc042f6650d714fe58d22ab57e8390a96a28791997af7c03d9735d32955d8d2b6f7e57085b1f6a9 WHIRLPOOL bb90cc2f3b38774d61b75dbce32ec0b70fdfa06009ad1a5e0da5b548ba43cb66a792e6ab8415f7a7e27fb9b490e1fce531da10b411a815037d464e26c643d55c
+MISC metadata.xml 278 SHA256 7bfb61855daae5123345b2146b6d1ebd5e82abc2946bce2cfa339b7215cca02a SHA512 2cd4384755f79ae9de8d40810923782a5c961f1899adca71ced586bd05993f8c30d36db62018fecc7abcf2181c3278409b36c1a8618516721a3f5abb9f9da45e WHIRLPOOL 5f4f822568b1a411f9fb15dd6b2db5875036c6ae1d30c30dee09fd661f6c064ab6ec04cfeef9a23d54766442b72dfba617c1d3aa8bb1d895128bd44418fefb10
diff --git a/net-analyzer/ssmping/files/ssmping-0.9-build.patch b/net-analyzer/ssmping/files/ssmping-0.9-build.patch
new file mode 100644
index 000000000000..586819ca0dd5
--- /dev/null
+++ b/net-analyzer/ssmping/files/ssmping-0.9-build.patch
@@ -0,0 +1,23 @@
+fixup build errors/warnings
+
+http://bugs.gentoo.org/240750
+
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,5 @@
+ PREFIX ?= /usr/local
++CPPFLAGS += -D_GNU_SOURCE
+ 
+ all: ssmping asmping ssmpingd mcfirst
+ 
+--- a/ssmping.c
++++ b/ssmping.c
+@@ -22,7 +22,7 @@
+     uint16_t size;
+     uint32_t intface;
+     struct sockaddr_storage name, ucaddr, mcaddr, grpaddr;
+-    size_t namelen;
++    socklen_t namelen;
+ #ifdef WIN32
+     WORD wVersionRequested;
+     WSADATA wsaData;
diff --git a/net-analyzer/ssmping/metadata.xml b/net-analyzer/ssmping/metadata.xml
new file mode 100644
index 000000000000..851f9e832157
--- /dev/null
+++ b/net-analyzer/ssmping/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/ssmping/ssmping-0.9.1.ebuild b/net-analyzer/ssmping/ssmping-0.9.1.ebuild
new file mode 100644
index 000000000000..a9dc609c45f5
--- /dev/null
+++ b/net-analyzer/ssmping/ssmping-0.9.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Tool for testing multicast connectivity"
+HOMEPAGE="http://www.venaas.no/multicast/ssmping/"
+LICENSE="public-domain"
+SRC_URI="http://www.venaas.no/multicast/ssmping/${P}.tar.gz"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.9-build.patch
+	tc-export CC
+}
+
+src_install() {
+	dobin ssmping asmping mcfirst
+	dosbin ssmpingd
+	doman ssmping.1 asmping.1 mcfirst.1
+}
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
new file mode 100644
index 000000000000..f7c7ab13834a
--- /dev/null
+++ b/net-analyzer/suricata/Manifest
@@ -0,0 +1,21 @@
+AUX fortify_source-numeric.patch 407 SHA256 fa4c9efc3e63b42a46b323ce58d8c42978b1d6a519f74b90b8aa3a124cd8e707 SHA512 7b8e2cd5353ad5b3129143a43ecd03d056bd71b048e52934efe5a50033fd8a62eee12cd9b773303b497834b1899ad69071f37cafe9c72d3ae180151788af6392 WHIRLPOOL 1d2678613e95dde98503d7679ba0f0c2ed65c6ecf99ff81a800583d65c72d662208f4916fa6eb4dfc37bfd0c75a56fb3678974d43942ea64f75ca712452148e5
+AUX json.patch 276 SHA256 9c6e9344b71a3c19cedc89a47670de76566d06d9895eeae8fbade60231506d96 SHA512 7deec6818ddad384bd6721e363599c0bcd38ba20f8f23673abf90559ccb67bc7c0b5734c0dec8e74501c4032f50dccf069f1d8ddd8c2d69aab79abfbe56181ca WHIRLPOOL 5fad1edf495382ba5d20f0c1cd31057af971f1ab45c305755fc7a0e37b69e6c94ee0897b4fd7eb448d79b95921158f1553b4a11540935d5401d6c8e1e36c986b
+AUX magic-location.patch 352 SHA256 2b66722559f2a2f9c4b1051468cfae0cbcbba3cf3b24b1dd7cc3870f6d97be00 SHA512 0cb2fbcf65c3ce567da0492b0b0b0ff5e6ce50390e2879131e2b912433c5540f7822bcf15cc4eb556d023105bbbff554aa990cc366b6b995482e98ecdf61c07f WHIRLPOOL d82ccfa9c9bb98e5b0c28e68921a174c3af7fd68fd8035004c7be6166422bada767d75b2da2bbceee0e64d23bf7dd8c5d77c222a4f41cf248611f39e63c13f12
+AUX suricata-3.2-conf 2767 SHA256 4597ab2e3bda0d45a33717d2d90f75cb7684bf0ef3d6d67898922bf86318301a SHA512 fd3aec48b4e7e52f192af117f3cda063c5614f33082986dca4e3bdf7a46d62655cd03a1d723db9d36a1b1f84964dc2273e3bf00fb23648902639b18a64025d6b WHIRLPOOL 8a5a110741bd5ebaeb77f146fc1b6d73d3dfa4f1fcbd34e96e1e5038186550d084159b54d457e311eef9495d402121d38ad3d0b6b9abc940f7929d8d0e7b469a
+AUX suricata-3.2-init 5499 SHA256 53b0fcbc91eb1b277e2f85e229fc33ca242a052d833d50e61dd7be46a2ffa436 SHA512 2f13036bd34e91760dfc53be3f6b9b2579a48e7e3146a5c2fcb9b83b949f5e979cab8001ebd4a6732d620f05c71b0a112028b86f423c126145941119c09456d0 WHIRLPOOL f64c2eefa9b23d6c5e461ee43bb006903b2c593b806c568b989aa283b50bdb05fed68684a08b31f8bcf8de278a496f45d130b313b184a72f37c39790a79d504b
+AUX suricata-3.2.1-conf 2767 SHA256 4597ab2e3bda0d45a33717d2d90f75cb7684bf0ef3d6d67898922bf86318301a SHA512 fd3aec48b4e7e52f192af117f3cda063c5614f33082986dca4e3bdf7a46d62655cd03a1d723db9d36a1b1f84964dc2273e3bf00fb23648902639b18a64025d6b WHIRLPOOL 8a5a110741bd5ebaeb77f146fc1b6d73d3dfa4f1fcbd34e96e1e5038186550d084159b54d457e311eef9495d402121d38ad3d0b6b9abc940f7929d8d0e7b469a
+AUX suricata-3.2.1-init 5499 SHA256 53b0fcbc91eb1b277e2f85e229fc33ca242a052d833d50e61dd7be46a2ffa436 SHA512 2f13036bd34e91760dfc53be3f6b9b2579a48e7e3146a5c2fcb9b83b949f5e979cab8001ebd4a6732d620f05c71b0a112028b86f423c126145941119c09456d0 WHIRLPOOL f64c2eefa9b23d6c5e461ee43bb006903b2c593b806c568b989aa283b50bdb05fed68684a08b31f8bcf8de278a496f45d130b313b184a72f37c39790a79d504b
+AUX suricata-logrotate 161 SHA256 7e8a4a3541387d51d5c65a2bf7d8db66f7535a87feeca200a83c002cf9994f8f SHA512 c22a85667460df9b7b1fd15af1e4472dd5b7d1726a43f3b621547a884dcd64ff49b0728767d6a4dc70c413dd8997905e3753fa94c82cda34e4aaf903ebdb1cec WHIRLPOOL d6de009066dd75a3170acd876a3e71549b24512582ccdc41cc3184e29c924c8de467a984d65a0bd030741642a3e4c3313a072b16cc45787521d243a2620c83d5
+DIST suricata-2.0.11.tar.gz 3091124 SHA256 c607f1e18e5636830f42a83f7c67e1466f07db82853f3a9dba4ab8c6c3bc656e SHA512 659e893fef3cdcca8440f2af7596d5cc58b142d3350b9ea5ba57d855c6759a00adafeb15a1dfe91dd55eca1437487eb4e842b4e2913d12417f0b906ca3d54ec9 WHIRLPOOL 5cfa55abd90284a0a3441853af9db18075a23fa5661d89448b409b8fdd1031ad348d76d455b7dfe7b2688e69633f5bbb65dc060cc2426af017ab1bcb824c9ac5
+DIST suricata-3.0.1.tar.gz 3315637 SHA256 74c685f8da51b3f038a7b8185bdbed274aca25daf64ac7ea01eea60636727f26 SHA512 cd10f5b19dd7b6ccbed668263b54d93738842191e71391b040aa7fc2049ac597feb38cd333f07b15d30ebeaf778f6abe18b72215e609891608dca094531c7fd8 WHIRLPOOL a1f6c8ee760cac9e3daa3358e89d30b4a24441fb975214ae2fe165fcb697b4292e035007323041febdc0d8f09b16666515aba76f60f1e437d865193db3deb25d
+DIST suricata-3.1.3.tar.gz 3340627 SHA256 bd89c269e29b03a8898ccabccfb7fcab11c1aa036444772e117705f3b37b4174 SHA512 d29c2c4344d52ba3d8c5ed4331a35b512e323c9a13a73e3039df6406d8c6389d05e3b311db6b561125c12dfbea67b121afbdecb7f0a5cb0594cf339b492726fb WHIRLPOOL 720f668480bfa05e7e6c32bb63f09af6d38e46b909ab4d0d9879cd069436215eb3b4bb1778147de82344b6879a1b3e04da0af2e14084bb1b74472ecc727c4ebe
+DIST suricata-3.2.1.tar.gz 11754332 SHA256 0e0b0cf49016804bb2fb1fc4327341617e76a67902f4e03e0ef6d16c1d7d3994 SHA512 6b0e5565368a085f059f62c9862364a9fcd970158b17671a25bcbed9b3ef8fcf857b1760a6d186ebe3227dde45070bc69a8b0d0bfd341f39a4d42ef93d12f290 WHIRLPOOL 6469191d11f8bd3cf4fab80650d4fbf380c74e3502867e446f57fd297d3f8bbd9b23e452dcb2c559496e8f64f9e9822c5f0303a6351ec13a32fd172a39d3ca05
+DIST suricata-3.2.tar.gz 11732080 SHA256 41cbe19c6fd6bd51ebcbc29063f558e2fbba4a2450e5809fee2e461f16a4ed68 SHA512 327f5a62449af44f6cb95220e1ff9bf61b51db7bd25f2b1e8def3e8650ba754304cf9d02fc30b46b6cbaa6b5f94fa3d4be90edb8a293ff3b6c0927b596a2976e WHIRLPOOL b6d4c2c08e34da2b4dee4087831a0a9dcad836737489e2599938d74b74c624e455d0f1299ef7c4e70df038ac13dcd29344c2117b44310f8dc42d9f0fad0c3e15
+EBUILD suricata-2.0.11.ebuild 2786 SHA256 935516dfe48624d072e2992f18cec0e13275ed1002867e103b213ec07dd7fe9a SHA512 c077788ff428b1d52ed5d307463520292e71daf728676fd9be92ea23da6d5ba20ec6957f932efc33e801b4a7d6be5090df166167cdb429be70b9420607f7518c WHIRLPOOL 6b8e041528dec06640fb1a78aca34b80e8ee555143b0990feda0ea614f53949180b107b74a3a9e404eeb6b71b1fa16b7ce1eba85c1fa3b22563ba55e55114f70
+EBUILD suricata-3.0.1.ebuild 2658 SHA256 4402c743c932623ad06458d45215cdd73145180c6f33b329565695f77850271e SHA512 2d9cc77b9dd82db6ccacf0d9ed5711ccc204b8d02325523dbbde266da71347e2bcb74be79ddb2b70278916ef4a779fe6bf7e7037eb77092939ee33a2b5f3d948 WHIRLPOOL 6957b9589ca037415395bf59ddb2b8974cb9e262c0e6a4d3ae46009fd82243342aadff5576237eb6bdccddc57fb88aea5214abc4a9cfcef42588585452d28a44
+EBUILD suricata-3.1.3.ebuild 2770 SHA256 cd764a576b29c4831a6ee996fb092c34ae242516f8657dc86f2bb65056d7350c SHA512 7d8a2e934c5f62aca4bc11faff14d39f92aaf8ab0ac802f6f1c1187061880ec3fa5b13c4192be19909000232eb91b1bcee76fc0af76543f00bb981e2b3542a3b WHIRLPOOL 67dd5c49e675229bf53fd423c4d4b40c5fc76d82e93c840f3e963cf4fafd3c3e3b17ee6b2017c7ee49ea370de6d6dcf3601617cea3f6b56c0d957e563d06d135
+EBUILD suricata-3.2-r1.ebuild 4490 SHA256 289aab11669d601bc333f6cdc03dc2bb64895cbf1883a5c9613dd19db7bd45ae SHA512 b143e94b1fbc444c2af5676bfb859e9780261a1b5435bd2018329736e81ac386c4927edf494fced53bba349535b26d48276b2be8e4c23bb9870e8174625da3a6 WHIRLPOOL 6e8bd825308e6c9afe81a99a19326697b027afd3eb63c7e6581a820152a75b2fd927eb41e7c3384a8ba5b097a2b36900fd363ec82c4d466dc0062b6eefdec84a
+EBUILD suricata-3.2.1.ebuild 4457 SHA256 1ad237a074ba4df27933a59d33b695d1b4ba8fe72ce2744bc8e5a1d1170cdee1 SHA512 f379ff6dd6137a4fc8541941f62f401f1ca73b1d635336eec27db30009ac7d2c32b7ec81f66c76b52b277e9c37b45da1a367a37f0c6f5540250fd58dcb69a790 WHIRLPOOL 1c9f90290787708169de3264b93f95726704a2f071846f341eec3194e1df310cbac188c9ec90ab68cc26e97e173175af421e11499463aab5fce34f7c08c4b75e
+EBUILD suricata-3.2.ebuild 3955 SHA256 6938b04bd7617d206b7ff0b4b092a8f5576a5e9384429828e16863846c5eb504 SHA512 a61cc818e963174184dbd3b1ba025138294856453c03ea60b8d6f66f41e040ad10e59982df750c7468cd3968789da0ea40f61ef8369c00c44ed3160cadab9539 WHIRLPOOL 664af824047845b86de6d5046cda479a62831e76bb568d28b6ac3cee11f543453634f6914d83c1a5a398dbb3bf555ee0942a5c044b9da921430f830b2031650f
+MISC ChangeLog 2855 SHA256 b1dab0f0a3876a0ff424a25c0cc2a52e3bf33e5010e4184e1d7b095ddb1007e9 SHA512 b2146e640c59d87c64c7b7e8bb1925da466db770eb5cbc0b6f09630b26b0dd9f5a2413d1c9580cb7421fea37711ce89be008ab704c76a31e7a165e11a95cce2d WHIRLPOOL b6c2a9a10feb1c0505798925400d144ec7e90ade6998a9bc5a6921e8f3381b33a35ce9d80a4580fb072fff7700da7f97c126de93837e5705cb607ed3eb45919e
+MISC metadata.xml 828 SHA256 5c9e69031f5b6705134839fa2c1cbd157f612d84cd8d78525f22d54fe1e31daf SHA512 b9508afecf680f4e4b48fa88853170ba30b4d7d3e0cb6696405a742dfeb1ae2039cb8979793e37526d082ca252fc828688973c1395dd50ff5a61b86c6433fe70 WHIRLPOOL 7dc5ecc22e635774d315af3fb3d8ea659ba988f35d7c6063396d9d3c8f2a9e8c23aabb7df9f9282e1612ccf02c505e75860ff9dcc9488461f6859423923450b0
diff --git a/net-analyzer/suricata/files/fortify_source-numeric.patch b/net-analyzer/suricata/files/fortify_source-numeric.patch
new file mode 100644
index 000000000000..0a7f4827ea05
--- /dev/null
+++ b/net-analyzer/suricata/files/fortify_source-numeric.patch
@@ -0,0 +1,11 @@
+--- a/src/suricata.c	2015-10-02 00:21:55.634213646 +0200
++++ b/src/suricata.c	2015-10-02 00:22:39.143940007 +0200
+@@ -774,7 +774,7 @@
+     printf("compiled with -fstack-protector-all\n");
+ #endif
+ #ifdef _FORTIFY_SOURCE
+-    printf("compiled with _FORTIFY_SOURCE=%d\n", _FORTIFY_SOURCE);
++    printf("compiled with _FORTIFY_SOURCE\n");
+ #endif
+ #ifdef CLS
+     printf("L1 cache line size (CLS)=%d\n", CLS);
diff --git a/net-analyzer/suricata/files/json.patch b/net-analyzer/suricata/files/json.patch
new file mode 100644
index 000000000000..a542f351640d
--- /dev/null
+++ b/net-analyzer/suricata/files/json.patch
@@ -0,0 +1,10 @@
+--- src/output-json.h.orig	2015-11-21 21:56:24.996289587 +0100
++++ src/output-json.h	2015-11-21 21:57:11.419622642 +0100
+@@ -28,6 +28,7 @@
+ 
+ #ifdef HAVE_LIBJANSSON
+ 
++#include <jansson.h>
+ #include "suricata-common.h"
+ #include "util-buffer.h"
+ #include "util-logopenfile.h"
diff --git a/net-analyzer/suricata/files/magic-location.patch b/net-analyzer/suricata/files/magic-location.patch
new file mode 100644
index 000000000000..02681f934b06
--- /dev/null
+++ b/net-analyzer/suricata/files/magic-location.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 8b41eb0..3cdf0e7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -182,7 +182,7 @@
+     fi
+     echo -n "installation for $host OS... "
+ 
+-    e_magic_file="/usr/share/file/magic"
++    e_magic_file="/usr/share/misc/magic.mgc"
+     case "$host" in
+         *-*-*freebsd*)
+             LUA_PC_NAME="lua-5.1"
diff --git a/net-analyzer/suricata/files/suricata-3.2-conf b/net-analyzer/suricata/files/suricata-3.2-conf
new file mode 100644
index 000000000000..655b947fdd9b
--- /dev/null
+++ b/net-analyzer/suricata/files/suricata-3.2-conf
@@ -0,0 +1,62 @@
+# Config file for /etc/init.d/suricata*
+
+# Where config files are stored. Default:
+
+# SURICATA_DIR="/etc/suricata"
+
+# Pass options to each suricata service.
+#
+# You can launch more than one service at the same time with different options.
+# This can be useful in a multi-queue gateway, for example.
+# You can expand on the Suricata inline example found at:
+# http://suricata.readthedocs.io/en/latest/setting-up-ipsinline-for-linux.html
+# Instead of configuring iptables to send traffic to just one queue, you can configure it to "load balance"
+# on several queues. You can then have a Suricata instance processing traffic for each queue.
+# This should help improve performance on the gateway/firewall.
+#
+# Suppose you configured iptables to use queues 0 and 1 named q0 and q1. You can now do the following:
+# ln -s /etc/init.d/suricata /etc/init.d/suricata.q0
+# ln -s /etc/init.d/suricata /etc/init.d/suricata.q1
+# cp /etc/suricata/suricata.yaml /etc/suricata/suricata-q0.yaml
+# cp /etc/suricata/suricata.yaml /etc/suricata/suricata-q1.yaml
+#
+# Edit both suricata-q{0,1}.yaml files and set values accordingly.
+# You can override these yaml config file names with SURICATA_CONF* below (optional).
+# This allows you to use the same yaml config file for multiple instances as long as you override
+# sensible options such as the log file paths.
+# SURICATA_CONF_q0="suricata-queues.yaml"
+# SURICATA_CONF_q1="suricata-queues.yaml"
+# SURICATA_CONF="suricata.yaml"
+
+# You can define the options here:
+# NB: avoid using -l, -c, --user, --group and setting logging.outputs.1.file.filename as the init script will try to set them for you.
+
+# SURICATA_OPTS_q0="-q 0"
+# SURICATA_OPTS_q1="-q 1"
+
+# If you want to use ${SURICATA_DIR}/suricata.yaml and start the service with /etc/init.d/suricata
+# then you can set:
+
+SURICATA_OPTS="-i eth0"
+
+# Log paths listed here will be created by the init script and will override the log path
+# set in the yaml file, if present.
+# SURICATA_LOG_FILE_q0="/var/log/suricata/q0/suricata.log"
+# SURICATA_LOG_FILE_q1="/var/log/suricata/q1/suricata.log"
+# SURICATA_LOG_FILE="/var/log/suricata/suricata.log"
+
+# Run as user/group.
+# Do not define if you want to run as root or as the user defined in the yaml config file (run-as).
+# The ebuild should have created the dedicated user/group suricata:suricata for you to specify here below.
+# SURICATA_USER_q0="suricata"
+# SURICATA_GROUP_q0="suricata"
+# SURICATA_USER_q1="suricata"
+# SURICATA_GROUP_q1="suricata"
+# SURICATA_USER="suricata"
+# SURICATA_GROUP="suricata"
+
+# Suricata processes can take a long time to shut down.
+# If necessary, adjust timeout in seconds to be used when calling stop from the init script.
+# Examples:
+# SURICATA_MAX_WAIT_ON_STOP="300"
+# SURICATA_MAX_WAIT_ON_STOP="SIGTERM/30"
diff --git a/net-analyzer/suricata/files/suricata-3.2-init b/net-analyzer/suricata/files/suricata-3.2-init
new file mode 100644
index 000000000000..76dd521d7ada
--- /dev/null
+++ b/net-analyzer/suricata/files/suricata-3.2-init
@@ -0,0 +1,147 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+SURICATA_BIN=/usr/bin/suricata
+SURICATA_DIR=${SURICATA_DIR:-/etc/suricata}
+SURICATA=${SVCNAME#*.}
+SURICATAID=$(shell_var "${SURICATA}")
+if [ -n "${SURICATA}" ] && [ ${SVCNAME} != "suricata" ]; then
+    eval SURICATACONF=\$SURICATA_CONF_${SURICATAID}
+    [ ${#SURICATACONF} -eq 0 ] && SURICATACONF="${SURICATA_DIR}/suricata-${SURICATA}.yaml" || SURICATACONF="${SURICATA_DIR}/${SURICATACONF}"
+    SURICATAPID="/var/run/suricata/suricata.${SURICATA}.pid"
+    eval SURICATAOPTS=\$SURICATA_OPTS_${SURICATAID}
+    eval SURICATALOGPATH=\$SURICATA_LOG_FILE_${SURICATAID}
+    eval SURICATAUSER=\$SURICATA_USER_${SURICATAID}
+    eval SURICATAGROUP=\$SURICATA_GROUP_${SURICATAID}
+else
+    SURICATACONF=${SURICATA_CONF}
+    [ ${#SURICATACONF} -eq 0 ] && SURICATACONF="${SURICATA_DIR}/suricata.yaml" || SURICATACONF="${SURICATA_DIR}/${SURICATACONF}"
+    SURICATAPID="/var/run/suricata/suricata.pid"
+    SURICATAOPTS=${SURICATA_OPTS}
+    SURICATALOGPATH=${SURICATA_LOG_FILE}
+    SURICATAUSER=${SURICATA_USER}
+    SURICATAGROUP=${SURICATA_GROUP}
+fi
+SURICATAUSER=${SURICATAUSER:-${SURICATA_USER}}
+SURICATAGROUP=${SURICATAGROUP:-${SURICATA_GROUP}}
+[ -e ${SURICATACONF} ] && SURICATAOPTS="-c ${SURICATACONF} ${SURICATAOPTS}"
+[[ -z "${SURICATA_MAX_WAIT_ON_STOP// }" ]] || SURICATA_RETRY="--retry ${SURICATA_MAX_WAIT_ON_STOP}"
+
+description="Suricata IDS/IPS"
+extra_commands="checkconfig dump"
+description_checkconfig="Check config for ${SVCNAME}"
+description_dump="List all config values that can be used with --set"
+extra_started_commands="reload relog"
+description_reload="Live rule and config reload"
+description_relog="Close and re-open all log files"
+
+depend() {
+	need net
+	after mysql
+	after postgresql
+}
+
+checkconfig() {
+	if [ ! -d "/var/run/suricata" ] ; then
+		checkpath -d /var/run/suricata
+	fi
+	if [ ${#SURICATALOGPATH} -gt 0 ]; then
+		SURICATALOGFILE=$( basename ${SURICATALOGPATH} )
+		SURICATALOGFILE=${SURICATALOGFILE:-suricata.log}
+		SURICATALOGPATH=$( dirname ${SURICATALOGPATH} )
+		if [ ! -d "${SURICATALOGPATH}" ] ; then
+			checkpath -d "${SURICATALOGPATH}"
+		fi
+		if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ] && [ -e "${SURICATALOGPATH}" ]; then
+			chown ${SURICATAUSER}:${SURICATAGROUP} "${SURICATALOGPATH}" || return 1
+			chown ${SURICATAUSER}:${SURICATAGROUP} "${SURICATALOGPATH}"/* >/dev/null 2>&1 3>&1
+		fi
+		SURICATAOPTS="${SURICATAOPTS} --set logging.outputs.1.file.filename=${SURICATALOGPATH}/${SURICATALOGFILE}"
+		SURICATALOGPATH="-l ${SURICATALOGPATH}"
+	fi
+	if [ ! -e ${SURICATACONF} ] ; then
+		einfo "The configuration file ${SURICATACONF} was not found."
+		einfo "If this is OK then make sure you set enough options for ${SVCNAME} in /etc/conf.d/suricata."
+		einfo "Take a look at the suricata arguments --set and --dump-config."
+	fi
+	if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ]; then
+		einfo "${SVCNAME} will run as user ${SURICATAUSER}:${SURICATAGROUP}."
+		SURICATAOPTS="${SURICATAOPTS} --user=${SURICATAUSER} --group=${SURICATAGROUP}"
+	fi
+}
+
+initpidinfo() {
+	[ -e ${SURICATAPID} ] && SUR_PID="$(cat ${SURICATAPID})"
+	if [ ${#SUR_PID} -gt 0 ]; then
+	    SUR_PID_CHECK="$(ps -eo pid | grep -c ${SUR_PID})"
+	    SUR_USER="$(ps -p ${SUR_PID} --no-headers -o user)"
+	fi
+}
+
+checkpidinfo() {
+	initpidinfo
+        if [ ! -e ${SURICATAPID} ]; then
+        	eerror "${SVCNAME} isn't running"
+                return 1
+	elif [ ${#SUR_PID} -eq 0 ] || [ $((SUR_PID_CHECK)) -ne 1 ]; then
+		eerror "Could not determine PID of ${SVCNAME}! Did the service crash?"
+		return 1
+	elif [ ${#SUR_USER} -eq 0 ]; then
+		eerror "Unable to determine user running ${SVCNAME}!"
+		return 1
+	elif [ "x${SUR_USER}" != "xroot" ]; then
+		ewarn "${SVCNAME} may need to be running as root or as a priviledged user for the extra commands reload and relog to work."
+        fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --quiet --exec ${SURICATA_BIN} \
+		-- --pidfile ${SURICATAPID} -D ${SURICATAOPTS} ${SURICATALOGPATH} >/dev/null 2>&1
+	local SUR_EXIT=$?
+	if [ $((SUR_EXIT)) -ne 0 ]; then
+	    einfo "Could not start ${SURICATA_BIN} with:"
+	    einfo "--pidfile ${SURICATAPID} -D ${SURICATAOPTS} ${SURICATALOGPATH}"
+	    einfo "Exit code ${SUR_EXIT}"
+	fi
+	eend ${SUR_EXIT}
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop ${SURICATA_RETRY} --quiet --pidfile ${SURICATAPID} >/dev/null 2>&1
+	eend $?
+}
+
+reload() {
+	checkpidinfo || return 1
+	checkconfig || return 1
+	ebegin "Sending USR2 signal to ${SVCNAME} to perform a live rule and config reload."
+	if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ]; then
+		start-stop-daemon --user ${SURICATAUSER} --group ${SURICATAGROUP} --signal USR2 --pidfile ${SURICATAPID}
+	else
+		start-stop-daemon --signal USR2 --pidfile ${SURICATAPID}
+	fi
+	eend $?
+}
+
+relog() {
+	checkpidinfo || return 1
+	checkconfig || return 1
+	ebegin "Sending HUP signal to ${SVCNAME} to close and re-open all log files."
+	if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ]; then
+		start-stop-daemon --user ${SURICATAUSER} --group ${SURICATAGROUP} --signal HUP --pidfile ${SURICATAPID}
+	else
+		start-stop-daemon --signal HUP --pidfile ${SURICATAPID}
+	fi
+	eend $?
+}
+
+dump() {
+	checkconfig || return 1
+	ebegin "Dumping ${SVCNAME} config values and quitting."
+	${SURICATA_BIN} --dump-config --pidfile ${SURICATAPID} ${SURICATAOPTS} ${SURICATALOGPATH}
+	eend $?
+}
diff --git a/net-analyzer/suricata/files/suricata-3.2.1-conf b/net-analyzer/suricata/files/suricata-3.2.1-conf
new file mode 100644
index 000000000000..655b947fdd9b
--- /dev/null
+++ b/net-analyzer/suricata/files/suricata-3.2.1-conf
@@ -0,0 +1,62 @@
+# Config file for /etc/init.d/suricata*
+
+# Where config files are stored. Default:
+
+# SURICATA_DIR="/etc/suricata"
+
+# Pass options to each suricata service.
+#
+# You can launch more than one service at the same time with different options.
+# This can be useful in a multi-queue gateway, for example.
+# You can expand on the Suricata inline example found at:
+# http://suricata.readthedocs.io/en/latest/setting-up-ipsinline-for-linux.html
+# Instead of configuring iptables to send traffic to just one queue, you can configure it to "load balance"
+# on several queues. You can then have a Suricata instance processing traffic for each queue.
+# This should help improve performance on the gateway/firewall.
+#
+# Suppose you configured iptables to use queues 0 and 1 named q0 and q1. You can now do the following:
+# ln -s /etc/init.d/suricata /etc/init.d/suricata.q0
+# ln -s /etc/init.d/suricata /etc/init.d/suricata.q1
+# cp /etc/suricata/suricata.yaml /etc/suricata/suricata-q0.yaml
+# cp /etc/suricata/suricata.yaml /etc/suricata/suricata-q1.yaml
+#
+# Edit both suricata-q{0,1}.yaml files and set values accordingly.
+# You can override these yaml config file names with SURICATA_CONF* below (optional).
+# This allows you to use the same yaml config file for multiple instances as long as you override
+# sensible options such as the log file paths.
+# SURICATA_CONF_q0="suricata-queues.yaml"
+# SURICATA_CONF_q1="suricata-queues.yaml"
+# SURICATA_CONF="suricata.yaml"
+
+# You can define the options here:
+# NB: avoid using -l, -c, --user, --group and setting logging.outputs.1.file.filename as the init script will try to set them for you.
+
+# SURICATA_OPTS_q0="-q 0"
+# SURICATA_OPTS_q1="-q 1"
+
+# If you want to use ${SURICATA_DIR}/suricata.yaml and start the service with /etc/init.d/suricata
+# then you can set:
+
+SURICATA_OPTS="-i eth0"
+
+# Log paths listed here will be created by the init script and will override the log path
+# set in the yaml file, if present.
+# SURICATA_LOG_FILE_q0="/var/log/suricata/q0/suricata.log"
+# SURICATA_LOG_FILE_q1="/var/log/suricata/q1/suricata.log"
+# SURICATA_LOG_FILE="/var/log/suricata/suricata.log"
+
+# Run as user/group.
+# Do not define if you want to run as root or as the user defined in the yaml config file (run-as).
+# The ebuild should have created the dedicated user/group suricata:suricata for you to specify here below.
+# SURICATA_USER_q0="suricata"
+# SURICATA_GROUP_q0="suricata"
+# SURICATA_USER_q1="suricata"
+# SURICATA_GROUP_q1="suricata"
+# SURICATA_USER="suricata"
+# SURICATA_GROUP="suricata"
+
+# Suricata processes can take a long time to shut down.
+# If necessary, adjust timeout in seconds to be used when calling stop from the init script.
+# Examples:
+# SURICATA_MAX_WAIT_ON_STOP="300"
+# SURICATA_MAX_WAIT_ON_STOP="SIGTERM/30"
diff --git a/net-analyzer/suricata/files/suricata-3.2.1-init b/net-analyzer/suricata/files/suricata-3.2.1-init
new file mode 100644
index 000000000000..76dd521d7ada
--- /dev/null
+++ b/net-analyzer/suricata/files/suricata-3.2.1-init
@@ -0,0 +1,147 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+SURICATA_BIN=/usr/bin/suricata
+SURICATA_DIR=${SURICATA_DIR:-/etc/suricata}
+SURICATA=${SVCNAME#*.}
+SURICATAID=$(shell_var "${SURICATA}")
+if [ -n "${SURICATA}" ] && [ ${SVCNAME} != "suricata" ]; then
+    eval SURICATACONF=\$SURICATA_CONF_${SURICATAID}
+    [ ${#SURICATACONF} -eq 0 ] && SURICATACONF="${SURICATA_DIR}/suricata-${SURICATA}.yaml" || SURICATACONF="${SURICATA_DIR}/${SURICATACONF}"
+    SURICATAPID="/var/run/suricata/suricata.${SURICATA}.pid"
+    eval SURICATAOPTS=\$SURICATA_OPTS_${SURICATAID}
+    eval SURICATALOGPATH=\$SURICATA_LOG_FILE_${SURICATAID}
+    eval SURICATAUSER=\$SURICATA_USER_${SURICATAID}
+    eval SURICATAGROUP=\$SURICATA_GROUP_${SURICATAID}
+else
+    SURICATACONF=${SURICATA_CONF}
+    [ ${#SURICATACONF} -eq 0 ] && SURICATACONF="${SURICATA_DIR}/suricata.yaml" || SURICATACONF="${SURICATA_DIR}/${SURICATACONF}"
+    SURICATAPID="/var/run/suricata/suricata.pid"
+    SURICATAOPTS=${SURICATA_OPTS}
+    SURICATALOGPATH=${SURICATA_LOG_FILE}
+    SURICATAUSER=${SURICATA_USER}
+    SURICATAGROUP=${SURICATA_GROUP}
+fi
+SURICATAUSER=${SURICATAUSER:-${SURICATA_USER}}
+SURICATAGROUP=${SURICATAGROUP:-${SURICATA_GROUP}}
+[ -e ${SURICATACONF} ] && SURICATAOPTS="-c ${SURICATACONF} ${SURICATAOPTS}"
+[[ -z "${SURICATA_MAX_WAIT_ON_STOP// }" ]] || SURICATA_RETRY="--retry ${SURICATA_MAX_WAIT_ON_STOP}"
+
+description="Suricata IDS/IPS"
+extra_commands="checkconfig dump"
+description_checkconfig="Check config for ${SVCNAME}"
+description_dump="List all config values that can be used with --set"
+extra_started_commands="reload relog"
+description_reload="Live rule and config reload"
+description_relog="Close and re-open all log files"
+
+depend() {
+	need net
+	after mysql
+	after postgresql
+}
+
+checkconfig() {
+	if [ ! -d "/var/run/suricata" ] ; then
+		checkpath -d /var/run/suricata
+	fi
+	if [ ${#SURICATALOGPATH} -gt 0 ]; then
+		SURICATALOGFILE=$( basename ${SURICATALOGPATH} )
+		SURICATALOGFILE=${SURICATALOGFILE:-suricata.log}
+		SURICATALOGPATH=$( dirname ${SURICATALOGPATH} )
+		if [ ! -d "${SURICATALOGPATH}" ] ; then
+			checkpath -d "${SURICATALOGPATH}"
+		fi
+		if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ] && [ -e "${SURICATALOGPATH}" ]; then
+			chown ${SURICATAUSER}:${SURICATAGROUP} "${SURICATALOGPATH}" || return 1
+			chown ${SURICATAUSER}:${SURICATAGROUP} "${SURICATALOGPATH}"/* >/dev/null 2>&1 3>&1
+		fi
+		SURICATAOPTS="${SURICATAOPTS} --set logging.outputs.1.file.filename=${SURICATALOGPATH}/${SURICATALOGFILE}"
+		SURICATALOGPATH="-l ${SURICATALOGPATH}"
+	fi
+	if [ ! -e ${SURICATACONF} ] ; then
+		einfo "The configuration file ${SURICATACONF} was not found."
+		einfo "If this is OK then make sure you set enough options for ${SVCNAME} in /etc/conf.d/suricata."
+		einfo "Take a look at the suricata arguments --set and --dump-config."
+	fi
+	if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ]; then
+		einfo "${SVCNAME} will run as user ${SURICATAUSER}:${SURICATAGROUP}."
+		SURICATAOPTS="${SURICATAOPTS} --user=${SURICATAUSER} --group=${SURICATAGROUP}"
+	fi
+}
+
+initpidinfo() {
+	[ -e ${SURICATAPID} ] && SUR_PID="$(cat ${SURICATAPID})"
+	if [ ${#SUR_PID} -gt 0 ]; then
+	    SUR_PID_CHECK="$(ps -eo pid | grep -c ${SUR_PID})"
+	    SUR_USER="$(ps -p ${SUR_PID} --no-headers -o user)"
+	fi
+}
+
+checkpidinfo() {
+	initpidinfo
+        if [ ! -e ${SURICATAPID} ]; then
+        	eerror "${SVCNAME} isn't running"
+                return 1
+	elif [ ${#SUR_PID} -eq 0 ] || [ $((SUR_PID_CHECK)) -ne 1 ]; then
+		eerror "Could not determine PID of ${SVCNAME}! Did the service crash?"
+		return 1
+	elif [ ${#SUR_USER} -eq 0 ]; then
+		eerror "Unable to determine user running ${SVCNAME}!"
+		return 1
+	elif [ "x${SUR_USER}" != "xroot" ]; then
+		ewarn "${SVCNAME} may need to be running as root or as a priviledged user for the extra commands reload and relog to work."
+        fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --quiet --exec ${SURICATA_BIN} \
+		-- --pidfile ${SURICATAPID} -D ${SURICATAOPTS} ${SURICATALOGPATH} >/dev/null 2>&1
+	local SUR_EXIT=$?
+	if [ $((SUR_EXIT)) -ne 0 ]; then
+	    einfo "Could not start ${SURICATA_BIN} with:"
+	    einfo "--pidfile ${SURICATAPID} -D ${SURICATAOPTS} ${SURICATALOGPATH}"
+	    einfo "Exit code ${SUR_EXIT}"
+	fi
+	eend ${SUR_EXIT}
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop ${SURICATA_RETRY} --quiet --pidfile ${SURICATAPID} >/dev/null 2>&1
+	eend $?
+}
+
+reload() {
+	checkpidinfo || return 1
+	checkconfig || return 1
+	ebegin "Sending USR2 signal to ${SVCNAME} to perform a live rule and config reload."
+	if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ]; then
+		start-stop-daemon --user ${SURICATAUSER} --group ${SURICATAGROUP} --signal USR2 --pidfile ${SURICATAPID}
+	else
+		start-stop-daemon --signal USR2 --pidfile ${SURICATAPID}
+	fi
+	eend $?
+}
+
+relog() {
+	checkpidinfo || return 1
+	checkconfig || return 1
+	ebegin "Sending HUP signal to ${SVCNAME} to close and re-open all log files."
+	if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ]; then
+		start-stop-daemon --user ${SURICATAUSER} --group ${SURICATAGROUP} --signal HUP --pidfile ${SURICATAPID}
+	else
+		start-stop-daemon --signal HUP --pidfile ${SURICATAPID}
+	fi
+	eend $?
+}
+
+dump() {
+	checkconfig || return 1
+	ebegin "Dumping ${SVCNAME} config values and quitting."
+	${SURICATA_BIN} --dump-config --pidfile ${SURICATAPID} ${SURICATAOPTS} ${SURICATALOGPATH}
+	eend $?
+}
diff --git a/net-analyzer/suricata/files/suricata-logrotate b/net-analyzer/suricata/files/suricata-logrotate
new file mode 100644
index 000000000000..7b22283ec7cf
--- /dev/null
+++ b/net-analyzer/suricata/files/suricata-logrotate
@@ -0,0 +1,10 @@
+/var/log/suricata/*.log /var/log/suricata/*.json {
+	rotate 3
+	missingok
+	nocompress
+	create
+	sharedscripts
+	postrotate
+		/etc/init.d/suricata relog
+	endscript
+}
diff --git a/net-analyzer/suricata/metadata.xml b/net-analyzer/suricata/metadata.xml
new file mode 100644
index 000000000000..58878c64f05c
--- /dev/null
+++ b/net-analyzer/suricata/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="af-packet">Enable AF_PACKET support</flag>
+    <flag name="control-socket">Enable unix socket</flag>
+    <flag name="cuda">Enable NVIDIA Cuda computations support</flag>
+    <flag name="detection">Enable detection modules</flag>
+    <flag name="luajit">Enable Luajit support</flag>
+    <flag name="nflog">Enable libnetfilter_log support</flag>
+    <flag name="nfqueue">Enable NFQUEUE support for inline IDP</flag>
+    <flag name="redis">Enable Redis support</flag>
+    <flag name="rules">Install default ruleset</flag>
+    <flag name="logrotate">Install logrotate rule</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-analyzer/suricata/suricata-2.0.11.ebuild b/net-analyzer/suricata/suricata-2.0.11.ebuild
new file mode 100644
index 000000000000..cebe46b654e3
--- /dev/null
+++ b/net-analyzer/suricata/suricata-2.0.11.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils user
+
+DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
+HOMEPAGE="http://suricata-ids.org/"
+SRC_URI="http://www.openinfosecfoundation.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+af-packet control-socket cuda debug +detection geoip hardened lua luajit nflog +nfqueue +rules test"
+
+DEPEND="
+	>=dev-libs/jansson-2.2
+	dev-libs/libpcre
+	dev-libs/libyaml
+	net-libs/libnet:*
+	net-libs/libnfnetlink
+	dev-libs/nspr
+	dev-libs/nss
+	>=net-libs/libhtp-0.5.18
+	net-libs/libpcap
+	sys-apps/file
+	cuda?       ( dev-util/nvidia-cuda-toolkit )
+	geoip?      ( dev-libs/geoip )
+	lua?        ( dev-lang/lua:* )
+	luajit?     ( dev-lang/luajit:* )
+	nflog?      ( net-libs/libnetfilter_log )
+	nfqueue?    ( net-libs/libnetfilter_queue )
+"
+# #446814
+#	prelude?    ( dev-libs/libprelude )
+#	pfring?     ( sys-process/numactl net-libs/pf_ring)
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} "${PN}"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/fortify_source-numeric.patch"
+	epatch "${FILESDIR}/magic-location.patch"
+	epatch "${FILESDIR}/json.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		"--localstatedir=/var/" \
+		"--enable-non-bundled-htp" \
+		$(use_enable af-packet) \
+		$(use_enable detection) \
+		$(use_enable nfqueue) \
+		$(use_enable test coccinelle) \
+		$(use_enable test unittests) \
+		$(use_enable control-socket unix-socket)
+	)
+
+	if use cuda ; then
+		myeconfargs+=( $(use_enable cuda) )
+	fi
+	if use debug ; then
+		myeconfargs+=( $(use_enable debug) )
+	fi
+	if use geoip ; then
+		myeconfargs+=( $(use_enable geoip) )
+	fi
+	if use hardened ; then
+		myeconfargs+=( $(use_enable hardened gccprotect) )
+	fi
+	if use nflog ; then
+		myeconfargs+=( $(use_enable nflog) )
+	fi
+	# not supported yet (no pfring in portage)
+# 	if use pfring ; then
+# 		myeconfargs+=( $(use_enable pfring) )
+# 	fi
+	# no libprelude in portage
+# 	if use prelude ; then
+# 		myeconfargs+=( $(use_enable prelude) )
+# 	fi
+	if use lua ; then
+		myeconfargs+=( $(use_enable lua) )
+	fi
+	if use luajit ; then
+		myeconfargs+=( $(use_enable luajit) )
+	fi
+
+# this should be used when pf_ring use flag support will be added
+# 	LIBS+="-lrt -lnuma"
+
+	econf LIBS="${LIBS}" ${myeconfargs[@]}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto "/etc/${PN}"
+	doins {classification,reference,threshold}.config suricata.yaml
+
+	if use rules ; then
+		insinto "/etc/${PN}/rules"
+		doins rules/*.rules
+	fi
+
+	dodir "/var/lib/${PN}"
+	dodir "/var/log/${PN}"
+	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+}
diff --git a/net-analyzer/suricata/suricata-3.0.1.ebuild b/net-analyzer/suricata/suricata-3.0.1.ebuild
new file mode 100644
index 000000000000..90010bf2a045
--- /dev/null
+++ b/net-analyzer/suricata/suricata-3.0.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils user
+
+DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
+HOMEPAGE="http://suricata-ids.org/"
+SRC_URI="http://www.openinfosecfoundation.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+af-packet control-socket cuda debug +detection geoip hardened lua luajit nflog +nfqueue +rules test"
+
+DEPEND="
+	>=dev-libs/jansson-2.2
+	dev-libs/libpcre
+	dev-libs/libyaml
+	net-libs/libnet:*
+	net-libs/libnfnetlink
+	dev-libs/nspr
+	dev-libs/nss
+	>=net-libs/libhtp-0.5.18
+	net-libs/libpcap
+	sys-apps/file
+	cuda?       ( dev-util/nvidia-cuda-toolkit )
+	geoip?      ( dev-libs/geoip )
+	lua?        ( dev-lang/lua:* )
+	luajit?     ( dev-lang/luajit:* )
+	nflog?      ( net-libs/libnetfilter_log )
+	nfqueue?    ( net-libs/libnetfilter_queue )
+"
+# #446814
+#	prelude?    ( dev-libs/libprelude )
+#	pfring?     ( sys-process/numactl net-libs/pf_ring)
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} "${PN}"
+}
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		"--localstatedir=/var/" \
+		"--enable-non-bundled-htp" \
+		$(use_enable af-packet) \
+		$(use_enable detection) \
+		$(use_enable nfqueue) \
+		$(use_enable test coccinelle) \
+		$(use_enable test unittests) \
+		$(use_enable control-socket unix-socket)
+	)
+
+	if use cuda ; then
+		myeconfargs+=( $(use_enable cuda) )
+	fi
+	if use debug ; then
+		myeconfargs+=( $(use_enable debug) )
+	fi
+	if use geoip ; then
+		myeconfargs+=( $(use_enable geoip) )
+	fi
+	if use hardened ; then
+		myeconfargs+=( $(use_enable hardened gccprotect) )
+	fi
+	if use nflog ; then
+		myeconfargs+=( $(use_enable nflog) )
+	fi
+	# not supported yet (no pfring in portage)
+# 	if use pfring ; then
+# 		myeconfargs+=( $(use_enable pfring) )
+# 	fi
+	# no libprelude in portage
+# 	if use prelude ; then
+# 		myeconfargs+=( $(use_enable prelude) )
+# 	fi
+	if use lua ; then
+		myeconfargs+=( $(use_enable lua) )
+	fi
+	if use luajit ; then
+		myeconfargs+=( $(use_enable luajit) )
+	fi
+
+# this should be used when pf_ring use flag support will be added
+# 	LIBS+="-lrt -lnuma"
+
+	econf LIBS="${LIBS}" ${myeconfargs[@]}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto "/etc/${PN}"
+	doins {classification,reference,threshold}.config suricata.yaml
+
+	if use rules ; then
+		insinto "/etc/${PN}/rules"
+		doins rules/*.rules
+	fi
+
+	dodir "/var/lib/${PN}"
+	dodir "/var/log/${PN}"
+	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+}
diff --git a/net-analyzer/suricata/suricata-3.1.3.ebuild b/net-analyzer/suricata/suricata-3.1.3.ebuild
new file mode 100644
index 000000000000..5b883f9be78a
--- /dev/null
+++ b/net-analyzer/suricata/suricata-3.1.3.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils user
+
+DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
+HOMEPAGE="http://suricata-ids.org/"
+SRC_URI="http://www.openinfosecfoundation.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+af-packet control-socket cuda debug +detection geoip hardened lua luajit nflog +nfqueue redis +rules test"
+
+DEPEND="
+	>=dev-libs/jansson-2.2
+	dev-libs/libpcre
+	dev-libs/libyaml
+	net-libs/libnet:*
+	net-libs/libnfnetlink
+	dev-libs/nspr
+	dev-libs/nss
+	>=net-libs/libhtp-0.5.20
+	net-libs/libpcap
+	sys-apps/file
+	cuda?       ( dev-util/nvidia-cuda-toolkit )
+	geoip?      ( dev-libs/geoip )
+	lua?        ( dev-lang/lua:* )
+	luajit?     ( dev-lang/luajit:* )
+	nflog?      ( net-libs/libnetfilter_log )
+	nfqueue?    ( net-libs/libnetfilter_queue )
+	redis?      ( dev-libs/hiredis )
+"
+# #446814
+#	prelude?    ( dev-libs/libprelude )
+#	pfring?     ( sys-process/numactl net-libs/pf_ring)
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} "${PN}"
+}
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		"--localstatedir=/var/" \
+		"--enable-non-bundled-htp" \
+		$(use_enable af-packet) \
+		$(use_enable detection) \
+		$(use_enable nfqueue) \
+		$(use_enable test coccinelle) \
+		$(use_enable test unittests) \
+		$(use_enable control-socket unix-socket)
+	)
+
+	if use cuda ; then
+		myeconfargs+=( $(use_enable cuda) )
+	fi
+	if use debug ; then
+		myeconfargs+=( $(use_enable debug) )
+	fi
+	if use geoip ; then
+		myeconfargs+=( $(use_enable geoip) )
+	fi
+	if use hardened ; then
+		myeconfargs+=( $(use_enable hardened gccprotect) )
+	fi
+	if use nflog ; then
+		myeconfargs+=( $(use_enable nflog) )
+	fi
+	if use redis ; then
+		myeconfargs+=( $(use_enable redis hiredis) )
+	fi
+	# not supported yet (no pfring in portage)
+# 	if use pfring ; then
+# 		myeconfargs+=( $(use_enable pfring) )
+# 	fi
+	# no libprelude in portage
+# 	if use prelude ; then
+# 		myeconfargs+=( $(use_enable prelude) )
+# 	fi
+	if use lua ; then
+		myeconfargs+=( $(use_enable lua) )
+	fi
+	if use luajit ; then
+		myeconfargs+=( $(use_enable luajit) )
+	fi
+
+# this should be used when pf_ring use flag support will be added
+# 	LIBS+="-lrt -lnuma"
+
+	econf LIBS="${LIBS}" ${myeconfargs[@]}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto "/etc/${PN}"
+	doins {classification,reference,threshold}.config suricata.yaml
+
+	if use rules ; then
+		insinto "/etc/${PN}/rules"
+		doins rules/*.rules
+	fi
+
+	dodir "/var/lib/${PN}"
+	dodir "/var/log/${PN}"
+	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+}
diff --git a/net-analyzer/suricata/suricata-3.2-r1.ebuild b/net-analyzer/suricata/suricata-3.2-r1.ebuild
new file mode 100644
index 000000000000..f6aa21dbcc46
--- /dev/null
+++ b/net-analyzer/suricata/suricata-3.2-r1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils user
+
+DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
+HOMEPAGE="http://suricata-ids.org/"
+SRC_URI="http://www.openinfosecfoundation.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+af-packet control-socket cuda debug +detection geoip hardened logrotate lua luajit nflog +nfqueue redis +rules test"
+
+REQUIRED_USE="lua? ( !luajit )"
+
+DEPEND="
+	>=dev-libs/jansson-2.2
+	dev-libs/libpcre
+	dev-libs/libyaml
+	net-libs/libnet:*
+	net-libs/libnfnetlink
+	dev-libs/nspr
+	dev-libs/nss
+	>=net-libs/libhtp-0.5.20
+	net-libs/libpcap
+	sys-apps/file
+	cuda?       ( dev-util/nvidia-cuda-toolkit )
+	geoip?      ( dev-libs/geoip )
+	lua?        ( dev-lang/lua:* )
+	luajit?     ( dev-lang/luajit:* )
+	nflog?      ( net-libs/libnetfilter_log )
+	nfqueue?    ( net-libs/libnetfilter_queue )
+	redis?      ( dev-libs/hiredis )
+	logrotate?      ( app-admin/logrotate )
+	sys-libs/libcap-ng
+"
+# #446814
+#	prelude?    ( dev-libs/libprelude )
+#	pfring?     ( sys-process/numactl net-libs/pf_ring)
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} "${PN}"
+}
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		"--localstatedir=/var/" \
+		"--enable-non-bundled-htp" \
+		$(use_enable af-packet) \
+		$(use_enable detection) \
+		$(use_enable nfqueue) \
+		$(use_enable test coccinelle) \
+		$(use_enable test unittests) \
+		$(use_enable control-socket unix-socket)
+	)
+
+	if use cuda ; then
+		myeconfargs+=( $(use_enable cuda) )
+	fi
+	if use geoip ; then
+		myeconfargs+=( $(use_enable geoip) )
+	fi
+	if use hardened ; then
+		myeconfargs+=( $(use_enable hardened gccprotect) )
+	fi
+	if use nflog ; then
+		myeconfargs+=( $(use_enable nflog) )
+	fi
+	if use redis ; then
+		myeconfargs+=( $(use_enable redis hiredis) )
+	fi
+	# not supported yet (no pfring in portage)
+# 	if use pfring ; then
+# 		myeconfargs+=( $(use_enable pfring) )
+# 	fi
+	# no libprelude in portage
+# 	if use prelude ; then
+# 		myeconfargs+=( $(use_enable prelude) )
+# 	fi
+	if use lua ; then
+		myeconfargs+=( $(use_enable lua) )
+	fi
+	if use luajit ; then
+		myeconfargs+=( $(use_enable luajit) )
+	fi
+
+# this should be used when pf_ring use flag support will be added
+# 	LIBS+="-lrt -lnuma"
+
+	# avoid upstream configure script trying to add -march=native to CFLAGS
+	myeconfargs+=( --enable-gccmarch-native=no )
+
+	if use debug ; then
+		myeconfargs+=( $(use_enable debug) )
+		# so we can get a backtrace according to "reporting bugs" on upstream web site
+		CFLAGS="-ggdb -O0" econf LIBS="${LIBS}" ${myeconfargs[@]}
+	else
+		econf LIBS="${LIBS}" ${myeconfargs[@]}
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto "/etc/${PN}"
+	doins {classification,reference,threshold}.config suricata.yaml
+
+	if use rules ; then
+		insinto "/etc/${PN}/rules"
+		doins rules/*.rules
+	fi
+
+	dodir "/var/lib/${PN}"
+	dodir "/var/log/${PN}"
+
+	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+
+	newinitd "${FILESDIR}/${P}-init" ${PN}
+	newconfd "${FILESDIR}/${P}-conf" ${PN}
+
+	if use logrotate; then
+		insopts -m0644
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/${PN}-logrotate ${PN}
+	fi
+}
+
+pkg_postinst() {
+	elog "The ${PN} init script expects to find the path to the configuration"
+	elog "file as well as extra options in /etc/conf.d."
+	elog ""
+	elog "To create more than one ${PN} service, simply create a new .yaml file for it"
+	elog "then create a symlink to the init script from a link called"
+	elog "${PN}.foo - like so"
+	elog "   cd /etc/${PN}"
+	elog "   ${EDITOR##*/} suricata-foo.yaml"
+	elog "   cd /etc/init.d"
+	elog "   ln -s ${PN} ${PN}.foo"
+	elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo."
+	elog ""
+	elog "You can create as many ${PN}.foo* services as you wish."
+
+	if use logrotate; then
+		elog "You enabled the logrotate USE flag. Please make sure you correctly set up the ${PN} logrotate config file in /etc/logrotate.d/."
+	fi
+
+	if use debug; then
+		elog "You enabled the debug USE flag. Please read this link to report bugs upstream:"
+		elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs"
+		elog "You need to also ensure the FEATURES variable in make.conf contains the"
+		elog "'nostrip' option to produce useful core dumps or back traces."
+	fi
+}
diff --git a/net-analyzer/suricata/suricata-3.2.1.ebuild b/net-analyzer/suricata/suricata-3.2.1.ebuild
new file mode 100644
index 000000000000..419c56ac26d8
--- /dev/null
+++ b/net-analyzer/suricata/suricata-3.2.1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils user
+
+DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
+HOMEPAGE="http://suricata-ids.org/"
+SRC_URI="http://www.openinfosecfoundation.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+af-packet control-socket cuda debug +detection geoip hardened logrotate lua luajit nflog +nfqueue redis +rules test"
+
+DEPEND="
+	>=dev-libs/jansson-2.2
+	dev-libs/libpcre
+	dev-libs/libyaml
+	net-libs/libnet:*
+	net-libs/libnfnetlink
+	dev-libs/nspr
+	dev-libs/nss
+	>=net-libs/libhtp-0.5.20
+	net-libs/libpcap
+	sys-apps/file
+	cuda?       ( dev-util/nvidia-cuda-toolkit )
+	geoip?      ( dev-libs/geoip )
+	lua?        ( dev-lang/lua:* )
+	luajit?     ( dev-lang/luajit:* )
+	nflog?      ( net-libs/libnetfilter_log )
+	nfqueue?    ( net-libs/libnetfilter_queue )
+	redis?      ( dev-libs/hiredis )
+	logrotate?      ( app-admin/logrotate )
+	sys-libs/libcap-ng
+"
+# #446814
+#	prelude?    ( dev-libs/libprelude )
+#	pfring?     ( sys-process/numactl net-libs/pf_ring)
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} "${PN}"
+}
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		"--localstatedir=/var/" \
+		"--enable-non-bundled-htp" \
+		$(use_enable af-packet) \
+		$(use_enable detection) \
+		$(use_enable nfqueue) \
+		$(use_enable test coccinelle) \
+		$(use_enable test unittests) \
+		$(use_enable control-socket unix-socket)
+	)
+
+	if use cuda ; then
+		myeconfargs+=( $(use_enable cuda) )
+	fi
+	if use geoip ; then
+		myeconfargs+=( $(use_enable geoip) )
+	fi
+	if use hardened ; then
+		myeconfargs+=( $(use_enable hardened gccprotect) )
+	fi
+	if use nflog ; then
+		myeconfargs+=( $(use_enable nflog) )
+	fi
+	if use redis ; then
+		myeconfargs+=( $(use_enable redis hiredis) )
+	fi
+	# not supported yet (no pfring in portage)
+# 	if use pfring ; then
+# 		myeconfargs+=( $(use_enable pfring) )
+# 	fi
+	# no libprelude in portage
+# 	if use prelude ; then
+# 		myeconfargs+=( $(use_enable prelude) )
+# 	fi
+	if use lua ; then
+		myeconfargs+=( $(use_enable lua) )
+	fi
+	if use luajit ; then
+		myeconfargs+=( $(use_enable luajit) )
+	fi
+
+# this should be used when pf_ring use flag support will be added
+# 	LIBS+="-lrt -lnuma"
+
+	# avoid upstream configure script trying to add -march=native to CFLAGS
+	myeconfargs+=( --enable-gccmarch-native=no )
+
+	if use debug ; then
+		myeconfargs+=( $(use_enable debug) )
+		# so we can get a backtrace according to "reporting bugs" on upstream web site
+		CFLAGS="-ggdb -O0" econf LIBS="${LIBS}" ${myeconfargs[@]}
+	else
+		econf LIBS="${LIBS}" ${myeconfargs[@]}
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto "/etc/${PN}"
+	doins {classification,reference,threshold}.config suricata.yaml
+
+	if use rules ; then
+		insinto "/etc/${PN}/rules"
+		doins rules/*.rules
+	fi
+
+	dodir "/var/lib/${PN}"
+	dodir "/var/log/${PN}"
+
+	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+
+	newinitd "${FILESDIR}/${P}-init" ${PN}
+	newconfd "${FILESDIR}/${P}-conf" ${PN}
+
+	if use logrotate; then
+		insopts -m0644
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/${PN}-logrotate ${PN}
+	fi
+}
+
+pkg_postinst() {
+	elog "The ${PN} init script expects to find the path to the configuration"
+	elog "file as well as extra options in /etc/conf.d."
+	elog ""
+	elog "To create more than one ${PN} service, simply create a new .yaml file for it"
+	elog "then create a symlink to the init script from a link called"
+	elog "${PN}.foo - like so"
+	elog "   cd /etc/${PN}"
+	elog "   ${EDITOR##*/} suricata-foo.yaml"
+	elog "   cd /etc/init.d"
+	elog "   ln -s ${PN} ${PN}.foo"
+	elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo."
+	elog ""
+	elog "You can create as many ${PN}.foo* services as you wish."
+
+	if use logrotate; then
+		elog "You enabled the logrotate USE flag. Please make sure you correctly set up the ${PN} logrotate config file in /etc/logrotate.d/."
+	fi
+
+	if use debug; then
+		elog "You enabled the debug USE flag. Please read this link to report bugs upstream:"
+		elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs"
+		elog "You need to also ensure the FEATURES variable in make.conf contains the"
+		elog "'nostrip' option to produce useful core dumps or back traces."
+	fi
+}
diff --git a/net-analyzer/suricata/suricata-3.2.ebuild b/net-analyzer/suricata/suricata-3.2.ebuild
new file mode 100644
index 000000000000..a8763bf9ff89
--- /dev/null
+++ b/net-analyzer/suricata/suricata-3.2.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils user
+
+DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
+HOMEPAGE="http://suricata-ids.org/"
+SRC_URI="http://www.openinfosecfoundation.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+af-packet control-socket cuda debug +detection geoip hardened lua luajit nflog +nfqueue redis +rules test"
+
+DEPEND="
+	>=dev-libs/jansson-2.2
+	dev-libs/libpcre
+	dev-libs/libyaml
+	net-libs/libnet:*
+	net-libs/libnfnetlink
+	dev-libs/nspr
+	dev-libs/nss
+	>=net-libs/libhtp-0.5.20
+	net-libs/libpcap
+	sys-apps/file
+	cuda?       ( dev-util/nvidia-cuda-toolkit )
+	geoip?      ( dev-libs/geoip )
+	lua?        ( dev-lang/lua:* )
+	luajit?     ( dev-lang/luajit:* )
+	nflog?      ( net-libs/libnetfilter_log )
+	nfqueue?    ( net-libs/libnetfilter_queue )
+	redis?      ( dev-libs/hiredis )
+"
+# #446814
+#	prelude?    ( dev-libs/libprelude )
+#	pfring?     ( sys-process/numactl net-libs/pf_ring)
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} "${PN}"
+}
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		"--localstatedir=/var/" \
+		"--enable-non-bundled-htp" \
+		$(use_enable af-packet) \
+		$(use_enable detection) \
+		$(use_enable nfqueue) \
+		$(use_enable test coccinelle) \
+		$(use_enable test unittests) \
+		$(use_enable control-socket unix-socket)
+	)
+
+	if use cuda ; then
+		myeconfargs+=( $(use_enable cuda) )
+	fi
+	if use geoip ; then
+		myeconfargs+=( $(use_enable geoip) )
+	fi
+	if use hardened ; then
+		myeconfargs+=( $(use_enable hardened gccprotect) )
+	fi
+	if use nflog ; then
+		myeconfargs+=( $(use_enable nflog) )
+	fi
+	if use redis ; then
+		myeconfargs+=( $(use_enable redis hiredis) )
+	fi
+	# not supported yet (no pfring in portage)
+# 	if use pfring ; then
+# 		myeconfargs+=( $(use_enable pfring) )
+# 	fi
+	# no libprelude in portage
+# 	if use prelude ; then
+# 		myeconfargs+=( $(use_enable prelude) )
+# 	fi
+	if use lua ; then
+		myeconfargs+=( $(use_enable lua) )
+	fi
+	if use luajit ; then
+		myeconfargs+=( $(use_enable luajit) )
+	fi
+
+# this should be used when pf_ring use flag support will be added
+# 	LIBS+="-lrt -lnuma"
+
+	# avoid upstream configure script trying to add -march=native to CFLAGS
+	myeconfargs+=( --enable-gccmarch-native=no )
+
+	if use debug ; then
+		myeconfargs+=( $(use_enable debug) )
+		# so we can get a backtrace according to "reporting bugs" on upstream web site
+		CFLAGS="-ggdb -O0" econf LIBS="${LIBS}" ${myeconfargs[@]}
+	else
+		econf LIBS="${LIBS}" ${myeconfargs[@]}
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto "/etc/${PN}"
+	doins {classification,reference,threshold}.config suricata.yaml
+
+	if use rules ; then
+		insinto "/etc/${PN}/rules"
+		doins rules/*.rules
+	fi
+
+	dodir "/var/lib/${PN}"
+	dodir "/var/log/${PN}"
+
+	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+
+	newinitd "${FILESDIR}/${P}-init" ${PN}
+	newconfd "${FILESDIR}/${P}-conf" ${PN}
+}
+
+pkg_postinst() {
+	elog "The ${PN} init script expects to find the path to the configuration"
+	elog "file as well as extra options in /etc/conf.d"
+	elog ""
+	elog "To create more than one ${PN} service, simply create a new .yaml file for it"
+	elog "then create a symlink to the init script from a link called"
+	elog "${PN}.foo - like so"
+	elog "   cd /etc/${PN}"
+	elog "   ${EDITOR##*/} suricata-foo.yaml"
+	elog "   cd /etc/init.d"
+	elog "   ln -s ${PN} ${PN}.foo"
+	elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo."
+	elog ""
+	elog "You can create as many ${PN}.foo* services as you wish."
+
+	if use debug; then
+	    elog "You enabled the debug USE flag. Please read this link to report bugs upstream:"
+	    elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs"
+	fi
+}
diff --git a/net-analyzer/symon/Manifest b/net-analyzer/symon/Manifest
new file mode 100644
index 000000000000..934967b97bbb
--- /dev/null
+++ b/net-analyzer/symon/Manifest
@@ -0,0 +1,11 @@
+AUX symon-init.d 554 SHA256 2ce2d2f4fba7611d3f56cee2d82214535e14be98d88352a921bbc0c82fa623d3 SHA512 5d9261c9784e17c39717fa7b446ab7e840e356549a687b423f28cb3bc0af03f4ee27652fea0ce4c7116d02eddd3adf7a417e61430b0cd4b21a9b286d484856a6 WHIRLPOOL 2a7c5bdda55e67315b23b256f77f101e03abc66b6fd3cca431a585ef32105501afa268f0e0622aeed8aa181830fb18af2c22a443ace439b004fe01d0e464228f
+AUX symon.conf 313 SHA256 3f4914f65fa4456de5ee70da3c6f40f416d6452fac8a439648cc565c791cec73 SHA512 9d83d316a5024c0fc5a9c487113088548e6ba193360d684b162d39e0373bc478ebdb40b7ce508c0de2287de6684c75cfcf2f312e34e9def1dcaaeb0036ecab56 WHIRLPOOL f782d8fb717c3de1bec7e5dfab0591bb51e1770605fc6060b2b5537eae31b3b3afcde9964a23b410c69388c3d32d94193894f8369a1865be887423f53d283d2f
+AUX symux-init.d 548 SHA256 3c0a86a4deb08cce57576dead7306748db6e5de267c405ec81d5762621b9c3a5 SHA512 0f494d3d141cfcc800d33dc0ed364fafaf713811ec8a8ccec7a77b421888aff42546ad742bdaf3928c49bf61d76b97fd3f2fc8992fadf1d1c499c9a1aeada11d WHIRLPOOL 06c0204de3f973da39e22259eb9ab9f1847cf15981bb06fecc50b6f0029a8ce2f369f40e620b1ce8c5276e54680ba0ee072cc0a8929f9346891f561f09dc0e2a
+AUX symux.conf 952 SHA256 20f915f55f084c1f9b55410c097c8165e2d621924e3496c9e3add7c1de655126 SHA512 5f7aa2d069ed6cb58dfc6ce7ab192f1486256551c1315b86b0216c56d4ee93d84101168c5ee8c1507729136dcd05c7a09cc9c901f132c5fc8015b2502bc15272 WHIRLPOOL 919d2bf8d56b52dccc10b0899993ff839578d16760243d2c204706d17662c34b33a1cf3dee4aae10728afc4191045d6c641396416fe61ff697209f68e64f7b8c
+DIST symon-2.87.tar.gz 107607 SHA256 3c0fa1aa0073f66c45697ffc12bb8da669eb67aeac22041d21235bbc515a8602 SHA512 8fce5cf2312f1d7ba78f693da2df9fea3bbeacae0c1b65f79c5f2444fcf07e07b11a5a7229ba762ac47ce484429a42f37bcbcc9e001fce0e5813a0dffd57a953 WHIRLPOOL ce9277f03198fbfa197aaa3540d6f5226d3f449bf69a2ee083917f4afe2e6439cfcc3289792c1f1ecf727d004d6aec3f470a813700f033fa6d9e13390ed5ce22
+DIST symon-2.88.tar.gz 110149 SHA256 02fd2641b0f671b1a623ff37099c75a3523e3ae98c7fdb1f5ebd04cb9cfa20f1 SHA512 d2079caefcde4cf017460560826c7bf9e97aee9dcce886cd0a85d671bdad877c513889c9b7cd67844dbb4161ce6b6e6f99709475dd2591141f1bc61ee11e8173 WHIRLPOOL b5724c1e787ba2932afecd0902cedea590e6a7a8de41c0b914ac53fed863b47863585fef401d8b5d69d085cd06c5b1eac436a3abb9f230b7f071a09ae2c6eacb
+EBUILD symon-2.87.ebuild 2483 SHA256 53b80db155df7f98a784485b9e66a55a0dcdb56e73d386682ee07a058159995b SHA512 a478a48b3b306463723e1f0a3b8a63a5a93c0d7da749af1e5984aeb14e6392b504ef65defb1f86e3becdfbf0a875565db96d67bccd94f584d09177047d6b078e WHIRLPOOL 2f391c5045f60be02420eab61c030dc48f985798a2324f60d6ace6263ca85f4e02c12d6e33672a425e69b961f7943c3935b4423395bc21e72cf457f5c31873af
+EBUILD symon-2.88.ebuild 2223 SHA256 a2e00957868817ba8ca58958f9cf71a9dce24d2a4d066706f8f4f36d309c7575 SHA512 c0315406f7080814403892756f7e0e23b4701f74d7326fe93d824b0f470113be3dbd5c7330025bcde15d36f546bde49f53000dfb150cab17ea49df055c628061 WHIRLPOOL 0afa1031a994ce55ce9b2ae67aaf055c0e93cce73c571ee21e60dd6cb0fc8c94481235e281185681b816e2517fa193c75088df25b952155ab5311880a76f8b78
+MISC ChangeLog 3390 SHA256 ec4df1d3cc8d62b41a08ab973937c015997be48dd15a00acdbe3e33fa81cfb7f SHA512 7c95b11e3467f132c9c76dc285a10c562f9590fc12a7f8aa98a937e4721d4efcf1c78e216920a9e3920b55bf1d2c69f92d03879e56ab91747be315f2aa0c36c8 WHIRLPOOL 8d8cef0b1734c746613e704821d34db9761eaf2148a19a6769a6ff108577fef8ce2cd88b2016fcd307f11ce0da277b9f0ca9e26f5dd5bd95462376605a694cf4
+MISC ChangeLog-2015 3741 SHA256 ee1fbebddf0b256da1b3a7ef1e9a7f56e8d00e006c7bf6fe4c7e527ea9504271 SHA512 964018da309fced62dadd18c5bfbc0065639d4a3bba0d3b47f5d0847a23dc135243b597377dda80853cc5a73f42530aed288744155f5bc7e9c1df85628a5b93f WHIRLPOOL 985ad0a2bd8189d173af7c18438ac490ea2341ef80e60345e47a00c4b4232d141176231ff196ff5a68d6ffaacd5aecdc7667c1b46b80eb0b1d4fdd8096f4b710
+MISC metadata.xml 632 SHA256 ad98172ccc6dc607ed622a3eed3c3b6de6d1b719f44a64956b8c8516b0d8cc77 SHA512 57e46a4106feab37a2f1c4cf5b9260bdcdfe8fa9f06fe850ca03cc3f9f80439e0f2db26c9cf41b2e7a10954241a4fbed68a16b5f8f33a6ed1b2c9ed31ea6edb7 WHIRLPOOL 27d81927ad1efcd6e9e68dbb54b640baef027ab1c6428915db68c87c3e9b63b57c554f1914bb088b8e9d9c9018c9fbe567f49c3510b0788ff23bc58fac628b01
diff --git a/net-analyzer/symon/files/symon-init.d b/net-analyzer/symon/files/symon-init.d
new file mode 100644
index 000000000000..3d48b793e597
--- /dev/null
+++ b/net-analyzer/symon/files/symon-init.d
@@ -0,0 +1,32 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the 2-clause BSD license
+
+extra_started_commands="reload"
+
+depend() {
+	after bootmisc
+	need localmount net
+	use logger
+}
+
+reload() {
+	ebegin "Reloading symon"
+	start-stop-daemon \
+		--pidfile /run/symon.pid \
+		--exec /usr/sbin/symon \
+		--signal HUP
+	eend $?
+}
+
+start() {
+	ebegin "Starting symon"
+	start-stop-daemon --start --exec /usr/sbin/symon -- -u
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping symon"
+	start-stop-daemon --stop --pidfile /run/symon.pid
+	eend $?
+}
diff --git a/net-analyzer/symon/files/symon.conf b/net-analyzer/symon/files/symon.conf
new file mode 100644
index 000000000000..920662185e58
--- /dev/null
+++ b/net-analyzer/symon/files/symon.conf
@@ -0,0 +1,14 @@
+#
+# Demo configuration for symon. See symon(8) for BNF.
+#
+
+monitor { cpu(0),  mem,
+	  if(lo),
+#	  cpuiow(0),
+#         sensor(fan0), sensor(in0), sensor(temp0),
+#         if(eth0), if(eth1), if(eth2),
+#         df(sda),
+#	  smart(sda),
+#	  io(hda), io(hdb), io(hdc), io(hdd)
+	  io(sda)
+} stream to 127.0.0.1 2100
diff --git a/net-analyzer/symon/files/symux-init.d b/net-analyzer/symon/files/symux-init.d
new file mode 100644
index 000000000000..452d4581b807
--- /dev/null
+++ b/net-analyzer/symon/files/symux-init.d
@@ -0,0 +1,32 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the 2-clause BSD license
+
+extra_started_commands="reload"
+
+depend() {
+	after bootmisc
+	need localmount net
+	use logger
+}
+
+reload() {
+	ebegin "Reloading symux"
+	start-stop-daemon \
+		--pidfile /run/symux.pid \
+		--exec /usr/sbin/symux \
+		--signal HUP
+	eend $?
+}
+
+start() {
+	ebegin "Starting symux"
+	start-stop-daemon --start --exec /usr/sbin/symux
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping symux"
+	start-stop-daemon --stop --pidfile /run/symux.pid
+	eend $?
+}
diff --git a/net-analyzer/symon/files/symux.conf b/net-analyzer/symon/files/symux.conf
new file mode 100644
index 000000000000..fa0ed50631d7
--- /dev/null
+++ b/net-analyzer/symon/files/symux.conf
@@ -0,0 +1,35 @@
+#
+# Demo symux configuration. See symux(8) for BNF.
+#
+
+mux 127.0.0.1 2100
+
+source 127.0.0.1 {
+	accept { cpu(0),  mem,
+	  	 if(lo),
+#		 cpuiow(0),
+#         	 sensor(fan0), sensor(in0), sensor(temp0),
+#         	 if(eth0), if(eth1), if(eth2),
+#         	 df(sda),
+#         	 smart(sda),
+#	  	 io(hda), io(hdb), io(hdc), io(hdd)
+	  	 io(sda)
+	}
+	datadir "/var/lib/symon/rrds/localhost"
+}
+
+# an example showing the write directive
+#
+# source 10.0.0.2 {
+#	accept { cpu(0), mem, if(eth0), if(eth1),
+#		 if(lo), if(eth2), io(sda)
+#	}
+#
+#	write cpu(0)   in "/var/lib/symon/rrds/<host>/cpu0.rrd"
+#	write mem      in "/var/lib/symon/rrds/<host>/mem.rrd"
+#	write if(eth0) in "/var/lib/symon/rrds/<host>/if_eth0.rrd"
+#	write if(eth1) in "/var/lib/symon/rrds/<host>/if_eth1.rrd"
+#	write if(lo)   in "/var/lib/symon/rrds/<host>/if_lo.rrd"
+#	write if(eth2) in "/var/lib/symon/rrds/<host>/if_eth2.rrd"
+#	write io(sda)  in "/var/lib/symon/rrds/<host>/io_sda.rrd"
+# }
diff --git a/net-analyzer/symon/metadata.xml b/net-analyzer/symon/metadata.xml
new file mode 100644
index 000000000000..ed375df28cbc
--- /dev/null
+++ b/net-analyzer/symon/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<use>
+		<flag name="perl">Enables a generic perl symux client</flag>
+		<flag name="symon">Enables the system monitor. Offers no functionality
+		but monitoring and forwarding of measured data</flag>
+		<flag name="symux">Enables the multiplexer which stores incoming symon
+		streams on disk in RRD (<pkg>net-analyzer/rrdtool</pkg>) files</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-analyzer/symon/symon-2.87.ebuild b/net-analyzer/symon/symon-2.87.ebuild
new file mode 100644
index 000000000000..f78f8d6d8a33
--- /dev/null
+++ b/net-analyzer/symon/symon-2.87.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils perl-module toolchain-funcs
+
+DESCRIPTION="Performance and information monitoring tool"
+HOMEPAGE="http://www.xs4all.nl/~wpd/symon/"
+SRC_URI="http://www.xs4all.nl/~wpd/symon/philes/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="perl +symon symux"
+
+RDEPEND="perl? ( dev-lang/perl )
+	symux? ( net-analyzer/rrdtool )"
+DEPEND="${RDEPEND}
+	sys-devel/pmake"
+
+S=${WORKDIR}/${PN}
+
+# Deletes the directory passed as an argument from the internal pmake
+# variable SUBDIR.
+zap_subdir() {
+	sed -i "/^SUBDIR/s|$1||" Makefile || die
+}
+
+pkg_setup() {
+	use symon && USE_SYMON=1 && return
+
+	if ! use perl && ! use symon && ! use symux; then
+		ewarn "You have all available USE flags disabled. Therefore, only the"
+		ewarn "system monitor will be emerged. Please, enable at least one USE"
+		ewarn "flag to avoid this message."
+		USE_SYMON=1
+	fi
+}
+
+src_prepare() {
+	sed -i \
+		-e '/^[ \t]*${CC}.*\${LIBS}/s:\${CC}:$(CC) $(LDFLAGS):' \
+		sym*/Makefile || die
+}
+
+src_configure() {
+	# Do some sed magic in accordance with the USE flags.
+	use perl && [[ -z ${USE_SYMON} ]] && ! use symux && zap_subdir lib
+	! use perl && zap_subdir client
+	! use symux && zap_subdir symux
+	[[ -z ${USE_SYMON} ]] && zap_subdir symon
+}
+
+src_compile() {
+	pmake CC="$(tc-getCC)" CFLAGS+="${CFLAGS}" STRIP=true || die "pmake failed"
+}
+
+src_install() {
+	if [[ -n ${USE_SYMON} ]]; then
+		insinto /etc
+		doins "${FILESDIR}"/symon.conf
+
+		newinitd "${FILESDIR}"/symon-init.d symon
+
+		dodoc CHANGELOG HACKERS TODO
+
+		doman symon/symon.8
+		dosbin symon/symon
+	fi
+
+	if use perl; then
+		dobin client/getsymonitem.pl
+
+		perl_set_version
+		insinto ${VENDOR_LIB}
+		doins client/SymuxClient.pm
+	fi
+
+	if use symux; then
+		insinto /etc
+		doins "${FILESDIR}"/symux.conf
+
+		newinitd "${FILESDIR}"/symux-init.d symux
+
+		doman symux/symux.8
+		dosbin symux/symux
+
+		dodir /usr/share/symon
+		insinto /usr/share/symon
+		doins symux/c_smrrds.sh
+		fperms a+x /usr/share/symon/c_smrrds.sh
+
+		dodir /var/lib/symon/rrds/localhost
+	fi
+}
+
+pkg_postinst() {
+	if use symux; then
+		elog "The RRDs files can be obtained by running"
+		elog "/usr/share/symon/c_smrrds.sh all."
+		elog "For information about migrating RRDs from a previous"
+		elog "symux version read the LEGACY FORMATS section of symux(8)."
+		elog "To view the rrdtool pictures of the stored data, emerge"
+		elog "net-analyzer/syweb."
+	fi
+}
diff --git a/net-analyzer/symon/symon-2.88.ebuild b/net-analyzer/symon/symon-2.88.ebuild
new file mode 100644
index 000000000000..2ea5066d30b8
--- /dev/null
+++ b/net-analyzer/symon/symon-2.88.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils perl-module toolchain-funcs
+
+DESCRIPTION="Performance and information monitoring tool"
+HOMEPAGE="http://wpd.home.xs4all.nl/symon"
+SRC_URI="${HOMEPAGE}/philes/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="perl +symon symux"
+REQUIRED_USE="
+	|| ( perl symon symux )
+"
+
+RDEPEND="
+	perl? ( dev-lang/perl )
+	symux? ( net-analyzer/rrdtool )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/pmake
+"
+
+S=${WORKDIR}/${PN}
+
+# Deletes the directory passed as an argument from the internal pmake
+# variable SUBDIR.
+zap_subdir() {
+	sed -i "/^SUBDIR/s|$1||" Makefile || die
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/^[ \t]*${CC}.*\${LIBS}/s:\${CC}:$(CC) $(LDFLAGS):' \
+		sym*/Makefile || die
+}
+
+src_configure() {
+	use symon && USE_SYMON=1
+	# Do some sed magic in accordance with the USE flags.
+	use perl && [[ -z ${USE_SYMON} ]] && ! use symux && zap_subdir lib
+	! use perl && zap_subdir client
+	! use symux && zap_subdir symux
+	[[ -z ${USE_SYMON} ]] && zap_subdir symon
+}
+
+src_compile() {
+	pmake CC="$(tc-getCC)" CFLAGS+="${CFLAGS}" STRIP=true || die
+}
+
+src_install() {
+	if [[ -n ${USE_SYMON} ]]; then
+		insinto /etc
+		doins "${FILESDIR}"/symon.conf
+
+		newinitd "${FILESDIR}"/symon-init.d symon
+
+		dodoc CHANGELOG HACKERS TODO
+
+		doman symon/symon.8
+		dosbin symon/symon
+	fi
+
+	if use perl; then
+		dobin client/getsymonitem.pl
+
+		perl_set_version
+		insinto ${VENDOR_LIB}
+		doins client/SymuxClient.pm
+	fi
+
+	if use symux; then
+		insinto /etc
+		doins "${FILESDIR}"/symux.conf
+
+		newinitd "${FILESDIR}"/symux-init.d symux
+
+		doman symux/symux.8
+		dosbin symux/symux
+
+		dodir /usr/share/symon
+		insinto /usr/share/symon
+		doins symux/c_smrrds.sh
+		fperms a+x /usr/share/symon/c_smrrds.sh
+
+		dodir /var/lib/symon/rrds/localhost
+	fi
+}
+
+pkg_postinst() {
+	if use symux; then
+		elog "The RRDs files can be obtained by running"
+		elog "/usr/share/symon/c_smrrds.sh all."
+		elog "For information about migrating RRDs from a previous"
+		elog "symux version read the LEGACY FORMATS section of symux(8)."
+		elog "To view the rrdtool pictures of the stored data, emerge"
+		elog "net-analyzer/syweb."
+	fi
+}
diff --git a/net-analyzer/synscan/Manifest b/net-analyzer/synscan/Manifest
new file mode 100644
index 000000000000..30adbb440098
--- /dev/null
+++ b/net-analyzer/synscan/Manifest
@@ -0,0 +1,6 @@
+AUX synscan-5.01-build.patch 2450 SHA256 478bc04fb412414fae1a1758c9130d240d045f38b79b9fa57ee8a1b54a35128f SHA512 231420fbc0b306442a8589bc406a9d8f6a206103878b5dde4dc1dd4d2d18ce165863c76df21b24c130895be4dbbc5798deae59044aa1e1d288fb3ffbc7acaaaa WHIRLPOOL 498b61ee6c25efde793f48ddd3a228dfa1e12daa09814ae7896a8028ab3b152850ba50c32b9e6dddbaba84a1e0302d2b37d48ed73a2480fd9dbbcd068eb78019
+DIST synscan-5.01.tar.gz 61440 SHA256 6fca109c82fe407dedaa9152963c7faa7445a998fb0ad1971bd861d7bafcc29f SHA512 6a090ceed5ca0766b63a82fee468459a47cc2bbd97c120d0e0b8708f5ce154116d988a42ff29a9b6fa5fd6d699064b1df0e263795c4dcef0f619797289db88fc WHIRLPOOL e89f094780aac5c0e6443b8cfc95546a5743e5acaf588398d8851ff0507b315660fd572c4f02ef1451098c6e23ff096d758bbe6210bb5f2991e8f6b766a0c931
+EBUILD synscan-5.01.ebuild 722 SHA256 a4805083adfe3f375d5dc560c1728763e8322ef0c7188ab91f3b53b57eb9376e SHA512 6abd15b1dcf875b960044814edb968461e6ae863a3428cc5e5a37f4a0fd1d81bef5849a92d3726c968d1a5289c3c077fc729a771ad3ea0023e3a37f07c03a4c8 WHIRLPOOL 25aaa5989ca36dd2d60f8c40884b0e69df424bb0b88d30f5e98187312c5ec00b1f0917621983fee8f30b3fd194990c89d2f01fefe678dab1ed25dd860260f056
+MISC ChangeLog 2332 SHA256 2f701d5602acf6fae62754a9a0ee1bdaa43e205b15d0454184c0ad928e1c4f1e SHA512 5e3ee0fd8c841c27bebb4f723a461abf14bead9bad8c2f76b2cd7198bd6158ae14dca928640d1dab8838c2b6c01e14f393dc4ba8fbc98f43fc6b06d2db59136d WHIRLPOOL 0e179bbd7ccc7cf20529c3fd5440e513d78d7ee3da31dcb262dc7c095fbaf50549e7b3163a59dbfeb9f82e9a6be5284f2c8be73d19373e1f7da8ce2263702a39
+MISC ChangeLog-2015 469 SHA256 cb83337443cb64695709e8d0bd46c9ee3cf9571b6be4efba55553a3f2e39880c SHA512 5b26129a7f518978d58994cb592d99db399224395ed9ac9a3efa5688ecefa311d4bf40c1e8e7f7567185ccec1495d3a17766e409eefbd26d817f34b980ffe80b WHIRLPOOL 4944c890ac9533a850213e30638e2fdcfd5a1d41daa728950c355cebb91f88f43efd120b659e51000b926ffe676da32b6ad512a91eee7e7a6818003316d8c895
+MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
diff --git a/net-analyzer/synscan/files/synscan-5.01-build.patch b/net-analyzer/synscan/files/synscan-5.01-build.patch
new file mode 100644
index 000000000000..79cf6943e185
--- /dev/null
+++ b/net-analyzer/synscan/files/synscan-5.01-build.patch
@@ -0,0 +1,79 @@
+diff -ur synscan-5.01.orig/configure.in synscan-5.01/configure.in
+--- synscan-5.01.orig/configure.in	2009-03-31 23:22:46.000000000 +0300
++++ synscan-5.01/configure.in	2010-06-14 00:31:06.000000000 +0300
+@@ -49,7 +49,7 @@
+         owd=`pwd`
+ 	if cd $withval; then withval=`pwd`; cd $owd; fi
+         CFLAGS="$CFLAGS -I$withval -I$withval/bpf"
+-        LDFLAGS="$LDFLAGS -L$withval -lpcap"
++        LIBS="$LIBS -L$withval -lpcap"
+      else
+         AC_ERROR(pcap.h or libpcap.a not found in $withval)
+      fi
+@@ -57,12 +57,12 @@
+   esac ],
+ [ if test -f ${prefix}/include/pcap.h; then
+      CFLAGS="$CFLAGS -I${prefix}/include"
+-     LDFLAGS="$LDFLAGS -L${prefix}/lib -lpcap"
++     LIBS="$LIBS -L${prefix}/lib -lpcap"
+   elif test -f /usr/include/pcap/pcap.h; then
+      CFLAGS="$CFLAGS -I/usr/include/pcap"
+-     LDFLAGS="$LDFLAGS -lpcap"
++     LIBS="$LIBS -lpcap"
+   elif test -f /usr/include/pcap.h; then
+-     LDFLAGS="$LDFLAGS -lpcap"
++     LIBS="$LIBS -lpcap"
+   else
+      AC_MSG_RESULT(no)
+      AC_ERROR(libpcap not found)
+@@ -73,12 +73,15 @@
+ ##
+ ## Check of getoptlong
+ ##
+-AC_CHECK_FUNCS([getopt_long],,
+-  AC_CHECK_LIB([gnugetopt], getopt_long,
+-               [ LDFLAGS="$LDFLAGS -lgnugetopt";
+-                 AC_DEFINE([HAVE_GETOPT_LONG])]
+-               )
+-)
++ac_cv_have_getopt_long="no"
++AC_CHECK_FUNCS([getopt_long],
++ [ac_cv_have_getopt_long="yes"],
++ [AC_CHECK_LIB([gnugetopt], [getopt_long],
++   [ac_cv_have_getopt_long="yes"
++    LIBS="${LIBS} -lgnugetopt"])])
++if test "$ac_cv_have_getopt_long" != "no"; then
++  AC_DEFINE([HAVE_GETOPT_LONG])
++fi
+ 
+ ##
+ ## Output files
+diff -ur synscan-5.01.orig/Makefile.in synscan-5.01/Makefile.in
+--- synscan-5.01.orig/Makefile.in	2009-03-31 23:22:28.000000000 +0300
++++ synscan-5.01/Makefile.in	2010-06-14 00:32:19.000000000 +0300
+@@ -5,7 +5,7 @@
+ 
+ CC = @CC@
+ CFLAGS=@CFLAGS@ @DEFS@ -Wall
+-LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
+ 
+ OBJS_MINIMAL = \
+ 	common.o net.o obuf.o
+@@ -56,13 +56,13 @@
+ solaris-sparc-gcc:
+ 	$(MAKE) $(PROJ) \
+ 		CFLAGS="$(CFLAGS) -DBSD_COMP -DSOLARIS" \
+-		LDFLAGS="$(LDFLAGS) -lsocket -lresolv -lnsl"
++		LIBS="$(LIBS) -lsocket -lresolv -lnsl"
+ 
+ synscan: synscan.c synscan.h ${OBJS}
+-	${CC} ${CFLAGS} $< ${OBJS} ${LDFLAGS} -o synscan
++	${CC} ${LDFLAGS} ${CFLAGS} $< ${OBJS} ${LIBS} -o synscan
+ 
+ sslog: sslog.c ${OBJS}
+-	${CC} ${CFLAGS} $< ${OBJS} ${LDFLAGS} -o sslog
++	${CC} ${LDFLAGS} ${CFLAGS} $< ${OBJS} ${LIBS} -o sslog
+ 
+ install:
+ 	mkdir -p -m 755 ${bindir}
diff --git a/net-analyzer/synscan/metadata.xml b/net-analyzer/synscan/metadata.xml
new file mode 100644
index 000000000000..097975e3adc2
--- /dev/null
+++ b/net-analyzer/synscan/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>
diff --git a/net-analyzer/synscan/synscan-5.01.ebuild b/net-analyzer/synscan/synscan-5.01.ebuild
new file mode 100644
index 000000000000..14cfdbfae4c4
--- /dev/null
+++ b/net-analyzer/synscan/synscan-5.01.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A fast asynchronous half-open TCP portscanner"
+HOMEPAGE="http://www.digit-labs.org/files/tools/synscan/"
+SRC_URI="http://www.digit-labs.org/files/tools/${PN}/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="kernel_FreeBSD kernel_linux"
+
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+	eautoconf
+}
+
+src_compile() {
+	local _target
+	use kernel_FreeBSD && _target=freebsd
+	use kernel_linux && _target=linux
+
+	emake ${_target}
+}
+
+src_install() {
+	dobin synscan sslog
+	dodoc AUTHORS README
+}
diff --git a/net-analyzer/syweb/Manifest b/net-analyzer/syweb/Manifest
new file mode 100644
index 000000000000..a3e24273eb57
--- /dev/null
+++ b/net-analyzer/syweb/Manifest
@@ -0,0 +1,7 @@
+AUX postinstall-en.txt 353 SHA256 ac0e8510c15719c525f054439174c55ddd90b1e1abc88c3a74b84f7b2d9c3244 SHA512 fb14e7b4acb86a0acc261e1690a03fc963be1e20df808c5a1f324692b0a2b0494fe79fe2e9b97d0be088cccd7c4c03ad3a4feafb126d17d0896e5c931670b0a1 WHIRLPOOL 80b90c0e940d91423003a3b0176b6924d6df7c5b2f98af548196250a7138bb7bcef54855f3999d07999055ab38905f8ec85201aa0fb6bd7148e7acb1fb096fae
+AUX reconfig 374 SHA256 7c207c999b5b31bc46a3b4f64afe21505e9217bc94d3ce5765298fbb8c329276 SHA512 4305a6931b07c8e06a4841a3b5094419f8201407a060c8a766424b31049d30e432921d53d6204cbc7a2c0d52f03119932ec99df915985050b7798f3f2653aaf6 WHIRLPOOL a3244b2784da8d94666ea73786fcdc50159a4a1d192a61d54843fe4fc36d1debc47888f20d564a5b6c5063233965f5fe12ea398f56db16602915573f1f2003ee
+DIST syweb-0.65.tar.gz 37052 SHA256 b37492b7180f27731b7ed3241f9e39d57633d10d0af3f9a19b52ed3df33595a2 SHA512 ca4a4ad6f48dc4ff32c11979d6f34ae6f87462fd295780cdef6609ca425d21698ff43e2c5ffbf43a1f1ecccef4718891992160d1fbc1325726c474d113f824b2 WHIRLPOOL 5b5edb41e65da5e53a33d32a5320dafcc540b7b5770c0f42213684cdaef5d1dce4a2310d11e8b62c1371ad62083c2be9ffff3d5c405e3ca331d30e777b3f338e
+EBUILD syweb-0.65.ebuild 921 SHA256 18b929af64c0f10fcfda845901e81aaee0a3d404c0423fcfaccfc6d1ff53f18c SHA512 86d24e2d6350c99c909e61c51d27f976afd8de1e65c12e6208618cb7fab449c90ef8ae32557cb9c0ab2ed6f22df797c3d1893a9cede812683347f72f98e249fb WHIRLPOOL bcc1da195a3751086f88dc191c3e2bd9167ad647488fccccb346796ec79eede5a3f2cc2361a137a4d935480502c604cf2fe6476a77d35ce8d70477358aeb8ad5
+MISC ChangeLog 2469 SHA256 af3d715ff9ada19dbc4f73db95536f29119652c99c60930c219b1472ea7fe3bb SHA512 d4c45943b0fd4c27a0775a383be876ce62e7c0c84ac30dee773c3a6ee82f4f63ef4f3adb82b0b9577288a52d7388041aa1ff79e5cd3fc3c54f739947fd7c4158 WHIRLPOOL 6c7ff3b4f24ed78881aeb76d4e89c79cfaf297b9f4d51514f0a17aff80fc36168394bf20763420ead011089767a5c9ea3f41bade7b436821db99f510dd6b1102
+MISC ChangeLog-2015 1946 SHA256 831ad526b415d67048e2c9ffee0eeb9b993aa32155d6e950abf0dc8a7a7473de SHA512 0fbb096052624b5f74d7889596966262e432072dc285cb1b65404480201721d8d2888e883939fec33e089b53cf9d00ca5b06eea98cda714d2f6ce23cd05d88a0 WHIRLPOOL 3d420e2738ac6ccc3a935cf8375c327d622cf5167093854b0d2ef3efdd183512c31710d9edad3ccdfc82f2d53235faa0a65ccf36ce549787c0c4a0d0cb247659
+MISC metadata.xml 280 SHA256 b04c5b9d91f6c4d6e36583488fd032751034d1e035085609c9bdf7677cf1e83f SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef WHIRLPOOL 6f3756b9ac748acccb6ac5a4de133cf93988e8c904f606376fecbb6a21ce038e86437fecca43b2521538da2570d33ff1a6a1e0cab290a3d71a9b4f2734f16328
diff --git a/net-analyzer/syweb/files/postinstall-en.txt b/net-analyzer/syweb/files/postinstall-en.txt
new file mode 100644
index 000000000000..291d66d4e381
--- /dev/null
+++ b/net-analyzer/syweb/files/postinstall-en.txt
@@ -0,0 +1,8 @@
+Test your syweb installation by pointing your browser to the URL
+http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/configtest.php
+
+If you don't want any user interaction, move index_noui.php to index.php.
+
+syweb expects a <host>/*.rrd style directory structure under
+/var/lib/symon/rrds. Customize ${MY_INSTALLDIR}/setup.inc
+if this is incorrect for your setup.
diff --git a/net-analyzer/syweb/files/reconfig b/net-analyzer/syweb/files/reconfig
new file mode 100644
index 000000000000..79324cc1c7d0
--- /dev/null
+++ b/net-analyzer/syweb/files/reconfig
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+die() {
+	echo "#####"
+	echo $1
+	echo "#####"
+	exit 1
+}
+
+sed_var() {
+	sed -i "/\\$symon['$1']/s|=.*|='$2';|" "${MY_INSTALLDIR}"/setup.inc \
+		|| die "sed $1 failed"
+}
+
+[[ $1 == "clean" ]] && exit 0
+
+sed_var rrdtool_path /usr/bin/rrdtool
+sed_var cache_dir "${VHOST_ROOT}"/syweb/cache
+sed_var host_tree /var/lib/symon/rrds
+sed_var layout_dir "${VHOST_ROOT}"/syweb
diff --git a/net-analyzer/syweb/metadata.xml b/net-analyzer/syweb/metadata.xml
new file mode 100644
index 000000000000..2c2a7923cfc8
--- /dev/null
+++ b/net-analyzer/syweb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/syweb/syweb-0.65.ebuild b/net-analyzer/syweb/syweb-0.65.ebuild
new file mode 100644
index 000000000000..da3bdcae2f6d
--- /dev/null
+++ b/net-analyzer/syweb/syweb-0.65.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+WEBAPP_MANUAL_SLOT="yes"
+inherit webapp
+
+DESCRIPTION="Web frontend to symon"
+HOMEPAGE="http://www.xs4all.nl/~wpd/symon/"
+SRC_URI="http://www.xs4all.nl/~wpd/symon/philes/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+
+RDEPEND="virtual/httpd-php
+	net-analyzer/rrdtool"
+
+need_httpd_cgi
+
+S=${WORKDIR}/${PN}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGELOG README
+	docinto layouts
+	dodoc symon/*.layout
+
+	dodir "${MY_HOSTROOTDIR}"/syweb/cache
+	insinto "${MY_HOSTROOTDIR}"/syweb
+	doins symon/hifn_test.layout
+	webapp_serverowned "${MY_HOSTROOTDIR}"/syweb/cache
+	insinto "${MY_HTDOCSDIR}"
+	doins -r htdocs/syweb/*
+	webapp_configfile "${MY_HTDOCSDIR}"/setup.inc
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_hook_script "${FILESDIR}"/reconfig
+
+	webapp_src_install
+}
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
new file mode 100644
index 000000000000..4abc2b37d735
--- /dev/null
+++ b/net-analyzer/tcpdump/Manifest
@@ -0,0 +1,6 @@
+DIST tcpdump-4.9.2.tar.gz 2298386 SHA256 798b3536a29832ce0cbb07fafb1ce5097c95e308a6f592d14052e1ef1505fe79 SHA512 e1bc19a5867d6e3628f3941bdf3ec831bf13784f1233ca1bccc46aac1702f47ee9357d7ff0ca62cddf211b3c8884488c21144cabddd92c861e32398cd8f7c44b WHIRLPOOL 6652a5bb83a082bc8df050610ed640f0119fb846f2938a5148be3008506548e73c3c6437a62752eafdd00910c35b2b5decfd21c207719d156fb7dc8ca9e3443a
+EBUILD tcpdump-4.9.2.ebuild 2083 SHA256 16b88b7edbf95895040bfbc48eae36e95ac64df03a2469c9c059181487040189 SHA512 1d6df16693ed2fb2f4aa50e26d789f679eeee5521da6e23c82520eec9165d86dd40bb3c2c089a4048baf0b34270d207c65487cfb325c6d1b5808728516373dbf WHIRLPOOL aa91facc01b6d91c16acca322ba1f03d0091f228a5c318d5e9558b7263a2b129187678003143bcacf0af59a9c76d89e6948b1b619276a9cbc1ef919a59de087c
+EBUILD tcpdump-9999.ebuild 2210 SHA256 1dcc973caa9dbd0dddf3e8a727eb28acf12401416b82acbbf4fa4bc5a4fbef4c SHA512 1c6e0b3ff504bcca0ebbb160f5a0eb88d5c57a4afc09400bbbccfaf62396018f4a03e284626b7a7d55829ffc8bf2648f5d84ae63defa9c1d7cde3678bf2635e6 WHIRLPOOL 58221a015af9fb2e025aaa5faf2dfbd9d1e0bbf0552d784314a5eefbed03682f706e4ca96dddc61641b6e62c41d6b900b90441c69e82bdce4bad8f020bf940fb
+MISC ChangeLog 4540 SHA256 a8cdb402e44537e911dd0bdd1343ebab7b0d39764d2232612431a5f9e90770d1 SHA512 69fe80d6589da9d2eff31f47af51478948e5db827861a6634effba434abc68cd34f27dbfc76ccab6ce4beb0cca71e31896a6873877c7320923daab1c7f8fcf04 WHIRLPOOL a6c75e60e59c0bd0d28f92a0d6ecd40f829c787fd8da17004d32dcdebab8610dfb624731f878c94fd2c3e80e5c8e8ef30a1539e059eb276f22a77ad73c4c18d5
+MISC ChangeLog-2015 29712 SHA256 4863278ce61c263a75d88ae2e72ccc38b70e82e9d9c506e533decf67447ca784 SHA512 bf84d0fa6c94c6eb1c27f3f923e40e198c9fcdad1b394e8f62d45d9a1c7de828d91ebb493bfcf8c423ec3204a1deeb14b07fb58a722247f2e15900dd4ff85480 WHIRLPOOL c299c8d27622a079e2a9a01c5fef0bd30e9c3b5a48dc6ed156a12e6929d32ea01401e1d2fffc27ef57b338698855ac250c2faa5c8b8a2ae847bf5eb2e92bdddf
+MISC metadata.xml 580 SHA256 46979e33a5f85d38a1ac9ae7ebbe91fc543fb300f6438d0de8fd20afd2a533d7 SHA512 b8fd75f13c0993c8aa97e0c35649b4f11f992413f4dce8f737c28741d047bb36637b6c509139a046594fa788eb2932ee39a87046742372c63fe0bc6e037da49a WHIRLPOOL c2a08efcdfbbc172b878c2ccb29e4ef4863ebf2149c6492570bd7f53c4c92e8b3c3e5f66a7deb43f5dc845f4d4ddbdaaae557de30e765f6fbfca6ecf9b98f5e3
diff --git a/net-analyzer/tcpdump/metadata.xml b/net-analyzer/tcpdump/metadata.xml
new file mode 100644
index 000000000000..2d5b8e1103b2
--- /dev/null
+++ b/net-analyzer/tcpdump/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<use>
+		<flag name="smi">Build with <pkg>net-libs/libsmi</pkg> to load MIBs on the fly to decode SNMP packets</flag>
+		<flag name="drop-root">Drop privileges to tcpdump:tcpdump when run as root</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">the-tcpdump-group/tcpdump</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild
new file mode 100644
index 000000000000..5ce4d4fd76cb
--- /dev/null
+++ b/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic toolchain-funcs user
+
+DESCRIPTION="A Tool for network monitoring and data acquisition"
+HOMEPAGE="
+	http://www.tcpdump.org/
+	https://github.com/the-tcpdump-group/tcpdump
+"
+SRC_URI="
+	http://www.tcpdump.org/release/${P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="+drop-root libressl smi ssl samba suid test"
+
+RDEPEND="
+	drop-root? ( sys-libs/libcap-ng )
+	net-libs/libpcap
+	smi? ( net-libs/libsmi )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6m:0 )
+		libressl? ( dev-libs/libressl )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	drop-root? ( virtual/pkgconfig )
+	test? (
+		|| ( app-arch/sharutils sys-freebsd/freebsd-ubin )
+		dev-lang/perl
+	)
+"
+
+pkg_setup() {
+	if use drop-root || use suid; then
+		enewgroup tcpdump
+		enewuser tcpdump -1 -1 -1 tcpdump
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i -e '/^eapon1/d;' tests/TESTLIST || die
+
+	# bug 630394
+	sed -i -e '/^nbns-valgrind/d' tests/TESTLIST || die
+}
+
+src_configure() {
+	if use drop-root; then
+		append-cppflags -DHAVE_CAP_NG_H
+		export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng )
+	fi
+
+	econf \
+		$(use_enable samba smb) \
+		$(use_with drop-root chroot '') \
+		$(use_with smi) \
+		$(use_with ssl crypto "${EPREFIX}/usr") \
+		$(usex drop-root "--with-user=tcpdump" "")
+}
+
+src_test() {
+	if [[ ${EUID} -ne 0 ]] || ! use drop-root; then
+		emake check
+	else
+		ewarn "If you want to run the test suite, make sure you either"
+		ewarn "set FEATURES=userpriv or set USE=-drop-root"
+	fi
+}
+
+src_install() {
+	dosbin tcpdump
+	doman tcpdump.1
+	dodoc *.awk
+	dodoc CHANGES CREDITS README.md
+
+	if use suid; then
+		fowners root:tcpdump /usr/sbin/tcpdump
+		fperms 4110 /usr/sbin/tcpdump
+	fi
+}
+
+pkg_preinst() {
+	if use drop-root || use suid; then
+		enewgroup tcpdump
+		enewuser tcpdump -1 -1 -1 tcpdump
+	fi
+}
+
+pkg_postinst() {
+	use suid && elog "To let normal users run tcpdump add them into tcpdump group."
+}
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
new file mode 100644
index 000000000000..0a56c11cfe97
--- /dev/null
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic toolchain-funcs user
+
+DESCRIPTION="A Tool for network monitoring and data acquisition"
+EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
+HOMEPAGE="
+	http://www.tcpdump.org/
+	${EGIT_REPO_URI}
+"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="+drop-root libressl smi ssl samba suid test"
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/the-${PN}-group/${PN}/archive/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+fi
+
+RDEPEND="
+	drop-root? ( sys-libs/libcap-ng )
+	net-libs/libpcap
+	smi? ( net-libs/libsmi )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6m:0 )
+		libressl? ( dev-libs/libressl )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	drop-root? ( virtual/pkgconfig )
+	test? (
+		|| ( app-arch/sharutils sys-freebsd/freebsd-ubin )
+		dev-lang/perl
+	)
+"
+
+pkg_setup() {
+	if use drop-root || use suid; then
+		enewgroup tcpdump
+		enewuser tcpdump -1 -1 -1 tcpdump
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i -e '/^eapon1/d;' tests/TESTLIST || die
+
+	# bug 630394
+	sed -i -e '/^nbns-valgrind/d' tests/TESTLIST || die
+}
+
+src_configure() {
+	if use drop-root; then
+		append-cppflags -DHAVE_CAP_NG_H
+		export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng )
+	fi
+
+	econf \
+		$(use_enable samba smb) \
+		$(use_with drop-root chroot '') \
+		$(use_with smi) \
+		$(use_with ssl crypto "${EPREFIX}/usr") \
+		$(usex drop-root "--with-user=tcpdump" "")
+}
+
+src_test() {
+	if [[ ${EUID} -ne 0 ]] || ! use drop-root; then
+		emake check
+	else
+		ewarn "If you want to run the test suite, make sure you either"
+		ewarn "set FEATURES=userpriv or set USE=-drop-root"
+	fi
+}
+
+src_install() {
+	dosbin tcpdump
+	doman tcpdump.1
+	dodoc *.awk
+	dodoc CHANGES CREDITS README.md
+
+	if use suid; then
+		fowners root:tcpdump /usr/sbin/tcpdump
+		fperms 4110 /usr/sbin/tcpdump
+	fi
+}
+
+pkg_preinst() {
+	if use drop-root || use suid; then
+		enewgroup tcpdump
+		enewuser tcpdump -1 -1 -1 tcpdump
+	fi
+}
+
+pkg_postinst() {
+	use suid && elog "To let normal users run tcpdump add them into tcpdump group."
+}
diff --git a/net-analyzer/tcpflow/Manifest b/net-analyzer/tcpflow/Manifest
new file mode 100644
index 000000000000..b7011536811a
--- /dev/null
+++ b/net-analyzer/tcpflow/Manifest
@@ -0,0 +1,14 @@
+AUX tcpflow-1.5.0_alpha-gentoo.patch 5929 SHA256 ff58e057917629a85ee595d02d3169043a60551cf017545185f92e759a2aab7e SHA512 afb1102de33918b50ecd30e53d336b9d3d3c9f50be5396cb2865e03d0ada0465b91a31bc683dd2690f4bc8c3c8ca287716bfa0eb6c84919951806790e01b6e69 WHIRLPOOL 858df21b620bada6f65d93810385eb8406b92a9641d73508b6c1b91a72539fd8f3e9413c5b24295fbfde77b50c1daec4fdd1ffaf6f34b5534de840f59def1dc4
+AUX tcpflow-1.5.0_alpha-libcapng.patch 235 SHA256 b7dd4cfdae2a48665dd0d03bc030e345457c26257ca287b8342066761df0471c SHA512 0d2bd1ed7056033c94fa32deeac70e31ea35309e38e54c66f5092547559cf4c037bf2f4302deee3474839681eeba24cc4ac1068597c0ee28d48d2a10c2eea063 WHIRLPOOL 61ed95930e5ab506f2f1398f400136c2249a1d5d0731ac378532bd1f933e2351d1e36387c5694287f4bd92a7af931470ac7d819df1a9e4d655a01f2df42e8bab
+DIST be13_api-20170924.tar.gz 75724 SHA256 6dc9f0157ec56e50ae7831a2fef8d3ecb88d689f318317bf1c4cc7dcb0917ae5 SHA512 5bf0d28f23df9436304245ccbdbf4af5b0f65e62b92e3039cfb9a70fe2056aa90dcce906db02f3df83fcf2a415c8a46f0f75468d48e13b15673d11c447a4c9c4 WHIRLPOOL 6ab2f40d45a2b8f495e7c0df2fa977b24c2245fe1015c627d1674eff519c206d301e0558f97c0528eeb1fb939f514cd976ae7caae323f86bc2493b75b5b90fbd
+DIST dfxml-20170921.tar.gz 163616 SHA256 f24bd6c149d07f9ed1089fc25afdab2451f6615e57d5f25529e8d2a59989bc18 SHA512 0885947aaf8efe639c13324413ef0cca49750027b48b434f226fb9fbfba494e84e245da879dc0d77b46bddc27798f7f5df12590fce47b096683034bbc61280e1 WHIRLPOOL b693966c0da1b228415b1416cd3a7a3c25212d0c29839054739aa3fb821a9b429166d8be3e1c58bdcacdacc25fc2c9664e3aadc8aa40c060ec11fc7ca865145d
+DIST tcpflow-1.5.0alpha.tar.gz 763403 SHA256 ea5467880cd1ea56f2567f97db12bdcebcf5bfb722b6580a6d3ce3acf641a4f1 SHA512 240ea6ccb39d13cc86fdaf8bb8284b796d2ceb070aee2dbb0364a6d9f572863159e79ad40259aa6e85c729e28f35c2f453df261490c09c321276686be4627b96 WHIRLPOOL 733075c64ea6f10ed8cce4738514c2987fbb340f9765f180c2987c048fb481c5685f2d00d27b8ad903b77a670889223e71fb473fcbc9af4eb498580aabd1751e
+DIST tcpflow_1.4.5+repack1-1.debian.tar.xz 11144 SHA256 b917e994ac1cd64cb63f719700b0a9862359779286cab89c9c29f73e64ec2d5b SHA512 ed2c491595a3d5382ca79fe945467639af3d99658d002353f90e07aa6b1a955e57ab0fbbc3fadf964e9d6d3dba4fd327a02c1b07d6a239efdf90b365928b2a1e WHIRLPOOL 0854405a429bd2f7276b18acc204e5ac5cfde1bbd4a8f5308e6bf667355eb1ea8a98c52b30a5a24aacb4f8f7b8469e75c2c49fc5f187aa87b869fad9c91d025c
+DIST tcpflow_1.4.5+repack1-4.debian.tar.xz 12228 SHA256 f7207ea03e9aa1c96ec322835aed486a7fde2244d26ce4d9b23cb75d613a0e07 SHA512 27d8a7a735b06c35cc2985cb26a129a490fc2236eedeede21977afe4c3096a6fde3ea18de1aaa3a1c6a56bc36d332b1e8bd4c7be933d5b031509a69cae189b18 WHIRLPOOL 35817c9ca6cfec60d91d4809ae1661f26011c0f4fe020c15a168e82651a6dfa9c63a87188428675dbc7330ab43b0fcdc443b7d7ec954007fbbc8f4f5d9b7df3d
+DIST tcpflow_1.4.5+repack1.orig.tar.gz 725962 SHA256 1d9b4ce2dd85adc1c608f34ada576b7f5b6d51c686ae6b870c3c277049a24af0 SHA512 fed8589957e3c790b5b6837b9b578d5dcbde316122ed6b3d4f908d1d73f23c6ed8a11720ee0510e878eaa7a6c559a2f35e7df2c77e3cb1f2810040adf7ac2b85 WHIRLPOOL 8743e20cea0fbee37c9ee050e8bbe02871e8a32dba2bbed922b912de457aa4eaf5cd21e8828a08eb3eafbf8d3897541230fc37bc4a15f7126e6b8adfb9fea860
+EBUILD tcpflow-1.4.5_p1-r1.ebuild 1119 SHA256 17a661bd39ebf5f298a4a0f000dffae1917ebc0233d9780e23ed997606344593 SHA512 bbaaf72e7ab163093392d1c4c690281f84100209f4084f351c60823bbbf94e7787530dc75120123ff4a7f4439de06d1a1c815a97185f0735753444d374d8506b WHIRLPOOL f764035aa9ef8bac6e10e6e27fe73c86325742d735e87cf7197913e1792c6a5afc96bc2b634195e48539250fbbe09d885bc189ea8abcebda64c493bde63da63e
+EBUILD tcpflow-1.4.5_p4-r1.ebuild 1132 SHA256 b1e353c83bc923dad241527eb0525e91eecbac14a89aba509744361d18bd521e SHA512 e781ef6618cbd549828bf426c2fdd9511b037d149f45279d54da658b48b5e6302e62b278e9fe36782cf458e2a335263507efb3be8134d698900c4530455a1bfa WHIRLPOOL 77235b280972b5165451182ac1bcfa435a286de9e58c4307207dd0105530a51789f10c43fced70da1022c42053a8f4d14103ce793b73f7f64ce7b24d08008a7d
+EBUILD tcpflow-1.5.0_alpha.ebuild 1522 SHA256 4233dcfe8dbb8912ad223986255e0accc6a20c3bf0f0b9618876a77c4fd580dc SHA512 e1ed5c6ecfe8e00d78dd01f919dbcd0b85a5bb0267b434ca0b238398563359da4c507f0ef680b039953f4040180c70cd1142415940373a7fd319fe2e6916e506 WHIRLPOOL 27d2d21bd088f8f587a63a85d0c0d3799e3bf605fb649eea427cad3c40f266c78414f4fe8a45813c2c762393641208a22f93dcc78a767b22d666a823e8d9e8da
+MISC ChangeLog 3861 SHA256 b54282d84a14884ef7fde0b468582515fd4f3249bc8fe3eb3bc43061ac93d48d SHA512 bcf0961a8f9430cab5dad509e7748ad466c2ad1d16370108f96694a09c6671635cb0c40d9a3f34ea6e3c0902cfb3e7f98a97cef9b32889ac0a6541f6afc3a1c1 WHIRLPOOL 39983a8082d1a2bf90b1dcee3994747dfe05b7e754a32e33a8781e160057af6a04161299691ecca00cf17d4f03494a3b16114ef7db9ecd11202935b357e2b38c
+MISC ChangeLog-2015 6547 SHA256 68a3c7f77594612ab1a6090bc1934b16e1840496dcbb0e563bb494a0c0e54452 SHA512 5de49ef07535da3578662bd73530e0264dc618e7760f86d78a1823387a81c3740872a6f65c5fa9670533e8a5ca57e605d8221983f011e8df1ab2181dac505bc1 WHIRLPOOL e9caf71dd7345f167fe8c9a088d6fafabeb7af8a3113df2bafa6bb21e1d98339dda15cc6e9728da415a8f257c71dd328b71b34b6ef5b5778a32f53b5f9e5296b
+MISC metadata.xml 360 SHA256 c4e2a471d18ab262865301e6cd36ef59d5fcc00b984a299f07d21623089c5dae SHA512 32d3c4b5fabd54d1c6c1db15d8af755a6c83725f1d52f5be2ffd7e9975113d200581da4e4a735d823bdf5d12408c8306cc08ef08721ce924f04e137a7da8fa08 WHIRLPOOL 45c76fce0bbd8a3c72e41339d3f84036382c1363a6cff66de31380cb275e5a6a2b2e70be1bafe8bdd4cf868fb8e3b142b1b8fea8edcb7ae199265e5be47d3071
diff --git a/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-gentoo.patch b/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-gentoo.patch
new file mode 100644
index 000000000000..6a2dc10cff9e
--- /dev/null
+++ b/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-gentoo.patch
@@ -0,0 +1,191 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,7 +29,6 @@
+ AC_PROG_INSTALL
+ 
+ m4_include([m4/slg_searchdirs.m4])
+-m4_include([m4/slg_gcc_all_warnings.m4])
+ 
+ 
+ # use C++11 mode if available; HAVE_CXX11 is defined in config.h if so.  Don't
+@@ -96,96 +95,6 @@
+ fi
+ 
+ ################################################################
+-#
+-# Enable all the compiler debugging we can find
+-#
+-# This is originally from PhotoRec, but modified substantially by Simson
+-# Figure out which flags we can use with the compiler. 
+-#
+-# These I don't like:
+-# -Wdeclaration-after-statement -Wconversion
+-# doesn't work: -Wunreachable-code 
+-# causes configure to crash on gcc-4.2.1: -Wsign-compare-Winline 
+-# causes warnings with unistd.h:  -Wnested-externs 
+-# Just causes too much annoyance: -Wmissing-format-attribute 
+-# Check GCC
+-WARNINGS_TO_TEST="-MD -D_FORTIFY_SOURCE=2 -Wpointer-arith -Wmissing-declarations -Wmissing-prototypes \
+-    -Wshadow -Wwrite-strings -Wcast-align -Waggregate-return \
+-    -Wbad-function-cast -Wcast-qual -Wundef -Wredundant-decls -Wdisabled-optimization \
+-    -Wfloat-equal -Wmultichar -Wc++-compat -Wmissing-noreturn "
+-
+-if test $mingw = "no" ; then
+-  # add the warnings we do not want to do on mingw
+-  WARNINGS_TO_TEST="$WARNINGS_TO_TEST -Wall -Wstrict-prototypes"
+-fi
+-
+-echo "Warnings to test: $WARNINGS_TO_TEST"
+-
+-for option in $WARNINGS_TO_TEST
+-do
+-  SAVE_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS $option"
+-  AC_MSG_CHECKING([whether gcc understands $option])
+-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+-      [has_option=yes],
+-      [has_option=no; CFLAGS="$SAVE_CFLAGS"])
+-  AC_MSG_RESULT($has_option)
+-  unset has_option
+-  unset SAVE_CFLAGS
+-  if test $option = "-Wmissing-format-attribute" ; then
+-    AC_DEFINE(HAVE_MISSING_FORMAT_ATTRIBUTE_WARNING,1,
+-		[Indicates that we have the -Wmissing-format-attribute G++ warning])
+-  fi
+-done
+-unset option
+-
+-
+-# C++
+-# We don't use these warnings:
+-# -Waggregate-return -- aggregate returns are GOOD; they simplify code design
+-# We can use these warnings after ZLIB gets upgraded:
+-# -Wundef  --- causes problems with zlib
+-# -Wcast-qual 
+-# -Wmissing-format-attribute  --- Just too annoying
+-AC_LANG_PUSH(C++)
+-WARNINGS_TO_TEST="-Wall -MD -D_FORTIFY_SOURCE=2 -Wpointer-arith \
+-    -Wshadow -Wwrite-strings -Wcast-align  \
+-    -Wredundant-decls -Wdisabled-optimization \
+-    -Wfloat-equal -Wmultichar -Wmissing-noreturn \
+-    -Woverloaded-virtual -Wsign-promo \
+-    -funit-at-a-time"
+-
+-if $CXX -dM -E - < /dev/null | grep -q __clang__ ; then
+-   AC_MSG_RESULT([Using clang])
+-   clang='yes'
+- else
+-   AC_MSG_RESULT([not using clang])   
+-   clang='no'
+-   # -Wstrict-null-sentinel is not supported under clang or under Darwin's gcc
+-   WARNINGS_TO_TEST="$WARNINGS_TO_TEST -Wstrict-null-sentinel"
+-fi
+-
+-if test $mingw = "no" ; then
+-  # add the warnings we don't want to do on mingw
+-  WARNINGS_TO_TEST="$WARNINGS_TO_TEST  -Weffc++"
+-fi
+-
+-for option in $WARNINGS_TO_TEST
+-do
+-  SAVE_CXXFLAGS="$CXXFLAGS"
+-  CXXFLAGS="$CXXFLAGS $option"
+-  AC_MSG_CHECKING([whether g++ understands $option])
+-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+-      [has_option=yes],
+-      [has_option=no; CXXFLAGS="$SAVE_CXXFLAGS"])
+-  AC_MSG_RESULT($has_option)
+-  unset has_option
+-  unset SAVE_CXXFLAGS
+-done
+-unset option
+-AC_LANG_POP()    
+-
+-################################################################
+ ##
+ 
+ 
+@@ -396,7 +305,12 @@
+ 	AC_CHECK_HEADERS(cap-ng.h)
+ fi
+ 
++################################################################
++# http-parser
+ 
++AC_CHECK_LIB(http_parser,http_parser_init,,
++  AC_MSG_ERROR([http-parser library not installed]))
++AC_CHECK_HEADERS(http_parser.h)
+ 
+ ################################################################
+ # Specify our other headers
+@@ -603,35 +517,6 @@
+   Mmissing_library="$Mmissing_library python27"           # Not sure: https://github.com/macports/macports-ports/blob/master/lang/python27/Portfile
+ ])
+ 
+-############## drop optimization flags if requested ################
+-
+-# Should we disable optimization?
+-AC_ARG_WITH([opt], AC_HELP_STRING([--without-opt], [Drop all -O C flags]))
+-# Or maybe just tone it down a bit?
+-AC_ARG_WITH([o3], AC_HELP_STRING([--without-o3], [Do not force O3 optimization; use default level]))
+-
+-if test x"${AFF_NOOPT}" != "x" ; then
+-  AC_MSG_NOTICE([Dropping optimization flags because AFF_NOOPT is set.])
+-   with_opt="no";
+-fi
+-
+-if test "${with_opt}" = "no" ; then
+-  AC_MSG_NOTICE([Dropping optimization flags])
+-  CFLAGS=`echo "$CFLAGS" | sed s/-O[[0-9]]//`             # note the double quoting! 
+-  CXXFLAGS=`echo "$CXXFLAGS" | sed s/-O[[0-9]]//`
+-
+-  AC_MSG_NOTICE([Removing -D_FORTIFY_SOURCE=2])
+-  CPPFLAGS=`echo $CPPFLAGS | sed s/-D_FORTIFY_SOURCE=2//`
+-  CXXFLAGS=`echo $CXXFLAGS | sed s/-D_FORTIFY_SOURCE=2//`
+-  CFLAGS=`echo $CFLAGS | sed s/-D_FORTIFY_SOURCE=2//`
+-else
+-  # and increase optimizer from -O2 to -O3 if not explicitly forbidden
+-  if test "${with_o3}" != "no" ; then
+-      CFLAGS=`echo   -g "$CFLAGS"   | sed s/-O2/-O3/`             # note the double quoting! 
+-      CXXFLAGS=`echo -g "$CXXFLAGS" | sed s/-O2/-O3/`
+-  fi
+-fi
+-
+ AC_OUTPUT
+ 
+ ## Finally, record the values of CFLAGS, CPPFLAGS, and CXXFLAGS for DFXML
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -90,18 +90,10 @@
+ 	scan_netviz.cpp \
+ 	pcap_writer.h \
+ 	iptree.h \
+-	http-parser/http_parser.c \
+-	http-parser/http_parser.h \
+ 	mime_map.cpp \
+ 	mime_map.h 
+ 
+ EXTRA_DIST =\
+-	http-parser/AUTHORS \
+-	http-parser/CONTRIBUTIONS \
+-	http-parser/LICENSE-MIT \
+-	http-parser/Makefile \
+-	http-parser/README.md \
+-	http-parser/http_parser.gyp \
+ 	wifipcap/README.txt \
+ 	wifipcap/TimeVal.cpp \
+ 	wifipcap/TimeVal.h \
+--- a/src/scan_http.cpp
++++ b/src/scan_http.cpp
+@@ -11,7 +11,11 @@
+ #include "tcpip.h"
+ #include "tcpdemux.h"
+ 
++#ifdef HAVE_HTTP_PARSER_H
++#include "http_parser.h"
++#else
+ #include "http-parser/http_parser.h"
++#endif
+ 
+ #include "mime_map.h"
+ 
diff --git a/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-libcapng.patch b/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-libcapng.patch
new file mode 100644
index 000000000000..b56144324c09
--- /dev/null
+++ b/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-libcapng.patch
@@ -0,0 +1,13 @@
+--- a/src/tcpflow.cpp
++++ b/src/tcpflow.cpp
+@@ -30,6 +30,10 @@
+ #include <grp.h>
+ #endif
+ 
++#ifdef HAVE_CAP_NG_H
++#include <cap-ng.h>
++#endif
++
+ /* bring in inet_ntop if it is not present */
+ #define ETH_ALEN 6
+ #ifndef HAVE_INET_NTOP
diff --git a/net-analyzer/tcpflow/metadata.xml b/net-analyzer/tcpflow/metadata.xml
new file mode 100644
index 000000000000..d0b78340e0f1
--- /dev/null
+++ b/net-analyzer/tcpflow/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">simsong/tcpflow</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/tcpflow/tcpflow-1.4.5_p1-r1.ebuild b/net-analyzer/tcpflow/tcpflow-1.4.5_p1-r1.ebuild
new file mode 100644
index 000000000000..ce8b561465f6
--- /dev/null
+++ b/net-analyzer/tcpflow/tcpflow-1.4.5_p1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A tool for monitoring, capturing and storing TCP connections flows"
+HOMEPAGE="https://github.com/simsong/tcpflow https://packages.qa.debian.org/t/tcpflow.html"
+SRC_URI="
+	mirror://debian/pool/main/t/${PN}/${PN}_${PV/_p*}+repack1.orig.tar.gz
+	mirror://debian/pool/main/t/${PN}/${PN}_${PV/_p*}+repack1-${PV/*_p}.debian.tar.xz
+"
+
+LICENSE="GPL-3"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+SLOT="0"
+IUSE="cairo test"
+
+RDEPEND="
+	app-forensics/afflib
+	dev-libs/boost
+	dev-libs/openssl:=
+	net-libs/http-parser:=
+	net-libs/libpcap
+	sys-libs/zlib
+	cairo? (
+		x11-libs/cairo
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? ( sys-apps/coreutils )
+"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${WORKDIR}"/debian/patches/*.patch
+
+	mv -f README{.md,} || die
+
+	sed -i -e 's:`md5 -q \(.*\)`:`md5sum \1 | cut -f1 -d" "`:' tests/*.sh || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(usex cairo --enable-cairo=true --enable-cairo=false) \
+		--without-o3
+}
diff --git a/net-analyzer/tcpflow/tcpflow-1.4.5_p4-r1.ebuild b/net-analyzer/tcpflow/tcpflow-1.4.5_p4-r1.ebuild
new file mode 100644
index 000000000000..e29648afaeb5
--- /dev/null
+++ b/net-analyzer/tcpflow/tcpflow-1.4.5_p4-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils
+
+DESCRIPTION="A tool for monitoring, capturing and storing TCP connections flows"
+HOMEPAGE="https://github.com/simsong/tcpflow https://packages.qa.debian.org/t/tcpflow.html"
+SRC_URI="
+	mirror://debian/pool/main/t/${PN}/${PN}_${PV/_p*}+repack1.orig.tar.gz
+	mirror://debian/pool/main/t/${PN}/${PN}_${PV/_p*}+repack1-${PV/*_p}.debian.tar.xz
+"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+SLOT="0"
+IUSE="cairo test"
+
+RDEPEND="
+	app-forensics/afflib
+	dev-libs/boost
+	dev-libs/openssl:=
+	net-libs/http-parser:=
+	net-libs/libpcap
+	sys-libs/zlib
+	cairo? (
+		x11-libs/cairo
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? ( sys-apps/coreutils )
+"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	default
+
+	eapply "${WORKDIR}"/debian/patches/*.patch
+
+	mv -f README{.md,} || die
+
+	sed -i -e 's:`md5 -q \(.*\)`:`md5sum \1 | cut -f1 -d" "`:' tests/*.sh || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(usex cairo --enable-cairo=true --enable-cairo=false) \
+		--without-o3
+}
diff --git a/net-analyzer/tcpflow/tcpflow-1.5.0_alpha.ebuild b/net-analyzer/tcpflow/tcpflow-1.5.0_alpha.ebuild
new file mode 100644
index 000000000000..6c5c1bdafe13
--- /dev/null
+++ b/net-analyzer/tcpflow/tcpflow-1.5.0_alpha.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic
+
+DESCRIPTION="A tool for monitoring, capturing and storing TCP connections flows"
+HOMEPAGE="https://github.com/simsong/tcpflow https://packages.qa.debian.org/t/tcpflow.html"
+SRC_URI="
+	https://api.github.com/repos/simsong/be13_api/tarball/c81521d768bb78499c069fcd7c47adc8eee0350c -> be13_api-20170924.tar.gz
+	https://api.github.com/repos/simsong/dfxml/tarball/7d11eaa7da8d31f588ce8aecb4b4f5e7e8169ba6 -> dfxml-20170921.tar.gz
+	https://dev.gentoo.org/~jer/be13_api-20170924.tar.gz
+	https://dev.gentoo.org/~jer/dfxml-20170921.tar.gz
+	https://github.com/simsong/${PN}/archive/${P/_/}.tar.gz
+"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+SLOT="0"
+IUSE="cairo test"
+
+RDEPEND="
+	dev-db/sqlite
+	dev-lang/python:2.7=
+	dev-libs/boost:=
+	dev-libs/openssl:=
+	net-libs/http-parser:=
+	net-libs/libpcap
+	sys-libs/libcap-ng
+	sys-libs/zlib:=
+	cairo? (
+		x11-libs/cairo
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? ( sys-apps/coreutils )
+"
+S=${WORKDIR}/${PN}-${P/_/}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.0_alpha-gentoo.patch
+	"${FILESDIR}"/${PN}-1.5.0_alpha-libcapng.patch
+)
+
+src_prepare() {
+	mv "${WORKDIR}"/simsong-dfxml-7d11eaa/* src/dfxml/ || die
+	mv "${WORKDIR}"/simsong-be13_api-c81521d/* src/be13_api/ || die
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -fpermissive
+	econf $(usex cairo --enable-cairo=true --enable-cairo=false)
+}
diff --git a/net-analyzer/tcping/Manifest b/net-analyzer/tcping/Manifest
new file mode 100644
index 000000000000..2f09c968ae39
--- /dev/null
+++ b/net-analyzer/tcping/Manifest
@@ -0,0 +1,5 @@
+DIST tcping-1.3.5.tar.gz 5889 SHA256 1ad52e904094d12b225ac4a0bc75297555e931c11a1501445faa548ff5ecdbd0 SHA512 729360cd1f820ec7c68e2c64365caf60daace8c486c64fe96a88d1037b9818dd27603408962842b74d0db1ee2306ef68522f3f3369c1390e4554929297de760d WHIRLPOOL a694d4c2f81348255b4f5c2d424cd14a5e4b5904021b810fa83c48607093949cfb85f1db1cd75e8fb1e38501fe1fcdab0dceb5c2e66df8576df70782a993df2e
+EBUILD tcping-1.3.5.ebuild 590 SHA256 b4e7b85e6f7ce2b24ad536e184dc5eda1048107f63e488298b989bfbd5b75fe3 SHA512 27c45d10a1c1d99f7851fe81e7c9b86d138db9cae29feb4e8303e31fcc9d94a5e497a931471837c48f8c3240c5bee7d28852837a47ee7a9d9974c33409531589 WHIRLPOOL 1623231fadeb703a981f6112f4aef9a2e832704133e3941b5149c0aa1a7177c5f497dcc989bb5490a509e54d52212ec09b1d7a649a20f6b209ae6714189da5d2
+MISC ChangeLog 2177 SHA256 2cd0423d0688e14aebb387bd51d70a328f041b01d62cb24b489a8c0c375f9905 SHA512 9b2c17093449d4946a327636c396b26a3d7b1df3b3146dcce93b1ff4344a907942135e4a6f551d23aca210b0498594a886fb91c45eba0d47be1a8ff85a2f9f17 WHIRLPOOL eaf12818f15b7d61b4eb28b075afca3599de84ee4856f6e6e5a78cb45359dbbcf55054a3c80e55aff5082ad4db4d0d89313c859a8279d5c86104b376fb114ed8
+MISC ChangeLog-2015 415 SHA256 0022d7359105e10028ee4d7fb3afa8df2d25d5bc5d24856a00e90566d303a85b SHA512 c8c852a10df2e831d9898c0c08ed21bc91eeaa2932bbc8bd84534aedcac3c9b5e9c49750782f41f234258323dcf5cd9a84e19322d9f25bb6abad22f8fef1f13b WHIRLPOOL 986b5d2d29697d77541f061d2640527b7f6b878883ef41e65f4e8c2313c7722f319a7f2494c734e79278a8e862858ae0774fc333c66b2d49e1ccbdc3e418d744
+MISC metadata.xml 239 SHA256 2a0c6a6922ad5c1460d3525cf24e302d4b3435d9c7d619a7c43605d0bbdf70c1 SHA512 be29819db58c3ddb7212a488f9965de11cb5d84223ccae9458e968425296d3ef0f93f20edf7b4ab8a4dda6c166c4104c8b615c82feac5d87b3364a88de591a45 WHIRLPOOL 36f4ad69c7deb9b7aaf9c1125165227d4de9d101a25fd6b38f9ce362245ac9456e96ae039728042cf8741e8ff0e8e0f56d5772ed85de1c4efdbe917b12b465bb
diff --git a/net-analyzer/tcping/metadata.xml b/net-analyzer/tcping/metadata.xml
new file mode 100644
index 000000000000..d04de4894ede
--- /dev/null
+++ b/net-analyzer/tcping/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>xmw@gentoo.org</email>
+	<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/tcping/tcping-1.3.5.ebuild b/net-analyzer/tcping/tcping-1.3.5.ebuild
new file mode 100644
index 000000000000..3c883e7c10db
--- /dev/null
+++ b/net-analyzer/tcping/tcping-1.3.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="Ping implementation that uses the TCP protocol"
+HOMEPAGE="http://www.linuxco.de/tcping/tcping.html"
+SRC_URI="http://www.linuxco.de/tcping/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+	sed -e '/^CC=/s:=:?=:' \
+		-e '/^CCFLAGS/s:=:+=:' \
+		-e 's/$(CCFLAGS)/$(CCFLAGS) $(LDFLAGS)/' \
+		-i Makefile || die
+	tc-export CC
+	export CCFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin tcping
+	dodoc README
+}
diff --git a/net-analyzer/tcpreen/Manifest b/net-analyzer/tcpreen/Manifest
new file mode 100644
index 000000000000..12b424ce0f07
--- /dev/null
+++ b/net-analyzer/tcpreen/Manifest
@@ -0,0 +1,5 @@
+DIST tcpreen-1.4.4.tar.bz2 187979 SHA256 6b2d712929184f6332d9760c943124873f8e6cb6ecdc2aca8fb793a1bc4c5cf9 SHA512 94496bbb21218b5acc9e76dd4377f92e35b17e03a2d10a7c42177ba5ccbb6aea1b0b54f49d52c5a97456f8cf77685e1c90c27773f4237c33e95f648d4258b786 WHIRLPOOL df77e4348918cedf45f3d7ecf5dd819b7a310c4dbd338fafe785c7076e7561eb98e8b8b34a849985f7ff145a3003b6a829c76824233e586e7cfd72369444a310
+EBUILD tcpreen-1.4.4.ebuild 524 SHA256 011c2d4ce1ffbdeec10cf0f04ebf03a54c2e570a93c98a206472e7d17797d602 SHA512 ab6eeec90025b97fbe9c9470348b1caf267678f679ba68425cafe240b7985f1ec41894c7bd4aed8226f7a4ff81763806874df835ea746b3e4b8050aa07ec3e99 WHIRLPOOL ce0789598455a1483aa7e7ffa1554c57c1c22b66b3a01396948a8f2cfca759aec002e00e6161562144f1a7c4e58e0ebf987b5a361ce5b02c0ccce9bcd72f09bf
+MISC ChangeLog 2431 SHA256 9682bccb858e46fde63b90822f0c3fc2edc31ffa6008571e1765662deb5ffde3 SHA512 9954898af25b9413628f56b53e2ec5384adbb8efffc5a5214bc89f2efe18b70b5b3909294a0110c8c89389d04332f85fbd941461cffdbd344be034f0b7f376fd WHIRLPOOL e2b488c3b4866e2255aa3c4c2985d6714e42ed12543e336ab9a0691b848b4860615867d544316f1fefa1014c5fcaa064350be8aa48144397b202c28a74543ecd
+MISC ChangeLog-2015 1692 SHA256 33ee879f616c8a4c692e6f69288b11acad54c71109561e120b267fe07cf8fb14 SHA512 0742e0810693a34eec1a1d9e397f70bca559ca06df5eeb2f77525fb7411282fc96e33af3a2ce260feaf50750267ed7298a9b01254fe5183516b77f1c5e2d1e7f WHIRLPOOL 94c78790f25b6efa19b4a279250cba76c2e4f79ee7730128e170bf46fb40bb720ef3cbaaf5fb55e91ad8f1aa9bf8e23022f97318084814c0f786a982e7915fba
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/tcpreen/metadata.xml b/net-analyzer/tcpreen/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/tcpreen/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/tcpreen/tcpreen-1.4.4.ebuild b/net-analyzer/tcpreen/tcpreen-1.4.4.ebuild
new file mode 100644
index 000000000000..ba523ef2cd1e
--- /dev/null
+++ b/net-analyzer/tcpreen/tcpreen-1.4.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="TCP network re-engineering tool"
+HOMEPAGE="http://www.remlab.net/tcpreen/"
+SRC_URI="http://www.remlab.net/files/${PN}/stable/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE="nls"
+
+DEPEND="nls? ( sys-devel/gettext )"
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+DOCS=( AUTHORS NEWS README THANKS TODO )
diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
new file mode 100644
index 000000000000..0e74b21006b6
--- /dev/null
+++ b/net-analyzer/tcpreplay/Manifest
@@ -0,0 +1,9 @@
+AUX tcpreplay-4.1.0-enable-pcap_findalldevs.patch 601 SHA256 b25a3bb306fc6a4375c5e340836de2a03802fa8f43aa0cc96bc69f74ae8d5394 SHA512 6aa44d082e068de90a431071d94e4351257e5074f1b36617c1d7226ed18c5a6e76f06a0e9f20f41772e1d33af72ea23cbaa29a4dcf3018a567412a0d0fac72de WHIRLPOOL 23158c734f69a4afc30ba5174923138de9e0d4e0dbea1220574d7f84f8f33dbe0bace9897bee691e38f586372bde4b080f3d1a2512fcca718c35839550ac4ba3
+AUX tcpreplay-4.1.2-CVE-2017-6429.patch 858 SHA256 a45572a46bd63e79556b0f55fd3c7cafc83566e0350cb8750b40c8a2fcd09416 SHA512 934a42f9b70c882780a4a2fe3c9621b8a8380199ea63056291d27cbce006afcddc7331f9b73c8c244e89229c8526c55d2f534bedba50fb3d28ec3b873f700e3f WHIRLPOOL cf7a3a61df5a86a1095d83045dad1c8ef2e33e76e516fcbd47ff8d3f01626e70809b5d6dd1e75c19357f5e3725c61a2b8e7ebdbdda244039ebf13aeb908d7bc6
+DIST tcpreplay-4.1.2.tar.gz 2162175 SHA256 da483347e83a9b5df0e0dbb0f822a2d37236e79dda35f4bc4e6684fa827f25ea SHA512 3a7d125f38fe15070d666eacb4a5ef026a73ff850adec7ef3592966f38d1d155002792c5d5ac2476aa034d71be5f31b9dacd5be34af01a336149af3a42cad360 WHIRLPOOL e5ca80234655b3614eebd400954b53d958d08dbe91cf123db07935e5bebfb34ad40cd41a7a25a8d8ee684dbcaeda41c75a18503172830141dca022713b7814d6
+DIST tcpreplay-4.2.6.tar.gz 3494827 SHA256 043756c532dab93e2be33a517ef46b1341f7239278a1045ae670041dd8a4531d SHA512 a46846b29e3cd7fbc635faee9c4be90db0d346c0d0f291ac8e007e1fbf614289094e14480c1c5b40feb5a175d3cbad018e2dd4d1a5762b7d31a4325af6102e7e WHIRLPOOL 97502778faee6dd27516c0323b6f4589b30a621e0380c579a68bd75744e03e1ec542e45b86427bff9482145dacae4d98d4a2025436c6411cb25f0fec306acc8f
+EBUILD tcpreplay-4.1.2-r1.ebuild 2020 SHA256 da13bfb804f5263d5768c4e4915ec1616a74311fc93b3743e237a98ba5087f03 SHA512 f39b594d93adf778e7432fc0770ac4e3328fea9cb082169fe426e09034e997ddbff43b5b2678ed8324e7d0a95fb05513384c6bcdc94816711b05e2bff561c67b WHIRLPOOL b224d077dfdfa8877d248b1b46f2a28287baef61b20f905a724e85d2807a374feb703ff6ede09e7fcf60bed641ff78a75ebf37957ec4da5dafdd693c16429f74
+EBUILD tcpreplay-4.2.6.ebuild 1923 SHA256 8b847b18577fc5552549f363df610ce96274c597b74689becd0d0e1ded58faa4 SHA512 a9d31e3a2db7b7ec12c68a3229c7f0137daaaf6acf35808f7f797f11c025263c3f533c528d5bc763fe8f490ae24aa72f2351a5c2ef9154f96e347bf9c1486752 WHIRLPOOL f9f2c53fc16c0aa0ef7cefb8fe75f99212647e60b26ec0c0110ac0bfb45f3b46bf95ffc0d975f776963f12cb827832de17ddfc1f1d6b54ed603a13aba6fb00c4
+MISC ChangeLog 4836 SHA256 2cf48e634a002228b5769f0789b8e9f2298a0d9bd79ff3f9fa2990697b9875ba SHA512 d51648eff360637f5644e1420bb64eefa71c43fb25211779d0f742d1c3e7ce9007a130c936bbc8220054904c3ff85bb2dd844d771548e425210bcabc58c96e2e WHIRLPOOL 7077be307e6861c5178e41bedf353116911dad37f4c1973437d1f15ce2729be1fec0e00e74fd849a9d46137abbd368791c649c2cf849d24deabcab242028da0f
+MISC ChangeLog-2015 10263 SHA256 e4e73c4d2313866c04941c53076fff8eea1c12f5c303da7d434a69aa027182d8 SHA512 0c51391a412c593abfd71037463e012477f21ac0501bc04eceb61353bc105c488403038e2500b47a2f36442a42d2fae76e00a8a75b8bd73b11722e61fd58280f WHIRLPOOL 66f5c88a453f0641f4027d08d7bc3c51a597dca9e6cf52cd9b6277e1cef14d5dcffc3a6768d77ddf492e57ce98deb0ddea7407a33b5a7821b48f4d880812730b
+MISC metadata.xml 1116 SHA256 28c7a3895300c6912e12a56cc5d9d72ff620426813ad39f6cf8cc69f9136c742 SHA512 58cb13a648ba7b9f9fd8c7a7cdfd37d56f0d7b957824a55d63001a8708f93d529b29e52df051bdce0c87eb672d24c7b2c35ee8a1e94ba062e2a1e12dd0d0ee1b WHIRLPOOL 6a9ad176ccb7e9654d3ea6992d97441ab54a7232844251afb075b6248a8f12c1196f03ac66d8c5f4a205d87857a3f2e56b8883e95835d172e97e692245fe67d4
diff --git a/net-analyzer/tcpreplay/files/tcpreplay-4.1.0-enable-pcap_findalldevs.patch b/net-analyzer/tcpreplay/files/tcpreplay-4.1.0-enable-pcap_findalldevs.patch
new file mode 100644
index 000000000000..f45d14cd1da1
--- /dev/null
+++ b/net-analyzer/tcpreplay/files/tcpreplay-4.1.0-enable-pcap_findalldevs.patch
@@ -0,0 +1,19 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1499,6 +1499,8 @@
+     AC_MSG_WARN(Unable to do tests when cross-compiling)
+ fi
+ 
++disable_pcap_findalldevs=no
++
+ dnl Allows user to choose which nic to use for testing purposes
+ AC_ARG_WITH(testnic,
+     AC_HELP_STRING([--with-testnic=NIC], [Select which network card to use for testing]),
+@@ -1509,7 +1511,6 @@
+ 
+ dnl There's a bug in OS X which causes pcap_findalldevs() to make the wifi NIC to disassociate
+ dnl so under OSX we disable the interface list feature
+-disable_pcap_findalldevs=no
+ 
+ osx_frameworks=no
+ dnl these need to be dynamic based on OS
diff --git a/net-analyzer/tcpreplay/files/tcpreplay-4.1.2-CVE-2017-6429.patch b/net-analyzer/tcpreplay/files/tcpreplay-4.1.2-CVE-2017-6429.patch
new file mode 100644
index 000000000000..42c74d650712
--- /dev/null
+++ b/net-analyzer/tcpreplay/files/tcpreplay-4.1.2-CVE-2017-6429.patch
@@ -0,0 +1,27 @@
+--- a/src/tcpcapinfo.c
++++ b/src/tcpcapinfo.c
+@@ -281,6 +281,15 @@ main(int argc, char *argv[])
+                 caplen = pcap_ph.caplen;
+             }
+ 
++            if (caplentoobig) {
++                printf("\n\nCapture file appears to be damaged or corrupt.\n"
++                        "Contains packet of size %u, bigger than snap length %u\n",
++                        caplen, pcap_fh.snaplen);
++
++                close(fd);
++                break;
++            }
++
+             /* check to make sure timestamps don't go backwards */
+             if (last_sec > 0 && last_usec > 0) {
+                 if ((pcap_ph.ts.tv_sec == last_sec) ? 
+@@ -306,7 +315,7 @@ main(int argc, char *argv[])
+                 }
+ 
+                 close(fd);
+-                continue;
++                break;
+             }
+ 
+             /* print the frame checksum */
diff --git a/net-analyzer/tcpreplay/metadata.xml b/net-analyzer/tcpreplay/metadata.xml
new file mode 100644
index 000000000000..e53da7185c86
--- /dev/null
+++ b/net-analyzer/tcpreplay/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
+  <longdescription>
+  Tcpreplay is a suite of utilities for UNIX systems for editing and replaying
+  network traffic which was previously captured by tools like tcpdump and
+  ethereal/wireshark. The goal of tcpreplay is to provide the means for
+  providing reliable and repeatible means for testing a variety of network
+  devices such as switches, router, firewalls, network intrusion detection and
+  prevention systems (IDS and IPS).
+  </longdescription>
+  <use>
+    <flag name="pcapnav">Enable if you want the jump to byte offset feature via <pkg>net-libs/libpcapnav</pkg></flag>
+    <flag name="tcpdump">Use <pkg>net-analyzer/tcpdump</pkg> for packet decoding feature </flag>
+  </use>
+  <upstream>
+    <remote-id type="github">appneta/tcpreplay</remote-id>
+    <remote-id type="sourceforge">tcpreplay</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.1.2-r1.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.1.2-r1.ebuild
new file mode 100644
index 000000000000..abd2c47ceca8
--- /dev/null
+++ b/net-analyzer/tcpreplay/tcpreplay-4.1.2-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic
+
+DESCRIPTION="utilities for editing and replaying previously captured network traffic"
+HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay"
+LICENSE="BSD GPL-3"
+SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="amd64 ~sparc x86"
+IUSE="debug pcapnav +tcpdump"
+
+DEPEND="
+	>=sys-devel/autogen-5.18.4[libopts]
+	dev-libs/libdnet
+	>=net-libs/libpcap-0.9
+	tcpdump? ( net-analyzer/tcpdump )
+	pcapnav? ( net-libs/libpcapnav )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=(
+	docs/{CHANGELOG,CREDIT,HACKING,TODO}
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.1.0-enable-pcap_findalldevs.patch
+	"${FILESDIR}"/${PN}-4.1.2-CVE-2017-6429.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|-O3||g' \
+		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
+		configure.ac || die
+	sed -i \
+		-e 's|#include <dnet.h>|#include <dnet/eth.h>|g' \
+		src/common/sendpacket.c || die
+	sed -i \
+		-e 's|@\([A-Z_]*\)@|$(\1)|g' \
+		-e '/tcpliveplay_CFLAGS/s|$| $(LDNETINC)|g' \
+		-e '/tcpliveplay_LDADD/s|$| $(LDNETLIB)|g' \
+		src/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# By default it uses static linking. Avoid that, bug 252940
+	econf \
+		$(use_enable debug) \
+		$(use_with pcapnav pcapnav-config /usr/bin/pcapnav-config) \
+		$(use_with tcpdump tcpdump /usr/sbin/tcpdump) \
+		--disable-local-libopts \
+		--enable-dynamic-link \
+		--enable-shared \
+		--with-libdnet \
+		--with-testnic2=lo \
+		--with-testnic=lo
+}
+
+src_test() {
+	if [[ ! ${EUID} -eq 0 ]]; then
+		ewarn "Some tests were disabled due to FEATURES=userpriv"
+		ewarn "To run all tests issue the following command as root:"
+		ewarn " # make -C ${S}/test"
+		emake -j1 -C test tcpprep || die "self test failed - see ${S}/test/test.log"
+	else
+		emake -j1 test || {
+			ewarn "Note, that some tests require eth0 iface to be UP." ;
+			die "self test failed - see ${S}/test/test.log" ; }
+	fi
+}
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.2.6.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.2.6.ebuild
new file mode 100644
index 000000000000..ee0ea9dffd4b
--- /dev/null
+++ b/net-analyzer/tcpreplay/tcpreplay-4.2.6.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic
+
+DESCRIPTION="utilities for editing and replaying previously captured network traffic"
+HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay"
+LICENSE="BSD GPL-3"
+SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV/_/-}/${P/_/-}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="debug pcapnav +tcpdump"
+
+DEPEND="
+	>=sys-devel/autogen-5.18.4[libopts]
+	dev-libs/libdnet
+	>=net-libs/libpcap-0.9
+	tcpdump? ( net-analyzer/tcpdump )
+	pcapnav? ( net-libs/libpcapnav )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=(
+	docs/{CHANGELOG,CREDIT,HACKING,TODO}
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.1.0-enable-pcap_findalldevs.patch
+)
+
+S=${WORKDIR}/${P/_/-}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|#include <dnet.h>|#include <dnet/eth.h>|g' \
+		src/common/sendpacket.c || die
+	sed -i \
+		-e 's|@\([A-Z_]*\)@|$(\1)|g' \
+		-e '/tcpliveplay_CFLAGS/s|$| $(LDNETINC)|g' \
+		-e '/tcpliveplay_LDADD/s|$| $(LDNETLIB)|g' \
+		src/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# By default it uses static linking. Avoid that, bug 252940
+	econf \
+		$(use_enable debug) \
+		$(use_with pcapnav pcapnav-config /usr/bin/pcapnav-config) \
+		$(use_with tcpdump tcpdump /usr/sbin/tcpdump) \
+		--disable-local-libopts \
+		--enable-dynamic-link \
+		--enable-shared \
+		--with-libdnet \
+		--with-testnic2=lo \
+		--with-testnic=lo
+}
+
+src_test() {
+	if [[ ! ${EUID} -eq 0 ]]; then
+		ewarn "Some tests were disabled due to FEATURES=userpriv"
+		ewarn "To run all tests issue the following command as root:"
+		ewarn " # make -C ${S}/test"
+		emake -j1 -C test tcpprep || die "self test failed - see ${S}/test/test.log"
+	else
+		emake -j1 test || {
+			ewarn "Note, that some tests require eth0 iface to be UP." ;
+			die "self test failed - see ${S}/test/test.log" ; }
+	fi
+}
diff --git a/net-analyzer/tcpslice/Manifest b/net-analyzer/tcpslice/Manifest
new file mode 100644
index 000000000000..831063c603aa
--- /dev/null
+++ b/net-analyzer/tcpslice/Manifest
@@ -0,0 +1,7 @@
+AUX tcpslice-1.2a_p3-exit.patch 148 SHA256 91fa3c70d401522de4aca5cdee05fc603cb2da3316575e24aed6fcf02291b955 SHA512 7506ce229cc1e0d44570c62a77e0e96adc3936d8464af6c79abbd9b1fd09559b627fa4f27f905cc5e7fd39f246e818a445406ac9439b6792223671f0f1f77864 WHIRLPOOL aeede33118b28fc31abd7ea4db8845a207195cbd21249f4e0adb73414d7e44d66b7c4d06f622d9ec84e6d4ed268c25a2652093f36ba48cc56cce7843f26ec569
+DIST tcpslice_1.2a3-4.debian.tar.gz 5784 SHA256 d2b2be807207ff1b268a855a5b4803b2773fdce7749618ac5f4c102195c94db0 SHA512 43a0ad5811c84639be0c6d162ea92101e73240e9689e4b647ee060697382062ec0e22dcb951ca000e05bac829455b7aa37f8dd73c5b1dd87f55e6d61a8a9b59b WHIRLPOOL 223ff2fcfafbaeb3f1bc1088d871a08d5ac7049e39da14ad29d12a43064dcf3c48e187fef14cec003ce1ced659fa65c037f6f3fea5216ac01bb359a3b4599adc
+DIST tcpslice_1.2a3.orig.tar.gz 76879 SHA256 4096e8debc898cfaa16b5306f1c42f8d18b19e30e60da8d4deb781c8f684c840 SHA512 04e12d592807022c78eb4941580ed103995680c69af885bb8f13828a12ec570f7fe93c34c1b20a01d3d99f445d5da17a1fcfbe25b2e3b41abe28304c034654c5 WHIRLPOOL fe151bf832318b29d99a9726a9bda7fc058c38fd83a803f14f2cb38553e4d47862fb7f993bf8c0fb87bf2d95cf91e3dc7e26eb5be9e9b944695d7cbccf54ff74
+EBUILD tcpslice-1.2a_p3-r1.ebuild 736 SHA256 496480c826214cb69bbb106cc3472bbe48bf3211efea098258541ec44ca765ae SHA512 8b7844ca28b934c922927da7a91751672d592f4332be1574d18c2818c0def15cf72aed435240ded7699690786f979f5a449cad69c1297bfc7e9d69b185eb7221 WHIRLPOOL dd3b7e8a8a32ed7cabeed17271edee231a2b7868c063b8448d2d9c347853d66f4ac481bcd817507e3f65aaa864f6aa9a45f041648be5588006718dae6c7a1cef
+MISC ChangeLog 2482 SHA256 a1476e63cf227a9debf27128e2409d7cda8b1e469776d83f1efd8c2858d0fffd SHA512 7f43e881a432335a207384f56390b5399cba2c996ae0994bac8bca3191a185b987ea5e8ee57b7973087ca66deca61d5d060df565ac3a3a8433f78b3cfc7772a0 WHIRLPOOL 1c6bedab039d6400fcab0c01dc6b3286300170733e2748ab7178827bc90deceb10d6fd9951e1188de94ac897635b08c423ab4a8833bde39d07cdba050fde6314
+MISC ChangeLog-2015 2855 SHA256 0367b7141f560941f941403e75cf87328865574483c78484873d87848c86e2ac SHA512 26f0a93b58f8d3f3cc687881fef8d13814628db2cbbc3116dafbbaae55e99ee2d7b46309a0969311cac548cd2c8f0ab3271d743e03df32641a9ae8ab67a198ee WHIRLPOOL 94763085617c73ac6b1a9148960e7ebb4d9f11ebe82881ec9e97f6c1d234c11b5d229a952ae281d8cae2499b949f919ec3ec2147fc77ef414daf2186b014166f
+MISC metadata.xml 371 SHA256 54ba7de310e1238768b816f7a610f61a33ffbaf1fa90990894c449ec95bef0a3 SHA512 3bd72b08f16ee7ae7c8fb8787de22923118d3a6b311328f4d7819003455312cf47002f9e41c00f68bf8c88f9e6d74abc4d1f8d24fb5ea41c038e4c46cf8b8bfa WHIRLPOOL 244c98d864497495444df7ec15762f05de98ce1507b2548b77fc279964e12d9bb2b70e16bef13ff9aea0fb567313f40e05feaadb162b895803a48aef4142a619
diff --git a/net-analyzer/tcpslice/files/tcpslice-1.2a_p3-exit.patch b/net-analyzer/tcpslice/files/tcpslice-1.2a_p3-exit.patch
new file mode 100644
index 000000000000..befcfdc9defe
--- /dev/null
+++ b/net-analyzer/tcpslice/files/tcpslice-1.2a_p3-exit.patch
@@ -0,0 +1,10 @@
+--- a/util.c
++++ b/util.c
+@@ -25,6 +25,7 @@
+ #endif
+ 
+ #include <sys/types.h>
++#include <stdlib.h> /* exit() */
+ 
+ #include <stdio.h>
+ #if __STDC__
diff --git a/net-analyzer/tcpslice/metadata.xml b/net-analyzer/tcpslice/metadata.xml
new file mode 100644
index 000000000000..f932bb378f35
--- /dev/null
+++ b/net-analyzer/tcpslice/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">the-tcpdump-group/tcpslice</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/tcpslice/tcpslice-1.2a_p3-r1.ebuild b/net-analyzer/tcpslice/tcpslice-1.2a_p3-r1.ebuild
new file mode 100644
index 000000000000..706c33979464
--- /dev/null
+++ b/net-analyzer/tcpslice/tcpslice-1.2a_p3-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+MY_P="${PN}_${PV/_p/}"
+
+DESCRIPTION="Extract and concatenate portions of pcap files"
+HOMEPAGE="http://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpslice"
+LICENSE="BSD"
+SLOT="0"
+SRC_URI="mirror://debian/pool/main/t/${PN}/${MY_P}.orig.tar.gz
+	mirror://debian/pool/main/t/${PN}/${MY_P}-4.debian.tar.gz"
+KEYWORDS="~amd64 ~ppc x86"
+
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P/_/-}"
+
+src_prepare() {
+	epatch \
+		"${WORKDIR}"/debian/patches/[0-]* \
+		"${FILESDIR}"/${P}-exit.patch
+	eautoreconf
+}
+
+src_install() {
+	dosbin tcpslice
+	doman tcpslice.1
+	dodoc README
+}
diff --git a/net-analyzer/tcpstat/Manifest b/net-analyzer/tcpstat/Manifest
new file mode 100644
index 000000000000..7b44cc4a49d2
--- /dev/null
+++ b/net-analyzer/tcpstat/Manifest
@@ -0,0 +1,8 @@
+AUX tcpstat-1.5-db.patch 4691 SHA256 d77717dc7144f0be4019fbf1b695650ed4a33520cdc714e00b8fb2686e2ad291 SHA512 03de51e86bd0aa1bf2d29097871fe8409498050100c4adefde7d8aae7bdd752455af6ce13b490f4e596ea90557b37c95b974705cbaece35d9b465571fdb31d6d WHIRLPOOL af6b886eb6c59b3ac9c1850b4c31b959e9b88c9009eded0f3e48c8ed097caba397660df5030de874a22cb5ec98d9311b77571032b4c48d6927f2ccda0fcf6aa0
+DIST tcpstat-1.5.tar.gz 93102 SHA256 46fde9458cc5678264b0c5f2197f84ada9101951197fdeec5f04b0801fcff0ba SHA512 f1399365e754e4d9e19657c455a580294a7b4002a0d02ff05791a45574dcb1d0e75dc492157ef595066502b1553702481c67b20ad24267a50d7293766c39a5ab WHIRLPOOL 386e777ff42a4a61e73e22630ef4ea83e8ce23da0fd165e7d3363530033819f12da3df3891e67da29be9afba5fb43d88397c519c6c7e2fea4a6d624b61ab6522
+EBUILD tcpstat-1.5-r1.ebuild 855 SHA256 928e5f4d17381a21793261684f0026fee8719c773eab17df6b563a4300b43510 SHA512 9aafc7493ad6121fe32344ddc3b63c5f12247f04604bc9b1917828113d421519da3bf7be2ae40771db7d5b394b89c930b2762045b4005ca7ee36c1b74b664652 WHIRLPOOL cd3acbf837d476c2eb34bc6f3e09f1bd3af718e07db8daa4e3fa52591d2cbb39da2e6a45fc7a3f5ce85bdcf2e246268f917921d2a0f5ad5971a36a9cf0cd273f
+EBUILD tcpstat-1.5-r2.ebuild 723 SHA256 32319ce46c8f30d8d69d2d6df01d9147f02b672bfbe1e5e51c8658c7ee5e544c SHA512 e6dc72f08fcb172c3ddb72ff79bf9d4b23d502a0c630d3438d054892b38c047946bc4b77a2f21e6cfda7cb61191bea0b58129461d8df8cf9e3c09c56cc0b67eb WHIRLPOOL f8fd5a25f7fb6c07a3694eed65d486a644c9ff2af7995b87c7a5d8004f9f6ce11e5472f7e89b8bc328f12203c354e18a84a5c1603639fa126378de98e04a73b6
+EBUILD tcpstat-1.5.ebuild 551 SHA256 ef8ddf040425ad72146876bbc6b1e3e2e0abad80bb6879c0e3a2657150765afe SHA512 961013e1968dc7c43e372615b4a5f2900dad32e1365d69516e63e639b2fa430c746fe8ce1068c4fa1317717777f80f62badca29f5235bd460081e9c1c5b292b2 WHIRLPOOL cf72a18dc0e4c50caa28d4e0eeb8ed21a9d5f3a4ad46a1afec2ec217363a36da35d344d12e92bf595515a4cb593e8a3762da2a3fbcb6de7e49c3c557d29c6664
+MISC ChangeLog 2566 SHA256 48f4fb432175c5525c45268b41b7d1d7881c342d3053a60ff0a51c3e2147bff7 SHA512 1d9898b0dc87186f10c3eeddd964fa0309d2ad382e67498561906b88084db1c7fc1af2ddccc03b3da75571e480d4efcd88af3b321a0ca5928cdb489547daa320 WHIRLPOOL 67ad6280d37a65386ecb1f0deb31cb442c2990aa6095d5670dce6cc910f88d19af0c100af101aee026eda4c21bb132b26dbed0bb019a7ab920942d9e6ee37fb3
+MISC ChangeLog-2015 3055 SHA256 a2dc55384d656d97fb9b641d265f1810ee6e819c4829c92536e5f8e31631a1ec SHA512 507b4cb836c38121d27e812c744660f415b9c31f659c0416d67c19005ed1a557e42a2ec2aead33886ccdbaf787e53f080913742f550d8f0530f7d882e957b6ad WHIRLPOOL d4936bd5f889ad0cf7a822fa8f70b80ed6fac9ed9f458a2667563618113bf80498f00f38ea345a1a65830de343da165ab5a23df99da98434d56ba395b675e002
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/tcpstat/files/tcpstat-1.5-db.patch b/net-analyzer/tcpstat/files/tcpstat-1.5-db.patch
new file mode 100644
index 000000000000..88e668e1a4a5
--- /dev/null
+++ b/net-analyzer/tcpstat/files/tcpstat-1.5-db.patch
@@ -0,0 +1,165 @@
+--- a/configure.in
++++ b/configure.in
+@@ -84,15 +84,26 @@
+ dnl #######################
+ dnl Checks for header files
+ dnl #######################
+ AC_HEADER_STDC
+ AC_HEADER_SYS_WAIT
+-AC_CHECK_HEADERS(sys/time.h sys/stat.h unistd.h strings.h fcntl.h netinet/ip6.h)
++AC_CHECK_HEADERS(sys/time.h sys/stat.h unistd.h strings.h fcntl.h)
+ 
+ dnl BSD/OS Seems to not have a good ethernet header, so we gotta wing it
+ AC_CHECK_HEADERS(net/if.h net/ethernet.h netinet/if_ether.h net/ppp_defs.h)
+ 
++AC_ARG_ENABLE( ipv6, [ AC_HELP_STRING([--enable-ipv6], [s use IPv6?]) ], ip6=$enableval )
++if test "$ip6" = "yes"
++then
++	AC_CHECK_HEADER(netinet/ip6.h, , [AC_MSG_ERROR([I couldn't find netinet/ip6.h though you asked for ipv6 support.])] )
++elif test "$ip6" != "no"
++then
++	AC_CHECK_HEADER(netinet/ip6.h)
++
++fi
++
++
+ dnl #############################################################
+ dnl Checks for typedefs, structures, and compiler characteristics
+ dnl #############################################################
+ AC_C_CONST
+ AC_TYPE_SIZE_T
+@@ -147,34 +158,11 @@
+   If you already have... then please rerun configure with the option
+     --with-pcap-lib=DIR
+   with "DIR" being where libpcap is found.])
+ ])
+ 
+-dnl look for dbopen for tcpprof
+-TCPPROF=""
+-LD_TCPPROF=""
+-AC_CHECK_LIB(c, dbopen, [ TCPPROF=tcpprof ], [
+- AC_CHECK_LIB(db1, dbopen, [
+-  TCPPROF=tcpprof
+-  LD_TCPPROF="-ldb1"
+-  AC_DEFINE(USE_DB1_LIBRARY, 1, [ Use the sleepycat DB library. ])
+-  ], [
+-  AC_MSG_WARN([
+-
+-  *** WARNING ***
+-  I couldn't locate the Berkeley DB library.  The extra utility
+-  "tcpprof" will not be built.  THIS IS OK!!!  "tcpstat" will
+-  continue to be built as if this never happened.
+-
+-  If you wish to use the extra "tcpprof" program, please install
+-  the Berkeley DB library from:
+-      ftp://ftp.cs.berkeley.edu/ucb/4bsd/db.tar.gz
+-    ])
+-  ])
+-])
+ AC_SUBST(TCPPROF)
+-AC_SUBST(LD_TCPPROF)
+ AC_SUBST(MATHLIB)
+ 
+ AC_CONFIG_FILES([
+ Makefile
+ doc/Makefile
+--- a/lib/process.c
++++ b/lib/process.c
+@@ -230,12 +230,12 @@
+  *   calls a user function pointing to the data
+  *
+  * XXX: filter is not used.  capture_seconds also isn't, but snoop is
+  *	always read from a file.
+  */
+-int get_snoop_data(char *fname, char *filter, int flags,
+-	Double capture_seconds, void (*hook)(packet_data *, void **),
++int get_snoop_data(char *fname,  char *filter __attribute__((unused)), int flags,
++	Double capture_seconds __attribute__((unused)), void (*hook)(packet_data *, void **),
+ 	void **args) {
+ 
+ 	u_char *packet;
+ 	int fd, len, blen, ret = 0;
+ 	struct snoop_file_header	fh;
+--- a/lib/tcpseq.c
++++ b/lib/tcpseq.c
+@@ -54,11 +54,10 @@
+ 	u_char	flags;
+ 	struct tcpseq_ha test_ha;
+ 	struct tcphdr *tp = NULL;
+ 	struct ip *ip;
+ #ifdef INET6
+-	int is_ip6 = 0;
+ 	struct ip6_hdr *ip6;
+ 
+ 	ip6 = (struct ip6_hdr *) &pd->data.ip6.hdr;
+ 	if (is_ip6_packet(pd))
+ 		tp= &(pd->data.ip6.body.tcphdr);
+--- a/src/catpcap.c
++++ b/src/catpcap.c
+@@ -50,11 +50,11 @@
+ 	if (c == ' ') return c;
+ 	if ((u_char)c > 0xa1 && SHOW_HIGH_BIT) return c;
+ 	return '.';
+ }
+ 
+-void proc_pcap(u_char *user, const struct pcap_pkthdr *h, const u_char *p) {
++void proc_pcap(u_char *user __attribute__((unused)), const struct pcap_pkthdr *h, const u_char *p) {
+ 	u_int length = h->caplen, i, j, k, step;
+ 	u_char *r, *s;
+ 	char c;
+ 
+ 	r = (u_char *)p;
+@@ -90,11 +90,11 @@
+ }
+ /*
+  * process_file() takes the output of tcpdump, saves packets, and displays
+  * statistics
+  */
+-void process_file(char *fname, u_int unused) {
++void process_file(char *fname, u_int unused __attribute__((unused))) {
+ 	int run = 1, i;
+ 	pcap_t	*pd;
+ 	char	ebuf[PCAP_ERRBUF_SIZE];
+ 	struct bpf_program	bpf_prog;
+ 
+--- a/src/dump.c
++++ b/src/dump.c
+@@ -37,21 +37,21 @@
+ char filterexpr[BUF_SIZ]	= "";
+ int	get_tcp_flags		= 0;
+ int	what_to_show		= 0;
+ int	packet_number		= 0;
+ 
+-void my_hook(packet_data *pd, void **args) {
++void my_hook(packet_data *pd) {
+ 	printf("PACKET NUMBER: %d\n", ++packet_number);
+ 	print_packet(pd, what_to_show);
+ 	printf("-------------------\n");
+ }
+ 
+ /*
+  * process_file() takes the output of tcpdump, saves packets, and displays
+  * statistics
+  */
+-void process_file(char *fname, u_int unused) {
++void process_file(char *fname, u_int unused __attribute__((unused))) {
+         get_dump_data(fname, filterexpr, get_tcp_flags,
+ 		-1.0, my_hook, NULL);
+ }
+ 
+ int parse_show_types(char *in) {
+--- a/src/tcpstat.c
++++ b/src/tcpstat.c
+@@ -421,11 +421,11 @@
+ }
+ 
+ /*
+  * process_file() gets the data, and then displays the statistics
+  */
+-void process_file(char *fname, u_int unused) {
++void process_file(char *fname, u_int unused __attribute__((unused))) {
+ 	void		*argv[2];
+ 	statistics	stats;
+ 	Double		x;
+ 
+ 	signal(SIGUSR1, catch_signal);
diff --git a/net-analyzer/tcpstat/metadata.xml b/net-analyzer/tcpstat/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/tcpstat/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/tcpstat/tcpstat-1.5-r1.ebuild b/net-analyzer/tcpstat/tcpstat-1.5-r1.ebuild
new file mode 100644
index 000000000000..6c1492869042
--- /dev/null
+++ b/net-analyzer/tcpstat/tcpstat-1.5-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils autotools flag-o-matic
+
+DESCRIPTION="Reports network interface statistics"
+SRC_URI="http://www.frenchfries.net/paul/tcpstat/${P}.tar.gz"
+HOMEPAGE="http://www.frenchfries.net/paul/tcpstat/"
+
+DEPEND="net-libs/libpcap"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="amd64 ~ppc ~ppc64 sparc x86"
+
+IUSE="ipv6"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-db.patch"
+	eautoreconf
+}
+
+src_compile() {
+	append-flags -Wall -Wextra
+	econf $(use_enable ipv6) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "emake install failed"
+	dobin src/{catpcap,packetdump} || die "dobin failed"
+	dodoc AUTHORS ChangeLog NEWS README doc/Tips_and_Tricks.txt
+	newdoc src/README README.src
+}
diff --git a/net-analyzer/tcpstat/tcpstat-1.5-r2.ebuild b/net-analyzer/tcpstat/tcpstat-1.5-r2.ebuild
new file mode 100644
index 000000000000..d9762afda9d3
--- /dev/null
+++ b/net-analyzer/tcpstat/tcpstat-1.5-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils autotools flag-o-matic
+
+DESCRIPTION="Reports network interface statistics"
+SRC_URI="http://www.frenchfries.net/paul/tcpstat/${P}.tar.gz"
+HOMEPAGE="http://www.frenchfries.net/paul/tcpstat/"
+
+DEPEND="net-libs/libpcap"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-db.patch
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -Wall -Wextra
+	econf $(use_enable ipv6)
+}
+
+DOCS=( AUTHORS ChangeLog NEWS README doc/Tips_and_Tricks.txt )
+
+src_install() {
+	default
+	dobin src/{catpcap,packetdump}
+	newdoc src/README README.src
+}
diff --git a/net-analyzer/tcpstat/tcpstat-1.5.ebuild b/net-analyzer/tcpstat/tcpstat-1.5.ebuild
new file mode 100644
index 000000000000..5a8dcf9dc27c
--- /dev/null
+++ b/net-analyzer/tcpstat/tcpstat-1.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+IUSE="berkdb"
+
+DESCRIPTION="Reports network interface statistics"
+SRC_URI="http://www.frenchfries.net/paul/tcpstat/${P}.tar.gz"
+HOMEPAGE="http://www.frenchfries.net/paul/tcpstat/"
+
+DEPEND="net-libs/libpcap
+	berkdb? ( <sys-libs/db-2 )"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
+
+src_install () {
+
+	make DESTDIR=${D} install || die
+	use berkdb && dobin src/tcpprof
+
+	dodoc AUTHORS ChangeLog COPYING LICENSE NEWS README*
+
+}
diff --git a/net-analyzer/tcptrace/Manifest b/net-analyzer/tcptrace/Manifest
new file mode 100644
index 000000000000..23046b1f6c19
--- /dev/null
+++ b/net-analyzer/tcptrace/Manifest
@@ -0,0 +1,8 @@
+AUX tcptrace-6.6.7-cross-compile.patch 1348 SHA256 c0285a211ceb6294de9d49c6da82a4379d948aa70be5b166c9f1f530120e180c SHA512 ea5f8d5352f1eb4059c0284abbce9ff9b6df78ac8c7cb17a2aa138fa912cb4197f09b8e43e91bd04b980b6d73e1670deb7e9a3b1386eaaede61a7bdb0f410d1e WHIRLPOOL 1b93660fed76ba09361f6f6ebedbd56545d47297ff2a1472d20a9d8a429bf0798bf357e6239017b25163fdd98ec4c5c3563a3a77f66530ee0d9267841fdbe00d
+DIST tcptrace-6.6.7.tar.gz 3773308 SHA256 63380a4051933ca08979476a9dfc6f959308bc9f60d45255202e388eb56910bd SHA512 3638770c342aea6c71aa556e758ed22e1fd44730f6c652cf82d3861eb1c31b186952c660071bd1df45020b80eaf9dd090a4ff58c979cc907eb8154dcb7b9b432 WHIRLPOOL b7eb2373b9a26789c47bb05e1e45047164648ff6f5cb3b57ba552d205443ca1fba7df9dd983a68f712a3e7398e776d97b328463f2497e7e39ba2b7db789c14b0
+DIST tcptrace_6.6.7-4.1.diff.gz 29161 SHA256 8d146edf2763badd92813404240c996613e256f1300c801f0dad02b842bf3ed4 SHA512 2f6dfeb8e15faa0151bdbb18194587e51de040f63117eb1b469a826091d5c1e5eb41a306bdc94e89ce993d0d04ec31324e5f7eea0a1a52852e07ee80006b2087 WHIRLPOOL 56af4f8ca7f5efbe5fd57acc2e7a881c315b245f5a10e4e4ce7eee9101554e53694e576129a8a997b4bbf89c2a0a92a2eab2f7efeca401808399524979cd2b17
+EBUILD tcptrace-6.6.7-r2.ebuild 1028 SHA256 ec2298aa4d19b7529d6f17e38cfd68f8359396e9b522c566e04c0f45bb156488 SHA512 cc29ad6fa8921d7f34ba073993d96cdb44f4d5fa203758c44b457b2ed6271958df592711cc33c2d8a0127e573249c4da897c48a279d8d8bb0d9fafee19e6af30 WHIRLPOOL a971692bbcc643c9c2750ad6efbbae737872bee32c034a0eff725f916e333b3aa96968607de838f8d5e8b9ab5a211ef7c1cac4a6a4350b5db77d13827d5d7ab3
+EBUILD tcptrace-6.6.7_p4_p1.ebuild 1485 SHA256 ad20032b4630216ded5901e9e0e0ad8f3db197fc23d4ae554d794c7d192d86eb SHA512 b9e24d4ede5c71a66c09099f5a0dcdf25f896ab92050548b0eb101348604be0dd2dde41c3fa2397d6d08f024b97636c8d3b5763159f352ca562e35454650ec32 WHIRLPOOL d474f3338937e1e0114b1bae47f7380da4f4f1de1a424d2021ea2391c3ab802a2dfd5dd7a5a02c83315e5faf759a9f578936f13fe571067697b2f47069dbc7a5
+MISC ChangeLog 2718 SHA256 3f57aa628205d6a68a03d1084d895f072d59d9c6a7bd4d6c4a38f4bf9eb74510 SHA512 d5c4cd7245862c3040e15561d703a07b065846b2e6a0e37bce2e2d31ec37cf3ff092408e661aec27a61af3e3a92f551348947742ea8f03b70b6dfc62d4bf24c7 WHIRLPOOL b8d28a05dd5e732fdd57b4df7c2e2ea998e16f52488c402110d90442decc27f801ca6a0f2822967a8ccb48dc2e992fdeb36c9aa74de9cd84b27378f2ae99cd98
+MISC ChangeLog-2015 3939 SHA256 d01deac55ccec7045e3b15ab7ca4707aa89fc29e78e0c0561edc430b5a33d63c SHA512 ac58b3f09bd83b5c76909b5df44b94c502ceb6a974e98a1c33ae100a0b9c67d31db1eb77573a5dc2bcfecad5005ceb4ffe32cd38e8a7fdf896455d2c6135ff06 WHIRLPOOL ff478ac9ddafb79ed4e27d9fd22b54051ad737cd241ffbe390f94a94453bd3153ef591c01f29ffe462bf1780d5b3fec78604286d07bcb2f7894fc41f385a6105
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/tcptrace/files/tcptrace-6.6.7-cross-compile.patch b/net-analyzer/tcptrace/files/tcptrace-6.6.7-cross-compile.patch
new file mode 100644
index 000000000000..a5b9ba0c009b
--- /dev/null
+++ b/net-analyzer/tcptrace/files/tcptrace-6.6.7-cross-compile.patch
@@ -0,0 +1,50 @@
+--- a/configure.in
++++ b/configure.in
+@@ -3,8 +3,6 @@
+ 
+ AC_CANONICAL_SYSTEM
+ 
+-AC_LBL_C_INIT(V_CCOPT, V_INCLS)
+-
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_MAKE_SET
+@@ -43,13 +41,12 @@
+ dnl check for the IPv6 routines inet_pton
+ AC_CHECK_FUNCS(inet_pton)
+ 
+-AC_MSG_CHECKING(how to print unsigned long long)
+-AC_SUBST(FS_ULL)
+ dnl AC_TRY_RUN is a test program that performs a run-time test to find out
+ dnl the correct syntax to print unsigned long long ints in printf stmts.
+ dnl If strcmp returns 0, we are on an enironment that uses %llu, otherwise
+ dnl we are on a MacOSX environment that uses %qu
+-AC_TRY_RUN([
++AC_CACHE_CHECK([how to print unsigned long long], ac_cv_unsigned_long_long_printf_format,
++  [AC_TRY_RUN([
+ #include <stdio.h>
+ 
+ #define NIX "%llu"
+@@ -63,11 +60,17 @@
+      exit (0);
+   else
+      exit (1);
+-}],
+-AC_DEFINE(USE_LLU)
+-AC_MSG_RESULT(%llu), 
+-AC_MSG_RESULT(%qu),
+-AC_MSG_ERROR(can not run test program while cross compiling))
++}
++    ],
++    ac_cv_unsigned_long_long_printf_format=%llu,
++    ac_cv_unsigned_long_long_printf_format=%qu,
++    [AS_ECHO_N(["cross-comiling, assuming "])]
++    ac_cv_unsigned_long_long_printf_format=%llu
++  )]
++)
++AS_IF([test $ac_cv_unsigned_long_long_printf_format = %llu],
++  AC_DEFINE(USE_LLU)
++)
+ 
+ dnl Grab standard includes under weird Linux versions
+ dnl case "$target_os" in
diff --git a/net-analyzer/tcptrace/metadata.xml b/net-analyzer/tcptrace/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/tcptrace/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7-r2.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7-r2.ebuild
new file mode 100644
index 000000000000..c00386bbbde0
--- /dev/null
+++ b/net-analyzer/tcptrace/tcptrace-6.6.7-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="A Tool for analyzing network packet dumps"
+HOMEPAGE="http://www.tcptrace.org/"
+SRC_URI="
+	http://www.tcptrace.org/download/${P}.tar.gz
+	http://www.tcptrace.org/download/old/6.6/${P}.tar.gz
+"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~ppc ppc64 x86"
+IUSE=""
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cross-compile.patch
+	eautoreconf
+	append-cppflags -D_BSD_SOURCE
+}
+
+src_compile() {
+	emake CCOPT="${CFLAGS}"
+}
+
+src_install() {
+	dobin tcptrace xpl2gpl
+
+	newman tcptrace.man tcptrace.1
+	dodoc CHANGES COPYRIGHT FAQ README* THANKS WWW
+}
+
+pkg_postinst() {
+	if ! has_version ${CATEGORY}/${PN}; then
+		elog "Note: tcptrace outputs its graphs in the xpl (xplot)"
+		elog "format. Since xplot is unavailable, you will have to"
+		elog "use the included xpl2gpl utility to convert it to"
+		elog "the gnuplot format."
+	fi
+}
diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.ebuild
new file mode 100644
index 000000000000..e65a749553be
--- /dev/null
+++ b/net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils flag-o-matic versionator
+
+TT_DEB_MAJOR=$(get_version_component_range 4)
+TT_DEB_MAJOR=${TT_DEB_MAJOR/p}
+TT_DEB_MINOR=$(get_version_component_range 5)
+TT_DEB_MINOR=${TT_DEB_MINOR/p}
+TT_VER=$(get_version_component_range 1-3)
+
+DESCRIPTION="A Tool for analyzing network packet dumps"
+HOMEPAGE="http://www.tcptrace.org/"
+SRC_URI="
+	http://www.tcptrace.org/download/${PN}-${TT_VER}.tar.gz
+	http://www.tcptrace.org/download/old/6.6/${PN}-${TT_VER}.tar.gz
+	mirror://debian/pool/main/t/${PN}/${PN}_${TT_VER}-${TT_DEB_MAJOR}.${TT_DEB_MINOR}.diff.gz
+"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DEPEND="
+	net-libs/libpcap
+"
+RDEPEND="
+	${DEPEND}
+"
+
+S=${WORKDIR}/${PN}-${TT_VER}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-${TT_VER}-cross-compile.patch
+	eapply "${WORKDIR}"/${PN}_${TT_VER}-${TT_DEB_MAJOR}.${TT_DEB_MINOR}.diff
+
+	eapply_user
+
+	append-cppflags -D_DEFAULT_SOURCE
+
+	eautoreconf
+}
+
+src_compile() {
+	emake CCOPT="${CFLAGS}"
+}
+
+src_install() {
+	dobin tcptrace xpl2gpl
+
+	newman tcptrace.man tcptrace.1
+	dodoc CHANGES COPYRIGHT FAQ README* THANKS WWW
+}
+
+pkg_postinst() {
+	if ! has_version ${CATEGORY}/${PN}; then
+		elog "Note: tcptrace outputs its graphs in the xpl (xplot)"
+		elog "format. Since xplot is unavailable, you will have to"
+		elog "use the included xpl2gpl utility to convert it to"
+		elog "the gnuplot format."
+	fi
+}
diff --git a/net-analyzer/tcptraceroute/Manifest b/net-analyzer/tcptraceroute/Manifest
new file mode 100644
index 000000000000..bf461519393a
--- /dev/null
+++ b/net-analyzer/tcptraceroute/Manifest
@@ -0,0 +1,6 @@
+AUX tcptraceroute-1.5_beta7-cross-compile-checks.patch 1228 SHA256 67b49d5f253b652bc91d37b3ce14dd6da267d99a379ce2972275cdb89bd64efc SHA512 a994d9d0dfd633fd9f091c77a0ca96b0b73dc9a7373631feece29fef3f3daeb38dddf7fc6fc829c64cb8eb3809d7e25d22f3c18d2202188df9d94ca237601815 WHIRLPOOL e8cec2e13d7d7953df2a71205acb6bbfdd7155e4be10573cb27d1c3a0dea16bfd7dbacc087d8bfd714cd0903e31d2040bf2b90ec122e668726e6f364516b8fe8
+DIST tcptraceroute-1.5_beta7.tar.gz 119059 SHA256 57fd2e444935bc5be8682c302994ba218a7c738c3a6cae00593a866cd85be8e7 SHA512 ad5588e62a56f1b5fa851b68280a88e66a900777fe4fd67587262245cd9da17b536b7dc972abe540fc124a93ac76abcabbc55bc32f9f8ee872d5df57b08f7222 WHIRLPOOL 2686f753a665e1ba704adfc778e158a0465badaa4f9b7bb26b9d58da7e892522766e8eedbc1faf868d5c7474dca84cc83b018a46e5ac704f9708ec62ca07f05c
+EBUILD tcptraceroute-1.5_beta7-r2.ebuild 953 SHA256 f40976706aaaa878fef6f12b49b03588dcaff2da004c08376a4aae7c0c0d9319 SHA512 6d58e44dd448e0733aa3c091684fd2405390abaaf193ed948d445e09e4a30c25272e92f98030df9b892968ca06151c2f4cb248c432dd50a01f8c0f097ddf4dce WHIRLPOOL f79a359513ab56b52d1e4866389c64fc55b5d009f36d7afb36520d3a4189a566b97120247786996f3e26db854eb49bfcf7013f4f1e6078083c156fbb07c4f390
+MISC ChangeLog 2914 SHA256 fdfe6c0b1dbe2b77904b728eb8aba4721a7a07225380967ad3b44d96814fe951 SHA512 fc454e7a2fe21dfe019d22b7b6cc9731e4c80c75aac8695d7e3c39a92b59ed5cdf4b725018a70cd6172c9f7eaf1c466bd0c8717a2af2d79950ddfa578b5bc472 WHIRLPOOL d524317cd9ffa4dc2369f20708da9ee3c443aa2bcc3428bb2b6bf40d47509c6ef0032368fa01676695ab16d85b8c9209d7b2da7c508cd576306755a14c7b1472
+MISC ChangeLog-2015 7446 SHA256 2611a6a0b2464c642d8b45296d6eafa12ffa77bc4a351784dd15a33b6eaa3dcf SHA512 969de2fe848a634b948b01a4b42baf9dea76ce03dfd2c5850661166fc0ade4f4cee77de456e3605bc43d19021dfbcb0a8861c8ce6776d4b8008a6bc4344b7df7 WHIRLPOOL 7c289d436f320dc5e7c914f64ad3f99b938e57297800b5da2b56cca918bf845db3a32fbbc3efcdf1348e7be426468e9724feaf3ad82ed5e7248de16ac415692e
+MISC metadata.xml 362 SHA256 7ec741d19670447b29c0414f5d9db0f478bbc08ec8e70f491fd81e711dc4146e SHA512 783a1867b40907e8704e19ec6d423f4db8a97ba683f64efc72ea7bf4e4157e9bf630470fcf8a0410d6fa9bc5cf63f810f1f577828bdfe1203f2f56e55458c7cf WHIRLPOOL 2d0897ed98943869dd06c95134c5242758e8c082950cc946cc94d7821ec9e4da528755e8f26f9763a0b4e400882b284e24d91717e8de940e4f664c89c7b6ff7a
diff --git a/net-analyzer/tcptraceroute/files/tcptraceroute-1.5_beta7-cross-compile-checks.patch b/net-analyzer/tcptraceroute/files/tcptraceroute-1.5_beta7-cross-compile-checks.patch
new file mode 100644
index 000000000000..469f57d4add7
--- /dev/null
+++ b/net-analyzer/tcptraceroute/files/tcptraceroute-1.5_beta7-cross-compile-checks.patch
@@ -0,0 +1,62 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -148,11 +148,9 @@
+ 
+ # Is this Solaris?
+ AC_MSG_CHECKING(for Solaris)
+-AC_RUN_IFELSE([AC_LANG_PROGRAM( [], [
+-#if defined (__SVR4) && defined (__sun)
+-	exit(0);
+-#else
+-	exit(-1);
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM( [], [
++#if ! ( defined (__SVR4) && defined (__sun) )
++#error "Not Solaris"
+ #endif
+ 		])
+ 	],[
+@@ -165,11 +163,9 @@
+ 
+ # Is this BSDI?
+ AC_MSG_CHECKING(for BSDI)
+-AC_RUN_IFELSE([AC_LANG_PROGRAM( [], [
+-#if defined (__bsdi__)
+-	exit(0);
+-#else
+-	exit(-1);
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM( [], [
++#if ! defined (__bsdi__)
++#error "Not BSDI"
+ #endif
+ 		])
+ 	],[
+@@ -182,11 +178,9 @@
+ 
+ # Is this NetBSD?
+ AC_MSG_CHECKING(for NetBSD)
+-AC_RUN_IFELSE([AC_LANG_PROGRAM( [], [
+-#if defined (__NetBSD__)
+-	exit(0);
+-#else
+-	exit(-1);
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM( [], [
++#if ! defined (__NetBSD__)
++#error "Not NetBSD";
+ #endif
+ 		])
+ 	],[
+@@ -199,11 +193,9 @@
+ 
+ # Is this MacOS X?
+ AC_MSG_CHECKING(for MacOS X)
+-AC_RUN_IFELSE([AC_LANG_PROGRAM( [], [
+-#if defined (__APPLE__) && defined (__MACH__)
+-	exit(0);
+-#else
+-	exit(-1);
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM( [], [
++#if ! ( defined (__APPLE__) && defined (__MACH__) )
++#error "Not Mac OS X"
+ #endif
+ 		])
+ 	],[
diff --git a/net-analyzer/tcptraceroute/metadata.xml b/net-analyzer/tcptraceroute/metadata.xml
new file mode 100644
index 000000000000..027df8340d8d
--- /dev/null
+++ b/net-analyzer/tcptraceroute/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mct/tcptraceroute</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r2.ebuild b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r2.ebuild
new file mode 100644
index 000000000000..d2c90c2dc80e
--- /dev/null
+++ b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+MY_P=${P/_beta/beta}
+
+DESCRIPTION="tcptraceroute is a traceroute implementation using TCP packets"
+HOMEPAGE="https://github.com/mct/tcptraceroute"
+SRC_URI="https://codeload.github.com/mct/${PN}/tar.gz/${MY_P} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+DEPEND="
+	net-libs/libnet:1.1
+	net-libs/libpcap
+"
+RDEPEND="${DEPEND}"
+
+# michael.toren.net is no longer available
+RESTRICT="test"
+
+S=${WORKDIR}/${PN}-${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cross-compile-checks.patch
+	eautoreconf
+}
+
+src_install() {
+	dosbin tcptraceroute
+	fowners root:wheel /usr/sbin/tcptraceroute
+	fperms 4710 /usr/sbin/tcptraceroute
+	doman tcptraceroute.1
+	dodoc examples.txt README ChangeLog
+	dohtml tcptraceroute.1.html
+}
diff --git a/net-analyzer/tcptrack/Manifest b/net-analyzer/tcptrack/Manifest
new file mode 100644
index 000000000000..0a81eff42f63
--- /dev/null
+++ b/net-analyzer/tcptrack/Manifest
@@ -0,0 +1,6 @@
+AUX tcptrack-1.4.2-tinfo.patch 389 SHA256 a7875d35ed2f71f19487b475baeec44341e05332df183a0ca9895c9b60d8af8f SHA512 d10afdbeba9ebe5af6521a349fa557634ccd8f57a85bfa797fccc6e6b07188b67c200c9a75d0556d8ad54b18153e3b004d07f418a0b771867fcd097f4fad09fd WHIRLPOOL ad74517c4693bbb514a21a427829a5c3f6777dce6fc4c7e7b5cf1bfd6dde8bbc44eda2d9b19cf0bcfd1c48ba516777fdaf0e8afc2fedc800f45bddcf7a6b1c48
+DIST tcptrack-1.4.2.tar.gz 120569 SHA256 6607b1e1c778c49d3e8795e119065cf66eb2db28b3255dbc56b1612527107049 SHA512 a15e22b2d7cc144b2f3c662b6e289fe28b538188d234b262d801d4212027446534c9981ef9f2a48125657fa87a367c748a9d98e86b5f38f865a47dd24d478f89 WHIRLPOOL d957d588b54970db9f6da0f35eed3b9542fa374bccbb995c39525b57de37fb757b76ba1a24e6b3208f654316ab74b0552e6c588c68a11e3461e0f7f81d71dfdd
+EBUILD tcptrack-1.4.2.ebuild 608 SHA256 3954d876081b3a3a3ae15c87b233c396ba3d163c857228a7e7db4ec85a8c92e3 SHA512 279c36f11821cada854acd08adfa70a10e280d29602db9d0fb1846eb4e1605fc9d9ec5dc63e9eae8efc9b43152d5c5ad1c48714c97d63ffe0dc12b2a5c6d0a2d WHIRLPOOL d5a4f88e41289a2ee830064c0b53e67fd5dc86a8bde93828aa0852b48e4ba919bd3b1169e3947707aa04eff73f369195b50d4e2ea287b35ecb857efcd5e03246
+MISC ChangeLog 2469 SHA256 3900d310b8cf3d30697c31ead61342b4fd187252df89f982cafb82536d6defe2 SHA512 da53db0c62fe6ffae4588e6b06c0f9ec3a008306188082fc104ec9b35dadc09d449824f77a2efbaa012e53234244df70e43830ae740e7a6877beadff6ce0f11e WHIRLPOOL d9101d1f502c1c4b5690bab22c60b7edc21ceb01602e5e2f791e59c1a39076e549aa2acfca832518048e9bf807014d51e31af90129645d1e066bc772c8953d73
+MISC ChangeLog-2015 3424 SHA256 61f3663d975118f45a62e308fe1683231ecbe2fead6a2e40a168262a03b62f54 SHA512 afddfef060ce3694df90f4991bff87290636327506a3e6180aef0bdca2cb43880b8ec1b6429b0f0d45f477959180fece6126696ef3017878cd56506e05dca162 WHIRLPOOL d3d3510391eb025b1ef780c8c9d0414e175d6a821fff7435c65f65bb786ffe6a90e3e8e86375b246b8b7b72b83d80e2fa201219ececdf871fd100c364cc87488
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/tcptrack/files/tcptrack-1.4.2-tinfo.patch b/net-analyzer/tcptrack/files/tcptrack-1.4.2-tinfo.patch
new file mode 100644
index 000000000000..fe23b48221ec
--- /dev/null
+++ b/net-analyzer/tcptrack/files/tcptrack-1.4.2-tinfo.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -26,7 +26,7 @@
+ AC_CHECK_LIB(socket,gethostbyname)
+ AC_CHECK_LIB(nsl,gethostbyname)
+ AC_CHECK_LIB(nsl,inet_addr)
+-AC_CHECK_LIB(ncurses, initscr)
++PKG_CHECK_MODULES(ncurses,ncurses,LIBS="$LIBS $ncurses_LIBS",AC_MSG_ERROR([ncurses is required]))
+ AC_CHECK_LIB(pcap, pcap_open_live)
+ AC_CHECK_LIB(pthread, pthread_create)
+ AC_CHECK_LIB(rt, nanosleep)
diff --git a/net-analyzer/tcptrack/metadata.xml b/net-analyzer/tcptrack/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/tcptrack/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/tcptrack/tcptrack-1.4.2.ebuild b/net-analyzer/tcptrack/tcptrack-1.4.2.ebuild
new file mode 100644
index 000000000000..235ac5dff8d2
--- /dev/null
+++ b/net-analyzer/tcptrack/tcptrack-1.4.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Passive per-connection tcp bandwidth monitor"
+HOMEPAGE="http://www.rhythm.cx/~steve/devel/tcptrack/"
+SRC_URI="http://www.rhythm.cx/~steve/devel/tcptrack/release/${PV}/source/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+
+DEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses
+"
+RDEPEND="
+	${DEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+	sed -i src/Makefile.am -e 's| -Werror||g' || die
+	eautoreconf
+}
diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
new file mode 100644
index 000000000000..9c70ce453038
--- /dev/null
+++ b/net-analyzer/testssl/Manifest
@@ -0,0 +1,6 @@
+DIST testssl-2.8.tar.gz 8529038 SHA256 2e4588bfcd5f4e6b30b2e250d51b39e4209131a5366f1e75354aaa4a5ee6a22d SHA512 9c30a0640c4c516bb6fd776d6d7d76af4f86be51ec2c282fad01b8ac14161d29732caf08ed64a0a93ad53c3afabe6641f423bc73f0323bd9526a4283fccad584 WHIRLPOOL 04564912e3e0ed3afac283da994edc032bc3b23c2c003ea02f531da25555dbb758f76e8ab04be38c6af8df340f7400545072f33dbb074586144bc2258d0de5e0
+DIST testssl-2.9.5.tar.gz 8955393 SHA256 3cd2d14b9b324545ff91d63e4261113f6ff0c6e32232cf49438b9fd2f3c8de3e SHA512 9b9cc9f4e5d85cb2bd3767f10d0342b65cd9662df2df4d21b838c8f6a904e8e91f0242e7be1a9e0d9532d13d210beacd1b9f189ba6f955f9c4d3a6bde675677c WHIRLPOOL faa158a05c8523df1e4142bf1838f4049d7ed9c9a2afbe2a97e190f19c5ab2efce878fb92e50665657e8cbf6a1abdfb2958b0ad142e2bc86e30a8bb672146968
+EBUILD testssl-2.8.ebuild 1396 SHA256 567ab64b38a034acd0bdb5c026e23f92f12fd5f1b96f04190c190866265be982 SHA512 51b485f25fb9448a510455b4aa8172b7f046fd3f15c9494d019d3f1e14816a9c9a996d7c9c7de3a7464288fabb532a642f1c8c846d380eb2b6e7f27c2906c8e0 WHIRLPOOL 97cadbbf78c63151e6014011784e4969199e527d17c5a20390ee0343f72b1bfe2a11144caf041680ba911567fde99b6aeadbbbcf609026a8950ef0e137a940f3
+EBUILD testssl-2.9.5.ebuild 1427 SHA256 53ea4c0958e7eb2730f7bcea9ee0d7af44ec617c31923bd56f322c7099c22b9c SHA512 5f41a1393afa10fafb1960006ed963953dbe90697d3044dd1e3a1e072f8df42b318820782b12fa720b1e6e00d4f0b0977194e17451ac88f7fcc1656a4ed3a49a WHIRLPOOL 6148fb2224537f215a24bb528f4612cd71f9cca15ba582a32e03165954a0476e99d2db860306362733f4725bfd283f22ddccac72238adc4c08b23d47cc37df24
+MISC ChangeLog 1148 SHA256 7387784a88de13fdaa0b09fff1f8d255729ccf8f1ddb121cca07067456366794 SHA512 ed6bdfab18a0d4898c7e6afde0842f3b635695dba2f6f0846534f64427fc52418b8b6d27e8fb0b5ed2f448e77e7cd4e4c21a2bd50a2c43319a011800df7a715b WHIRLPOOL 862e19b7e63c9976375077622e2bedaa06937dd7c66504ad6c7b19ebb2a438eb7d0da2c213ebd3a3cb7109943e2dff7ac0f46f19387fd5856ca59c2a04c0a7d6
+MISC metadata.xml 427 SHA256 f9e642a1c5ece37509373afb6e8152c0d516d8fa0802872dcd50a9cdf1870aa9 SHA512 83dacfa2293a8f14bce97a01f732376e76f84c4eb4fffbed1049b08210850cc5b54381d83df15bec2ecc1c1a592148d538ac37053b36fa1022542e023a97d9ab WHIRLPOOL fdff73ccb431fb2fabad3186df41206a875de7d98c518bcee26bb16a141e4f4f9dec343dfef484d2f1649542755defc40096ef632116826642d06d90c388f743
diff --git a/net-analyzer/testssl/metadata.xml b/net-analyzer/testssl/metadata.xml
new file mode 100644
index 000000000000..ffc44aeef678
--- /dev/null
+++ b/net-analyzer/testssl/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>kensington@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="bundled-openssl">Install precompiled versions of OpenSSL for greater testing coverage</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">drwetter/testssl.sh</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/testssl/testssl-2.8.ebuild b/net-analyzer/testssl/testssl-2.8.ebuild
new file mode 100644
index 000000000000..20712e46f347
--- /dev/null
+++ b/net-analyzer/testssl/testssl-2.8.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN}.sh"
+
+DESCRIPTION="Tool to check TLS/SSL cipher support"
+HOMEPAGE="https://testssl.sh/"
+SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 bundled-openssl? ( openssl )"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="bundled-openssl"
+
+RDEPEND="
+	dev-libs/openssl:0
+	net-dns/bind-tools
+	sys-apps/util-linux
+	sys-libs/ncurses:0
+	sys-process/procps
+"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+QA_PREBUILT="opt/${PN}/*"
+
+pkg_setup() {
+	use amd64 && BUNDLED_OPENSSL="openssl.Linux.x86_64"
+}
+
+src_prepare() {
+	default
+	sed -i -e "s|MAPPING_FILE_RFC=\"\"|MAPPING_FILE_RFC=\"/usr/share/${PN}/mapping-rfc.txt\"|" ${PN}.sh || die
+}
+
+src_install() {
+	dodoc CHANGELOG.stable-releases.txt CREDITS.md Readme.md
+	dodoc openssl-rfc.mappping.html
+
+	dobin ${PN}.sh
+
+	insinto /usr/share/${PN}
+	doins etc/mapping-rfc.txt
+
+	if use bundled-openssl; then
+		exeinto /opt/${PN}
+		use amd64 && doexe bin/${BUNDLED_OPENSSL}
+	fi
+}
+
+pkg_postinst() {
+	if use bundled-openssl; then
+		einfo "A precompiled version of OpenSSL has been installed into /opt/${PN},"
+		einfo "configured to enable a wider range of features to allow better testing."
+		einfo ""
+		einfo "To use it, call ${PN} appropriately:"
+		einfo "${MY_PN} --openssl /opt/${PN}/${BUNDLED_OPENSSL} example.com"
+	fi
+}
diff --git a/net-analyzer/testssl/testssl-2.9.5.ebuild b/net-analyzer/testssl/testssl-2.9.5.ebuild
new file mode 100644
index 000000000000..c6ac1f8ddd28
--- /dev/null
+++ b/net-analyzer/testssl/testssl-2.9.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN}.sh"
+
+DESCRIPTION="Tool to check TLS/SSL cipher support"
+HOMEPAGE="https://testssl.sh/"
+SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 bundled-openssl? ( openssl )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="bundled-openssl"
+
+RDEPEND="
+	dev-libs/openssl:0
+	net-dns/bind-tools
+	sys-apps/util-linux
+	sys-libs/ncurses:0
+	sys-process/procps
+"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+QA_PREBUILT="opt/${PN}/*"
+
+pkg_setup() {
+	use amd64 && BUNDLED_OPENSSL="openssl.Linux.x86_64"
+}
+
+src_prepare() {
+	default
+	sed -i ${PN}.sh \
+		-e 's|TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"|TESTSSL_INSTALL_DIR="/"|' \
+		-e 's|$TESTSSL_INSTALL_DIR/etc/|&testssl/|g' || die
+}
+
+src_install() {
+	dodoc CHANGELOG.stable-releases.txt CREDITS.md Readme.md
+	dodoc openssl-rfc.mappping.html
+
+	dobin ${PN}.sh
+
+	insinto /etc/${PN}
+	doins etc/*
+
+	if use bundled-openssl; then
+		exeinto /opt/${PN}
+		use amd64 && doexe bin/${BUNDLED_OPENSSL}
+	fi
+}
+
+pkg_postinst() {
+	if use bundled-openssl; then
+		einfo "A precompiled version of OpenSSL has been installed into /opt/${PN},"
+		einfo "configured to enable a wider range of features to allow better testing."
+		einfo ""
+		einfo "To use it, call ${PN} appropriately:"
+		einfo "${MY_PN} --openssl /opt/${PN}/${BUNDLED_OPENSSL} example.com"
+	fi
+}
diff --git a/net-analyzer/thc-ipv6/Manifest b/net-analyzer/thc-ipv6/Manifest
new file mode 100644
index 000000000000..1704e7d1e687
--- /dev/null
+++ b/net-analyzer/thc-ipv6/Manifest
@@ -0,0 +1,14 @@
+AUX thc-ipv6-2.1-Makefile.patch 1233 SHA256 f2cfd2d88f3940d503ed419af1696cf87d62e5e5c1df426b8f66ab49e0907d82 SHA512 14880d1982e935eba874c87fb7bab7859246d4ba1539e3cbfc06fe5850c3076f99d4bdd59cd968e7d5c1386062c4a081f3a0a11d61e9f66ea90177e78c22e307 WHIRLPOOL 019bf64e6fcd81b615f99256cbadc1c0a7a746352222474aac90bf3e431f420de3015f8ae3465014095be16d0615996e01927d287e58b5080a4158f09e34ca57
+AUX thc-ipv6-3.0-Makefile.patch 465 SHA256 c6a0398d6aaeb64fc0ee6e720bd4467bafec981590c84d15c2ba596dff2b98c7 SHA512 2a0a0d21ad3147a772df5a52ea425edbf2681256240e3570976268b5d9cf19f315a014b304932161219813c65dff95a2644070383121595ec3f2adabbb116093 WHIRLPOOL 9bef7e879a02946c75669ddff4e3821f0565f1f02f02848cb937dc8da394058b38798dff15e9304f88eec1a6effe13c197501d415309cd7cf6b3451125daa73a
+DIST thc-ipv6-2.3.tar.gz 176918 SHA256 d1e8a3f295931fdc89e200da3c171b9e4922029cc55d11faece9b776ba2fd10a SHA512 d4eff19a0a87ca828d7cf06e9ef9c1e542c0a527949681d08730445e40e90608aaebf778b8ab1cd8d3adeb44fb8cac79607e27704baddf703355a0058ebce4a8 WHIRLPOOL c28369468390ded2421a897b1cff4a52517dcd28d490e1859eaa34a202d6a5715ac30369a423c0ea21e899526db75afbfa2c3c46ebf5a59503fcbe0f9fb07b45
+DIST thc-ipv6-2.5.tar.gz 262015 SHA256 52120bee2da3d25820f021b5c4d6fc79e220e685e2a505b74b48046b608cba8c SHA512 7fc2dda9d83d25c61b3dc8576679e06866fd1144ca39d5e0b43bbd3c4da2583ec37ca901a43a817bdeec19226d3e252624d684f31bc7e94e08bdd811d5fb5466 WHIRLPOOL b4199d2e4443e48c8e44aa1c060b2d5b010a62abcd66bcb77b632d7b91e02272bf7720ed63331a4e9872d5e00157b3d6aff5ec332d27b12450aeb34058513bfe
+DIST thc-ipv6-2.7.tar.gz 661592 SHA256 440a3ae98b57100c397ec4f8634468dbbb0c3b48788c6b74af2a597a90544a96 SHA512 0863ff36109e048a45ec220b98f0e2cf62b7214edcab4afa27a89fc5c0e41469f7e5733efeb56ed0d00cffcf57ceed3d7d32d813e8081d39f1a21e2646e0a0f3 WHIRLPOOL 3c84be3bdb184cc059aabbd13032e6a0b83369f77eda4702277a79cafdadda1f29e43b8613b56e357d1c0e368f1e4df489b7ad3ee18ca6d5796c6a5098726f65
+DIST thc-ipv6-3.0.tar.gz 667859 SHA256 cec2db604e3fe59f26ddc42632d858f53660ef5d6e25d6a7e90ed927f6826102 SHA512 969ebbf4da4514cb83e3abcff637f7ba301c4f072f1f983b3cd3cfd3b0643b55af6eacca3c76e39e11ea9ef6e465be03dfa7ce1d6c988cabbd42cdd95d1e2552 WHIRLPOOL 73ceec5c8c6dc995225cecf4c12d083e5fb13fc3f09138ba716089bd97f662f726902c711852f9bb69cc01adb4a8aa6500d9a7be1d6af3daf38d787bae4137cd
+EBUILD thc-ipv6-2.3.ebuild 776 SHA256 d7cc8756c7c7f39cb806b38b3e70868fa00eb253c7619d8902bd957d89a98ebe SHA512 9f5c13cc7553c95652e6171ea32924a073af5949a616179c1571e35d9f6224728ab39df431a8ea7e9140babcfc94cc00a4025109debc501897cb03d5e47d3911 WHIRLPOOL a3124b4b5082447087ce2a18cf7784cbdfbbf851039e4314b12fac1b3a4e36d5f3b6d4af692b6eb6c55184c83a2960a7dc932c9511169e13cf0b31a797cf949c
+EBUILD thc-ipv6-2.5.ebuild 777 SHA256 4da21e0b52301f6b7ac0bc57156c30b542dc67fd966c393fa7990903700c4abd SHA512 67af189268fe5e6fbb99cd6dc31d54706890ecba5ee8ba33dd5010a1fe7fd152c7fd9315725b2f0ac713ad683bac846cfb36f46ed98331b4f5e40156928cc3f5 WHIRLPOOL a995f4ec0321441d1095317d221070cc88c4a5dcb754c285dc244559196c9bc668d9aa19a4ca06ee3f71b4831549dccd38ccb72721cc75b7cf1af1c94c06f516
+EBUILD thc-ipv6-2.7.ebuild 777 SHA256 4da21e0b52301f6b7ac0bc57156c30b542dc67fd966c393fa7990903700c4abd SHA512 67af189268fe5e6fbb99cd6dc31d54706890ecba5ee8ba33dd5010a1fe7fd152c7fd9315725b2f0ac713ad683bac846cfb36f46ed98331b4f5e40156928cc3f5 WHIRLPOOL a995f4ec0321441d1095317d221070cc88c4a5dcb754c285dc244559196c9bc668d9aa19a4ca06ee3f71b4831549dccd38ccb72721cc75b7cf1af1c94c06f516
+EBUILD thc-ipv6-3.0.ebuild 1130 SHA256 dc43da7607c54ac3828549eae05d456b580de964c97ef892b66289634221c3cf SHA512 ef2f809e3348f222fe2f01d81202f26a4d119209256ab6d27148c98f04bd896740b54397ff64d60b4af7eee36d20a906ceef831d14a0d567e951cf9f2e78fe1a WHIRLPOOL 8585b0d83e95bb2a39072d9d1b7b85a2dbe33ae31f8b725d943f25211b8850dd4ec6393065b9fd778afbe7fae80c960983a85df01449a7b545aea9791e9698ab
+EBUILD thc-ipv6-9999.ebuild 1130 SHA256 dc43da7607c54ac3828549eae05d456b580de964c97ef892b66289634221c3cf SHA512 ef2f809e3348f222fe2f01d81202f26a4d119209256ab6d27148c98f04bd896740b54397ff64d60b4af7eee36d20a906ceef831d14a0d567e951cf9f2e78fe1a WHIRLPOOL 8585b0d83e95bb2a39072d9d1b7b85a2dbe33ae31f8b725d943f25211b8850dd4ec6393065b9fd778afbe7fae80c960983a85df01449a7b545aea9791e9698ab
+MISC ChangeLog 3014 SHA256 7e9b8b431085ac11b0dc52eab8c18a80e0f994a0471aafa84b2d59f00c2b64a1 SHA512 0436f16d9643f42680a527cfb64004d36cb5e2e1626f340a307a33445c04be0147e5deb294eb8c4956feee719dace80cbb771269445f915460c80e72906d31db WHIRLPOOL cbe5261c341cf17dd2132f01a1378eda450be708e25e324ebf1077a86a5bd4cda960773f9c9b65a28a6d520b941523644b7dec34c7fa6e31d4ba090d917608de
+MISC ChangeLog-2015 2352 SHA256 7c1b465110c402ec778d3c529342b35bc6f2f71458df80979c48d83d445c252c SHA512 7ecb1282a512d07bf51c165e0b478f502dd8c91c8d92eba8477939a660ec94d3a479a009b490851faad266df028626fc900a65b058a52534868681d9a2a822b2 WHIRLPOOL 4e12783c9a123ff15e35638363a885853aee456ff742b7a1b41a0172a61e651a83343d0c6e921fdbd3d7b776e66bec6783e14dadff98d0aac95957e30584fedc
+MISC metadata.xml 237 SHA256 ffb571839c57797d282263369646d2bba2662601a45f7bb3251bb97f716554a6 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f WHIRLPOOL 60d6da846c983457e038ea5ba3c0bf48f939c9586610985a14cac9772fd1d45d781a643abc16482f232f3028e44fe99fe1a382deaebf6589602fc244a4460e3f
diff --git a/net-analyzer/thc-ipv6/files/thc-ipv6-2.1-Makefile.patch b/net-analyzer/thc-ipv6/files/thc-ipv6-2.1-Makefile.patch
new file mode 100644
index 000000000000..d7b42147ae1e
--- /dev/null
+++ b/net-analyzer/thc-ipv6/files/thc-ipv6-2.1-Makefile.patch
@@ -0,0 +1,24 @@
+--- thc-ipv6-2.1/Makefile
++++ thc-ipv6-2.1/Makefile
+@@ -4,7 +4,7 @@
+ 
+ CC=gcc
+ #CFLAGS=-g
+-CFLAGS=-O2
++CFLAGS?=-O2
+ CFLAGS+=$(if $(HAVE_SSL),-D_HAVE_SSL,)
+ LDFLAGS+=-lpcap $(if $(HAVE_SSL),-lssl -lcrypto,)
+ PROGRAMS=parasite6 dos-new-ip6 detect-new-ip6 fake_router6 fake_advertise6 fake_solicitate6 fake_mld6 fake_mld26 fake_mldrouter6 flood_mldrouter6 fake_mipv6 redir6 smurf6 alive6 toobig6 rsmurf6 implementation6 implementation6d sendpees6 sendpeesmp6 randicmp6 fuzz_ip6 flood_mld6 flood_mld26 flood_router6 flood_advertise6 flood_solicitate6 trace6 exploit6 denial6 fake_dhcps6 flood_dhcpc6 fake_dns6d fragmentation6 kill_router6 fake_dnsupdate6 ndpexhaust6 detect_sniffer6 dump_router6 fake_router26 flood_router26 passive_discovery6 dnsrevenum6 inverse_lookup6 node_query6 address6 covert_send6 covert_send6d inject_alive6 firewall6 ndpexhaust26 fake_pim6
+@@ -17,10 +17,10 @@
+ all:	$(LIBS) $(PROGRAMS) dnssecwalk dnsdict6 thcping6
+ 
+ dnssecwalk:	dnssecwalk.c
+-	$(CC) $(CFLAGS) -o $@ $^
++	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+ 
+ dnsdict6:	dnsdict6.c
+-	$(CC) $(CFLAGS) -o $@ $^ -lpthread -lresolv
++	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) -lpthread -lresolv
+ 
+ thcping6:	thcping6.c $(LIBS)
+ 	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) -lrt
diff --git a/net-analyzer/thc-ipv6/files/thc-ipv6-3.0-Makefile.patch b/net-analyzer/thc-ipv6/files/thc-ipv6-3.0-Makefile.patch
new file mode 100644
index 000000000000..43b72eeb9069
--- /dev/null
+++ b/net-analyzer/thc-ipv6/files/thc-ipv6-3.0-Makefile.patch
@@ -0,0 +1,11 @@
+diff -Nuar thc-ipv6-3.0.orig/Makefile thc-ipv6-3.0/Makefile
+--- thc-ipv6-3.0.orig/Makefile	2015-10-13 20:17:34.000000000 -0700
++++ thc-ipv6-3.0/Makefile	2016-11-18 15:57:57.577946828 -0800
+@@ -19,5 +19,5 @@
+ dnssecwalk:	dnssecwalk.c
+-	$(CC) $(CFLAGS) $(STATIC) -o $@ $^
++	$(CC) $(CFLAGS) $(STATIC) -o $@ $^ $(LDFLAGS)
+ 
+ dnsdict6:	dnsdict6.c
+-	$(CC) $(CFLAGS) $(STATIC) -o $@ $^ -lpthread -lresolv
++	$(CC) $(CFLAGS) $(STATIC) -o $@ $^ $(LDFLAGS) -lpthread -lresolv
diff --git a/net-analyzer/thc-ipv6/metadata.xml b/net-analyzer/thc-ipv6/metadata.xml
new file mode 100644
index 000000000000..a535b8852829
--- /dev/null
+++ b/net-analyzer/thc-ipv6/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-2.3.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-2.3.ebuild
new file mode 100644
index 000000000000..0cf3cf3241d1
--- /dev/null
+++ b/net-analyzer/thc-ipv6/thc-ipv6-2.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6"
+HOMEPAGE="http://freeworld.thc.org/thc-ipv6/"
+SRC_URI="http://freeworld.thc.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-3 openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+DEPEND="net-libs/libpcap
+	ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.1-Makefile.patch
+	if ! use ssl ; then
+		sed -e '/^HAVE_SSL/s:^:#:' \
+			-i Makefile
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" STRIP="true" install
+	dodoc CHANGES HOWTO-INJECT README
+}
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-2.5.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-2.5.ebuild
new file mode 100644
index 000000000000..4b3cd8777b52
--- /dev/null
+++ b/net-analyzer/thc-ipv6/thc-ipv6-2.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6"
+HOMEPAGE="http://freeworld.thc.org/thc-ipv6/"
+SRC_URI="http://freeworld.thc.org/releases/${P}.tar.gz"
+
+LICENSE="AGPL-3 openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+DEPEND="net-libs/libpcap
+	ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.1-Makefile.patch
+	if ! use ssl ; then
+		sed -e '/^HAVE_SSL/s:^:#:' \
+			-i Makefile
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" STRIP="true" install
+	dodoc CHANGES HOWTO-INJECT README
+}
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-2.7.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-2.7.ebuild
new file mode 100644
index 000000000000..4b3cd8777b52
--- /dev/null
+++ b/net-analyzer/thc-ipv6/thc-ipv6-2.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6"
+HOMEPAGE="http://freeworld.thc.org/thc-ipv6/"
+SRC_URI="http://freeworld.thc.org/releases/${P}.tar.gz"
+
+LICENSE="AGPL-3 openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+DEPEND="net-libs/libpcap
+	ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.1-Makefile.patch
+	if ! use ssl ; then
+		sed -e '/^HAVE_SSL/s:^:#:' \
+			-i Makefile
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" STRIP="true" install
+	dodoc CHANGES HOWTO-INJECT README
+}
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-3.0.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-3.0.ebuild
new file mode 100644
index 000000000000..5151e3d3ceca
--- /dev/null
+++ b/net-analyzer/thc-ipv6/thc-ipv6-3.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-ipv6.git"
+EGIT_BRANCH=master
+
+inherit eutils toolchain-funcs ${SCM}
+
+DESCRIPTION="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6"
+HOMEPAGE="https://www.thc.org/thc-ipv6/"
+LICENSE="AGPL-3 openssl"
+SLOT="0"
+IUSE="ssl"
+
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://www.thc.org/releases/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DEPEND="net-libs/libpcap
+	net-libs/libnetfilter_queue
+	ssl? ( dev-libs/openssl:* )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		default_src_unpack
+	else
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.0-Makefile.patch
+	sed -i \
+		-e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \
+		Makefile
+	if ! use ssl ; then
+		sed -e '/^HAVE_SSL/s:^:#:' \
+			-i Makefile
+	fi
+	eapply_user
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" STRIP="true" install
+	dodoc CHANGES HOWTO-INJECT README
+}
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild
new file mode 100644
index 000000000000..5151e3d3ceca
--- /dev/null
+++ b/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-ipv6.git"
+EGIT_BRANCH=master
+
+inherit eutils toolchain-funcs ${SCM}
+
+DESCRIPTION="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6"
+HOMEPAGE="https://www.thc.org/thc-ipv6/"
+LICENSE="AGPL-3 openssl"
+SLOT="0"
+IUSE="ssl"
+
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://www.thc.org/releases/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DEPEND="net-libs/libpcap
+	net-libs/libnetfilter_queue
+	ssl? ( dev-libs/openssl:* )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		default_src_unpack
+	else
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.0-Makefile.patch
+	sed -i \
+		-e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \
+		Makefile
+	if ! use ssl ; then
+		sed -e '/^HAVE_SSL/s:^:#:' \
+			-i Makefile
+	fi
+	eapply_user
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" STRIP="true" install
+	dodoc CHANGES HOWTO-INJECT README
+}
diff --git a/net-analyzer/thcrut/Manifest b/net-analyzer/thcrut/Manifest
new file mode 100644
index 000000000000..f62985c04a3c
--- /dev/null
+++ b/net-analyzer/thcrut/Manifest
@@ -0,0 +1,7 @@
+AUX thcrut-1.2.5-configure.patch 2088 SHA256 74f91be921f1da01ea5c0f544282b3a7fcbf08a50d2470dbe2d48348f88ef0b1 SHA512 0d3e77959f534d3231037c0cb71e602842f19dbbf33864100b854931ceb3b47c95017dc84f5f6b557562c338864f8809e20f96ff7f7fa88dafb930a443056d3a WHIRLPOOL 422d6add78c67d193210239f1c46d4ca0a6e36e285b51f92215c25c5bec985968d473780285e51a61bd2c917965b61cdeaa078d5edeee0866ff12fa4addf8533
+AUX thcrut-1.2.5-libnet.patch 1344 SHA256 0c5baf0c3ae62a576aa4e7b853c7ccf443868a14027899125aa94853d70f3a61 SHA512 412f925820c3aab4333ee56d7a0d697ebd278225cd90cf0e7abe5edae363faa95c3ff450b5311ddb05e12b2839b99a850a4a7f1a0cc7ce51c6c53c1c56874b07 WHIRLPOOL f987fa1345286b45d4266dd084497a597b1d688b40d90eeabc189bb79b6563625c878d47f58640be144b587f846bc63955c3bde9bbe76179a46fa3b6123693a3
+DIST thcrut-1.2.5.tar.gz 660673 SHA256 b32f3d71ac540248b7643baa39d8ecfb75af493228caaeb64608e49f2f092473 SHA512 954f7512bd3e3937796cc065612214ae7d17f70175305ee66951a4e4dc2fcd83c7b15c690f429c7642c9951c2219f86a045418a77e42e3e4a54deac2ae0c46ab WHIRLPOOL c63b9214e0638e937944e9944d1239b94b685e40116a9ed327b2eac57491b749ec6784ac41a21dd76282c771ed18f3a7e5e8e7402719a3bde2feccdcb56f4b42
+EBUILD thcrut-1.2.5-r1.ebuild 634 SHA256 ff9d736711c865c51a72d273a2e823b2463076bc438d5b356965989e0f872e18 SHA512 c92ed1665bcc1a909f8b9366ec8a411160c7a2c43423b47d57e2ee9f88862df18c5d2315b447ebcd44c8c98825127ed708954d8bd4cbb44eeda96156450a346d WHIRLPOOL 2dc5cc2e4395afc0a00b9e88b425930a924d4387ea5a96e4297fa62adf754e6e1e23a839ee59cdb4dc2c39b6c3df3132db6f6bf95c798dd8ff26708236ee5c43
+MISC ChangeLog 2507 SHA256 011d4717db1651fe90dae9a219986ac25dc4dd85a30e2e8341f4e93cf7a47091 SHA512 2dfe83e2b25913998bf11ffcbd93fcfadab4befea341143b412e92aa90f32aa5801a13960d98bea28c9a8f3e2f62ef35c9997c276398464696828674284f3e7e WHIRLPOOL 1d5f9e1addfae41c6ad5ae67e90bc6f61daa4b98293179aa16167b2cfb3e355cf24c7937eaa91460c4067ebe8242ef015b717ef321553505ea035b3da09eb30e
+MISC ChangeLog-2015 1682 SHA256 c78eb18ed57ff93d74e81869cb21366a228b9a64a4c084f5744ea30f1b33c74a SHA512 1a668cb42a7f6073042efb490686f8084a0611172b4b3b3f5f6f561a7634592304836b6678f83e83042a05fb97939bc406d3deebaa867aefe3337570a4d38bf4 WHIRLPOOL 061e98327e163d3db00a81558a7182bd043a5c8299feec4cf3feb8dbe9b8111627677897d34a24f44dc5199c7e80d1f6dc76c4a94ee896259a6edae367b40a26
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/thcrut/files/thcrut-1.2.5-configure.patch b/net-analyzer/thcrut/files/thcrut-1.2.5-configure.patch
new file mode 100644
index 000000000000..daa069e22afd
--- /dev/null
+++ b/net-analyzer/thcrut/files/thcrut-1.2.5-configure.patch
@@ -0,0 +1,42 @@
+--- a/configure.in
++++ b/configure.in
+@@ -153,10 +153,8 @@
+ dnl libnet_init_packet only available in < libnet-1.1.x
+ dnl AC_CHECK_LIB(net, libnet_init_packet,, AC_MSG_ERROR(We need libnet.
+ dnl Get libnet from http://www.packetfactory.net or try --with-[[libs,includes]]=DIR))
+-AC_CHECK_LIB(net, libnet_init_packet, [NET=yes], [NET=no])
++AC_CHECK_LIB(net-1.0, libnet_init_packet, [NET=yes], [NET=no])
+ if test x"$NET" = x"no" -o x"$DIST" = x"yes"; then
+-	AC_CONFIG_SUBDIRS(Libnet-1.0.2a)
+-	THCRUT_SUBDIRS="$THCRUT_SUBDIRS Libnet-1.0.2a"
+ 	CPPFLAGS="-I../Libnet-1.0.2a/include ${CPPFLAGS}"
+ 	LDFLAGS="-L../Libnet-1.0.2a/src ${LDFLAGS}"
+ 	PRG_LIBNET_CONFIG_CFLAGS="../Libnet-1.0.2a/libnet-config --cflags --defines | tr '\n' ' '"
+@@ -164,14 +162,12 @@
+ 	dnl CFLAGS="`${srcdir}/Libnet-1.0.2a/libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS"
+ 	dnl LIBS="`${srcdir}/Libnet-1.0.2a/libnet-config --libs` $LIBS"
+ else
+-	CFLAGS="`libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS"
+-	LIBS="`libnet-config --libs` $LIBS"
++	CFLAGS="`libnet-1.0-config --cflags --defines | tr '\n' ' '` $CFLAGS"
++	LIBS="`libnet-1.0-config --libs` $LIBS"
+ fi
+ 
+ AC_CHECK_LIB(pcre, pcre_compile, [PCRE=yes], [PCRE=no])
+ if test x"$PCRE" = x"no" -o x"$DIST" = x"yes"; then
+-	AC_CONFIG_SUBDIRS(pcre-3.9)
+-	THCRUT_SUBDIRS="$THCRUT_SUBDIRS pcre-3.9"
+ 	CPPFLAGS="-I../pcre-3.9 ${CPPFLAGS}"
+ 	LDFLAGS="-L../pcre-3.9 ${LDFLAGS}"
+ 	PRG_PCRE_CONFIG_CFLAGS="../pcre-3.9/pcre-config --cflags"
+@@ -199,8 +195,8 @@
+ AC_OUTPUT(Makefile src/Makefile)
+ 
+ dnl Just to show the correct values...
+-CFLAGS="`${srcdir}/pcre-3.9/pcre-config --cflags` `${srcdir}/Libnet-1.0.2a/libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS"
+-LIBS="`${srcdir}/pcre-3.9/pcre-config --libs` `${srcdir}/Libnet-1.0.2a/libnet-config --libs` $LIBS"
++CFLAGS="`${srcdir}/pcre-3.9/pcre-config --cflags` `libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS"
++LIBS="`${srcdir}/pcre-3.9/pcre-config --libs` `libnet-config --libs` $LIBS"
+ 
+ echo "THCrut has been configured with the following options:"
+ echo "                 User binaries: $B"
diff --git a/net-analyzer/thcrut/files/thcrut-1.2.5-libnet.patch b/net-analyzer/thcrut/files/thcrut-1.2.5-libnet.patch
new file mode 100644
index 000000000000..87488c8c5196
--- /dev/null
+++ b/net-analyzer/thcrut/files/thcrut-1.2.5-libnet.patch
@@ -0,0 +1,65 @@
+--- a/src/arp_main.c
++++ b/src/arp_main.c
+@@ -18 +18 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- a/src/arpg.c
++++ b/src/arpg.c
+@@ -12 +12 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- a/src/dhcp_main.c
++++ b/src/dhcp_main.c
+@@ -14 +14 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- a/src/discover_dispatch.c
++++ b/src/discover_dispatch.c
+@@ -10 +10 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- a/src/discover_main.c
++++ b/src/discover_main.c
+@@ -8 +8 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- a/src/fp.h
++++ b/src/fp.h
+@@ -10 +10 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- a/src/icmp_main.c
++++ b/src/icmp_main.c
+@@ -14 +14 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- a/src/network_raw.c
++++ b/src/network_raw.c
+@@ -10 +10 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- a/src/packets.c
++++ b/src/packets.c
+@@ -6 +6 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- a/src/thcrut.c
++++ b/src/thcrut.c
+@@ -87 +87 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- a/src/thcrut.h
++++ b/src/thcrut.h
+@@ -7 +7 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- a/src/thcrut_libnet.c
++++ b/src/thcrut_libnet.c
+@@ -5 +5 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- a/src/thcrut_libnet.h
++++ b/src/thcrut_libnet.h
+@@ -5 +5 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
diff --git a/net-analyzer/thcrut/metadata.xml b/net-analyzer/thcrut/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/thcrut/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/thcrut/thcrut-1.2.5-r1.ebuild b/net-analyzer/thcrut/thcrut-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..81a092c175cd
--- /dev/null
+++ b/net-analyzer/thcrut/thcrut-1.2.5-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Network discovery and fingerprinting tool"
+HOMEPAGE="http://www.thc.org/thc-rut/"
+SRC_URI="http://www.thc.org/thc-rut/${P}.tar.gz"
+
+LICENSE="free-noncomm PCRE GPL-1+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+
+DEPEND="
+	dev-libs/libpcre
+	net-libs/libnet:1.0
+	net-libs/libpcap
+"
+
+src_prepare() {
+	rm -r Libnet-1.0.2a pcre-3.9 || die
+	epatch \
+		"${FILESDIR}"/${P}-libnet.patch \
+		"${FILESDIR}"/${P}-configure.patch
+	eautoreconf
+}
+
+DOCS=( ChangeLog FAQ README TODO thcrutlogo.txt )
diff --git a/net-analyzer/thrulay/Manifest b/net-analyzer/thrulay/Manifest
new file mode 100644
index 000000000000..d455917ed10e
--- /dev/null
+++ b/net-analyzer/thrulay/Manifest
@@ -0,0 +1,7 @@
+AUX thrulayd-conf.d 248 SHA256 8a778b1c892b27e9fe51f72b4a20b8364721325322fa516c9100219409b797ba SHA512 d74cf8e47c48b762ab76ec74bf92227092706a4594a8b894a58eb0a8972ae99ad9fa565e1ea5520144e692429e35f67593c37ac79e2682a9cebd2044bc3b510a WHIRLPOOL 83e74cbe9e4ee230f44e21780f985508ebc3034ae7bb11f438bbd7376fe7059f7285f1342c4f03781b82bb62b24c9334a2f7d621f208e32ef036c6dfe29c903c
+AUX thrulayd-init.d 557 SHA256 0e2d352816401ed4f720941ec0135b8694449e787945ac568b4e878d742717e1 SHA512 9573ca678b719b913f492b8f2303c8c25b1b49fe727aae5f89016c1d3a2d34595655b851ef26eb85a8f66379b9ea1868babb1e1e1a8e9bef9a61858aa467b9a2 WHIRLPOOL b8b41f9a603c95c42d189cdd111913f339f87e676a6f5114e07a8f07a93d43bf08b4fc3cf1ea49f5c066711ed2f332c85ca80a6cca7a235615ca215ebc434933
+DIST thrulay-0.9.tar.gz 370312 SHA256 373d5613dfe371f6b4f48fc853f6c27701b2981ba4100388c9881cb802d1780d SHA512 9655ef37f6ef3ba51a2fadacf08978fb1c284af6b571dbf76c44e5582bf705bec08170b3b2cc69512b8327485dfd3f758ed2addf510a075558aea70eb4779a6f WHIRLPOOL 224cab8b044d09f2f8ce1f2cece990a6d08fc708596a02509edfaa0a38758d3716235fe1fee55a849f3d180a8acb6fc87499c9769ee8b2931d2d82b0fd03a2a8
+EBUILD thrulay-0.9-r1.ebuild 988 SHA256 51189dc7963281e296a42df9d4a99b0e73a7acf5afbee6e6758bdbae834fcd0b SHA512 95023931605ce3d696eefd6e36f6bc47b6ed97f8c3ab4d18a6a19c2139818c017730fdfadc24803fc95dad8e4149f838be969e4085ddc10166f5c9da4ecba8b7 WHIRLPOOL 7ed0eb0d7f89769d99319fa5d8950eb8ccae35b23cf547c665aed2a158229e854d81b28ddb345162183b0614360dcb4b73e89fdd94648fa503332fb0fb22e578
+MISC ChangeLog 2362 SHA256 cafdd87ce5bc7168bed5e8502246b3b3269843b10bd65c247272289d18411c68 SHA512 5be0e6ee0c67156391a0415cebc38cca1d743ca2b7d1f2bf6e93e7a9f8ec1ed76481ddbf764a0ac7b0201073b1d2071fcd6a12e4737e9db3f35b6df741494a0c WHIRLPOOL abb0819e161dda4fba7e64159d1ced3fcf598e68f93a3a8589f5953f692b32d522684dafbdfe4b3861577c9c52394873ab22a4a1bced661a211f5ccd4aab27dd
+MISC ChangeLog-2015 2226 SHA256 3361685c3e221831a0b94279b71266558b34e0ab0ef1a4670cc0a095a174e0ae SHA512 839b31d9369f1a7d85aa862519ddbac791648c23265ad1a7e9497a5807b3cf6f546ba35290b70fd703f0ab49148ba17e3fb3fc3abd5a99ffae51fea64343e5e0 WHIRLPOOL 4ceaff5dd3d8977f244a84e81117d6204542283808de6829c9626ba247a070527198192f30749f0335196b5151fd52a27f33e18821e93f492ae4a7dca0903406
+MISC metadata.xml 303 SHA256 f36117e655cd6d99944cf51554bbe6c094fa92689d533ec66c5d9f0d506ace56 SHA512 ccf7095c2929ce1262d94f379a7a704d82980b691da0d77e8ec5684803ab6c40bcd85d167cc50f37411e92ace6978b90953e71395ab6f56a31479f2ca3a35ccf WHIRLPOOL 015827c7ee8835c94ba0ed81ab5d38f63fcbf979deece7cce90d60704dc771a2870c25bdd24b814aa8ce09a9f9cd889ad338540738586ea0137ea1ab37987c4e
diff --git a/net-analyzer/thrulay/files/thrulayd-conf.d b/net-analyzer/thrulay/files/thrulayd-conf.d
new file mode 100644
index 000000000000..a1350488a714
--- /dev/null
+++ b/net-analyzer/thrulay/files/thrulayd-conf.d
@@ -0,0 +1,8 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# The default window size is 4194304 bytes
+#THRULAYD_WINDOW="4194304"
+
+# By default, thrulayd will listen on 5003/tcp
+#THRULAYD_PORT="5003"
diff --git a/net-analyzer/thrulay/files/thrulayd-init.d b/net-analyzer/thrulay/files/thrulayd-init.d
new file mode 100644
index 000000000000..8fa9f4bc6ba5
--- /dev/null
+++ b/net-analyzer/thrulay/files/thrulayd-init.d
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use net
+}
+
+start() {
+	[ -n "${THRULAYD_WINDOW}" ] && THRULAYD_OPTS="${THRULAYD_OPTS} -w${THRULAYD_WINDOW}"
+	[ -n "${THRULAYD_PORT}" ] && THRULAYD_OPTS="${THRULAYD_OPTS} -p${THRULAYD_PORT}"
+	ebegin "Starting thrulayd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/thrulayd -- ${THRULAYD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping thrulayd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/thrulayd
+	eend $?
+}
diff --git a/net-analyzer/thrulay/metadata.xml b/net-analyzer/thrulay/metadata.xml
new file mode 100644
index 000000000000..7fb9c5a520e9
--- /dev/null
+++ b/net-analyzer/thrulay/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>robbat2@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">thrulay</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/thrulay/thrulay-0.9-r1.ebuild b/net-analyzer/thrulay/thrulay-0.9-r1.ebuild
new file mode 100644
index 000000000000..f7e905e1772a
--- /dev/null
+++ b/net-analyzer/thrulay/thrulay-0.9-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit toolchain-funcs autotools
+
+DESCRIPTION="Measure the capacity of a network by sending a bulk TCP stream over it"
+HOMEPAGE="http://www.internet2.edu/~shalunov/thrulay/"
+SRC_URI="http://www.internet2.edu/~shalunov/thrulay/${P}.tar.gz
+		mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+DEPEND=""
+
+src_prepare() {
+	echo 'thrulay thrulayd: libthrulay.la' >>src/Makefile.am
+	eautoreconf
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed"
+	#dobin src/thrulay || die "dobin failed"
+	#dosbin src/thrulayd || die "dosbin failed"
+	dodoc LICENSE README TODO doc/thrulay-protocol.txt || die "dodoc failed"
+	doman doc/thrulay*.[1-8] || die "doman failed"
+	newinitd "${FILESDIR}"/thrulayd-init.d thrulayd || die "newinitd failed"
+	newconfd "${FILESDIR}"/thrulayd-conf.d thrulayd || die "newconfd failed"
+}
diff --git a/net-analyzer/tleds/Manifest b/net-analyzer/tleds/Manifest
new file mode 100644
index 000000000000..6cca57e574e7
--- /dev/null
+++ b/net-analyzer/tleds/Manifest
@@ -0,0 +1,9 @@
+AUX tleds-1.05_beta11-gentoo.patch 1450 SHA256 60819774ad4fcd9c2a93564a2676ab6d1f70c1e8eed16151d842257b777ba65a SHA512 12140be169027edc77353ba0c2c66854fac099b17e46fedf368bdcb69147beae1b0a1e1ffb9de9f3172fd0f809b1de146ed29b5c730baf4b8459d4068ddf0918 WHIRLPOOL ebe44d9f72fb76a9de580baf2ee3460da6d883c5f09eff9e26edbb45a825b3c732e0236f1cdc8cadbe42e9ec5e7f4fadfa5e35dc76edf022ebede0fe661b1c08
+AUX tleds.conf.d 145 SHA256 cd1b471cfdc9ad14aa29c27572626ee84aa285fd82e4dfeac43921e9e1323f78 SHA512 7eb1b97802199b06b498f7ff7c0017417d75877f84ff639b6b878890dbfe4d6a474583c0412a9b85139247dee08aa745665e3df8501863509cae8788b1dc9771 WHIRLPOOL 0f5f32f41fffc961c36cb4c9331d435a3fdc825b3cbdef3d99e62aa7c795e056c2e0eeb82fb9deceb6311db971611dd357b6fbb9385e6ce58c49bc5b6b800142
+AUX tleds.init.d 341 SHA256 4080736dc0fb61477ff30979c5cf55dcdc305b55886f4da07450c6ff5b043a10 SHA512 45e39bfc3e769f86432bb251e221f22a5e4640281713ed1e39ca372dd46343b56ab3ab257aca6b012be533daec2c559d987e9447e807c6df6406520d63ea60dd WHIRLPOOL e294a73c3719d1ed657cec0e8645842c2dd1c315aaa2ee01262b54af3179b85d48a83d9b285f423fe6220679ff33f2f4db19d2abb60bf631d5873e98b2664ede
+DIST tleds-1.05beta10.tgz 28640 SHA256 6d139bdaf9ebc0759954d4a5ad061c87c1a3d9c2d9b674886ce93879e803b47b SHA512 661ac8749c85ce20ffc2851a62ee7691e6cddf3700f4a388465bbdf2faa117d8bd6e316541bc5e2fa81d18f74d47bdd78010b8490124f39b6a1c085c4d345d3a WHIRLPOOL 23d8c6d54e2bbae44da0c49b35d6519f96f1fb85afbbf1fa657f0f00fa08538602a6b934ed7d47b382ba1b33479303928823d9575e45970f772a3580da91a340
+DIST tleds-1.05beta11.patch.bz2 5540 SHA256 a7542930e7e5cf537dc08cbbe70808f57db18c110ae998fc5edef206537bbeb5 SHA512 8c6e5b28e055fd546af97244230560cb22d7def65a8c16e0257d9f41b789394f744a056a95bf7d9f6fb9dcf8ab0bcacfc8fce7c91d0e8be798ae2af4817ce1a4 WHIRLPOOL 5046743da828cb9fd417125ff76d9c4f1bef18e452b800cf6892feb480c5c32ad467076d682dbc242d80aed9ac2f6346c9c88fa868991fce244de361df7a5179
+EBUILD tleds-1.05_beta11-r2.ebuild 960 SHA256 c74ab6efc9860d0823863623126d0dc52a55be970ade623b1dbfc959c8a81bc3 SHA512 9b456a4b2d96d41224a6ebd3bae83f3e8995053f3170d71f5d4a3c131fdd0dfc9ca08f8b1a177bc0af313d327bff693325d6a9d9f787ab8d89a34ff0bdf2a91f WHIRLPOOL 319e3f3c028c61af4aec51ab7b4b7c79af08321a923f0fae90f77d538ae91a177d472d53e068a65252d92a549f5d491ffd46cc5960117e8b49e77e02bc77d9a7
+MISC ChangeLog 2655 SHA256 f415c005bc4c9e251ad046c200bb697713f322ab893f87244f7e047d634b8735 SHA512 1ad291897eb72adec09c228d1b443e57709772c56658a97f97924d4d74e3271f55b3147ebe85f79d17b0f0d8be2f308035685b21e673822244eaff3e432aec31 WHIRLPOOL b2c6d4ca06fbcdf3ba46ee76f9464b959f5c77c3a3eb43ee657afd3d74d184874f221e8d9ae933dda4df70588f70ff33608536dab0cec6dd3443ad85c940bd8e
+MISC ChangeLog-2015 3588 SHA256 d7fcc092d45b838d8531826b8a8769708ec03d97271ce70d99e489b77d8743a4 SHA512 c8462a13345d38ace2c446e1b0fe857252970939c8c04b4140ec7767a345d5d8e3bafe72156b7cc6b31d63d3bddc2a988627af07a9b724d3e1b57476f4e8d654 WHIRLPOOL 3601db92dfb6d4708454e4fe522f4b58c3aa9c94f718ea877d6db8c5fc03ffcb1e4305c37ec905dfd6fbf6c6471b019d6489569567ffee978045bc8dcf8f1711
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/tleds/files/tleds-1.05_beta11-gentoo.patch b/net-analyzer/tleds/files/tleds-1.05_beta11-gentoo.patch
new file mode 100644
index 000000000000..96e6e3d21d45
--- /dev/null
+++ b/net-analyzer/tleds/files/tleds-1.05_beta11-gentoo.patch
@@ -0,0 +1,53 @@
+--- a/Changes
++++ b/Changes
+@@ -1,4 +1,7 @@
+ VERSION	DATE		WHAT WAS FIXED OR WHAT WAS/IS NEW
++
++	2 Jul 2002	2.4/2.5 patch
++
+ 1.05b11 7 Mar 2002	Support for multiple interfaces
+ 
+ 1.05b7	2 Apr 1998	Keeps LEDs deattached also after VT is reset if run
+--- a/tleds.c
++++ b/tleds.c
+@@ -43,16 +43,6 @@
+ #define VERSION	"1.05beta11"
+ #define MYNAME	"tleds"
+ 
+-/* Supported kernel version */
+-/* If you want to compile for Linux 2.1.x add -DKERNEL2_1 to gcc options. */
+-/* Currently kernel v2.1.97 is "tested", older v2.1.x kernels may not work */
+-#ifdef KERNEL2_1
+-#undef KERNEL2_1
+-#define KERNEL2_0 0
+-#else
+-#define KERNEL2_0 1
+-#endif
+-
+ /* If you don't want X stuff. */
+ #ifdef NO_X_SUPPORT
+ #define REMOVE_X_CODE 1
+--- a/Makefile
++++ b/Makefile
+@@ -9,18 +9,18 @@
+ 
+ # For 2.1.x kernels, you have to include -DKERNEL2_1 option for gcc
+ 
+-GCCOPTS = -D_GNU_SOURCE -O3 -Wall 
++GCCOPTS = -D_GNU_SOURCE $(CFLAGS) $(LDFLAGS) -Wall 
+ 
+ # The first one is if you want to include X code
+ xtleds:	tleds.c Makefile
+ 	# Making xtleds
+-	gcc $(GCCOPTS) -o xtleds tleds.c -I /usr/X11R6/include/ -L /usr/X11R6/lib/ -lX11
++	$(CC) $(GCCOPTS) -o xtleds tleds.c -I /usr/include/ -L /usr/lib/ -lX11
+ 
+ # This second one works only when started in VT. Check the REMOVE_X_CODE
+ # in the source code.
+ tleds:	tleds.c Makefile
+ 	# Making tleds
+-	gcc -DNO_X_SUPPORT $(GCCOPTS) -o tleds tleds.c
++	$(CC) -DNO_X_SUPPORT $(GCCOPTS) -o tleds tleds.c
+ 
+ help:
+ 	# make help	-	this.
diff --git a/net-analyzer/tleds/files/tleds.conf.d b/net-analyzer/tleds/files/tleds.conf.d
new file mode 100644
index 000000000000..477408d30ed0
--- /dev/null
+++ b/net-analyzer/tleds/files/tleds.conf.d
@@ -0,0 +1,6 @@
+# Copyright 2003-2004 Gentoo Foundation 
+# Distributed under the terms of the GNU General Public License v2
+
+IFACE="eth0"
+DELAY=50
+EXTRA_OPTS=""
diff --git a/net-analyzer/tleds/files/tleds.init.d b/net-analyzer/tleds/files/tleds.init.d
new file mode 100644
index 000000000000..9815c3b8a621
--- /dev/null
+++ b/net-analyzer/tleds/files/tleds.init.d
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting tleds"
+	/usr/sbin/tleds -d ${DELAY} ${IFACE} ${EXTRA_OPTS} > /dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping tleds"
+	/usr/sbin/tleds -k > /dev/null
+	eend $?
+}
+
diff --git a/net-analyzer/tleds/metadata.xml b/net-analyzer/tleds/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/tleds/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild b/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild
new file mode 100644
index 000000000000..56abdfd1f3cd
--- /dev/null
+++ b/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+MY_P="${P/_/}"
+S="${WORKDIR}/${MY_P/eta11/}"
+DESCRIPTION="Blinks keyboard LEDs indicating outgoing and incoming network packets on selected network interface"
+HOMEPAGE="http://www.hut.fi/~jlohikos/tleds_orig.html"
+SRC_URI="
+	http://www.hut.fi/~jlohikos/tleds/public/${MY_P/11/10}.tgz
+	http://www.hut.fi/~jlohikos/tleds/public/${MY_P}.patch.bz2
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="X"
+
+DEPEND="X? ( x11-libs/libX11 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# code patches
+	epatch \
+		"${WORKDIR}"/${MY_P}.patch \
+		"${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) $(usex X all tleds)
+}
+
+src_install() {
+	dosbin tleds
+	use X && dosbin xtleds
+
+	doman tleds.1
+	dodoc README Changes
+
+	newinitd "${FILESDIR}"/tleds.init.d tleds
+	newconfd "${FILESDIR}"/tleds.conf.d tleds
+}
diff --git a/net-analyzer/tptest/Manifest b/net-analyzer/tptest/Manifest
new file mode 100644
index 000000000000..d4008d97d0b5
--- /dev/null
+++ b/net-analyzer/tptest/Manifest
@@ -0,0 +1,6 @@
+AUX tptest-3.1.7-getstatsfromlinevuln.patch 5727 SHA256 1315296c0d79aa486ec4db1f0c43c95c676d76cecc4884f761307dca27c2ac2d SHA512 3d0135d382adbbb58fc359d021313b4eef319d96c46cfdee06def06273dce259d0027a4dd043ccb08c5382dc543c6ec5ba05b536e685f41b946c8048711dc883 WHIRLPOOL b4f7918e4b0791bbe058add0c236f2f73991915702ec580f4d9c73d8fe44e697844592dca7de16af17dd4934a47668951c7282ff37ce5ecce700b9eb832cbb94
+DIST tptest-3.1.7.tar.gz 313801 SHA256 db39257b3ee6408a575e16804975df1e68f52270537cc3e7505897b777f7994d SHA512 c78fdbc561adbe109be9fc45a2dbd5c452235525ac4d5f24e39fd8824825fd02c35853411c3f4ae1870f98b576df37f3f1f1266de7c40edcb8f35c69b9063c59 WHIRLPOOL f19631cc2e9d8ed3272cfb81da3c003e26ef6d80b35de57eb793157b2acadf65eb85179afa3138ec83722b9b5b70b0b4f800381ef43d3d56072018be3838ac15
+EBUILD tptest-3.1.7-r2.ebuild 899 SHA256 e398e59f7aec2a4c3f8f316d728acb8643ad090b690966edafc6627df3c1810b SHA512 7462d7a2570d3ad9445188659980ea1985cc69b97725fc91c3dcce6c2add46a748693a82a7595bca00c04f6f96094b248a9baf2f604cfa7680e49996cf28f62f WHIRLPOOL f402e38f63a8b7dbbce4ce95433a3e6adadb578b08415c2b9494fc2f3540efbeac53f8ccb45e6f768502dd1797811bf41c3da9a1d5d70242ac4b0aafa72da48a
+MISC ChangeLog 2484 SHA256 2fafdb40bdebb2aca0a430d3556ea1f80bb4c091fbc4725b4fc4a52d04c7f953 SHA512 d020873a954627e8f44c6c7f614481e03ce1c7cfea1f8b3b2142e4881a193b2834ab00976e2240c3d665fd7ba43ab6be4f767988cdf01c6622b2a3bdd81d5b2d WHIRLPOOL ccf1eea4bce2fcda29f39c9f05600ddc8dc553ccbb8e6bfac8e3d2591e684cba075d00b005c3df0ec1cb8e063a2372e90e2149fb1f66bb8fba23239dc64bf4e7
+MISC ChangeLog-2015 2375 SHA256 3672b8b1313c9e1f04b72ef1dbec3263d56b72b39b43cfb3687dce5d0eb51e4c SHA512 2f183c96823d3894f0657b0560d9619bae9c45c7689c2e6b4ce1ec7eb506015f0dec9a8e6579568c18dacd34b86290c1850ee7c52aa0afe2330e3443715e9ff6 WHIRLPOOL f7d6051dc7467604ecf900e627fc464082f1e0facbb8fda48f6b299f4027d9b04978f32c04c26ec20527164dd194b2a488c92fe40c97928b5754ee4657b9e304
+MISC metadata.xml 356 SHA256 41ebc785ff8e46fbf986d9c7823212765ace64be94474e6ded5468b3a6bd934b SHA512 df040b3a61401e1ca7ff513904875c135b48d03dbbe8ee4bd83f2faa8e8ba448bed670a44b6ff04b24cace44d8308ca64c29dfb32b2f0dac602e3d6d62234956 WHIRLPOOL efb8402d8f394e2f72965f4985115a13b469a308a6e5cb1b074d0e25554480b39fb45fccef746f83a0c6ddca71b7e6fad42e7a4637c776fbb4230fba4c67b472
diff --git a/net-analyzer/tptest/files/tptest-3.1.7-getstatsfromlinevuln.patch b/net-analyzer/tptest/files/tptest-3.1.7-getstatsfromlinevuln.patch
new file mode 100644
index 000000000000..4b7fd209f9e4
--- /dev/null
+++ b/net-analyzer/tptest/files/tptest-3.1.7-getstatsfromlinevuln.patch
@@ -0,0 +1,150 @@
+--- a/engine/tpcommon.c
++++ b/engine/tpcommon.c
+@@ -37,6 +37,8 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdarg.h>
++#include <stdlib.h>
++#include <stddef.h>
+ 
+ #ifdef UNIX
+ #include <sys/time.h>
+@@ -194,68 +196,76 @@ done:
+ 
+ 
+ // Fill a tpStats structure with the contents from a STATS line
+-int GetStatsFromLine(char *line, TPStats *s)
++int GetStatsFromLine(const char *line, TPStats *s)
+ {
+ 	char valBuf[30];
++	char * stats_ptr = NULL;
+ 
+ 	if (strncmp(line, "STATS ", 6) != 0)
+ 		return -1;
+-	memset(valBuf, 0, 30);
++	memset(valBuf, 0, sizeof(valBuf));
++	stats_ptr = ((char *)line)+6;
+ 
+-	if (CopyTagField(valBuf, 29, line+6, "majorv"))
+-		s->MajorVersion = atoi(valBuf);
+-	if (CopyTagField(valBuf, 29, line+6, "minorv"))
+-		s->MinorVersion = atoi(valBuf);
+-	if (CopyTagField(valBuf, 29, line+6, "pktssent"))
+-		s->PktsSent = atoi(valBuf);
+-	if (CopyTagField(valBuf, 29, line+6, "pktsunsent"))
+-		s->PktsUnSent = atoi(valBuf);
+-	if (CopyTagField(valBuf, 29, line+6, "pktsrcvd"))
+-		s->PktsRecvd = atoi(valBuf);
+-	if (CopyTagField(valBuf, 29, line+6, "bytessent"))
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "majorv"))
++		s->MajorVersion = (USHORT) strtoul(valBuf,NULL,10);
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "minorv"))
++		s->MinorVersion = (USHORT) strtoul(valBuf,NULL,10);
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "pktssent"))
++		s->PktsSent = (UINT32) strtoul(valBuf,NULL,10);
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "pktsunsent"))
++		s->PktsUnSent = (UINT32) strtoul(valBuf,NULL,10);
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "pktsrcvd"))
++		s->PktsRecvd = (UINT32) strtoul(valBuf,NULL,10);
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "bytessent"))
+ 		sscanf(valBuf, "%" LONG_LONG_PREFIX "d", &(s->BytesSent));
+-	if (CopyTagField(valBuf, 29, line+6, "bytesrcvd"))
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "bytesrcvd"))
+ 		sscanf(valBuf, "%" LONG_LONG_PREFIX "d", &(s->BytesRecvd));
+-	if (CopyTagField(valBuf, 29, line+6, "maxrtt"))
+-		s->MaxRoundtrip = atoi(valBuf);
+-	if (CopyTagField(valBuf, 29, line+6, "minrtt"))
+-		s->MinRoundtrip = atoi(valBuf);
+-	if (CopyTagField(valBuf, 29, line+6, "oocount"))
+-		s->ooCount = atoi(valBuf);
+-
+-	if (CopyTagField(valBuf, 29, line+6, "txstart_s"))
+-		s->StartSend.tv_sec = atoi(valBuf);
+-	if (CopyTagField(valBuf, 29, line+6, "txstart_us"))
+-		s->StartSend.tv_usec = atoi(valBuf);
+-
+-	if (CopyTagField(valBuf, 29, line+6, "txstop_s"))
+-		s->StopSend.tv_sec = atoi(valBuf);
+-	if (CopyTagField(valBuf, 29, line+6, "txstop_us"))
+-		s->StopSend.tv_usec = atoi(valBuf);
+-
+-	if (CopyTagField(valBuf, 29, line+6, "rxstart_s"))
+-		s->StartRecv.tv_sec = atoi(valBuf);
+-	if (CopyTagField(valBuf, 29, line+6, "rxstart_us"))
+-		s->StartRecv.tv_usec = atoi(valBuf);
+-
+-	if (CopyTagField(valBuf, 29, line+6, "rxstop_s"))
+-		s->StopRecv.tv_sec = atoi(valBuf);
+-	if (CopyTagField(valBuf, 29, line+6, "rxstop_us"))
+-		s->StopRecv.tv_usec = atoi(valBuf);
+-
+-	if (CopyTagField(valBuf, 29, line+6, "totrtt"))
+-		s->TotalRoundtrip = atoi(valBuf);
+-	if (CopyTagField(valBuf, 29, line+6, "nortt"))
+-		s->nRoundtrips = atoi(valBuf);
+-
+-	if (CopyTagField(valBuf, 101, line + 6, "email"))
+-		strcpy(s->email, valBuf);
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "maxrtt"))
++		s->MaxRoundtrip = (UINT32) strtoul(valBuf,NULL,10);
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "minrtt"))
++		s->MinRoundtrip = (UINT32) strtoul(valBuf,NULL,10);
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "oocount"))
++		s->ooCount = (UINT32) strtoul(valBuf,NULL,10);
++
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "txstart_s"))
++		s->StartSend.tv_sec = strtol(valBuf,NULL,10);
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "txstart_us"))
++		s->StartSend.tv_usec = strtol(valBuf,NULL,10);
++
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "txstop_s"))
++		s->StopSend.tv_sec = strtol(valBuf,NULL,10);
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "txstop_us"))
++		s->StopSend.tv_usec = strtol(valBuf,NULL,10);
++
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "rxstart_s"))
++		s->StartRecv.tv_sec = strtol(valBuf,NULL,10);
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "rxstart_us"))
++		s->StartRecv.tv_usec = strtol(valBuf,NULL,10);
++
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "rxstop_s"))
++		s->StopRecv.tv_sec = strtol(valBuf,NULL,10);
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "rxstop_us"))
++		s->StopRecv.tv_usec = strtol(valBuf,NULL,10);
++
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "totrtt"))
++		s->TotalRoundtrip = (UINT32) strtoul(valBuf,NULL,10);
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "nortt"))
++		s->nRoundtrips = (UINT32) strtoul(valBuf,NULL,10);
++
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "email"))
++	{
++		strncpy(s->email, valBuf, sizeof(s->email));
++		s->email[sizeof(s->email)-1] = '\0';
++	}
+ 
+-	if (CopyTagField(valBuf, 101, line + 6, "pwd"))
+-		strcpy(s->pwd, valBuf);
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "pwd"))
++	{
++		strncpy(s->pwd, valBuf, sizeof(s->pwd));
++		s->pwd[sizeof(s->pwd)-1] = '\0';
++	}
+ 
++	stats_ptr = NULL;
+ 	return 0;
+-
+ }
+ 
+ 
+--- a/engine/tpcommon.h
++++ b/engine/tpcommon.h
+@@ -43,7 +43,7 @@ int SameTag(char *s1, char *s2);
+ int CopyTagField(char *destp, int destSize, char *srcp, char *pname);
+ int GetSessionFromLine(char *, TPEngine *);
+ char * CreateSessionLine(TPEngine *, char *);
+-int GetStatsFromLine(char *, TPStats *);
++int GetStatsFromLine(const char *, TPStats *);
+ char * CreateLineFromStats(TPStats *, char *);
+ int ReplyCode(char *);
+ void TVAddUSec(struct timeval *, int);
diff --git a/net-analyzer/tptest/metadata.xml b/net-analyzer/tptest/metadata.xml
new file mode 100644
index 000000000000..43601ae2ee47
--- /dev/null
+++ b/net-analyzer/tptest/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">tptest</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/tptest/tptest-3.1.7-r2.ebuild b/net-analyzer/tptest/tptest-3.1.7-r2.ebuild
new file mode 100644
index 000000000000..d580934eae8f
--- /dev/null
+++ b/net-analyzer/tptest/tptest-3.1.7-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs eutils
+
+MY_PV="${PV/./_}"
+
+DESCRIPTION="Internet bandwidth tester"
+HOMEPAGE="http://tptest.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="amd64 ppc sparc x86"
+
+src_prepare() {
+	sed -i apps/unix/{client,server}/Makefile \
+		-e "s:^CFLAGS[[:space:]]*=:CFLAGS+=:" \
+		|| die
+	epatch "${FILESDIR}/${PN}-3.1.7-getstatsfromlinevuln.patch"
+	cp -f os-dep/unix/* .
+	cp -f engine/* .
+}
+
+src_compile() {
+	emake -C apps/unix/client \
+		CC=$(tc-getCC) \
+		LDFLAGS="${LDFLAGS}" \
+		|| die
+	emake -C apps/unix/server \
+		CC=$(tc-getCC) \
+		LDFLAGS="${LDFLAGS}" \
+		|| die
+}
+
+src_install() {
+	dobin apps/unix/client/tptestclient
+	dosbin apps/unix/server/tptestserver
+
+	insinto /etc
+	doins apps/unix/server/tptest.conf
+}
diff --git a/net-analyzer/tracebox/Manifest b/net-analyzer/tracebox/Manifest
new file mode 100644
index 000000000000..97a521324540
--- /dev/null
+++ b/net-analyzer/tracebox/Manifest
@@ -0,0 +1,6 @@
+AUX tracebox-0.2-deps.patch 1119 SHA256 ec41bf225726e6449d3196ce601feecf8093b7a3987a4abfd4578572b54f5b46 SHA512 ecfffb4fca07597361170681762ea001a403979a96b8681fa144f7dc86c6d3b508d756863f8b2584f4951c1207a23c6babf7457f5f48dce1c400fe87ab5985b3 WHIRLPOOL a1e1cf852b1a2723e5815f434672f92c7e8b0a79948d4ce10e9d176d4f255b1b9f610dc99e312d1c6f4afba846c848b816208fa610a6ee8d9dc549822bb5b138
+DIST tracebox-0.2.tar.gz 27954 SHA256 39a7a70edb386defe03fabafe0ec8dd448ec8a24adcb2df8ea70f4ea16dfffd8 SHA512 15bfaede7e4828c14efbf7395f3d1c681b672b47157c370f4fe92d5d306ccc8e3e061107c3d36a505d732451d67ea146c21c299e6e826205725ab12680ee773e WHIRLPOOL 89a0c7dd13a6fbadcd88678a7981ed8331b0217792e95404b8ec2be0eb2ff069c570ad441f5a3651c00512d1e6471f01dd719ecddcc740f8a2c0074ba5caf268
+EBUILD tracebox-0.2.ebuild 973 SHA256 18793ff470948233888c980d81fc90ad90e8785f433f69f1ff3acac2498ea8e5 SHA512 85a7b38d61154683a1288d9e1e8ef5a271e7840493998a1caa462ce13a3df1327520c3e8dd0be1e4246e4e3d48cca02fee32bc94ceea28dde8a7fff06a3daec1 WHIRLPOOL dbdc72ddd41ad5c0483d4a3df34829296b48d2aa2aaf57c4ded92ffad805faff08b90bc6c540b0ad538c3151afdca9cb2806febceb945dc87c0ce91080889c9d
+MISC ChangeLog 2462 SHA256 ae42470b1585c6dd4e8aca15114001bf9ebdce082082b6315286a26337898196 SHA512 5ad2ec848e4d0b092ff806fae9c7e07511aeee8342cb1f740b2659841d001f6b32726ab8fa919d6340318bc4ad6d510a9f86d6edfd6e0bc41663f99002eef987 WHIRLPOOL 88f77b065090b0ec79179c583c7695db8e1197e26b2374eab1d42d64a781f7c790fd80ac52aec9b5f44a2aae76d19ab6ec0bbefbe2791ee6c8b01add04be51e3
+MISC ChangeLog-2015 907 SHA256 50be4ae7317abb4f2a82e137cbf549acdf7ae20a45e266edfbe1ab19e0f53f9a SHA512 a1cf1c5afb6987dde67e9e264235993ad3d94784d044931ca26e912bb972a36d6fda4f22216ce25dd7c1b95d9c55ab67679804938a74d427d649428836d743a0 WHIRLPOOL 3c34ad7a7972b1477e6b45d83632ea41e5aa06de622334503f784958695fbc45f24f5948b4816fed006be0b938d25cb9216fdafcebe7cf36f32cf76d688ea473
+MISC metadata.xml 362 SHA256 b0f596b63227f32264082fc6b3729f6d6bfee8d4d26372af457527a802b79072 SHA512 8a03e6fbda5bad0b496b5acf23e79cfd5d7e96c6062dd67b4bb8ab9ff949d7ea2238d06b06300dec48ed988e5b04dd811c1826edeb0b8fed56274f37640b56d4 WHIRLPOOL 79a2daa64c0a031e2f090c7ce4a8f97dc0e625317083edcbc94e87b32746ea34284c0cf474903aae0169981c05d8cdb5395c1a0df81b2070918128bbf07927ba
diff --git a/net-analyzer/tracebox/files/tracebox-0.2-deps.patch b/net-analyzer/tracebox/files/tracebox-0.2-deps.patch
new file mode 100644
index 000000000000..f6c748a410cd
--- /dev/null
+++ b/net-analyzer/tracebox/files/tracebox-0.2-deps.patch
@@ -0,0 +1,30 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,15 +32,11 @@
+ 	])
+ ])
+ 
+-# Make sure libcrafter build a static library by adding the --disable-shared
+-# argument to the configure script.
+-ac_configure_args_pre="$ac_configure_args"
+-ac_configure_args_post="$ac_configure_args --disable-shared"
+-ac_configure_args="$ac_configure_args_post"
++# check for libcrafter
++PKG_CHECK_MODULES(crafter, crafter, LIBS="$LIBS $crafter_LIBS",AC_MSG_ERROR([libcrafter is required]))
+ 
+-AC_CONFIG_COMMANDS_PRE([ac_configure_args="$ac_configure_args_pre"])
+-AC_CONFIG_COMMANDS_POST([ac_configure_args="$ac_configure_args_post"])
+-AC_CONFIG_SUBDIRS(noinst/libcrafter/libcrafter)
++# check for libpcap
++AC_CHECK_LIB(pcap,pcap_open_offline,LIBS="$LIBS -lpcap",AC_MSG_ERROR([libpcap is required]))
+ 
+ # Enable click submodule
+ AS_IF([test "x$enable_tests" = "xyes"], [
+@@ -50,7 +46,6 @@
+ 
+ 	AC_CONFIG_COMMANDS_PRE([ac_configure_args="$ac_configure_args_pre"])
+ 	AC_CONFIG_COMMANDS_POST([ac_configure_args="$ac_configure_args_post"])
+-	AC_CONFIG_SUBDIRS(tests/tools/click)
+ 
+ 	AC_PATH_PROG([FAKEROOT], [fakeroot])
+ 	AS_IF([test -z "$FAKEROOT"], [
diff --git a/net-analyzer/tracebox/metadata.xml b/net-analyzer/tracebox/metadata.xml
new file mode 100644
index 000000000000..e55d9843a684
--- /dev/null
+++ b/net-analyzer/tracebox/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tracebox/tracebox</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/tracebox/tracebox-0.2.ebuild b/net-analyzer/tracebox/tracebox-0.2.ebuild
new file mode 100644
index 000000000000..6713366d9482
--- /dev/null
+++ b/net-analyzer/tracebox/tracebox-0.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A Middlebox Detection Tool"
+HOMEPAGE="http://www.tracebox.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/lua
+	net-libs/libcrafter
+	net-libs/libpcap
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+RESTRICT="test"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-deps.patch
+
+	sed -i -e '/SUBDIRS/s|noinst||g' Makefile.am || die
+	sed -i -e '/DIST_SUBDIRS.*libcrafter/d' noinst/Makefile.am || die
+
+	sed -i \
+		-e '/[[:graph:]]*libcrafter[[:graph:]]*/d' \
+		-e '/dist_bin_SCRIPTS/d' \
+		src/${PN}/Makefile.am \
+		|| die
+
+	sed -i \
+		-e 's|"crafter.h"|<crafter.h>|g' \
+		src/${PN}/PacketModification.h \
+		src/${PN}/PartialHeader.h \
+		src/${PN}/script.h \
+		src/${PN}/${PN}.h \
+		|| die
+
+	rm README.md || die
+
+	eautoreconf
+}
diff --git a/net-analyzer/traceproto/Manifest b/net-analyzer/traceproto/Manifest
new file mode 100644
index 000000000000..e39735205fc0
--- /dev/null
+++ b/net-analyzer/traceproto/Manifest
@@ -0,0 +1,6 @@
+AUX traceproto-1.1.2_beta1-tinfo.patch 804 SHA256 5d67415419ebc19e7f35ec1f5311c14b5971a8ae2cab02b650f8814917b9d2db SHA512 d1c6653637b2d5ed812bd3999ae3f5456fb36621b7d2ed3c8502b9a25abd6303b1b3fff268a557ad288b35a9075079376f533f4a76dcada64d92b85c2d351b3f WHIRLPOOL 300cffd8f0151fe3cd04ec637ad55299e51d003d49dadbeb5c79c596fead07c4ec2b7cf7061329640fcbee2c086260e8f08c8f4659809b464874d619f014a804
+DIST traceproto-1.1.2beta1.tar.gz 192288 SHA256 96c1985793dd9913513669772efdf5736d4bc3af8cd2a852567be64ecd028900 SHA512 e7c99fd0ccc6a8e21901d538b9a05ff26807afdd749ab53e958722ad7fa54c27545c95e4bc390a6a06130e7a123f8fa4c7f794ca7b25180a4d3ca5044d1e7364 WHIRLPOOL 129f31cb97a12b6db08b6b4a717c44e884a9aadf876d374a04df091f03381d8bc458c3ba75940c395a8ab795d44da32db021eb78302b1a3ff678dadc596d0eee
+EBUILD traceproto-1.1.2_beta1.ebuild 758 SHA256 32fdf19cb0bad49afd1fe317c277cb8e1df4f99c3a0734108106e04653211904 SHA512 d8f78fa49625affccaaa0ed7246318d6dc6ffd325b555a1069b55705927f2a9ef1821f0bb6b5a07e90aaa73740f3307b06c3cdeb11429728789bc9b798c9e796 WHIRLPOOL b3fefc65582da56fbc4d16cd640a5551cfbc2071c72c9a3a48d5ea089ac3d8fe10af89a7df560b9624331a4b2b6861cf56a1121199e1bdff3eceefa4b39b4297
+MISC ChangeLog 3043 SHA256 7dc17e71dec5f0d4365e6f575f03b9e814a227ae4c0dbd157c5b6c9753d4e423 SHA512 a796d42c8670ad0fadd444dd6cc4ee2987610deebd0cd62b2be54863e1e96935f5df8c4f29271d4fcd99f7214b1422fbda00342ea8fa499974b0d81920498baf WHIRLPOOL 5cf42937b762418713fd978b51315774be4cbeb26606447f8bbffa03bc8422199bcfadea370599415b57c704654bfe98c8f73aed2a5686b4408431233fa37a43
+MISC ChangeLog-2015 1627 SHA256 e0d057e26d57966350e53e70970d226a5c1b12ac96da1f0a886f1956c5b3ab97 SHA512 e9bde15b2af2d1501b4c5c33e1c8e8fcf7b6833517e74d1b379bc32824e6cb35a7a217e6bca8a0aad4a424dffd9b21c2a2a5770ce701102f2a7cf4763cd27c2d WHIRLPOOL 8cc8e972f0513738aa80fe442b61c4c98236a727f925c2799ac25ebbfe9d8ce4b668df964e30719631f606279dc6751a1a7bd163c020d7e6d6ba115d27d881e8
+MISC metadata.xml 360 SHA256 abb659f66fd27a4253a6b5d3d6002f56c3404571d8f0e9ab2ab56cbabb66d4d7 SHA512 09c1bdd4747222c72f8db8e0486a93b67ece13643ef4532175af88ae7a550a44c5a7533b9926c4898a6aefaff069c0d43befd781430927a199489901553456e6 WHIRLPOOL 804ddfea4e5e76b92b9687c86455eab0ec97f6f56cd621a9b3dd1f5bae57a9ef742b4ebe15fb023c463f1b49fc5a2a014438442678c295a571518685693ee3d2
diff --git a/net-analyzer/traceproto/files/traceproto-1.1.2_beta1-tinfo.patch b/net-analyzer/traceproto/files/traceproto-1.1.2_beta1-tinfo.patch
new file mode 100644
index 000000000000..383daaefd78b
--- /dev/null
+++ b/net-analyzer/traceproto/files/traceproto-1.1.2_beta1-tinfo.patch
@@ -0,0 +1,17 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -182,9 +182,11 @@
+ AC_CHECK_LIB(pcap, pcap_open_live, , AC_MSG_ERROR([ERROR - pcap check failed]))
+ AC_CHECK_LIB(net, libnet_init, , AC_MSG_ERROR([ERROR - libnet check failed]))
+ AC_CHECK_LIB(cap, cap_init, , AC_MSG_WARN([libcap check failed]))
+-AC_CHECK_LIB(ncurses, initscr, , AC_MSG_WARN([ncurses check failed]))
+-AC_CHECK_LIB(curses,  initscr, , AC_MSG_WARN([curses check failed]))
+-AC_CHECK_LIB(termcap, tgetent)
++PKG_CHECK_MODULES(ncurses,ncurses,
++	LIBS="$LIBS $ncurses_LIBS"
++	AC_DEFINE([HAVE_NCURSES_H], 1, [We have ncurses headers])
++	AC_DEFINE([HAVE_LIBNCURSES], 1, [We have ncurses libraries]),
++	AC_MSG_ERROR([ncurses check failed]))
+ if test "x$dmalloc_test" = "xyes"; then
+ 	AC_CHECK_LIB(dmalloc, malloc, ,AC_MSG_RESULT([dmalloc unavailable]))
+ fi
diff --git a/net-analyzer/traceproto/metadata.xml b/net-analyzer/traceproto/metadata.xml
new file mode 100644
index 000000000000..d46f35d35c2d
--- /dev/null
+++ b/net-analyzer/traceproto/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">traceproto</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/traceproto/traceproto-1.1.2_beta1.ebuild b/net-analyzer/traceproto/traceproto-1.1.2_beta1.ebuild
new file mode 100644
index 000000000000..15e52604060b
--- /dev/null
+++ b/net-analyzer/traceproto/traceproto-1.1.2_beta1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils autotools
+
+MY_PV=${PV/_/}
+
+DESCRIPTION="A traceroute-like utility that sends packets based on protocol"
+HOMEPAGE="http://traceproto.sourceforge.net/"
+SRC_URI="mirror://gentoo/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE="debug"
+
+RDEPEND="
+	net-libs/libnet:1.1
+	net-libs/libpcap
+	sys-libs/ncurses
+	debug? ( dev-libs/dmalloc )
+"
+DEPEND="
+	${RDEPEND}
+	app-doc/doxygen[dot]
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable debug dmalloc)
+}
diff --git a/net-analyzer/traceroute-nanog/Manifest b/net-analyzer/traceroute-nanog/Manifest
new file mode 100644
index 000000000000..6c8c96054cca
--- /dev/null
+++ b/net-analyzer/traceroute-nanog/Manifest
@@ -0,0 +1,6 @@
+DIST traceroute-nanog_6.4.2-1.diff.gz 18417 SHA256 840f517113cfc03cc708a7e58ef091b464f4876507488ea072df078795b8346b SHA512 62c2df3db292ab263a2d076689b80ff156bd4a3b4f604974ad8210a700bee80055e21165909eeff138d03570ffe4a44b983ed0cf5ba0c6a914af1928ae82038e WHIRLPOOL 8f6fa7b062cade6c1c3a594a46f31aaec9b40ed2653fe371dc83b97e7012041969f55690365fea070fb09c06b43fbc03ab80d5cea53580da9d531a33fbde46b7
+DIST traceroute-nanog_6.4.2.orig.tar.gz 34429 SHA256 86def604ea95df7c0b6787f6b3e41b10feab0756e16b49a7d2aeab9b02199168 SHA512 1cd4c98404e7b25b2c1f1e4018fc1774f09822df8e597022c7b31b9cf20ce3c5649fd90337c62c65d163fb9c896bd9e19277febb5312d4afe347eac328c6e304 WHIRLPOOL 90c095acb11240089636e4f3258678914fb9bd845ff602326e3eb605ba67be14e8b9525b4c9895edf650063f900d21df0fadd2df418f2aab10466bb4a78a1f31
+EBUILD traceroute-nanog-6.4.2-r1.ebuild 908 SHA256 8e4b5086e9633db0b2150e757d3c2e29b1ad73c403469b867cdaf447b7686956 SHA512 8c390c84866ba38e150ce73d3ad126bca4a327064ad9507a12630c1e4de36ec5b453cbc569d368aa92b9e8abeb7a0395cde1149a6945178dfe5d02b553d6a838 WHIRLPOOL e55421d095ba3b446c401a9dd28c477248b55eebb9e113592229e38cebec45b21f01eebda810ee14eadff92d1bbdb694b202e9906264a4e4d59f4851f2694d56
+MISC ChangeLog 2630 SHA256 0fa14090390a4d9ddd3b4bbd968b4aae3be484159996e68c8c43da7d02caca61 SHA512 46ef7193248d74bd2731a4c263c1e9650e056bc5b9931d1d8d5add68d497266797b34f072d88197ddf4965174e254abfda2e29cfeb29240989ed022ccbd431e7 WHIRLPOOL cea201994bacb5516a2679f24e0ef25047afb9376e416e38fdeccffddfac15b45ad67d7ef2e1e916c273052032e421ef80df49824cbea4a73e18ff43dc660bfd
+MISC ChangeLog-2015 4020 SHA256 4a44cb6d91e386f15cfadb18edfd487ed9f3a77122b1579ffe4a0dc571111449 SHA512 dba67da650b71b4f49f27feadd28a6cb90a2afa85d237c5147dd5477c1a5e81a0e78cb7558f2579aecd34a7c0150ad6a33752847e3e8bf5956d41cdc1eb0543f WHIRLPOOL 5b6520efef235e4df5a6412e53abdb6eda7a89f462c7799c1e5dd989a6867791428774d5a845b8ae05b11eccb0c29b600a147edf44717ec5c260732e775654cc
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/traceroute-nanog/metadata.xml b/net-analyzer/traceroute-nanog/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/traceroute-nanog/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2-r1.ebuild b/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2-r1.ebuild
new file mode 100644
index 000000000000..5dc3aa31866e
--- /dev/null
+++ b/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+MY_P="${PN}_${PV}"
+DEB_PL="1"
+DESCRIPTION="Traceroute with AS lookup, TOS support, MTU discovery and other features"
+HOMEPAGE="http://packages.debian.org/traceroute-nanog"
+SRC_URI="
+	https://dev.gentoo.org/~jer/${MY_P}.orig.tar.gz
+	https://dev.gentoo.org/~jer/${MY_P}-${DEB_PL}.diff.gz
+"
+RESTRICT="mirror"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+
+S="${S}.orig"
+
+src_prepare() {
+	EPATCH_SUFFIX="dpatch" epatch \
+		"${WORKDIR}/${MY_P}-${DEB_PL}.diff" \
+		"${WORKDIR}/${P}.orig/${P}/debian/patches/"
+}
+
+src_compile() {
+	$(tc-getCC) traceroute.c -o ${PN} ${CFLAGS} -DSTRING ${LDFLAGS} -lresolv -lm \
+		|| die
+}
+
+src_install() {
+	dosbin traceroute-nanog
+	dodoc 0_readme.txt faq.txt
+	newman ${P}/debian/traceroute-nanog.genuine.8 traceroute-nanog.8
+}
diff --git a/net-analyzer/traceroute/Manifest b/net-analyzer/traceroute/Manifest
new file mode 100644
index 000000000000..95e23b7de5dc
--- /dev/null
+++ b/net-analyzer/traceroute/Manifest
@@ -0,0 +1,9 @@
+DIST traceroute-2.0.20.tar.gz 68907 SHA256 2facba9525c95428d7bff3a313fc6ecfd8c529c678ae666c73015558a0edc271 SHA512 ba82468f5e52a14cf029ff977d85e9cc395bdac2fdf8c29232f9e664bf15efdbaca4f56a78533f2afadd3aef95e31d4497f00f4fc29f74a699a149f0434b484d WHIRLPOOL f7fad8dca126291b17194b6f2f2fd2de98c358d63aa7bcf9e853b888562a8a9c251afdfb85ba5990a7c52f3c4e518b153a1323de0997ce6292113545c133e8b5
+DIST traceroute-2.0.22.tar.gz 69001 SHA256 ee36c35a7dd0ea859734778c1fe95b49a861d30dbf64496ac673c2429f539ada SHA512 f7981188b5aa13b6a6c26e7bb3b6cbab88b1adec53a04bff4b878f800bb32a62d82fa389fb36aefd81cc3e9da31740e095f6b6f7eba4dd5926520ad3cff7a92c WHIRLPOOL b65d03913d497b800c0d9f567e099f1c65bae1bc9c380187039afa4bb18997e7810e5dc69b3ca193d5b86b6a0bbed27e45c28d5b5f51cc12223c085734819050
+DIST traceroute-2.1.0.tar.gz 71460 SHA256 3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6 SHA512 3578007c734091ea0c906637c03fd133a8b0154fbf2e6b5c0c881184947918196bc03aeaf872d3bd53777b9b771cba5cf97f73fb5916bb53b75037f429b40ed3 WHIRLPOOL 3060815a5774c476492acea4532e75bd9253a06602b2f1c0171044341d44e436ae76abed548070820897baece6507ce0dfb90694a001c93412167f59e013a7ba
+EBUILD traceroute-2.0.20.ebuild 948 SHA256 ff687ae934fe9103bde5654a3adadd70b5275f42ab8eb1e1e0fa5418cff9f7c8 SHA512 d868c7d06c04bcd147a82f93de78cc61bb3833ffde4a9f0c970a86bad535bd63f8aaa29cde056cd529a5e784cff3b4efba22af326791ebd8e38824e05fa13795 WHIRLPOOL 0cacec889745a9d8227f6a444dc0e7d7aa2c2d4cd4b0004c037f676a61f9e4a5732459bd8fb8c13a61126ca0395588cfed55c89aed0f672e419d80f207957ba4
+EBUILD traceroute-2.0.22.ebuild 899 SHA256 4f359ac32c44ca2c1a1c0a428a3f3c3eeccbac61301529c8772968c388a5a3e6 SHA512 77968573ab9dde4236a9a4c5322738482a13be38457ed64602f51b3d739a5cbd9d17229da3a9f00cf8f955b161d773c81ef38d701bca0411eaadfd9a6e9faed2 WHIRLPOOL a137cad58475b53b89186349c84dc5a74550cba8c6b989377459ba265ea2c592b86ff1b4eff347b7f5e23d8fb4d77c5ac47874353b1b11eec99a7b1ada134494
+EBUILD traceroute-2.1.0.ebuild 897 SHA256 27fec30925363ba309c316c8187205bb0cece12f32441f145296ed522508e784 SHA512 ffb40681e258cfe2d6b579350ac84431421522012fa5135f5064d0b64b86362babe1c94fc391349718e4190e0fd98a96dc9d58cb0ee120bce826d1859abab847 WHIRLPOOL 3ce652a4ab3624655527f517f54280bd2a4687daa6ed6c309d1fd4686c2bd3059446abc08a5594a4db16685bff1be1c075427e7e9948a6085535c1ac3a6bdfe8
+MISC ChangeLog 3667 SHA256 1c3526d8ec41de631d3686848c2de0474bdb311b1aba37abbc0ab40c588c07bd SHA512 869f3d2b1c8ec4b946e03fb4d7f813e74da66301aba8220886866701c696ec77ab3f2b033587c257d6a0e3501b52361fdb39c3707c635983a1b875096cb67dc7 WHIRLPOOL a861e848d58d66874e6e459f7b8d5c4412b2614bdd8ae6df3029edbbcadd157c126e234da02febb177db767e5a49ec68c49cc115d3eff34da555a32ec65bd91e
+MISC ChangeLog-2015 16040 SHA256 ccb74e093ef279cf4437044f538d29639f7b9de036d463d7625aa586a492be41 SHA512 e623c3d508f213a748a5f9292bec98da20612f488766f0b9c7351553885d5010bd93460ff59f232dda087460db775b9bd81d535537ba660e3c6953a9d295bcfe WHIRLPOOL cb4750c9e49d5b6e4d5587daa2725e39c61479938be4dfd396cd46ecc5a49c3014a55f4bda3b542303c899faf7f0cb6efc613d586bb038516e4bf473c34b7361
+MISC metadata.xml 437 SHA256 5194796cabd2654aec5c5c3057b53333c85953e86d28c744e81ccf6d855ff16c SHA512 928cbbbcefe88681f5f797616d8f8b4de75cf789157afa536a757e7e72f44b07c337105380816aa79713ec143c324ae16577351648357a77267b6625b962924d WHIRLPOOL 371062321f35e44b4ec4b92ac42b5905ef8c51097b2b5822810ff4c6085dde5346ece92a182acede43c782987a6dd8201cc994d3898d31e612cb57d236284c45
diff --git a/net-analyzer/traceroute/metadata.xml b/net-analyzer/traceroute/metadata.xml
new file mode 100644
index 000000000000..bdcc2fb0e8cf
--- /dev/null
+++ b/net-analyzer/traceroute/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>Utility to trace the route of IP packets</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">traceroute</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/traceroute/traceroute-2.0.20.ebuild b/net-analyzer/traceroute/traceroute-2.0.20.ebuild
new file mode 100644
index 000000000000..2591edda883f
--- /dev/null
+++ b/net-analyzer/traceroute/traceroute-2.0.20.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Utility to trace the route of IP packets"
+HOMEPAGE="http://traceroute.sourceforge.net/"
+SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="static"
+
+RDEPEND="!<net-misc/iputils-20121221-r1
+	!net-misc/iputils[traceroute]"
+
+src_compile() {
+	use static && append-ldflags -static
+	append-ldflags -L../libsupp #432116
+	tc-export AR CC RANLIB
+	emake env=yes
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		prefix="${EPREFIX}/usr" \
+		libdir="${EPREFIX}/usr/$(get_libdir)" \
+		install
+	dodoc ChangeLog CREDITS README TODO
+
+	dosym traceroute /usr/bin/traceroute6
+	dosym traceroute.8 /usr/share/man/man8/traceroute6.8
+}
diff --git a/net-analyzer/traceroute/traceroute-2.0.22.ebuild b/net-analyzer/traceroute/traceroute-2.0.22.ebuild
new file mode 100644
index 000000000000..80b2fb236062
--- /dev/null
+++ b/net-analyzer/traceroute/traceroute-2.0.22.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Utility to trace the route of IP packets"
+HOMEPAGE="http://traceroute.sourceforge.net/"
+SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="static"
+
+RDEPEND="!<net-misc/iputils-20121221-r1
+	!net-misc/iputils[traceroute]"
+
+src_compile() {
+	use static && append-ldflags -static
+	append-ldflags -L../libsupp #432116
+	tc-export AR CC RANLIB
+	emake env=yes
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install
+	dodoc ChangeLog CREDITS README TODO
+	dosym traceroute /usr/bin/traceroute6
+	dosym traceroute.8 /usr/share/man/man8/traceroute6.8
+}
diff --git a/net-analyzer/traceroute/traceroute-2.1.0.ebuild b/net-analyzer/traceroute/traceroute-2.1.0.ebuild
new file mode 100644
index 000000000000..35d643119bff
--- /dev/null
+++ b/net-analyzer/traceroute/traceroute-2.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Utility to trace the route of IP packets"
+HOMEPAGE="http://traceroute.sourceforge.net/"
+SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="static"
+
+RDEPEND="!<net-misc/iputils-20121221-r1
+	!net-misc/iputils[traceroute]"
+
+src_compile() {
+	use static && append-ldflags -static
+	append-ldflags -L../libsupp #432116
+	tc-export AR CC RANLIB
+	emake env=yes
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install
+	dodoc ChangeLog CREDITS README TODO
+	dosym traceroute /usr/bin/traceroute6
+	dosym traceroute.8 /usr/share/man/man8/traceroute6.8
+}
diff --git a/net-analyzer/trafshow/Manifest b/net-analyzer/trafshow/Manifest
new file mode 100644
index 000000000000..7006a3215073
--- /dev/null
+++ b/net-analyzer/trafshow/Manifest
@@ -0,0 +1,8 @@
+AUX trafshow-5.2.3-gcc44.patch 215 SHA256 f8fd709d231fee3df37434c4a394912ba16c6953b70813e7dd5696821cc908a5 SHA512 64157530b0605758f083bdccc6729d9f785d08f343fa2d6de22b0f60533c75c8e522ea891a31a3f8137af95075c5004b7b520c8e2dd252ab772b7b9ac6de8212 WHIRLPOOL da124d276c0dd304e198b472091493d866339b606639dcf13ee5322875dc886be29a7fe34c5292d9ea7a6464c4c16cf964d95ffa017724cd83159a71a3c749c5
+AUX trafshow-5.2.3-gentoo.patch 638 SHA256 0021f66ddf4c5648c828c9396b23ae65a9478e43c4866f0edcab6537b917dda5 SHA512 fccba5018a5fd7c1665bc8004507d7689a101dee10560c007e68a77a4c07824ae10954fb3e9555abe3991c495e2bd235bdbb41e3ca027355a1d0a08ea3aff686 WHIRLPOOL e4f82d5b0e036fccb5151940764a817af398bf277eb155bcd7816b5db9f7fb016c73a42ed2efa0143018b4bfd871b2dafc108ab675b4cea6e261db7961efc8b8
+AUX trafshow-5.2.3-tinfo.patch 1864 SHA256 670938611681f771db81e66fffd52a65da1d959b3a2804fa8edd8e62160356bf SHA512 55414a2f014f046b76c678aa6801ed6d5cb1cd9215854b1e0491192b06e42b71aad88a37507a446d13571cf95796807af06a3094f9167a507b3c4e8f1d3bd056 WHIRLPOOL 2282836b3589b733a6abcbb327b2a97770298b5e4f68bba1bb4ab53b60475e5dc7a1c05a99ab4e317ebd95269daf02f2030d0fb61696ae67904e65f13fbb619a
+DIST trafshow-5.2.3.tgz 142615 SHA256 ea7e22674a66afcc7174779d0f803c1f25b42271973b4f75fab293b8d7db11fc SHA512 9ea57c319cb177de2d29eaf2a09c06f0bd7efcfc3e50d5fa5cc18f193c6dfc0109d4388ccbaee7bf2db37b5418fc0f4b6ce47a5558b652ecf9e891a813ef8540 WHIRLPOOL ebdd335029aa6bbd85320f7f587a65f8ca645d4236fae21b2d70ed7351edb8cfea4066491f8a803775d30b840663eef621ef8e9e4fbd321d0f3da08de6d90234
+EBUILD trafshow-5.2.3.ebuild 846 SHA256 f6bbf7020a4b6e0adf5a8656007e7113f64610dfe7331a15c8742d7ab2d08c6d SHA512 548e0a060fd84841d71720c80f09ef2b13eea314d07522b534f2de7eb30669bd21b6d47a0c9331fad1e398e922d6e1e0719435367c27b0fd68a1ff50fe3a7943 WHIRLPOOL 0c684de39b96fadd68ff1848c8432f44bd6a8c7b45f5a350a6ff0d98022a3ced35e6a5b23e2ba8453c39dfee8572672b05832166e482d3a04dc563aa6827871c
+MISC ChangeLog 2542 SHA256 62abc6f1b54bf64da8de2598d33657b3b0bbf2bf795d4ff2af668b1055ab3810 SHA512 e05cf6d7e128a09bf519bd4f08f0d09222ce01c8faed1c74e05975f8638eb24c3e5af0d934eb400ffd2b07253f94752dc51a4598abcb0f21416a3d71be5a5814 WHIRLPOOL 23a1bab841f4805862131a8877514c514c56e6b02d17e14d1e677d9e1ea9288f411a1d4c3f21ef7dc4e8dffad737c1418509c3f697eb5470b7b3754c83f8fd63
+MISC ChangeLog-2015 5413 SHA256 eac5f8d45c2e0d8173438c0adc0b1b20ea2306be2e37e156c42d0671ff5a9cea SHA512 4c16c79b6fc939f05ea023e2491c15eef933e638d6ebd27c42568ad312aa2457f86e88a8a1b456be3ec469bfaa9568d60af2edcfc515de8095a863d6f417ea27 WHIRLPOOL 21db32b033bfa89f0fb71a0b269470d3676c7af55900867eb34b1de9f6d467d3dfe0d81b1c4b4f2f480ce328ee129f103de0c4ea1f846ed39167273a7bd6e3e7
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/trafshow/files/trafshow-5.2.3-gcc44.patch b/net-analyzer/trafshow/files/trafshow-5.2.3-gcc44.patch
new file mode 100644
index 000000000000..02424fe1203a
--- /dev/null
+++ b/net-analyzer/trafshow/files/trafshow-5.2.3-gcc44.patch
@@ -0,0 +1,11 @@
+--- a/session.c
++++ b/session.c
+@@ -40,7 +40,7 @@
+ #define	ASYNC_MODE	FNDELAY
+ #elif	O_ASYNC
+ #define	ASYNC_MODE	O_ASYNC
+-#elif
++#else
+ #error the fcntl argument to turn ON/OFF non-blocking I/O is unknown
+ #endif
+ 
diff --git a/net-analyzer/trafshow/files/trafshow-5.2.3-gentoo.patch b/net-analyzer/trafshow/files/trafshow-5.2.3-gentoo.patch
new file mode 100644
index 000000000000..95d342a603a4
--- /dev/null
+++ b/net-analyzer/trafshow/files/trafshow-5.2.3-gentoo.patch
@@ -0,0 +1,15 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -73,9 +73,9 @@
+ 	@echo 'char compiled[] = "$(CC) $(CFLAGS) $(LIBS)";' >> $@
+ 
+ install:
+-	./install-sh -c -s -m 555 -o bin -g bin $(PROG) $(BINDEST)/$(PROG)
+-	./install-sh -c -m 444 -o bin -g bin $(PROG).1 $(MANDEST)/man1/$(PROG).1
+-	[ -f /etc/$(PROG) ] || ./install-sh -c -m 444 .trafshow /etc/$(PROG)
++	./install-sh -c -m 755 -o root -g root $(PROG) $(DESTDIR)$(BINDEST)/$(PROG)
++	./install-sh -c -m 644 -o root -g root $(PROG).1 $(DESTDIR)$(MANDEST)/man1/$(PROG).1
++	[ -f $(DESTDIR)/etc/$(PROG) ] || ./install-sh -c -o root -m 644 .trafshow $(DESTDIR)/etc/$(PROG)
+ 
+ clean:
+ 	rm -f $(CLEANFILES)
diff --git a/net-analyzer/trafshow/files/trafshow-5.2.3-tinfo.patch b/net-analyzer/trafshow/files/trafshow-5.2.3-tinfo.patch
new file mode 100644
index 000000000000..0fd4985794d8
--- /dev/null
+++ b/net-analyzer/trafshow/files/trafshow-5.2.3-tinfo.patch
@@ -0,0 +1,75 @@
+--- a/configure.in
++++ b/configure.in
+@@ -23,6 +23,9 @@
+ AC_PROG_CC
+ AC_PROG_YACC
+ AC_PROG_LEX
++
++PKG_PROG_PKG_CONFIG
++
+ AC_REQUIRE_CPP
+ AC_AIX
+ ACX_PTHREAD(, AC_MSG_ERROR(cannot find pthread; see the INSTALL notes))
+@@ -51,7 +54,7 @@
+ 	)
+ )
+ if test "$ac_cv_type_in_addr_t" != yes; then
+-	AC_DEFINE_UNQUOTED(in_addr_t, $ac_cv_type_in_addr_t)
++	AC_DEFINE_UNQUOTED([in_addr_t], [$ac_cv_type_in_addr_t], [addr_t])
+ fi
+ 
+ AC_CACHE_CHECK(for socklen_t, ac_cv_type_socklen_t,
+@@ -65,7 +68,7 @@
+ 	)
+ )
+ if test "$ac_cv_type_socklen_t" != yes; then
+-	AC_DEFINE_UNQUOTED(socklen_t, $ac_cv_type_socklen_t)
++	AC_DEFINE_UNQUOTED([socklen_t], [$ac_cv_type_socklen_t], [socklen_t])
+ fi
+ 
+ AC_CACHE_CHECK(for struct sockaddr_storage, ac_cv_sockaddr_storage,
+@@ -79,7 +82,7 @@
+ 	)
+ )
+ if test "$ac_cv_sockaddr_storage" != no; then
+-	AC_DEFINE(HAVE_SOCKADDR_STORAGE)
++	AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, [have sockaddr_storage])
+ fi
+ 
+ AC_CACHE_CHECK(for struct ether_addr, ac_cv_ether_addr,
+@@ -94,7 +97,7 @@
+ 	)
+ )
+ if test "$ac_cv_ether_addr" != no; then
+-	AC_DEFINE(HAVE_ETHER_ADDR)
++	AC_DEFINE(HAVE_ETHER_ADDR, 1, [have ether_addr])
+ fi
+ 
+ dnl Check for network system libraries.
+@@ -144,20 +147,21 @@
+ case "$ac_cv_have_curses" in
+ 
+ slang)
+-	AC_DEFINE(HAVE_SLCURSES)
+-	AC_DEFINE(HAVE_HAS_COLORS)
++	AC_DEFINE(HAVE_SLCURSES, 1, [have slcurses])
++	AC_DEFINE(HAVE_HAS_COLORS, 1, [have colors])
+ 	;;
+ ncurses)
+-	AC_DEFINE(HAVE_NCURSES)
++	PKG_CHECK_MODULES(ncurses,ncurses, [LIBS="$LIBS $ncurses_LIBS"], [ncurses not found])
++	AC_DEFINE(HAVE_NCURSES, 1, [have ncurses])
+ 	AC_CHECK_FUNCS(has_colors)
+ 	;;
+ n_curses)
+ 	CFLAGS="-I/usr/include/ncurses $CFLAGS"
+-	AC_DEFINE(HAVE_NCURSES)
++	AC_DEFINE(HAVE_NCURSES, 1, [have n_curses])
+ 	AC_CHECK_FUNCS(has_colors)
+ 	;;
+ curses)
+-	AC_DEFINE(HAVE_CURSES)
++	AC_DEFINE(HAVE_CURSES, 1, [have curses])
+ 	AC_CHECK_FUNCS(has_colors)
+ 	;;
+ *)
diff --git a/net-analyzer/trafshow/metadata.xml b/net-analyzer/trafshow/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/trafshow/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/trafshow/trafshow-5.2.3.ebuild b/net-analyzer/trafshow/trafshow-5.2.3.ebuild
new file mode 100644
index 000000000000..9cde85d61f47
--- /dev/null
+++ b/net-analyzer/trafshow/trafshow-5.2.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Full screen visualization of the network traffic"
+HOMEPAGE="http://soft.risp.ru/trafshow/index_en.shtml"
+SRC_URI="ftp://ftp.nsk.su/pub/RinetSoftware/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="amd64 hppa ~ppc ppc64 sparc x86"
+IUSE="slang"
+
+DEPEND="
+	net-libs/libpcap
+	!slang? ( sys-libs/ncurses )
+	slang? ( >=sys-libs/slang-1.4 )
+"
+
+src_prepare() {
+	cat /usr/share/aclocal/pkg.m4 >> aclocal.m4 || die
+	epatch \
+		"${FILESDIR}"/${P}-gcc44.patch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-tinfo.patch
+	eautoreconf
+}
+
+src_configure() {
+	if ! use slang; then
+		# No command-line option so pre-cache instead
+		export ac_cv_have_curses=ncurses
+		export LIBS=-lncurses
+	fi
+
+	econf
+}
diff --git a/net-analyzer/tsung/Manifest b/net-analyzer/tsung/Manifest
new file mode 100644
index 000000000000..6c2868bec5a6
--- /dev/null
+++ b/net-analyzer/tsung/Manifest
@@ -0,0 +1,7 @@
+DIST tsung-1.6.0.tar.gz 1585794 SHA256 56846c3a90fd7037d9a76330cb8f3052238344491e2fe6ef1ebdb0b620eb3d84 SHA512 c66a84fc9b6781398ed4dee67f076fcddca28c5156782c05d6f5d7ce3e5e2ed6dbdb4076585f45a42aea65237b68aa08c8c80539706202a10cfec4e3ac8170cd WHIRLPOOL 3f083239c6c0950b6420dd7d401d0267f30655f5a3470f136326e6cc35414f779d58eb8e8aeac40eecb279976f5228369e5786e9df2b582e4ed75b45dc9fd35b
+DIST tsung-1.7.0.tar.gz 1572265 SHA256 6394445860ef34faedf8c46da95a3cb206bc17301145bc920151107ffa2ce52a SHA512 67490a95fb54f5196ae0302190190a6b8e79bbeba9a7c1932d83a949504489d4cc3ce048380c0cb09c6cae4c1e203d52de9ea0e2f4e7c3d7438b836aef532dac WHIRLPOOL f9175aebcff944b13550a11d10cd20cae8a0a1afadf6b40ab30aad6b02894008db0b340ff48f32ef76c0856be9921c4fcf2d877120937d1fe1ab869efe36825c
+EBUILD tsung-1.6.0.ebuild 738 SHA256 4a631ff438f139be7bd135e4b9206086b7b71553d1bb7231760fce7e881ddc06 SHA512 12fbc734c700bb8e019bae98edbfdc68dd7c526bfb39fef52812ac493d11953157a97b92241893788b3b65724709cd973135badc436661314a8a14e207f655dc WHIRLPOOL 18dbf116173778e196ab6c3fb5a6f5bb4f81e741deb4c91af849600863417349cfba6a1fbd2247673cf5dc148b0211074f038c8908b0784cdf1f83894c25e059
+EBUILD tsung-1.7.0.ebuild 738 SHA256 5ab2fc7b07edb989bb2ccfd47410674baa54abb05179d5ea550d41a7f70e9df8 SHA512 b4c4badf3577f83f7a42fc7135157b6b5410a0535a3310b46eaf13fee0eed826155e32a851448f6e0c90422518bf6874b8f307eb2e17788f44e5eeb466bc90f8 WHIRLPOOL 1eac7a80b3d8b9d9e889ec5498991ebc74a615026dc489e7dbe437b8b5a6127a3e22d688db47aa1a290d9455e702013c22e19f157b71cb6cb50a339d7204ece7
+MISC ChangeLog 2222 SHA256 7d12ee3c0e697febf9e68a8e16ce6f796f7e5f654621c251327bfac73f92b520 SHA512 616cbac6a8e857fc5740e1e229f2a00911d6b853d856bdc02f5d791db2ee2c535a409c4d3b3a8449105378dfdc705a70aa4012b3c79af051f404285956126d3d WHIRLPOOL 6de2c90611c80b760602adeb9a193647245d9f54d9edf3dfa378d7c9a458c19380e4dd16a54ef0ccc158498a76ab32b6c89e5de989a35c26858e47f6456628bf
+MISC ChangeLog-2015 1101 SHA256 1638ccf34fd75d1dd06b6630927c8b5f34aaf5b2f563d51c974c7f762bee7f33 SHA512 da249b8670836150c7fbddb1eee9b0aa1685e51327fdd8238467108c2564f0c506dfc4b88307fc9920347f62e3e14612946cecd568dd66a11a2bf87a86b3f441 WHIRLPOOL ade75957c9bf0e996da358e14ffb029e5063ffbc2474b189f35dc8fddeb7304a5ad3045475f3a93a5113c69fb5d8735674f2ab9efdea7f30a5a98ddb1cfc9792
+MISC metadata.xml 247 SHA256 0deec0776f26fb762fdf7711f4589b14f52a2456436ef557eec62a2cf2fb2bb7 SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7 WHIRLPOOL a135fa622e99d3dcdb432bc6b3c366076b3d86b4bfd9a76c852d781b8e9152541c7e7a2c7c6d6a3c4d2200dce792847a08166aaf7c17c22b6299dfe868234dec
diff --git a/net-analyzer/tsung/metadata.xml b/net-analyzer/tsung/metadata.xml
new file mode 100644
index 000000000000..40aa45df2b01
--- /dev/null
+++ b/net-analyzer/tsung/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/tsung/tsung-1.6.0.ebuild b/net-analyzer/tsung/tsung-1.6.0.ebuild
new file mode 100644
index 000000000000..532e451fbaf4
--- /dev/null
+++ b/net-analyzer/tsung/tsung-1.6.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+
+# Seems to be misconfigured
+RESTRICT="test"
+
+inherit eutils
+
+DESCRIPTION="Erlang's multi-protocol distributed load testing tool"
+HOMEPAGE="http://tsung.erlang-projects.org/"
+SRC_URI="http://tsung.erlang-projects.org/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnuplot"
+
+DEPEND="dev-lang/erlang"
+RDEPEND="
+	gnuplot? (
+		sci-visualization/gnuplot
+		dev-perl/Template-Toolkit
+	)
+	${DEPEND}
+"
+src_configure() {
+	./configure --prefix="/usr" || die "econf failed"
+}
+
+src_compile() {
+	emake || die "Failed building"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "Failed installing"
+}
diff --git a/net-analyzer/tsung/tsung-1.7.0.ebuild b/net-analyzer/tsung/tsung-1.7.0.ebuild
new file mode 100644
index 000000000000..d2d90fd44c21
--- /dev/null
+++ b/net-analyzer/tsung/tsung-1.7.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# Seems to be misconfigured
+RESTRICT="test"
+
+inherit eutils
+
+DESCRIPTION="Erlang's multi-protocol distributed load testing tool"
+HOMEPAGE="http://tsung.erlang-projects.org/"
+SRC_URI="http://tsung.erlang-projects.org/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnuplot"
+
+DEPEND="dev-lang/erlang"
+RDEPEND="
+	gnuplot? (
+		sci-visualization/gnuplot
+		dev-perl/Template-Toolkit
+	)
+	${DEPEND}
+"
+src_configure() {
+	./configure --prefix="/usr" || die "econf failed"
+}
+
+src_compile() {
+	emake || die "Failed building"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "Failed installing"
+}
diff --git a/net-analyzer/ttcp/Manifest b/net-analyzer/ttcp/Manifest
new file mode 100644
index 000000000000..af6d65ee045e
--- /dev/null
+++ b/net-analyzer/ttcp/Manifest
@@ -0,0 +1,6 @@
+DIST ttcp-1.12.tar.bz2 8086 SHA256 a87b7b7fb14a0d067a49905c66cee2f552efc0d326b6734ec3d160518febd5a8 SHA512 2218f801a04964dcc684bac2957f892569e4458eb7770e26d4ac5a9a5beebb16b9191cacd8e60cceee306b8fe53000248b52457cb679a3d12ad4308bb0066dbb WHIRLPOOL 75f3b7a0f4c5d2e6da0392078f2fa27ffe1bb4413cecffe947fa13b74f477869fa65f8a253215a4a6d970d7d8324a7fd824cad82ae03d7958523338fa85fd268
+DIST ttcp.c 23690 SHA256 52f438ef4f57ddbdd1e0dcd77efeffbdf10e59ff09279cff2fcc717803536612 SHA512 8fc800b05fcf3590d15a87983ac7abc3646c6d4a89f7cc6b91e495066a90a6ce21f7bd7b6ab21e09f07bfa20c39bdc7bcec479449d7cd2b88639dc6cca4a432e WHIRLPOOL ff33d64e541207d2c3bf62facf20038fb63ed00a71b4347a0610e25ad0122dea839b281ff8e871fabd4bfbd64ba4bde01d6fa5dde840e65924e15ecb6d5e818b
+EBUILD ttcp-1.12-r2.ebuild 634 SHA256 05c13101bcc19923b1f768b615c451732d2a720e6f9a32f0892fb2fd4ea02e34 SHA512 3791209037fba45fbedd835301bf3ca105de6a79c6f86beab09a1138786973bf670bee017d82a29bb54747b3098f204643c0e5467956b7db49087d0569d8a91f WHIRLPOOL f89965c6dca6c6659bf93c7b540c92703746b991bd1bc2184903e16803f2600a721b6675fa766d592c5298cabd94c2f26b5d384d9ed57c8e5bb0d706383f5eb6
+MISC ChangeLog 2456 SHA256 cff62fa2b5e550ca0d796043d942c3b0e941125e8f74f404c4ad03580d5c08e0 SHA512 a5b11e22bd412f36c529bd79dd511206f495eca4817815cf052a13e373aa0dbe691ce54d610a0717032eee36f84b6fd957164248ee4329ffd5291092740a9196 WHIRLPOOL 442780460b00808a9ebfa3b9d0074118ec4164d2d2ddb8b72c4d4f2d5f05b929ad4f8e7e8e050fa90529cc84bf49819884f77773ec322daa6bc75012881f690f
+MISC ChangeLog-2015 3237 SHA256 ab6a264ccff77a37a54c3d7d62c35f7cf83868202b37ab38e4ec7b5f7bdcfb7d SHA512 77d48a8782a52b0d2632c5ff67de306d5f90018d0d79ecb3a7cc0579e87890f98224f45638899e67660ef3b4d44557bc7dcb4ac4d61103e1285eb7af3c0bc098 WHIRLPOOL 38922f24101bbf3df0fdc50c78a3ad32a0b1bc1fc277ffd5b1411711634fec60c00176a51f0ff4f3649d593c1148f66f6b1528efd8c3d8f600e49960b6dc68b6
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/ttcp/metadata.xml b/net-analyzer/ttcp/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/ttcp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/ttcp/ttcp-1.12-r2.ebuild b/net-analyzer/ttcp/ttcp-1.12-r2.ebuild
new file mode 100644
index 000000000000..14f85101f144
--- /dev/null
+++ b/net-analyzer/ttcp/ttcp-1.12-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="Tool to test TCP and UDP throughput"
+HOMEPAGE="
+	http://ftp.arl.mil/~mike/ttcp.html
+	http://www.netcore.fi/pekkas/linux/ipv6/
+"
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+SRC_URI="
+	mirror://gentoo/${P}.tar.bz2
+	http://www.netcore.fi/pekkas/linux/ipv6/${PN}.c
+"
+
+src_compile() {
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} "${DISTDIR}"/${PN}.c || die
+}
+
+src_install() {
+	dobin ${PN}
+	newman sgi-${PN}.1 ${PN}.1
+}
diff --git a/net-analyzer/upnpscan/Manifest b/net-analyzer/upnpscan/Manifest
new file mode 100644
index 000000000000..70e509384316
--- /dev/null
+++ b/net-analyzer/upnpscan/Manifest
@@ -0,0 +1,6 @@
+AUX upnpscan-0.4-r2-cflags.patch 967 SHA256 d6d5a0cffa816fb8314e7e8d36d986b5d6cce8d0353cf18c885aad8027633d76 SHA512 69115c3f63af1ef29151e541aa99e7af8325a1c63c5453f4fa3cfa2cdb74959f0b6f7c1098bd87003aa290421bfe97dcd49a7c1f565a9c554b3158c54962afbc WHIRLPOOL 1809bf16416c4220a327148d3bf363db79b92364fe162f5ec2e9865d9c22d2f236838647783103ec5c20dc1bf0221fbe4df74d5c736a3323073fa5ea7a4e99b1
+DIST upnpscan-v0.4-src.tgz 309011 SHA256 0d41d63efcc9ed15133306d9996ec72a07ddb047552fca0ac417eeb412db045b SHA512 d7791afdc6d3f318a1a29486485ab5f71a1a32159a2212164c763748a047c8243e3017afc887e9394ae78ffc2412091ed590a714c4a482b44792ae8a835e095e WHIRLPOOL 34b3fa2756577ebb637cd8486effc2356601b1dc9ec742e19b43e1a8bbe01b9ee08fbb5bc9bc0cdb9e02579188c5c6f4d8bbc305cfa7ca328827f25cb886ca40
+EBUILD upnpscan-0.4-r3.ebuild 513 SHA256 9a25a8674f3b34cae737ae5f0c0a9a10ae7feb1c04bd8f6b1cdba8aa4acefbb2 SHA512 0441a0668f8b413a892a0072c082eb1576bf903c20cd25576e3d1e639de6ce418b18dadaf3eeeafe86fd320008cd5fbd8d4817bf58c59ce98ac0eef5ab493530 WHIRLPOOL 459c4a3725b49a21ca16ec13de2314637167c52f176370c66bc29a95ca5a861b13e54694a98c1355f282fd2e05d2f95435b7812192a5e380d2cb41c6856d3571
+MISC ChangeLog 2473 SHA256 4f93d9722e630da7283cc14a884162c410d37f73926980a9d9a0062446608731 SHA512 fe29101320f86f85ee1b68b136601e51e13e8eaf2af5535ce4ed7efc32215f90368a47c9e2ee6aaff63f7683b2241bcc26dc232b57788822247258e0373dfbf8 WHIRLPOOL 60bee309d40d3369ab747d6d2efe5dc74f117e7308c67cb9a641b809c7b0caac56611ec930486e31397f5ed2e92beb08737d7ea77c36f477d8f4746bfff97746
+MISC ChangeLog-2015 2717 SHA256 86c95ce5f8b395c3600a7c3e527272da4d582eccc1c525d4b3f204b71a539016 SHA512 e5b3a8052aa35b9af8ae6d5f92205d0278f0d72a9fefa2bb20bb280f97c7ee8895e2d1281eee7fe5531f7b25c8f7f468c356084a8e0dc11a327d8f24d2511e68 WHIRLPOOL cc6095406da38c401df06510fa3851f7f08b267c15299357e9119bd921b7c50228b31bf3b745e000049ee49234ed26c2782c0cf1d05aa949baeae51d2e313a3a
+MISC metadata.xml 508 SHA256 f4f79745be2bb5d63e8f37cacfc44e56e388d10c650ec245b3120555dacef507 SHA512 e96d83ebf9190d887b037a1eca1aa797a39df2180ffb95cdeeeeab9e793fafea0c23a5832fdc507d1e2be4275da1e3a5cf9f1baf96f543238cd1d3945b797d00 WHIRLPOOL 71a278d160142430bba01765408e77467136e30427139930ca3e8aef6150854eb6142786baa839991a08b57e7cde9eb7d567f8e7756cb0119e5ca2183b1d0f10
diff --git a/net-analyzer/upnpscan/files/upnpscan-0.4-r2-cflags.patch b/net-analyzer/upnpscan/files/upnpscan-0.4-r2-cflags.patch
new file mode 100644
index 000000000000..46be9888ec7c
--- /dev/null
+++ b/net-analyzer/upnpscan/files/upnpscan-0.4-r2-cflags.patch
@@ -0,0 +1,51 @@
+--- a/configure.in	2005-06-23 17:02:57.000000000 +0200
++++ b/configure.in	2010-11-01 04:44:44.000000000 +0100
+@@ -8,12 +8,10 @@
+ AM_CONFIG_HEADER(config.h)
+ 
+ AC_ISC_POSIX
+-CFLAGS=""
+ AC_SUBST(CFLAGS)
+ AC_PROG_CC
+ AM_PROG_CC_STDC
+ AC_HEADER_STDC
+-AM_PROG_LIBTOOL
+ 
+ dnl Checks for programs.
+ 
+--- a/Makefile.am	2005-06-23 12:32:13.000000000 +0200
++++ b/Makefile.am	2010-11-01 04:46:41.000000000 +0100
+@@ -5,20 +5,6 @@
+ 
+ SUBDIRS = src
+ 
+-upnpscandocdir = ${prefix}/doc/upnpscan
+-upnpscandoc_DATA = \
+-	README\
+-	COPYING\
+-	AUTHORS\
+-	ChangeLog\
+-	INSTALL\
+-	NEWS\
+-	TODO
+-
+-EXTRA_DIST = $(upnpscandoc_DATA)
+-
+-
+-
+ # Copy all the spec files. Of cource, only one is actually used.
+ dist-hook:
+ 	for specfile in *.spec; do \
+--- a/src/Makefile.am	2005-06-21 22:57:32.000000000 +0200
++++ b/src/Makefile.am	2010-11-01 04:53:22.000000000 +0100
+@@ -7,10 +7,6 @@
+ INCLUDES =\
+ 	 -I../include
+ 
+-AM_CFLAGS =\
+-	 -Wall\
+-	 -g
+-
+ bin_PROGRAMS = upnpscan
+ 
+ upnpscan_SOURCES = \
diff --git a/net-analyzer/upnpscan/metadata.xml b/net-analyzer/upnpscan/metadata.xml
new file mode 100644
index 000000000000..87ebba397bfa
--- /dev/null
+++ b/net-analyzer/upnpscan/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<longdescription>
+A tool that scans the LAN or a given address range for UPnP capable
+devices. This is done by sending M-SEARCH discovery packets to either
+the UPnP multicast address or to the specified ip range.
+</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/upnpscan/upnpscan-0.4-r3.ebuild b/net-analyzer/upnpscan/upnpscan-0.4-r3.ebuild
new file mode 100644
index 000000000000..91839f3352c1
--- /dev/null
+++ b/net-analyzer/upnpscan/upnpscan-0.4-r3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils
+
+DESCRIPTION="Scans the network for UPNP capable devices"
+HOMEPAGE="http://www.cqure.net/wp/upnpscan/"
+SRC_URI="http://www.cqure.net/tools/${PN}-v${PV}-src.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+S=${WORKDIR}/${PN}
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+PATCHES=( "${FILESDIR}"/${P}-r2-cflags.patch )
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
new file mode 100644
index 000000000000..06ac28a3be46
--- /dev/null
+++ b/net-analyzer/vnstat/Manifest
@@ -0,0 +1,14 @@
+AUX vnstat.cron 220 SHA256 b6b437c680606061b98af19758cbacc3f883f73cd86f0bbfbcfe756c982cd3fd SHA512 c901385f97323d1a686cee63d015eaf9ad38ed195a1c0e25dae671dd7061ebc918498684c55b90b0674960891dfca4b83f458174892c1b9efb48cd362fdb8477 WHIRLPOOL 1432dfdfdf2f121deeff6f8147b344ff61838a8fe54d7bc5bb3ac6c1b9675a64b6e331bd3e33ee0e9fe2488bde42ad8c4e279ea3b1d1d5ed304b4b2ef4205429
+AUX vnstat.cron-r1 177 SHA256 614966fa153b024515a4d6363d3046df9bdda07c7d18bc7aeb4f8347d80e7134 SHA512 8074d65cf2f28bd5c02fe741dbe20f8404bc2e25b94b43d0bcc829ca088828227805caf9cb8cae020ae0a9370d68dc3c757fedf07d48c0fc71ba944f2da1cb94 WHIRLPOOL 9c44e29673064d7c1ac77f8af0bd5aa3117bb46560f4cddee829a3e6a3d617ba468a867298d6d7e58c840c752402e35a8b82dedd8571d13454a167bdbc188676
+AUX vnstatd.confd 216 SHA256 2cd5b91f86bc26aca85166a50de89faaccbf1ea8f219efb48b50b7ed0f3fe377 SHA512 d645817913d5b52e928561b3d6a0e869d8ae5db81b97af91c1ebfc6a8cd2df666c1653e6dc5f91c0a890033a89692f77eaf081c1cae5590446c69a70ea263946 WHIRLPOOL 3a974a3dc30a33a3a2ca22db551068f1df3444f4248e896482e26d1c5b0bd717706ef30e18f5a6ee193966bef1466a13d3c6ad35e86f42f025ebb3c02e622a22
+AUX vnstatd.confd-r1 569 SHA256 e5820c6557cd578faf31c6d5060606e9fe4c024d5f91a90e9b4701c4677fbb5f SHA512 2d5370623ac886e424380100474506b6c2076bfb522fd8ead789af41aeb89b7f3f23c6aa85520d7cc84a53d36926a433b631b5bafe837c9ad04ba04dd7e11553 WHIRLPOOL f943bac6f03d61bd70cbad66f2c96a6b41a4f98ce83671a9430d620fa90f295ad76f007a23304b359a127713567a2df25f5559f1ebf098f0ecf44558267c4e0b
+AUX vnstatd.initd-r1 867 SHA256 631738731bf78a6d0c00c5180c2b3a75b96fffb596d8c9e04dbb0cd24fcc4fec SHA512 6ad3a29a9a376e7dc19279f7effd643b7f55e66461925689c0a7bc43d3484d001d9c027b53e16b3b5b526f45fb0cc47d31f68b2d3137fbb9203e03e66795304f WHIRLPOOL f07914af933371c2b264d4bb67b87ea835dc3f6d7c5b1a069a5166dc4f7b30c0397c01513299f4ddb1bd8f366c852318b4d65275353893f292cefd30a4d0b584
+AUX vnstatd.initd-r2 874 SHA256 5ce75e189239ab52b9114defda6c46f57c18ed88d0ffc8116def3bc6df3831c5 SHA512 1d670980c73a40c92029a3b2141e84d428f41d68528daf199fb6659f164bec903eeef437200da4043d2e6fd3f5abf32c7b6e75dc00054417ff4f38ad55b0a535 WHIRLPOOL 4025c1381c2b30eec2dd01f7f7d069c64d203c80405a94a2ce2e944e0bdf0ad210bd8701fa11d27429bf86f5739559bc41d2411069e6a2678cfbe5654a8a738b
+AUX vnstatd.systemd 262 SHA256 26c4a8e6e1800fd912229bb9463355cde8591261d51f4936765bb94a4ea25cff SHA512 35f9714641d1b3288bed659bd010ef1b8f0316f915622dcf5d3250e1acdd3b438762ae934fab2f6cd350274c7ec0f70a7d8946448bbc6db67be6f91cd86aa47c WHIRLPOOL 3d7f67a773204d3f933c7692b006419376aeead550c3bd169545586f7e7f69deb20585b44bd264be5ec0e83002f2cab3c8d8e11d4d12103fe07c3ae84b52df9f
+AUX vnstatd.tmpfile 35 SHA256 91c9577f36c7f7ec32bb2963035a6ac49e7556ac6adc41564c033db8889b669e SHA512 e13b52e3c4fe8743074ab2704b6a6cbe0c855589fe19e05bba98f0193473437f350dfdc9675689172c54ed83491d9caef0cbb842f6c2533b98366cd78a4f0bac WHIRLPOOL dd6b74ff518ba3b652b3db0519bb45a370c50341ba5e1c8f37b01c2a5dc03341dffda2a88e389e66f6d620fa90a63f6ddf5e05c474d92d7644be156312989cda
+DIST vnstat-1.17.tar.gz 238397 SHA256 18e4c53576ca9e1ef2f0e063a6d83b0c44e3b1cf008560d658745df5c9aa7971 SHA512 c9c119a89054dacdc15026c766a20d88336d7689dd4264530d0347fcc58f3cbfc806b271e0f83e76c3b4a31ab793a628ee7d7b696943da919ee4cd2fdb481cc3 WHIRLPOOL 38f64c6eadf7bbfcc1cd6cc3d8f8ea3da4846dd64caf242628ce9d0e6f9b8f565dff9d31ecd1633b3a0a8b5e7dcd4545f1adeafeb4f42547ad87be77317622e3
+EBUILD vnstat-1.17-r1.ebuild 3245 SHA256 eef8bbf28b4d7b375d1c1bc7641c3030905d1af52eda262b511404919bc7a2e9 SHA512 e057cc84373e4c60fe84e97836a066067b54ce13409f3eb83033fcd3f73dc7186276a00b89793602dbfc68d9a5dfa0cf18ba4619dcb6bd47a1bdf14b9a8bd6f7 WHIRLPOOL 2a0d5e64c8c23db5df2b119f5b797995cb4577c1ca6233aad80809019887046ecf5ccccd51fd1470b08753db73ca56629c115ac4f81d1571fec3cdeb3821229c
+EBUILD vnstat-1.17.ebuild 1430 SHA256 d05f7cede84c40a709d44a69e1717fb1d9a801df75ce95a51f6ec144aa58a8d8 SHA512 14d709e9ba19b7707d62fd5a82dc483f50b76efa884015a14600dd1489132a1c0a687444b802bbd917252acbfa84c291210cd2078778a16796d0bacb576b360d WHIRLPOOL 1bab57fa5b8b832d7277c4b05820af2898b66f9c5b4617ebcbdd52049020e87344f5e78c44756571ae1bc2201fda0a0fa36dbb9ce6078e4dd8aeaee1080d109c
+MISC ChangeLog 4350 SHA256 8dc324d38ef67a70ae4206f377deed192838d9685f91f11e4faf44045ae48dd4 SHA512 cef200253f77a3059ed18d1630da13c5f33aad335d2399d0fc8e94f687643a983e02fd749480324f77ba0d905e95196ffb73e3d238d1d0436b5b75fa05f30d19 WHIRLPOOL 3a3cf0f596faa146a4127436274dbaec11a604ed129cd95709027701c0b41827012a2db7564b0d1812e1bf726aa47c437c374e245ce0386e6277677cea15eb4c
+MISC ChangeLog-2015 9786 SHA256 db76c2eba2b1cd31b5afd4096dd5e15479842d0dc2835c22b4b6c70d7be0f0c5 SHA512 483b71d6778421520e2696c2ed0e2efc480a40f7f4a36ea0aeaa6fe02b386393c4805f551079e1d304eb73d1c1a443248b6b3449dba7e6734eb0ea54fbdd93bf WHIRLPOOL f721d1991070b8dc468a8ca6d6692b049d8e2ed78ae3100ab0dcc67246c3a005f9cbe2016bc8c45015a92d6d9393070d7f9cf30b0eefbedcebbcc9d6731be09e
+MISC metadata.xml 603 SHA256 943206494ad02b8a7ffbcd0a23032a7f89186eec391aadbe025ea370d6db5b62 SHA512 7dbda5d3a317201c8eb0000f2b55af6b2de6fd44368ab39b08c60ee8eb1355264a8886d9a484ab75d47c0c0ce3f41059a8f354f7d6480ae20e469e4c29ca31e2 WHIRLPOOL c3e1e3cfc44e205edac088ade0205e3f555bb32fdc75f00db031e0f5594d8abe1a6c9120a18f725828b3b3ad2e645e23bf4e0360e0872a0ff7b215ef12e51458
diff --git a/net-analyzer/vnstat/files/vnstat.cron b/net-analyzer/vnstat/files/vnstat.cron
new file mode 100644
index 000000000000..690681327688
--- /dev/null
+++ b/net-analyzer/vnstat/files/vnstat.cron
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# run vnstat if installed and at least one database exists
+
+# Uncomment the following to enable
+
+#if [ -x /usr/bin/vnstat ] && [ `ls /var/lib/vnstat/ | wc -l` -ge 1 ] ; then
+#    exec /usr/bin/vnstat -u
+#fi
diff --git a/net-analyzer/vnstat/files/vnstat.cron-r1 b/net-analyzer/vnstat/files/vnstat.cron-r1
new file mode 100644
index 000000000000..178133675c6f
--- /dev/null
+++ b/net-analyzer/vnstat/files/vnstat.cron-r1
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# run vnstat if installed and at least one database exists
+
+if [ -x /usr/bin/vnstat ] && [ `ls /var/lib/vnstat/ | wc -l` -ge 1 ] ; then
+	exec /usr/bin/vnstat -u
+fi
diff --git a/net-analyzer/vnstat/files/vnstatd.confd b/net-analyzer/vnstat/files/vnstatd.confd
new file mode 100644
index 000000000000..17901419aacb
--- /dev/null
+++ b/net-analyzer/vnstat/files/vnstatd.confd
@@ -0,0 +1,7 @@
+# /etc/conf.d/vnstatd: config file for /etc/init.d/vnstatd
+
+# Adjust scheduling priority on vnstatd (default: 0)
+#VNSTATD_NICELEVEL="0"
+
+# Pass extra options to vnstatd
+#VNSTATD_EXTRAOPTS="--config /etc/vnstat.conf"
diff --git a/net-analyzer/vnstat/files/vnstatd.confd-r1 b/net-analyzer/vnstat/files/vnstatd.confd-r1
new file mode 100644
index 000000000000..33edf3560ee8
--- /dev/null
+++ b/net-analyzer/vnstat/files/vnstatd.confd-r1
@@ -0,0 +1,18 @@
+# /etc/conf.d/vnstatd: config file for /etc/init.d/vnstatd
+
+# Configuration file
+VNSTATD_CONFIGFILE="/etc/vnstat.conf"
+
+# PID file
+VNSTATD_PIDFILE="/run/vnstat/vnstatd.pid"
+
+# Options to vnstatd
+# See vnstatd(8) for more details
+# Notes:
+#  * Do not specify another PIDFILE but use the variable above to change the location
+#  * Do not specify another CONFIGFILE but use the variable above to change the location
+VNSTATD_OPTS=""
+
+# Wait x milliseconds after starting and check that daemon is still running.
+# See start-stop-daemon(8) for more details
+SSD_STARTWAIT=500
diff --git a/net-analyzer/vnstat/files/vnstatd.initd-r1 b/net-analyzer/vnstat/files/vnstatd.initd-r1
new file mode 100644
index 000000000000..a8d61efe0f2a
--- /dev/null
+++ b/net-analyzer/vnstat/files/vnstatd.initd-r1
@@ -0,0 +1,37 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+
+depend() {
+	use net
+}
+
+VNSTATD_PIDFILE="${VNSTATD_PIDFILE:-/run/vnstatd/vnstatd.pid}"
+
+start() {
+	ebegin "Starting vnstatd"
+	checkpath -q -d -m 755 -o vnstat:vnstat /run/vnstatd
+	checkpath -q -d -m 755 -o vnstat:vnstat /var/lib/vnstat
+	start-stop-daemon --start --quiet \
+		--pidfile "${VNSTATD_PIDFILE}" \
+		--user vnstat --group vnstat \
+		--nicelevel ${VNSTATD_NICELEVEL:-0} \
+		--exec /usr/bin/vnstatd -- \
+		-d ${VNSTATD_EXTRAOPTS} -p ${VNSTATD_PIDFILE}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping vnstatd"
+	start-stop-daemon --stop --quiet \
+		--pidfile "${VNSTATD_PIDFILE}"
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading vnstatd configuration"
+	kill -HUP $(cat "${VNSTATD_PIDFILE}") 2>&1 >/dev/null
+	eend $?
+}
diff --git a/net-analyzer/vnstat/files/vnstatd.initd-r2 b/net-analyzer/vnstat/files/vnstatd.initd-r2
new file mode 100644
index 000000000000..2b4a9336c2a5
--- /dev/null
+++ b/net-analyzer/vnstat/files/vnstatd.initd-r2
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+
+VNSTATD_CONFIGFILE=${VNSTATD_CONFIGFILE:-"/etc/vnstat.conf"}
+VNSTATD_PIDFILE=${VNSTATD_PIDFILE:-"/run/vnstat/vnstatd.pid"}
+
+pidfile="${VNSTATD_PIDFILE}"
+command="/usr/bin/vnstatd"
+command_args="${VNSTATD_OPTS} --daemon --config \"${VNSTATD_CONFIGFILE}\" --pidfile \"${pidfile}\""
+start_stop_daemon_args="--wait ${SSD_STARTWAIT:-500}"
+name="vnStat daemon"
+
+description="vnstatd updates vnStat databases."
+description_reload="Reload ${name}'s configuration"
+
+required_files="${VNSTATD_CONFIGFILE}"
+
+start_pre() {
+	checkpath --directory --mode 0775 --owner vnstat:vnstat $(dirname "${pidfile}")
+}
+
+reload() {
+	ebegin "Reloading ${name} configuration"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
diff --git a/net-analyzer/vnstat/files/vnstatd.systemd b/net-analyzer/vnstat/files/vnstatd.systemd
new file mode 100644
index 000000000000..51b079c5a9fb
--- /dev/null
+++ b/net-analyzer/vnstat/files/vnstatd.systemd
@@ -0,0 +1,11 @@
+[Unit]
+Description=vnStat network traffic monitor
+Documentation=man:vnstatd(1) man:vnstat(1) man:vnstat.conf(5)
+After=network-online.target
+
+[Service]
+ExecStart=/usr/bin/vnstatd --nodaemon
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-analyzer/vnstat/files/vnstatd.tmpfile b/net-analyzer/vnstat/files/vnstatd.tmpfile
new file mode 100644
index 000000000000..36ecf2259495
--- /dev/null
+++ b/net-analyzer/vnstat/files/vnstatd.tmpfile
@@ -0,0 +1 @@
+d /run/vnstat 0775 vnstat vnstat -
diff --git a/net-analyzer/vnstat/metadata.xml b/net-analyzer/vnstat/metadata.xml
new file mode 100644
index 000000000000..dace7f2e8f57
--- /dev/null
+++ b/net-analyzer/vnstat/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
+<longdescription>
+  vnStat is a network traffic monitor for Linux that keeps a log of daily
+  network traffic for the selected interface(s). vnStat isn't a packet sniffer.
+  The traffic information is analyzed from the /proc filesystem. That way vnStat
+  can be used even without root permissions.
+</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/vnstat/vnstat-1.17-r1.ebuild b/net-analyzer/vnstat/vnstat-1.17-r1.ebuild
new file mode 100644
index 000000000000..0c24c6dc6014
--- /dev/null
+++ b/net-analyzer/vnstat/vnstat-1.17-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit systemd toolchain-funcs user versionator
+
+DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
+HOMEPAGE="http://humdi.net/vnstat/"
+SRC_URI="http://humdi.net/vnstat/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gd selinux test"
+
+COMMON_DEPEND="
+	gd? ( media-libs/gd[png] )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( dev-libs/check )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-vnstatd )
+"
+
+pkg_setup() {
+	enewgroup vnstat
+	enewuser vnstat -1 -1 /var/lib/vnstat vnstat
+}
+
+src_prepare() {
+	default
+
+	tc-export CC
+
+	sed -i \
+		-e 's|^\(MaxBWethnone.*\)$|#\1|' \
+		-e 's|^Daemon\(.*\) ""$|Daemon\1 "vnstat"|' \
+		-e 's|vnstat[.]log|vnstatd.log|' \
+		-e 's|vnstat[.]pid|vnstatd.pid|' \
+		-e 's|/var/run|/run|' \
+		cfg/${PN}.conf || die
+	sed -i \
+		-e '/PIDFILE/s|/var/run|/run|' \
+		src/common.h || die
+}
+
+src_compile() {
+	emake ${PN} ${PN}d $(usex gd ${PN}i '')
+}
+
+src_install() {
+	use gd && dobin vnstati
+	dobin vnstat vnstatd
+
+	exeinto /usr/share/${PN}
+	newexe "${FILESDIR}"/vnstat.cron-r1 vnstat.cron
+
+	insinto /etc
+	doins cfg/vnstat.conf
+	fowners root:vnstat /etc/vnstat.conf
+
+	keepdir /var/lib/vnstat
+	fowners vnstat:vnstat /var/lib/vnstat
+
+	newconfd "${FILESDIR}"/vnstatd.confd-r1 vnstatd
+	newinitd "${FILESDIR}"/vnstatd.initd-r2 vnstatd
+
+	systemd_newunit "${FILESDIR}"/vnstatd.systemd vnstatd.service
+	systemd_newtmpfilesd "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf
+
+	use gd && doman man/vnstati.1
+	doman man/vnstat.1 man/vnstatd.1
+
+	newdoc INSTALL README.setup
+	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
+}
+
+pkg_postinst() {
+	local _v
+	for _v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 1.17-r1 ${_v}; then
+			# This is an upgrade
+			elog ""
+			elog "Beginning with ${PN}-1.17-r1, we no longer install and use the cron job"
+			elog "per default to update vnStat databases because you will lose some traffic"
+			elog "if your interface transfers more than ~4GB in the time between two cron"
+			elog "runs".
+			elog ""
+			elog "Please make sure that the vnstatd service is enabled if you want to"
+			elog "continue monitoring your traffic."
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		elog
+		elog "Repeat the following command for every interface you"
+		elog "wish to monitor (replace eth0):"
+		elog "   vnstat -u -i eth0"
+		elog "and set correct permissions after that, e.g."
+		elog "   chown -R vnstat:vnstat /var/lib/vnstat"
+		elog
+		elog "It is highly recommended to use the included vnstatd to update your"
+		elog "vnStat databases."
+		elog
+		elog "If you want to use the old cron way to update your vnStat databases,"
+		elog "you have to install the cron job manually:"
+		elog ""
+		elog "   cp /usr/share/${PN}/vnstat.cron /etc/cron.hourly/vnstat"
+		elog ""
+		elog "Note: if an interface transfers more than ~4GB in"
+		elog "the time between cron runs, you may miss traffic."
+		elog "That's why using vnstatd instead of the cronjob is"
+		elog "the recommended way to update your vnStat databases."
+	fi
+}
diff --git a/net-analyzer/vnstat/vnstat-1.17.ebuild b/net-analyzer/vnstat/vnstat-1.17.ebuild
new file mode 100644
index 000000000000..357fafc8b08f
--- /dev/null
+++ b/net-analyzer/vnstat/vnstat-1.17.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs user
+
+DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
+HOMEPAGE="http://humdi.net/vnstat/"
+SRC_URI="http://humdi.net/vnstat/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
+IUSE="gd selinux test"
+
+COMMON_DEPEND="
+	gd? ( media-libs/gd[png] )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( dev-libs/check )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-vnstatd )
+"
+
+pkg_setup() {
+	enewgroup vnstat
+	enewuser vnstat -1 -1 /dev/null vnstat
+}
+
+src_prepare() {
+	default
+
+	tc-export CC
+
+	sed -i \
+		-e 's|vnstat[.]log|vnstatd.log|' \
+		-e 's|vnstat[.]pid|vnstatd/vnstatd.pid|' \
+		-e 's|/var/run|/run|' \
+		cfg/${PN}.conf || die
+	sed -i \
+		-e '/PIDFILE/s|/var/run|/run|' \
+		src/common.h || die
+}
+
+src_compile() {
+	emake ${PN} ${PN}d $(usex gd ${PN}i '')
+}
+
+src_install() {
+	use gd && dobin vnstati
+	dobin vnstat vnstatd
+
+	exeinto /etc/cron.hourly
+	newexe "${FILESDIR}"/vnstat.cron vnstat
+
+	insinto /etc
+	doins cfg/vnstat.conf
+	fowners root:vnstat /etc/vnstat.conf
+
+	newconfd "${FILESDIR}"/vnstatd.confd vnstatd
+	newinitd "${FILESDIR}"/vnstatd.initd-r1 vnstatd
+
+	use gd && doman man/vnstati.1
+	doman man/vnstat.1 man/vnstatd.1
+
+	newdoc INSTALL README.setup
+	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
+}
diff --git a/net-analyzer/w3af/Manifest b/net-analyzer/w3af/Manifest
new file mode 100644
index 000000000000..95cb8338280a
--- /dev/null
+++ b/net-analyzer/w3af/Manifest
@@ -0,0 +1,9 @@
+AUX w3af_console 45 SHA256 baec5ace41ba0ff29b792dd288ee9a14eef83546af633620125644ad29fd19c7 SHA512 e8353393663d892f0f362a03e9459383cb8cf2de87a4bdd135f6c7fbc289cc34a236abf514dcfb9d9a3c573e2e5747c06c819527b1b0051c9513130cd0047a21 WHIRLPOOL 4b61760caf06b8df3cf1fb3d220c990efc72ea1de1f03ebe875e75f71904037006de6e3470f30f9607c6343ff0130b08622523a34bac822ddc084f43a6b0137f
+AUX w3af_gui 41 SHA256 12f98d26f6c844b74e9d12a4df12ac8430eeb627dd15e8452e37202d254dda69 SHA512 1fd52f555d9fe3ebf7c8a985d83e7f86eb6e9a379589c50c567ed12c54abb63125ccd21b028215a87acb533aa45ec8fd8dc3169a3c9cbe090b8d32f2a9b751ca WHIRLPOOL af264d9b03b34c97a09ff7bafe44f041b07a044bdd47ece3095353c1155bbf57c5cf055f0a0e8d1c8242ed4270ba1822ae264fb0c1f4d987e81713184810f29c
+DIST w3af-1.1.tar.bz2 39994121 SHA256 0bf3cec513931b9bf20e6f753dedeaab57b5cad303489ab9ff365786c04d9444 SHA512 9a6c7d474d61f9039c150b44d4c6027451d58e925e47083262105f62b0fca718373103015e3f5bbed1cb89a40c9c057d3d54ce0c533ad3cc90e8ff24e193f868 WHIRLPOOL cb5d0d7bc9096ae27e5597e5dfd2963e03e0b7f4939fb0583ef61d2dec0c8b595ccbfb3e43f4ed170cb8ac79a74f654a5502eeb5d590138f43cfd7cdbe3e4e1f
+DIST w3af-1.5.tar.gz 31147412 SHA256 ce3ac0c5a1c1ae4f8aba012619e400558bf33b77080af61a9756d615883c523f SHA512 5b0b83e36b35883bd78fe990e9e5f0c955e49a22421d8eee4ec877cda842e79c8af0b490f0927ea253bdd60b957fbacf7ad1116e2c3d93023f160691aa50ce7e WHIRLPOOL 79662c1bbf05b825aa5251b43f98ebe118780d456e3dab8368d51c055792c435435cc245ec6d5f897c49a6445e90503d8917a7aa4ef3af6d87c5dcdf3a287b47
+EBUILD w3af-1.1-r1.ebuild 1884 SHA256 764ba1452f7bd5f5db2b52598dc5025bd6489cc03c6eb05d8365e076008cfb73 SHA512 51d625b9517c6575d66da139d73b4c04879d49aba12dc0cb7900e96f44131719ad0211871a1a1672257beec0019c4eef0031852580b0464bfcb1608c385f5631 WHIRLPOOL 673ecc35c18236e695d74ebcc68bfe3df9885b0af1febb9db42693a5e9f4b00f14ea6b77574aaa4885d5ffa10c9ee4a3408732cfcf2adf8e364e8dae97d39a9b
+EBUILD w3af-1.5.ebuild 2348 SHA256 f8f309d5b9f797d0dbc53cf3f1569968a2b55322d724b15664a367016fdb764c SHA512 84f76244a37fcb30edfca70b64700eb06093027d6f66624522cceee4e9c9ba54bd466fa7fc1f8e69ddcee70c3d919456e9a1e70d592cdaff8435a7ed67fea32f WHIRLPOOL 457b6d8c430901d406a75734a62865e043c307b6a5f6cb8ae1111f01cd44e452f2cfab6f43aa71639dd27cf1363ba0efd0715d26ea7b2348596f8172ee80ee29
+MISC ChangeLog 3418 SHA256 7312f15375a7234379274bb27fecd8e524928e9ca2a4d4c3dfedd4af036797d6 SHA512 5440bc59d9a718ffc5e0428d92e6e37d99125a3cf1fd55b2b950ae8683643ea93d83307ebd56bf8d4267840d14e80b3cdd11afdedd127edd81bb281a3861a2a5 WHIRLPOOL af341aa91fc42c2e06f16a94b315b621a897c33403b3d22fa98014673d780e8e3dc222226fb40a9a644d34ddc0040d18c3980d46da50e5a84b61867ed5712b74
+MISC ChangeLog-2015 3764 SHA256 20785338ff2c38cc785b087d185813c951489276faaafb46ca672f5e63db090e SHA512 ede74f11d21ce45b28f0990fedaef474fe59e468871ef08ed9f9b38ab8eed6e5698274a2fe7160409c1f0e8daa5fab7ec52d5d5668c4e6dbb4b70a3875caa61f WHIRLPOOL 82ad6a310345a3598237e2e11ed63934c830cb46d7ba194eab963720ad9a3f837ad399e119693a3d361cf8043d1068ab411087ed1d5a39e06d420c728abfb2c9
+MISC metadata.xml 515 SHA256 5f1fd7c17635297957e7a63613b32bccba2f1bd231aaa6e6db5d41e21c040ae6 SHA512 01a5e591fab2095f36570418ea556d385155c417dd94b2ed7a2a4c85897bc024bc139cbc3cfba55a0b76ea8c7973cadf867e183dffa426cf911c1af430d34f2a WHIRLPOOL 46cb49179b06b6b8bfbb628e25e03f6849e726465b64de4a68c2049cd255e2a5f3ece005159765d004f9a0a422d41cdb9a7d1dfdd4dae62bb14dc761bab9ac8d
diff --git a/net-analyzer/w3af/files/w3af_console b/net-analyzer/w3af/files/w3af_console
new file mode 100644
index 000000000000..93212cefb237
--- /dev/null
+++ b/net-analyzer/w3af/files/w3af_console
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /usr/lib/w3af
+./w3af_console $*
diff --git a/net-analyzer/w3af/files/w3af_gui b/net-analyzer/w3af/files/w3af_gui
new file mode 100644
index 000000000000..41f4802e3ae1
--- /dev/null
+++ b/net-analyzer/w3af/files/w3af_gui
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /usr/lib/w3af
+./w3af_gui $*
diff --git a/net-analyzer/w3af/metadata.xml b/net-analyzer/w3af/metadata.xml
new file mode 100644
index 000000000000..5f71099f5b98
--- /dev/null
+++ b/net-analyzer/w3af/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>clabbe.montjoie@gmail.com</email>
+		<name>LABBE Corentin (Montjoie)</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">andresriancho/w3af</remote-id>
+		<remote-id type="sourceforge">w3af</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/w3af/w3af-1.1-r1.ebuild b/net-analyzer/w3af/w3af-1.1-r1.ebuild
new file mode 100644
index 000000000000..a2a89f6c86f3
--- /dev/null
+++ b/net-analyzer/w3af/w3af-1.1-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit multilib python-single-r1 versionator
+
+MY_P=${PN}-"$(replace_version_separator 2 '-')"
+
+DESCRIPTION="Web Application Attack and Audit Framework"
+HOMEPAGE="http://w3af.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc gtk"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/fpconst-0.7.2[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/nltk[${PYTHON_USEDEP}]
+	dev-python/pybloomfiltermmap[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/pyPdf[${PYTHON_USEDEP}]
+	dev-python/python-cluster[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	dev-python/soappy[${PYTHON_USEDEP}]
+	dev-python/pysvn[${PYTHON_USEDEP}]
+	|| (
+		net-analyzer/gnu-netcat
+		net-analyzer/netcat
+		net-analyzer/netcat6
+		)
+	>=net-analyzer/scapy-2
+	gtk? (
+		media-gfx/graphviz
+		>dev-python/pygtk-2.0
+		dev-python/pygtksourceview
+		)"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare(){
+	rm -r extlib/{cluster,fpconst-0.7.2,pyPdf,SOAPpy,yaml} || die
+	sed -i 's,extlib.pyPdf.,,' core/data/parsers/pdfParser.py || die
+	rm readme/{GPL,INSTALL} || die
+	rm plugins/attack/payloads/code/netcat || die #bug 349780
+	esvn_clean
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/w3af
+	doins -r core extlib locales plugins profiles scripts tools w3af_gui w3af_console
+	fperms +x /usr/$(get_libdir)/w3af/w3af_{gui,console}
+	dobin "${FILESDIR}"/w3af_console
+	use gtk && dobin "${FILESDIR}"/w3af_gui
+	#use flag doc is here because doc is bigger than 3 Mb
+	if use doc ; then
+		insinto /usr/share/doc/${PF}/
+		doins -r readme/*
+	fi
+	python_fix_shebang "${ED}"usr/$(get_libdir)/${PN}
+}
diff --git a/net-analyzer/w3af/w3af-1.5.ebuild b/net-analyzer/w3af/w3af-1.5.ebuild
new file mode 100644
index 000000000000..857b058864f1
--- /dev/null
+++ b/net-analyzer/w3af/w3af-1.5.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit multilib python-single-r1
+
+DESCRIPTION="Web Application Attack and Audit Framework"
+HOMEPAGE="http://w3af.sourceforge.net/"
+SRC_URI="https://github.com/andresriancho/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc gtk"
+
+#w3af seems to ship sqlmap? maybe we should split this out...
+
+QA_PREBUILT="
+	usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/mysql/linux/32/lib_mysqludf_sys.so
+	usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/mysql/linux/64/lib_mysqludf_sys.so
+	usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/postgresql/linux/*/8.2/lib_postgresqludf_sys.so
+	usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/postgresql/linux/*/8.3/lib_postgresqludf_sys.so
+	usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/postgresql/linux/*/8.4/lib_postgresqludf_sys.so
+	usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/postgresql/linux/*/9.0/lib_postgresqludf_sys.so"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/fpconst-0.7.2[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/nltk[${PYTHON_USEDEP}]
+	dev-python/pybloomfiltermmap[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/pyPdf[${PYTHON_USEDEP}]
+	dev-python/python-cluster[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	dev-python/soappy[${PYTHON_USEDEP}]
+	dev-python/pysvn[${PYTHON_USEDEP}]
+	|| (
+		net-analyzer/gnu-netcat
+		net-analyzer/netcat
+		net-analyzer/netcat6
+		)
+	>=net-analyzer/scapy-2
+	gtk? (
+		media-gfx/graphviz
+		>dev-python/pygtk-2.0
+		dev-python/pygtksourceview
+		)"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare(){
+	rm doc/{GPL,INSTALL} || die
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/${PN}
+	doins -r core locales plugins profiles scripts tools w3af_gui w3af_console
+	fperms +x /usr/$(get_libdir)/${PN}/${PN}_{gui,console}
+	dobin "${FILESDIR}"/${PN}_console
+	if use gtk ; then
+		dobin "${FILESDIR}"/${PN}_gui
+	else
+		rm "${ED}"/usr/$(get_libdir)/${PN}/w3af_gui
+	fi
+	#use flag doc is here because doc is bigger than 3 Mb
+	if use doc ; then
+		insinto /usr/share/doc/${PF}/
+		doins -r doc/*
+	fi
+	python_fix_shebang "${ED}"usr/$(get_libdir)/${PN}
+}
diff --git a/net-analyzer/wapiti/Manifest b/net-analyzer/wapiti/Manifest
new file mode 100644
index 000000000000..7d361c7b7e0b
--- /dev/null
+++ b/net-analyzer/wapiti/Manifest
@@ -0,0 +1,6 @@
+DIST wapiti-2.3.0.tar.gz 305739 SHA256 6b836a4810f17b7eda4345fb12293112129961ba243140c72a8da0ac2572f4b4 SHA512 a72e87f4c2aec3884d5de7018c7fe1ab32721fc86420167c0b7636f31d9718661c787ff3d4ee66cc27e3932497543d0324b0bd238c33ce16f41f39213c119af2 WHIRLPOOL 29944978e7a497951eb4355d7818c4596316d1862c63c8d33e5cb0e9131ad418964e1fc7a6e04423201144ec67774c8ef8ae6d9e1d1bca1eb9eeea6ed6a964d4
+EBUILD wapiti-2.3.0.ebuild 508 SHA256 943c80dbb12788998fe98fa637e902692714296db5064b28ce03a808a4eb0ffd SHA512 dea28c6d333d56e36a35f4d6aee96b36896a205e95cd799146f6cecb660dc12bb9ea6359af83b03a50f5772b71e69a4fad9545e20b48d2aa73d02e117f445eec WHIRLPOOL f60298631c13aeeb93d318a16904be3b0bd597bc54df46591352b698561e745028d9fdbbd7b041a2d19f51628b6601f87fbc8745b15e1108eaeaca22f84c22b2
+EBUILD wapiti-9999.ebuild 524 SHA256 fed9d64ed3276a32a6d3dadbdbef25325a596e18784f2d89197666d86bda0430 SHA512 e95bc1deb156017ccfc295774ca6d01c2c4ed25046b1bafc9f3110ef8128f4d4f2f95f6074fdcd18a2d6a500f991278082d475725aec562bfa125bf2d9e936cd WHIRLPOOL 807ca3a9a7dc7a00a4624740e0372e40dc63f451ce511eab5d74145cb78c4039c2d75c2271ba8cabe97f0c8202c54e99ab8d126e88153b9f664bb9abb2604c33
+MISC ChangeLog 2907 SHA256 b4a79c86390f0d9a88fbf9a4852cfc544e46d8f57deec2a433cd372195be876a SHA512 dcbf1792911d64bcff0edd2705c1685fd7018071bd1833a8510aea8e153698d398385000ddf642dda50298b77c4ca1ae23570739c91257af06dd8d3de789f4c1 WHIRLPOOL 5843c45118c72846d9008d763725ed9e68060a5cd03deda094d814f79288570e874c39db05556c672ec721e7303678144d45786b3aa754a31c024f5d954b40b3
+MISC ChangeLog-2015 681 SHA256 e1fbc6d86b50b668da23e3dc98c6818e7ff6f4b623e4eb8f456aef10c1e68583 SHA512 38de8ee792a4e9914e157450be82f60f648d0e37e24c6de9f9abd56b020b04aa0e3545af50aaab99e9c060709077f81f4793aedaa3c0f9bececf17ad62d868e9 WHIRLPOOL e888b830f0c3f19a4c33207136e80067151cc1548842fa60a3165d78821e6e84654724dc237e48814b58952c191fbc15ec52a2bff195414e5bf61ed9d7edd28d
+MISC metadata.xml 731 SHA256 28ff4da2ed5e564cb6abcff0f45a285750f24752e2488d2cb2963c480804adb4 SHA512 f71323601d1b5be55efccda40ad08f6dddcd26c9400557765d9ccc32da18e6992b0780f50b070306a12e36c15da02b522e1eb2463494de5e88c838b68ad78abf WHIRLPOOL 5c5d80f3703f92feee06899ed10f4d8ec4d83826492d86cd1d0acc5a84eff9620dde7b87015eeddf88eaba395e576728e831c9af45c589bd9746887d50f6871c
diff --git a/net-analyzer/wapiti/metadata.xml b/net-analyzer/wapiti/metadata.xml
new file mode 100644
index 000000000000..043a4b4f70a2
--- /dev/null
+++ b/net-analyzer/wapiti/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>Wapiti allows you to audit the security of your web applications.
+
+It performs black-box scans, i.e. it does not study the source code of the application but will scans the webpages of the deployed webapp, looking for scripts and forms where it can inject data.
+
+Once it gets this list, Wapiti acts like a fuzzer, injecting payloads to see if a script is vulnerable.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">wapiti</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/wapiti/wapiti-2.3.0.ebuild b/net-analyzer/wapiti/wapiti-2.3.0.ebuild
new file mode 100644
index 000000000000..00b046e1aac3
--- /dev/null
+++ b/net-analyzer/wapiti/wapiti-2.3.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml'
+
+inherit distutils-r1
+
+DESCRIPTION="Web-application vulnerability scanner"
+HOMEPAGE="http://wapiti.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]"
diff --git a/net-analyzer/wapiti/wapiti-9999.ebuild b/net-analyzer/wapiti/wapiti-9999.ebuild
new file mode 100644
index 000000000000..7d202ad1e489
--- /dev/null
+++ b/net-analyzer/wapiti/wapiti-9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml'
+
+ESVN_REPO_URI="https://svn.code.sf.net/p/wapiti/code/trunk/"
+inherit distutils-r1 subversion
+
+DESCRIPTION="Web-application vulnerability scanner"
+HOMEPAGE="http://wapiti.sourceforge.net/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]"
diff --git a/net-analyzer/webfuzzer/Manifest b/net-analyzer/webfuzzer/Manifest
new file mode 100644
index 000000000000..78d9f6d3611f
--- /dev/null
+++ b/net-analyzer/webfuzzer/Manifest
@@ -0,0 +1,5 @@
+DIST webfuzzer-0.2.0.tar.gz 29664 SHA256 7e9a9ed81a7edab950acb69b8243735a9ff116e7043a9c0b7e55fe96dfd99d3f SHA512 7cb858178dd11e7b6020f2b0db1092462401aab552af6bdb8b8c95c018bd35572a981338226def07dc45ed8f0b5a0b282ad681e9d86bec14d14ffd623518082e WHIRLPOOL ef437fd0fbc3f6f490d16e6f7a9d385ab59f772a7579f0a70f89a54658145d2daab4a89b031146a037a5ed23c71c025d8d048e94f5849b5f6db0c2078b630a3b
+EBUILD webfuzzer-0.2.0-r1.ebuild 613 SHA256 7b75783c1f48fae9fb22dcd408f97c944ddd8b9fece30bce78605e5b164fd025 SHA512 e70b8c6c76fa58c93e90b3924d7a98ffc3da0f23e8c09943e12946a44f54dba5a6e61fd596e7bee475bc20796beef27903ccebba6da7c83cdd05a77cd090615e WHIRLPOOL 884b8fd9fcb2241b9118e2c457a804bee74b2e535e1aac823ef2aaba3ee7fa2ecf34680aeb9a83c623bf4de4b1e4d0f459cee8aadf95b61ae7c8f6ab9c01fc0d
+MISC ChangeLog 2443 SHA256 97efbec0b1a24ba369769896dc1b8e6409e4637b5932e7e507e23ffd11ab181b SHA512 9571830e35e272dcc674d2e070b3056c57ca88486173f0fd237b3afef2bcc1947dd883ecdf33820fe25146230557d42d806ef979e9402a01ec39c0ecea779f09 WHIRLPOOL 1c423c07193f01b3d83e1ebde1cb7cc277b77892cced387f5cf4fea0bd52760d25b1296cd0affcd2ecbaa73727418951997d206105a1463eb317f5d326d015ad
+MISC ChangeLog-2015 977 SHA256 6b35bdd50013d2ea4370d7d1b3488186bae631ceb7ff4db943b6dd61acd542d0 SHA512 56fd08cac6084f5775944f56fce3f602bf8661c974ce61e84513aea34aa9030eb09bee7c403f3441d5984dbff6ca93b80406d4a93a8ee71f95f35661b86e4522 WHIRLPOOL 99e00e7af4296582b15861b018995d0f38fc5f20f6e770936a6967c3730db6c4bb2d37861f8a168fed6258d59d6c82759ceaf3fd614f875e6bfbbbb1ad26faf7
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/webfuzzer/metadata.xml b/net-analyzer/webfuzzer/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/webfuzzer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/webfuzzer/webfuzzer-0.2.0-r1.ebuild b/net-analyzer/webfuzzer/webfuzzer-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..6b40638cf0bc
--- /dev/null
+++ b/net-analyzer/webfuzzer/webfuzzer-0.2.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Poor man's web vulnerability scanner"
+HOMEPAGE="http://gunzip.altervista.org/g.php?f=projects"
+SRC_URI="http://gunzip.altervista.org/webfuzzer/webfuzzer-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S=${WORKDIR}/devel
+
+src_prepare() {
+	sed -i Makefile \
+		-e 's|CFLAGS=-g -O3|CFLAGS+=|' \
+		-e 's| -o | $(LDFLAGS)&|g' \
+		|| die
+}
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	dodoc CHANGES README TODO
+	dobin webfuzzer
+}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
new file mode 100644
index 000000000000..592831a807a7
--- /dev/null
+++ b/net-analyzer/wireshark/Manifest
@@ -0,0 +1,12 @@
+AUX wireshark-1.99.8-qtchooser.patch 296 SHA256 adfbd7ded334d51f805efb0bea412cbaa8f400c9ede93aabb879d784cccbab44 SHA512 ecdbc5b3164cbef46d9f9e647deefc141ef2fa261fdab2e46df8a6235af544e8496b22a87ffefb60be34907a8432a6e6ec4d3a9fb3789404d946558cab7a0afc WHIRLPOOL 6d2818b246794eacdf7ea18fa502d3c314147b79d23948f79aa67de22ee6dc26ea114c35131aa2ac8196293a9ea4f2e25b1a2133110031cc3501f6f8d6ff93d9
+AUX wireshark-2.1.0-sse4_2-r1.patch 498 SHA256 db6bc1e9171147340bf57e374ce62fc2d8f02cf01bc0ea300a127c02b1a37d11 SHA512 1938754656a0654a3e40909c30c9416e65078b2d664b44d31ef9e75cd2d0dbb360982106c9300ffca60da81aeb27c8a37298c9aff762d0800d77d17e46b9a524 WHIRLPOOL 65fd2f3b186b77ba4035bca44d9015e8b0de3f8eabd30e5f7b21c6c7306ae78bf08d984ca62e87d4f2c3de5947f67596266e0098c517ca1ce002ce23b5a6fd93
+AUX wireshark-2.4-androiddump.patch 1135 SHA256 d381eb84b6b4a1e6807de6f062c129ea9040f4efb95c4fcf924745bc3a951476 SHA512 d18daa46b3ff8f0f4e3e468c65c33fd1bf9fb9a8e90f6318a64cc11b696520b07ccfcbc9921f3c932fcceb809c0406a5cd9773a157ed1bfd10e4c8873215b36b WHIRLPOOL 1f0fb1d65f24c39e8fe17c77ecdc7229348a0ce60ca7fe12da8d88864f5c80049431cc1651e02cc55a68ac26d25b11374abff95fe55ba3977923fc5def3e8d70
+AUX wireshark-99999999-androiddump.patch 198 SHA256 7607082abf45448fd4def4693522e219b448f92868a199c64ae7e2f9387a8494 SHA512 7fd971d2b7bbf0bc3685021e0bf55e412e9995cb5d95be85da92d3191227f4af4de94b13a99cfef4f71c74225aa3fd471e5ca23ac6586ab9372f563f3c18c967 WHIRLPOOL 497f50079df7d4aacc13e12ad1a4f09a37701f6cb8cbe5fe89bae905510eedcfb3f037504d4bd726686923d9883403a331dc3eed0150263f35c3998902fafe35
+DIST wireshark-2.2.7.tar.bz2 32309420 SHA256 689ddf62221b152779d8846ab5b2063cc7fd41ec1a9f04eefab09b5d5486dbb5 SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 WHIRLPOOL 0361821da9c113a8de1339cc48cae0291be84bcffb1ba34b1fc3f457b22525329e954a2060f7eef25bca550d0ccdaf4a9e9587d35394b0abd9b0d38bc6023e44
+DIST wireshark-2.4.1.tar.xz 28780384 SHA256 02ddbcf9b10f9dfa1e36eec00fe00cb5b5ce8e07203843baf056ac7909911fcd SHA512 66f3f9abecc00c4c153c61f42739522b091ba06cc68b6bd79fe45a1064192fbb88e38e96d4df6722255b06a3520f23d2db6c5fa5e4faf5e8641cf2f5dce10056 WHIRLPOOL 3cdf5b1a3fe95bfaf2416f1ea1310999dd6d34babd5c040797ae4b2ea5faee7b90797a6507fed9be77e6038e90acd052484982b2dc62d9da67ac1e2520ef94c2
+EBUILD wireshark-2.2.7.ebuild 6489 SHA256 0978c03c370a2d1b8e2e910bd1c3a57f8cd6984fa2e25b15e152b3fbbd4b95b9 SHA512 3aad3004619a02cd4a2bb8a9d4f87e0a669e2ea23a0e83377056477af4a2b5a6f7ed95d9c7fe1373e847fb186c014c87f5cb96f5f32d4bff7bfc2700710301f9 WHIRLPOOL a3715bb7c19f1007dac053ec1aaf1e49232b31605ec55761884bb6556e19fb1f0b53440657bf0f49330630d5beef435881f157cb6af3be02cc5cfd90134c156f
+EBUILD wireshark-2.4.1-r3.ebuild 7337 SHA256 794e6daf4d2bd724e87882d0d879d55c456e3e935cdab3b36bfb32725b2e6509 SHA512 54e39d028ba1cbd4fcf925eca2c14b6ccc0a8a058b30a0a9adab5a8712eca2781ef0b5f0795bb2115a1c4dcc77e7ba56ef78327f804ac999be3d5ee3aaf66157 WHIRLPOOL 041b4fb98160d4ac4a45a1a83a04318f7a292512bbf928016b5f84411d533f49e5bd806fabbbabbff155d23d97fec2a21bedf0962fc934bc9a6ebdf32b80a654
+EBUILD wireshark-99999999.ebuild 7244 SHA256 72ba7b56f2f65ede095d2694d246225ce9162512166962bcede6fe89d842cc52 SHA512 84107c356b10259f6b230931ff136c3dcd364e7aa928cc29609d253ec36e11193e7f723548965c9f085c49040a9ddcf9bfcfd476242178b25ae8213eb0617742 WHIRLPOOL e985f39f06d5dbda4a4a71290b8f024ef483c65ac3c5cf2fe9aac02c79f7ef685eeefeb5a0a5a75c75765342116d554983620aec0f24b893c86db9cdc19c9e61
+MISC ChangeLog 28152 SHA256 4d533b118cf6326befb9d60fef7212306a14528010f3c1864ea6657e20b00605 SHA512 1dbf03f303e0e05eb243d70595fd88e7ea4d14e397a3d717fe2ac9ba05e2407e1928f2cd78b7bc6fe205ce8d660e75b6f11608546b32a70ffc1ec24629567fd5 WHIRLPOOL fbb5a086aa52c90e28c392813dd7b8ade906f4376ec596741e2396b9160e2e64a45148a793b45530ae3ab6dd744dccf6c30261cdf354ada3a50c11a545afd811
+MISC ChangeLog-2015 107469 SHA256 077b97e93bc0bcebd520af0c72ec9df8da0af9b004423b34190b15c201341b2b SHA512 ce81239e7a9731845ee59ef8206094263b501ab74130cf2a34f8e052e6bf431f019c116c732e2b290c1c61e65ab548e1e10009d1d269cc83fed7f295aee555bc WHIRLPOOL 936c3ea54e274000a61a4114c7d69415f7289183b7c7f75b72925fa9ca0f0f6d42a4ef367d625d4e5892587eee680bbf63eb2945fbc4a98e68b04907ed3fdbc5
+MISC metadata.xml 4697 SHA256 3ac6d14b99bd32da2eda362b754999e36a3d56fdc22abc305a5fba1b39e81b2d SHA512 4ffb089fb47613cce521dac37c8e732ace1acfdb7889dc13538db55362a513078d6f1aab31be353e5b97d86faa18234dcf90afa97e040134af75af060d9c7a40 WHIRLPOOL b1305127e4ee772102a1b104ae87b4c4f29371eca8aedb5d63fc6cb0429bfebc57f8744eefc3e251803f6a4d12b2f5bd3acb8ed5925c2dc476a79bb3ed22e2cc
diff --git a/net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch b/net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch
new file mode 100644
index 000000000000..47459515ee79
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch
@@ -0,0 +1,10 @@
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -2149,7 +2149,6 @@
+ 	# -qt={version} argument, otherwise we look for particular
+ 	# tool versions using tool name suffixes.
+ 	#
+-	AC_PATH_PROG(QTCHOOSER, qtchooser)
+ 	if test ! -z "$QTCHOOSER"; then
+ 		#
+ 		# We found qtchooser; we assume that means that
diff --git a/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2-r1.patch b/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2-r1.patch
new file mode 100644
index 000000000000..8efe5aff6c55
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2-r1.patch
@@ -0,0 +1,21 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -818,6 +818,7 @@
+ AC_SUBST(PIE_CFLAGS)
+ AC_SUBST(PIE_LDFLAGS)
+ 
++AC_ARG_ENABLE(sse4_2,[  --enable-sse4_2         Support SSE4.2 (Streaming SIMD Extensions 4.2) instructions],[
+ WS_CFLAGS_saved="$WS_CFLAGS"
+ AC_WIRESHARK_COMPILER_FLAGS_CHECK(-msse4.2, C)
+ if test "x$can_add_to_cflags" = "xyes"
+@@ -844,6 +845,10 @@
+ 		ac_sse4_2_flag=-xarch=sse4_2
+ 	fi
+ fi
++],[
++AC_MSG_RESULT(no)
++])
++
+ WS_CFLAGS="$WS_CFLAGS_saved"
+ 
+ if test "x$ac_sse4_2_flag" != x; then
diff --git a/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch b/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch
new file mode 100644
index 000000000000..e67ab21b6a8d
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch
@@ -0,0 +1,27 @@
+--- a/extcap/androiddump.c
++++ b/extcap/androiddump.c
+@@ -363,13 +363,13 @@
+     pcap = pcap_open_dead_with_tstamp_precision(encap_ext, PACKET_LENGTH, PCAP_TSTAMP_PRECISION_NANO);
+     extcap_dumper.dumper.pcap = pcap_dump_open(pcap, fifo);
+     if (!extcap_dumper.dumper.pcap) {
+-        g_warning("Can't open %s for saving packets: %s", pcap_geterr(pcap));
++        g_warning("Can't open %s for saving packets: %s", fifo, pcap_geterr(pcap));
+         pcap_close(pcap);
+         exit(EXIT_CODE_CANNOT_SAVE_LIBPCAP_DUMP);
+     }
+     extcap_dumper.encap = encap;
+     if (pcap_dump_flush(extcap_dumper.dumper.pcap) == -1) {
+-        g_warning("Write to %s failed: %s", g_strerror(errno));
++        g_warning("Write to %s failed: %s", fifo, g_strerror(errno));
+     }
+ #else
+     int err = 0;
+@@ -416,7 +416,7 @@
+ 
+     pcap_dump((u_char *) extcap_dumper.dumper.pcap, &pcap_header, buffer);
+     if (pcap_dump_flush(extcap_dumper.dumper.pcap) == -1) {
+-        g_warning("Write to %s failed: %s", g_strerror(errno));
++        g_warning("Write to %s failed: %s", fifo, g_strerror(errno));
+     }
+ #else
+     int                 err = 0;
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch b/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch
new file mode 100644
index 000000000000..124a9b8b00be
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch
@@ -0,0 +1,10 @@
+--- a/extcap/Makefile.am
++++ b/extcap/Makefile.am
+@@ -49,6 +49,7 @@
+ androiddump_LDADD = \
+ 	../wiretap/libwiretap.la	\
+ 	../wsutil/libwsutil.la		\
++	@PCAP_LIBS@ \
+ 	@GLIB_LIBS@
+ 
+ if ENABLE_STATIC
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
new file mode 100644
index 000000000000..e88111bc335c
--- /dev/null
+++ b/net-analyzer/wireshark/metadata.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>
+	Wireshark is the world's foremost network protocol analyzer, and is the de
+	facto (and often de jure) standard across many industries and educational
+	institutions. Wireshark has a rich feature set which includes 1) deep
+	inspection of hundreds of protocols, with more being added all the time, 2)
+	live capture and offline analysis, 3) standard three-pane packet browser, 4)
+	captured network data can be browsed via a GUI, or via the TTY-mode TShark
+	utility, 5) the most powerful display filters in the industry, 6) rich VoIP
+	analysis, 7) read/write many different capture file formats: tcpdump
+	(libpcap), Catapult DCT2000, Cisco Secure IDS iplog, Microsoft Network
+	Monitor, Network General Sniffer® (compressed and uncompressed), Sniffer®
+	Pro, and NetXray®, Network Instruments Observer, Novell LANalyzer, RADCOM
+	WAN/LAN Analyzer, Shomiti/Finisar Surveyor, Tektronix K12xx, Visual Networks
+	Visual UpTime, WildPackets EtherPeek/TokenPeek/AiroPeek, and many others, 8)
+	capture files compressed with gzip can be decompressed on the fly, 9) live
+	data can be read from Ethernet, IEEE 802.11, PPP/HDLC, ATM, Bluetooth, USB,
+	Token Ring, Frame Relay, FDDI, and others, 10) decryption support for many
+	protocols, including IPsec, ISAKMP, Kerberos, SNMPv3, SSL/TLS, WEP, and
+	WPA/WPA2, 11) coloring rules can be applied to the packet list for quick,
+	intuitive analysis, 12) output can be exported to XML, PostScript®, CSV, or
+	plain text 
+</longdescription>
+	<use>
+		<flag name="adns">Use the GNU <pkg>net-dns/c-ares</pkg> library to resolve DNS names</flag>
+		<flag name="androiddump">Install androiddump, an extcap interface to capture from Android devices</flag>
+		<flag name="capinfos">Install capinfos, to print information about capture files</flag>
+		<flag name="captype">Install captype, to print the file types of capture files</flag>
+		<flag name="ciscodump">Install ciscodump, extcap interface to capture from a remote Cisco router</flag>
+		<flag name="crypt">Use <pkg>dev-libs/libgcrypt</pkg> to decrypt traffic</flag>
+		<flag name="dftest">Install dftest, to display filter byte-code, for debugging dfilter routines</flag>
+		<flag name="doc-pdf">Build documentation in pdf format (US and a4 paper sizes)</flag>
+		<flag name="dumpcap">Install dumpcap, to dump network traffic from inside wireshark</flag>
+		<flag name="editcap">Install editcap, to edit and/or translate the format of capture files</flag>
+		<flag name="libssh">Use <pkg>net-libs/libssh</pkg> (for sshdump)</flag>
+		<flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for handling XML configuration in dissectors</flag>
+		<flag name="mergecap">Install mergecap, to merge two or more capture files into one</flag>
+		<flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag>
+		<flag name="nghttp2">Use <pkg>net-libs/nghttp2</pkg> for HTTP/2 support</flag>
+		<flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
+		<flag name="randpkt">Install randpkt, a utility for creating pcap trace files full of random packets</flag>
+		<flag name="randpktdump">Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)</flag>
+		<flag name="reordercap">Install reordercap, to reorder input file by timestamp into output file</flag>
+		<flag name="sbc">Use <pkg>media-libs/sbc</pkg> for playing back SBC encoded packets</flag>
+		<flag name="sharkd">Install sharkd, the daemon variant of wireshark</flag>
+		<flag name="smi">Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag>
+		<flag name="snappy">Use <pkg>app-arch/snappy</pkg> for snappy compression and decompression</flag>
+		<flag name="spandsp">Use <pkg>media-libs/spandsp</pkg> for for G.722 and G.726 codec support in the RTP Player</flag>
+		<flag name="sshdump">Install sshdump, an extcap interface to capture from a remote host through SSH</flag>
+		<flag name="text2pcap">Install text2pcap, to generate a capture file from an ASCII hexdump of packets</flag>
+		<flag name="tfshark">Install tfshark, a terminal-based version of the FileShark capability</flag>
+		<flag name="tshark">Install tshark, to dump and analyzer network traffic from the command line</flag>
+		<flag name="udpdump">Install udpdumpi, to get packets exported from a source (like a network device or a GSMTAP producer) that are dumped to a pcap file</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-analyzer/wireshark/wireshark-2.2.7.ebuild b/net-analyzer/wireshark/wireshark-2.2.7.ebuild
new file mode 100644
index 000000000000..e0aadc7230b7
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.2.7.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils fcaps flag-o-matic multilib qmake-utils user
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="
+	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
+	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi
+	libssh randpkt randpktdump sshdump ssl tfshark zlib
+"
+REQUIRED_USE="
+	ciscodump? ( libssh )
+	sshdump? ( libssh )
+	ssl? ( crypt )
+"
+
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+	>=dev-libs/glib-2.14:2
+	netlink? ( dev-libs/libnl:3 )
+	adns? ( >=net-dns/c-ares-1.5 )
+	crypt? ( dev-libs/libgcrypt:0 )
+	caps? ( sys-libs/libcap )
+	geoip? ( dev-libs/geoip )
+	gtk? (
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/pango
+		x11-misc/xdg-utils
+	)
+	kerberos? ( virtual/krb5 )
+	libssh? ( >=net-libs/libssh-0.6 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	pcap? ( net-libs/libpcap )
+	portaudio? ( media-libs/portaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		media-libs/speex
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	smi? ( net-libs/libsmi )
+	ssl? ( net-libs/gnutls:= )
+	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+"
+# We need perl for `pod2html`.  The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	dev-lang/perl
+	!<virtual/perl-Pod-Simple-3.170
+	!<perl-core/Pod-Simple-3.170
+	doc? (
+		app-doc/doxygen
+		app-text/asciidoc
+		dev-libs/libxml2
+		dev-libs/libxslt
+		doc-pdf? ( dev-java/fop )
+		www-client/lynx
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	gtk? ( virtual/freedesktop-icon-theme )
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
+	"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch
+	"${FILESDIR}"/${PN}-99999999-androiddump.patch
+)
+
+pkg_setup() {
+	enewgroup wireshark
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				myconf+=( "--with-ssl" )
+				;;
+		esac
+	fi
+
+	# Enable wireshark binary with any supported GUI toolkit (bug #473188)
+	if use gtk || use qt5; then
+		myconf+=( "--enable-wireshark" )
+	else
+		myconf+=( "--disable-wireshark" )
+	fi
+
+	if ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	# Hack around inability to disable doxygen/fop doc generation
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
+
+	# dumpcap requires libcap
+	# --disable-profile-build bugs #215806, #292991, #479602
+	econf \
+		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use_enable androiddump) \
+		$(use_enable ciscodump) \
+		$(use_enable randpkt) \
+		$(use_enable randpktdump) \
+		$(use_enable sshdump) \
+		$(use_enable tfshark) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with crypt gcrypt) \
+		$(use_with geoip) \
+		$(use_with gtk gtk 3) \
+		$(use_with kerberos krb5) \
+		$(use_with libssh ssh) \
+		$(use_with lua) \
+		$(use_with pcap dumpcap-group wireshark) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(use_with ssl gnutls) \
+		$(use_with zlib) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		$(usex netlink --with-libnl=3 --without-libnl) \
+		$(usex qt5 --with-qt=5 '') \
+		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') \
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
+		--disable-profile-build \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -j1 -C docbook
+		if use doc-pdf; then
+			addpredict "/root/.java"
+			emake -C docbook all-pdf
+		fi
+	fi
+}
+
+src_install() {
+	default
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
+		doc/{randpkt.txt,README*}
+
+	if use doc; then
+		docinto /usr/share/doc/${PF}/html
+		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
+		if use doc-pdf; then
+			docinto /usr/share/doc/${PF}/pdf/
+			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
+		fi
+	fi
+
+	# install headers
+	local wsheader
+	for wsheader in \
+		config.h \
+		epan/*.h \
+		epan/crypt/*.h \
+		epan/dfilter/*.h \
+		epan/dissectors/*.h \
+		epan/ftypes/*.h \
+		epan/wmem/*.h \
+		register.h \
+		wiretap/*.h \
+		ws_diag_control.h \
+		ws_symbol_export.h \
+		wsutil/*.h
+	do
+		insinto /usr/include/wireshark/$( dirname ${wsheader} )
+		doins ${wsheader}
+	done
+
+	#with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use gtk || use qt5; then
+		local c d
+		for c in hi lo; do
+			for d in 16 32 48; do
+				insinto /usr/share/icons/${c}color/${d}x${d}/apps
+				newins image/${c}${d}-app-wireshark.png wireshark.png
+			done
+		done
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+
+	if use pcap; then
+		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the wireshark group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
diff --git a/net-analyzer/wireshark/wireshark-2.4.1-r3.ebuild b/net-analyzer/wireshark/wireshark-2.4.1-r3.ebuild
new file mode 100644
index 000000000000..82628ef1cff3
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.4.1-r3.ebuild
@@ -0,0 +1,289 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils fcaps flag-o-matic gnome2-utils multilib qmake-utils user xdg-utils
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="
+	adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2
+	+dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua
+	+mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump
+	+reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap
+	tfshark +tshark +udpdump zlib
+"
+REQUIRED_USE="
+	ciscodump? ( libssh )
+	sshdump? ( libssh )
+"
+
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+	>=dev-libs/glib-2.14:2
+	dev-libs/libgcrypt:0
+	netlink? ( dev-libs/libnl:3 )
+	adns? ( >=net-dns/c-ares-1.5 )
+	caps? ( sys-libs/libcap )
+	geoip? ( dev-libs/geoip )
+	gtk? (
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/pango
+		x11-misc/xdg-utils
+	)
+	kerberos? ( virtual/krb5 )
+	libssh? ( >=net-libs/libssh-0.6 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	nghttp2? ( net-libs/nghttp2 )
+	pcap? ( net-libs/libpcap )
+	portaudio? ( media-libs/portaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		media-libs/speex
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy )
+	spandsp? ( media-libs/spandsp )
+	ssl? ( net-libs/gnutls:= )
+	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+"
+# We need perl for `pod2html`.  The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	dev-lang/perl
+	!<virtual/perl-Pod-Simple-3.170
+	!<perl-core/Pod-Simple-3.170
+	doc? (
+		app-doc/doxygen
+		app-text/asciidoc
+		dev-libs/libxml2
+		dev-libs/libxslt
+		doc-pdf? ( dev-java/fop )
+		www-client/lynx
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	gtk? ( virtual/freedesktop-icon-theme )
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
+	"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch
+	"${FILESDIR}"/${PN}-2.4-androiddump.patch
+	"${FILESDIR}"/${PN}-99999999-androiddump.patch
+)
+
+pkg_setup() {
+	enewgroup wireshark
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				myconf+=( "--with-ssl" )
+				;;
+		esac
+	fi
+
+	# Enable wireshark binary with any supported GUI toolkit (bug #473188)
+	if use gtk || use qt5; then
+		myconf+=( "--enable-wireshark" )
+	else
+		myconf+=( "--disable-wireshark" )
+	fi
+
+	if ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	# Hack around inability to disable doxygen/fop doc generation
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
+
+	# dumpcap requires libcap
+	# --disable-profile-build bugs #215806, #292991, #479602
+	econf \
+		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use dumpcap && use_with pcap dumpcap-group wireshark) \
+		$(use_enable androiddump) \
+		$(use_enable capinfos) \
+		$(use_enable captype) \
+		$(use_enable ciscodump) \
+		$(use_enable dftest) \
+		$(use_enable dumpcap) \
+		$(use_enable editcap) \
+		$(use_enable mergecap) \
+		$(use_enable randpkt) \
+		$(use_enable randpktdump) \
+		$(use_enable reordercap) \
+		$(use_enable sharkd) \
+		$(use_enable sshdump) \
+		$(use_enable text2pcap) \
+		$(use_enable tfshark) \
+		$(use_enable tshark) \
+		$(use_enable udpdump) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with geoip) \
+		$(use_with gtk gtk 3) \
+		$(use_with kerberos krb5) \
+		$(use_with libssh ssh) \
+		$(use_with libxml2) \
+		$(use_with lua) \
+		$(use_with nghttp2) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(use_with snappy) \
+		$(use_with spandsp) \
+		$(use_with ssl gnutls) \
+		$(use_with zlib) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		$(usex netlink --with-libnl=3 --without-libnl) \
+		$(usex qt5 --with-qt=5 '') \
+		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') \
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
+		--disable-profile-build \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -j1 -C docbook
+		if use doc-pdf; then
+			addpredict "/root/.java"
+			emake -C docbook all-pdf
+		fi
+	fi
+}
+
+src_install() {
+	default
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
+		doc/{randpkt.txt,README*}
+
+	if use doc; then
+		docinto /usr/share/doc/${PF}/html
+		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
+		if use doc-pdf; then
+			docinto /usr/share/doc/${PF}/pdf/
+			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
+		fi
+	fi
+
+	# install headers
+	local wsheader
+	for wsheader in \
+		config.h \
+		epan/*.h \
+		epan/crypt/*.h \
+		epan/dfilter/*.h \
+		epan/dissectors/*.h \
+		epan/ftypes/*.h \
+		epan/wmem/*.h \
+		register.h \
+		wiretap/*.h \
+		ws_diag_control.h \
+		ws_symbol_export.h \
+		wsutil/*.h
+	do
+		insinto /usr/include/wireshark/$( dirname ${wsheader} )
+		doins ${wsheader}
+	done
+
+	#with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use gtk || use qt5; then
+		local c d
+		for c in hi lo; do
+			for d in 16 32 48; do
+				insinto /usr/share/icons/${c}color/${d}x${d}/apps
+				newins image/${c}${d}-app-wireshark.png wireshark.png
+			done
+		done
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+
+	if use pcap; then
+		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the wireshark group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
new file mode 100644
index 000000000000..5d11c1bd60e1
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils fcaps flag-o-matic git-r3 gnome2-utils multilib qmake-utils user xdg-utils
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+EGIT_REPO_URI="https://code.wireshark.org/review/wireshark"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="
+	adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2
+	+dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua
+	+mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump
+	+reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap
+	tfshark +tshark +udpdump zlib
+"
+REQUIRED_USE="
+	ciscodump? ( libssh )
+	sshdump? ( libssh )
+"
+
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+	>=dev-libs/glib-2.14:2
+	dev-libs/libgcrypt:0
+	netlink? ( dev-libs/libnl:3 )
+	adns? ( >=net-dns/c-ares-1.5 )
+	caps? ( sys-libs/libcap )
+	geoip? ( dev-libs/geoip )
+	gtk? (
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/pango
+		x11-misc/xdg-utils
+	)
+	kerberos? ( virtual/krb5 )
+	libssh? ( >=net-libs/libssh-0.6 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	nghttp2? ( net-libs/nghttp2 )
+	pcap? ( net-libs/libpcap )
+	portaudio? ( media-libs/portaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		media-libs/speex
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy )
+	spandsp? ( media-libs/spandsp )
+	ssl? ( net-libs/gnutls:= )
+	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+"
+# We need perl for `pod2html`.  The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	dev-lang/perl
+	!<virtual/perl-Pod-Simple-3.170
+	!<perl-core/Pod-Simple-3.170
+	doc? (
+		app-doc/doxygen
+		app-text/asciidoc
+		dev-libs/libxml2
+		dev-libs/libxslt
+		doc-pdf? ( dev-java/fop )
+		www-client/lynx
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	gtk? ( virtual/freedesktop-icon-theme )
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
+	"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch
+	"${FILESDIR}"/${PN}-2.4-androiddump.patch
+	"${FILESDIR}"/${PN}-99999999-androiddump.patch
+)
+
+pkg_setup() {
+	enewgroup wireshark
+}
+
+src_unpack() {
+	git-r3_src_unpack
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				myconf+=( "--with-ssl" )
+				;;
+		esac
+	fi
+
+	# Enable wireshark binary with any supported GUI toolkit (bug #473188)
+	if use gtk || use qt5; then
+		myconf+=( "--enable-wireshark" )
+	else
+		myconf+=( "--disable-wireshark" )
+	fi
+
+	if ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	# Hack around inability to disable doxygen/fop doc generation
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
+
+	# dumpcap requires libcap
+	# --disable-profile-build bugs #215806, #292991, #479602
+	econf \
+		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use dumpcap && use_with pcap dumpcap-group wireshark) \
+		$(use_enable androiddump) \
+		$(use_enable capinfos) \
+		$(use_enable captype) \
+		$(use_enable ciscodump) \
+		$(use_enable dftest) \
+		$(use_enable dumpcap) \
+		$(use_enable editcap) \
+		$(use_enable mergecap) \
+		$(use_enable randpkt) \
+		$(use_enable randpktdump) \
+		$(use_enable reordercap) \
+		$(use_enable sharkd) \
+		$(use_enable sshdump) \
+		$(use_enable text2pcap) \
+		$(use_enable tfshark) \
+		$(use_enable tshark) \
+		$(use_enable udpdump) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with geoip) \
+		$(use_with gtk gtk 3) \
+		$(use_with kerberos krb5) \
+		$(use_with libssh ssh) \
+		$(use_with libxml2) \
+		$(use_with lua) \
+		$(use_with nghttp2) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(use_with snappy) \
+		$(use_with spandsp) \
+		$(use_with ssl gnutls) \
+		$(use_with zlib) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		$(usex netlink --with-libnl=3 --without-libnl) \
+		$(usex qt5 --with-qt=5 '') \
+		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') \
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
+		--disable-profile-build \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -j1 -C docbook
+		if use doc-pdf; then
+			addpredict "/root/.java"
+			emake -C docbook all-pdf
+		fi
+	fi
+}
+
+src_install() {
+	default
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README.* \
+		doc/{randpkt.txt,README*}
+
+	if use doc; then
+		docinto /usr/share/doc/${PF}/html
+		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
+		if use doc-pdf; then
+			docinto /usr/share/doc/${PF}/pdf/
+			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
+		fi
+	fi
+
+	# install headers
+	local wsheader
+	for wsheader in \
+		config.h \
+		epan/*.h \
+		epan/crypt/*.h \
+		epan/dfilter/*.h \
+		epan/dissectors/*.h \
+		epan/ftypes/*.h \
+		epan/wmem/*.h \
+		register.h \
+		wiretap/*.h \
+		ws_diag_control.h \
+		ws_symbol_export.h \
+		wsutil/*.h
+	do
+		insinto /usr/include/wireshark/$( dirname ${wsheader} )
+		doins ${wsheader}
+	done
+
+	#with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use gtk || use qt5; then
+		local c d
+		for c in hi lo; do
+			for d in 16 32 48; do
+				insinto /usr/share/icons/${c}color/${d}x${d}/apps
+				newins image/${c}${d}-app-wireshark.png wireshark.png
+			done
+		done
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+
+	if use pcap; then
+		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the wireshark group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-analyzer/xnetload/Manifest b/net-analyzer/xnetload/Manifest
new file mode 100644
index 000000000000..7e39638a2b1f
--- /dev/null
+++ b/net-analyzer/xnetload/Manifest
@@ -0,0 +1,5 @@
+DIST xnetload-1.11.3.tar.gz 24551 SHA256 518f6bd138b9d414865aa068ca7110de8b6d6cccde24e5deda8a8c534087a299 SHA512 2008102c132ee96b12251b7c2475efcae7926bb16ba032f75d6be42650785fb707bed3696586369c04bb0e9434ee7854de585e7a015f1a15037a7f30c86036b7 WHIRLPOOL d64db168de3626c60388c5b457602c9d4a31affae445efcbae3dea67e43d5a648c540187a7cbbfcefbad4acfae65428eb115f6a7e100d4ba3d48cd684d010bdc
+EBUILD xnetload-1.11.3-r1.ebuild 845 SHA256 fd5d5cde28200185e9acdfbe7dc2241de6e94d56df00f0829ccf2487151e2c02 SHA512 4ee0278265541b2c8812f79d32fb2bdacd29147abc923ef714cf984c0f1337f38a245dfdb529b44aee010b719987d55c54bcbcada3f368afb822ad55fbe620b6 WHIRLPOOL 93e658a2aa90c7b2fe0fe70c19ec8d775e7083bfd593e498136d09ebed9c2f27c5551719436f70cfc7f79916ed7ba552b3ee5f08d7b436fc415af4dc4b48167a
+MISC ChangeLog 2442 SHA256 165ee59a6c17f8ba09cf484e79f4b81b9a1614e0127230d9ee33606b20237107 SHA512 6edd0bdaae2b65214f2f06e5ddac5de11b96438f3d6a8224bc3c027b438ab17d81124ac9c7306a28469f172d94cede7c0e94efec578307d95a18da2698cf639d WHIRLPOOL ae972c5b8cf061808401b3272c29f12f452dd836ee3ce6298082b9d785bebbd228e0500a145c6c4abb793ddcacdea5e6b8427a113f5b583fb90817e18e1ac2ba
+MISC ChangeLog-2015 2243 SHA256 79493a74c9755176f764635580864a655b5bfd9afde145c084413a918f93fd8b SHA512 6c571b1806773e60d4ac26f9d48aead2fcc98798a0c782462bfecbdf2ea34a66042a5738c72ea1c7e739cf95bb5d533b49f1f4fe9d261f260fd978949746d8f3 WHIRLPOOL 1a338ed06eaa7fd193071c4aef228429246d8d52d8900a17a828416ecbc0c054adb3089202d0b2d9260cecbb3e574bd28c66f4c107fbda8586e5e31b76dca961
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/xnetload/metadata.xml b/net-analyzer/xnetload/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/xnetload/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild b/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
new file mode 100644
index 000000000000..4844a6cb930f
--- /dev/null
+++ b/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="displays a count and a graph of the traffic over a specified network connection"
+LICENSE="GPL-2"
+HOMEPAGE="http://www.xs4all.nl/~rsmith/software/"
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+
+DEPEND="
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXaw
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i \
+		-e 's:CFLAGS = -pipe -O2 -Wall:CFLAGS += -Wall:' \
+		-e 's:LFLAGS = -s -pipe:LFLAGS = $(LDFLAGS):' \
+		-e 's:gcc -MM:$(CC) -MM:' \
+		-e 's:/usr/X11R6:/usr:g' \
+		Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin xnetload
+	doman xnetload.1
+	dodoc ChangeLog README
+	insinto /usr/share/X11/app-defaults/
+	doins XNetload
+}
diff --git a/net-analyzer/xprobe/Manifest b/net-analyzer/xprobe/Manifest
new file mode 100644
index 000000000000..d591c813661d
--- /dev/null
+++ b/net-analyzer/xprobe/Manifest
@@ -0,0 +1,6 @@
+AUX xprobe-0.3-gcc43.patch 655 SHA256 d2118c93804dfda277243240fa7b63506123ec3f476bcaa65fcdcb9c6f4b6d95 SHA512 7ab58b18fe7593f2389d72cc5d9160a65500866f44045c219e8a4fc6d860e34080a50d9e295d38d801c8af3d1b0ceab4f98fec296aa2eb49415561bbe9903950 WHIRLPOOL e3be695923f4a5e75d9d052b0fa86828d1950665ac904af97721958eb775ca0731b160df13e7ab7c5a20f8bfc47e2341d727d9d2bf047027e71d3fbeeee292ba
+DIST xprobe2-0.3.tar.gz 533636 SHA256 12a9d0a2f38da8bb74c9e1cd96b2019802632cf55f8948384aafd417bb79a164 SHA512 fd499ada22be5df3e01630948cb72d1a9e648e0c7bfaf2a688386a61c67bb36a326a9e2f3f2b9960a6a49128343010aafe8a3f04ec05e89420a1384215e41f21 WHIRLPOOL 6b5b9ec1b1786c186f63912dcc424b0750bd98acee20ffe729d77ca7c474d5f0a531a6089db5fe791135bb2a584e5ea01f7f06ac4bb4344844f06e11e5ff7bd1
+EBUILD xprobe-0.3.ebuild 639 SHA256 86f3980741a1f22cbbb48fd610e67722f34911f2186ccfe8e8f4057f230d3434 SHA512 54f5df5388d324e453bf444d9aab21b982bd5c251487ec8782fa8bd1be652641e7ca76fee940de9fa25242a99fee7775cbafc3ca8e1361074ff25c80a0f051c7 WHIRLPOOL ab402ef26254b02f38007981aa88af808d621b26f3deae3d1096b24f1eceecd28779a5b11aff3d504080e32e5a769945f9ef518e0aa60a052a68aa141b2e7736
+MISC ChangeLog 2455 SHA256 f082ceb2ed69d46040b3cf35a5f0d5a239be148c90a962f382e8a69a3c0033d9 SHA512 eaad74dc9904723da5312f4c1898a8b59a9071ab3535d39ebe757a69a22deb605a7656aba5a5694c832384c6e0e15b2c778f743db71d3e941ee99b6b89c29609 WHIRLPOOL 1a9ee2d260d9ea8c97deb4adfc4770385ba431162c67b885a5102dc2f6f1139947b5079a248553fe6cf39187e570c3fe00f7d650a4ea15262892c361036ccfc4
+MISC ChangeLog-2015 3428 SHA256 03864556c9ee424b2797838ed38fcf5e8c1daaceac3643121d9fa09b8e3d5d8d SHA512 28d1d9c3e5d04ede915135e345d70ed167352d87c8e7951e0791d599e4e74eff14597cbba8262cd40e4d4a55cb8b6104787bbc22542564d9f42383ae048a820c WHIRLPOOL d1bea027afcbbd8e80ce72cae115dfd1c0708b738e1160e0dacf3893297cca55e280e574bec27d000020952420a47c1be2590ac5bff5af2024bb0ef50cfff280
+MISC metadata.xml 678 SHA256 074d24e40b9f6a3d87b47911d2a8988218a487174fa96a606b51f79dc77cfc6d SHA512 54ad9e288eabc0a3b230504a94310fb9477f392ab7138c7d7f6ff252abbfe0e9e0733b29ab757a39729e916cfde43cbf591a7e4fc099be2bc8bcec44b945cd36 WHIRLPOOL cc002a69b34c55c873babb865bd6d32e82a525d4b26fe5d701aaab9c28afc5e0317bf92ce90b5960fed376baa36b32b8e610d180a4f1d06b9a1d52b24dadac9e
diff --git a/net-analyzer/xprobe/files/xprobe-0.3-gcc43.patch b/net-analyzer/xprobe/files/xprobe-0.3-gcc43.patch
new file mode 100644
index 000000000000..1175631b9a16
--- /dev/null
+++ b/net-analyzer/xprobe/files/xprobe-0.3-gcc43.patch
@@ -0,0 +1,29 @@
+--- a/libs-external/USI++/src/ip.cc
++++ b/libs-external/USI++/src/ip.cc
+@@ -13,6 +13,7 @@
+ #include "usi++/ip.h"
+ 
+ #include "config.h"
++#include <cstdlib>
+ #include <iostream>
+ #include <string.h>
+ #include <errno.h>
+--- a/libs-external/USI++/src/misc.cc
++++ b/libs-external/USI++/src/misc.cc
+@@ -1,5 +1,6 @@
+ #include "usi++/usi++"
+ #include "usi++/usi-structs.h"
++#include <cstdlib>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+--- a/libs-external/USI++/usi++/tcp.h
++++ b/libs-external/USI++/usi++/tcp.h
+@@ -15,6 +15,7 @@
+ #include "usi-structs.h"
+ #include "datalink.h"
+ #include "ip.h"
++#include <cstring>
+ 
+ namespace usipp {
+ 
diff --git a/net-analyzer/xprobe/metadata.xml b/net-analyzer/xprobe/metadata.xml
new file mode 100644
index 000000000000..0552dd858870
--- /dev/null
+++ b/net-analyzer/xprobe/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>
+Active OS fingerprinting tool. This is the new xprobe, called xprobe2, due to
+xprobe1 being obsoleted. xprobe2 has a different approach to OS fingerprinting.
+xprobe2 relies on fuzzy signature matching, probabilistic guesses, multiple
+matches simultaneously, and a signature database.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">xprobe</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/xprobe/xprobe-0.3.ebuild b/net-analyzer/xprobe/xprobe-0.3.ebuild
new file mode 100644
index 000000000000..fd60ee96cc6d
--- /dev/null
+++ b/net-analyzer/xprobe/xprobe-0.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+MY_P=${PN}2-${PV}
+
+DESCRIPTION="Active OS fingerprinting tool - this is Xprobe2"
+HOMEPAGE="http://sys-security.com/blog/xprobe2"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+	sed -i -e 's:strip:true:' src/Makefile.in || die
+}
+
+src_install() {
+	default
+	dodoc AUTHORS CHANGELOG CREDITS README TODO docs/*.{txt,pdf}
+}
diff --git a/net-analyzer/yersinia/Manifest b/net-analyzer/yersinia/Manifest
new file mode 100644
index 000000000000..fb727a9391b7
--- /dev/null
+++ b/net-analyzer/yersinia/Manifest
@@ -0,0 +1,9 @@
+AUX yersinia-0.7.1-no-ncurses.patch 330 SHA256 ea4aecbf84b9b6011a0c8df4c940c9d1d0df09f67092ccdcecfdce74d60b9d2d SHA512 c0a0ef6456727eaa0ae9ea50667e04a72afb01c5b75d13965836657e4d1946df550840afd091ec58e8875b1a551df5966feb98b655183cec6dadaf4f5de23e4f WHIRLPOOL 1da3a25a8583b5acb4b3a09cc85db098035c759461089404b6f4300a62fd0baf636e980580939d97d395b23be485a89afdf92b40d587154b748817a50a68a5f6
+AUX yersinia-0.7.3-tinfo.patch 563 SHA256 16ec1fba54e2d2f7e08e78910351267fb68b08210e62a006bc1667ac3e183bc4 SHA512 9a53505e050a9658f49809ad989d534e542fb0cf21ae70a9271b536a9a478a4306e49c9b0493ab522d5ffb82849eed043b212e399505c916792372a64d96c319 WHIRLPOOL 269dfc64b49990fa4dbfb63462497cddd0b9eaa6d93d696a0c2a54c4601bf866d3acbdc80a59dbfc8259c32e750d2c34223181b03e1d76f4e31cf40caf90aab6
+DIST yersinia-0.7.3.tar.gz 378124 SHA256 042abc466c5b470b97079e0049b4029a8cbb75d583cfbfb756fca76e460d40b4 SHA512 60a1b58e6d76448e9332656645b468a6aa66afa0f45ea4b70a929651194a294b9b559bbe5fbacaeb475126e7ac248cd97c29f3177e5080286b2f551f1400d339 WHIRLPOOL bf554765fb4d8a5a2c4bef78841c58c8712cd3b44c3d325e0b92b51ff4ff629a377ce78471df45d1307341ff9fd3099945d5359a86df47aebafeca7b447a2c8b
+DIST yersinia-0.8.2.tar.gz 387889 SHA256 964f528dbffd904376ab7986e69b1e8639591c929e2f39186ac9ebf2d3bc761f SHA512 2c7c89f19b6791150c472a6066b6ffaf9ac5b3d1a3d2e6a27f91293bba9a0f72d147266731e5e2670e4bf7e67ccf04b6e353071ca42d3d281b25126c9bfcb1dd WHIRLPOOL 4c2d075fadebb3e6da9751f0d502dcbdbba997a48ed9616b56fc34a5fd2ea7a41aa9ef293cc88316963344254e72650188568c337535c3129d6445a716e24678
+EBUILD yersinia-0.7.3.ebuild 980 SHA256 093dd725239755d63df9fb319b27db476ebd5a4c8228f3cb39c89fd1ce124d52 SHA512 df6a775cc7761a450f408439dda555f1864384516ee88b7406512b9eef3f6f3beda7cbb75ba4b070e98d4eeefdda152b3206fa04a5855b36e38bf1e874c706e3 WHIRLPOOL e7ccefeddb14f6013988d836368981c5301ce359d7e441037234c0c5e68f22d7f4a61df4a5c98827fd673b1a2e765e4cbb72e80f118946cc65ef0d4d487088f5
+EBUILD yersinia-0.8.2.ebuild 1038 SHA256 13b5fe221253469d8b098294567bdd22022f4923409d11697ecd2f6d716b05ab SHA512 4385b3fe96879188680c992ed430e71d267cc892e222582962b1539c76c806bf0924c6eaa6314bd0ead7c2b1bdeb200870cfaac771b7d6cf235b7b840254743c WHIRLPOOL 4613f54a792db572f4ddb62affb9773934b76180b31194e9983bd5a63d9cc17aa1f40b44a9d4dbcc2c826c7a01d0d1892bb817b641dfd3e2a0093a6d1a80c153
+MISC ChangeLog 2511 SHA256 1d49bde754df2037bb6c71e3a7ecf6f32378ed07f6d5fd70b5edf102282fc0ce SHA512 6f152c82b1adbe7760d66b42cda91d5f6c4874072eeebb788b824ae2db796108548a8c9307bd87e5ef58bef8b67d7d9f4bfcdd4eafa743b69b2d1b6f252992b9 WHIRLPOOL cb27b6693735f5b5a7b4b5164af11f7e26b5bcad8217d3556436ee6609f446ab82f8dd63e4117c7ecb8555771cbfd1ad576b77e7f74d90951730a0993be05c5c
+MISC ChangeLog-2015 2360 SHA256 f7f7f97019e8bf8f54f06c92cbcaffd24bdc4beb5e4d1fa577899b97a0333db0 SHA512 d8c27a3d3d2acd0f084e57661b8ab88356746e29c62069541f9a8c08b0fbfa5a08777c6223ff2539219b5cc52094b0df35ce653832b2e6b4fe47506bd03dabce WHIRLPOOL 938752cd160f6d930fcc17b68cb7d8be37e70988ef6bfbcfd3d2fb6c2e54fc1e678b65b9e84e0888e4e3c7a5f64fb11117e3718bf00e2c6fde66d76189afa9cf
+MISC metadata.xml 513 SHA256 f2c9999dc0809724aef0f7ed00966d4a4717138b34239de119a78be815e68099 SHA512 47b3fd2bc0c3c09d142113fcf3ac23256364a5737692f4c5a30f4980325c6a706d95c55d26365ac878e8a34c2a2471984c4c608ac4ecad2606836ea990bd468b WHIRLPOOL 47e052a557c219b2039ace75a288e42ff8c0b91c7234d6afb5e86caa786b49f3ee45e608c55f42f4acc3ffd6f03d5b22e814a90dbebafab2e7ab3f59f5d0e01f
diff --git a/net-analyzer/yersinia/files/yersinia-0.7.1-no-ncurses.patch b/net-analyzer/yersinia/files/yersinia-0.7.1-no-ncurses.patch
new file mode 100644
index 000000000000..96036dd629e9
--- /dev/null
+++ b/net-analyzer/yersinia/files/yersinia-0.7.1-no-ncurses.patch
@@ -0,0 +1,13 @@
+--- a/src/terminal.c
++++ b/src/terminal.c
+@@ -190,7 +190,9 @@
+ #endif
+ 
+    pthread_mutex_destroy(&terms->admin_listen_th.finished);
++#ifdef HAS_CURSES
+    pthread_mutex_destroy(&terms->gui_th.finished);
++#endif
+    pthread_mutex_destroy(&terms->pcap_listen_th.finished);
+    pthread_mutex_destroy(&terms->uptime_th.finished);
+ 
+
diff --git a/net-analyzer/yersinia/files/yersinia-0.7.3-tinfo.patch b/net-analyzer/yersinia/files/yersinia-0.7.3-tinfo.patch
new file mode 100644
index 000000000000..8a58d01d33c6
--- /dev/null
+++ b/net-analyzer/yersinia/files/yersinia-0.7.3-tinfo.patch
@@ -0,0 +1,27 @@
+--- a/configure.in
++++ b/configure.in
+@@ -467,6 +467,7 @@
+      AC_DEFINE(HAVE_REMOTE_ADMIN)
+ fi
+ 
++PKG_CHECK_MODULES(ncurses,ncurses)
+ 
+ dnl Curses detection: Munged from Midnight Commander's configure.in
+ dnl
+@@ -616,6 +617,16 @@
+ 		AC_DEFINE(USE_NCURSES)
+ 		AC_DEFINE(HAS_CURSES)
+ 		has_curses=true
++	  else
++		if test "$ncurses_LIBS" ; then
++			CURSES_LIBS="$ncurses_LIBS"
++			CURSES_INCLUDEDIR="$ncurses_CFLAGS"
++			search_ncurses=false
++			screen_manager="ncurses"
++			AC_DEFINE(USE_NCURSES)
++			AC_DEFINE(HAS_CURSES)
++			has_curses=true
++		fi
+ 	  fi
+ 	)
+ 
diff --git a/net-analyzer/yersinia/metadata.xml b/net-analyzer/yersinia/metadata.xml
new file mode 100644
index 000000000000..a0e9a2ee4c47
--- /dev/null
+++ b/net-analyzer/yersinia/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<longdescription>
+Yersinia is a network tool designed to take advantage of some weakeness
+in different network protocols. It intends to be a solid framework for
+analyzing and testing the deployed networks and systems.
+</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/yersinia/yersinia-0.7.3.ebuild b/net-analyzer/yersinia/yersinia-0.7.3.ebuild
new file mode 100644
index 000000000000..bc346d8cf0d3
--- /dev/null
+++ b/net-analyzer/yersinia/yersinia-0.7.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A layer 2 attack framework"
+HOMEPAGE="http://www.yersinia.net/"
+SRC_URI="http://www.yersinia.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="gtk ncurses"
+
+RDEPEND="
+	ncurses? ( >=sys-libs/ncurses-5.5 )
+	gtk? ( =x11-libs/gtk+-2* )
+	>=net-libs/libnet-1.1.2
+	>=net-libs/libpcap-0.9.4
+"
+DEPEND="
+	virtual/pkgconfig
+	${RDEPEND}
+"
+
+DOCS=( AUTHORS ChangeLog FAQ README THANKS TODO )
+
+S="${WORKDIR}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.7.1-no-ncurses.patch
+	epatch "${FILESDIR}"/${PN}-0.7.3-tinfo.patch
+
+	if ! use gtk; then
+		#bug #514802
+		sed -i -e '/AM_GLIB_GNU_GETTEXT/d' configure.in || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-admin \
+		--with-pcap-includes=/usr/include \
+		$(use_with ncurses) \
+		$(use_enable gtk)
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+}
diff --git a/net-analyzer/yersinia/yersinia-0.8.2.ebuild b/net-analyzer/yersinia/yersinia-0.8.2.ebuild
new file mode 100644
index 000000000000..4ec918539c0f
--- /dev/null
+++ b/net-analyzer/yersinia/yersinia-0.8.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="A framework for layer 2 attacks"
+HOMEPAGE="http://www.yersinia.net/"
+SRC_URI="https://github.com/tomac/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk ncurses"
+
+RDEPEND="
+	ncurses? ( >=sys-libs/ncurses-5.5:= )
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf
+		=x11-libs/gtk+-2*
+	)
+	>=net-libs/libnet-1.1.2
+	>=net-libs/libpcap-0.9.4
+"
+DEPEND="
+	virtual/pkgconfig
+	${RDEPEND}
+"
+DOCS=( AUTHORS ChangeLog FAQ README THANKS TODO )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.1-no-ncurses.patch
+	"${FILESDIR}"/${PN}-0.7.3-tinfo.patch
+)
+
+src_prepare() {
+	default
+
+	if ! use gtk; then
+		#bug #514802
+		sed -i -e '/AM_GLIB_GNU_GETTEXT/d' configure.in || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-admin \
+		--with-pcap-includes=/usr/include \
+		$(use_with ncurses) \
+		$(use_enable gtk)
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+}
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
new file mode 100644
index 000000000000..a7972af1bce9
--- /dev/null
+++ b/net-analyzer/zabbix/Manifest
@@ -0,0 +1,65 @@
+AUX 2.2/init.d/zabbix-agentd 607 SHA256 ab20981c3dd65cd330ef9fd915add1ecaf09e5a71c8b5c953f76db5398e41d68 SHA512 e2e974af382fc85e2b44fe2adac36d55470d6b091144ece1e85718639b33e28360e831b357ce6cb4f5db70d540da679f72f55e6ffb7371520faa665b43f32b8c WHIRLPOOL d5804dbbf989c6b6d84efc5aa7976b9759c8449d0bd18416287c80bf0fc58ce8c121da60bc61aa5c54004b725dbae6c7af7429bdffbc0fdcbcad7afbd959fb29
+AUX 2.2/init.d/zabbix-proxy 585 SHA256 088af573d9bc8372d6bf57256fa0d8316898ad476c6359fef48cad937743c326 SHA512 e996f175bee5cfa459561143ea827053ca56c8db7c8bffba7cd8deb73798ca00b15830afed8b5a50e8ba6db3db1d52ffa1f2ab09f4412259f9cbe16bd1ef2545 WHIRLPOOL 043e7e30cc798b740186339ef88f396bb66a43a5e2afce385ab2247c91601effe1cc21d13a9d96c64943a7451ff52ad212a489c255f3604f7151e4bd1f9f4bd3
+AUX 2.2/init.d/zabbix-server 596 SHA256 a760177470452b5bbc43bd5832e3dabd09f8b1303214817298c15214db480c6a SHA512 b1e7e5b7cc9f68283a6cfb515eefee82b58b7337f4accb8db8486dd8f7b692add2597d2b187336c7ceb40db29fe70e02f9ca0f01ef4cf2e1e12a2e375ce91449 WHIRLPOOL e47b3775e7de777bf99377405811fc23c6a732db1b28beb550612f344665d3b5489dfcb6c08be999df91122f0b18af06fe07dea2575e5d1e9f0a4b1354c89a6c
+AUX 2.2/patches/zbx7479.patch 2148 SHA256 e19cf42dc6b5cef61240c94bd22938cac20f882214c9d464457a235c1c5213d9 SHA512 1acaddbdb9e2fa0f09703a8274db53fcb23b8ead3cf8b34f81bb2b38e65d576ccf4198a9504c255f3c6f2f900078e74341d9cf331af53aa697b0420ffccdde9a WHIRLPOOL 71b40b70eb806f14db495147498100bb9eddac6b1a76d841ba4251d1c3f8fa197f0a606f595758933de00c9c31a8b14f96a825da97e6e7e6ff0e045297fc2caa
+AUX 2.2/patches/zbx8151.patch 2328 SHA256 43e671d964b1dd118f68e8d9ddd03980474da079a0c2287e4827501b9bed4b74 SHA512 f34c478241baf64739b8a2ae964a1c8d0f9e0d59963c8d8442e03b555e1f4d425dc90ab9491509c7e5c38e85ed8f3944c4626c7e2ca627a774219005bba6dba6 WHIRLPOOL 59aa4dc9b818460398bf86524235ad37814cd835b0b68b8faf11aae4c1439e5f02752750e0c9adc692fb033b026b2a2e6d9765f2f435fecdb721708d9d97ccb2
+AUX 2.2/zabbix_agent.conf 2138 SHA256 b3bc0b5facf5d55e50722ea109fbd3dd4757130f555ff6ecd4bd18ed8c795739 SHA512 7cfd6c1b1ec29b72a8d82f8d026cce2c6f56cd4c49d0a9f987193f812032dc26c814bd30f7ff115950dba1a8319d4e1bceebbdcc87f221e0fc34feb8c0264e56 WHIRLPOOL 84bf7e3421315157dff172060fc8d934dc05fa32ee393312be6ae10de5190dcd8749aabd724becf0c2d6eb530b385fbf6617b0288b0c141bd7cf446e7d356133
+AUX 2.2/zabbix_agentd.conf 7009 SHA256 4826f39a2f1f7a68ad51bd95afd68c6e3e4b0e41828ff1a39f20333b55ed88b9 SHA512 0474e31279c0cd0083468ec4f354176197bdd9ae7138f15dc19454537248b1218993ba6e79b292c4e526df6230104a5a40781fc44d618d4117ff72132424e699 WHIRLPOOL 019c42be344c410707f793bf17841ed01746e547aad9dc513b865b6c8a093f423210b38eacbbbc010e1a8e2f5f1da6ed86444c55f7d404dfab68fea65fa423cc
+AUX 2.2/zabbix_proxy.conf 11353 SHA256 65f4a096489c0c5b416d7cceaed3d3e5ec922d0a74d257092806f72c5b368ab2 SHA512 35e278970a8ca2d1c2ba763d6a57eec4d05586c3eec9c2aa80c67d1eff1b78354dcf823161f03b06ade4c3f9616016a2fc653ea2686e7e0ea4ca00e1bab5e29b WHIRLPOOL 271e40754c3ac478a11ca770fd4c5bcff6148591a8aa6bf4ce8f07dbef6df73a5e5c486369264c6269c46868cbff6744dca2d9095385c43412844afb53fe8b5d
+AUX 2.2/zabbix_server.conf 12145 SHA256 31f87d3f6f403dbb3b64bd841a0e2b16cbab388c73d46cf6984cf827431a4e66 SHA512 d53801446011d36ede4821207dd507b50d3b8ebc29d54f9a4d9bfc2814746c73b7fc43156a940c3bd154776cb1b358853727e931eff68a9d1fcd9549c10c6e77 WHIRLPOOL 461c96dbcfa272e8eccc7e2163ba7904bde7e4a88e9770f104bb172c771f7ff44c843241857198ba431fd91236070a5db64b57c3f628ec386b4ec1ce033f18e1
+AUX 3.0/conf.d/zabbix-jmx-proxy 432 SHA256 d6589913af04941843edc56b5d408ac7f8c7550810635f43275eabad6f91c060 SHA512 0d68b9681528256131e35b5115053242f8558f5ad06254e61a16ab14f6530048551f0b777fa81d4afe07cc6282c31a6204fd0ee2e56e0e792ed3252222212250 WHIRLPOOL 24b3510859c7eedaaaf46b7e474ba2698006c856082f2d5fa725c5cdb77483857e16f2a17bdd71cef0b9a6f73e20d6cda2b385381fa91b88ea2b7f707e596f2c
+AUX 3.0/init.d/zabbix-agentd 607 SHA256 600a3e7b9448add11c6848f6424c565aab30a67e1e82a304016a2eba7030d63b SHA512 915594ed8a9a41460e02045292a7235ee70676bacdf3fff721d189c5c39a8937758c2e7c7faa155abc6730bace44a3fbcc41188e4cfdf42796d3feee686daa50 WHIRLPOOL db2f5c1e20bd277be25fc2390ccebab345adf8cceaeb110c4e9547b616871ed4c5109fdc2a422a0359a50462d2b7779d4a311cd1908c0c332963bcc5980f9bd2
+AUX 3.0/init.d/zabbix-jmx-proxy 849 SHA256 487d0ca5d112d465dc1bf11d5dbad0ade773aca9c2d18526695c6449e9b27187 SHA512 79a1966405546899b2e6eb4cb53f0ea1ec70575cbf97ff0f9de16d662c5750f8bf276bf8eadaf00cb69ffa078b79e9144eb9824eec6a23df6b2cd315b79b05d8 WHIRLPOOL 805e5ca1fde95e310034926ab05981015c01d29ae1cacf2fbd41807186b2f57681b33dfbc34a1454800166129eb1efd5ee34f95fc7c48d25d538ff9c24b92369
+AUX 3.0/init.d/zabbix-proxy 585 SHA256 49571838eca586e8ca7b4136f7a47b757e6f22bf65b283322929de403b0eaa1a SHA512 c70439aa7de8209d1bdd791109c855ceeda3c4de7538f5aab0274f8e3fd5248eae99579293afb4f313148ae8ce0423cecfc338b4da6cb2ea412ed59ddebfc269 WHIRLPOOL 11ed11d0d3ddd357937b5186c10f313238e4ce5810dc695ac3479bff19ab4bf2c4963471d7180a06b444b9c9dcdfc41b8b0fde18079718ef8790d239e617a308
+AUX 3.0/init.d/zabbix-server 596 SHA256 43849ce0d06ad513042f7e93d6a5bf2435a820a2889899cf11ad634ef4fb6c66 SHA512 41109ac7c23fd6be5340923eb82bd724c98390667e86cb71ea02ea8faeaec65c0168aacda462f95936c5d49704b13751cea6bc3d90213db3a3d6bbc42b821fcb WHIRLPOOL e13a9a4c319068ec4064db0361eaf60e14359d5c7fa480644804a7ec6153cd5592301a5b020fccb0724c8ba7afdd143ee2e4c97330be7e8ddca4cff33ce05297
+AUX 3.0/zabbix_agent.conf 2138 SHA256 b3bc0b5facf5d55e50722ea109fbd3dd4757130f555ff6ecd4bd18ed8c795739 SHA512 7cfd6c1b1ec29b72a8d82f8d026cce2c6f56cd4c49d0a9f987193f812032dc26c814bd30f7ff115950dba1a8319d4e1bceebbdcc87f221e0fc34feb8c0264e56 WHIRLPOOL 84bf7e3421315157dff172060fc8d934dc05fa32ee393312be6ae10de5190dcd8749aabd724becf0c2d6eb530b385fbf6617b0288b0c141bd7cf446e7d356133
+AUX 3.0/zabbix_agentd.conf 10299 SHA256 8309d9c9085f1de9e6e3c74f05d8463b2d6d843f40a3fb556d837c6b53ad5ddb SHA512 ed2e8fca996b5227616a01a2479ca5910833e67d4c30b99b2f70a1618d0ec6f44b5a9d68de81131e1d84cd93a6e39ddf1ecb79beb7cb853232cb9ea0b5f6a3d9 WHIRLPOOL 88b5b8899da2b57123eb33a637be6333f2b4b3d24758ade644ccaf820697166e1eee84e160b138f0c5d720f62c1b65cc1daa46197eb6fa143b92a2edd9ebff38
+AUX 3.0/zabbix_proxy.conf 15824 SHA256 dc1b0ed18ec3f5af28557a5b7672dc5714fe20df84c9a317319528221f5fe24a SHA512 7f06f7e5514cc30d8f477a522fb37d4ff70307a78c9c748bccc6b352031f85947563a3f965986a9549a6a868bdac9c40d2596ea2e91affe507e0387443b1aab7 WHIRLPOOL f5c10bc14cd601e7ed56c9dc9111bd914305a32d88b1cd3a4c30a071b55457dbb71c3d2e9473cab2be679f0428f21e5a8e434f50caff6b27ff0f2dfa057a5a4a
+AUX 3.0/zabbix_server.conf 14822 SHA256 390e08a1034fdcf8c49ee07f5754fd7a8b05401b24e0c507ed626de39da7894e SHA512 755b8b80d8e10620f8d4d19fb22f3b99633a4904d134665aed982da9a43b2666b622753f7990d27d90d9645fa391882e46c8e37540a107852514d2966b0ce5e2 WHIRLPOOL 7aca42ec5fd5f48b3b4f0e7fa67dc6f8fa0934eb3d45cb63ba7f0227174f46183341aa8b20333a72902204c0701827e8be688c6bfd81ee27df37226cc4190cce
+AUX zabbix-agentd.service 254 SHA256 0cb3dce6c208d1bdcc9f258bf04904932a30e4a3ab6e45aa6b3a687fb807d3e3 SHA512 f740ef1f6f698eab0ebe894ba726b7a4b35379974c3f5dda26c43c6360f0b8f86f2846c085befe485ced6345fd39e67fe221ce9f08955896e4ccb5561e124c01 WHIRLPOOL fd3421c1197652b47393df3e6f25d2fbff0e7cf0419b518c6f3a23a0ef31f42123694826971253affb07daabdb4e70eb983d7fc560da80c8d05f0189a9fe8af5
+AUX zabbix-agentd.tmpfiles 35 SHA256 d0516a64ad0841dac41faf0ca709ff16405346f1e9d1bcb00dcffe37ac6b689b SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df WHIRLPOOL f8a3202aa65ecdf733cd8f9208c294dd2086d4de11682c01bd18f7122b0c3d2e1e3da4775020beca68f5bb9be8e14f57c50b0c18ecbad3c2c23237d3572e3b39
+AUX zabbix-proxy.service 244 SHA256 e0b65f25da5d4db20b50a62a50802f6692181365d43a09e59af906f78a1ccfef SHA512 450bc0ccd110fb012c31e43fc1dd92604255f7577dabce49e67b36f80ef73a1ddfd967e9ca7ccd37dc13e5ac50e0c45bf924999f4e3c7b13ddd284f89f076bad WHIRLPOOL 4b16647b07b30e59d2baa4b53a767154cf06d181813fda92df03f1fa11737abb4070f065f743fde34fa45a2dae614131420c07d61bb3390e1a696625967e09d2
+AUX zabbix-proxy.tmpfiles 35 SHA256 d0516a64ad0841dac41faf0ca709ff16405346f1e9d1bcb00dcffe37ac6b689b SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df WHIRLPOOL f8a3202aa65ecdf733cd8f9208c294dd2086d4de11682c01bd18f7122b0c3d2e1e3da4775020beca68f5bb9be8e14f57c50b0c18ecbad3c2c23237d3572e3b39
+AUX zabbix-server.service 281 SHA256 53465d624fc5cd4d00586119234c2d3d763b63a2721f9410392cb77f73db4a74 SHA512 b002e8efdc58300fc06ed1e1028f64d525dfaff52d74e661dbb4da3750b785d817d2bdff96f4ea3a28545fda4e37df962ec7a28b70868cc4b50b63ea27b088ff WHIRLPOOL caf2ef91caf33b517623e5c4e81bf635886d5199ec1f33389dee33cbb2d13c78d54911daac2d1af317d0b2b32d361424a961d7530a690d30f3d0089fb96e4808
+AUX zabbix-server.tmpfiles 35 SHA256 d0516a64ad0841dac41faf0ca709ff16405346f1e9d1bcb00dcffe37ac6b689b SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df WHIRLPOOL f8a3202aa65ecdf733cd8f9208c294dd2086d4de11682c01bd18f7122b0c3d2e1e3da4775020beca68f5bb9be8e14f57c50b0c18ecbad3c2c23237d3572e3b39
+DIST zabbix-2.2.16.tar.gz 15498413 SHA256 3cfcd8c7c11a2e18298e93f33701210b963a7c0e61d8c14fccfd9a8beef08041 SHA512 5d92c17e86608359fff220416d5eed2d4ac10edfe56f4162f4b7660c472cf6f609ba01034d76e5b7164c22d55a1fc5be753f5d0e0ce7ac71d00a6f68dca14afd WHIRLPOOL 2b219d17624ef40a8844193a3d836326160249549775db31c7c68597d17d9fa3d71ddbc9aa30e73c2255606957d0d2f5f562fbf2b0c0654d794c8e61e96e7ead
+DIST zabbix-2.2.17.tar.gz 15494053 SHA256 cf42c5db31c27466a9ec33b6bf22289bbc43ee4e5711e6d323d71644b743e535 SHA512 1abd60d05443cdb7b7ecdeca4d0b97414b249fe8be8c3ceaca137722af93e77101151bde59faaac4a3b61b8256bab68b0d1416192d8f72480703575794068a1f WHIRLPOOL 0ab0df7723ac6403fb26d53369fbc1d207b08343bd24f27832b2a2c7a1f043e6fe95ae99d79210f5baa5e5bd9ed9dd89acb74ce66114dfe4702d7913a26a4bb9
+DIST zabbix-2.2.18.tar.gz 15495920 SHA256 b87e7dadec65d04711fcd66dba398b213452453c5f0c3fc5490d1ab68a41abde SHA512 3e24827b2739aefa12e3d189b856d836b85a1fa45928343c08620ce1ef16c664a8ad806d051f5cffed10837a326245dd5617034f83cdd00432b81eb05be40491 WHIRLPOOL 7936219b6ea6b0db4251db494731b0cbd40a5b774467314a6011434b2c11111e21998217efb3a6925a7d4067da6fc04a4aea9d271f0568101f1ebe660244e378
+DIST zabbix-2.2.19.tar.gz 15497840 SHA256 311d70a1d0868eeda752b3e9555afbbdf3f37b380e79b0b0ee138e4be488873c SHA512 f9a35093cd63fe433ae67a01d526e65387455cc0c82b33d4015ad428991289f711857e089c169fc46fad51697e3a07a2b310026789099e6f42fa88f2f573c560 WHIRLPOOL b8ed5c92b88c3799cdd37b1e878b5db82e9147e9b603b99655cb4820a38caaeb6280733b3c4c5af57957e2dbf050f31cccad1c494cc4f46c7fcd95f5b1652d50
+DIST zabbix-2.2.20.tar.gz 15503661 SHA256 139a4000455bf948df247b4312b9127701596e80742e605beabcf93da4bfee02 SHA512 ca63237c1eece870c2f54a1c35c5165062d0e875e9aa05ce9654657de59e52a131b2ddc1f94dbfb1e2d3f4e6f202e4d6424ba97de06fa008fc15ff859ab8e0c6 WHIRLPOOL 397462758352b585c48aa3a4168ab06134057c292b89cd227ccee4a3ab29b5e7c4797afa2f673a904a91ffc78fd64ae9897697d6ecf923b5aa07a218ad79eb0a
+DIST zabbix-3.0.10.tar.gz 15573988 SHA256 49ab7a69352fc07c88e08f10e20ef714adde6d08e44df8af81edb82e26c7c772 SHA512 cb5602a6fdb78f4f5e3b6b0193e707497e8c04a7558da8345e2e9130f3058be670a48d501b36bca87d10a1964188ae81eb6cd83a573499086ce1f2152dfa9936 WHIRLPOOL d8da9e2eeaf1a7ded198f25198742a53b97762000b2f84add25fcbc05ff2c5be48193072338e6131e0d905d8429d581802125806512d7705e5f1aa50211fb385
+DIST zabbix-3.0.11.tar.gz 15642949 SHA256 e161f4b9ff233740029f9fa39c4cf7f1c7e3d829c465741b200d82d53ffda444 SHA512 880b69677833ed636c866fec731d84540a0269975c767bbcb834ca0bb22b8b881095b80b359e30e965282935650e6533d0e930bb6c21b2f6245d57a0e6e73ec6 WHIRLPOOL c4260523379640780fd3d06a86c6c0f001125b53c0b6e7a61f800ba123800737600c46f54756072fbfa3013844aaed68b999aa0687a1e9942b27ec853da6b44c
+DIST zabbix-3.0.6.tar.gz 15513412 SHA256 4fe972b061cae8cc91bf2870f2caabc967096f31def5a3f53e8789154b05a97b SHA512 ccffc58f3555bea62011bad272e8a3085d1723d8cb200e00a3e657696104c3fd055b8b963a26d9c726ef45a5381c7f9625498e99b756a3dd97b147d8b7884d1f WHIRLPOOL 137eb724b5205e5d38d00f96c62da5f96ef91c57b01280489bafb67c54d10e7c40304b4674fcefedda9381dfe6d2721b81dbcda1822f56f6d538e067c2588fea
+DIST zabbix-3.0.8.tar.gz 15514547 SHA256 1df3e106427ed21547b8119049a161092f597d04507f9eb535951a9ee887a476 SHA512 9f5fec7f3888f34ad9659a5d34d5fc089efc86a5fcf78f8cabf6704fbf95fd52a8caaab6f4291cb76d15cc2d69c986c95346fbe4fdfdc407c5506f3b8946aa1a WHIRLPOOL 83a391ee2d60e974fa4e569050b62af69df192d24ad8dd151d39b668a170980f4dc448e3564a823662aecf5a2f03adca9e32c37b4949c95cab71425e786ab0bb
+DIST zabbix-3.0.9.tar.gz 15516440 SHA256 4445f26c025009681c29c9b350aa6c4ee7b124ddcaf1609ae36c55997bcb8cf2 SHA512 f34d0fde48e64dfb6bea152ab6c63eb28be66e3647cc781d430b56b13bc91ac9f194ac80d264b2e837f8fceb929e0ebeda0221bf8363eb0a66e53461088a4ef9 WHIRLPOOL dae1417efa8df60633a950473af7cf9b533dc63abfdd95b2f2edb30fc07d074fa8ef626927e578911eead45461cdc4918f92be17c21d494d6f198519c117a74d
+DIST zabbix-3.2.2.tar.gz 15915015 SHA256 f9760dde57b1faee4bbecf00c39877678d58aaf4b6205e010d6b049d9cf4535e SHA512 1f6cb6344d24ed91c49fa116d6862cfd78caab9cd3297329369dd2df5cf9c83fda67bc9faa1a59f2b605bfeda73a69a3e29653fca320eda1b67f4d0931bfdb9b WHIRLPOOL a3e9c22459376b29b3f041f0e57b369976e2fa6eb752dd79e3f862a3095c216c91e08854dff350505c33c0a5e1b73b0c4b677d5a2bb1c0c872791023c741ac77
+DIST zabbix-3.2.3.tar.gz 15922416 SHA256 e6dba74039d8d6efff86ec3da99909f4daeaeb66d48781bbb666e3094533da25 SHA512 5a704282765fa66d1aa53ae546d3a49a35050d6830a25a3a9ad64d73f8aff48b31e8d13f37d147c8d6244bb0f2dab21bceb5d022f1c3ffa726c10edc6e7bd1f6 WHIRLPOOL cab23a3edfa53f7b505f0d7e03fbcf0a2f59a52e441e195b5f7ff5555ee7bd0258ba7cb93e45f894e16ba4ad1a1b236cfef0cc65c7b7905ee0ebde2e11972710
+DIST zabbix-3.2.4.tar.gz 15924840 SHA256 22cf19ef5a9478df2281bf518e8be38adc7dbc508bf63111e02388ca7aabeef4 SHA512 62e532bcf6a5ab82b1f943e28d46d1e64782758a405680d2c1a54e9c1092a340a50987045acbbad2b57439e3c2640d8a11fe1a29a234764859befa6a7fd779d1 WHIRLPOOL 8cac552472bb186a1e16bc809d68a7dd7a63eaec7503f204bec58cd03ce9f813247d47e95b6a17baa3765dca9a51835c2dc4d6efbc69bcf03ff64cb976ac716f
+DIST zabbix-3.2.5.tar.gz 15931390 SHA256 2f25d4622f85f9faa9626c9d5b3dbd9bf098f494fae007fecd52c8dc5545504e SHA512 313eda7d26d4fe443440ff20f355a51ee0a14d7dbce2aef7ce21f95543588eb69f111dc4b19e17024f82e629bcb8fdf5739dace6f05517aee744f4e68518ea37 WHIRLPOOL 1bdb93ba3f82cda5389e68f8e9468836e2e111133f3ccb983095ab45b866d1cb483cf05522c8bb13524d77ae8f09f753158af73ba73f3f8b6c1b098e28c6bebe
+DIST zabbix-3.2.6.tar.gz 16008047 SHA256 98f025b39515b196552b8a23e2fe20a8180b5e99e613ce7378725a46ed8b62d6 SHA512 48e70a7e33ec8c29967f099d27f240b2e8b02554b43a47387d02b5450367efcb0d2f1c60557194f6b1d4a9755d2c9c69a478627e57624521152b1c1ea0264844 WHIRLPOOL 19cccff8e71ea6bf18fc71ccc770ae863ef6ed63f56b068f0b8741d39fc9c0dab3f63129f74c057e5f34f64adcd584b478f5214214ff3d2deaf54e53a2b24574
+DIST zabbix-3.2.7.tar.gz 16016367 SHA256 3ea0c299bd69bc728177128740f0476bc1a2c1de438330df5bbd8f5fc6090712 SHA512 f60c82829c076a7f8b9d2f0c7dc91f7b65594ac4dcfaa08b19a61b730d8d21afc161636f793416613a47220535334fb675bb105738b130677c729fc0e31cd3e3 WHIRLPOOL 5956e6a5116a70f9feb00ffbb7547243f2de6a6c26188008bea31b4fb4d6fa31a099b11f9535f8409f7a66d6ab682837f27497b881b263f253192034250669fb
+DIST zabbix-3.2.8.tar.gz 16092939 SHA256 f27608b56f12dd016805a87fe3c8a6d5dbe55fe0626d463b1d6bbb4c6889ec16 SHA512 ba4356218c41c7bdf580906d58589ffd71baa357b26ae12f414bfa47592d61a8dc4de900f4ab24377475d5ece3723526eb170d678ea6083f0dce5ca0c4e594da WHIRLPOOL 2af99622552224da938a459dfb80edd86f508d687b63d92da6f7f85515fd31576247c685d02bc1feeed11e5dafb936af7dd07c9883144ad138ecaa5e7d3512e5
+DIST zabbix-3.4.1.tar.gz 17010519 SHA256 faaf1a1569ec6b4674d80e707904197c8b568f2b4660f636c28d0c42af471fd4 SHA512 e3ce49cbbb6ada1d12fa80ff366b9e819b8d7b8c60474698457f8250682614af0d2e5de6c2f6a9e34ab10bb8fd01eac51d8365489606b6d0aefc103c5780ebce WHIRLPOOL 52cfae3172e36a61db75f82f37ec97c9c85614c865c30b784b7644c2af99790e295f9700a1dcddfe85d23825f1b4cfccc2a9785051a8cb8d0c4439626ccbfcd9
+DIST zabbix-3.4.2.tar.gz 17113290 SHA256 54c21e04da4ef43380af647c6a0ddff67614337386fa318da021117efe5b334f SHA512 42feff59e1e1dd5d69a66cc857e9076b9a6f1410b5796a719cb660ea97ccd2544fe87f3cfabc27590cc53a321d24a7977daa320be1fdff31653b3650602dd385 WHIRLPOOL 752bf703018a67b8299a25b40e1fd204abf9e37675313705646b5eac05dfa84b5301f3ef9588aa21e097b1608ae82db418b084866f70800d78eb2384c1d34fce
+EBUILD zabbix-2.2.16.ebuild 9411 SHA256 33d56135b2eeece3b16240f014c8a20cf5d2731676e0e92e2709a952876efce6 SHA512 522fdcebd45a24c517c7a74b9e80969d4573f63205440ca61c0252d6280529f83019864c3ae24f89493974c06be09f7fe9872fc56332b1d8b950de6782b8d95c WHIRLPOOL 55ad51914a7f4088f84d401e12586fc417d76f42e8fcd1efaef78dfefde45f57d95b8fb43057aa61c9002a1caaae5a82d77d20259a8cdd23d3639cb6736b9e6e
+EBUILD zabbix-2.2.17.ebuild 9413 SHA256 87f763ba407034930c2ed76d479156744643d638ac7bde922b2425f8543499a2 SHA512 183407027ea64f68e8f257637444a160e7b4e42a590b9dc31d58273fe0280e733f8d0b4e9285ced47a2e818acc145e1cb381c61691ea536ae913ed4ffffcc055 WHIRLPOOL 206802f10e3ecd36c56edaf9d465d1c88b994c3c7147035d7f164f6b5a9b646fc1142c6984e4fb51e11f29031af4699e2dd4b68babaa01e06158b393048695a6
+EBUILD zabbix-2.2.18.ebuild 9413 SHA256 87f763ba407034930c2ed76d479156744643d638ac7bde922b2425f8543499a2 SHA512 183407027ea64f68e8f257637444a160e7b4e42a590b9dc31d58273fe0280e733f8d0b4e9285ced47a2e818acc145e1cb381c61691ea536ae913ed4ffffcc055 WHIRLPOOL 206802f10e3ecd36c56edaf9d465d1c88b994c3c7147035d7f164f6b5a9b646fc1142c6984e4fb51e11f29031af4699e2dd4b68babaa01e06158b393048695a6
+EBUILD zabbix-2.2.19.ebuild 9413 SHA256 87f763ba407034930c2ed76d479156744643d638ac7bde922b2425f8543499a2 SHA512 183407027ea64f68e8f257637444a160e7b4e42a590b9dc31d58273fe0280e733f8d0b4e9285ced47a2e818acc145e1cb381c61691ea536ae913ed4ffffcc055 WHIRLPOOL 206802f10e3ecd36c56edaf9d465d1c88b994c3c7147035d7f164f6b5a9b646fc1142c6984e4fb51e11f29031af4699e2dd4b68babaa01e06158b393048695a6
+EBUILD zabbix-2.2.20.ebuild 9413 SHA256 87f763ba407034930c2ed76d479156744643d638ac7bde922b2425f8543499a2 SHA512 183407027ea64f68e8f257637444a160e7b4e42a590b9dc31d58273fe0280e733f8d0b4e9285ced47a2e818acc145e1cb381c61691ea536ae913ed4ffffcc055 WHIRLPOOL 206802f10e3ecd36c56edaf9d465d1c88b994c3c7147035d7f164f6b5a9b646fc1142c6984e4fb51e11f29031af4699e2dd4b68babaa01e06158b393048695a6
+EBUILD zabbix-3.0.10.ebuild 9276 SHA256 2468af2abb48074e6ad8864cc84ef46c99a1abe022c278e92992123086434ebe SHA512 6739ba08d11cd9c05f2ab55dd2d60c8f808636e4c7af6c188280b7a3ed41c8d976d4526f53064859d2bec3e4b8e32dc98e0ab4718691893dd6c68a28af2d3c3c WHIRLPOOL a77a540a4d94a969fb09f67762cbb52c2c7728f749ae74a35fab6af827f86264374ba46f713123edc9038722dc1f97ce6d0d25653b40f1cf5b4e4a41caa599f6
+EBUILD zabbix-3.0.11.ebuild 9276 SHA256 2468af2abb48074e6ad8864cc84ef46c99a1abe022c278e92992123086434ebe SHA512 6739ba08d11cd9c05f2ab55dd2d60c8f808636e4c7af6c188280b7a3ed41c8d976d4526f53064859d2bec3e4b8e32dc98e0ab4718691893dd6c68a28af2d3c3c WHIRLPOOL a77a540a4d94a969fb09f67762cbb52c2c7728f749ae74a35fab6af827f86264374ba46f713123edc9038722dc1f97ce6d0d25653b40f1cf5b4e4a41caa599f6
+EBUILD zabbix-3.0.6.ebuild 9276 SHA256 ce18219796d2ae09dc32c82c551b89242ef67c6f4e9d5af1c1caae4af4ee985c SHA512 4275953f472eb7a4e6fc0988f93eb1f3d1f133d15dd245120fe5e48a1f4a3276debf412667b248bead4045e9c067818f1a2aed03b9b14d18cc45515d8232881f WHIRLPOOL 6efcfab549c0fc2f651d2b56cf6f9a88a5058fef4f5010c6721557cef03d78e5ab3e173ebeeeb6a4b851fb485486d2de0a9acea4c29c627639009d9a90f1eb75
+EBUILD zabbix-3.0.8.ebuild 9276 SHA256 2468af2abb48074e6ad8864cc84ef46c99a1abe022c278e92992123086434ebe SHA512 6739ba08d11cd9c05f2ab55dd2d60c8f808636e4c7af6c188280b7a3ed41c8d976d4526f53064859d2bec3e4b8e32dc98e0ab4718691893dd6c68a28af2d3c3c WHIRLPOOL a77a540a4d94a969fb09f67762cbb52c2c7728f749ae74a35fab6af827f86264374ba46f713123edc9038722dc1f97ce6d0d25653b40f1cf5b4e4a41caa599f6
+EBUILD zabbix-3.0.9.ebuild 9276 SHA256 2468af2abb48074e6ad8864cc84ef46c99a1abe022c278e92992123086434ebe SHA512 6739ba08d11cd9c05f2ab55dd2d60c8f808636e4c7af6c188280b7a3ed41c8d976d4526f53064859d2bec3e4b8e32dc98e0ab4718691893dd6c68a28af2d3c3c WHIRLPOOL a77a540a4d94a969fb09f67762cbb52c2c7728f749ae74a35fab6af827f86264374ba46f713123edc9038722dc1f97ce6d0d25653b40f1cf5b4e4a41caa599f6
+EBUILD zabbix-3.2.2.ebuild 9240 SHA256 154e1f99b7cf5f63b2bba9b16f0f756ef9429c53fa731bd2099d6a8fe987a604 SHA512 6a72ef2a6cbcecd6474f38500b40ef54de31542e1885fc1bd76a3e285b4771c98d0827fa13b2e9c9996745b4f44446d3a89c7ba971806197c6a23bdf9386848a WHIRLPOOL 60e3db4eb99a80e2582f6ea9a24c15b0a806f1f401586dddcd073275900d5ba17ec3aecd143328d9d02627829a2c8aaa6022495a1423d99c660dae39aea762fc
+EBUILD zabbix-3.2.3.ebuild 9240 SHA256 154e1f99b7cf5f63b2bba9b16f0f756ef9429c53fa731bd2099d6a8fe987a604 SHA512 6a72ef2a6cbcecd6474f38500b40ef54de31542e1885fc1bd76a3e285b4771c98d0827fa13b2e9c9996745b4f44446d3a89c7ba971806197c6a23bdf9386848a WHIRLPOOL 60e3db4eb99a80e2582f6ea9a24c15b0a806f1f401586dddcd073275900d5ba17ec3aecd143328d9d02627829a2c8aaa6022495a1423d99c660dae39aea762fc
+EBUILD zabbix-3.2.4.ebuild 9240 SHA256 898444a2640f901c033b890641d8ab0b2b30eee6efb074eb1cd6aa187e0cf1c9 SHA512 502e7299347bce819d47662096eeb5d5161f63777d0ba337bc18b75936d81b3a416c37703506dd342e40792051e3233dff168c3dc99aa611c4af7ae43dec8016 WHIRLPOOL 588482189282116bffbee2010f93a5a627494e514a8e60edb4270989484dd6552df648a8205d1f230af18da9a2235f522732cecf93b3a860062f1255271d243f
+EBUILD zabbix-3.2.5.ebuild 9240 SHA256 898444a2640f901c033b890641d8ab0b2b30eee6efb074eb1cd6aa187e0cf1c9 SHA512 502e7299347bce819d47662096eeb5d5161f63777d0ba337bc18b75936d81b3a416c37703506dd342e40792051e3233dff168c3dc99aa611c4af7ae43dec8016 WHIRLPOOL 588482189282116bffbee2010f93a5a627494e514a8e60edb4270989484dd6552df648a8205d1f230af18da9a2235f522732cecf93b3a860062f1255271d243f
+EBUILD zabbix-3.2.6.ebuild 9240 SHA256 898444a2640f901c033b890641d8ab0b2b30eee6efb074eb1cd6aa187e0cf1c9 SHA512 502e7299347bce819d47662096eeb5d5161f63777d0ba337bc18b75936d81b3a416c37703506dd342e40792051e3233dff168c3dc99aa611c4af7ae43dec8016 WHIRLPOOL 588482189282116bffbee2010f93a5a627494e514a8e60edb4270989484dd6552df648a8205d1f230af18da9a2235f522732cecf93b3a860062f1255271d243f
+EBUILD zabbix-3.2.7.ebuild 9240 SHA256 898444a2640f901c033b890641d8ab0b2b30eee6efb074eb1cd6aa187e0cf1c9 SHA512 502e7299347bce819d47662096eeb5d5161f63777d0ba337bc18b75936d81b3a416c37703506dd342e40792051e3233dff168c3dc99aa611c4af7ae43dec8016 WHIRLPOOL 588482189282116bffbee2010f93a5a627494e514a8e60edb4270989484dd6552df648a8205d1f230af18da9a2235f522732cecf93b3a860062f1255271d243f
+EBUILD zabbix-3.2.8.ebuild 9240 SHA256 898444a2640f901c033b890641d8ab0b2b30eee6efb074eb1cd6aa187e0cf1c9 SHA512 502e7299347bce819d47662096eeb5d5161f63777d0ba337bc18b75936d81b3a416c37703506dd342e40792051e3233dff168c3dc99aa611c4af7ae43dec8016 WHIRLPOOL 588482189282116bffbee2010f93a5a627494e514a8e60edb4270989484dd6552df648a8205d1f230af18da9a2235f522732cecf93b3a860062f1255271d243f
+EBUILD zabbix-3.4.1.ebuild 9254 SHA256 086a73af7a3673ea5700f28ca28dbb5a034ee79fba97e19a8f0cef4b0963ed50 SHA512 979b168af278b789bd0779f8762baa605dda2c2f109155a6f7ca45df23e4c0e922357975cd5dfbb861fc4497f9bf5a455f17c333da41414af196450a15ffcac0 WHIRLPOOL aa104fd5758c3abe0c8986c91b6e68473c05ed383fa97d9c15542e98935ab44371ad9b4c055821b4304ef91fc196d1d85e30c50e84d6f4e24c207acb002e5590
+EBUILD zabbix-3.4.2.ebuild 9254 SHA256 086a73af7a3673ea5700f28ca28dbb5a034ee79fba97e19a8f0cef4b0963ed50 SHA512 979b168af278b789bd0779f8762baa605dda2c2f109155a6f7ca45df23e4c0e922357975cd5dfbb861fc4497f9bf5a455f17c333da41414af196450a15ffcac0 WHIRLPOOL aa104fd5758c3abe0c8986c91b6e68473c05ed383fa97d9c15542e98935ab44371ad9b4c055821b4304ef91fc196d1d85e30c50e84d6f4e24c207acb002e5590
+MISC ChangeLog 11545 SHA256 31fa904f00b346fa7cbddbace720019f7d8aa9c9d91b549934f2b2560acd840e SHA512 e380c06a57c77fbc67d5d6c818c02b9611cedab166a94c78775648e941a86ddadeed98a021fc1e6a9bdbff29964582b827b0e37747bd2ab9b8c13b193f0b17f9 WHIRLPOOL 157ee54c2f767570374dd6008837cd6a07ab09c12ff4e263d6d00cfdb3e1dd80a54a46237d0b59f587cf50779668a6de0eed5c8ada96b05d7ffd390a37f44107
+MISC ChangeLog-2015 41076 SHA256 7feb294f642c0a648b2fe1918b7b6238f780e2805cd9646b791e08af1857414e SHA512 6f5e87f26f273baaa5e4eb611af23600b6011a145e304a2a97f5ade594a6a581734a083924bbd9867444793e49b62d36244b0d2d723445d4ab0226fee351a803 WHIRLPOOL 10bf063a8209b7ab3d67e4fd3de13d605e7637deaa2f4c1764cd272f2dfda0676538e50161deaadaad90b75a1b902200d120956fb4e5f119ccc8d65a1a266682
+MISC metadata.xml 1402 SHA256 3790615d203c28077ae91711a0cff900074d5f5853fd99ed53c2fede9fb873bc SHA512 8d3ad204e8cfb4d2aa76f0af90c77d7b6e4cc13da54772d95fe43d68bf85eb96e9d96bc2b11b08421e4684b03ad53042a4f4c0a44817f0e4ea804b81996cda5a WHIRLPOOL c50a85cfffea91c2f0a1218bba6f172edcc5d965d7e917e066ce6002ef66079255f377da9a7133f736552227c51d77e9c7363dc1e4a8cfcc02b09020eba91387
diff --git a/net-analyzer/zabbix/files/2.2/init.d/zabbix-agentd b/net-analyzer/zabbix/files/2.2/init.d/zabbix-agentd
new file mode 100644
index 000000000000..50db578f6b5a
--- /dev/null
+++ b/net-analyzer/zabbix/files/2.2/init.d/zabbix-agentd
@@ -0,0 +1,28 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+pid_file="/run/zabbix/zabbix_agentd.pid"
+
+depend() {
+	need net
+	provide zabbix-agent
+	use zabbix-server
+}
+
+start_pre() {
+	checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix
+}
+
+start() {
+	ebegin "Starting Zabbix agent"
+	start-stop-daemon --start --pidfile ${pid_file} \
+		--user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd -- -c /etc/zabbix/zabbix_agentd.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Zabbix agent"
+	start-stop-daemon  --stop --pidfile ${pid_file}
+	eend $?
+}
diff --git a/net-analyzer/zabbix/files/2.2/init.d/zabbix-proxy b/net-analyzer/zabbix/files/2.2/init.d/zabbix-proxy
new file mode 100644
index 000000000000..81bd4f3607a1
--- /dev/null
+++ b/net-analyzer/zabbix/files/2.2/init.d/zabbix-proxy
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+pid_file="/run/zabbix/zabbix_proxy.pid"
+
+depend() {
+	need net
+	provide zabbix-proxy
+}
+
+start_pre() {
+	checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix
+}
+
+start() {
+	ebegin "Starting Zabbix proxy"
+	start-stop-daemon --start --pidfile ${pid_file} \
+		--user zabbix --group zabbix --exec /usr/sbin/zabbix_proxy -- -c /etc/zabbix/zabbix_proxy.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Zabbix proxy"
+	start-stop-daemon  --stop --pidfile ${pid_file}
+	eend $?
+}
diff --git a/net-analyzer/zabbix/files/2.2/init.d/zabbix-server b/net-analyzer/zabbix/files/2.2/init.d/zabbix-server
new file mode 100644
index 000000000000..abc9002f4646
--- /dev/null
+++ b/net-analyzer/zabbix/files/2.2/init.d/zabbix-server
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+pid_file="/run/zabbix/zabbix_server.pid"
+
+depend() {
+	need net
+	use mysql postgresql
+}
+start_pre() {
+	checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix
+}
+
+start() {
+	ebegin "Starting Zabbix server"
+	start-stop-daemon --start --user zabbix --group zabbix --pidfile ${pid_file} \
+	        --exec /usr/sbin/zabbix_server -- -c /etc/zabbix/zabbix_server.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Zabbix server"
+	start-stop-daemon --stop --pidfile ${pid_file} 
+	eend $?
+}
diff --git a/net-analyzer/zabbix/files/2.2/patches/zbx7479.patch b/net-analyzer/zabbix/files/2.2/patches/zbx7479.patch
new file mode 100644
index 000000000000..79bb92f4bae0
--- /dev/null
+++ b/net-analyzer/zabbix/files/2.2/patches/zbx7479.patch
@@ -0,0 +1,83 @@
+Index: src/libs/zbxsysinfo/sysinfo.c
+===================================================================
+--- src/libs/zbxsysinfo/sysinfo.c	(revision 40348)
++++ src/libs/zbxsysinfo/sysinfo.c	(working copy)
+@@ -427,13 +427,49 @@
+ 	test_aliases();
+ }
+ 
++static int	zbx_check_user_parameter(const char *param, char *error, int max_error_len)
++{
++	const char	suppressed_chars[] = "\\'\"`*?[]{}~$!&;()<>|#@\n", *c;
++	char		*buf = NULL;
++	size_t		buf_alloc = 128, buf_offset = 0;
++
++	if (0 != CONFIG_UNSAFE_USER_PARAMETERS)
++		return SUCCEED;
++
++	for (c = suppressed_chars; '\0' != *c; c++)
++	{
++		if (NULL == strchr(param, *c))
++			continue;
++
++		buf = zbx_malloc(buf, buf_alloc);
++
++		for (c = suppressed_chars; '\0' != *c; c++)
++		{
++			if (c != suppressed_chars)
++				zbx_strcpy_alloc(&buf, &buf_alloc, &buf_offset, ", ");
++
++			if (0 != isprint(*c))
++				zbx_chrcpy_alloc(&buf, &buf_alloc, &buf_offset, *c);
++			else
++				zbx_snprintf_alloc(&buf, &buf_alloc, &buf_offset, "0x%02x", *c);
++		}
++
++		zbx_snprintf(error, max_error_len, "special characters \"%s\" are not allowed in the parameters", buf);
++
++		zbx_free(buf);
++
++		return FAIL;
++	}
++
++	return SUCCEED;
++}
++
+ static int	replace_param(const char *cmd, const char *param, char *out, int outlen, char *error, int max_error_len)
+ {
+ 	int		ret = SUCCEED;
+ 	char		buf[MAX_STRING_LEN];
+ 	char		command[MAX_STRING_LEN];
+ 	char		*pl, *pr;
+-	const char	suppressed_chars[] = "\\'\"`*?[]{}~$!&;()<>|#@", *c;
+ 
+ 	assert(out);
+ 
+@@ -465,25 +501,10 @@
+ 			{
+ 				get_param(param, (int)(pr[1] - '0'), buf, sizeof(buf));
+ 
+-				if (0 == CONFIG_UNSAFE_USER_PARAMETERS)
+-				{
+-					for (c = suppressed_chars; '\0' != *c; c++)
+-					{
+-						if (NULL != strchr(buf, *c))
+-						{
+-							zbx_snprintf(error, max_error_len, "Special characters '%s'"
+-									" are not allowed in the parameters",
+-									suppressed_chars);
+-							ret = FAIL;
+-							break;
+-						}
+-					}
+-				}
++				if (SUCCEED != (ret = zbx_check_user_parameter(buf, error, max_error_len)))
++					break;
+ 			}
+ 
+-			if (FAIL == ret)
+-				break;
+-
+ 			zbx_strlcat(out, buf, outlen);
+ 			outlen -= MIN((int)strlen(buf), (int)outlen);
+ 
diff --git a/net-analyzer/zabbix/files/2.2/patches/zbx8151.patch b/net-analyzer/zabbix/files/2.2/patches/zbx8151.patch
new file mode 100644
index 000000000000..076e10ab75a4
--- /dev/null
+++ b/net-analyzer/zabbix/files/2.2/patches/zbx8151.patch
@@ -0,0 +1,53 @@
+Index: frontends/php/include/defines.inc.php
+===================================================================
+--- frontends/php/include/defines.inc.php	(revision 46596)
++++ frontends/php/include/defines.inc.php	(revision 46655)
+@@ -835,6 +835,14 @@
+ 
+ define('ZBX_DEFAULT_IMPORT_HOST_GROUP', 'Imported hosts');
+ 
++// XML import flags
++// See ZBX-8151. Old version of libxml suffered from setting DTDLOAD and NOENT flags by default, which allowed
++// performing XXE attacks. Calling libxml_disable_entity_loader(true) also had no affect if flags passed to libxml
++// calls were 0 - so for better security with legacy libxml we need to call libxml_disable_entity_loader(true) AND
++// pass the LIBXML_NONET flag. Please keep in mind that LIBXML_NOENT actually EXPANDS entities, opposite to it's name -
++// so this flag is not needed here.
++define('LIBXML_IMPORT_FLAGS', LIBXML_NONET);
++
+ // API errors
+ define('ZBX_API_ERROR_INTERNAL',	111);
+ define('ZBX_API_ERROR_PARAMETERS',	100);
+Index: frontends/php/include/classes/import/readers/CXmlImportReader.php
+===================================================================
+--- frontends/php/include/classes/import/readers/CXmlImportReader.php	(revision 46596)
++++ frontends/php/include/classes/import/readers/CXmlImportReader.php	(revision 46655)
+@@ -32,7 +32,8 @@
+ 	 */
+ 	public function read($string) {
+ 		libxml_use_internal_errors(true);
+-		$result = simplexml_load_string($string);
++		libxml_disable_entity_loader(true);
++		$result = simplexml_load_string($string, null, LIBXML_IMPORT_FLAGS);
+ 		if (!$result) {
+ 			$errors = libxml_get_errors();
+ 			libxml_clear_errors();
+Index: frontends/php/include/classes/import/CXmlImport18.php
+===================================================================
+--- frontends/php/include/classes/import/CXmlImport18.php	(revision 46596)
++++ frontends/php/include/classes/import/CXmlImport18.php	(revision 46655)
+@@ -390,12 +390,13 @@
+ 		return $array;
+ 	}
+ 
+-	public static function import($file) {
++	public static function import($source) {
+ 
+ 		libxml_use_internal_errors(true);
++		libxml_disable_entity_loader(true);
+ 
+ 		$xml = new DOMDocument();
+-		if (!$xml->loadXML($file)) {
++		if (!$xml->loadXML($source, LIBXML_IMPORT_FLAGS)) {
+ 			$text = '';
+ 			foreach (libxml_get_errors() as $error) {
+ 				switch ($error->level) {
diff --git a/net-analyzer/zabbix/files/2.2/zabbix_agent.conf b/net-analyzer/zabbix/files/2.2/zabbix_agent.conf
new file mode 100644
index 000000000000..dcb4b7248c2e
--- /dev/null
+++ b/net-analyzer/zabbix/files/2.2/zabbix_agent.conf
@@ -0,0 +1,81 @@
+# This is a config file for Zabbix internet service daemon agent
+# To get more information about Zabbix visit http://www.zabbix.com
+
+### Option: Server
+#	IP address of Zabbix server
+#	Connections from other hosts will be denied
+#	If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally.
+#
+# Mandatory: yes
+# Default:
+# Server=
+
+Server=127.0.0.1
+
+############ ADVANCED PARAMETERS #################
+
+### Option: Alias
+#	Sets an alias for parameter. It can be useful to substitute long and complex parameter name with a smaller and simpler one.
+#
+# Mandatory: no
+# Range:
+# Default:
+
+### Option: Timeout
+#	Spend no more than Timeout seconds on processing
+#
+# Mandatory: no
+# Range: 1-30
+# Default:
+# Timeout=3
+
+### Option: Include
+#	You may include individual files or all files in a directory in the configuration file.
+#	Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time.
+#
+# Mandatory: no
+# Default:
+# Include=
+
+# Include=/usr/local/etc/zabbix_agent.userparams.conf
+# Include=/usr/local/etc/zabbix_agent.conf.d/
+
+####### USER-DEFINED MONITORED PARAMETERS #######
+
+### Option: UnsafeUserParameters
+#	Allow all characters to be passed in arguments to user-defined parameters.
+#	0 - do not allow
+#	1 - allow
+#
+# Mandatory: no
+# Default:
+# UnsafeUserParameters=0
+
+### Option: UserParameter
+#	User-defined parameter to monitor. There can be several user-defined parameters.
+#	Format: UserParameter=<key>,<shell command>
+#	See 'zabbix_agentd' directory for examples.
+#
+# Mandatory: no
+# Default:
+# UserParameter=
+
+####### LOADABLE MODULES #######
+
+### Option: LoadModulePath
+#	Full path to location of agent modules.
+#	Default depends on compilation options.
+#
+# Mandatory: no
+# Default:
+# LoadModulePath=${libdir}/modules
+
+### Option: LoadModule
+#	Module to load at agent startup. Modules are used to extend functionality of the agent.
+#	Format: LoadModule=<module.so>
+#	The modules must be located in directory specified by LoadModulePath.
+#	It is allowed to include multiple LoadModule parameters.
+#
+# Mandatory: no
+# Default:
+# LoadModule=
diff --git a/net-analyzer/zabbix/files/2.2/zabbix_agentd.conf b/net-analyzer/zabbix/files/2.2/zabbix_agentd.conf
new file mode 100644
index 000000000000..4d49d3685e81
--- /dev/null
+++ b/net-analyzer/zabbix/files/2.2/zabbix_agentd.conf
@@ -0,0 +1,278 @@
+# This is a config file for the Zabbix agent daemon (Unix)
+# To get more information about Zabbix, visit http://www.zabbix.com
+
+############ GENERAL PARAMETERS #################
+
+### Option: PidFile
+#	Name of PID file.
+#
+# Mandatory: no
+# Default:
+PidFile=/run/zabbix/zabbix_agentd.pid
+
+### Option: LogFile
+#	Name of log file.
+#	If not set, syslog is used.
+#
+# Mandatory: no
+# Default:
+# LogFile=
+
+LogFile=/var/log/zabbix/zabbix_agentd.log
+
+### Option: LogFileSize
+#	Maximum size of log file in MB.
+#	0 - disable automatic log rotation.
+#
+# Mandatory: no
+# Range: 0-1024
+# Default:
+LogFileSize=128
+
+### Option: DebugLevel
+#	Specifies debug level
+#	0 - no debug
+#	1 - critical information
+#	2 - error information
+#	3 - warnings
+#	4 - for debugging (produces lots of information)
+#
+# Mandatory: no
+# Range: 0-4
+# Default:
+# DebugLevel=3
+
+### Option: SourceIP
+#	Source IP address for outgoing connections.
+#
+# Mandatory: no
+# Default:
+# SourceIP=
+
+### Option: EnableRemoteCommands
+#	Whether remote commands from Zabbix server are allowed.
+#	0 - not allowed
+#	1 - allowed
+#
+# Mandatory: no
+# Default:
+# EnableRemoteCommands=0
+
+### Option: LogRemoteCommands
+#	Enable logging of executed shell commands as warnings.
+#	0 - disabled
+#	1 - enabled
+#
+# Mandatory: no
+# Default:
+# LogRemoteCommands=0
+
+##### Passive checks related
+
+### Option: Server
+#	List of comma delimited IP addresses (or hostnames) of Zabbix servers.
+#	Incoming connections will be accepted only from the hosts listed here.
+#	If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally.
+#
+# Mandatory: no
+# Default:
+# Server=
+
+Server=127.0.0.1
+
+### Option: ListenPort
+#	Agent will listen on this port for connections from the server.
+#
+# Mandatory: no
+# Range: 1024-32767
+# Default:
+# ListenPort=10050
+
+### Option: ListenIP
+#	List of comma delimited IP addresses that the agent should listen on.
+#	First IP address is sent to Zabbix server if connecting to it to retrieve list of active checks.
+#
+# Mandatory: no
+# Default:
+# ListenIP=0.0.0.0
+
+### Option: StartAgents
+#	Number of pre-forked instances of zabbix_agentd that process passive checks.
+#	If set to 0, disables passive checks and the agent will not listen on any TCP port.
+#
+# Mandatory: no
+# Range: 0-100
+# Default:
+# StartAgents=3
+
+##### Active checks related
+
+### Option: ServerActive
+#	List of comma delimited IP:port (or hostname:port) pairs of Zabbix servers for active checks.
+#	If port is not specified, default port is used.
+#	IPv6 addresses must be enclosed in square brackets if port for that host is specified.
+#	If port is not specified, square brackets for IPv6 addresses are optional.
+#	If this parameter is not specified, active checks are disabled.
+#	Example: ServerActive=127.0.0.1:20051,zabbix.domain,[::1]:30051,::1,[12fc::1]
+#
+# Mandatory: no
+# Default:
+# ServerActive=
+
+ServerActive=127.0.0.1
+
+### Option: Hostname
+#	Unique, case sensitive hostname.
+#	Required for active checks and must match hostname as configured on the server.
+#	Value is acquired from HostnameItem if undefined.
+#
+# Mandatory: no
+# Default:
+# Hostname=
+
+Hostname=Zabbix server
+
+### Option: HostnameItem
+#	Item used for generating Hostname if it is undefined.
+#	Ignored if Hostname is defined.
+#
+# Mandatory: no
+# Default:
+# HostnameItem=system.hostname
+
+### Option: HostMetadata
+#	Optional parameter that defines host metadata.
+#	Host metadata is used at host auto-registration process.
+#	An agent will issue an error and not start if the value is over limit of 255 characters.
+#	If not defined, value will be acquired from HostMetadataItem.
+#
+# Mandatory: no
+# Range: 0-255 characters
+# Default:
+# HostMetadata=
+
+### Option: HostMetadataItem
+#	Optional parameter that defines an item used for getting host metadata.
+#	Host metadata is used at host auto-registration process.
+#	During an auto-registration request an agent will log a warning message if
+#	the value returned by specified item is over limit of 255 characters.
+#	This option is only used when HostMetadata is not defined.
+#
+# Mandatory: no
+# Default:
+# HostMetadataItem=
+
+### Option: RefreshActiveChecks
+#	How often list of active checks is refreshed, in seconds.
+#
+# Mandatory: no
+# Range: 60-3600
+# Default:
+# RefreshActiveChecks=120
+
+### Option: BufferSend
+#	Do not keep data longer than N seconds in buffer.
+#
+# Mandatory: no
+# Range: 1-3600
+# Default:
+# BufferSend=5
+
+### Option: BufferSize
+#	Maximum number of values in a memory buffer. The agent will send
+#	all collected data to Zabbix Server or Proxy if the buffer is full.
+#
+# Mandatory: no
+# Range: 2-65535
+# Default:
+# BufferSize=100
+
+### Option: MaxLinesPerSecond
+#	Maximum number of new lines the agent will send per second to Zabbix Server
+#	or Proxy processing 'log' and 'logrt' active checks.
+#	The provided value will be overridden by the parameter 'maxlines',
+#	provided in 'log' or 'logrt' item keys.
+#
+# Mandatory: no
+# Range: 1-1000
+# Default:
+# MaxLinesPerSecond=100
+
+############ ADVANCED PARAMETERS #################
+
+### Option: Alias
+#	Sets an alias for parameter. It can be useful to substitute long and complex parameter name with a smaller and simpler one.
+#
+# Mandatory: no
+# Range:
+# Default:
+
+### Option: Timeout
+#	Spend no more than Timeout seconds on processing
+#
+# Mandatory: no
+# Range: 1-30
+# Default:
+# Timeout=3
+
+### Option: AllowRoot
+#	Allow the agent to run as 'root'. If disabled and the agent is started by 'root', the agent
+#	will try to switch to user 'zabbix' instead. Has no effect if started under a regular user.
+#	0 - do not allow
+#	1 - allow
+#
+# Mandatory: no
+# Default:
+# AllowRoot=0
+
+### Option: Include
+#	You may include individual files or all files in a directory in the configuration file.
+#	Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time.
+#
+# Mandatory: no
+# Default:
+# Include=
+
+# Include=/usr/local/etc/zabbix_agentd.userparams.conf
+# Include=/usr/local/etc/zabbix_agentd.conf.d/
+
+####### USER-DEFINED MONITORED PARAMETERS #######
+
+### Option: UnsafeUserParameters
+#	Allow all characters to be passed in arguments to user-defined parameters.
+#	0 - do not allow
+#	1 - allow
+#
+# Mandatory: no
+# Range: 0-1
+# Default:
+# UnsafeUserParameters=0
+
+### Option: UserParameter
+#	User-defined parameter to monitor. There can be several user-defined parameters.
+#	Format: UserParameter=<key>,<shell command>
+#	See 'zabbix_agentd' directory for examples.
+#
+# Mandatory: no
+# Default:
+# UserParameter=
+
+####### LOADABLE MODULES #######
+
+### Option: LoadModulePath
+#	Full path to location of agent modules.
+#	Default depends on compilation options.
+#
+# Mandatory: no
+# Default:
+# LoadModulePath=${libdir}/modules
+
+### Option: LoadModule
+#	Module to load at agent startup. Modules are used to extend functionality of the agent.
+#	Format: LoadModule=<module.so>
+#	The modules must be located in directory specified by LoadModulePath.
+#	It is allowed to include multiple LoadModule parameters.
+#
+# Mandatory: no
+# Default:
+# LoadModule=
diff --git a/net-analyzer/zabbix/files/2.2/zabbix_proxy.conf b/net-analyzer/zabbix/files/2.2/zabbix_proxy.conf
new file mode 100644
index 000000000000..d4bae2ea962f
--- /dev/null
+++ b/net-analyzer/zabbix/files/2.2/zabbix_proxy.conf
@@ -0,0 +1,519 @@
+# This is a configuration file for Zabbix Proxy process
+# To get more information about Zabbix,
+# visit http://www.zabbix.com
+
+############ GENERAL PARAMETERS #################
+
+### Option: ProxyMode
+#	Proxy operating mode
+#	0 - proxy in the active mode
+#	1 - proxy in the passive mode
+#
+# Mandatory: no
+# Default:
+# ProxyMode=0
+
+### Option: Server
+#	IP address (or hostname) of Zabbix server.
+#	Active proxy will get configuration data from the server.
+#	For a proxy in the passive mode this parameter will be ignored.
+#
+# Mandatory: yes (if ProxyMode is set to 0)
+# Default:
+# Server=
+
+Server=127.0.0.1
+
+### Option: ServerPort
+#	Port of Zabbix trapper on Zabbix server.
+#	For a proxy in the passive mode this parameter will be ignored.
+#
+# Mandatory: no
+# Range: 1024-32767
+# Default:
+# ServerPort=10051
+
+### Option: Hostname
+#	Unique, case sensitive Proxy name. Make sure the Proxy name is known to the server!
+#	Value is acquired from HostnameItem if undefined.
+#
+# Mandatory: no
+# Default:
+# Hostname=
+
+Hostname=Zabbix proxy
+
+### Option: HostnameItem
+#	Item used for generating Hostname if it is undefined.
+#	Ignored if Hostname is defined.
+#
+# Mandatory: no
+# Default:
+# HostnameItem=system.hostname
+
+### Option: ListenPort
+#	Listen port for trapper.
+#
+# Mandatory: no
+# Range: 1024-32767
+# Default:
+# ListenPort=10051
+
+### Option: SourceIP
+#	Source IP address for outgoing connections.
+#
+# Mandatory: no
+# Default:
+# SourceIP=
+
+### Option: LogFile
+#	Name of log file.
+#	If not set, syslog is used.
+#
+# Mandatory: no
+# Default:
+# LogFile=
+
+LogFile=/var/log/zabbix/zabbix_proxy.log
+
+### Option: LogFileSize
+#	Maximum size of log file in MB.
+#	0 - disable automatic log rotation.
+#
+# Mandatory: no
+# Range: 0-1024
+# Default:
+LogFileSize=128
+
+### Option: DebugLevel
+#	Specifies debug level
+#	0 - no debug
+#	1 - critical information
+#	2 - error information
+#	3 - warnings
+#	4 - for debugging (produces lots of information)
+#
+# Mandatory: no
+# Range: 0-4
+# Default:
+# DebugLevel=3
+
+### Option: PidFile
+#	Name of PID file.
+#
+# Mandatory: no
+# Default:
+PidFile=/run/zabbix/zabbix_proxy.pid
+
+### Option: DBHost
+#	Database host name.
+#	If set to localhost, socket is used for MySQL.
+#	If set to empty string, socket is used for PostgreSQL.
+#
+# Mandatory: no
+# Default:
+# DBHost=localhost
+
+### Option: DBName
+#	Database name.
+#	For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored.
+#	Warning: do not attempt to use the same database Zabbix server is using.
+#
+# Mandatory: yes
+# Default:
+# DBName=
+
+DBName=zabbix_proxy
+
+### Option: DBSchema
+#	Schema name. Used for IBM DB2.
+#
+# Mandatory: no
+# Default:
+# DBSchema=
+
+### Option: DBUser
+#	Database user. Ignored for SQLite.
+#
+# Default:
+# DBUser=
+
+DBUser=root
+
+### Option: DBPassword
+#	Database password. Ignored for SQLite.
+#	Comment this line if no password is used.
+#
+# Mandatory: no
+# Default:
+# DBPassword=
+
+### Option: DBSocket
+#	Path to MySQL socket.
+#
+# Mandatory: no
+# Default:
+# DBSocket=/tmp/mysql.sock
+
+# Option: DBPort
+#	Database port when not using local socket. Ignored for SQLite.
+#
+# Mandatory: no
+# Default (for MySQL):
+# DBPort=3306
+
+######### PROXY SPECIFIC PARAMETERS #############
+
+### Option: ProxyLocalBuffer
+#	Proxy will keep data locally for N hours, even if the data have already been synced with the server.
+#	This parameter may be used if local data will be used by third party applications.
+#
+# Mandatory: no
+# Range: 0-720
+# Default:
+# ProxyLocalBuffer=0
+
+### Option: ProxyOfflineBuffer
+#	Proxy will keep data for N hours in case if no connectivity with Zabbix Server.
+#	Older data will be lost.
+#
+# Mandatory: no
+# Range: 1-720
+# Default:
+# ProxyOfflineBuffer=1
+
+### Option: HeartbeatFrequency
+#	Frequency of heartbeat messages in seconds.
+#	Used for monitoring availability of Proxy on server side.
+#	0 - heartbeat messages disabled.
+#	For a proxy in the passive mode this parameter will be ignored.
+#
+# Mandatory: no
+# Range: 0-3600
+# Default:
+# HeartbeatFrequency=60
+
+### Option: ConfigFrequency
+#	How often proxy retrieves configuration data from Zabbix Server in seconds.
+#	For a proxy in the passive mode this parameter will be ignored.
+#
+# Mandatory: no
+# Range: 1-3600*24*7
+# Default:
+# ConfigFrequency=3600
+
+### Option: DataSenderFrequency
+#	Proxy will send collected data to the Server every N seconds.
+#	For a proxy in the passive mode this parameter will be ignored.
+#
+# Mandatory: no
+# Range: 1-3600
+# Default:
+# DataSenderFrequency=1
+
+############ ADVANCED PARAMETERS ################
+
+### Option: StartPollers
+#	Number of pre-forked instances of pollers.
+#
+# Mandatory: no
+# Range: 0-1000
+# Default:
+# StartPollers=5
+
+### Option: StartIPMIPollers
+#	Number of pre-forked instances of IPMI pollers.
+#
+# Mandatory: no
+# Range: 0-1000
+# Default:
+# StartIPMIPollers=0
+
+### Option: StartPollersUnreachable
+#	Number of pre-forked instances of pollers for unreachable hosts (including IPMI).
+#
+# Mandatory: no
+# Range: 0-1000
+# Default:
+# StartPollersUnreachable=1
+
+### Option: StartTrappers
+#	Number of pre-forked instances of trappers.
+#	Trappers accept incoming connections from Zabbix sender and active agents.
+#
+# Mandatory: no
+# Range: 0-1000
+# Default:
+# StartTrappers=5
+
+### Option: StartPingers
+#	Number of pre-forked instances of ICMP pingers.
+#
+# Mandatory: no
+# Range: 0-1000
+# Default:
+# StartPingers=1
+
+### Option: StartDiscoverers
+#	Number of pre-forked instances of discoverers.
+#
+# Mandatory: no
+# Range: 0-250
+# Default:
+# StartDiscoverers=1
+
+### Option: StartHTTPPollers
+#	Number of pre-forked instances of HTTP pollers.
+#
+# Mandatory: no
+# Range: 0-1000
+# Default:
+# StartHTTPPollers=1
+
+### Option: JavaGateway
+#	IP address (or hostname) of Zabbix Java gateway.
+#	Only required if Java pollers are started.
+#
+# Mandatory: no
+# Default:
+# JavaGateway=
+
+### Option: JavaGatewayPort
+#	Port that Zabbix Java gateway listens on.
+#
+# Mandatory: no
+# Range: 1024-32767
+# Default:
+# JavaGatewayPort=10052
+
+### Option: StartJavaPollers
+#	Number of pre-forked instances of Java pollers.
+#
+# Mandatory: no
+# Range: 0-1000
+# Default:
+# StartJavaPollers=0
+
+### Option: StartVMwareCollectors
+#	Number of pre-forked vmware collector instances.
+#
+# Mandatory: no
+# Range: 0-250
+# Default:
+# StartVMwareCollectors=0
+
+### Option: VMwareFrequency
+#	How often Zabbix will connect to VMware service to obtain a new data.
+#
+# Mandatory: no
+# Range: 10-86400
+# Default:
+# VMwareFrequency=60
+
+### Option: VMwareCacheSize
+#	Size of VMware cache, in bytes.
+#	Shared memory size for storing VMware data.
+#	Only used if VMware collectors are started.
+#
+# Mandatory: no
+# Range: 256K-2G
+# Default:
+# VMwareCacheSize=8M
+
+### Option: SNMPTrapperFile
+#	Temporary file used for passing data from SNMP trap daemon to the proxy.
+#	Must be the same as in zabbix_trap_receiver.pl or SNMPTT configuration file.
+#
+# Mandatory: no
+# Default:
+# SNMPTrapperFile=/tmp/zabbix_traps.tmp
+
+### Option: StartSNMPTrapper
+#	If 1, SNMP trapper process is started.
+#
+# Mandatory: no
+# Range: 0-1
+# Default:
+# StartSNMPTrapper=0
+
+### Option: ListenIP
+#	List of comma delimited IP addresses that the trapper should listen on.
+#	Trapper will listen on all network interfaces if this parameter is missing.
+#
+# Mandatory: no
+# Default:
+# ListenIP=0.0.0.0
+
+### Option: HousekeepingFrequency
+#	How often Zabbix will perform housekeeping procedure (in hours).
+#	Housekeeping is removing unnecessary information from history, alert, and alarms tables.
+#
+# Mandatory: no
+# Range: 1-24
+# Default:
+# HousekeepingFrequency=1
+
+### Option: CacheSize
+#	Size of configuration cache, in bytes.
+#	Shared memory size, for storing hosts and items data.
+#
+# Mandatory: no
+# Range: 128K-2G
+# Default:
+# CacheSize=8M
+
+### Option: StartDBSyncers
+#	Number of pre-forked instances of DB Syncers
+#
+# Mandatory: no
+# Range: 1-100
+# Default:
+# StartDBSyncers=4
+
+### Option: HistoryCacheSize
+#	Size of history cache, in bytes.
+#	Shared memory size for storing history data.
+#
+# Mandatory: no
+# Range: 128K-2G
+# Default:
+# HistoryCacheSize=8M
+
+### Option: HistoryTextCacheSize
+#	Size of text history cache, in bytes.
+#	Shared memory size for storing character, text or log history data.
+#
+# Mandatory: no
+# Range: 128K-2G
+# Default:
+# HistoryTextCacheSize=16M
+
+### Option: Timeout
+#	Specifies how long we wait for agent, SNMP device or external check (in seconds).
+#
+# Mandatory: no
+# Range: 1-30
+# Default:
+# Timeout=3
+
+### Option: TrapperTimeout
+#	Specifies how many seconds trapper may spend processing new data.
+#
+# Mandatory: no
+# Range: 1-300
+# Default:
+# TrapperTimeout=300
+
+### Option: UnreachablePeriod
+#	After how many seconds of unreachability treat a host as unavailable.
+#
+# Mandatory: no
+# Range: 1-3600
+# Default:
+# UnreachablePeriod=45
+
+### Option: UnavailableDelay
+#	How often host is checked for availability during the unavailability period, in seconds.
+#
+# Mandatory: no
+# Range: 1-3600
+# Default:
+# UnavailableDelay=60
+
+### Option: UnreachableDelay
+#	How often host is checked for availability during the unreachability period, in seconds.
+#
+# Mandatory: no
+# Range: 1-3600
+# Default:
+# UnreachableDelay=15
+
+### Option: ExternalScripts
+#	Full path to location of external scripts.
+#	Default depends on compilation options.
+#
+# Mandatory: no
+# Default:
+# ExternalScripts=${datadir}/zabbix/externalscripts
+
+### Option: FpingLocation
+#	Location of fping.
+#	Make sure that fping binary has root ownership and SUID flag set.
+#
+# Mandatory: no
+# Default:
+# FpingLocation=/usr/sbin/fping
+
+### Option: Fping6Location
+#	Location of fping6.
+#	Make sure that fping6 binary has root ownership and SUID flag set.
+#	Make empty if your fping utility is capable to process IPv6 addresses.
+#
+# Mandatory: no
+# Default:
+# Fping6Location=/usr/sbin/fping6
+
+### Option: SSHKeyLocation
+#	Location of public and private keys for SSH checks and actions.
+#
+# Mandatory: no
+# Default:
+# SSHKeyLocation=
+
+### Option: LogSlowQueries
+#	How long a database query may take before being logged (in milliseconds).
+#	Only works if DebugLevel set to 3 or 4.
+#	0 - don't log slow queries.
+#
+# Mandatory: no
+# Range: 1-3600000
+# Default:
+# LogSlowQueries=0
+
+### Option: TmpDir
+#	Temporary directory.
+#
+# Mandatory: no
+# Default:
+# TmpDir=/tmp
+
+### Option: AllowRoot
+#	Allow the proxy to run as 'root'. If disabled and the proxy is started by 'root', the proxy
+#	will try to switch to user 'zabbix' instead. Has no effect if started under a regular user.
+#	0 - do not allow
+#	1 - allow
+#
+# Mandatory: no
+# Default:
+# AllowRoot=0
+
+### Option: Include
+#	You may include individual files or all files in a directory in the configuration file.
+#	Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time.
+#
+# Mandatory: no
+# Default:
+# Include=
+
+# Include=/usr/local/etc/zabbix_proxy.general.conf
+# Include=/usr/local/etc/zabbix_proxy.conf.d/
+
+####### LOADABLE MODULES #######
+
+### Option: LoadModulePath
+#	Full path to location of proxy modules.
+#	Default depends on compilation options.
+#
+# Mandatory: no
+# Default:
+# LoadModulePath=${libdir}/modules
+
+### Option: LoadModule
+#	Module to load at proxy startup. Modules are used to extend functionality of the proxy.
+#	Format: LoadModule=<module.so>
+#	The modules must be located in directory specified by LoadModulePath.
+#	It is allowed to include multiple LoadModule parameters.
+#
+# Mandatory: no
+# Default:
+# LoadModule=
diff --git a/net-analyzer/zabbix/files/2.2/zabbix_server.conf b/net-analyzer/zabbix/files/2.2/zabbix_server.conf
new file mode 100644
index 000000000000..caba0190668e
--- /dev/null
+++ b/net-analyzer/zabbix/files/2.2/zabbix_server.conf
@@ -0,0 +1,546 @@
+# This is a configuration file for Zabbix Server process
+# To get more information about Zabbix,
+# visit http://www.zabbix.com
+
+############ GENERAL PARAMETERS #################
+
+### Option: NodeID
+#	Unique NodeID in distributed setup.
+#	0 - standalone server
+#
+# Mandatory: no
+# Range: 0-999
+# Default:
+# NodeID=0
+
+### Option: ListenPort
+#	Listen port for trapper.
+#
+# Mandatory: no
+# Range: 1024-32767
+# Default:
+# ListenPort=10051
+
+### Option: SourceIP
+#	Source IP address for outgoing connections.
+#
+# Mandatory: no
+# Default:
+# SourceIP=
+
+### Option: LogFile
+#	Name of log file.
+#	If not set, syslog is used.
+#
+# Mandatory: no
+# Default:
+# LogFile=
+
+LogFile=/var/log/zabbix/zabbix_server.log
+
+### Option: LogFileSize
+#	Maximum size of log file in MB.
+#	0 - disable automatic log rotation.
+#
+# Mandatory: no
+# Range: 0-1024
+# Default:
+LogFileSize=128
+
+### Option: DebugLevel
+#	Specifies debug level
+#	0 - no debug
+#	1 - critical information
+#	2 - error information
+#	3 - warnings
+#	4 - for debugging (produces lots of information)
+#
+# Mandatory: no
+# Range: 0-4
+# Default:
+# DebugLevel=3
+
+### Option: PidFile
+#	Name of PID file.
+#
+# Mandatory: no
+# Default:
+PidFile=/run/zabbix/zabbix_server.pid
+
+### Option: DBHost
+#	Database host name.
+#	If set to localhost, socket is used for MySQL.
+#	If set to empty string, socket is used for PostgreSQL.
+#
+# Mandatory: no
+# Default:
+# DBHost=localhost
+
+### Option: DBName
+#	Database name.
+#	For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored.
+#
+# Mandatory: yes
+# Default:
+# DBName=
+
+DBName=zabbix
+
+### Option: DBSchema
+#	Schema name. Used for IBM DB2.
+#
+# Mandatory: no
+# Default:
+# DBSchema=
+
+### Option: DBUser
+#	Database user. Ignored for SQLite.
+#
+# Mandatory: no
+# Default:
+# DBUser=
+
+DBUser=root
+
+### Option: DBPassword
+#	Database password. Ignored for SQLite.
+#	Comment this line if no password is used.
+#
+# Mandatory: no
+# Default:
+# DBPassword=
+
+### Option: DBSocket
+#	Path to MySQL socket.
+#
+# Mandatory: no
+# Default:
+# DBSocket=/tmp/mysql.sock
+
+### Option: DBPort
+#	Database port when not using local socket. Ignored for SQLite.
+#
+# Mandatory: no
+# Range: 1024-65535
+# Default (for MySQL):
+# DBPort=3306
+
+############ ADVANCED PARAMETERS ################
+
+### Option: StartPollers
+#	Number of pre-forked instances of pollers.
+#
+# Mandatory: no
+# Range: 0-1000
+# Default:
+# StartPollers=5
+
+### Option: StartIPMIPollers
+#	Number of pre-forked instances of IPMI pollers.
+#
+# Mandatory: no
+# Range: 0-1000
+# Default:
+# StartIPMIPollers=0
+
+### Option: StartPollersUnreachable
+#	Number of pre-forked instances of pollers for unreachable hosts (including IPMI).
+#
+# Mandatory: no
+# Range: 0-1000
+# Default:
+# StartPollersUnreachable=1
+
+### Option: StartTrappers
+#	Number of pre-forked instances of trappers.
+#	Trappers accept incoming connections from Zabbix sender, active agents, active proxies and child nodes.
+#	At least one trapper process must be running to display server availability in the frontend.
+#
+# Mandatory: no
+# Range: 0-1000
+# Default:
+# StartTrappers=5
+
+### Option: StartPingers
+#	Number of pre-forked instances of ICMP pingers.
+#
+# Mandatory: no
+# Range: 0-1000
+# Default:
+# StartPingers=1
+
+### Option: StartDiscoverers
+#	Number of pre-forked instances of discoverers.
+#
+# Mandatory: no
+# Range: 0-250
+# Default:
+# StartDiscoverers=1
+
+### Option: StartHTTPPollers
+#	Number of pre-forked instances of HTTP pollers.
+#
+# Mandatory: no
+# Range: 0-1000
+# Default:
+# StartHTTPPollers=1
+
+### Option: StartTimers
+#	Number of pre-forked instances of timers.
+#	Timers process time-based trigger functions and maintenance periods.
+#	Only the first timer process handles the maintenance periods.
+#
+# Mandatory: no
+# Range: 1-1000
+# Default:
+# StartTimers=1
+
+### Option: JavaGateway
+#	IP address (or hostname) of Zabbix Java gateway.
+#	Only required if Java pollers are started.
+#
+# Mandatory: no
+# Default:
+# JavaGateway=
+
+### Option: JavaGatewayPort
+#	Port that Zabbix Java gateway listens on.
+#
+# Mandatory: no
+# Range: 1024-32767
+# Default:
+# JavaGatewayPort=10052
+
+### Option: StartJavaPollers
+#	Number of pre-forked instances of Java pollers.
+#
+# Mandatory: no
+# Range: 0-1000
+# Default:
+# StartJavaPollers=0
+
+### Option: StartVMwareCollectors
+#	Number of pre-forked vmware collector instances.
+#
+# Mandatory: no
+# Range: 0-250
+# Default:
+# StartVMwareCollectors=0
+
+### Option: VMwareFrequency
+#	How often Zabbix will connect to VMware service to obtain a new data.
+#
+# Mandatory: no
+# Range: 10-86400
+# Default:
+# VMwareFrequency=60
+
+### Option: VMwareCacheSize
+#	Size of VMware cache, in bytes.
+#	Shared memory size for storing VMware data.
+#	Only used if VMware collectors are started.
+#
+# Mandatory: no
+# Range: 256K-2G
+# Default:
+# VMwareCacheSize=8M
+
+### Option: SNMPTrapperFile
+#	Temporary file used for passing data from SNMP trap daemon to the server.
+#	Must be the same as in zabbix_trap_receiver.pl or SNMPTT configuration file.
+#
+# Mandatory: no
+# Default:
+# SNMPTrapperFile=/tmp/zabbix_traps.tmp
+
+### Option: StartSNMPTrapper
+#	If 1, SNMP trapper process is started.
+#
+# Mandatory: no
+# Range: 0-1
+# Default:
+# StartSNMPTrapper=0
+
+### Option: ListenIP
+#	List of comma delimited IP addresses that the trapper should listen on.
+#	Trapper will listen on all network interfaces if this parameter is missing.
+#
+# Mandatory: no
+# Default:
+# ListenIP=0.0.0.0
+
+# ListenIP=127.0.0.1
+
+### Option: HousekeepingFrequency
+#	How often Zabbix will perform housekeeping procedure (in hours).
+#	Housekeeping is removing unnecessary information from history, alert, and alarms tables.
+#
+# Mandatory: no
+# Range: 1-24
+# Default:
+# HousekeepingFrequency=1
+
+### Option: MaxHousekeeperDelete
+#	The table "housekeeper" contains "tasks" for housekeeping procedure in the format:
+#	[housekeeperid], [tablename], [field], [value].
+#	No more than 'MaxHousekeeperDelete' rows (corresponding to [tablename], [field], [value])
+#	will be deleted per one task in one housekeeping cycle.
+#	SQLite3 does not use this parameter, deletes all corresponding rows without a limit.
+#	If set to 0 then no limit is used at all. In this case you must know what you are doing!
+#
+# Mandatory: no
+# Range: 0-1000000
+# Default:
+# MaxHousekeeperDelete=500
+
+### Option: SenderFrequency
+#	How often Zabbix will try to send unsent alerts (in seconds).
+#
+# Mandatory: no
+# Range: 5-3600
+# Default:
+# SenderFrequency=30
+
+### Option: CacheSize
+#	Size of configuration cache, in bytes.
+#	Shared memory size for storing host, item and trigger data.
+#
+# Mandatory: no
+# Range: 128K-2G
+# Default:
+# CacheSize=8M
+
+### Option: CacheUpdateFrequency
+#	How often Zabbix will perform update of configuration cache, in seconds.
+#
+# Mandatory: no
+# Range: 1-3600
+# Default:
+# CacheUpdateFrequency=60
+
+### Option: StartDBSyncers
+#	Number of pre-forked instances of DB Syncers
+#
+# Mandatory: no
+# Range: 1-100
+# Default:
+# StartDBSyncers=4
+
+### Option: HistoryCacheSize
+#	Size of history cache, in bytes.
+#	Shared memory size for storing history data.
+#
+# Mandatory: no
+# Range: 128K-2G
+# Default:
+# HistoryCacheSize=8M
+
+### Option: TrendCacheSize
+#	Size of trend cache, in bytes.
+#	Shared memory size for storing trends data.
+#
+# Mandatory: no
+# Range: 128K-2G
+# Default:
+# TrendCacheSize=4M
+
+### Option: HistoryTextCacheSize
+#	Size of text history cache, in bytes.
+#	Shared memory size for storing character, text or log history data.
+#
+# Mandatory: no
+# Range: 128K-2G
+# Default:
+# HistoryTextCacheSize=16M
+
+### Option: ValueCacheSize
+#	Size of history value cache, in bytes.
+#	Shared memory size for caching item history data requests
+#	Setting to 0 disables value cache.
+#
+# Mandatory: no
+# Range: 0,128K-64G
+# Default:
+# ValueCacheSize=8M
+
+### Option: NodeNoEvents
+#	If set to '1' local events won't be sent to master node.
+#	This won't impact ability of this node to propagate events from its child nodes.
+#
+# Mandatory: no
+# Range: 0-1
+# Default:
+# NodeNoEvents=0
+
+### Option: NodeNoHistory
+#	If set to '1' local history won't be sent to master node.
+#	This won't impact ability of this node to propagate history from its child nodes.
+#
+# Mandatory: no
+# Range: 0-1
+# Default:
+# NodeNoHistory=0
+
+### Option: Timeout
+#	Specifies how long we wait for agent, SNMP device or external check (in seconds).
+#
+# Mandatory: no
+# Range: 1-30
+# Default:
+# Timeout=3
+
+### Option: TrapperTimeout
+#	Specifies how many seconds trapper may spend processing new data.
+#
+# Mandatory: no
+# Range: 1-300
+# Default:
+# TrapperTimeout=300
+
+### Option: UnreachablePeriod
+#	After how many seconds of unreachability treat a host as unavailable.
+#
+# Mandatory: no
+# Range: 1-3600
+# Default:
+# UnreachablePeriod=45
+
+### Option: UnavailableDelay
+#	How often host is checked for availability during the unavailability period, in seconds.
+#
+# Mandatory: no
+# Range: 1-3600
+# Default:
+# UnavailableDelay=60
+
+### Option: UnreachableDelay
+#	How often host is checked for availability during the unreachability period, in seconds.
+#
+# Mandatory: no
+# Range: 1-3600
+# Default:
+# UnreachableDelay=15
+
+### Option: AlertScriptsPath
+#	Full path to location of custom alert scripts.
+#	Default depends on compilation options.
+#
+# Mandatory: no
+# Default:
+AlertScriptsPath=/var/lib/zabbix/alertscripts
+
+### Option: ExternalScripts
+#	Full path to location of external scripts.
+#	Default depends on compilation options.
+#
+# Mandatory: no
+# Default:
+ExternalScripts=/var/lib/zabbix/externalscripts
+
+### Option: FpingLocation
+#	Location of fping.
+#	Make sure that fping binary has root ownership and SUID flag set.
+#
+# Mandatory: no
+# Default:
+# FpingLocation=/usr/sbin/fping
+
+### Option: Fping6Location
+#	Location of fping6.
+#	Make sure that fping6 binary has root ownership and SUID flag set.
+#	Make empty if your fping utility is capable to process IPv6 addresses.
+#
+# Mandatory: no
+# Default:
+# Fping6Location=/usr/sbin/fping6
+
+### Option: SSHKeyLocation
+#	Location of public and private keys for SSH checks and actions.
+#
+# Mandatory: no
+# Default:
+# SSHKeyLocation=
+
+### Option: LogSlowQueries
+#	How long a database query may take before being logged (in milliseconds).
+#	Only works if DebugLevel set to 3 or 4.
+#	0 - don't log slow queries.
+#
+# Mandatory: no
+# Range: 1-3600000
+# Default:
+# LogSlowQueries=0
+
+### Option: TmpDir
+#	Temporary directory.
+#
+# Mandatory: no
+# Default:
+# TmpDir=/tmp
+
+### Option: StartProxyPollers
+#	Number of pre-forked instances of pollers for passive proxies.
+#
+# Mandatory: no
+# Range: 0-250
+# Default:
+# StartProxyPollers=1
+
+### Option: ProxyConfigFrequency
+#	How often Zabbix Server sends configuration data to a Zabbix Proxy in seconds.
+#	This parameter is used only for proxies in the passive mode.
+#
+# Mandatory: no
+# Range: 1-3600*24*7
+# Default:
+# ProxyConfigFrequency=3600
+
+### Option: ProxyDataFrequency
+#	How often Zabbix Server requests history data from a Zabbix Proxy in seconds.
+#	This parameter is used only for proxies in the passive mode.
+#
+# Mandatory: no
+# Range: 1-3600
+# Default:
+# ProxyDataFrequency=1
+
+### Option: AllowRoot
+#	Allow the server to run as 'root'. If disabled and the server is started by 'root', the server
+#	will try to switch to user 'zabbix' instead. Has no effect if started under a regular user.
+#	0 - do not allow
+#	1 - allow
+#
+# Mandatory: no
+# Default:
+# AllowRoot=0
+
+### Option: Include
+#	You may include individual files or all files in a directory in the configuration file.
+#	Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time.
+#
+# Mandatory: no
+# Default:
+# Include=
+
+# Include=/usr/local/etc/zabbix_server.general.conf
+#Include=/etc/zabbix/zabbix_server.conf.d/
+
+####### LOADABLE MODULES #######
+
+### Option: LoadModulePath
+#	Full path to location of server modules.
+#	Default depends on compilation options.
+#
+# Mandatory: no
+# Default:
+# LoadModulePath=${libdir}/modules
+
+### Option: LoadModule
+#	Module to load at server startup. Modules are used to extend functionality of the server.
+#	Format: LoadModule=<module.so>
+#	The modules must be located in directory specified by LoadModulePath.
+#	It is allowed to include multiple LoadModule parameters.
+#
+# Mandatory: no
+# Default:
+# LoadModule=
diff --git a/net-analyzer/zabbix/files/3.0/conf.d/zabbix-jmx-proxy b/net-analyzer/zabbix/files/3.0/conf.d/zabbix-jmx-proxy
new file mode 100644
index 000000000000..6aa3cf96f84d
--- /dev/null
+++ b/net-analyzer/zabbix/files/3.0/conf.d/zabbix-jmx-proxy
@@ -0,0 +1,12 @@
+# Configuration variables for the zabbix jmx proxy
+
+
+# LISTEN_IP="0.0.0.0"
+# LISTEN_PORT=10052
+# START_POLLERS=5
+# TIMEOUT=3
+
+# uncomment to enable remote monitoring of the standard JMX objects on the Zabbix Java Gateway itself
+# JAVA_OPTIONS="$JAVA_OPTIONS -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=12345
+#       -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
+
diff --git a/net-analyzer/zabbix/files/3.0/init.d/zabbix-agentd b/net-analyzer/zabbix/files/3.0/init.d/zabbix-agentd
new file mode 100644
index 000000000000..2e5024ed2de8
--- /dev/null
+++ b/net-analyzer/zabbix/files/3.0/init.d/zabbix-agentd
@@ -0,0 +1,28 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+pid_file="/run/zabbix/zabbix_agentd.pid"
+
+depend() {
+	need net
+	provide zabbix-agent
+	use zabbix-server
+}
+
+start_pre() {
+	checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix
+}
+
+start() {
+	ebegin "Starting Zabbix agent"
+	start-stop-daemon --start --pidfile ${pid_file} \
+		--user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd -- -c /etc/zabbix/zabbix_agentd.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Zabbix agent"
+	start-stop-daemon  --stop --pidfile ${pid_file}
+	eend $?
+}
diff --git a/net-analyzer/zabbix/files/3.0/init.d/zabbix-jmx-proxy b/net-analyzer/zabbix/files/3.0/init.d/zabbix-jmx-proxy
new file mode 100755
index 000000000000..5722814173e8
--- /dev/null
+++ b/net-analyzer/zabbix/files/3.0/init.d/zabbix-jmx-proxy
@@ -0,0 +1,33 @@
+#!/sbin/openrc-run
+
+LISTEN_IP=${LISTEN_IP:-127.0.0.1}
+LISTEN_PORT=${LISTEN_PORT:-10052}
+START_POLLERS=${START_POLLERS:-5}
+TIMEOUT=${TIMEOUT:-3}
+
+PID_FILE="/run/zabbix-jmx-proxy"
+
+
+start() {
+  ZABBIX_OPTIONS="-Dzabbix.pidFile=$PID_FILE \
+	-Dzabbix.listenIP=$LISTEN_IP \
+	-Dzabbix.listenPort=$LISTEN_PORT \
+	-Dzabbix.startPollers=$START_POLLERS \
+	-Dzabbix.timeout=$TIMEOUT \
+	-Dsun.rmi.transport.tcp.responseTimeout=${TIMEOUT}000"
+
+  JAVA_OPTIONS="-server $JAVA_OPTIONS -Dlogback.configurationFile=logback-console.xml"
+
+  cd /opt/zabbix_java
+
+  CLASSPATH="lib"
+  for jar in lib/*.jar bin/*.jar; do
+        CLASSPATH="$CLASSPATH:$jar"
+  done
+
+  start-stop-daemon -m --background --pidfile $PID_FILE -- java $JAVA_OPTIONS -classpath $CLASSPATH $ZABBIX_OPTIONS com.zabbix.gateway.JavaGateway
+}
+
+stop() {
+  start-stop-daemon --stop --pidfile $PID_FILE
+}
diff --git a/net-analyzer/zabbix/files/3.0/init.d/zabbix-proxy b/net-analyzer/zabbix/files/3.0/init.d/zabbix-proxy
new file mode 100644
index 000000000000..81dc78f08e3f
--- /dev/null
+++ b/net-analyzer/zabbix/files/3.0/init.d/zabbix-proxy
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+pid_file="/run/zabbix/zabbix_proxy.pid"
+
+depend() {
+	need net
+	provide zabbix-proxy
+}
+
+start_pre() {
+	checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix
+}
+
+start() {
+	ebegin "Starting Zabbix proxy"
+	start-stop-daemon --start --pidfile ${pid_file} \
+		--user zabbix --group zabbix --exec /usr/sbin/zabbix_proxy -- -c /etc/zabbix/zabbix_proxy.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Zabbix proxy"
+	start-stop-daemon  --stop --pidfile ${pid_file}
+	eend $?
+}
diff --git a/net-analyzer/zabbix/files/3.0/init.d/zabbix-server b/net-analyzer/zabbix/files/3.0/init.d/zabbix-server
new file mode 100644
index 000000000000..a57a3100dd95
--- /dev/null
+++ b/net-analyzer/zabbix/files/3.0/init.d/zabbix-server
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+pid_file="/run/zabbix/zabbix_server.pid"
+
+depend() {
+	need net
+	use mysql postgresql
+}
+start_pre() {
+	checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix
+}
+
+start() {
+	ebegin "Starting Zabbix server"
+	start-stop-daemon --start --user zabbix --group zabbix --pidfile ${pid_file} \
+	        --exec /usr/sbin/zabbix_server -- -c /etc/zabbix/zabbix_server.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Zabbix server"
+	start-stop-daemon --stop --pidfile ${pid_file} 
+	eend $?
+}
diff --git a/net-analyzer/zabbix/files/3.0/zabbix_agent.conf b/net-analyzer/zabbix/files/3.0/zabbix_agent.conf
new file mode 100644
index 000000000000..dcb4b7248c2e
--- /dev/null
+++ b/net-analyzer/zabbix/files/3.0/zabbix_agent.conf
@@ -0,0 +1,81 @@
+# This is a config file for Zabbix internet service daemon agent
+# To get more information about Zabbix visit http://www.zabbix.com
+
+### Option: Server
+#	IP address of Zabbix server
+#	Connections from other hosts will be denied
+#	If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally.
+#
+# Mandatory: yes
+# Default:
+# Server=
+
+Server=127.0.0.1
+
+############ ADVANCED PARAMETERS #################
+
+### Option: Alias
+#	Sets an alias for parameter. It can be useful to substitute long and complex parameter name with a smaller and simpler one.
+#
+# Mandatory: no
+# Range:
+# Default:
+
+### Option: Timeout
+#	Spend no more than Timeout seconds on processing
+#
+# Mandatory: no
+# Range: 1-30
+# Default:
+# Timeout=3
+
+### Option: Include
+#	You may include individual files or all files in a directory in the configuration file.
+#	Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time.
+#
+# Mandatory: no
+# Default:
+# Include=
+
+# Include=/usr/local/etc/zabbix_agent.userparams.conf
+# Include=/usr/local/etc/zabbix_agent.conf.d/
+
+####### USER-DEFINED MONITORED PARAMETERS #######
+
+### Option: UnsafeUserParameters
+#	Allow all characters to be passed in arguments to user-defined parameters.
+#	0 - do not allow
+#	1 - allow
+#
+# Mandatory: no
+# Default:
+# UnsafeUserParameters=0
+
+### Option: UserParameter
+#	User-defined parameter to monitor. There can be several user-defined parameters.
+#	Format: UserParameter=<key>,<shell command>
+#	See 'zabbix_agentd' directory for examples.
+#
+# Mandatory: no
+# Default:
+# UserParameter=
+
+####### LOADABLE MODULES #######
+
+### Option: LoadModulePath
+#	Full path to location of agent modules.
+#	Default depends on compilation options.
+#
+# Mandatory: no
+# Default:
+# LoadModulePath=${libdir}/modules
+
+### Option: LoadModule
+#	Module to load at agent startup. Modules are used to extend functionality of the agent.
+#	Format: LoadModule=<module.so>
+#	The modules must be located in directory specified by LoadModulePath.
+#	It is allowed to include multiple LoadModule parameters.
+#
+# Mandatory: no
+# Default:
+# LoadModule=
diff --git a/net-analyzer/zabbix/files/3.0/zabbix_agentd.conf b/net-analyzer/zabbix/files/3.0/zabbix_agentd.conf
new file mode 100644
index 000000000000..5ff17ce33d65
--- /dev/null
+++ b/net-analyzer/zabbix/files/3.0/zabbix_agentd.conf
@@ -0,0 +1,390 @@
+# This is a configuration file for Zabbix agent daemon (Unix)
+# To get more information about Zabbix, visit http://www.zabbix.com
+
+############ GENERAL PARAMETERS #################
+
+### Option: PidFile
+#	Name of PID file.
+#
+# Mandatory: no
+# Default:
+# PidFile=/tmp/zabbix_agentd.pid
+PidFile=/run/zabbix/zabbix_agentd.pid
+
+### Option: LogType
+#	Specifies where log messages are written to:
+#		system  - syslog
+#		file    - file specified with LogFile parameter
+#		console - standard output
+#
+# Mandatory: no
+# Default:
+# LogType=file
+
+### Option: LogFile
+#	Log file name for LogType 'file' parameter.
+#
+# Mandatory: no
+# Default:
+# LogFile=
+
+LogFile=/var/log/zabbix/zabbix_agentd.log
+
+### Option: LogFileSize
+#	Maximum size of log file in MB.
+#	0 - disable automatic log rotation.
+#
+# Mandatory: no
+# Range: 0-1024
+# Default:
+# LogFileSize=1
+LogFileSize=128
+
+### Option: DebugLevel
+#	Specifies debug level:
+#	0 - basic information about starting and stopping of Zabbix processes
+#	1 - critical information
+#	2 - error information
+#	3 - warnings
+#	4 - for debugging (produces lots of information)
+#	5 - extended debugging (produces even more information)
+#
+# Mandatory: no
+# Range: 0-5
+# Default:
+# DebugLevel=3
+
+### Option: SourceIP
+#	Source IP address for outgoing connections.
+#
+# Mandatory: no
+# Default:
+# SourceIP=
+
+### Option: EnableRemoteCommands
+#	Whether remote commands from Zabbix server are allowed.
+#	0 - not allowed
+#	1 - allowed
+#
+# Mandatory: no
+# Default:
+# EnableRemoteCommands=0
+
+### Option: LogRemoteCommands
+#	Enable logging of executed shell commands as warnings.
+#	0 - disabled
+#	1 - enabled
+#
+# Mandatory: no
+# Default:
+# LogRemoteCommands=0
+
+##### Passive checks related
+
+### Option: Server
+#	List of comma delimited IP addresses (or hostnames) of Zabbix servers.
+#	Incoming connections will be accepted only from the hosts listed here.
+#	If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally.
+#
+# Mandatory: no
+# Default:
+# Server=
+
+Server=127.0.0.1
+
+### Option: ListenPort
+#	Agent will listen on this port for connections from the server.
+#
+# Mandatory: no
+# Range: 1024-32767
+# Default:
+# ListenPort=10050
+
+### Option: ListenIP
+#	List of comma delimited IP addresses that the agent should listen on.
+#	First IP address is sent to Zabbix server if connecting to it to retrieve list of active checks.
+#
+# Mandatory: no
+# Default:
+# ListenIP=0.0.0.0
+
+### Option: StartAgents
+#	Number of pre-forked instances of zabbix_agentd that process passive checks.
+#	If set to 0, disables passive checks and the agent will not listen on any TCP port.
+#
+# Mandatory: no
+# Range: 0-100
+# Default:
+# StartAgents=3
+
+##### Active checks related
+
+### Option: ServerActive
+#	List of comma delimited IP:port (or hostname:port) pairs of Zabbix servers for active checks.
+#	If port is not specified, default port is used.
+#	IPv6 addresses must be enclosed in square brackets if port for that host is specified.
+#	If port is not specified, square brackets for IPv6 addresses are optional.
+#	If this parameter is not specified, active checks are disabled.
+#	Example: ServerActive=127.0.0.1:20051,zabbix.domain,[::1]:30051,::1,[12fc::1]
+#
+# Mandatory: no
+# Default:
+# ServerActive=
+
+ServerActive=127.0.0.1
+
+### Option: Hostname
+#	Unique, case sensitive hostname.
+#	Required for active checks and must match hostname as configured on the server.
+#	Value is acquired from HostnameItem if undefined.
+#
+# Mandatory: no
+# Default:
+# Hostname=
+
+Hostname=Zabbix server
+
+### Option: HostnameItem
+#	Item used for generating Hostname if it is undefined. Ignored if Hostname is defined.
+#	Does not support UserParameters or aliases.
+#
+# Mandatory: no
+# Default:
+# HostnameItem=system.hostname
+
+### Option: HostMetadata
+#	Optional parameter that defines host metadata.
+#	Host metadata is used at host auto-registration process.
+#	An agent will issue an error and not start if the value is over limit of 255 characters.
+#	If not defined, value will be acquired from HostMetadataItem.
+#
+# Mandatory: no
+# Range: 0-255 characters
+# Default:
+# HostMetadata=
+
+### Option: HostMetadataItem
+#	Optional parameter that defines an item used for getting host metadata.
+#	Host metadata is used at host auto-registration process.
+#	During an auto-registration request an agent will log a warning message if
+#	the value returned by specified item is over limit of 255 characters.
+#	This option is only used when HostMetadata is not defined.
+#
+# Mandatory: no
+# Default:
+# HostMetadataItem=
+
+### Option: RefreshActiveChecks
+#	How often list of active checks is refreshed, in seconds.
+#
+# Mandatory: no
+# Range: 60-3600
+# Default:
+# RefreshActiveChecks=120
+
+### Option: BufferSend
+#	Do not keep data longer than N seconds in buffer.
+#
+# Mandatory: no
+# Range: 1-3600
+# Default:
+# BufferSend=5
+
+### Option: BufferSize
+#	Maximum number of values in a memory buffer. The agent will send
+#	all collected data to Zabbix Server or Proxy if the buffer is full.
+#
+# Mandatory: no
+# Range: 2-65535
+# Default:
+# BufferSize=100
+
+### Option: MaxLinesPerSecond
+#	Maximum number of new lines the agent will send per second to Zabbix Server
+#	or Proxy processing 'log' and 'logrt' active checks.
+#	The provided value will be overridden by the parameter 'maxlines',
+#	provided in 'log' or 'logrt' item keys.
+#
+# Mandatory: no
+# Range: 1-1000
+# Default:
+# MaxLinesPerSecond=20
+
+############ ADVANCED PARAMETERS #################
+
+### Option: Alias
+#	Sets an alias for an item key. It can be used to substitute long and complex item key with a smaller and simpler one.
+#	Multiple Alias parameters may be present. Multiple parameters with the same Alias key are not allowed.
+#	Different Alias keys may reference the same item key.
+#	For example, to retrieve the ID of user 'zabbix':
+#	Alias=zabbix.userid:vfs.file.regexp[/etc/passwd,^zabbix:.:([0-9]+),,,,\1]
+#	Now shorthand key zabbix.userid may be used to retrieve data.
+#	Aliases can be used in HostMetadataItem but not in HostnameItem parameters.
+#
+# Mandatory: no
+# Range:
+# Default:
+
+### Option: Timeout
+#	Spend no more than Timeout seconds on processing
+#
+# Mandatory: no
+# Range: 1-30
+# Default:
+# Timeout=3
+
+### Option: AllowRoot
+#	Allow the agent to run as 'root'. If disabled and the agent is started by 'root', the agent
+#	will try to switch to the user specified by the User configuration option instead.
+#	Has no effect if started under a regular user.
+#	0 - do not allow
+#	1 - allow
+#
+# Mandatory: no
+# Default:
+# AllowRoot=0
+
+### Option: User
+#	Drop privileges to a specific, existing user on the system.
+#	Only has effect if run as 'root' and AllowRoot is disabled.
+#
+# Mandatory: no
+# Default:
+# User=zabbix
+
+### Option: Include
+#	You may include individual files or all files in a directory in the configuration file.
+#	Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time.
+#
+# Mandatory: no
+# Default:
+# Include=
+
+# Include=/usr/local/etc/zabbix_agentd.userparams.conf
+# Include=/usr/local/etc/zabbix_agentd.conf.d/
+# Include=/usr/local/etc/zabbix_agentd.conf.d/*.conf
+
+####### USER-DEFINED MONITORED PARAMETERS #######
+
+### Option: UnsafeUserParameters
+#	Allow all characters to be passed in arguments to user-defined parameters.
+#	The following characters are not allowed:
+#	\ ' " ` * ? [ ] { } ~ $ ! & ; ( ) < > | # @
+#	Additionally, newline characters are not allowed.
+#	0 - do not allow
+#	1 - allow
+#
+# Mandatory: no
+# Range: 0-1
+# Default:
+# UnsafeUserParameters=0
+
+### Option: UserParameter
+#	User-defined parameter to monitor. There can be several user-defined parameters.
+#	Format: UserParameter=<key>,<shell command>
+#	See 'zabbix_agentd' directory for examples.
+#
+# Mandatory: no
+# Default:
+# UserParameter=
+
+####### LOADABLE MODULES #######
+
+### Option: LoadModulePath
+#	Full path to location of agent modules.
+#	Default depends on compilation options.
+#
+# Mandatory: no
+# Default:
+# LoadModulePath=${libdir}/modules
+
+### Option: LoadModule
+#	Module to load at agent startup. Modules are used to extend functionality of the agent.
+#	Format: LoadModule=<module.so>
+#	The modules must be located in directory specified by LoadModulePath.
+#	It is allowed to include multiple LoadModule parameters.
+#
+# Mandatory: no
+# Default:
+# LoadModule=
+
+####### TLS-RELATED PARAMETERS #######
+
+### Option: TLSConnect
+#	How the agent should connect to server or proxy. Used for active checks.
+#	Only one value can be specified:
+#		unencrypted - connect without encryption
+#		psk         - connect using TLS and a pre-shared key
+#		cert        - connect using TLS and a certificate
+#
+# Mandatory: yes, if TLS certificate or PSK parameters are defined (even for 'unencrypted' connection)
+# Default:
+# TLSConnect=unencrypted
+
+### Option: TLSAccept
+#	What incoming connections to accept.
+#	Multiple values can be specified, separated by comma:
+#		unencrypted - accept connections without encryption
+#		psk         - accept connections secured with TLS and a pre-shared key
+#		cert        - accept connections secured with TLS and a certificate
+#
+# Mandatory: yes, if TLS certificate or PSK parameters are defined (even for 'unencrypted' connection)
+# Default:
+# TLSAccept=unencrypted
+
+### Option: TLSCAFile
+#	Full pathname of a file containing the top-level CA(s) certificates for
+#	peer certificate verification.
+#
+# Mandatory: no
+# Default:
+# TLSCAFile=
+
+### Option: TLSCRLFile
+#	Full pathname of a file containing revoked certificates.
+#
+# Mandatory: no
+# Default:
+# TLSCRLFile=
+
+### Option: TLSServerCertIssuer
+#      Allowed server certificate issuer.
+#
+# Mandatory: no
+# Default:
+# TLSServerCertIssuer=
+
+### Option: TLSServerCertSubject
+#      Allowed server certificate subject.
+#
+# Mandatory: no
+# Default:
+# TLSServerCertSubject=
+
+### Option: TLSCertFile
+#	Full pathname of a file containing the agent certificate or certificate chain.
+#
+# Mandatory: no
+# Default:
+# TLSCertFile=
+
+### Option: TLSKeyFile
+#	Full pathname of a file containing the agent private key.
+#
+# Mandatory: no
+# Default:
+# TLSKeyFile=
+
+### Option: TLSPSKIdentity
+#	Unique, case sensitive string used to identify the pre-shared key.
+#
+# Mandatory: no
+# Default:
+# TLSPSKIdentity=
+
+### Option: TLSPSKFile
+#	Full pathname of a file containing the pre-shared key.
+#
+# Mandatory: no
+# Default:
+# TLSPSKFile=
diff --git a/net-analyzer/zabbix/files/3.0/zabbix_proxy.conf b/net-analyzer/zabbix/files/3.0/zabbix_proxy.conf
new file mode 100644
index 000000000000..f96b0d01f51e
--- /dev/null
+++ b/net-analyzer/zabbix/files/3.0/zabbix_proxy.conf
@@ -0,0 +1,674 @@
+# This is a configuration file for Zabbix proxy daemon
+# To get more information about Zabbix, visit http://www.zabbix.com
+
+############ GENERAL PARAMETERS #################
+
+### Option: ProxyMode
+#	Proxy operating mode.
+#	0 - proxy in the active mode
+#	1 - proxy in the passive mode
+#
+# Mandatory: no
+# Default:
+# ProxyMode=0
+
+### Option: Server
+#	IP address (or hostname) of Zabbix server.
+#	Active proxy will get configuration data from the server.
+#	For a proxy in the passive mode this parameter will be ignored.
+#
+# Mandatory: yes (if ProxyMode is set to 0)
+# Default:
+# Server=
+
+Server=127.0.0.1
+
+### Option: ServerPort
+#	Port of Zabbix trapper on Zabbix server.
+#	For a proxy in the passive mode this parameter will be ignored.
+#
+# Mandatory: no
+# Range: 1024-32767
+# Default:
+# ServerPort=10051
+
+### Option: Hostname
+#	Unique, case sensitive Proxy name. Make sure the Proxy name is known to the server!
+#	Value is acquired from HostnameItem if undefined.
+#
+# Mandatory: no
+# Default:
+# Hostname=
+
+Hostname=Zabbix proxy
+
+### Option: HostnameItem
+#	Item used for generating Hostname if it is undefined.
+#	Ignored if Hostname is defined.
+#
+# Mandatory: no
+# Default:
+# HostnameItem=system.hostname
+
+### Option: ListenPort
+#	Listen port for trapper.
+#
+# Mandatory: no
+# Range: 1024-32767
+# Default:
+# ListenPort=10051
+
+### Option: SourceIP
+#	Source IP address for outgoing connections.
+#
+# Mandatory: no
+# Default:
+# SourceIP=
+
+### Option: LogType
+#	Specifies where log messages are written to:
+#		system  - syslog
+#		file    - file specified with LogFile parameter
+#		console - standard output
+#
+# Mandatory: no
+# Default:
+# LogType=file
+
+### Option: LogFile
+#	Log file name for LogType 'file' parameter.
+#
+# Mandatory: no
+# Default:
+# LogFile=
+
+LogFile=/var/log/zabbix/zabbix_proxy.log
+
+### Option: LogFileSize
+#	Maximum size of log file in MB.
+#	0 - disable automatic log rotation.
+#
+# Mandatory: no
+# Range: 0-1024
+# Default:
+# LogFileSize=1
+LogFileSize=128
+
+### Option: DebugLevel
+#	Specifies debug level:
+#	0 - basic information about starting and stopping of Zabbix processes
+#	1 - critical information
+#	2 - error information
+#	3 - warnings
+#	4 - for debugging (produces lots of information)
+#	5 - extended debugging (produces even more information)
+#
+# Mandatory: no
+# Range: 0-5
+# Default:
+# DebugLevel=3
+
+### Option: PidFile
+#	Name of PID file.
+#
+# Mandatory: no
+# Default:
+# PidFile=/tmp/zabbix_proxy.pid
+PidFile=/run/zabbix/zabbix_proxy.pid
+
+### Option: DBHost
+#	Database host name.
+#	If set to localhost, socket is used for MySQL.
+#	If set to empty string, socket is used for PostgreSQL.
+#
+# Mandatory: no
+# Default:
+# DBHost=localhost
+
+### Option: DBName
+#	Database name.
+#	For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored.
+#	Warning: do not attempt to use the same database Zabbix server is using.
+#
+# Mandatory: yes
+# Default:
+# DBName=
+
+DBName=zabbix_proxy
+
+### Option: DBSchema
+#	Schema name. Used for IBM DB2 and PostgreSQL.
+#
+# Mandatory: no
+# Default:
+# DBSchema=
+
+### Option: DBUser
+#	Database user. Ignored for SQLite.
+#
+# Default:
+# DBUser=
+
+DBUser=zabbix
+
+### Option: DBPassword
+#	Database password. Ignored for SQLite.
+#	Comment this line if no password is used.
+#
+# Mandatory: no
+# Default:
+# DBPassword=
+
+### Option: DBSocket
+#	Path to MySQL socket.
+#
+# Mandatory: no
+# Default:
+# DBSocket=/tmp/mysql.sock
+
+# Option: DBPort
+#	Database port when not using local socket. Ignored for SQLite.
+#
+# Mandatory: no
+# Default (for MySQL):
+# DBPort=3306
+
+######### PROXY SPECIFIC PARAMETERS #############
+
+### Option: ProxyLocalBuffer
+#	Proxy will keep data locally for N hours, even if the data have already been synced with the server.
+#	This parameter may be used if local data will be used by third party applications.
+#
+# Mandatory: no
+# Range: 0-720
+# Default:
+# ProxyLocalBuffer=0
+
+### Option: ProxyOfflineBuffer
+#	Proxy will keep data for N hours in case if no connectivity with Zabbix Server.
+#	Older data will be lost.
+#
+# Mandatory: no
+# Range: 1-720
+# Default:
+# ProxyOfflineBuffer=1
+
+### Option: HeartbeatFrequency
+#	Frequency of heartbeat messages in seconds.
+#	Used for monitoring availability of Proxy on server side.
+#	0 - heartbeat messages disabled.
+#	For a proxy in the passive mode this parameter will be ignored.
+#
+# Mandatory: no
+# Range: 0-3600
+# Default:
+# HeartbeatFrequency=60
+
+### Option: ConfigFrequency
+#	How often proxy retrieves configuration data from Zabbix Server in seconds.
+#	For a proxy in the passive mode this parameter will be ignored.
+#
+# Mandatory: no
+# Range: 1-3600*24*7
+# Default:
+# ConfigFrequency=3600
+
+### Option: DataSenderFrequency
+#	Proxy will send collected data to the Server every N seconds.
+#	For a proxy in the passive mode this parameter will be ignored.
+#
+# Mandatory: no
+# Range: 1-3600
+# Default:
+# DataSenderFrequency=1
+
+############ ADVANCED PARAMETERS ################
+
+### Option: StartPollers
+#	Number of pre-forked instances of pollers.
+#
+# Mandatory: no
+# Range: 0-1000
+# Default:
+# StartPollers=5
+
+### Option: StartIPMIPollers
+#	Number of pre-forked instances of IPMI pollers.
+#
+# Mandatory: no
+# Range: 0-1000
+# Default:
+# StartIPMIPollers=0
+
+### Option: StartPollersUnreachable
+#	Number of pre-forked instances of pollers for unreachable hosts (including IPMI and Java).
+#	At least one poller for unreachable hosts must be running if regular, IPMI or Java pollers
+#	are started.
+#
+# Mandatory: no
+# Range: 0-1000
+# Default:
+# StartPollersUnreachable=1
+
+### Option: StartTrappers
+#	Number of pre-forked instances of trappers.
+#	Trappers accept incoming connections from Zabbix sender and active agents.
+#
+# Mandatory: no
+# Range: 0-1000
+# Default:
+# StartTrappers=5
+
+### Option: StartPingers
+#	Number of pre-forked instances of ICMP pingers.
+#
+# Mandatory: no
+# Range: 0-1000
+# Default:
+# StartPingers=1
+
+### Option: StartDiscoverers
+#	Number of pre-forked instances of discoverers.
+#
+# Mandatory: no
+# Range: 0-250
+# Default:
+# StartDiscoverers=1
+
+### Option: StartHTTPPollers
+#	Number of pre-forked instances of HTTP pollers.
+#
+# Mandatory: no
+# Range: 0-1000
+# Default:
+# StartHTTPPollers=1
+
+### Option: JavaGateway
+#	IP address (or hostname) of Zabbix Java gateway.
+#	Only required if Java pollers are started.
+#
+# Mandatory: no
+# Default:
+# JavaGateway=
+
+### Option: JavaGatewayPort
+#	Port that Zabbix Java gateway listens on.
+#
+# Mandatory: no
+# Range: 1024-32767
+# Default:
+# JavaGatewayPort=10052
+
+### Option: StartJavaPollers
+#	Number of pre-forked instances of Java pollers.
+#
+# Mandatory: no
+# Range: 0-1000
+# Default:
+# StartJavaPollers=0
+
+### Option: StartVMwareCollectors
+#	Number of pre-forked vmware collector instances.
+#
+# Mandatory: no
+# Range: 0-250
+# Default:
+# StartVMwareCollectors=0
+
+### Option: VMwareFrequency
+#	How often Zabbix will connect to VMware service to obtain a new data.
+#
+# Mandatory: no
+# Range: 10-86400
+# Default:
+# VMwareFrequency=60
+
+### Option: VMwarePerfFrequency
+#	How often Zabbix will connect to VMware service to obtain performance data.
+#
+# Mandatory: no
+# Range: 10-86400
+# Default:
+# VMwarePerfFrequency=60
+
+### Option: VMwareCacheSize
+#	Size of VMware cache, in bytes.
+#	Shared memory size for storing VMware data.
+#	Only used if VMware collectors are started.
+#
+# Mandatory: no
+# Range: 256K-2G
+# Default:
+# VMwareCacheSize=8M
+
+### Option: VMwareTimeout
+#	Specifies how many seconds vmware collector waits for response from VMware service.
+#
+# Mandatory: no
+# Range: 1-300
+# Default:
+# VMwareTimeout=10
+
+### Option: SNMPTrapperFile
+#	Temporary file used for passing data from SNMP trap daemon to the proxy.
+#	Must be the same as in zabbix_trap_receiver.pl or SNMPTT configuration file.
+#
+# Mandatory: no
+# Default:
+# SNMPTrapperFile=/tmp/zabbix_traps.tmp
+
+### Option: StartSNMPTrapper
+#	If 1, SNMP trapper process is started.
+#
+# Mandatory: no
+# Range: 0-1
+# Default:
+# StartSNMPTrapper=0
+
+### Option: ListenIP
+#	List of comma delimited IP addresses that the trapper should listen on.
+#	Trapper will listen on all network interfaces if this parameter is missing.
+#
+# Mandatory: no
+# Default:
+# ListenIP=0.0.0.0
+
+### Option: HousekeepingFrequency
+#	How often Zabbix will perform housekeeping procedure (in hours).
+#	Housekeeping is removing outdated information from the database.
+#	To prevent Housekeeper from being overloaded, no more than 4 times HousekeepingFrequency
+#	hours of outdated information are deleted in one housekeeping cycle.
+#	To lower load on proxy startup housekeeping is postponed for 30 minutes after proxy start.
+#	With HousekeepingFrequency=0 the housekeeper can be only executed using the runtime control option.
+#	In this case the period of outdated information deleted in one housekeeping cycle is 4 times the
+#	period since the last housekeeping cycle, but not less than 4 hours and not greater than 4 days.
+#
+# Mandatory: no
+# Range: 0-24
+# Default:
+# HousekeepingFrequency=1
+
+### Option: CacheSize
+#	Size of configuration cache, in bytes.
+#	Shared memory size, for storing hosts and items data.
+#
+# Mandatory: no
+# Range: 128K-8G
+# Default:
+# CacheSize=8M
+
+### Option: StartDBSyncers
+#	Number of pre-forked instances of DB Syncers.
+#
+# Mandatory: no
+# Range: 1-100
+# Default:
+# StartDBSyncers=4
+
+### Option: HistoryCacheSize
+#	Size of history cache, in bytes.
+#	Shared memory size for storing history data.
+#
+# Mandatory: no
+# Range: 128K-2G
+# Default:
+# HistoryCacheSize=16M
+
+### Option: HistoryIndexCacheSize
+#	Size of history index cache, in bytes.
+#	Shared memory size for indexing history cache.
+#
+# Mandatory: no
+# Range: 128K-2G
+# Default:
+# HistoryIndexCacheSize=4M
+
+### Option: Timeout
+#	Specifies how long we wait for agent, SNMP device or external check (in seconds).
+#
+# Mandatory: no
+# Range: 1-30
+# Default:
+# Timeout=3
+
+Timeout=4
+
+### Option: TrapperTimeout
+#	Specifies how many seconds trapper may spend processing new data.
+#
+# Mandatory: no
+# Range: 1-300
+# Default:
+# TrapperTimeout=300
+
+### Option: UnreachablePeriod
+#	After how many seconds of unreachability treat a host as unavailable.
+#
+# Mandatory: no
+# Range: 1-3600
+# Default:
+# UnreachablePeriod=45
+
+### Option: UnavailableDelay
+#	How often host is checked for availability during the unavailability period, in seconds.
+#
+# Mandatory: no
+# Range: 1-3600
+# Default:
+# UnavailableDelay=60
+
+### Option: UnreachableDelay
+#	How often host is checked for availability during the unreachability period, in seconds.
+#
+# Mandatory: no
+# Range: 1-3600
+# Default:
+# UnreachableDelay=15
+
+### Option: ExternalScripts
+#	Full path to location of external scripts.
+#	Default depends on compilation options.
+#
+# Mandatory: no
+# Default:
+# ExternalScripts=${datadir}/zabbix/externalscripts
+
+### Option: FpingLocation
+#	Location of fping.
+#	Make sure that fping binary has root ownership and SUID flag set.
+#
+# Mandatory: no
+# Default:
+# FpingLocation=/usr/sbin/fping
+
+### Option: Fping6Location
+#	Location of fping6.
+#	Make sure that fping6 binary has root ownership and SUID flag set.
+#	Make empty if your fping utility is capable to process IPv6 addresses.
+#
+# Mandatory: no
+# Default:
+# Fping6Location=/usr/sbin/fping6
+
+### Option: SSHKeyLocation
+#	Location of public and private keys for SSH checks and actions.
+#
+# Mandatory: no
+# Default:
+# SSHKeyLocation=
+
+### Option: LogSlowQueries
+#	How long a database query may take before being logged (in milliseconds).
+#	Only works if DebugLevel set to 3 or 4.
+#	0 - don't log slow queries.
+#
+# Mandatory: no
+# Range: 1-3600000
+# Default:
+# LogSlowQueries=0
+
+LogSlowQueries=3000
+
+### Option: TmpDir
+#	Temporary directory.
+#
+# Mandatory: no
+# Default:
+# TmpDir=/tmp
+
+### Option: AllowRoot
+#	Allow the proxy to run as 'root'. If disabled and the proxy is started by 'root', the proxy
+#	will try to switch to the user specified by the User configuration option instead.
+#	Has no effect if started under a regular user.
+#	0 - do not allow
+#	1 - allow
+#
+# Mandatory: no
+# Default:
+# AllowRoot=0
+
+### Option: User
+#	Drop privileges to a specific, existing user on the system.
+#	Only has effect if run as 'root' and AllowRoot is disabled.
+#
+# Mandatory: no
+# Default:
+# User=zabbix
+
+### Option: Include
+#	You may include individual files or all files in a directory in the configuration file.
+#	Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time.
+#
+# Mandatory: no
+# Default:
+# Include=
+
+# Include=/usr/local/etc/zabbix_proxy.general.conf
+# Include=/usr/local/etc/zabbix_proxy.conf.d/
+# Include=/usr/local/etc/zabbix_proxy.conf.d/*.conf
+
+### Option: SSLCertLocation
+#	Location of SSL client certificates.
+#	This parameter is used only in web monitoring.
+#
+# Mandatory: no
+# Default:
+# SSLCertLocation=${datadir}/zabbix/ssl/certs
+
+### Option: SSLKeyLocation
+#	Location of private keys for SSL client certificates.
+#	This parameter is used only in web monitoring.
+#
+# Mandatory: no
+# Default:
+# SSLKeyLocation=${datadir}/zabbix/ssl/keys
+
+### Option: SSLCALocation
+#	Location of certificate authority (CA) files for SSL server certificate verification.
+#	If not set, system-wide directory will be used.
+#	This parameter is used only in web monitoring.
+#
+# Mandatory: no
+# Default:
+# SSLCALocation=
+
+####### LOADABLE MODULES #######
+
+### Option: LoadModulePath
+#	Full path to location of proxy modules.
+#	Default depends on compilation options.
+#
+# Mandatory: no
+# Default:
+# LoadModulePath=${libdir}/modules
+
+### Option: LoadModule
+#	Module to load at proxy startup. Modules are used to extend functionality of the proxy.
+#	Format: LoadModule=<module.so>
+#	The modules must be located in directory specified by LoadModulePath.
+#	It is allowed to include multiple LoadModule parameters.
+#
+# Mandatory: no
+# Default:
+# LoadModule=
+
+####### TLS-RELATED PARAMETERS #######
+
+### Option: TLSConnect
+#	How the proxy should connect to Zabbix server. Used for an active proxy, ignored on a passive proxy.
+#	Only one value can be specified:
+#		unencrypted - connect without encryption
+#		psk         - connect using TLS and a pre-shared key
+#		cert        - connect using TLS and a certificate
+#
+# Mandatory: yes, if TLS certificate or PSK parameters are defined (even for 'unencrypted' connection)
+# Default:
+# TLSConnect=unencrypted
+
+### Option: TLSAccept
+#	What incoming connections to accept from Zabbix server. Used for a passive proxy, ignored on an active proxy.
+#	Multiple values can be specified, separated by comma:
+#		unencrypted - accept connections without encryption
+#		psk         - accept connections secured with TLS and a pre-shared key
+#		cert        - accept connections secured with TLS and a certificate
+#
+# Mandatory: yes, if TLS certificate or PSK parameters are defined (even for 'unencrypted' connection)
+# Default:
+# TLSAccept=unencrypted
+
+### Option: TLSCAFile
+#	Full pathname of a file containing the top-level CA(s) certificates for
+#	peer certificate verification.
+#
+# Mandatory: no
+# Default:
+# TLSCAFile=
+
+### Option: TLSCRLFile
+#	Full pathname of a file containing revoked certificates.
+#
+# Mandatory: no
+# Default:
+# TLSCRLFile=
+
+### Option: TLSServerCertIssuer
+#      Allowed server certificate issuer.
+#
+# Mandatory: no
+# Default:
+# TLSServerCertIssuer=
+
+### Option: TLSServerCertSubject
+#      Allowed server certificate subject.
+#
+# Mandatory: no
+# Default:
+# TLSServerCertSubject=
+
+### Option: TLSCertFile
+#	Full pathname of a file containing the proxy certificate or certificate chain.
+#
+# Mandatory: no
+# Default:
+# TLSCertFile=
+
+### Option: TLSKeyFile
+#	Full pathname of a file containing the proxy private key.
+#
+# Mandatory: no
+# Default:
+# TLSKeyFile=
+
+### Option: TLSPSKIdentity
+#	Unique, case sensitive string used to identify the pre-shared key.
+#
+# Mandatory: no
+# Default:
+# TLSPSKIdentity=
+
+### Option: TLSPSKFile
+#	Full pathname of a file containing the pre-shared key.
+#
+# Mandatory: no
+# Default:
+# TLSPSKFile=
diff --git a/net-analyzer/zabbix/files/3.0/zabbix_server.conf b/net-analyzer/zabbix/files/3.0/zabbix_server.conf
new file mode 100644
index 000000000000..81a4961ee587
--- /dev/null
+++ b/net-analyzer/zabbix/files/3.0/zabbix_server.conf
@@ -0,0 +1,635 @@
+# This is a configuration file for Zabbix server daemon
+# To get more information about Zabbix, visit http://www.zabbix.com
+
+############ GENERAL PARAMETERS #################
+
+### Option: ListenPort
+#	Listen port for trapper.
+#
+# Mandatory: no
+# Range: 1024-32767
+# Default:
+# ListenPort=10051
+
+### Option: SourceIP
+#	Source IP address for outgoing connections.
+#
+# Mandatory: no
+# Default:
+# SourceIP=
+
+### Option: LogType
+#	Specifies where log messages are written to:
+#		system  - syslog
+#		file    - file specified with LogFile parameter
+#		console - standard output
+#
+# Mandatory: no
+# Default:
+# LogType=file
+
+### Option: LogFile
+#	Log file name for LogType 'file' parameter.
+#
+# Mandatory: no
+# Default:
+# LogFile=
+
+LogFile=/var/log/zabbix/zabbix_server.log
+
+### Option: LogFileSize
+#	Maximum size of log file in MB.
+#	0 - disable automatic log rotation.
+#
+# Mandatory: no
+# Range: 0-1024
+# Default:
+# LogFileSize=1
+LogFileSize=128
+
+### Option: DebugLevel
+#	Specifies debug level:
+#	0 - basic information about starting and stopping of Zabbix processes
+#	1 - critical information
+#	2 - error information
+#	3 - warnings
+#	4 - for debugging (produces lots of information)
+#	5 - extended debugging (produces even more information)
+#
+# Mandatory: no
+# Range: 0-5
+# Default:
+# DebugLevel=3
+
+### Option: PidFile
+#	Name of PID file.
+#
+# Mandatory: no
+# Default:
+# PidFile=/tmp/zabbix_server.pid
+PidFile=/run/zabbix/zabbix_server.pid
+
+### Option: DBHost
+#	Database host name.
+#	If set to localhost, socket is used for MySQL.
+#	If set to empty string, socket is used for PostgreSQL.
+#
+# Mandatory: no
+# Default:
+# DBHost=localhost
+
+### Option: DBName
+#	Database name.
+#	For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored.
+#
+# Mandatory: yes
+# Default:
+# DBName=
+
+DBName=zabbix
+
+### Option: DBSchema
+#	Schema name. Used for IBM DB2 and PostgreSQL.
+#
+# Mandatory: no
+# Default:
+# DBSchema=
+
+### Option: DBUser
+#	Database user. Ignored for SQLite.
+#
+# Mandatory: no
+# Default:
+# DBUser=
+
+DBUser=zabbix
+
+### Option: DBPassword
+#	Database password. Ignored for SQLite.
+#	Comment this line if no password is used.
+#
+# Mandatory: no
+# Default:
+# DBPassword=
+
+### Option: DBSocket
+#	Path to MySQL socket.
+#
+# Mandatory: no
+# Default:
+# DBSocket=/tmp/mysql.sock
+
+### Option: DBPort
+#	Database port when not using local socket. Ignored for SQLite.
+#
+# Mandatory: no
+# Range: 1024-65535
+# Default (for MySQL):
+# DBPort=3306
+
+############ ADVANCED PARAMETERS ################
+
+### Option: StartPollers
+#	Number of pre-forked instances of pollers.
+#
+# Mandatory: no
+# Range: 0-1000
+# Default:
+# StartPollers=5
+
+### Option: StartIPMIPollers
+#	Number of pre-forked instances of IPMI pollers.
+#
+# Mandatory: no
+# Range: 0-1000
+# Default:
+# StartIPMIPollers=0
+
+### Option: StartPollersUnreachable
+#	Number of pre-forked instances of pollers for unreachable hosts (including IPMI and Java).
+#	At least one poller for unreachable hosts must be running if regular, IPMI or Java pollers
+#	are started.
+#
+# Mandatory: no
+# Range: 0-1000
+# Default:
+# StartPollersUnreachable=1
+
+### Option: StartTrappers
+#	Number of pre-forked instances of trappers.
+#	Trappers accept incoming connections from Zabbix sender, active agents and active proxies.
+#	At least one trapper process must be running to display server availability and view queue
+#	in the frontend.
+#
+# Mandatory: no
+# Range: 0-1000
+# Default:
+# StartTrappers=5
+
+### Option: StartPingers
+#	Number of pre-forked instances of ICMP pingers.
+#
+# Mandatory: no
+# Range: 0-1000
+# Default:
+# StartPingers=1
+
+### Option: StartDiscoverers
+#	Number of pre-forked instances of discoverers.
+#
+# Mandatory: no
+# Range: 0-250
+# Default:
+# StartDiscoverers=1
+
+### Option: StartHTTPPollers
+#	Number of pre-forked instances of HTTP pollers.
+#
+# Mandatory: no
+# Range: 0-1000
+# Default:
+# StartHTTPPollers=1
+
+### Option: StartTimers
+#	Number of pre-forked instances of timers.
+#	Timers process time-based trigger functions and maintenance periods.
+#	Only the first timer process handles the maintenance periods.
+#
+# Mandatory: no
+# Range: 1-1000
+# Default:
+# StartTimers=1
+
+### Option: StartEscalators
+#	Number of pre-forked instances of escalators.
+#
+# Mandatory: no
+# Range: 0-100
+# Default:
+# StartEscalators=1
+
+### Option: JavaGateway
+#	IP address (or hostname) of Zabbix Java gateway.
+#	Only required if Java pollers are started.
+#
+# Mandatory: no
+# Default:
+# JavaGateway=
+
+### Option: JavaGatewayPort
+#	Port that Zabbix Java gateway listens on.
+#
+# Mandatory: no
+# Range: 1024-32767
+# Default:
+# JavaGatewayPort=10052
+
+### Option: StartJavaPollers
+#	Number of pre-forked instances of Java pollers.
+#
+# Mandatory: no
+# Range: 0-1000
+# Default:
+# StartJavaPollers=0
+
+### Option: StartVMwareCollectors
+#	Number of pre-forked vmware collector instances.
+#
+# Mandatory: no
+# Range: 0-250
+# Default:
+# StartVMwareCollectors=0
+
+### Option: VMwareFrequency
+#	How often Zabbix will connect to VMware service to obtain a new data.
+#
+# Mandatory: no
+# Range: 10-86400
+# Default:
+# VMwareFrequency=60
+
+### Option: VMwarePerfFrequency
+#	How often Zabbix will connect to VMware service to obtain performance data.
+#
+# Mandatory: no
+# Range: 10-86400
+# Default:
+# VMwarePerfFrequency=60
+
+### Option: VMwareCacheSize
+#	Size of VMware cache, in bytes.
+#	Shared memory size for storing VMware data.
+#	Only used if VMware collectors are started.
+#
+# Mandatory: no
+# Range: 256K-2G
+# Default:
+# VMwareCacheSize=8M
+
+### Option: VMwareTimeout
+#	Specifies how many seconds vmware collector waits for response from VMware service.
+#
+# Mandatory: no
+# Range: 1-300
+# Default:
+# VMwareTimeout=10
+
+### Option: SNMPTrapperFile
+#	Temporary file used for passing data from SNMP trap daemon to the server.
+#	Must be the same as in zabbix_trap_receiver.pl or SNMPTT configuration file.
+#
+# Mandatory: no
+# Default:
+# SNMPTrapperFile=/tmp/zabbix_traps.tmp
+
+### Option: StartSNMPTrapper
+#	If 1, SNMP trapper process is started.
+#
+# Mandatory: no
+# Range: 0-1
+# Default:
+# StartSNMPTrapper=0
+
+### Option: ListenIP
+#	List of comma delimited IP addresses that the trapper should listen on.
+#	Trapper will listen on all network interfaces if this parameter is missing.
+#
+# Mandatory: no
+# Default:
+# ListenIP=0.0.0.0
+
+# ListenIP=127.0.0.1
+
+### Option: HousekeepingFrequency
+#	How often Zabbix will perform housekeeping procedure (in hours).
+#	Housekeeping is removing outdated information from the database.
+#	To prevent Housekeeper from being overloaded, no more than 4 times HousekeepingFrequency
+#	hours of outdated information are deleted in one housekeeping cycle, for each item.
+#	To lower load on server startup housekeeping is postponed for 30 minutes after server start.
+#	With HousekeepingFrequency=0 the housekeeper can be only executed using the runtime control option.
+#	In this case the period of outdated information deleted in one housekeeping cycle is 4 times the
+#	period since the last housekeeping cycle, but not less than 4 hours and not greater than 4 days.
+#
+# Mandatory: no
+# Range: 0-24
+# Default:
+# HousekeepingFrequency=1
+
+### Option: MaxHousekeeperDelete
+#	The table "housekeeper" contains "tasks" for housekeeping procedure in the format:
+#	[housekeeperid], [tablename], [field], [value].
+#	No more than 'MaxHousekeeperDelete' rows (corresponding to [tablename], [field], [value])
+#	will be deleted per one task in one housekeeping cycle.
+#	SQLite3 does not use this parameter, deletes all corresponding rows without a limit.
+#	If set to 0 then no limit is used at all. In this case you must know what you are doing!
+#
+# Mandatory: no
+# Range: 0-1000000
+# Default:
+# MaxHousekeeperDelete=5000
+
+### Option: SenderFrequency
+#	How often Zabbix will try to send unsent alerts (in seconds).
+#
+# Mandatory: no
+# Range: 5-3600
+# Default:
+# SenderFrequency=30
+
+### Option: CacheSize
+#	Size of configuration cache, in bytes.
+#	Shared memory size for storing host, item and trigger data.
+#
+# Mandatory: no
+# Range: 128K-8G
+# Default:
+# CacheSize=8M
+
+### Option: CacheUpdateFrequency
+#	How often Zabbix will perform update of configuration cache, in seconds.
+#
+# Mandatory: no
+# Range: 1-3600
+# Default:
+# CacheUpdateFrequency=60
+
+### Option: StartDBSyncers
+#	Number of pre-forked instances of DB Syncers.
+#
+# Mandatory: no
+# Range: 1-100
+# Default:
+# StartDBSyncers=4
+
+### Option: HistoryCacheSize
+#	Size of history cache, in bytes.
+#	Shared memory size for storing history data.
+#
+# Mandatory: no
+# Range: 128K-2G
+# Default:
+# HistoryCacheSize=16M
+
+### Option: HistoryIndexCacheSize
+#	Size of history index cache, in bytes.
+#	Shared memory size for indexing history cache.
+#
+# Mandatory: no
+# Range: 128K-2G
+# Default:
+# HistoryIndexCacheSize=4M
+
+### Option: TrendCacheSize
+#	Size of trend cache, in bytes.
+#	Shared memory size for storing trends data.
+#
+# Mandatory: no
+# Range: 128K-2G
+# Default:
+# TrendCacheSize=4M
+
+### Option: ValueCacheSize
+#	Size of history value cache, in bytes.
+#	Shared memory size for caching item history data requests.
+#	Setting to 0 disables value cache.
+#
+# Mandatory: no
+# Range: 0,128K-64G
+# Default:
+# ValueCacheSize=8M
+
+### Option: Timeout
+#	Specifies how long we wait for agent, SNMP device or external check (in seconds).
+#
+# Mandatory: no
+# Range: 1-30
+# Default:
+# Timeout=3
+
+Timeout=4
+
+### Option: TrapperTimeout
+#	Specifies how many seconds trapper may spend processing new data.
+#
+# Mandatory: no
+# Range: 1-300
+# Default:
+# TrapperTimeout=300
+
+### Option: UnreachablePeriod
+#	After how many seconds of unreachability treat a host as unavailable.
+#
+# Mandatory: no
+# Range: 1-3600
+# Default:
+# UnreachablePeriod=45
+
+### Option: UnavailableDelay
+#	How often host is checked for availability during the unavailability period, in seconds.
+#
+# Mandatory: no
+# Range: 1-3600
+# Default:
+# UnavailableDelay=60
+
+### Option: UnreachableDelay
+#	How often host is checked for availability during the unreachability period, in seconds.
+#
+# Mandatory: no
+# Range: 1-3600
+# Default:
+# UnreachableDelay=15
+
+### Option: AlertScriptsPath
+#	Full path to location of custom alert scripts.
+#	Default depends on compilation options.
+#
+# Mandatory: no
+# Default:
+# AlertScriptsPath=${datadir}/zabbix/alertscripts
+AlertScriptsPath=/var/lib/zabbix/alertscripts
+
+### Option: ExternalScripts
+#	Full path to location of external scripts.
+#	Default depends on compilation options.
+#
+# Mandatory: no
+# Default:
+# ExternalScripts=${datadir}/zabbix/externalscripts
+ExternalScripts=/var/lib/zabbix/externalscripts
+
+### Option: FpingLocation
+#	Location of fping.
+#	Make sure that fping binary has root ownership and SUID flag set.
+#
+# Mandatory: no
+# Default:
+# FpingLocation=/usr/sbin/fping
+
+### Option: Fping6Location
+#	Location of fping6.
+#	Make sure that fping6 binary has root ownership and SUID flag set.
+#	Make empty if your fping utility is capable to process IPv6 addresses.
+#
+# Mandatory: no
+# Default:
+# Fping6Location=/usr/sbin/fping6
+
+### Option: SSHKeyLocation
+#	Location of public and private keys for SSH checks and actions.
+#
+# Mandatory: no
+# Default:
+# SSHKeyLocation=
+
+### Option: LogSlowQueries
+#	How long a database query may take before being logged (in milliseconds).
+#	Only works if DebugLevel set to 3, 4 or 5.
+#	0 - don't log slow queries.
+#
+# Mandatory: no
+# Range: 1-3600000
+# Default:
+# LogSlowQueries=0
+
+LogSlowQueries=3000
+
+### Option: TmpDir
+#	Temporary directory.
+#
+# Mandatory: no
+# Default:
+# TmpDir=/tmp
+
+### Option: StartProxyPollers
+#	Number of pre-forked instances of pollers for passive proxies.
+#
+# Mandatory: no
+# Range: 0-250
+# Default:
+# StartProxyPollers=1
+
+### Option: ProxyConfigFrequency
+#	How often Zabbix Server sends configuration data to a Zabbix Proxy in seconds.
+#	This parameter is used only for proxies in the passive mode.
+#
+# Mandatory: no
+# Range: 1-3600*24*7
+# Default:
+# ProxyConfigFrequency=3600
+
+### Option: ProxyDataFrequency
+#	How often Zabbix Server requests history data from a Zabbix Proxy in seconds.
+#	This parameter is used only for proxies in the passive mode.
+#
+# Mandatory: no
+# Range: 1-3600
+# Default:
+# ProxyDataFrequency=1
+
+### Option: AllowRoot
+#	Allow the server to run as 'root'. If disabled and the server is started by 'root', the server
+#	will try to switch to the user specified by the User configuration option instead.
+#	Has no effect if started under a regular user.
+#	0 - do not allow
+#	1 - allow
+#
+# Mandatory: no
+# Default:
+# AllowRoot=0
+
+### Option: User
+#	Drop privileges to a specific, existing user on the system.
+#	Only has effect if run as 'root' and AllowRoot is disabled.
+#
+# Mandatory: no
+# Default:
+# User=zabbix
+
+### Option: Include
+#	You may include individual files or all files in a directory in the configuration file.
+#	Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time.
+#
+# Mandatory: no
+# Default:
+# Include=
+
+# Include=/usr/local/etc/zabbix_server.general.conf
+# Include=/usr/local/etc/zabbix_server.conf.d/
+# Include=/usr/local/etc/zabbix_server.conf.d/*.conf
+
+### Option: SSLCertLocation
+#	Location of SSL client certificates.
+#	This parameter is used only in web monitoring.
+#
+# Mandatory: no
+# Default:
+# SSLCertLocation=${datadir}/zabbix/ssl/certs
+
+### Option: SSLKeyLocation
+#	Location of private keys for SSL client certificates.
+#	This parameter is used only in web monitoring.
+#
+# Mandatory: no
+# Default:
+# SSLKeyLocation=${datadir}/zabbix/ssl/keys
+
+### Option: SSLCALocation
+#	Override the location of certificate authority (CA) files for SSL server certificate verification.
+#	If not set, system-wide directory will be used.
+#	This parameter is used only in web monitoring and SMTP authentication.
+#
+# Mandatory: no
+# Default:
+# SSLCALocation=
+
+####### LOADABLE MODULES #######
+
+### Option: LoadModulePath
+#	Full path to location of server modules.
+#	Default depends on compilation options.
+#
+# Mandatory: no
+# Default:
+# LoadModulePath=${libdir}/modules
+
+### Option: LoadModule
+#	Module to load at server startup. Modules are used to extend functionality of the server.
+#	Format: LoadModule=<module.so>
+#	The modules must be located in directory specified by LoadModulePath.
+#	It is allowed to include multiple LoadModule parameters.
+#
+# Mandatory: no
+# Default:
+# LoadModule=
+
+####### TLS-RELATED PARAMETERS #######
+
+### Option: TLSCAFile
+#	Full pathname of a file containing the top-level CA(s) certificates for
+#	peer certificate verification.
+#
+# Mandatory: no
+# Default:
+# TLSCAFile=
+
+### Option: TLSCRLFile
+#	Full pathname of a file containing revoked certificates.
+#
+# Mandatory: no
+# Default:
+# TLSCRLFile=
+
+### Option: TLSCertFile
+#	Full pathname of a file containing the server certificate or certificate chain.
+#
+# Mandatory: no
+# Default:
+# TLSCertFile=
+
+### Option: TLSKeyFile
+#	Full pathname of a file containing the server private key.
+#
+# Mandatory: no
+# Default:
+# TLSKeyFile=
diff --git a/net-analyzer/zabbix/files/zabbix-agentd.service b/net-analyzer/zabbix/files/zabbix-agentd.service
new file mode 100644
index 000000000000..8485d06f5a3a
--- /dev/null
+++ b/net-analyzer/zabbix/files/zabbix-agentd.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Zabbix agent daemon
+After=network.target
+
+[Service]
+Type=forking
+User=zabbix
+Group=zabbix
+ExecStart=/usr/sbin/zabbix_agentd -c /etc/zabbix/zabbix_agentd.conf
+PIDFile=/run/zabbix/zabbix_agentd.pid
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/net-analyzer/zabbix/files/zabbix-agentd.tmpfiles b/net-analyzer/zabbix/files/zabbix-agentd.tmpfiles
new file mode 100644
index 000000000000..56471bb42c0a
--- /dev/null
+++ b/net-analyzer/zabbix/files/zabbix-agentd.tmpfiles
@@ -0,0 +1 @@
+d /run/zabbix 0755 zabbix zabbix -
diff --git a/net-analyzer/zabbix/files/zabbix-proxy.service b/net-analyzer/zabbix/files/zabbix-proxy.service
new file mode 100644
index 000000000000..85ecd79cc889
--- /dev/null
+++ b/net-analyzer/zabbix/files/zabbix-proxy.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Zabbix proxy
+After=network.target
+
+[Service]
+Type=forking
+User=zabbix
+Group=zabbix
+ExecStart=/usr/sbin/zabbix_proxy -c /etc/zabbix/zabbix_proxy.conf
+PIDFile=/run/zabbix/zabbix_proxy.pid
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/net-analyzer/zabbix/files/zabbix-proxy.tmpfiles b/net-analyzer/zabbix/files/zabbix-proxy.tmpfiles
new file mode 100644
index 000000000000..56471bb42c0a
--- /dev/null
+++ b/net-analyzer/zabbix/files/zabbix-proxy.tmpfiles
@@ -0,0 +1 @@
+d /run/zabbix 0755 zabbix zabbix -
diff --git a/net-analyzer/zabbix/files/zabbix-server.service b/net-analyzer/zabbix/files/zabbix-server.service
new file mode 100644
index 000000000000..3ea973356eff
--- /dev/null
+++ b/net-analyzer/zabbix/files/zabbix-server.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Zabbix server
+After=syslog.target network.target postgresql.service
+
+[Service]
+Type=forking
+User=zabbix
+Group=zabbix
+ExecStart=/usr/sbin/zabbix_server -c /etc/zabbix/zabbix_server.conf
+PIDFile=/run/zabbix/zabbix_server.pid
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/net-analyzer/zabbix/files/zabbix-server.tmpfiles b/net-analyzer/zabbix/files/zabbix-server.tmpfiles
new file mode 100644
index 000000000000..56471bb42c0a
--- /dev/null
+++ b/net-analyzer/zabbix/files/zabbix-server.tmpfiles
@@ -0,0 +1 @@
+d /run/zabbix 0755 zabbix zabbix -
diff --git a/net-analyzer/zabbix/metadata.xml b/net-analyzer/zabbix/metadata.xml
new file mode 100644
index 000000000000..0a5802a41df4
--- /dev/null
+++ b/net-analyzer/zabbix/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>patrick@gentoo.org</email>
+    <name>Patrick Lauer</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>alicef@gentoo.org</email>
+    <name>Alice Ferrazzi</name>
+  </maintainer>
+  <longdescription>
+ZABBIX is software for monitoring of your applications, network and servers.
+ZABBIX supports both polling and trapping techniques to collect data from
+monitored hosts. A flexible notification mechanism allows easy and quickly
+configure different types of notifications for pre-defined events.
+  </longdescription>
+  <use>
+    <flag name="agent">Enable zabbix agent (for to-be-monitored machines)</flag>
+    <flag name="frontend">Enable zabbix web frontend</flag>
+    <flag name="ipv6">Turn on support of IPv6</flag>
+    <flag name="proxy">Enable proxy support</flag>
+    <flag name="openipmi">Enable openipmi things</flag>
+    <flag name="server">Enable zabbix server</flag>
+    <flag name="ssh">SSH v2 based checks</flag>
+    <flag name="odbc">Enable Database Monitor and use UnixODBC Library by default</flag>
+    <flag name="static">Build statically linked binaries</flag>
+    <flag name="java">Enable Zabbix Java JMX Management Gateway</flag>
+    <flag name="libxml2">Use libxml2 client library</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-analyzer/zabbix/zabbix-2.2.16.ebuild b/net-analyzer/zabbix/zabbix-2.2.16.ebuild
new file mode 100644
index 000000000000..4f7cac6a16d0
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-2.2.16.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="amd64 x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping )
+	server? ( net-analyzer/fping
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/2.2"/zabbix_server.conf
+		doinitd "${FILESDIR}/2.2"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd \
+			"${FILESDIR}/2.2"/init.d/zabbix-proxy
+		dosbin \
+			src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/2.2"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/2.2"/zabbix_agent.conf \
+			"${FILESDIR}/2.2"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd
+		dosbin \
+			src/zabbix_agent/zabbix_agent \
+			src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix \
+			/etc/zabbix/zabbix_agent.conf \
+			/etc/zabbix/zabbix_agentd.conf
+		fperms 0640 \
+			/etc/zabbix/zabbix_agent.conf \
+			/etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agent.conf \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+	   dodir \
+	   	/${ZABBIXJAVA_BASE} \
+		/${ZABBIXJAVA_BASE}/bin \
+		/${ZABBIXJAVA_BASE}/lib
+	   keepdir /${ZABBIXJAVA_BASE}
+	   exeinto /${ZABBIXJAVA_BASE}/bin
+	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+	   exeinto /${ZABBIXJAVA_BASE}/lib
+	   doexe \
+	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
+		src/zabbix_java/lib/logback-console.xml \
+		src/zabbix_java/lib/logback-core-0.9.27.jar \
+		src/zabbix_java/lib/logback.xml \
+		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+		src/zabbix_java/lib/slf4j-api-1.6.1.jar
+	   exeinto /${ZABBIXJAVA_BASE}/
+	   doexe \
+	   	src/zabbix_java/settings.sh \
+		src/zabbix_java/startup.sh \
+		src/zabbix_java/shutdown.sh
+	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-2.2.17.ebuild b/net-analyzer/zabbix/zabbix-2.2.17.ebuild
new file mode 100644
index 000000000000..6a201569afd4
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-2.2.17.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping )
+	server? ( net-analyzer/fping
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/2.2"/zabbix_server.conf
+		doinitd "${FILESDIR}/2.2"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd \
+			"${FILESDIR}/2.2"/init.d/zabbix-proxy
+		dosbin \
+			src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/2.2"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/2.2"/zabbix_agent.conf \
+			"${FILESDIR}/2.2"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd
+		dosbin \
+			src/zabbix_agent/zabbix_agent \
+			src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix \
+			/etc/zabbix/zabbix_agent.conf \
+			/etc/zabbix/zabbix_agentd.conf
+		fperms 0640 \
+			/etc/zabbix/zabbix_agent.conf \
+			/etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agent.conf \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+	   dodir \
+	   	/${ZABBIXJAVA_BASE} \
+		/${ZABBIXJAVA_BASE}/bin \
+		/${ZABBIXJAVA_BASE}/lib
+	   keepdir /${ZABBIXJAVA_BASE}
+	   exeinto /${ZABBIXJAVA_BASE}/bin
+	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+	   exeinto /${ZABBIXJAVA_BASE}/lib
+	   doexe \
+	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
+		src/zabbix_java/lib/logback-console.xml \
+		src/zabbix_java/lib/logback-core-0.9.27.jar \
+		src/zabbix_java/lib/logback.xml \
+		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+		src/zabbix_java/lib/slf4j-api-1.6.1.jar
+	   exeinto /${ZABBIXJAVA_BASE}/
+	   doexe \
+	   	src/zabbix_java/settings.sh \
+		src/zabbix_java/startup.sh \
+		src/zabbix_java/shutdown.sh
+	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-2.2.18.ebuild b/net-analyzer/zabbix/zabbix-2.2.18.ebuild
new file mode 100644
index 000000000000..6a201569afd4
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-2.2.18.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping )
+	server? ( net-analyzer/fping
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/2.2"/zabbix_server.conf
+		doinitd "${FILESDIR}/2.2"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd \
+			"${FILESDIR}/2.2"/init.d/zabbix-proxy
+		dosbin \
+			src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/2.2"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/2.2"/zabbix_agent.conf \
+			"${FILESDIR}/2.2"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd
+		dosbin \
+			src/zabbix_agent/zabbix_agent \
+			src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix \
+			/etc/zabbix/zabbix_agent.conf \
+			/etc/zabbix/zabbix_agentd.conf
+		fperms 0640 \
+			/etc/zabbix/zabbix_agent.conf \
+			/etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agent.conf \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+	   dodir \
+	   	/${ZABBIXJAVA_BASE} \
+		/${ZABBIXJAVA_BASE}/bin \
+		/${ZABBIXJAVA_BASE}/lib
+	   keepdir /${ZABBIXJAVA_BASE}
+	   exeinto /${ZABBIXJAVA_BASE}/bin
+	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+	   exeinto /${ZABBIXJAVA_BASE}/lib
+	   doexe \
+	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
+		src/zabbix_java/lib/logback-console.xml \
+		src/zabbix_java/lib/logback-core-0.9.27.jar \
+		src/zabbix_java/lib/logback.xml \
+		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+		src/zabbix_java/lib/slf4j-api-1.6.1.jar
+	   exeinto /${ZABBIXJAVA_BASE}/
+	   doexe \
+	   	src/zabbix_java/settings.sh \
+		src/zabbix_java/startup.sh \
+		src/zabbix_java/shutdown.sh
+	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-2.2.19.ebuild b/net-analyzer/zabbix/zabbix-2.2.19.ebuild
new file mode 100644
index 000000000000..6a201569afd4
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-2.2.19.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping )
+	server? ( net-analyzer/fping
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/2.2"/zabbix_server.conf
+		doinitd "${FILESDIR}/2.2"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd \
+			"${FILESDIR}/2.2"/init.d/zabbix-proxy
+		dosbin \
+			src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/2.2"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/2.2"/zabbix_agent.conf \
+			"${FILESDIR}/2.2"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd
+		dosbin \
+			src/zabbix_agent/zabbix_agent \
+			src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix \
+			/etc/zabbix/zabbix_agent.conf \
+			/etc/zabbix/zabbix_agentd.conf
+		fperms 0640 \
+			/etc/zabbix/zabbix_agent.conf \
+			/etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agent.conf \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+	   dodir \
+	   	/${ZABBIXJAVA_BASE} \
+		/${ZABBIXJAVA_BASE}/bin \
+		/${ZABBIXJAVA_BASE}/lib
+	   keepdir /${ZABBIXJAVA_BASE}
+	   exeinto /${ZABBIXJAVA_BASE}/bin
+	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+	   exeinto /${ZABBIXJAVA_BASE}/lib
+	   doexe \
+	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
+		src/zabbix_java/lib/logback-console.xml \
+		src/zabbix_java/lib/logback-core-0.9.27.jar \
+		src/zabbix_java/lib/logback.xml \
+		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+		src/zabbix_java/lib/slf4j-api-1.6.1.jar
+	   exeinto /${ZABBIXJAVA_BASE}/
+	   doexe \
+	   	src/zabbix_java/settings.sh \
+		src/zabbix_java/startup.sh \
+		src/zabbix_java/shutdown.sh
+	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-2.2.20.ebuild b/net-analyzer/zabbix/zabbix-2.2.20.ebuild
new file mode 100644
index 000000000000..6a201569afd4
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-2.2.20.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping )
+	server? ( net-analyzer/fping
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/2.2"/zabbix_server.conf
+		doinitd "${FILESDIR}/2.2"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd \
+			"${FILESDIR}/2.2"/init.d/zabbix-proxy
+		dosbin \
+			src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/2.2"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/2.2"/zabbix_agent.conf \
+			"${FILESDIR}/2.2"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd
+		dosbin \
+			src/zabbix_agent/zabbix_agent \
+			src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix \
+			/etc/zabbix/zabbix_agent.conf \
+			/etc/zabbix/zabbix_agentd.conf
+		fperms 0640 \
+			/etc/zabbix/zabbix_agent.conf \
+			/etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agent.conf \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+	   dodir \
+	   	/${ZABBIXJAVA_BASE} \
+		/${ZABBIXJAVA_BASE}/bin \
+		/${ZABBIXJAVA_BASE}/lib
+	   keepdir /${ZABBIXJAVA_BASE}
+	   exeinto /${ZABBIXJAVA_BASE}/bin
+	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+	   exeinto /${ZABBIXJAVA_BASE}/lib
+	   doexe \
+	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
+		src/zabbix_java/lib/logback-console.xml \
+		src/zabbix_java/lib/logback-core-0.9.27.jar \
+		src/zabbix_java/lib/logback.xml \
+		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+		src/zabbix_java/lib/slf4j-api-1.6.1.jar
+	   exeinto /${ZABBIXJAVA_BASE}/
+	   doexe \
+	   	src/zabbix_java/settings.sh \
+		src/zabbix_java/startup.sh \
+		src/zabbix_java/shutdown.sh
+	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-3.0.10.ebuild b/net-analyzer/zabbix/zabbix-3.0.10.ebuild
new file mode 100644
index 000000000000..13448bdf670d
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.0.10.ebuild
@@ -0,0 +1,331 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping )
+	server? ( net-analyzer/fping
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_server.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
+		dosbin src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+	   dodir \
+	   	/${ZABBIXJAVA_BASE} \
+		/${ZABBIXJAVA_BASE}/bin \
+		/${ZABBIXJAVA_BASE}/lib
+	   keepdir /${ZABBIXJAVA_BASE}
+	   exeinto /${ZABBIXJAVA_BASE}/bin
+	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+	   exeinto /${ZABBIXJAVA_BASE}/lib
+	   doexe \
+	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
+		src/zabbix_java/lib/logback-console.xml \
+		src/zabbix_java/lib/logback-core-0.9.27.jar \
+		src/zabbix_java/lib/logback.xml \
+		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+		src/zabbix_java/lib/slf4j-api-1.6.1.jar
+	   exeinto /${ZABBIXJAVA_BASE}/
+	   doexe \
+	   	src/zabbix_java/settings.sh \
+		src/zabbix_java/startup.sh \
+		src/zabbix_java/shutdown.sh
+	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-3.0.11.ebuild b/net-analyzer/zabbix/zabbix-3.0.11.ebuild
new file mode 100644
index 000000000000..13448bdf670d
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.0.11.ebuild
@@ -0,0 +1,331 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping )
+	server? ( net-analyzer/fping
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_server.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
+		dosbin src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+	   dodir \
+	   	/${ZABBIXJAVA_BASE} \
+		/${ZABBIXJAVA_BASE}/bin \
+		/${ZABBIXJAVA_BASE}/lib
+	   keepdir /${ZABBIXJAVA_BASE}
+	   exeinto /${ZABBIXJAVA_BASE}/bin
+	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+	   exeinto /${ZABBIXJAVA_BASE}/lib
+	   doexe \
+	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
+		src/zabbix_java/lib/logback-console.xml \
+		src/zabbix_java/lib/logback-core-0.9.27.jar \
+		src/zabbix_java/lib/logback.xml \
+		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+		src/zabbix_java/lib/slf4j-api-1.6.1.jar
+	   exeinto /${ZABBIXJAVA_BASE}/
+	   doexe \
+	   	src/zabbix_java/settings.sh \
+		src/zabbix_java/startup.sh \
+		src/zabbix_java/shutdown.sh
+	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-3.0.6.ebuild b/net-analyzer/zabbix/zabbix-3.0.6.ebuild
new file mode 100644
index 000000000000..c914ecab5213
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.0.6.ebuild
@@ -0,0 +1,331 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping )
+	server? ( net-analyzer/fping
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_server.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
+		dosbin src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+	   dodir \
+	   	/${ZABBIXJAVA_BASE} \
+		/${ZABBIXJAVA_BASE}/bin \
+		/${ZABBIXJAVA_BASE}/lib
+	   keepdir /${ZABBIXJAVA_BASE}
+	   exeinto /${ZABBIXJAVA_BASE}/bin
+	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+	   exeinto /${ZABBIXJAVA_BASE}/lib
+	   doexe \
+	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
+		src/zabbix_java/lib/logback-console.xml \
+		src/zabbix_java/lib/logback-core-0.9.27.jar \
+		src/zabbix_java/lib/logback.xml \
+		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+		src/zabbix_java/lib/slf4j-api-1.6.1.jar
+	   exeinto /${ZABBIXJAVA_BASE}/
+	   doexe \
+	   	src/zabbix_java/settings.sh \
+		src/zabbix_java/startup.sh \
+		src/zabbix_java/shutdown.sh
+	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-3.0.8.ebuild b/net-analyzer/zabbix/zabbix-3.0.8.ebuild
new file mode 100644
index 000000000000..13448bdf670d
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.0.8.ebuild
@@ -0,0 +1,331 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping )
+	server? ( net-analyzer/fping
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_server.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
+		dosbin src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+	   dodir \
+	   	/${ZABBIXJAVA_BASE} \
+		/${ZABBIXJAVA_BASE}/bin \
+		/${ZABBIXJAVA_BASE}/lib
+	   keepdir /${ZABBIXJAVA_BASE}
+	   exeinto /${ZABBIXJAVA_BASE}/bin
+	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+	   exeinto /${ZABBIXJAVA_BASE}/lib
+	   doexe \
+	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
+		src/zabbix_java/lib/logback-console.xml \
+		src/zabbix_java/lib/logback-core-0.9.27.jar \
+		src/zabbix_java/lib/logback.xml \
+		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+		src/zabbix_java/lib/slf4j-api-1.6.1.jar
+	   exeinto /${ZABBIXJAVA_BASE}/
+	   doexe \
+	   	src/zabbix_java/settings.sh \
+		src/zabbix_java/startup.sh \
+		src/zabbix_java/shutdown.sh
+	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-3.0.9.ebuild b/net-analyzer/zabbix/zabbix-3.0.9.ebuild
new file mode 100644
index 000000000000..13448bdf670d
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.0.9.ebuild
@@ -0,0 +1,331 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping )
+	server? ( net-analyzer/fping
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_server.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
+		dosbin src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+	   dodir \
+	   	/${ZABBIXJAVA_BASE} \
+		/${ZABBIXJAVA_BASE}/bin \
+		/${ZABBIXJAVA_BASE}/lib
+	   keepdir /${ZABBIXJAVA_BASE}
+	   exeinto /${ZABBIXJAVA_BASE}/bin
+	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+	   exeinto /${ZABBIXJAVA_BASE}/lib
+	   doexe \
+	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
+		src/zabbix_java/lib/logback-console.xml \
+		src/zabbix_java/lib/logback-core-0.9.27.jar \
+		src/zabbix_java/lib/logback.xml \
+		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+		src/zabbix_java/lib/slf4j-api-1.6.1.jar
+	   exeinto /${ZABBIXJAVA_BASE}/
+	   doexe \
+	   	src/zabbix_java/settings.sh \
+		src/zabbix_java/startup.sh \
+		src/zabbix_java/shutdown.sh
+	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-3.2.2.ebuild b/net-analyzer/zabbix/zabbix-3.2.2.ebuild
new file mode 100644
index 000000000000..6a018fcf0c91
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.2.2.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping[suid] )
+	server? ( net-analyzer/fping[suid]
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_server.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
+		dosbin src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
+		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-3.2.3.ebuild b/net-analyzer/zabbix/zabbix-3.2.3.ebuild
new file mode 100644
index 000000000000..6a018fcf0c91
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.2.3.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping[suid] )
+	server? ( net-analyzer/fping[suid]
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_server.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
+		dosbin src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
+		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-3.2.4.ebuild b/net-analyzer/zabbix/zabbix-3.2.4.ebuild
new file mode 100644
index 000000000000..31176f59177a
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.2.4.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping[suid] )
+	server? ( net-analyzer/fping[suid]
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_server.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
+		dosbin src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
+		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-3.2.5.ebuild b/net-analyzer/zabbix/zabbix-3.2.5.ebuild
new file mode 100644
index 000000000000..31176f59177a
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.2.5.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping[suid] )
+	server? ( net-analyzer/fping[suid]
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_server.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
+		dosbin src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
+		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-3.2.6.ebuild b/net-analyzer/zabbix/zabbix-3.2.6.ebuild
new file mode 100644
index 000000000000..31176f59177a
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.2.6.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping[suid] )
+	server? ( net-analyzer/fping[suid]
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_server.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
+		dosbin src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
+		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-3.2.7.ebuild b/net-analyzer/zabbix/zabbix-3.2.7.ebuild
new file mode 100644
index 000000000000..31176f59177a
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.2.7.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping[suid] )
+	server? ( net-analyzer/fping[suid]
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_server.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
+		dosbin src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
+		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-3.2.8.ebuild b/net-analyzer/zabbix/zabbix-3.2.8.ebuild
new file mode 100644
index 000000000000..31176f59177a
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.2.8.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping[suid] )
+	server? ( net-analyzer/fping[suid]
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_server.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
+		dosbin src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
+		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-3.4.1.ebuild b/net-analyzer/zabbix/zabbix-3.4.1.ebuild
new file mode 100644
index 000000000000..ae1d5666084c
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.4.1.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping[suid] )
+	server? ( net-analyzer/fping[suid]
+		app-admin/webapp-config
+		dev-libs/libevent )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_server.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
+		dosbin src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
+		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-3.4.2.ebuild b/net-analyzer/zabbix/zabbix-3.4.2.ebuild
new file mode 100644
index 000000000000..ae1d5666084c
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.4.2.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping[suid] )
+	server? ( net-analyzer/fping[suid]
+		app-admin/webapp-config
+		dev-libs/libevent )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_server.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
+		dosbin src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
+		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zmap/Manifest b/net-analyzer/zmap/Manifest
new file mode 100644
index 000000000000..be65be8e36aa
--- /dev/null
+++ b/net-analyzer/zmap/Manifest
@@ -0,0 +1,8 @@
+DIST zmap-1.2.1.tar.gz 99840 SHA256 ff01f2b139e98a7e64ed2872ae332929c500dd6120888d57900fac82dccfeea8 SHA512 1b3d7fa41bb75c859463f3ec8bcde31778f5d91a6f561aa9638ba93be97dacdba89493574581ce52aebcf093a86b042dcce41cffe6cb0849bb76a6005b714be2 WHIRLPOOL 842ad32286883b554440dcb5ccfd8655997321612fd9ec49f591a6151819b6b605bc518281100c55ca8a9113819960710f870a745ebcb9994a6224b47d9a49ee
+DIST zmap-2.1.1.tar.gz 131689 SHA256 29627520c81101de01b0213434adb218a9f1210bfd3f2dcfdfc1f975dbce6399 SHA512 9d62dceff77fa20ff5945516b0766340366175947130bb844f19c11dac7676e658bcdedd6be29ffc945706aa3cdc0e4ac207bd127b618592769a4d3e75892857 WHIRLPOOL 09d7fb4e522b207b0b7f1d1ea9efcd9be49f7296d6c5e96858d795de61bf4a9d10ece07f7fa3bd56338dd3e410b5e474b51ed2c917a4b093fdc1689deec43d62
+EBUILD zmap-1.2.1.ebuild 825 SHA256 e44c5cc14d33011da41fbf382d09a71b85f6abfd4819595eda3ccc0376ef8c16 SHA512 e098118e347b16d0ff1dd64dc3e40f46d8e2f6c219df7f1602ef9b5d6a58ccccc37c2f693c918d547cd0a9e9778a7e2c4776082f9bb9f3e7406150f7670d989e WHIRLPOOL 73874319d44fbfef8b9af1a050b042e01572ecb39172ea3741f0eaa1ffcd170dfd676bf3edaf55c7d5a6239a42fba9e52299ae3f1369f5c3c0a175da85774e3d
+EBUILD zmap-2.1.1.ebuild 994 SHA256 24389b54ec49e090a86ecd3266ba464591ce98c8638751e259adf7f83b43c18c SHA512 e632f5710d524c12e4d65bd5c6ff908c1711c46002edc8094feaa3c0e500045ba00d30d40b64da2da13d35189fa51b3ce8117fabbc4e98505812c8d6afd23ec5 WHIRLPOOL ba6a75043ebab556f55c00e7dfb19a40b9a7b886f5494cfcfc9410a000987f7a0b8cc98c67f2535eeaa25a344aec9c0f3ba43f43cdab18da2ea0f59bbfa0bf53
+EBUILD zmap-9999.ebuild 820 SHA256 3eb01121d3acc48a65fdf10bb1437cfd8bf3da367095203d3ccaaf84ebc9fa4f SHA512 45e913f66c503c3ea13c8f85385d3100b439e9281b6b4293707f08fd4037a481a76aea0a22e07f10f9b6674c7d9e4cbb3b80a52d29ac208407ae0eb3b8b66bf8 WHIRLPOOL 9191e52fd76efd2fb72dc460f7c7559e3a8fa1351beca351a311fa0f2244c987dbe6568c5a4b1128a019b518fa5174cb7795b5324a66f0cf7f8b613bd9e0e0da
+MISC ChangeLog 3751 SHA256 71ceca50d63df26b1ec388a8a455568cb6640c9f03bd4f2e27cb6f7081c9bded SHA512 786b0e122e0f414b63ec9f58aab3819c1584ad00ac16cc55449b2030cafc29ef3b9ac943387ed19f6fc125ae40db365a8c235b0f6f549ace71f7ab6ecfb9a59d WHIRLPOOL 734ce66a1f85311dba749be3ed35239e9aff90975c2b4fde467c7bec32daaa5148840d2f9897c984d7e2162399a2d00164d883cd05fb2f2a67d7c85f76aa8d7e
+MISC ChangeLog-2015 1553 SHA256 8982f756fa5cebd88bf5063fca8592b30687f43b539b4b3d13c7095073824021 SHA512 3160e7026e1ba677a695884db3189e91941188fc9b28ca086b348bf1c6d2cab3ed7b3057c72ef2e3ff8082d196593d398cfa07474ac7798b7c527e050c7012f9 WHIRLPOOL f940819e09da798f70a0dfcee72a3287de80cf0dc502f1e11efc8b9dfdedd376f3ba4433c7e60a398cff899c8124f34b17070710b65c0f66b58e5e5484ab31b2
+MISC metadata.xml 1137 SHA256 8353c5d091f77ddc89d9ab5388f6ba5480424acc30b3f39d19c8aa2d186cb053 SHA512 ba948942b57ac083ad7a7baa0b31cdb8d009945419e20e60c374b0bda1b009fe09eca2a7575f79ce3d05f3282aa3e6cde061b72eec512bfecec6d255dfbfaad6 WHIRLPOOL af221ef6c11577749e98447ee8f579719da54189004c0f518ff7b4a390cce2a95c074cc990675150d1db317d03cbefc5d4556beba85ef80085c42670e2751351
diff --git a/net-analyzer/zmap/metadata.xml b/net-analyzer/zmap/metadata.xml
new file mode 100644
index 000000000000..46f0b4cadbc4
--- /dev/null
+++ b/net-analyzer/zmap/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>jlec@gentoo.org</email>
+  </maintainer>
+  <longdescription>
+ZMap is an open-source network scanner that enables researchers to easily 
+perform Internet-wide network studies. With a single machine and a well 
+provisioned network uplink, ZMap is capable of performing a complete scan of 
+the IPv4 address space in under 45 minutes, approaching the theoretical limit 
+of gigabit Ethernet.
+
+ZMap can be used to study protocol adoption over time, monitor service 
+availability, and help us better understand large systems distributed 
+across the Internet.
+  </longdescription>
+  <use>
+    <flag name="json">Add support to store results JSON based</flag>
+    <flag name="mongo">
+      Add support for storing in a mongo DB via <pkg>dev-db/mongodb</pkg>
+    </flag>
+    <flag name="redis">
+      Add support for storing in a redis DB via <pkg>dev-libs/hiredis</pkg>
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="github">zmap/zmap</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/zmap/zmap-1.2.1.ebuild b/net-analyzer/zmap/zmap-1.2.1.ebuild
new file mode 100644
index 000000000000..0f6e591a1788
--- /dev/null
+++ b/net-analyzer/zmap/zmap-1.2.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils fcaps
+
+DESCRIPTION="Fast network scanner designed for Internet-wide network surveys"
+HOMEPAGE="https://zmap.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="json redis"
+
+RDEPEND="
+	dev-libs/gmp:0
+	net-libs/libpcap
+	json? ( dev-libs/json-c )
+	redis? ( dev-libs/hiredis )"
+DEPEND="${RDEPEND}
+	dev-util/gengetopt
+	sys-devel/flex
+	dev-util/byacc"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DEVELOPMENT=OFF
+		-DENABLE_HARDENING=OFF
+		-DWITH_WERROR=OFF
+		$(cmake-utils_use_with json)
+		$(cmake-utils_use_with redis)
+		)
+	cmake-utils_src_configure
+}
+
+FILECAPS=( cap_net_raw=ep usr/sbin/zmap )
diff --git a/net-analyzer/zmap/zmap-2.1.1.ebuild b/net-analyzer/zmap/zmap-2.1.1.ebuild
new file mode 100644
index 000000000000..b52063eda35e
--- /dev/null
+++ b/net-analyzer/zmap/zmap-2.1.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils fcaps
+
+DESCRIPTION="Fast network scanner designed for Internet-wide network surveys"
+HOMEPAGE="https://zmap.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="json mongo redis"
+
+RDEPEND="
+	dev-libs/gmp:0
+	net-libs/libpcap
+	dev-libs/json-c
+	mongo? ( dev-db/mongodb )
+	redis? ( dev-libs/hiredis )"
+DEPEND="${RDEPEND}
+	dev-util/gengetopt
+	sys-devel/flex
+	dev-util/byacc"
+
+src_prepare() {
+	sed \
+		-e '/ggo/s:CMAKE_CURRENT_SOURCE_DIR}:CMAKE_BINARY_DIR}/src:g' \
+		-i src/CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DEVELOPMENT=OFF
+		-DENABLE_HARDENING=OFF
+		-DWITH_WERROR=OFF
+		-DWITH_mongo="$(usex mongo)"
+		-DWITH_redis="$(usex redis)"
+		)
+	cmake-utils_src_configure
+}
+
+FILECAPS=( cap_net_raw=ep usr/sbin/zmap )
diff --git a/net-analyzer/zmap/zmap-9999.ebuild b/net-analyzer/zmap/zmap-9999.ebuild
new file mode 100644
index 000000000000..a229c0000778
--- /dev/null
+++ b/net-analyzer/zmap/zmap-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils fcaps git-r3
+
+DESCRIPTION="Fast network scanner designed for Internet-wide network surveys"
+HOMEPAGE="https://zmap.io/"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS=""
+IUSE="mongo redis"
+
+RDEPEND="
+	dev-libs/gmp:0
+	net-libs/libpcap
+	dev-libs/json-c
+	mongo? ( dev-db/mongo )
+	redis? ( dev-libs/hiredis )"
+DEPEND="${RDEPEND}
+	dev-util/gengetopt
+	sys-devel/flex
+	dev-util/byacc
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DEVELOPMENT=OFF
+		-DENABLE_HARDENING=OFF
+		-DWITH_WERROR=OFF
+		-DWITH_mongo="$(usex mongo)"
+		-DWITH_redis="$(usex redis)"
+		)
+	cmake-utils_src_configure
+}
+
+FILECAPS=( cap_net_raw=ep usr/sbin/zmap )
diff --git a/net-analyzer/zniper/Manifest b/net-analyzer/zniper/Manifest
new file mode 100644
index 000000000000..60975460cea6
--- /dev/null
+++ b/net-analyzer/zniper/Manifest
@@ -0,0 +1,5 @@
+DIST zniper-1.0.tgz 20324 SHA256 317b115f0060252706e151936603b344119f0a547816d4bbf19d3808b8823e3f SHA512 052683628c8094c402fd042b6329ca799bab594debf35c4e8b4f422e58b67f1acba8b40b335e519f1d2f1baca6c716be40718fd1089020a86c97c011da7003d1 WHIRLPOOL bab7e049955a4748d620c98b18f7c9370ede6dd3d9b656abc91135239b9034c576049891d797b6a7e009d39a7e81b60463ffbf4ff6e3aa58b2a59fbc3df43a74
+EBUILD zniper-1.0-r1.ebuild 795 SHA256 adbba972ec19d914cfe481c1f93e934c90bfb6fc20f85547ebe9455d36993c0b SHA512 1afa6da4b8f699f0426f90891a0b772f6c2d952681bd89478683dc1c965cf5d936fb2f9007aaaceb3f9002686b265b9c92f63e921254f1aa825a57a417bdc7d5 WHIRLPOOL c1b146c27796b2c407f1363a60f96105351137559d65ff9140bce47075ed94065ed1c6da8485c0a14de30ffeebf675e8006700c9a9f6d090f66f7e04fc5bf6a5
+MISC ChangeLog 2430 SHA256 e756a39335d641541ac67b0f7162566bf13611f661fe834c02dd3a19ced02457 SHA512 5549345b31b6e58b5f268d33cb5ef381e9461656312601ca82b7a5e4169c52489b573543c91e083574a79c69df91736a580ab1217a43c694f9b7b49cccc97111 WHIRLPOOL 9bbe78cdd3e6744309baaf515df0a2cee15a931520aec9833c028826dd0f4377fccf0f79cf568ee6c921b4b8d0ddf5356c9cf6f001b070c61438378f3a5c9e86
+MISC ChangeLog-2015 1287 SHA256 cfcdf285688be4f0845a3237d7ba54898462ecb1b46f4d082f465689ed928df9 SHA512 4ea7e7468abaf892f3a4b6a6d00fd9444a2cbc95c4282bfef4e89e06114e44adfc80745cf07eb9ca4ccc6fa1ca64ae869aefb3f116a919f4026d38d271de6649 WHIRLPOOL b73e18ef3295440bd91897bb87f74dbcb378faa0a48bf0481795ea22c21eb15eb3a0ad2aceefa8d5b204fa747ce1ca42f9e2360a7e8a5feb7d3900fcde1a7d44
+MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/zniper/metadata.xml b/net-analyzer/zniper/metadata.xml
new file mode 100644
index 000000000000..74c2baebb4ec
--- /dev/null
+++ b/net-analyzer/zniper/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/zniper/zniper-1.0-r1.ebuild b/net-analyzer/zniper/zniper-1.0-r1.ebuild
new file mode 100644
index 000000000000..dae03274def1
--- /dev/null
+++ b/net-analyzer/zniper/zniper-1.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="Displays and kill active TCP connections seen by the selected interface"
+HOMEPAGE="http://www.signedness.org/tools/"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses
+"
+RDEPEND="
+	${DEPEND}
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/"zniper"
+
+src_prepare() {
+	sed -i \
+		-e 's| -o | $(LDFLAGS)&|g' \
+		-e 's|@make|@$(MAKE)|g' \
+		-e 's|-lncurses|$(shell $(PKG_CONFIG) --libs ncurses)|g' \
+		Makefile || die
+	tc-export PKG_CONFIG
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		CFLAGS="${CFLAGS}" \
+		linux_x86
+}
+
+src_install() {
+	dobin zniper
+	doman zniper.1
+}