commit: e9501f518b53a502a1c2546651f827e76e319152 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Feb 28 15:33:13 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Feb 28 18:08:16 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9501f51
net-analyzer/pmacct: Sync live ebuild w/ 1.7.5 dropping IUSE=mongodb 1.7.5 version bump was not synced up to 9999, commit e675b02c Fix EAPI-7 bump by using BDEPEND Fix metadata.xml indentation Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> net-analyzer/pmacct/metadata.xml | 39 ++++++++++++++++---------------- net-analyzer/pmacct/pmacct-1.7.5.ebuild | 7 +++--- net-analyzer/pmacct/pmacct-999999.ebuild | 21 ++++++++--------- 3 files changed, 32 insertions(+), 35 deletions(-) diff --git a/net-analyzer/pmacct/metadata.xml b/net-analyzer/pmacct/metadata.xml index 79a9a515b96..ee7d2e55c72 100644 --- a/net-analyzer/pmacct/metadata.xml +++ b/net-analyzer/pmacct/metadata.xml @@ -1,24 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<maintainer type="project"> -<email>[email protected]</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="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>[email protected]</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.5.ebuild b/net-analyzer/pmacct/pmacct-1.7.5.ebuild index b40dc62cab7..b6cef6d81f8 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 63073745a3d..88a7b0b03c6 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() {
