From 4a05a3663271b873d3e66e36a89cb5a882ce1ec0 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Thu, 2 Jan 2020 11:05:47 +0100 Subject: net-analyzer/pmacct: Fix net-libs/nDPI dependency Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Jeroen Roovers --- net-analyzer/pmacct/pmacct-1.7.3-r1.ebuild | 100 ----------------------------- net-analyzer/pmacct/pmacct-1.7.3-r2.ebuild | 100 +++++++++++++++++++++++++++++ net-analyzer/pmacct/pmacct-999999.ebuild | 4 +- 3 files changed, 102 insertions(+), 102 deletions(-) delete mode 100644 net-analyzer/pmacct/pmacct-1.7.3-r1.ebuild create mode 100644 net-analyzer/pmacct/pmacct-1.7.3-r2.ebuild diff --git a/net-analyzer/pmacct/pmacct-1.7.3-r1.ebuild b/net-analyzer/pmacct/pmacct-1.7.3-r1.ebuild deleted file mode 100644 index 33e50e3e8313..000000000000 --- a/net-analyzer/pmacct/pmacct-1.7.3-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2019 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 - =net-libs/zeromq-4.2.0:= ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${PN}-1.7.3-nDPI-3.0.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-cppflags -DMYSQL_SERVER_VERSION=99999999 - - 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.3-r2.ebuild b/net-analyzer/pmacct/pmacct-1.7.3-r2.ebuild new file mode 100644 index 000000000000..29e8537602fb --- /dev/null +++ b/net-analyzer/pmacct/pmacct-1.7.3-r2.ebuild @@ -0,0 +1,100 @@ +# 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 + =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 +) + +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-cppflags -DMYSQL_SERVER_VERSION=99999999 + + 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-999999.ebuild b/net-analyzer/pmacct/pmacct-999999.ebuild index 02039602f301..36566e6c719e 100644 --- a/net-analyzer/pmacct/pmacct-999999.ebuild +++ b/net-analyzer/pmacct/pmacct-999999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -32,7 +32,7 @@ RDEPEND=" =net-libs/nDPI-2.4:= ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) -- cgit v1.2.3-18-g5258