gentoo resync : 15.05.2018

13 files changed, 63 insertions, 34 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 93ec8e3726bd..a3be3523daf2 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest
index 3c43a06e5395..3122ff3296ee 100644
--- a/net-analyzer/argus/Manifest
+++ b/net-analyzer/argus/Manifest
@@ -6,6 +6,6 @@ AUX argus.initd 365 BLAKE2B 1b7841cd53679b10444a1da1af0f0226bc84c08e9e5427f96462
 DIST argus-3.0.8.1.tar.gz 523375 BLAKE2B 785f68d3977b72146a57c1a1fb6c40d80cce1b9c4e5ca46555ac12766fd8885f657997da8f54a5d0610ccedf2ed652231c15518dc631d61051edae75c57849a2 SHA512 d96332849df7ce2297aa0d81a9f22c12763d04b2936ffaffc0e4b1942535846cfbc41dadf28791eb88d1ffd0429bdc280d16dff44369c415c713064849b158f7
 DIST argus-3.0.8.2.tar.gz 524749 BLAKE2B 4d93fd8acd71b198da712961d75f0e813f5ed3fde841e77b8a10c3a9b89571902b7597969a4be12437c97ffc69ba5ebefaee8b684c5d2d4ce4f1309c1cfd1199 SHA512 146795880d8697e065ed23d2fbab226846d55db0b71945c5a4cab2896e48ceb6e1671ccb4e00dc3b0f984525bac4ced3773f3b9e70c3ea5f7c6972fe9bd94313
 EBUILD argus-3.0.8.1.ebuild 1850 BLAKE2B 838f107c5e002894480cd4f82e5b4b3c12662cca9dcbf9362089b69911c365fb4420b270fdd2c0ed1d709bc84e60bca4a15863d72114eb467459514a7c04a7a4 SHA512 7fae97954944c0c5d22f8a688a3ceeae803309c3b0f5d1d2c8144ef6fcc840e8997820d1974b3e1fbd0e72fdda3071d0b9641c59de43c098ce4aff8648448c87
-EBUILD argus-3.0.8.2-r1.ebuild 2054 BLAKE2B 0bcc7e64a85226a70046bc1b76d5e02c24d1ab3a4e9861b2343cef94e5bd9d3f69486adbd51aadd83d6463ae00b6f25f25db31f8a693700bc422cd7e1f662e33 SHA512 39ac92a95f4b4c48a7184a05b04dbe359aaba353eab1fd24b2cd33453e810eb6a616d786d97c0f1677d217b143f935df05481d380a17c46315410d0f0ac1c5f2
+EBUILD argus-3.0.8.2-r1.ebuild 2052 BLAKE2B ca1b7828270bfd5bf246e4ea079719757b434a5caa6264abe21a12012384488f8f7ec08489c95701b7a325416f1e9be3f6d86919e0b4df82f85981aad707cb43 SHA512 863a7785e43cede3c1fb15b74d16bfc0770d0e358a9f8a860bcb50cbede120a9f6e570480854019ff40dbce99079c5e398db1138eb650c5b9854e1bea7ce5988
 EBUILD argus-3.0.8.2.ebuild 1876 BLAKE2B 7f01ccbf95c2cc9990acf77d0443c6eb5b453eac19867007359b5434306eb7e5d505ceb1a914276c9b311c9d7130402aa3eeb4e311688dd415f3770d56ed19ea SHA512 70832f5bc42829924d7667e79018eb859e381b4cc0811e8147fe9e87b9170ff4f5250c18f020af9fe376da7cce98afca031b4550217608e3e8ee0a29cb8e8ce9
 MISC metadata.xml 468 BLAKE2B ce716483a5c126030c044618343341e853b367516f0fb6142b5cf7140738a5950eec5fcc514a856dd119310d7a1e05adab9f4ac0e802e01ee873a6c81f14a2e4 SHA512 64c97706da7a48ebaf5d3bd9aecdd11b1eff9516d5e99993ba65217b169c503bb509fdf19ade828925c85a82573b186aab89991b5870161681c42985a244771f
