Config file location fix for #354649

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

diff --git a/net-analyzer/pmacct/ChangeLog b/net-analyzer/pmacct/ChangeLog
index 2fe5b95db45a4074f885fd6715c616ef066bf269..94c8fae4a2b24111a59bb45c3b674c3188fe823e 100644 (file)
--- a/net-analyzer/pmacct/ChangeLog
+++ b/net-analyzer/pmacct/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/pmacct
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.73 2010/12/29 16:57:29 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.74 2011/07/30 21:07:54 patrick Exp $
+
+*pmacct-0.12.5-r1 (30 Jul 2011)
+
+  30 Jul 2011; Patrick Lauer <patrick@gentoo.org> +pmacct-0.12.5-r1.ebuild:
+  Config file location fix for #354649
 
 *pmacct-0.12.5 (29 Dec 2010)
 

diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index 127a93ba363ce8aa3551f1723be0f53717a7eccd..74b0c6351c60ea7dd98219fee6de105a42eaada8 100644 (file)
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -7,6 +7,7 @@ DIST pmacct-0.12.3.tar.gz 542529 RMD160 c52e2abf4fd825ac125e8fdcac75ecb668836840
 DIST pmacct-0.12.5.tar.gz 552007 RMD160 de505ff82158fa56ebdc2a7f485814a0680b3d0c SHA1 efbabc0ae624f1b5c1229c0ded26b9bd5debc5cd SHA256 5252d7df24e9baefcc5a36ed66e9cac5ae505c9d502c8cffb96e6808acbb2fe8
 EBUILD pmacct-0.12.2.ebuild 1596 RMD160 0c0acdf6de43ec8c63120b4b8ca90d3fe7036183 SHA1 7687d838083106266a86e95068e81595c58f00ea SHA256 0f6bd528a084115ab60fe7c4b92b8efcf65143423e6205643a2e65903bda658a
 EBUILD pmacct-0.12.3.ebuild 1596 RMD160 4633bcb797646c3119da59e6edfb887e74dac943 SHA1 b30b30206117847cc22e91e1328a2d09a49e2809 SHA256 27a575420a68c3ff45b265d338fcf5bd66b6293f5ed787e1f8de30325fba984a
+EBUILD pmacct-0.12.5-r1.ebuild 1691 RMD160 0f195d126982d596c9487790ebafcf9c7002c66f SHA1 205e9f2da6ec02efe98030f431d9f779dd67a4a7 SHA256 ac8370186eb8b0fb2dc73cc37d0ba45ba933112b872fc6f2f069ad53f295dfdf
 EBUILD pmacct-0.12.5.ebuild 1647 RMD160 e6496644cadea4fea2350b4daa35195538643edf SHA1 768d5f1efbd1164cff52bcbd8a5fd9315c026e20 SHA256 a8f92bbe425a2f480a3065b6801aa1112e77bb778031d32a7d478189ad3c89c5
-MISC ChangeLog 11632 RMD160 8e27b1313b473406cc6193ccc6b9f69fd1306a28 SHA1 2607f7977638ca64cd69de6ceb065e12c7b68ee5 SHA256 99e848960884eb1fb2f483a1bc905cdc39ba2ce992d57ee5c718d4d539ddb02b
+MISC ChangeLog 11785 RMD160 2df344ac6cc4d288456caefbfc3ba4e0bac9e0b2 SHA1 c71de26207d14462480952c7dd3e0e06af2de5f3 SHA256 6668afbff0e962c58804bbf8550f6a1c77de8bda57b69cf49917436c82f5b8ca
 MISC metadata.xml 371 RMD160 e4cc8890693c53d4a20615455dc35173906be14b SHA1 afc98635ba56ebd01607028feb938a805d77139d SHA256 2cc1ad160ce6d50f18af1a3cad6fbaa13ad54455c8d5641667fb7f08c4e9e2ae

diff --git a/net-analyzer/pmacct/pmacct-0.12.5-r1.ebuild b/net-analyzer/pmacct/pmacct-0.12.5-r1.ebuild
new file mode 100644 (file)
index 0000000..1ad5110
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-0.12.5-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.12.5-r1.ebuild,v 1.1 2011/07/30 21:07:54 patrick Exp $
+
+EAPI="2"
+
+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="~amd64 ~ppc ~x86"
+IUSE="64bit debug ipv6 mysql postgres sqlite threads ulog"
+
+RDEPEND="net-libs/libpcap
+       mysql? ( virtual/mysql )
+       postgres? ( dev-db/postgresql-base )
+       sqlite? ( =dev-db/sqlite-3* )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+       epatch \
+               "${FILESDIR}"/${PN}-0.12.0-gentoo.patch \
+               "${FILESDIR}"/${PN}-0.12.5-sin6_addr.patch
+}
+
+src_configure() {
+       tc-export CC
+       econf \
+               $(use_enable 64bit) \
+               $(use_enable debug) \
+               $(use_enable ipv6) \
+               $(use_enable mysql) \
+               $(use_enable postgres pgsql) \
+               $(use_enable sqlite sqlite3) \
+               $(use_enable threads) \
+               $(use_enable ulog) \
+               || die "econf failed"
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die "make install failed"
+       dodoc ChangeLog CONFIG-KEYS EXAMPLES FAQS KNOWN-BUGS README UPGRADE \
+               docs/SIGNALS docs/PLUGINS docs/INTERNALS TODO TOOLS \
+               || die "dodoc failed"
+
+       for dirname in examples sql; do
+               docinto ${dirname}
+               dodoc ${dirname}/* || die "dodoc ${dirname} failed"
+       done
+
+       newinitd "${FILESDIR}"/pmacctd-init.d pmacctd || die "newinitd failed"
+       newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd || die "newconfd failed"
+
+       mkdir -p "${D}"/etc/pmacctd
+       insinto /etc/pmacctd
+       newins "${S}/examples/pmacctd-imt.conf.example" pmacctd.conf || \
+               die "newins failed"
+}