Fix spidermonkey dependency wrt #376983 (thanks to Ian Stakenvicius). Version bump. Drop old 1.6 series. Add Johan Bergström as proxy maintainer. Init scripts handle baselayout-1 and openrc correctly + better bind_ip setup.

(Portage version: 2.1.10.9/cvs/Linux x86_64)

5 files changed, 28 insertions, 45 deletions

diff --git a/dev-db/mongodb/files/mongodb-1.6-fix-scons.patch b/dev-db/mongodb/files/mongodb-1.6-fix-scons.patch
deleted file mode 100644
index 64d562256272..000000000000
--- a/dev-db/mongodb/files/mongodb-1.6-fix-scons.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/SConstruct	2011-04-13 19:09:56.774788380 +0200
-+++ b/SConstruct	2011-04-13 19:15:50.874924566 +0200
-@@ -744,21 +744,20 @@
-     print( "No special config for [" + os.sys.platform + "] which probably means it won't work" )
- 
- if nix:
--    env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
--    if linux:
--        env.Append( CPPFLAGS=" -Werror " )
-+    env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
-     env.Append( CXXFLAGS=" -Wnon-virtual-dtor " )
-+    env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
-+    env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
-     env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )
-     env.Append( LIBS=[] )
- 
-     if linux and GetOption( "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
--    else:
--        env.Append( CPPFLAGS=" -O3" )
- 
-     if debugLogging:
-         env.Append( CPPFLAGS=" -D_DEBUG" );
-@@ -972,8 +971,8 @@
-                 
-         myCheckLib( J , True )
-         mozHeader = "js"
--        if bigLibString(myenv).find( "mozjs" ) >= 0:
--            mozHeader = "mozjs"
-+        env.Append( CPPPATH=["/usr/include/nspr"] )
-+        env.Append( CPPDEFINES=[ "XULRUNNER" ] )
- 
-         if not conf.CheckHeader( mozHeader + "/jsapi.h" ):
-             if conf.CheckHeader( "jsapi.h" ):
diff --git a/dev-db/mongodb/files/mongodb.confd b/dev-db/mongodb/files/mongodb.confd
index 9b3a43835271..4f76c5a79f9f 100644
--- a/dev-db/mongodb/files/mongodb.confd
+++ b/dev-db/mongodb/files/mongodb.confd
@@ -4,7 +4,10 @@ MONGODB_RUN="/var/run/mongodb"
 MONGODB_DATA="/var/lib/mongodb"
 MONGODB_USER="mongodb"
 
+# Listen to specified IP, comment this to listen to all
 MONGODB_IP="127.0.0.1"
+
+# Listen to specified port
 MONGODB_PORT="27017"
 
 # Set extra options here, such as disabling the admin web server
diff --git a/dev-db/mongodb/files/mongodb.initd b/dev-db/mongodb/files/mongodb.initd
index ac1bc31930ca..b4f05de52259 100644
--- a/dev-db/mongodb/files/mongodb.initd
+++ b/dev-db/mongodb/files/mongodb.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mongodb.initd,v 1.3 2011/04/13 14:56:32 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mongodb.initd,v 1.4 2011/08/26 12:38:49 ultrabug Exp $
 
 depend() {
 	need net
@@ -11,13 +11,21 @@ start() {
 	mkdir -p ${MONGODB_RUN:-/var/run/mongodb}
 	chown ${MONGODB_USER:-mongodb}: ${MONGODB_RUN:-/var/run/mongodb}
 
+	# Listen to MONGODB_IP if configured
+	[ -z "${MONGODB_IP}" ] || MONGODB_OPTIONS="--bind_ip ${MONGODB_IP} ${MONGODB_OPTIONS}"
+
+	# Baselayout-1 user should use --chuid instead of --user
+	local USEROPT="--user"
+	if [ ! -f /etc/init.d/sysfs ]; then
+		USEROPT="--chuid"
+	fi
+
 	ebegin "Starting ${SVCNAME}"
 	start-stop-daemon --background --start --make-pidfile \
 		--pidfile ${MONGODB_RUN:-/var/run/mongodb}/${SVCNAME}.pid \
-		--chuid ${MONGODB_USER:-mongodb} \
+		${USEROPT} ${MONGODB_USER:-mongodb} \
 		--exec ${MONGODB_EXEC:-/usr/bin/mongod} \
 		-- \
-		--bind_ip ${MONGODB_IP:-127.0.0.1} \
 		--port ${MONGODB_PORT:-27017} \
 		--dbpath ${MONGODB_DATA:-/var/lib/mongodb} \
 		--unixSocketPrefix ${MONGODB_RUN:-/var/run/mongodb} \
diff --git a/dev-db/mongodb/files/mongos.confd b/dev-db/mongodb/files/mongos.confd
index 8ac0ebcd655b..644cd0a2522d 100644
--- a/dev-db/mongodb/files/mongos.confd
+++ b/dev-db/mongodb/files/mongos.confd
@@ -3,7 +3,10 @@ MONGOS_EXEC="/usr/bin/mongos"
 MONGOS_RUN="/var/run/mongodb"
 MONGOS_USER="mongodb"
 
+# Listen to specified IP, comment this to listen to all
 MONGOS_IP="127.0.0.1"
+
+# Listen to specified port
 MONGOS_PORT="27018"
 
 # 1 to 3 comma separated config servers (mandatory)
diff --git a/dev-db/mongodb/files/mongos.initd b/dev-db/mongodb/files/mongos.initd
index 9279c4fc9993..8a73340909f2 100644
--- a/dev-db/mongodb/files/mongos.initd
+++ b/dev-db/mongodb/files/mongos.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mongos.initd,v 1.1 2011/04/13 14:56:32 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mongos.initd,v 1.2 2011/08/26 12:38:49 ultrabug Exp $
 
 depend() {
 	need net
@@ -21,13 +21,21 @@ start() {
 	mkdir -p ${MONGOS_RUN:-/var/run/mongodb}
 	chown ${MONGOS_USER:-mongodb}: ${MONGOS_RUN:-/var/run/mongodb}
 
+	# Listen to MONGOS_IP if configured
+	[ -z "${MONGOS_IP}" ] || MONGOS_OPTIONS="--bind_ip ${MONGOS_IP} ${MONGOS_OPTIONS}"
+
+	# Baselayout-1 user should use --chuid instead of --user
+	local USEROPT="--user"
+	if [ ! -f /etc/init.d/sysfs ]; then
+		USEROPT="--chuid"
+	fi
+
 	ebegin "Starting ${SVCNAME}"
 	start-stop-daemon --background --start --make-pidfile \
 		--pidfile ${MONGOS_RUN:-/var/run/mongodb}/${SVCNAME}.pid \
-		--chuid ${MONGOS_USER:-mongodb} \
+		${USEROPT} ${MONGOS_USER:-mongodb} \
 		--exec ${MONGOS_EXEC:-/usr/bin/mongos} \
 		-- \
-		--bind_ip ${MONGOS_IP:-127.0.0.1} \
 		--port ${MONGOS_PORT:-27018} \
 		--unixSocketPrefix ${MONGOS_RUN:-/var/run/mongodb} \
 		--logappend --logpath /var/log/mongodb/${SVCNAME}.log \