gentoo resync : 03.03.2021

8 files changed, 35 insertions, 324 deletions

diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index bec63d69b08e..4d08aa71b1e8 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -1,13 +1,7 @@
-AUX pmacct-1.7.3-nDPI-3.0.patch 1157 BLAKE2B e7beb25fa1b239193d4c4deb7521b1b03051335901e61ee68b198e8ef73cefe193884111f605cbd38f444cb5380c28529a815b4b055fceac8e467da59ff9f2db SHA512 323012c63ed16ce3fe7a3684b84cc6fdcf9412fa9ce2cead2600459ee500ae60a0e5603805ef9c66b7d6e3f4b7d1b779b51b45494ce91e4798035956621eb8fe
 AUX pmacct-1.7.4--Werror.patch 327 BLAKE2B 1b77ca15ef64a48ca6b477be9f37fa7b88d79e7fedb47895648b6637e9af9e38c959b8838d28d1370dd11b4c722d2b18adabcdd72c8e074dbc10467b770ea6de SHA512 06e1cce962022e51c960881c6f169c91605c5ed597960085f38b5c9fffa4056813014c08070ba7f016cb0f6c449038df9666e5f0d7ab7879563d2dfdc53d2b0a
-AUX pmacct-1.7.4-nDPI-3.2.patch 1712 BLAKE2B 103650626f7e4cb8f7f76738c3b151f38c517d27ec0c5b4c1b2ab14f6a22fb20150b01c0bd171e99c70749d8cd62aa6f04cce229d3056e0382bedd6bd9e28b24 SHA512 3ed43f04bc7aa709390748c503f390f98a6b057825fc6d608730803ffd70e6a081c455085067507567b7f43f49c8e6ebc00d4762bc2aeee66a9784ebfdb80c80
 AUX pmacctd-conf.d 153 BLAKE2B 10329deaac64fb5e03bf673c806ad691fb00579d16c77b05aa73662b5e187a31c25da38afb3be853434900ad65103bef3b9d1d9c3b24e0f241a98e4c9b6696b8 SHA512 1637316833db6e2a7c2d531deb4d68d647948bc03da8aecf0c6a34dd2f0c58d58d8473270e6096cf232e98c07946bac265161d4a8577def6cb72a4e8c9778c31
 AUX pmacctd-init.d 834 BLAKE2B 15b66c0495690bd42069abed21962db93edc798650cd23944206eddebe1f4baa3086537620c58fa0e63f83336bf2956318eb5ac7521235555ce3f67b2d54eca8 SHA512 eb87cafae945c13a5eff12c1140e0943bed59d46ca91d46a9fe71e1269549064d04980b04ce78f6a87eeacb7253d1d59f32461ee68734e7cac6510d187fb7f3c
-DIST pmacct-1.7.4.tar.gz 1581213 BLAKE2B 3835abc91947af083932e01b828c2324f90595c973fdde9d9f4034dc7d03e12fad6bbe6e91e1462ec36963ccb41a5a740159f531d7e1929f4cd8d994b89a58a1 SHA512 780b6cc25562fb7b5a1f55b48ce9719b36c1ee0d9ee2b6db8d7f238cd5d9f204938313b13e3ff3f62c7b9b179279f18314eba38ad787ffc346a4b217da239ca1
-DIST pmacct-1.7.4_p1.tar.gz 3200089 BLAKE2B 638983a92df0a46441ddddaefa78dc0f61fee94264870979f46674e851e3bf111ae71550f7e6b677d425fa4c688d4ed7735d82aae85a2e77155c1bfa050d8e76 SHA512 03553128975ced54ce08a1a543c794377c2b7a3c800de600a7b5e8aa483b1c3123dee536a361a47053233d60070cacaf269f1a16ad17b563fa9fc0ec7af6a467
 DIST pmacct-1.7.5.tar.gz 3219384 BLAKE2B 9a9feb8a11222e54a018b37eaa387cfa43efcb6aa3da175ea6c367bc7b42d816cbe106431c8b8f69b17c8d0286514a80250bf28b15fcaad12a2ac5fb7af6ff27 SHA512 d52e3d749cf0e8a412a82051531c63f37aa6cf4e7cc435ebd185195040819d65dc2cf4d4b1aa64bae620a9f8d3d1b1a505992044fe45d57b91ba056cfa67609c
