summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-analyzer/pmacct/ChangeLog6
-rw-r--r--net-analyzer/pmacct/metadata.xml7
-rw-r--r--net-analyzer/pmacct/pmacct-1.5.0_rc2.ebuild70
3 files changed, 8 insertions, 75 deletions
diff --git a/net-analyzer/pmacct/ChangeLog b/net-analyzer/pmacct/ChangeLog
index 40bfdf5d6dfa..21fe8f59f88c 100644
--- a/net-analyzer/pmacct/ChangeLog
+++ b/net-analyzer/pmacct/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/pmacct
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.94 2014/05/13 15:00:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.95 2014/07/16 16:40:28 jer Exp $
+
+ 16 Jul 2014; Jeroen Roovers <jer@gentoo.org> -pmacct-1.5.0_rc2.ebuild,
+ metadata.xml:
+ Remove short <longdescription>.
*pmacct-1.5.0_rc3 (13 May 2014)
diff --git a/net-analyzer/pmacct/metadata.xml b/net-analyzer/pmacct/metadata.xml
index aa97dae02372..12a9db305535 100644
--- a/net-analyzer/pmacct/metadata.xml
+++ b/net-analyzer/pmacct/metadata.xml
@@ -2,10 +2,9 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>netmon</herd>
-<longdescription>A network tool to gather IP traffic information</longdescription>
<use>
- <flag name='64bit'>Use 64bit counters instead of 32bit ones</flag>
- <flag name='mongodb'>Add support for mongodb backend</flag>
- <flag name='ulog'>Enable ULOG support</flag>
+<flag name='64bit'>Use 64bit counters instead of 32bit ones</flag>
+<flag name='mongodb'>Add support for mongodb backend</flag>
+<flag name='ulog'>Enable ULOG support</flag>
</use>
</pkgmetadata>
diff --git a/net-analyzer/pmacct/pmacct-1.5.0_rc2.ebuild b/net-analyzer/pmacct/pmacct-1.5.0_rc2.ebuild
deleted file mode 100644
index 51c51a8acebb..000000000000
--- a/net-analyzer/pmacct/pmacct-1.5.0_rc2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-1.5.0_rc2.ebuild,v 1.2 2014/04/05 00:21:48 jer Exp $
-
-EAPI=5
-inherit eutils 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=""
-IUSE="64bit debug geoip ipv6 mongodb mysql postgres sqlite threads ulog"
-
-DEPEND="
- net-libs/libpcap
- geoip? ( dev-libs/geoip )
- mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 )
- mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql-base )
- sqlite? ( =dev-db/sqlite-3* )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P/_/}"
-
-DOCS=(
- CONFIG-KEYS ChangeLog FAQS KNOWN-BUGS QUICKSTART README TODO TOOLS UPGRADE
- docs/INTERNALS docs/PLUGINS docs/SIGNALS
-)
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.12.0-gentoo.patch
- sed -i \
- -e '/[[:space:]]ar /s|ar |$(AR) |g' \
- $(find . -name Makefile.in) || die
-}
-
-src_configure() {
- tc-export CC AR RANLIB
-
- econf \
- $(use_enable 64bit) \
- $(use_enable debug) \
- $(use_enable geoip) \
- $(use_enable ipv6) \
- $(use_enable mongodb) \
- $(use_enable mysql) \
- $(use_enable postgres pgsql) \
- $(use_enable sqlite sqlite3) \
- $(use_enable threads) \
- $(use_enable ulog)
-}
-
-src_install() {
- default
-
- for dirname in examples sql; 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
-}