diff --git a/net-analyzer/argus/argus-3.0.8.2-r1.ebuild b/net-analyzer/argus/argus-3.0.8.2-r1.ebuild
index 8e3fcd9e4299..4f8d88d2e023 100644
--- a/net-analyzer/argus/argus-3.0.8.2-r1.ebuild
+++ b/net-analyzer/argus/argus-3.0.8.2-r1.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug +libtirpc sasl tcpd"
 
 RDEPEND="
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 4c665af892de..db409b6561bf 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -15,5 +15,5 @@ DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b
 EBUILD nagios-core-3.5.1.ebuild 6154 BLAKE2B a12a36fc2217394d21f7084fce74104f5c17749271fcf984a1dd96cac505327abb89a20e9582c927286b4b93dbcbecfa131129bc3362a29b900441138dae580a SHA512 c402040b5449fe096d40d0313ee08380089788c57da4dc780a8736eb335fb775379db4667145baed355dbbe9128e99d2662f54d9a57e44f2cc5fc35f0fe2bf01
 EBUILD nagios-core-4.3.1-r1.ebuild 7579 BLAKE2B 931cbb9b132ad116fc2e7ed6670d309ecb5165b172eef9e24ef401b7946c4dc0f434f9678a338f4ecac2cf65cd2147cdda046d9ede2676e8aa7f7b5d5b8795b5 SHA512 8a4273cb4e2f50ed4e69d190743c362db3c1c9480ea19d061501dc57e48fea7e6b3c1811107714667b7ead9eb748ee8a7a106b792f066422ef13640b14bd5aac
 EBUILD nagios-core-4.3.3.ebuild 7466 BLAKE2B af8a11f344adbb8e8e7bb46b48c8bb414ef7c58e7b8aab77c2988919bc5fae24c6272f96cf51a9b43f64f6e42003187e6616d4d87d56f86a5e00184c8c5e9483 SHA512 860b07673f9d77e296bfc471291cd07de65b1195ea2cfd0bad7ceffdf316afa23fda0c5f90a2de2c7115f053f54dbced5e45627d6747512af62833d0c398682b
-EBUILD nagios-core-4.3.4.ebuild 6644 BLAKE2B 5d4122fcdaf7a49e1b1f19a8329978adb13c4453d3c582353a041e44dd8b836018351bd5a67be60acf21a8e1451960b67b453c7a898e6865eafc06a021918247 SHA512 9dc3711eae6ca9aace53ee2d960f5a5886ea0cd2473e8f61b939fd0dc6a2db7881d299702997d2c5cf47438b2248c939a552077fb8bf542bd583b9ea2eb28f9d
+EBUILD nagios-core-4.3.4.ebuild 6643 BLAKE2B d3ab6cbd0a2d7fbc90eb73e22b4b0c86f546afeb1919562df2dd4b0b5481fa9a31286086e68fb70ce8d820e4cb225772911691003ce58e8e995a2516389178f5 SHA512 689e4e5bb5b832a9c50f546aaaf4187c2a7bd38d3c520e3dd3527f45b778bf6ae805f39c2a12057bab1a4e7b1db93871abc2e2de4409f6b6fa8e706e4611acec
 MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b
diff --git a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
index fdfbefc49438..122423ab1055 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86"
+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
diff --git a/net-analyzer/ostinato/Manifest b/net-analyzer/ostinato/Manifest
index c62536e915bd..5bb0ae11d87b 100644
--- a/net-analyzer/ostinato/Manifest
+++ b/net-analyzer/ostinato/Manifest
@@ -1,7 +1,7 @@
 DIST ostinato-0.8.tar.gz 424104 BLAKE2B 5244ac9577da3fc99b714044a349e4003f0e64034fad04e241b43288a234f86f282ba0169c7e27c358d7ee3f4dc255b2408ef23f030d25f1edfec891e8ae17f7 SHA512 ecb3581736bd8dff44fe21082c270febc2ead4530cfb57997f218bd0b61a85993208937729374dd09c67fdc24eb2b9adfe5b3750ee6daef90b1e7dac2ea0737b
 DIST ostinato-0.9.tar.gz 413756 BLAKE2B cc1cb6d4db614b1968c27d7cdbebb977f39e6be8ec1a39b08f7e34d9a1a4d6b7c0c034f245b6b562c72b5dbdba9fc04c03b1cfc0c01044c249bcc2bc67af357d SHA512 a50f6e20d8a2a4d76ca43a89feaa774778981377ce1f4c731ad8b1a97aa658013082fb85cc3f4dfdd888d708c45c8093e55facaa7f02cecbd2ce5228f57e2e14
 DIST ostinato-src-0.5.1.tar.gz 291529 BLAKE2B 207a3b423040e82042e7e68e2c7ffaf304a0c7e7d1578a994caf090ee934e10f169b9fce96724c0527268fb9f656b25bf3baa19b5f1ab6a06ffc2b8925b1c952 SHA512 d06b59dc2129aba01e5a42a677339d6e8f353f9c7c027226e66c8a5af94ecb48e8450e7770ae5e179131fa4cfeefcc827fb9a18be4294ddfcd7a471ec26ee06a