-EBUILD pmacct-1.7.4.ebuild 2236 BLAKE2B 3cde1024527435d97409cc455abc619398ff506f1a63f92fb6a467f92d3a408775ed9ffa67a86e5d17628cf7e763218cb2f075a0fd574b70b7ff83f48e618d8e SHA512 596821332b1ea6990945dfec619a29807a49434e9821e12472c6dd8d00638be374318956eb976478c7862b546a96e98c0f8e3ee16fcf89109f43449d6eb3427f
-EBUILD pmacct-1.7.4_p1.ebuild 2335 BLAKE2B 5b7c57caed2f2e96817f247a719e90f05bb3f30b715c053b07ddce3738f8e54ad35eb17edd94c385cc1dcb804dcce16c72282d70f572237f8e55cb06e70d827f SHA512 04c0c6fed8c5d81affd3eb3b65c3959934880cc38c5d5cbc67e269d399cea7a41da889d8e984630f2399138680a8bd4e885e716647097cfb06a8030f4364d2ac
-EBUILD pmacct-1.7.5.ebuild 2102 BLAKE2B 2c075143458f53bf9186e7ecf6b65e806f099a573e5d1a14ccd5a72224c8665ad0f1d25b4f343b0dcd56a0d32dab65bc0445b22c242740b8584d6608a0be5d6e SHA512 afc89ef6d76d06ce7da4634e39b2e62b3f1a574dc291803a13e5ed882168f5c680ab7cb69b5c6682dc2ca28f11d988f18e7cb1b0bf1468140698c5c503bce4a8
-EBUILD pmacct-999999.ebuild 2159 BLAKE2B 8896ff11b80d2ceb5256ca205557fd6471f007356218b8ea8f358617d61a61c61c1f5a8d42c23bff7c03e8ca2909420aaf1ab14abddc4cb07f1eb4b6cbffec04 SHA512 f6604dea81dead988131d69ce4118b1d305beb9fade5bd49da06e6c46e27b45a264e5c5bc41f98e7cb56fcb3bd5f0aac2e178ec8c89b2ccbce136e7c6cfa804d
-MISC metadata.xml 1424 BLAKE2B 75ce1e74993587289adbef0841807d758f0a587bc5b0429cb03a86be690d49479a2cf37211006ae905473528f3f4714ec2827e5bc556a4bcaf368215f97db7b8 SHA512 ddfd0eaac09d66640660baffe80ca83911000632416602eb258b2c01e630ada343ebeff7191c53fe71e4d5e658c94eac9a95bf4527a9ba40ee674ffa9442d856
+EBUILD pmacct-1.7.5.ebuild 2112 BLAKE2B 9cd161a5985445c2b4f80ea83f8d253f8768d05fc14ff43743d118fa36c3e63dabbdf210bdef15c6ad14d3f2affec424af861aaf8d20c0de160cdaed76330661 SHA512 7be7c18a3d7dd9949fbb82d3725e81302b5846176d5ad3b6e006e4d1cd3cc1b69eff51de7ddecee91285859d56f300e444bb8953a97ce0133efe2d88273ef751
+EBUILD pmacct-999999.ebuild 2073 BLAKE2B b9e1405cfb4694ef08bc16b477169345155ecc83fe18eebfc51c34eb4cb365d021aa306ab3ac75a6f998e38515988cc6da4b8b9c4128c45c640d86a0fd0b85ce SHA512 aad2e1e6cffc1fc28997fdf2dc7bed7ba4c40eb109417325244179e7e55a236e4ee33e6c8991697b0868a754ef3892cc0e3c715591dddcdcc241ea2bc10f9b32
+MISC metadata.xml 1293 BLAKE2B 102bb4be653f429b9b20ebe66e121ee1fa1f95e2133b81ee9b6741e9a3aaf7e2c2ce4862845c35ef2a1a9f83ad5112a914a0db4153e67ad61435ed6ce3a74125 SHA512 e68e3c42adfe2dc8287f5e06caa1e14fabcba7601605512024524e00c82a09100bd5af75a863fa7027508f792d0e446e66f27c19d1abd2ae0e14e8cecf201732
diff --git a/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch b/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch
deleted file mode 100644
index 9e6c618fe443..000000000000
--- a/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -955,6 +955,7 @@
-       CFLAGS="$_save_CFLAGS"
-     ])
-     PKG_CHECK_MODULES([NDPI26], [libndpi >= 2.6], [AC_DEFINE(WITH_NDPI26, 1)], [AC_DEFINE(WITH_NDPI, 1)])
-+    PKG_CHECK_MODULES([NDPI30], [libndpi >= 3.0], [AC_DEFINE(WITH_NDPI30, 1)], [AC_DEFINE(WITH_NDPI, 1)])
-     ;;
-   no)
-     AC_MSG_RESULT(no)
---- a/src/ndpi/ndpi.c
-+++ b/src/ndpi/ndpi.c
-@@ -374,10 +374,14 @@
-   if (flow->detection_completed || flow->tcp_finished) {
-     if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN)
- #ifdef WITH_NDPI26
-+#ifdef WITH_NDPI30
-+	  flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, 1, workflow->prefs.protocol_guess);
-+#else
-       flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, workflow->prefs.protocol_guess);
-+#endif /* WITH_NDPI30 */
- #else
-       flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow);
--#endif
-+#endif /* WITH_NDPI26 */
- 
-     if (workflow->prefs.protocol_guess) {
-       if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN && !flow->guess_completed) {
diff --git a/net-analyzer/pmacct/files/pmacct-1.7.4-nDPI-3.2.patch b/net-analyzer/pmacct/files/pmacct-1.7.4-nDPI-3.2.patch
deleted file mode 100644
index bcbdbc834cad..000000000000
--- a/net-analyzer/pmacct/files/pmacct-1.7.4-nDPI-3.2.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -900,7 +900,7 @@
-   [ case "$enableval" in
-   yes)
-     AC_MSG_RESULT(yes)
--    PKG_CHECK_MODULES([NDPI], [libndpi >= 2.4], [
-+    PKG_CHECK_MODULES([NDPI], [libndpi >= 3.2], [
-       SUPPORTS="${SUPPORTS} ndpi"
-       USING_NDPI="yes"
- 
---- a/src/ndpi/ndpi_util.c
-+++ b/src/ndpi/ndpi_util.c
-@@ -29,7 +29,8 @@
-     
-   NDPI_PROTOCOL_BITMASK all;
-     
--  struct ndpi_detection_module_struct *module = ndpi_init_detection_module();
-+  ndpi_init_prefs pm_ndpi_init_prefs = ndpi_no_prefs;
-+  struct ndpi_detection_module_struct *module = ndpi_init_detection_module(pm_ndpi_init_prefs);
-   struct pm_ndpi_workflow *workflow = ndpi_calloc(1, sizeof(struct pm_ndpi_workflow));
- 
-   log_notification_init(&log_notifications.ndpi_cache_full);
-@@ -77,6 +78,8 @@
-   NDPI_BITMASK_SET_ALL(all);
-   ndpi_set_protocol_detection_bitmask2(workflow->ndpi_struct, &all);
- 
-+  ndpi_finalize_initalization(workflow->ndpi_struct);
-+
-   return workflow;
- }
- 
---- a/src/ndpi/ndpi.c
-+++ b/src/ndpi/ndpi.c
-@@ -373,11 +373,7 @@
- 
-   if (flow->detection_completed || flow->tcp_finished) {
-     if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN)
--#ifdef WITH_NDPI26
--      flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, workflow->prefs.protocol_guess);
--#else
--      flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow);
--#endif
-+      flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, 1, workflow->prefs.protocol_guess);
- 
-     if (workflow->prefs.protocol_guess) {
-       if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN && !flow->guess_completed) {
diff --git a/net-analyzer/pmacct/metadata.xml b/net-analyzer/pmacct/metadata.xml
index a306c0fa5034..ee7d2e55c726 100644
--- a/net-analyzer/pmacct/metadata.xml
+++ b/net-analyzer/pmacct/metadata.xml
@@ -1,25 +1,23 @@
 <?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="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="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>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<use>
+		<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="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="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.4.ebuild b/net-analyzer/pmacct/pmacct-1.7.4.ebuild
deleted file mode 100644
index 99560fad9a73..000000000000
--- a/net-analyzer/pmacct/pmacct-1.7.4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools 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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="
-	64bit +bgp-bins +bmp-bins geoip geoipv2 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? ( dev-db/mysql-connector-c:0= )
-	ndpi? ( >=net-libs/nDPI-2.4:= )
-	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
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.3-nDPI-3.0.patch
-	"${FILESDIR}"/${PN}-1.7.4--Werror.patch
-)
-
-DOCS=(
-	CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE
-	docs/INTERNALS docs/PLUGINS docs/SIGNALS
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC AR RANLIB
-	append-cflags -fcommon
-
-	econf \
-		$(use_enable 64bit) \
-		$(use_enable bgp-bins) \
-		$(use_enable bmp-bins) \
-		$(use_enable geoip) \
-		$(use_enable geoipv2) \
-		$(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 st-bins) \
-		$(use_enable traffic-bins) \
-		$(use_enable zmq) \
-		--disable-debug
-}
-
-src_install() {
-	default
-
-	for dirname in examples sql telemetry; 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.7.4_p1.ebuild b/net-analyzer/pmacct/pmacct-1.7.4_p1.ebuild
deleted file mode 100644
index 29e47d7219dd..000000000000
--- a/net-analyzer/pmacct/pmacct-1.7.4_p1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="A network tool to gather IP traffic information"
-HOMEPAGE="http://www.pmacct.net/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="
-	64bit +bgp-bins +bmp-bins geoip geoipv2 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? ( dev-db/mysql-connector-c:0= )
-	ndpi? ( >=net-libs/nDPI-3.2:= )
-	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
-"
-PATCHES=(
-#	"${FILESDIR}"/${PN}-1.7.3-nDPI-3.0.patch
-	"${FILESDIR}"/${PN}-1.7.4--Werror.patch
-	"${FILESDIR}"/${PN}-1.7.4-nDPI-3.2.patch
-)
-
-DOCS=(
-	CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE
-	docs/INTERNALS docs/PLUGINS docs/SIGNALS
-)
-S=${WORKDIR}/${P/_}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC AR RANLIB
-	append-cflags -fcommon
-
-	econf \
-		$(use_enable 64bit) \
-		$(use_enable bgp-bins) \
-		$(use_enable bmp-bins) \
-		$(use_enable geoip) \
-		$(use_enable geoipv2) \
-		$(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 st-bins) \
-		$(use_enable traffic-bins) \
-		$(use_enable zmq) \
-		--disable-debug
-}
-
-src_install() {
-	default
-
-	for dirname in examples sql telemetry; 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.7.5.ebuild b/net-analyzer/pmacct/pmacct-1.7.5.ebuild
index b40dc62cab70..b6cef6d81f80 100644
--- a/net-analyzer/pmacct/pmacct-1.7.5.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.7.5.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="A network tool to gather IP traffic information"
@@ -35,8 +36,8 @@ RDEPEND="
 	sqlite? ( =dev-db/sqlite-3* )
 	zmq? ( >=net-libs/zeromq-4.2.0:= )
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 "
 PATCHES=(
diff --git a/net-analyzer/pmacct/pmacct-999999.ebuild b/net-analyzer/pmacct/pmacct-999999.ebuild
index 63073745a3d7..88a7b0b03c6c 100644
--- a/net-analyzer/pmacct/pmacct-999999.ebuild
+++ b/net-analyzer/pmacct/pmacct-999999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools flag-o-matic git-r3 toolchain-funcs
 
 DESCRIPTION="A network tool to gather IP traffic information"
@@ -12,8 +13,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE="
-	+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mongodb mysql
-	ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq
+	+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog plabel
+	postgres rabbitmq sqlite +st-bins +traffic-bins zmq
 "
 REQUIRED_USE="
 	?? ( geoip geoipv2 )
@@ -27,10 +28,6 @@ RDEPEND="
 	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? ( dev-db/mysql-connector-c:0= )
 	ndpi? ( >=net-libs/nDPI-3.2:= )
 	nflog? ( net-libs/libnetfilter_log )
@@ -39,8 +36,8 @@ RDEPEND="
 	sqlite? ( =dev-db/sqlite-3* )
 	zmq? ( >=net-libs/zeromq-4.2.0:= )
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 "
 
@@ -67,18 +64,18 @@ src_configure() {
 		$(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 plabel) \
 		$(use_enable postgres pgsql) \
 		$(use_enable rabbitmq) \
 		$(use_enable sqlite sqlite3) \
 		$(use_enable st-bins) \
 		$(use_enable traffic-bins) \
 		$(use_enable zmq) \
-		--disable-debug
+		--disable-debug \
+		--disable-mongodb
 }
 
 src_install() {