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)

11 files changed, 54 insertions, 218 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index e589a634fe24..e1e7aebb1884 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-db/mongodb
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.20 2011/07/29 15:35:14 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.21 2011/08/26 12:38:49 ultrabug Exp $
+
+*mongodb-1.8.3 (26 Aug 2011)
+
+  26 Aug 2011; Ultrabug <ultrabug@gentoo.org> -mongodb-1.6.5-r1.ebuild,
+  -files/mongodb-1.6-fix-scons.patch, -mongodb-1.8.2_rc3.ebuild,
+  -mongodb-1.8.2.ebuild, mongodb-1.8.2-r1.ebuild, +mongodb-1.8.3.ebuild,
+  files/mongodb.confd, files/mongodb.initd, files/mongos.confd,
+  files/mongos.initd, metadata.xml:
+  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.
 
 *mongodb-1.8.2-r1 (29 Jul 2011)
 
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 \
diff --git a/dev-db/mongodb/metadata.xml b/dev-db/mongodb/metadata.xml
index 497509baa6c9..a81de2908ef1 100644
--- a/dev-db/mongodb/metadata.xml
+++ b/dev-db/mongodb/metadata.xml
@@ -3,13 +3,18 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>ramereth@gentoo.org</email>
-		<name>Lance Albertson</name>
-	</maintainer>
-	<maintainer>
 		<email>ultrabug@gentoo.org</email>
 		<name>Alexys Jacob</name>
 	</maintainer>
+	<maintainer>
+		<email>bugs@bergstroem.nu</email>
+		<name>Johan Bergström</name>
+		<description>Proxy Maintainer. CC on bugs</description>
+	</maintainer>
+	<maintainer>
+		<email>ramereth@gentoo.org</email>
+		<name>Lance Albertson</name>
+	</maintainer>
 	<longdescription lang="en">
 	MongoDB (from "humongous") is a scalable, high-performance, open source,
 	schema-free, document-oriented database. Written in C++, MongoDB features:
diff --git a/dev-db/mongodb/mongodb-1.6.5-r1.ebuild b/dev-db/mongodb/mongodb-1.6.5-r1.ebuild
deleted file mode 100644
index 0150f0bdf754..000000000000
--- a/dev-db/mongodb/mongodb-1.6.5-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.6.5-r1.ebuild,v 1.2 2011/06/22 05:26:54 nirbheek Exp $
-
-EAPI=4
-SCONS_MIN_VERSION="1.2.0"
-
-inherit eutils multilib scons-utils versionator
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="http://www.mongodb.org"
-SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs v8"
-
-RDEPEND="!v8? ( >=dev-lang/spidermonkey-1.8 )
-	v8? ( dev-lang/v8 )
-	dev-libs/boost
-	dev-libs/libpcre[cxx]
-	net-libs/libpcap"
-DEPEND="${RDEPEND}
-	sys-libs/readline
-	sys-libs/ncurses"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup mongodb
-	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-	scons_opts=" --cxx=$(tc-getCXX) --sharedclient"
-	if use v8; then
-		scons_opts+=" --usev8"
-	else
-		scons_opts+=" --usesm"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.6-fix-scons.patch"
-}
-
-src_compile() {
-	escons ${scons_opts} all
-}
-
-src_install() {
-	escons ${scons_opts} --full --nostrip install --prefix="${D}"/usr
-
-	use static-libs || rm "${D}/usr/$(get_libdir)/libmongoclient.a"
-
-	for x in /var/{lib,log,run}/${PN}; do
-		keepdir "${x}"
-		fowners mongodb:mongodb "${x}"
-	done
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	# Remove unsupported options
-	sed -i -e '/--unixSocketPrefix/d' "${D}/etc/init.d/${PN}"
-	sed -i -e 's/--journal//g' "${D}/etc/conf.d/${PN}"
-}
-
-src_test() {
-	escons ${scons_opts} smoke --smokedbprefix='testdir' test
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} < 1.6 ]]; then
-		ewarn "You just upgraded from a previous version of mongodb !"
-		ewarn "Make sure you run 'mongod --upgrade' before using this version."
-	fi
-}
diff --git a/dev-db/mongodb/mongodb-1.8.2-r1.ebuild b/dev-db/mongodb/mongodb-1.8.2-r1.ebuild
index 36cfe0e18817..52e7f3c08a9d 100644
--- a/dev-db/mongodb/mongodb-1.8.2-r1.ebuild
+++ b/dev-db/mongodb/mongodb-1.8.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.8.2-r1.ebuild,v 1.1 2011/07/29 15:35:14 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.8.2-r1.ebuild,v 1.2 2011/08/26 12:38:49 ultrabug Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="static-libs v8"
 
