Version bump (bug #536576).

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

4 files changed, 18 insertions, 184 deletions

diff --git a/net-analyzer/pmacct/ChangeLog b/net-analyzer/pmacct/ChangeLog
index 84c38d83cfab..3811dd67084f 100644
--- a/net-analyzer/pmacct/ChangeLog
+++ b/net-analyzer/pmacct/ChangeLog
@@ -1,6 +1,12 @@
 # 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.103 2014/12/28 16:11:25 titanofold Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.104 2015/01/14 14:27:31 jer Exp $
+
+*pmacct-1.5.0 (14 Jan 2015)
+
+  14 Jan 2015; Jeroen Roovers <jer@gentoo.org> -pmacct-1.5.0_rc3.ebuild,
+  +pmacct-1.5.0.ebuild, -files/pmacct-1.5.0_rc3-mongodb.patch:
+  Version bump (bug #536576).
 
   28 Dec 2014; Aaron W. Swenson <titanofold@gentoo.org> pmacct-0.14.3.ebuild,
   pmacct-1.5.0_rc3.ebuild:
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index ad929908739c..b8aaf7ef0c8c 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -2,19 +2,18 @@
 Hash: SHA256
 
 AUX pmacct-0.12.0-gentoo.patch 708 SHA256 5d839947dc966b62d2eed3d1d22b242ca643e98b3dffd1b7149ea5381f06bfba SHA512 895e2327ad4e78956d67097631934dbe288e66725f1da162ba107c287f5933db0647a4efb9c1a6a0c0175f3f8b430f70a226b0822767370524bda3cc128012f6 WHIRLPOOL 37376e18b52cf5eba30b902c9007833f5446f8bfac2b451aae8c721e6fb6ddacc4ab9989c6893e7628a02a63612c837fbf4c1df24d82af360332a195ae2220db
-AUX pmacct-1.5.0_rc3-mongodb.patch 5219 SHA256 53f04a82d6398789f960536c680a0e0c39b58e0bac3daf976d717cce3aa574c5 SHA512 294b3ea8c0d76d3063f1eb5755996b879b5bbde6f744de2277355eac61f1e26bfd4ee6f1cf54f3ed4ed7dd334f103de5a57434dae9cf7dd625826661e9a41fd8 WHIRLPOOL e82d1e661f380445f39858ed6176e715293ca3f4a5ea46f4895e96480ae79edd1550bd7d138d02f8401dbc06d258c36e1a703b1295fa3b3528ddca3af864cfa9
 AUX pmacctd-conf.d 266 SHA256 341dee2b5e870747a39b8639efec2d8e37133251be0f6a5243629b6440991f34 SHA512 1553599d1658a32b32144b5cb4fcd889dc45e7aa78e36f39a76aa742990f0776d9468259841be68bec0a4081293abd6367de94bddfcd88689b0c686e64d629f4 WHIRLPOOL 9fb669f9246443822b4ff1f9b0516f0abb75657d804208c4e710beba1f80506511682c0030fbd002c88e41e61bfd927c6843e9ccb72aa70aed49f1cc6d6ccd03
 AUX pmacctd-init.d 932 SHA256 26f1000944d8b1382006a386941c4f3f5ebbbe4fa9e27fcff8d188a79a84a987 SHA512 3bff8513f2e1a2a54b0883848e3671874974681468d6cab934d708f3693eb2414bcaf9e0b4fe59dee23895b0e14b6e56a84976e62ae9293da9e77377b53b04d8 WHIRLPOOL 979362b87b9b693fb43979cc3e1eea910e56afabb7e08a2c713c1435b5f96d30e2c9ee7237f91f7b4bd7ad6961af48a120312b6fca4ba8a38d1155c4639c8b07
 DIST pmacct-0.14.3.tar.gz 746387 SHA256 c3197dcb21b131da82eaaecc9dccbff894c35bf1cb74214e93ae1e7c1bdef50e SHA512 310cee3f74d41befd74f981aff6c1a33a2db14c7010e8d1283374d8f6be49fb825a768f992c7b24acca74710413148fd61006ae7e87ad566b7193d575fa6df36 WHIRLPOOL bd7b8560ed5e30ff6342920ec04cca1795bf675dc90db7abf31c8d105f733109950ca28ac9c57d80cb2b6aef24f3db6259a71b170a032b1a77cdb98f5b7bcbe9
-DIST pmacct-1.5.0rc3.tar.gz 815267 SHA256 4c5030789fcee66c8f51c6b17520c3ab526c9fa06d123cce32648001b44b5154 SHA512 419123369c0dbadee30941ecc8187d6acac17cb76ac24202f5ac98cc88b2e628e52614a0740c4338ef13441932aabc656d5a753722ed7b2de9decb93dec8ccd1 WHIRLPOOL fdf76134dd2df97a775ff8896c63c9e48bd0ef9c3d8bf1947ea298588b3460f4f12f74673b4f48a9ba41fb3b9d4f893129fa854845a23715e32a691865cede32
+DIST pmacct-1.5.0.tar.gz 843881 SHA256 28edc18aec67c2157c599dcf095dd9f26a4c06ca4dfe7da79390011b3fd432fc SHA512 e1ff47f6a987e76c5e5ac92896f9dac3722c681a5a85835dbf8bffba68dc5794c63f06c9576d1b8f667fb4fe2f9b17d8e0dd1d3a4a96673c43378d2aba3329a1 WHIRLPOOL e886a73e732b7e63f5453710913372dfab671d33bbbc85dc4f10daab89173cdf5579ddfd2ad4019855d67705b52bafd1b31d1e2d14da34dfc00877db444e1419
 EBUILD pmacct-0.14.3.ebuild 1613 SHA256 c1f3c71024dfe8c09b6011d8a5022700ec72be81943ff0b46f65f140aa6aa777 SHA512 c47af3ed3870f404deae8208eb4918b2544f87bb2d6066298097fd5f7234e48be04bbffccd45759192ddeea17b8071294e426e69205f0421589f343088609e2f WHIRLPOOL e80c62da1231e372afe2790b2b0971f824d5909901fd14ccf373402a26f2debebf1a73164b53ad3b8b8808a2d8803adfd3e50d9f65100ab164464aa5f375f07e
-EBUILD pmacct-1.5.0_rc3.ebuild 1615 SHA256 9b3acd955a6d98f1da517080e0a90d2024925104d41a43e8536b77b370d30f35 SHA512 e1321f030eb57be4a1c62ce29aaf1b05bdff2cfc6b0acc2eab3add7bf6d2a8f7a11953efc3a4c3d5a4b6905e7baa0be025a5a944ab03112824fc26158feaa0cb WHIRLPOOL c7cfbb7871545c2b1509c829f87021bfefadb3711ec337b36ec703bd7b8fed7449c8f28680580f13cbf4c8a4ada23fe1593d007b7e5a18b259353f23fc003de3
-MISC ChangeLog 15578 SHA256 ced8d44d9c63fe8d047600dbba494ebe5f674c725a4e64486db6a6e125f34ae5 SHA512 e1490dfef02590eda986cb61908e22f1070c718adfbb907012f68ab83fd811dcf732ca28cbe7f264107da9fc08fd12363e15df2c668eee46b15008239c714aa7 WHIRLPOOL 311827620b4fb62308f98953fde905465ebf0af515fd92cd07f1b8b8b4e793185cc2bdd1d36539c614d91b84f7f383cd5aebdd2377f89bd51b7db34e3909aa61
+EBUILD pmacct-1.5.0.ebuild 1530 SHA256 ae4ccecb9039e5fe259bd331f83fa4bf4f2b3ee801cba07b7d4326bcbc9eecf4 SHA512 6415131a2e161a28988553487f40ae1e35cd9122ff58fa4e798df4fbdeb62432e1ba0f38071f60dc34e1c2bb307939ff6f306a5eacf4398f745d0c793f8ff8e2 WHIRLPOOL 73e176623a04d045e8c42cdf1c03b201298d9f8985427b78ed73865d073a436aca90814efacb0883fc4d005c22982754f5fd23edea61f1b2ebaabfbc2786793e
+MISC ChangeLog 15767 SHA256 a025da5e8c57d91cfa4183215e29dec351bb42b70de24c2b246beceaeef4b2b3 SHA512 8ec491edd11800d1fa34949c959250c4c865b69d970c581eee488736ee87e5f30c03d56d7aab5dfda0ee7627b5751cb21ad06e5b6224e8804cf6b9a0c6d3da4b WHIRLPOOL fa12017fadf5ddde58e00d307fa8841224452fec897ebf6f5af1b1e3018407f7e6fb133589a59a8609410d528486464f0805e7e70aff452d5b2e3d628a4aff1e
 MISC metadata.xml 344 SHA256 ab05358e894fdcd0097c6bd624c60563971ae87d45b754fc0fb6fae11d94894d SHA512 6af1ba602f90ef8e71e9730d8b4712866b872a7c415ccf0916587a671433f2f3b0d50d76544269b1ed7d753f259e7ca9a076280ebc5771780c2eb8615daade5b WHIRLPOOL 0e69d437de7e1af36b18fe47fdfabc40bc3c4214ed23c16e0b88554be0cb18faea36c1d303f5aa5a566d76d5c99f0bb94774b4214132c9f318b87a2084b99aa1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSgK68ACgkQVxOqA9G7/aDjiwD8Dae1R0y4qIb5wx7bCalloyPf
-Ruva2dM/wPmvSN7aAF8A/3uRP7Lo4WdZ6UlmHTJgbRo+vYHAxziTFFmh+c2+e823
-=ROHq
+iEYEAREIAAYFAlS2fNQACgkQVWmRsqeSphMAgQCfY5cVC8FgucAHfun47gIj1Awe
+M4wAn1armGY4KwfLT/bIeAMWfhxbuMyu
+=xq8x
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/pmacct/files/pmacct-1.5.0_rc3-mongodb.patch b/net-analyzer/pmacct/files/pmacct-1.5.0_rc3-mongodb.patch
deleted file mode 100644
index 7b85bd863f19..000000000000
--- a/net-analyzer/pmacct/files/pmacct-1.5.0_rc3-mongodb.patch
+++ /dev/null
@@ -1,166 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -68,36 +68,6 @@
-         AC_MSG_RESULT(no)
- )
- 
--dnl: shared object handling
--AC_MSG_CHECKING([whether to disable shared objects])
--AC_ARG_ENABLE(so,
--        [  --disable-so                     Disable shared objects (default: no)],
--        if test x$enableval = x"yes" ; then
--          AC_MSG_RESULT(no)
--          AC_CHECK_FUNC(dlopen, [ USING_DLOPEN="yes" ], [])
--          AC_CHECK_LIB(dl, dlopen,
--                [ USING_DLOPEN="yes"
--                  LIBS="${LIBS} -ldl" ],
--                  [])
--          if test x"$USING_DLOPEN" != x"yes"; then
--                AC_MSG_ERROR(Unable to find dlopen(). Try with --disable-so)
--          fi
--        else
--          AC_MSG_RESULT(yes)
--        fi
--        ,
--        AC_MSG_RESULT(no)
--        AC_CHECK_FUNC(dlopen, [ USING_DLOPEN="yes" ], [])
--        AC_CHECK_LIB(dl, dlopen,
--                [ USING_DLOPEN="yes"
--                  LIBS="${LIBS} -ldl" ],
--                  [])
--        if test x"$USING_DLOPEN" != x"yes"; then
--                AC_MSG_ERROR(Unable to find dlopen(). Try with --disable-so)
--        fi
--)
--dnl finish: shared object handling
--
- dnl os specific flags
- case "$host_os" in
-   OSF*)
-@@ -736,106 +706,31 @@
- dnl finish: pgsql handling
- 
- dnl start: mongodb handling
-+
-+AC_PROG_CC_C99
-+PKG_PROG_PKG_CONFIG
-+
- AC_MSG_CHECKING(whether to enable MongoDB support)
- AC_ARG_ENABLE(mongodb,
--  [  --enable-mongodb                 Enable MongoDB support (default: no)],
--  [ case "$enableval" in
--  yes)
-+  [  --enable-mongodb                 Enable MongoDB support (default: no)],[
-     AC_MSG_RESULT(yes)
--dnl USING_SQL="yes"
--
--    AC_ARG_WITH(mongodb-libs,
--      [  --with-mongodb-libs=DIR          Search for MongoDB libs in the specified directory],
--      [
--	AC_LINEARIZE_PATH($withval, withval=$absdir)
--	LIBS="${LIBS} -L$withval"
--	MONGODBLIB=$withval
--	MONGODBLIBFOUND=1
--      ]) 
--
--    if test x"$MONGODBLIB" != x""; then
--      AC_MSG_CHECKING(your own MongoDB library)
--      if test -r $MONGODBLIB/libmongoc.a -o -r $MONGODBLIB/libmongoc.so; then
--        AC_MSG_RESULT(ok)
--      else
--        AC_MSG_RESULT(no)
--	AC_MSG_ERROR(ERROR: missing MongoDB library in $MONGODBLIB)
--      fi
--    fi
- 
--    if test x"$MONGODBLIBFOUND" = x""; then
--      AC_MSG_CHECKING([default locations for libmongoc])
--      if test -r /usr/lib/libmongoc.a -o -r /usr/lib/libmongoc.so; then
--	AC_MSG_RESULT([found in /usr/lib])
--	MONGODBLIBFOUND=1
--      elif test -r /usr/lib64/libmongoc.a -o -r /usr/lib64/libmongoc.so; then
--        LIBS="${LIBS} -L/usr/lib64"
--        AC_MSG_RESULT([found in /usr/lib64])
--        MONGODBLIBFOUND=1
--      elif test -r /usr/local/lib/libmongoc.a -o -r /usr/local/lib/libmongoc.so; then
--	LIBS="${LIBS} -L/usr/local/lib"
--	AC_MSG_RESULT([found in /usr/local/lib])
--	MONGODBLIBFOUND=1
--      else 
--        AC_MSG_RESULT([not found])
--      fi
--    fi
--
--    if test x"$MONGODBLIBFOUND" = x""; then
--      AC_CHECK_LIB([mongoc], [mongo_connect], [], [AC_MSG_ERROR([
--        ERROR: missing MongoDB library. Refer to: http://api.mongodb.org/c/
--      ])])
--    else 
--      LIBS="${LIBS} -lmongoc"
--    fi 
--
--    AC_ARG_WITH(mongodb-includes,
--      [  --with-mongodb-includes=DIR      Search for MongoDB includes in the specified directory],
--      [
--	AC_LINEARIZE_PATH($withval, withval=$absdir)
--	INCLUDES="${INCLUDES} -I$withval"
--	MONGODBINCLUDES=$withval
--	MONGODBINCLUDESFOUND=1
--      ])
--
--    if test x"$MONGODBINCLUDES" != x""; then
--      AC_MSG_CHECKING(your own MongoDB headers)
--      if test -r $MONGODBINCLUDES/mongo.h; then
--        AC_MSG_RESULT(ok)
--      else
--	AC_MSG_RESULT(no)
--	AC_MSG_ERROR(ERROR: missing MongoDB headers in $MONGODBINCLUDES)
--      fi
--    fi
--
--    if test x"$MONGODBINCLUDESFOUND" = x""; then 
--      AC_MSG_CHECKING([default locations for mongo.h])
--      if test -r /usr/include/mongo.h; then
--	AC_MSG_RESULT([found in /usr/include])
--	MONGODBINCLUDESFOUND=1;
--      elif test -r /usr/local/include/mongo.h; then
--	INCLUDES="${INCLUDES} -I/usr/local/include"
--	AC_MSG_RESULT([found in /usr/local/include])
--	MONGODBINCLUDESFOUND=1;
--      fi
--      if test x"$MONGODBINCLUDESFOUND" = x""; then
--	AC_MSG_RESULT([not found])
--      fi
--    fi
--
--    if test x"$MONGODBINCLUDESFOUND" = x""; then
--      AC_CHECK_HEADER([mongo.h],,
--      [AC_MSG_ERROR(ERROR: missing MongoDB headers)])      
--    fi
-+    PKG_CHECK_MODULES(mongo, libmongoc-1.0,[
-+      INCLUDES="$INCLUDES $mongo_CFLAGS"
-+      LIBS="$LIBS $mongo_LIBS"
-+      ],
-+        AC_CHECK_HEADERS([mongo.h],[],AC_MSG_ERROR([missing MongoDB headers]))
-+		AC_CHECK_LIB(dl, dlopen,[],AC_MSG_ERROR([Unable to find dlopen()]))
-+        AC_CHECK_LIB([mongoc],[mongo_connect],[
-+          AC_DEFINE(WITH_MONGODB, 1)
-+          PLUGINS="${PLUGINS} mongodb_plugin.c"
-+          LIBS="$LIBS -lmongoc"
-+          ],
-+        AC_MSG_ERROR([ERROR: missing MongoDB library. Refer to: http://api.mongodb.org/c/])
-+        )
-+    )]
-+)
- 
--    AC_DEFINE(WITH_MONGODB, 1)
--    PLUGINS="${PLUGINS} mongodb_plugin.c"
--    ;;
--  no)
--    AC_MSG_RESULT(no)
--    ;;
--  esac ],
--AC_MSG_RESULT(no))
- dnl finish: mongodb handling
- 
- AC_MSG_CHECKING(whether to enable SQLite3 support)
diff --git a/net-analyzer/pmacct/pmacct-1.5.0_rc3.ebuild b/net-analyzer/pmacct/pmacct-1.5.0.ebuild
index 439a73e94640..529f20ff3cae 100644
--- a/net-analyzer/pmacct/pmacct-1.5.0_rc3.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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_rc3.ebuild,v 1.5 2014/12/28 16:11:25 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-1.5.0.ebuild,v 1.1 2015/01/14 14:27:31 jer Exp $
 
 EAPI=5
-inherit autotools eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A network tool to gather IP traffic information"
 HOMEPAGE="http://www.pmacct.net/"
@@ -11,7 +11,7 @@ SRC_URI="http://www.pmacct.net/${P/_}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="64bit debug geoip ipv6 mongodb mysql postgres sqlite threads ulog"
 
 RDEPEND="
@@ -34,11 +34,6 @@ DOCS=(
 	docs/INTERNALS docs/PLUGINS docs/SIGNALS
 )
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-mongodb.patch
-	eautoreconf
-}
-
 src_configure() {
 	tc-export CC AR RANLIB