[gentoo-commits] dev/ultrabug:master commit in: dev-db/mongodb/files/, dev-db/mongodb/

["Alexys Jacob" <ultrabug@gentoo.org>]

commit:     04b5936cf10223a7e7add4a97423ec0d37abfd8e
Author:     Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  8 17:39:22 2011 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Apr  8 17:39:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=04b5936c

mongodb work in progress

---
 dev-db/mongodb/Manifest                          |    8 +++++-
 dev-db/mongodb/files/mongodb-1.8-fix-scons.patch |   23 ++++++++++++++++-----
 dev-db/mongodb/mongodb-1.8.1.ebuild              |   11 ++++++++-
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index c40ae28..8d0d3b2 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,5 +1,9 @@
-AUX mongodb-1.8-fix-scons.patch 1599 RMD160 de9ced190d9e1581dd06a5f120a805e894075b83 SHA1 2bc5ffd701503cf1abaf007085f536d1c9d83185 SHA256 731f63484aa5e81e70faf4cd2b3bcacf67ddaf65c05e3e0584809b075999d82b
+AUX mongodb-1.8-fix-scons.patch 2000 RMD160 0728a6d2e50b3756f7d0c4c75cdd256467d20a34 SHA1 087ff1065360a63ee21ed52d1b8f78b88c8fb359 SHA256 bb7d569d43bc2aee1f51bd0082e5ff68e6da89debf0ffd8c15d992094fb6320b
+AUX mongodb-1.8-fix-scons.patch.ultrabug 1599 RMD160 de9ced190d9e1581dd06a5f120a805e894075b83 SHA1 2bc5ffd701503cf1abaf007085f536d1c9d83185 SHA256 731f63484aa5e81e70faf4cd2b3bcacf67ddaf65c05e3e0584809b075999d82b
 AUX mongodb.confd 285 RMD160 cc5e3ab24a9880a19392a7416d23d1ae7a328e11 SHA1 7c4b720ea5b0afd2fa88a6adc2d8a2e356691413 SHA256 8dfedbb433e11f8ed6ec8159ed5c02f94c22f86006cda21f0b2bb59ebe50b2ad
 AUX mongodb.initd 1129 RMD160 92a89d9d71ffcdaba8f86f1a2902abddc9866147 SHA1 2c83bfe4c5728ffc8b3dc37fd8d345d09c13f6b0 SHA256 c318a8ca1fe83c59df759b2c70e0e0c22fe38cae49de6dbd1afa8399ef626e6a
 DIST mongodb-src-r1.8.1.tar.gz 1718969 RMD160 e8739fd15c40eac9934045af4365c13f204d16fe SHA1 615cfe4ace4899e73a7083059c7178d8f5c19f03 SHA256 8b268b4f8c4d055c74add1fc995f103d893657c4291964d370899ebefd0bc97d
-EBUILD mongodb-1.8.1.ebuild 1812 RMD160 80b475453be9a13413f4a2da8081adef7ed8fc0a SHA1 7124877abafc70eb7659a913508727a3713b9990 SHA256 97ebc14d66b1d3d41bebe35f3baa4e97aa61c25527a4cc8276636dd550d9c6c7
+EBUILD mongodb-1.8.1.ebuild 2082 RMD160 1ce22cdfb7c236ff356d302d6b3e4e8d336d43a8 SHA1 5b8cb8c80833b710626fd0ae41c04265066faefb SHA256 1465baaef0f28b23a8acccee79247f51333f6f9fa7174d9f7b0396c83640f980
+MISC johan-fixes.patch 5859 RMD160 1abbc357419b44d6dec3dab6165aa96d9c425081 SHA1 bac0e8da059f93ebcbeef7a3c109d61eb1f8375a SHA256 7e051265cf978eafc76359d9ad6cbb3e5c4998b16383936971a9d8425c0f38fa
+MISC johan-fixes.patch.orig 5898 RMD160 6499a6181059d619e2f2e5c1cb5969bc7cd21cda SHA1 32984512cd6a1c5f2b630051dc83b6727caae2a1 SHA256 13a9525c9e13fd6405d6bc86605ad9a48ca8e983da9ef3c94917108125e3c810
+MISC johan-fixes.patch.rej 1599 RMD160 de9ced190d9e1581dd06a5f120a805e894075b83 SHA1 2bc5ffd701503cf1abaf007085f536d1c9d83185 SHA256 731f63484aa5e81e70faf4cd2b3bcacf67ddaf65c05e3e0584809b075999d82b

