Add support for newer versions of dev-libs/mongo-c-driver (bug #518624).

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

4 files changed, 183 insertions, 10 deletions

diff --git a/net-analyzer/pmacct/ChangeLog b/net-analyzer/pmacct/ChangeLog
index 21fe8f59f88c..f1d63a950dcf 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.95 2014/07/16 16:40:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.96 2014/08/05 16:36:59 jer Exp $
+
+  05 Aug 2014; Jeroen Roovers <jer@gentoo.org> pmacct-1.5.0_rc3.ebuild,
+  +files/pmacct-1.5.0_rc3-mongodb.patch:
+  Add support for newer versions of dev-libs/mongo-c-driver (bug #518624).
 
   16 Jul 2014; Jeroen Roovers <jer@gentoo.org> -pmacct-1.5.0_rc2.ebuild,
   metadata.xml:
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index 03a0c7cd7d23..4bb2d777f6f5 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -2,6 +2,7 @@
 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.1.tar.gz 704707 SHA256 048f5747c2caa1085f1cd9442668b9edc98a40688b7696d1ad6f1e16c5a6d206 SHA512 0c13a2a2faab0fda1ba3b9218ea1f5d33de2581abb16916fa95ad80a05758e65b9bd2c19fa54bf1f59e62f8c769c9b0dedcbc505bcc4eb8fc79df12806b013a2 WHIRLPOOL 04d1816c924841f1008f58b6828f7128bdb42b2cca3750dc1b2342386ea125ebb8fadb923ff6eeee6367359742a96a97ff36d69b17439defe523081b1b1bede3
@@ -9,13 +10,13 @@ DIST pmacct-0.14.3.tar.gz 746387 SHA256 c3197dcb21b131da82eaaecc9dccbff894c35bf1
 DIST pmacct-1.5.0rc3.tar.gz 815267 SHA256 4c5030789fcee66c8f51c6b17520c3ab526c9fa06d123cce32648001b44b5154 SHA512 419123369c0dbadee30941ecc8187d6acac17cb76ac24202f5ac98cc88b2e628e52614a0740c4338ef13441932aabc656d5a753722ed7b2de9decb93dec8ccd1 WHIRLPOOL fdf76134dd2df97a775ff8896c63c9e48bd0ef9c3d8bf1947ea298588b3460f4f12f74673b4f48a9ba41fb3b9d4f893129fa854845a23715e32a691865cede32
 EBUILD pmacct-0.14.1.ebuild 1493 SHA256 12c884ca19fbdfe058bc0e35c72c8a6fa03b88ba51a0e8cdb60ccb204784a717 SHA512 a4971c592d3e3dfcb194587f184ea09fa59acdef162f030b6ca321c8aa5fd2718017153f07fa5bf095211280135959d1c147d53ced8350f44bd87c4ae8b3ca1d WHIRLPOOL c2651531456780ac061aa20fedcd943ff3017a6e71c29b5782f2262d66c98d69b3433538f97d35daea45eac3cfa4311b65d66d5bb56752ae690cc6a11d0d7a1a
 EBUILD pmacct-0.14.3.ebuild 1614 SHA256 be3fcb8b861e617698cf2f1c80f28f2f9f166beeee78ee6c90e7b06a6df3398d SHA512 f35afd806a16404eb92b596cb92e38d5564d29a3824d5aaf9c8ebbe16ac00aaae097abdf98fd0623c8a06c889942b2f6caa052bac6e5c4e48953c6358aa6e3b3 WHIRLPOOL 520975df331f1ecfb541b76ee6ee448c36b4a317561c0d2c31255f9567792035d53a0648697d096aa09d3a0b4855811809249488f4b4f5027929246394995c5a
-EBUILD pmacct-1.5.0_rc3.ebuild 1554 SHA256 5aa4c169d853cc5af4e303ece8c9b9dd4b2e151fa2854c5efd4ee4419562ca00 SHA512 cb43f885c48b6250d324e60055fd2ad1e61e1c9b6cb2cc0bf08c8834f3e483ff10b7f16ad7fb6c09e11c4ac87a8e106652fbabc07ed63008d66ef8b4d02d07e4 WHIRLPOOL 81c1ca67d9ad428cd798606daca828b8246b59cfd6eb307c448ddd59f2175aba2e4a550238f0fa753bdb29dd660de529bfc1a39ccd2d2241a20c65f166a34206
-MISC ChangeLog 14545 SHA256 79787977b0660c941482f9fbd6f83e005b153ba42a784d666417dc25bdb9a944 SHA512 16bcc2f2fb2aa52bb08c59c0a10a67eac34992c116aeb669c0918ab3bbfeac6ef1f8356c0da99eedf633467bf306e0f1527b8b141a57940464a353ad19348e31 WHIRLPOOL 4a238aafa8f50a6c6d2325c6e71a8672bed83049883540ba93d05f23bed5b81045e27741ed12e594c5c0bd25b5a6f0de75e7e9a76b5b98eb029ab48339b1c530
+EBUILD pmacct-1.5.0_rc3.ebuild 1590 SHA256 9b1a65b6656be80977a9de20a35a1f6859d714cb47d8045064981cf358e15c15 SHA512 cafe1f116c0e9a8ce17855866f6d9ea08a4ae924fba3b027ed1a1827d8c65ae639f806a058d573254fed30fa701a491a98ac456799e8aa2fc8cb092cf1562a24 WHIRLPOOL 7408951e8086a1b922ce8152e450fd45219803702441a4ec0707b46635d3f277bf5ae303a8168d6024d633b83fc165c3bb04dd3fa12b7a1a94e0e83ff0fdd37a
+MISC ChangeLog 14734 SHA256 ac8246d55d63270bcdfd146710eb5b149fe044d689f7846deb38af940b1a50ff SHA512 c527f3ebf8d6fb691f53f66e70902f53353050bd176464826193e4a88952094aefe6fc72f0b79ed93b1ed1f57f979568b66d92b1a4fb90ee39ab9f8601ccc359 WHIRLPOOL e0a65e71ceec13707060cb0e00e14afd27b7c0c098751f7f58bcb013901586676c333c085993a8a61d42673fada20852d780386b801385e3b62fe0f548faaafe
 MISC metadata.xml 344 SHA256 ab05358e894fdcd0097c6bd624c60563971ae87d45b754fc0fb6fae11d94894d SHA512 6af1ba602f90ef8e71e9730d8b4712866b872a7c415ccf0916587a671433f2f3b0d50d76544269b1ed7d753f259e7ca9a076280ebc5771780c2eb8615daade5b WHIRLPOOL 0e69d437de7e1af36b18fe47fdfabc40bc3c4214ed23c16e0b88554be0cb18faea36c1d303f5aa5a566d76d5c99f0bb94774b4214132c9f318b87a2084b99aa1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPGqv0ACgkQVWmRsqeSphMLDgCfWB8yFzNSwtvW4noS331O/F2o
-hzMAnR7DBqNcq3RRexNSXrxjCPbtYb7V
-=JVKb
+iEYEAREIAAYFAlPhCCwACgkQVWmRsqeSphOh/ACfWs1l9fbhtukNdUXjElWaplqM
+3bgAni1DyE2IAoK333FgRm4q9AFKRgAH
+=khfp
 -----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
new file mode 100644
index 000000000000..7b85bd863f19
--- /dev/null
+++ b/net-analyzer/pmacct/files/pmacct-1.5.0_rc3-mongodb.patch
@@ -0,0 +1,166 @@
+--- 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_rc3.ebuild
index 9abd904656bf..30ca12af5600 100644
--- a/net-analyzer/pmacct/pmacct-1.5.0_rc3.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.5.0_rc3.ebuild
@@ -1,9 +1,9 @@
 # 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_rc3.ebuild,v 1.1 2014/05/13 15:00:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-1.5.0_rc3.ebuild,v 1.2 2014/08/05 16:36:59 jer Exp $
 
 EAPI=5
-inherit eutils toolchain-funcs
+inherit autotools eutils toolchain-funcs
 
 DESCRIPTION="A network tool to gather IP traffic information"
 HOMEPAGE="http://www.pmacct.net/"
@@ -32,7 +32,8 @@ DOCS=(
 )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.12.0-gentoo.patch
+	epatch "${FILESDIR}"/${P}-mongodb.patch
+	eautoreconf
 }
 
 src_configure() {
@@ -48,7 +49,8 @@ src_configure() {
 		$(use_enable postgres pgsql) \
 		$(use_enable sqlite sqlite3) \
 		$(use_enable threads) \
-		$(use_enable ulog)
+		$(use_enable ulog) \
+		--disable-debug
 }
 
 src_install() {