-EBUILD ostinato-0.5.1.ebuild 508 BLAKE2B 6b9d53a7df309859e8023d796e39bd74fccae29327f8a71693838ade13d7690d8cbf997e81947722feef59d88835f78712b51bd884a94c1ddeb0a6647054d838 SHA512 3dd8623d7f875237d15b67e21a50af896ef71a248e806cb28bbdeb37c92d8499c55c6c858347aff303b43ba5dcf7b9161599863835f305c2201129c6f6f8d796
-EBUILD ostinato-0.8.ebuild 550 BLAKE2B 01b58bc17ecfb8ffe9a7a8d6bcf75646410206be56712663703de5afb975c19b53503a5fc4d58fefd8033dff57c7b21782e902f7ed1422f0ad042c4708e3c7a8 SHA512 34df775de08c0b3b9aef72d7b0b251985df7af67667dccff17486563f01db303bee00aa4767a93bef2b97afc3fd090dfdedbe9beead794911dc7dc87e474dd3d
-EBUILD ostinato-0.9.ebuild 654 BLAKE2B 68d076967bdb55df333698d10f543109df4449e98a2d218bb2544651bfeed4b60d9984ebe8c2d1d59184fdb34357f3e3ffb43cd08edbc7579c3c2132c2241be1 SHA512 b41e57f52c46d0105795812af573bbcc570348d8d527b5e8ef83304a8f02f248912a106b880586a1a7b59f3eac1d65452d0ccb0a4f01cda437132f28c8d4673e
+EBUILD ostinato-0.5.1.ebuild 508 BLAKE2B 1857e47c74bd91eea56c551e95e63b667388ecb389be9939d4e2eb37898b84416d9b151bd71952567973fdbdd22bc08f85fdfc963fc208ff716e461c45542905 SHA512 589777f1c32dbeb62411f028527259c57fd86e5e9bf27b527650d517c68e9c05a77d11ecb213d88610f468db4a756d94c817985dff618a260a7110427bbe216d
+EBUILD ostinato-0.8.ebuild 550 BLAKE2B a4e7b8e65a2278db94b3b5d284b97b8fdbeab2c70e9c81e1cba9ce90768e65f818a0a2b77ef5ceeb181fab1364682f8b45b2f5012cc3fda4aa70d4103ba97a3c SHA512 a7d654097e7fbd013e1413ebb471b6b27abfeecc0d26f98f49a424e47c58cd9ea905fe19e49b15043c5ec8c8a7166c9f56cbf5b8b6210acd5863bd18cafbb82d
+EBUILD ostinato-0.9.ebuild 654 BLAKE2B 71bac7438fc30945a49181cdf26b31a4b5f61d9a2986acd11ef5895f8c2c623d3c54a55a2c733db9b68ddfb27bb00c4a92ad0793bbdbc9a2cbf41cd5e00018f7 SHA512 cfcf4573ac143eb6f8d07ef0e49a6539fadcfa8d68214dcef455bec042f45af335e6b3bbf8eaae0fd30ae1a1d9402c7b686f45b9896da721d9227ded7c1f4023
 MISC metadata.xml 325 BLAKE2B 7deccc14079e605af5cd4a154a6d7ba4f69b2c7472c0f3ebb59c968bbb3c992216b0a367973d6ed729b0b117594ff47d1e9401c1750f5a6627aefca6008aab5f SHA512 65ed2d54f5a181004ea4900cd1b26b632fe57809f4903f9e4bb79b3440e7e3d72effc62725be9e788922e37b38f34b4363c30a3adda9f9483c0a983ff2f9fe09