diff --git a/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch b/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
index 305d113..7652f56 100644
--- a/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
+++ b/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
@@ -1,6 +1,8 @@
---- a/SConstruct	2011-04-05 09:24:54.828004785 +0200
-+++ b/SConstruct	2011-04-08 09:56:19.401717001 +0200
-@@ -670,9 +670,7 @@
+diff --git a/SConstruct b/SConstruct
+index 41383b1..3752c4a 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -670,11 +670,10 @@ if nix:
          
      env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
      # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
@@ -9,9 +11,18 @@
 -        env.Append( CPPFLAGS=" -fno-builtin-memcmp " ) # glibc's memcmp is faster than gcc's
 +    env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
      env.Append( CXXFLAGS=" -Wnon-virtual-dtor " )
-     env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )
+-    env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )
++    env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic " )
++    env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
      env.Append( LIBS=[] )
-@@ -687,13 +685,6 @@
+ 
+     #make scons colorgcc friendly
+@@ -683,17 +682,11 @@ if nix:
+ 
+     if linux and has_option( "sharedclient" ):
+         env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " )
++        env.Append( SHLINKFLAGS=" -Wl,-soname=libmongoclient.so " )
+ 
      if debugBuild:
          env.Append( CPPFLAGS=" -O0 -fstack-protector " );
          env['ENV']['GLIBCXX_FORCE_NEW'] = 1; # play nice with valgrind
@@ -25,7 +36,7 @@
  
      if debugLogging:
          env.Append( CPPFLAGS=" -D_DEBUG" );
-@@ -911,8 +902,9 @@
+@@ -911,8 +904,9 @@ def doConfigure( myenv , needPcre=True , shell=False ):
                  
          myCheckLib( J , True )
          mozHeader = "js"

diff --git a/dev-db/mongodb/mongodb-1.8.1.ebuild b/dev-db/mongodb/mongodb-1.8.1.ebuild
index 483edf4..0af2443 100644
--- a/dev-db/mongodb/mongodb-1.8.1.ebuild
+++ b/dev-db/mongodb/mongodb-1.8.1.ebuild
@@ -16,9 +16,10 @@ SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz"
 LICENSE="AGPL-3 Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="v8"
+IUSE="pcap static-libs v8"
 
-RDEPEND="!v8? ( dev-lang/spidermonkey )
+RDEPEND="pcap? ( net-libs/libpcap )
+	!v8? ( dev-lang/spidermonkey )
 	v8? ( dev-lang/v8 )
 	dev-libs/boost
 	dev-libs/libpcre"
@@ -34,6 +35,7 @@ pkg_setup() {
 	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
 
 	scons_opts="${MAKEOPTS}"
+	use static-libs || scons_opts+=" --sharedclient"
 	if use v8; then
 		scons_opts+=" --usev8"
 	else
@@ -44,6 +46,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.8-fix-scons.patch"
 	if use v8; then
+		# TODO: is this still true ?
 		# Suppress known test failure with v8:
 		# http://jira.mongodb.org/browse/SERVER-1147
 		sed -i -e '/add< NumberLong >/d' dbtests/jstests.cpp || die
@@ -57,6 +60,10 @@ src_compile() {
 src_install() {
 	scons ${scons_opts} --full --nostrip install --prefix="${D}"/usr || die "Install failed"
 
+	# TODO: check for other possible .a files ?
+	use static-libs || rm ${D}/usr/*/libmongoclient.a
+
+	# TODO: wouldn't we prefer keepdir for this ?
 	for x in /var/{lib,log,run}/${PN}; do
 		dodir "${x}" || die "Install failed"
 		fowners mongodb:mongodb "${x}"