gentoo resync : 15.05.2018

4 files changed, 51 insertions, 22 deletions

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
 }