Add dev-libs/geoip dependency (bug #499924 by Michael Rowell).

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 15 insertions, 79 deletions

diff --git a/net-analyzer/pmacct/ChangeLog b/net-analyzer/pmacct/ChangeLog
index 56762ad70e97..ae8d0629f7b1 100644
--- a/net-analyzer/pmacct/ChangeLog
+++ b/net-analyzer/pmacct/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/pmacct
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.90 2013/05/09 03:03:11 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.91 2014/02/01 11:50:27 jer Exp $
+
+  01 Feb 2014; Jeroen Roovers <jer@gentoo.org> -pmacct-0.14.2.ebuild,
+  pmacct-0.14.3.ebuild:
+  Add dev-libs/geoip dependency (bug #499924 by Michael Rowell).
 
 *pmacct-0.14.3 (09 May 2013)
 
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index 5e37c03e24a6..23a297e529bb 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -5,17 +5,15 @@ AUX pmacct-0.12.0-gentoo.patch 780 SHA256 a0f2205b7106cf813cfdb0106e2e3db5e28bfb
 AUX pmacctd-conf.d 266 SHA256 341dee2b5e870747a39b8639efec2d8e37133251be0f6a5243629b6440991f34 SHA512 1553599d1658a32b32144b5cb4fcd889dc45e7aa78e36f39a76aa742990f0776d9468259841be68bec0a4081293abd6367de94bddfcd88689b0c686e64d629f4 WHIRLPOOL 9fb669f9246443822b4ff1f9b0516f0abb75657d804208c4e710beba1f80506511682c0030fbd002c88e41e61bfd927c6843e9ccb72aa70aed49f1cc6d6ccd03
 AUX pmacctd-init.d 945 SHA256 51ae7ca155ac340a496b0f301e946a25684987d6dc69e1c38cdd7ca9ae3a2747 SHA512 5f5bc336d668b6c615a13cbdb8ea7bce3744cc060b5475183dc5a87ebf417a64807e6bee5a98eaedc1b4af18c144bcc7b978c83e677bd0330adad3bde3e5bc72 WHIRLPOOL 9b194853e5d446a846531cc27daaf3ca81dd8149f483fe8c6b13a6d54341fb936565f878fa58ebaa9b1f56d6aa83efd9f5a0068a517299310ececbe86ec23644
 DIST pmacct-0.14.1.tar.gz 704707 SHA256 048f5747c2caa1085f1cd9442668b9edc98a40688b7696d1ad6f1e16c5a6d206 SHA512 0c13a2a2faab0fda1ba3b9218ea1f5d33de2581abb16916fa95ad80a05758e65b9bd2c19fa54bf1f59e62f8c769c9b0dedcbc505bcc4eb8fc79df12806b013a2 WHIRLPOOL 04d1816c924841f1008f58b6828f7128bdb42b2cca3750dc1b2342386ea125ebb8fadb923ff6eeee6367359742a96a97ff36d69b17439defe523081b1b1bede3
-DIST pmacct-0.14.2.tar.gz 721749 SHA256 ce6f877c78cbb27aa40e8284d33d962980b40a8c442e58656ffee34ef53d2830 SHA512 4b9046b49040d702ca3c0913715e417ebb18097f8ecd71a820ef00344abb426c904bb41fd5c58f3d590c0f074a5a3ef8d18a73bce996784a049718ba3569be62 WHIRLPOOL 2d55c90d6fbb5aa85f98d29bd5c9541f8119ac15f306f21c2a3614a13c80c15ad84079c5a2ba85b8b477c4b1483b9db269964a8e1d4107425f54d040b13ba809
 DIST pmacct-0.14.3.tar.gz 746387 SHA256 c3197dcb21b131da82eaaecc9dccbff894c35bf1cb74214e93ae1e7c1bdef50e SHA512 310cee3f74d41befd74f981aff6c1a33a2db14c7010e8d1283374d8f6be49fb825a768f992c7b24acca74710413148fd61006ae7e87ad566b7193d575fa6df36 WHIRLPOOL bd7b8560ed5e30ff6342920ec04cca1795bf675dc90db7abf31c8d105f733109950ca28ac9c57d80cb2b6aef24f3db6259a71b170a032b1a77cdb98f5b7bcbe9
 EBUILD pmacct-0.14.1.ebuild 1493 SHA256 12c884ca19fbdfe058bc0e35c72c8a6fa03b88ba51a0e8cdb60ccb204784a717 SHA512 a4971c592d3e3dfcb194587f184ea09fa59acdef162f030b6ca321c8aa5fd2718017153f07fa5bf095211280135959d1c147d53ced8350f44bd87c4ae8b3ca1d WHIRLPOOL c2651531456780ac061aa20fedcd943ff3017a6e71c29b5782f2262d66c98d69b3433538f97d35daea45eac3cfa4311b65d66d5bb56752ae690cc6a11d0d7a1a
-EBUILD pmacct-0.14.2.ebuild 1587 SHA256 8427c5c377011091365636860269918d7845b3c1bbf198ff6edcb90c47e6c4b6 SHA512 f1c29a3a100928330e2897f89dbbc3ceb6a8b85e54e4aebd42da7ac58c265f7fc9c0f88154fc26ed146be7073a6382dd324baff74ea7f0767350cd9a97ead7f4 WHIRLPOOL 269e348228812624668b7a11e9419b114464015d640aae662f6dfa9dd4977b8b48f800a4a2de8cd6a905d0fc4c05b73064163125adcb6dc8676729e12f3cbfad
-EBUILD pmacct-0.14.3.ebuild 1587 SHA256 8b409791d57d9f87a197fb230b30fb2aa66ae1037114712328b008e980cc7923 SHA512 bd3b0b241993bfc2c55222e0cc7523414bd14529e589d9e5eeeed8a382d9943a6da7f427827039e7418c50051a624b10dcdc7fe2428cca39e2ca15bf51533932 WHIRLPOOL 871dfa6e8e6380c090d3f1571ebfe658c467c1bc638aca871c02de2e0dbb8e552d8cba203534c96afbe50a48293c6246ff8bcd4ec350d776df0ce961b9957b13
-MISC ChangeLog 13745 SHA256 3058cd80267f755663987c0d5a17eb31106473046be43c7e6d29f61609acfe95 SHA512 4fa0ab6fca3b5ac891c2ae35de2371b563f74ce82ab5a6d922cb5f6665c5fd9bac632371cfcc7f269e43e5a294a7eb7070ff5f45b5f3204b64dabcb6f810b160 WHIRLPOOL f39a2278379f0811b77864b406bfd1cb1a41f1f6415e50775e826b3b8120dcec603c244773100a187a552085436c1b72f531fbc156ed33708d11e9c395b676cc
+EBUILD pmacct-0.14.3.ebuild 1614 SHA256 be3fcb8b861e617698cf2f1c80f28f2f9f166beeee78ee6c90e7b06a6df3398d SHA512 f35afd806a16404eb92b596cb92e38d5564d29a3824d5aaf9c8ebbe16ac00aaae097abdf98fd0623c8a06c889942b2f6caa052bac6e5c4e48953c6358aa6e3b3 WHIRLPOOL 520975df331f1ecfb541b76ee6ee448c36b4a317561c0d2c31255f9567792035d53a0648697d096aa09d3a0b4855811809249488f4b4f5027929246394995c5a
+MISC ChangeLog 13905 SHA256 6aa0c45cc4aa618a36cb68664dc4dec011f5606f0a482f3e99ed7657f14a6196 SHA512 6627d57808591ead158c30b1624d6fb6c5f09ad355ee7bee386d59ae84835b8d04a6c9dad78bb7d86ad1c5c31ab495712effc1bcd51507df675db23aa81c215b WHIRLPOOL 04f8c0a3f5f67bb76d675dfebfd29849d1a6fd4dc29330121404bf7b3d27cc0ece635cb875f23b76f70c175fd85fdf4568d0278d4fc609008fe471a778493cd4
 MISC metadata.xml 433 SHA256 42f615a346f1e581d638fea1db16046521e62c83e9fa7ca57ee2d24b35ab00f8 SHA512 936d0b3b087416cbb91b28946d9e587171a85a5e046c6150b4b82e8481edb2f610984a894661f54703d2f872054525db258f3906121ec5623ec0254499421891 WHIRLPOOL 3d3f3ccbf9c806c5125a86bcf332d75d3bf27c091581c90cb2aca5b45d5d9b61ad48cc75be80ec48f27c87c5685a4cd0618d1446fc82898ef17cb0278eba40b2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlGLEfAACgkQVWmRsqeSphOoFgCeLo/CQIhH+gQB/eBzPliD6c0f
-c2kAnAqsjQUy6tGSTcULn5vaC5n9a+xC
-=05PM
+iEYEAREIAAYFAlLs34QACgkQVWmRsqeSphNKjQCfXHJs7s0xSXMy87Etw+Fcbmyk
+ISAAnjo7V601U2XdzlurBkX4T2blSme+
+=EKFz
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/pmacct/pmacct-0.14.2.ebuild b/net-analyzer/pmacct/pmacct-0.14.2.ebuild
deleted file mode 100644
index dd6be981f4ff..000000000000
--- a/net-analyzer/pmacct/pmacct-0.14.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.14.2.ebuild,v 1.3 2013/02/03 19:32:38 ago Exp $
-
-EAPI=4
-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 geoip ipv6 mongodb mysql postgres sqlite threads ulog"
-
-DEPEND="
-	net-libs/libpcap
-	mongodb? ( dev-libs/mongo-c-driver )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( =dev-db/sqlite-3* )
-"
-RDEPEND="${DEPEND}"
-
-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 ${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-0.14.3.ebuild b/net-analyzer/pmacct/pmacct-0.14.3.ebuild
index e463d3f664c6..e6e1dfeb3382 100644
--- a/net-analyzer/pmacct/pmacct-0.14.3.ebuild
+++ b/net-analyzer/pmacct/pmacct-0.14.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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-0.14.3.ebuild,v 1.1 2013/05/09 03:03:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.14.3.ebuild,v 1.2 2014/02/01 11:50:27 jer Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs
@@ -16,6 +16,7 @@ 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 )
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql-base )