gentoo resync : 29.10.2017

9 files changed, 21 insertions, 386 deletions

diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index 79b5eaf36c71..87ab4d553c41 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -1,19 +1,11 @@
 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
+DIST pmacct-1.7.0.tar.gz 1351888 SHA256 19c3795db452191c2b1b9533fecaf69c6767c9fb7b4ae60ae3f28e24eb2ee9c8 SHA512 14f1cecc562f008d9b79259f885fc3a1d0a74efa4840d6150277c9bb3c67a233ca9a6b921d9d83fd488d1eb6f535075d7fbf53de0036c48611ffcbf5eb7559b5 WHIRLPOOL d0b09160195ea53e7b83f7a70cb8a051874dd5d3ef00c27fd9becc0dcf5b72f2ce2e01d73994ca54fee14feacacb0029bbfa94a7e73c40010a21718d48e25891
 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
+EBUILD pmacct-1.6.2.ebuild 1797 SHA256 71a6e8efb3d8d09f2fea98f1770158e1e786a275888518b5a08298c15c2f83c3 SHA512 43fccffe30d711724a937cbbe236f379f33b6d2bdebde91743bc5d05355532a46ac85bb8a949f2563d2d023dd2dbf3b940526698e59ea6acf569f0ff9eea7438 WHIRLPOOL 54a487491997e87644890ee78e86b86bda6cdb80b257a6a245dff1494aacb3f49e737a75f78ed944d65215b0a88e660f9a9ea54710a81685a484fc89af364256
+EBUILD pmacct-1.7.0.ebuild 1969 SHA256 7f189f44f3a48e4575821377048376ba809320bae7b3666df05503bba36896fd SHA512 3692ebc01a464fb66bf4fa1891ad8ae5f9c9c2299b9038a1bc49fb742a54312c10005f8e860c268f5727b93ee1fe9059e6d87838318d2940d1048d3f6950928a WHIRLPOOL f8c4a46195ea3acbf37c8771a86aeac638b5f4715cb8ed3cd619e29387aaaec6030909aa9bc85e413ce1d2c403019a166ac2059b347f82104c031da5afe2e694
 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
+MISC metadata.xml 1140 SHA256 77a23129a81bfeb2a2b255a8b6af510c21610ae197e689407a583413a29b4e1a SHA512 1b35f356c2991f002b7803897442c78040d41cf62cc60833454642e2389c256463df47a43ce125441239370cbcbd388d529146841fa7cb98079e85e23122f51c WHIRLPOOL 6bf403da1202af204ef3e442bc4c98e5e70f1a6af08c2811c85438d0ab85d36af335e2d5e51b63de1505226aa8be3f688dca8888eb02efb7fbb1713813c6da62
diff --git a/net-analyzer/pmacct/metadata.xml b/net-analyzer/pmacct/metadata.xml
index cc407997e255..178cb4633b4f 100644
--- a/net-analyzer/pmacct/metadata.xml
+++ b/net-analyzer/pmacct/metadata.xml
@@ -7,12 +7,14 @@
 </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="geoipv2">Enable support for GeoIP2 through <pkg>dev-libs/libmaxminddb</pkg></flag>
+<flag name="jansson">Enable support for JSON through <pkg>dev-libs/jansson</pkg></flag>
+<flag name="kafka">Enable support for Apache Kafka through <pkg>dev-libs/librdkafka</pkg></flag>
+<flag name="mongodb">Enable support for MongoDB through <pkg>dev-libs/mongo-c-driver</pkg></flag>
+<flag name="ndpi">Enable support for nDPI through <pkg>net-libs/nDPI</pkg></flag>
+<flag name="nflog">Enable support for NFLOG through uacctd</flag>
+<flag name="rabbitmq">Enable support for RabbitMQ through <pkg>net-libs/rabbitmq-c</pkg></flag>
 <flag name="ulog">Enable support for ULOG in older kernels (deprecated)</flag>
+<flag name="zmq">Enable support for ZeroMQ through <pkg>net-libs/zeromq</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/net-analyzer/pmacct/pmacct-1.5.2.ebuild b/net-analyzer/pmacct/pmacct-1.5.2.ebuild
deleted file mode 100644
index f27118bbbe3c..000000000000
--- a/net-analyzer/pmacct/pmacct-1.5.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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
deleted file mode 100644
index bf3780777ae8..000000000000
--- a/net-analyzer/pmacct/pmacct-1.5.3_pre20150925-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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
deleted file mode 100644
index f28070082930..000000000000
--- a/net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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
deleted file mode 100644
index 91a703ca1ffe..000000000000
--- a/net-analyzer/pmacct/pmacct-1.6.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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.ebuild b/net-analyzer/pmacct/pmacct-1.6.1.ebuild
deleted file mode 100644
index 91a703ca1ffe..000000000000
--- a/net-analyzer/pmacct/pmacct-1.6.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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
index 72d65265800b..0b22f3b865ca 100644
--- a/net-analyzer/pmacct/pmacct-1.6.2.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.6.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.pmacct.net/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="64bit debug geoip geoipv2 ipv6 jansson kafka mongodb mysql nflog postgres rabbitmq sqlite threads"
 REQUIRED_USE="
 	?? ( geoip geoipv2 )
diff --git a/net-analyzer/pmacct/pmacct-1.6.1-r1.ebuild b/net-analyzer/pmacct/pmacct-1.7.0.ebuild
index 0b22f3b865ca..ff729c382305 100644
--- a/net-analyzer/pmacct/pmacct-1.6.1-r1.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.7.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="A network tool to gather IP traffic information"
 HOMEPAGE="http://www.pmacct.net/"
@@ -10,8 +10,8 @@ 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"
+KEYWORDS="~amd64 ~x86"
+IUSE="64bit debug geoip geoipv2 ipv6 jansson kafka mongodb mysql ndpi nflog postgres rabbitmq sqlite threads zmq"
 REQUIRED_USE="
 	?? ( geoip geoipv2 )
 	kafka? ( jansson )
@@ -29,10 +29,12 @@ RDEPEND="
 		<dev-libs/mongo-c-driver-0.98
 	)
 	mysql? ( virtual/mysql )
+	ndpi? ( net-libs/nDPI )
 	nflog? ( net-libs/libnetfilter_log )
 	postgres? ( dev-db/postgresql:* )
 	rabbitmq? ( net-libs/rabbitmq-c )
 	sqlite? ( =dev-db/sqlite-3* )
+	zmq? ( >=net-libs/zeromq-4.2.0:= )
 "
 DEPEND="
 	${RDEPEND}
@@ -46,6 +48,7 @@ DOCS=(
 
 src_configure() {
 	tc-export CC AR RANLIB
+	append-cppflags -DMYSQL_SERVER_VERSION=99999999
 
 	econf \
 		$(use_enable 64bit) \
@@ -57,11 +60,13 @@ src_configure() {
 		$(use_enable kafka) \
 		$(use_enable mongodb) \
 		$(use_enable mysql) \
+		$(use_enable ndpi) \
 		$(use_enable nflog) \
 		$(use_enable postgres pgsql) \
 		$(use_enable rabbitmq) \
 		$(use_enable sqlite sqlite3) \
 		$(use_enable threads) \
+		$(use_enable zmq) \
 		--disable-debug
 }