-RDEPEND="!v8? ( >=dev-lang/spidermonkey-1.8 )
+RDEPEND="!v8? ( =dev-lang/spidermonkey-1.8.2* )
 	v8? ( dev-lang/v8 )
 	dev-libs/boost
 	dev-libs/libpcre[cxx]
diff --git a/dev-db/mongodb/mongodb-1.8.2_rc3.ebuild b/dev-db/mongodb/mongodb-1.8.2_rc3.ebuild
deleted file mode 100644
index a36a4a6eec75..000000000000
--- a/dev-db/mongodb/mongodb-1.8.2_rc3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.8.2_rc3.ebuild,v 1.2 2011/06/22 05:26:54 nirbheek Exp $
-
-EAPI=4
-SCONS_MIN_VERSION="1.2.0"
-
-inherit eutils multilib scons-utils versionator
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="http://www.mongodb.org"
-SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs v8"
-
-RDEPEND="!v8? ( >=dev-lang/spidermonkey-1.8 )
-	v8? ( dev-lang/v8 )
-	dev-libs/boost
-	dev-libs/libpcre[cxx]
-	net-libs/libpcap"
-DEPEND="${RDEPEND}
-	sys-libs/readline
-	sys-libs/ncurses"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup mongodb
-	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-	scons_opts=" --cxx=$(tc-getCXX) --sharedclient"
-	if use v8; then
-		scons_opts+=" --usev8"
-	else
-		scons_opts+=" --usesm"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.8-fix-scons.patch"
-}
-
-src_compile() {
-	escons ${scons_opts} all
-}
-
-src_install() {
-	escons ${scons_opts} --full --nostrip install --prefix="${D}"/usr
-
-	use static-libs || rm "${D}/usr/$(get_libdir)/libmongoclient.a"
-
-	for x in /var/{lib,log,run}/${PN}; do
-		keepdir "${x}"
-		fowners mongodb:mongodb "${x}"
-	done
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN/db/s}.initd" ${PN/db/s}
-	newconfd "${FILESDIR}/${PN/db/s}.confd" ${PN/db/s}
-}
-
-src_test() {
-	escons ${scons_opts} test
-	"${S}"/test --dbpath=unittest || die
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} < 1.8 ]]; then
-		ewarn "You just upgraded from a previous version of mongodb !"
-		ewarn "Make sure you run 'mongod --upgrade' before using this version."
-	fi
-	elog "Journaling is now enabled by default, see /etc/conf.d/${PN}.conf"
-}
diff --git a/dev-db/mongodb/mongodb-1.8.2.ebuild b/dev-db/mongodb/mongodb-1.8.3.ebuild
index e9aa96a7ceef..fb0be9613f00 100644
--- a/dev-db/mongodb/mongodb-1.8.2.ebuild
+++ b/dev-db/mongodb/mongodb-1.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.8.2.ebuild,v 1.1 2011/06/22 17:26:09 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.8.3.ebuild,v 1.1 2011/08/26 12:38:49 ultrabug Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="static-libs v8"
 
-RDEPEND="!v8? ( >=dev-lang/spidermonkey-1.8 )
+RDEPEND="!v8? ( =dev-lang/spidermonkey-1.8.2* )
 	v8? ( dev-lang/v8 )
 	dev-libs/boost
 	dev-libs/libpcre[cxx]
@@ -43,6 +43,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.8-fix-scons.patch"
+	epatch "${FILESDIR}/${PN}-linux3.patch"
 }
 
 src_compile() {