diff --git a/net-analyzer/ostinato/ostinato-0.5.1.ebuild b/net-analyzer/ostinato/ostinato-0.5.1.ebuild
index 1feec41aa768..ab172d3770cc 100644
--- a/net-analyzer/ostinato/ostinato-0.5.1.ebuild
+++ b/net-analyzer/ostinato/ostinato-0.5.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 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/"
+HOMEPAGE="https://ostinato.org"
 SRC_URI="https://ostinato.googlecode.com/files/${PN}-src-${PV}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/net-analyzer/ostinato/ostinato-0.8.ebuild b/net-analyzer/ostinato/ostinato-0.8.ebuild
index 9b5821f9b93a..3642909eb53e 100644
--- a/net-analyzer/ostinato/ostinato-0.8.ebuild
+++ b/net-analyzer/ostinato/ostinato-0.8.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 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/"
+HOMEPAGE="https://ostinato.org"
 SRC_URI="https://bintray.com/pstavirs/ostinato/download_file?file_path=${PN}-src-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/net-analyzer/ostinato/ostinato-0.9.ebuild b/net-analyzer/ostinato/ostinato-0.9.ebuild
index fa2db04b283b..124577240763 100644
--- a/net-analyzer/ostinato/ostinato-0.9.ebuild
+++ b/net-analyzer/ostinato/ostinato-0.9.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit qmake-utils
 
 DESCRIPTION="A packet generator and analyzer"
-HOMEPAGE="http://ostinato.org/"
+HOMEPAGE="https://ostinato.org"
 SRC_URI="https://github.com/pstavirs/ostinato/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index aa088f4785e4..b2d4fb081f78 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -1,9 +1,9 @@
 AUX pmacctd-conf.d 153 BLAKE2B 10329deaac64fb5e03bf673c806ad691fb00579d16c77b05aa73662b5e187a31c25da38afb3be853434900ad65103bef3b9d1d9c3b24e0f241a98e4c9b6696b8 SHA512 1637316833db6e2a7c2d531deb4d68d647948bc03da8aecf0c6a34dd2f0c58d58d8473270e6096cf232e98c07946bac265161d4a8577def6cb72a4e8c9778c31
 AUX pmacctd-init.d 839 BLAKE2B 06d09dd80b526c9e12579e0ee2f76de96d91fef6f533727c5f6862a4a09be323fca4614be2f800f76195661cea5d52a3e6a316640ff4b853de963192c08f80d5 SHA512 c340e62eebfc15ee72591178451d46052e03ef1656a0b81a4b53c02b69df1e5a365742ddf98d9f7f0a8de1345b6a111b8e5ee9009f33fed2a3204344a15690a3
-DIST pmacct-1.5.1.tar.gz 874563 BLAKE2B 7dfa381c6f6fbde0c01d790046a087f0291f2347c0c2f776f12f5a3ef1864531a496cb05aa6fbea08c12d3f393cd7c6ad3af280807a759ea8934bdeeecb6a972 SHA512 c3a0ddaf1b8679df2097147ce844eb2a3e3058599aea457e463cd4e65a7601e0ce5bac5ca5e1c82afecd5edc92dae673eed3ed1787bfbd3e8ac2af5677885bb7
 DIST pmacct-1.6.2.tar.gz 1311678 BLAKE2B 123629ca2e5e58bb4e684001b1c6d2d510e18450eed1c6e45bbe79ec7bb37072ba9b844fe0d8826a7923d0b09cf6923ea87d4e22fb2f251e7ebb9744d1c59b93 SHA512 8495f97752ae586fd842eed49ce91db3e4753133f7d380d067e7df153abeea469e5126800074e9071cb7227a3f1df64d4642dfece624fbbfa39b4537fde38b46
 DIST pmacct-1.7.0.tar.gz 1351888 BLAKE2B d80d996bd247a90074b79bab69d709f70df74c7d89a552d01d86e718b165bc0091c560f4c5164db0c770b952d7bfe6660ac8c3a057f5ae8f321c015b9bdc40d3 SHA512 14f1cecc562f008d9b79259f885fc3a1d0a74efa4840d6150277c9bb3c67a233ca9a6b921d9d83fd488d1eb6f535075d7fbf53de0036c48611ffcbf5eb7559b5
-EBUILD pmacct-1.5.1.ebuild 1613 BLAKE2B ee811680e02b2ee6ad710c38520247935720da1f0e49011ff7b8ae6ec3f2f22793e337e872e41d206978130e331e58ad73af31bd4fd485aad7c42c8016b9a0a3 SHA512 7d59db86eb9a0bca64c83b4b51af301f183affbb492960949bf4ae9f69b2dc69c1120d0dd31c50c80614101ac82523d5b7af7e355af12fde708dee96f2774793
+DIST pmacct-1.7.1.tar.gz 1392360 BLAKE2B 75a4dda461c2fe643c24a901c19efacf325d1922bcda503a1ff41fe0b6c4178732d476b479875e9e0ba34872dbd86b8d8b2087471148f10e202f57c4a212f2fd SHA512 6a5d75522b9197b324907598ee4ba22bbda96b45e10f62df2ae507e23faac927af5468f587deab08d1e0f3f6422c609d106dcf30fa7bf16eb215bb35ea6aa08c
 EBUILD pmacct-1.6.2.ebuild 1790 BLAKE2B be2fe64588677200a54a4866e2946cb5516fb65d4f1ac0bef07287796321d3832c4acba1284f8bc285bbacf6513493a297880bccca350e6d7286ef6569e1d6e6 SHA512 6db9673c145cec1da55e4cd18428f64fb334066eb0a5794adc6127a0ba27144301237aa6e30e1c4a93ce892ad4306369da46e9572b41430df7a776080b7edcc0
-EBUILD pmacct-1.7.0.ebuild 1969 BLAKE2B cf2c83edc5ede644a2673e471418967a74e1c882e6fa736773f779ffeff3355f0f0aa0b6d0aa3f6fc83a8e3f7e2a779e731969c6bbc78a280fd4d81e9d8691e4 SHA512 3692ebc01a464fb66bf4fa1891ad8ae5f9c9c2299b9038a1bc49fb742a54312c10005f8e860c268f5727b93ee1fe9059e6d87838318d2940d1048d3f6950928a
-MISC metadata.xml 1140 BLAKE2B 293f22275f422c2fe1c4961c08e9215b471e01a9b7cb52b380fd6c420cafd9fa4dc32db96cb6f529eea0f58dbfcb1ba08db3edb645a204933272808cf47dd223 SHA512 1b35f356c2991f002b7803897442c78040d41cf62cc60833454642e2389c256463df47a43ce125441239370cbcbd388d529146841fa7cb98079e85e23122f51c
+EBUILD pmacct-1.7.0.ebuild 1943 BLAKE2B 64e813482f238b84c06b6f2f41d56cf0c3f04a82dd2d97c606135eda2f6ef33f8b2d2d43b8fe01dd740024d009b90c87f2045f36b78e68018116b67b529a4b0f SHA512 5c6b819d64f4fb9fe08a5b8e32651f69e83f996e98189e547d57136c8e0f8183db2e62a147e2669cc88c8d6581bf973b3261085214885d2cedef116c3e9ade80
+EBUILD pmacct-1.7.1.ebuild 2120 BLAKE2B 3c93a931372991ca9f82a3793b48b28d3a4a899d9fcc680028ca5ca164373ebabbabc9430c9ccf5dc69d5ec1bd4af86583e6b10984e7cacbd4323c2e4faf5900 SHA512 cbf0c8e7a7b26e8b8a6c6ca8fa1a8f6f7742100c3cf738f064e1313342013cb51f5f9454385fe3f0b8c093465a73808c714294edb48a1d3de95ce59aa41610e9
+MISC metadata.xml 1424 BLAKE2B 75ce1e74993587289adbef0841807d758f0a587bc5b0429cb03a86be690d49479a2cf37211006ae905473528f3f4714ec2827e5bc556a4bcaf368215f97db7b8 SHA512 ddfd0eaac09d66640660baffe80ca83911000632416602eb258b2c01e630ada343ebeff7191c53fe71e4d5e658c94eac9a95bf4527a9ba40ee674ffa9442d856
diff --git a/net-analyzer/pmacct/metadata.xml b/net-analyzer/pmacct/metadata.xml
index 178cb4633b4f..a306c0fa5034 100644
--- a/net-analyzer/pmacct/metadata.xml
+++ b/net-analyzer/pmacct/metadata.xml
@@ -7,14 +7,19 @@
 </maintainer>
 <use>
 <flag name="64bit">Use 64bit counters instead of 32bit ones</flag>
+<flag name="bgp-bins">Link BGP daemon binaries</flag>
+<flag name="bmp-bins">Link BMP daemon binaries</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="l2">Enable Layer-2 features and support</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="plabel">Enable IP prefix labels</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="st-bins">Link Streaming Telemetry daemon binaries</flag>
+<flag name="traffic-bins">Link IPv4/IPv6 traffic accounting binaries</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.7.0.ebuild b/net-analyzer/pmacct/pmacct-1.7.0.ebuild
index ff729c382305..762deb0d3058 100644
--- a/net-analyzer/pmacct/pmacct-1.7.0.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,10 @@ 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 ndpi nflog postgres rabbitmq sqlite threads zmq"
+IUSE="
+	64bit geoip geoipv2 ipv6 jansson kafka mongodb mysql ndpi nflog postgres
+	rabbitmq sqlite threads zmq
+"
 REQUIRED_USE="
 	?? ( geoip geoipv2 )
 	kafka? ( jansson )
@@ -52,7 +55,6 @@ src_configure() {
 
 	econf \
 		$(use_enable 64bit) \
-		$(use_enable debug) \
 		$(use_enable geoip) \
 		$(use_enable geoipv2) \
 		$(use_enable ipv6) \
diff --git a/net-analyzer/pmacct/pmacct-1.5.1.ebuild b/net-analyzer/pmacct/pmacct-1.7.1.ebuild
index 42f78533f6aa..4fa04368686e 100644
--- a/net-analyzer/pmacct/pmacct-1.5.1.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.7.1.ebuild
@@ -1,57 +1,79 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit toolchain-funcs
+EAPI=6
+inherit flag-o-matic 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"
+SRC_URI="http://www.pmacct.net/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="64bit debug geoip ipv6 mongodb mysql postgres sqlite threads ulog"
+KEYWORDS="~amd64 ~x86"
+IUSE="
+	64bit +bgp-bins +bmp-bins geoip geoipv2 ipv6 jansson kafka +l2 mongodb
+	mysql ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq
+"
+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 )
+	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}
 	virtual/pkgconfig
 "
 
-S="${WORKDIR}/${P/_/}"
-
 DOCS=(
-	CONFIG-KEYS ChangeLog FAQS KNOWN-BUGS QUICKSTART README TODO TOOLS UPGRADE
+	CONFIG-KEYS ChangeLog FAQS QUICKSTART TOOLS UPGRADE
 	docs/INTERNALS docs/PLUGINS docs/SIGNALS
 )
 
 src_configure() {
 	tc-export CC AR RANLIB
+	append-cppflags -DMYSQL_SERVER_VERSION=99999999
 
 	econf \
 		$(use_enable 64bit) \
-		$(use_enable debug) \
+		$(use_enable bgp-bins) \
+		$(use_enable bmp-bins) \
 		$(use_enable geoip) \
+		$(use_enable geoipv2) \
 		$(use_enable ipv6) \
+		$(use_enable jansson) \
+		$(use_enable kafka) \
+		$(use_enable l2) \
+		$(use_enable plabel) \
 		$(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 ulog) \
-		$(usex mysql "--with-mysql-includes=$(mysql_config --variable=pkgincludedir)" '') \
-		$(usex mysql "--with-mysql-libs=$(mysql_config --variable=pkglibdir)" '') \
+		$(use_enable st-bins) \
+		$(use_enable traffic-bins) \
+		$(use_enable zmq) \
 		--disable-debug
 }