version bump, add embedded-v8 USE, drop critically bugged versions, drop obsolete versions, filesdir cleanup

(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key B658FA13)

19 files changed, 40 insertions, 1175 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index 20411e8f14ac..a436288a31e9 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for dev-db/mongodb
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.74 2013/08/16 12:54:43 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.75 2013/08/21 12:41:54 ultrabug Exp $
+
+*mongodb-2.4.6 (21 Aug 2013)
+*mongodb-2.2.6 (21 Aug 2013)
+
+  21 Aug 2013; Ultrabug <ultrabug@gentoo.org> -mongodb-2.0.7-r1.ebuild,
+  -mongodb-2.0.7-r2.ebuild, -mongodb-2.0.8-r1.ebuild, -mongodb-2.0.8-r2.ebuild,
+  -mongodb-2.2.0-r1.ebuild, -mongodb-2.2.0-r2.ebuild, -mongodb-2.2.4.ebuild,
+  +mongodb-2.2.6.ebuild, -mongodb-2.4.5.ebuild, -mongodb-2.4.6_rc1.ebuild,
+  +mongodb-2.4.6.ebuild, -files/mongodb-1.8.5-fix-smokepy.patch,
+  -files/mongodb-1.8-fix-scons.patch, -files/mongodb-2.2-fix-scons.patch,
+  -files/mongodb-2.2-fix-sconscript.patch,
+  -files/mongodb-2.4.4-fix-sharedclient.patch, -files/mongodb.initd,
+  -files/mongodb-linux3.patch, -files/mongos.initd, metadata.xml:
+  version bump, add embedded-v8 USE, drop critically bugged versions, drop
+  obsolete versions, filesdir cleanup
 
 *mongodb-2.4.6_rc1 (16 Aug 2013)
 
diff --git a/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch b/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
deleted file mode 100644
index d16e233ed9c9..000000000000
--- a/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/SConstruct	2011-04-13 18:25:01.436551679 +0200
-+++ b/SConstruct	2011-04-13 18:25:45.387832601 +0200
-@@ -668,12 +668,13 @@
-     if has_option( "distcc" ):
-         env["CXX"] = "distcc " + env["CXX"]
-         
--    env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
-+    env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
-     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
-     if linux:
--        env.Append( CPPFLAGS=" -Werror " )
-         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=os.environ['LDFLAGS'] )
-     env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )
-     env.Append( LIBS=[] )
- 
-@@ -683,12 +684,11 @@
- 
-     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
--    else:
--        env.Append( CPPFLAGS=" -O3" )
-         #env.Append( CPPFLAGS=" -fprofile-generate" )
-         #env.Append( LINKFLAGS=" -fprofile-generate" )
-         # then:
-@@ -911,8 +911,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-1.8.5-fix-smokepy.patch b/dev-db/mongodb/files/mongodb-1.8.5-fix-smokepy.patch
deleted file mode 100644
index a98a0e1f4888..000000000000
--- a/dev-db/mongodb/files/mongodb-1.8.5-fix-smokepy.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/SConstruct	2012-08-20 10:26:51.484835418 +0200
-+++ b/SConstruct	2012-08-20 10:27:49.855374497 +0200
-@@ -765,11 +765,16 @@
-     binaries = ['python', 'python2.5', 'python2.6', 'python2.7', 'python25', 'python26', 'python27']
-     for binary in binaries:
-         try:
--            # py-2.4 compatible replacement for shell backticks
--            output = subprocess.Popen([binary, '--version'], stdout=subprocess.PIPE).communicate()[0]
--            match = version.search(output)
--            if match and float(match.group(1)) >= 2.5:
--                return binary
-+            for path in smokeEnv['ENV']['PATH'].split(':'):
-+                if os.path.isfile( '%s/%s' % (path, binary) ):
-+                    # py-2.4 compatible replacement for shell backticks
-+                    out, err = subprocess.Popen([binary, '-V'], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
-+                    for stream in (out, err):
-+                        match = version.search(stream)
-+                        if match:
-+                            versiontuple = tuple(map(int, match.group(1).split('.')))
-+                            if versiontuple >= (2, 5):
-+                                return binary
-         except:
-             pass
- 
diff --git a/dev-db/mongodb/files/mongodb-2.2-fix-scons.patch b/dev-db/mongodb/files/mongodb-2.2-fix-scons.patch
deleted file mode 100644
index 2d29d1e3faee..000000000000
--- a/dev-db/mongodb/files/mongodb-2.2-fix-scons.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/SConstruct	2012-08-29 16:21:35.107094792 +0200
-+++ b/SConstruct	2012-08-29 19:09:16.964893217 +0200
-@@ -677,7 +677,6 @@
-     # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
-     env.Append( CCFLAGS=["-fPIC",
-                          "-fno-strict-aliasing",
--                         "-ggdb",
-                          "-pthread",
-                          "-Wall",
-                          "-Wsign-compare",
-@@ -685,14 +684,15 @@
-                          "-Winvalid-pch"] )
-     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
-     if linux:
--        env.Append( CCFLAGS=["-Werror", "-pipe"] )
-+        env.Append( CPPDEFINES=["XP_UNIX=1"] )
-         if not has_option('clang'):
-             env.Append( CCFLAGS=["-fno-builtin-memcmp"] ) # glibc's memcmp is faster than gcc's
- 
-     env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
--    env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
-+    env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
-+    env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
-     env.Append( LINKFLAGS=["-fPIC", "-pthread",  "-rdynamic"] )
--    env.Append( LIBS=[] )
-+    env.Append( LIBS=['js', 'pcre', 'pcrecpp', 'snappy'] )
- 
-     #make scons colorgcc friendly
-     for key in ('HOME', 'TERM'):
-@@ -703,6 +703,7 @@
- 
-     if linux and has_option( "sharedclient" ):
-         env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " )
-+        env.Append( SHLINKFLAGS=" -Wl,-soname=libmongoclient.so " )
- 
-     if linux and has_option( "gcov" ):
-         env.Append( CXXFLAGS=" -fprofile-arcs -ftest-coverage " )
-@@ -712,7 +713,7 @@
-         env.Append( CCFLAGS=["-O0", "-fstack-protector"] )
-         env['ENV']['GLIBCXX_FORCE_NEW'] = 1; # play nice with valgrind
-     else:
--        env.Append( CCFLAGS=["-O3"] )
-+        env.Append( CXXFLAGS=["-O3"] )
- 
-     if debugLogging:
-         env.Append( CPPDEFINES=["_DEBUG"] );
diff --git a/dev-db/mongodb/files/mongodb-2.2-fix-sconscript.patch b/dev-db/mongodb/files/mongodb-2.2-fix-sconscript.patch
deleted file mode 100644
index 43b9db6530dc..000000000000
--- a/dev-db/mongodb/files/mongodb-2.2-fix-sconscript.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/mongo/SConscript	2012-08-29 16:21:35.077094498 +0200
-+++ b/src/mongo/SConscript	2012-08-29 17:13:55.199620421 +0200
-@@ -170,7 +170,7 @@
- 
- if usesm:
-     env.StaticLibrary('scripting', scripting_common_files + ['scripting/engine_spidermonkey.cpp'],
--                      LIBDEPS=['$BUILD_DIR/third_party/js-1.7/js', 'bson_template_evaluator'])
-+                      LIBDEPS=['bson_template_evaluator'])
- elif usev8:
-     env.StaticLibrary('scripting', scripting_common_files + ['scripting/engine_v8.cpp',
-                                                              'scripting/v8_db.cpp',
diff --git a/dev-db/mongodb/files/mongodb-2.4.4-fix-sharedclient.patch b/dev-db/mongodb/files/mongodb-2.4.4-fix-sharedclient.patch
deleted file mode 100644
index 891b9b1531c8..000000000000
--- a/dev-db/mongodb/files/mongodb-2.4.4-fix-sharedclient.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff --git a/src/mongo/SConscript b/src/mongo/SConscript
-index c026ce9..bbd900c 100644
---- a/src/mongo/SConscript
-+++ b/src/mongo/SConscript
-@@ -452,7 +452,7 @@
- env.Library('stacktrace', 'util/stacktrace.cpp')
- 
- env.Program('lame_stacktrace_test', 'util/lame_stacktrace_test.cpp',
--            LIBDEPS=['stacktrace',
-+            LIBDEPS=['stacktrace', 'foundation', 'mongocommon', 'alltools',
-                      '$BUILD_DIR/mongo/base/base'])
- 
- serverOnlyFiles += mmapFiles
-@@ -654,10 +654,6 @@
-                                        "defaultversion",
-                                        "gridfs",
-                                        "notmongodormongos"])
--env.Library("allclient", "client/clientOnly.cpp", LIBDEPS=["clientandshell"])
--
--if has_option( "sharedclient" ):
--    sharedClientLibName = str( env.SharedLibrary( "mongoclient", [], LIBDEPS=["allclient"] )[0] )
- 
- # dbtests test binary
- env.StaticLibrary('testframework', ['dbtests/framework.cpp'], LIBDEPS=['unittest/unittest'])
-@@ -806,12 +802,6 @@
-         env.Install( "$INSTALL_DIR/include/" + id, Glob( id + "*.h" ) )
-         env.Install( "$INSTALL_DIR/include/" + id, Glob( id + "*.hpp" ) )
- 
--#lib
--if installSetup.libraries:
--    env.Install('$INSTALL_DIR/$NIX_LIB_DIR', '#${LIBPREFIX}mongoclient${LIBSUFFIX}')
--    if has_option( "sharedclient" ):
--        env.Install( "$INSTALL_DIR/$NIX_LIB_DIR",  '#${SHLIBPREFIX}mongoclient${SHLIBSUFFIX}')
--
- # Stage the top-level mongodb banners
- distsrc = env.Dir('#distsrc')
- env.Append(MODULE_BANNERS = [distsrc.File('README'),
-diff --git a/src/SConscript.client b/src/SConscript.client
-index b88a54f..a15bbb3 100644
---- a/src/SConscript.client
-+++ b/src/SConscript.client
-@@ -4,6 +4,7 @@
- # programs.
- 
- Import('env clientEnv')
-+Import("has_option")
- 
- env.Command(['mongo/base/error_codes.h', 'mongo/base/error_codes.cpp',],
-             ['mongo/base/generate_error_codes.py', 'mongo/base/error_codes.err'],
-@@ -36,7 +37,6 @@ clientSourceBasic = [
-     'mongo/client/dbclient.cpp',
-     'mongo/client/dbclient_rs.cpp',
-     'mongo/client/dbclientcursor.cpp',
--    'mongo/client/distlock.cpp',
-     'mongo/client/gridfs.cpp',
-     'mongo/client/model.cpp',
-     'mongo/client/sasl_client_authenticate.cpp',
-@@ -83,7 +83,6 @@ clientSourceBasic = [
-     'mongo/util/timer.cpp',
-     'mongo/util/trace.cpp',
-     'mongo/util/util.cpp',
--    'mongo/util/version.cpp',
-     ]
- 
- clientSourceSasl = ['mongo/client/sasl_client_authenticate_impl.cpp',
-@@ -93,6 +92,7 @@ clientSourceAll = clientSourceBasic + clientSourceSasl
- 
- if env['MONGO_BUILD_SASL_CLIENT']:
-     clientSource = clientSourceAll
-+    env.Append(LIBS="sasl2")
- else:
-     clientSource = clientSourceBasic
- 
-@@ -133,16 +133,18 @@ for path in clientHeaderDirectories:
-     clientHeaders.extend(Glob('mongo/%s/*.h' % path))
-     clientHeaders.extend(Glob('mongo/%s/*.hpp' % path))
- 
--mongoclient_lib = env.Library('mongoclient', clientSource),
--mongoclient_install = env.Install('#/', [
--        mongoclient_lib,
--        #env.SharedLibrary('mongoclient', clientSource),
--        ])
-+
-+mongoclient_libs = [ env.Library('mongoclient', clientSource) ]
-+if has_option( "sharedclient" ):
-+   mongoclient_libs.append( env.SharedLibrary('mongoclient', clientSource) )
-+
-+mongoclient_install = env.Install('#/', mongoclient_libs)
-+
- env.Alias('mongoclient', mongoclient_install)
- 
- clientTests = clientEnv.Install('#/', [
-         clientEnv.Program(target,
--                          [source, mongoclient_lib]) for (target, source) in exampleSourceMap])
-+                          [source, mongoclient_libs[-1]]) for (target, source) in exampleSourceMap])
- 
- clientTests.append(
-     clientEnv.Install('#/', clientEnv.Program('bsondemo', 'mongo/bson/bsondemo/bsondemo.cpp')))
-@@ -177,6 +179,8 @@ env.Install(
- prefix = GetOption("prefix")
- 
- env.Install(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')
-+if has_option( "sharedclient" ):
-+   env.Install(prefix + "/lib", '${SHLIBPREFIX}mongoclient${SHLIBSUFFIX}')
- 
- for x in clientHeaderDirectories:
-     inst = env.Install(prefix + "/include/mongo/" + x,
diff --git a/dev-db/mongodb/files/mongodb-linux3.patch b/dev-db/mongodb/files/mongodb-linux3.patch
deleted file mode 100644
index 5c7d11c28c09..000000000000
--- a/dev-db/mongodb/files/mongodb-linux3.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From b1ec2058673f8ca582a490c2dd4a8405698221ae Mon Sep 17 00:00:00 2001
-From: Eliot Horowitz <eliot@10gen.com>
-Date: Thu, 28 Jul 2011 19:54:51 -0400
-Subject: [PATCH] compile on linux3 SERVER-3457
-
----
- SConstruct                |    4 +++-
- distsrc/client/SConstruct |    2 +-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 55d34d5..c47d3f6 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -343,6 +343,8 @@ processInfoFiles = [ "util/processinfo.cpp" ]
- 
- if os.path.exists( "util/processinfo_" + os.sys.platform + ".cpp" ):
-     processInfoFiles += [ "util/processinfo_" + os.sys.platform + ".cpp" ]
-+elif os.sys.platform == "linux3":
-+    processInfoFiles += [ "util/processinfo_linux2.cpp" ]
- else:
-     processInfoFiles += [ "util/processinfo_none.cpp" ]
- 
-@@ -474,7 +476,7 @@ if "darwin" == os.sys.platform:
-         env.Append( CPPPATH=filterExists(["/sw/include" , "/opt/local/include"]) )
-         env.Append( LIBPATH=filterExists(["/sw/lib/", "/opt/local/lib"]) )
- 
--elif "linux2" == os.sys.platform:
-+elif "linux2" == os.sys.platform or "linux3" == os.sys.platform:
-     linux = True
-     platform = "linux"
- 
-diff --git a/distsrc/client/SConstruct b/distsrc/client/SConstruct
-index c2d309a..54fc943 100755
---- a/distsrc/client/SConstruct
-+++ b/distsrc/client/SConstruct
-@@ -41,7 +41,7 @@ linux = False
- if "darwin" == os.sys.platform:
-     addExtraLibs( "/opt/local/" )
-     nix = True
--elif "linux2" == os.sys.platform:
-+elif "linux2" == os.sys.platform or "linux3" == os.sys.platform:
-     nix = True
-     linux = True
- 
--- 
-1.7.5.4
-
diff --git a/dev-db/mongodb/files/mongodb.initd b/dev-db/mongodb/files/mongodb.initd
deleted file mode 100644
index 5b7b77eebf6b..000000000000
--- a/dev-db/mongodb/files/mongodb.initd
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 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.5 2013/01/18 11:19:27 ultrabug Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	checkpath -d -m 0750 -o "${MONGODB_USER}":mongodb "${MONGODB_RUN}"
-
-	# 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 \
-		${USEROPT} ${MONGODB_USER:-mongodb} \
-		--exec ${MONGODB_EXEC:-/usr/bin/mongod} \
-		-- \
-		--port ${MONGODB_PORT:-27017} \
-		--dbpath ${MONGODB_DATA:-/var/lib/mongodb} \
-		--unixSocketPrefix ${MONGODB_RUN:-/var/run/mongodb} \
-		--logappend --logpath /var/log/mongodb/${SVCNAME}.log \
-		${MONGODB_OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile ${MONGODB_RUN:-/var/run/mongodb}/${SVCNAME}.pid
-	eend $?
-}
diff --git a/dev-db/mongodb/files/mongos.initd b/dev-db/mongodb/files/mongos.initd
deleted file mode 100644
index d0a4ea6525a5..000000000000
--- a/dev-db/mongodb/files/mongos.initd
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 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.3 2013/01/18 11:19:27 ultrabug Exp $
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ -z "${MONGOS_CONFIGDB}" ]; then
-		eerror "MONGOS_CONFIGDB is not defined, check your configuration file !"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-
-	checkpath -d -m 0750 -o "${MONGOS_USER}":mongodb "${MONGOS_RUN}"
-
-	# 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 \
-		${USEROPT} ${MONGOS_USER:-mongodb} \
-		--exec ${MONGOS_EXEC:-/usr/bin/mongos} \
-		-- \
-		--port ${MONGOS_PORT:-27018} \
-		--unixSocketPrefix ${MONGOS_RUN:-/var/run/mongodb} \
-		--logappend --logpath /var/log/mongodb/${SVCNAME}.log \
-		--configdb ${MONGOS_CONFIGDB} \
-		${MONGOS_OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile ${MONGOS_RUN:-/var/run/mongodb}/${SVCNAME}.pid
-	eend $?
-}
\ No newline at end of file
diff --git a/dev-db/mongodb/metadata.xml b/dev-db/mongodb/metadata.xml
index 26396f014ef4..d36240582fbe 100644
--- a/dev-db/mongodb/metadata.xml
+++ b/dev-db/mongodb/metadata.xml
@@ -20,6 +20,7 @@
 	and powerful queries).
 	</longdescription>
 	<use>
+		<flag name="embedded-v8">Use embedded version of v8 instead of system v8</flag>
 		<flag name="v8">Use V8 JavaScript engine
 			(<pkg>dev-lang/v8</pkg>) instead of SpiderMonkey
 			(<pkg>dev-lang/spidermonkey</pkg>)</flag>
diff --git a/dev-db/mongodb/mongodb-2.0.7-r1.ebuild b/dev-db/mongodb/mongodb-2.0.7-r1.ebuild
deleted file mode 100644
index 0de8d48fb32a..000000000000
--- a/dev-db/mongodb/mongodb-2.0.7-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.0.7-r1.ebuild,v 1.3 2013/03/05 14:08:39 ultrabug Exp $
-
-EAPI=4
-SCONS_MIN_VERSION="1.2.0"
-
-inherit eutils flag-o-matic multilib pax-utils scons-utils user 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
-	mms-agent? ( http://dev.gentoo.org/~ultrabug/20120514-10gen-mms-agent.zip )"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mms-agent static-libs v8"
-
-PDEPEND="mms-agent? ( dev-python/pymongo )"
-RDEPEND="
-	v8? ( dev-lang/v8 )
-	<dev-libs/boost-1.50
-	dev-libs/libpcre[cxx]
-	net-libs/libpcap
-	app-arch/snappy"
-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="  --cc=$(tc-getCC) --cxx=$(tc-getCXX) --sharedclient"
-	scons_opts+=" --use-system-pcre"
-	scons_opts+=" --use-system-snappy"
-
-	if use v8; then
-		scons_opts+=" --usev8"
-	else
-		scons_opts+=" --usesm"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.0-fix-scons.patch"
-	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
-
-	# drop -Werror
-	sed -i -e '/Werror/d' SConstruct || die
-}
-
-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"
-
-	use v8 && pax-mark m "${D}"/usr/bin/{mongo,mongod}
-
-	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}
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	if use mms-agent; then
-		local MY_PN="mms-agent"
-		local MY_D="/opt/${MY_PN}"
-		insinto ${MY_D}
-		doins "${WORKDIR}/${MY_PN}/"*
-		fowners -R mongodb:mongodb ${MY_D}
-		newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
-		newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
-	fi
-}
-
-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}"
-}
diff --git a/dev-db/mongodb/mongodb-2.0.7-r2.ebuild b/dev-db/mongodb/mongodb-2.0.7-r2.ebuild
deleted file mode 100644
index ace3be8f09d8..000000000000
--- a/dev-db/mongodb/mongodb-2.0.7-r2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.0.7-r2.ebuild,v 1.3 2013/03/05 14:08:39 ultrabug Exp $
-
-EAPI=4
-SCONS_MIN_VERSION="1.2.0"
-
-inherit eutils flag-o-matic multilib pax-utils scons-utils user 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
-	mms-agent? ( http://dev.gentoo.org/~ultrabug/20120514-10gen-mms-agent.zip )"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mms-agent static-libs v8"
-
-PDEPEND="mms-agent? ( dev-python/pymongo )"
-RDEPEND="
-	v8? ( dev-lang/v8 )
-	>=dev-libs/boost-1.50
-	dev-libs/libpcre[cxx]
-	net-libs/libpcap
-	app-arch/snappy"
-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="  --cc=$(tc-getCC) --cxx=$(tc-getCXX) --sharedclient"
-	scons_opts+=" --use-system-pcre"
-	scons_opts+=" --use-system-snappy"
-
-	if use v8; then
-		scons_opts+=" --usev8"
-	else
-		scons_opts+=" --usesm"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.0-fix-scons.patch"
-	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
-	epatch "${FILESDIR}/${PN}-2.0-r1-boost-1.50.patch"
-
-	# drop -Werror
-	sed -i -e '/Werror/d' SConstruct || die
-}
-
-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"
-
-	use v8 && pax-mark m "${D}"/usr/bin/{mongo,mongod}
-
-	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}
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	if use mms-agent; then
-		local MY_PN="mms-agent"
-		local MY_D="/opt/${MY_PN}"
-		insinto ${MY_D}
-		doins "${WORKDIR}/${MY_PN}/"*
-		fowners -R mongodb:mongodb ${MY_D}
-		newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
-		newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
-	fi
-}
-
-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}"
-}
diff --git a/dev-db/mongodb/mongodb-2.0.8-r1.ebuild b/dev-db/mongodb/mongodb-2.0.8-r1.ebuild
deleted file mode 100644
index 0038a26b6c7c..000000000000
--- a/dev-db/mongodb/mongodb-2.0.8-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.0.8-r1.ebuild,v 1.2 2013/03/05 14:08:39 ultrabug Exp $
-
-EAPI=4
-SCONS_MIN_VERSION="1.2.0"
-
-inherit eutils flag-o-matic multilib pax-utils scons-utils user 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
-	mms-agent? ( http://dev.gentoo.org/~ultrabug/20120514-10gen-mms-agent.zip )"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mms-agent static-libs v8"
-
-PDEPEND="mms-agent? ( dev-python/pymongo )"
-RDEPEND="
-	v8? ( dev-lang/v8 )
-	<dev-libs/boost-1.50
-	dev-libs/libpcre[cxx]
-	net-libs/libpcap
-	app-arch/snappy"
-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="  --cc=$(tc-getCC) --cxx=$(tc-getCXX) --sharedclient"
-	scons_opts+=" --use-system-pcre"
-	scons_opts+=" --use-system-snappy"
-
-	if use v8; then
-		scons_opts+=" --usev8"
-	else
-		scons_opts+=" --usesm"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.0-fix-scons.patch"
-	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
-
-	# drop -Werror
-	sed -i -e '/Werror/d' SConstruct || die
-}
-
-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"
-
-	use v8 && pax-mark m "${D}"/usr/bin/{mongo,mongod}
-
-	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}
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	if use mms-agent; then
-		local MY_PN="mms-agent"
-		local MY_D="/opt/${MY_PN}"
-		insinto ${MY_D}
-		doins "${WORKDIR}/${MY_PN}/"*
-		fowners -R mongodb:mongodb ${MY_D}
-		newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
-		newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
-	fi
-}
-
-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}"
-}
diff --git a/dev-db/mongodb/mongodb-2.0.8-r2.ebuild b/dev-db/mongodb/mongodb-2.0.8-r2.ebuild
deleted file mode 100644
index bc3d210eea16..000000000000
--- a/dev-db/mongodb/mongodb-2.0.8-r2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.0.8-r2.ebuild,v 1.2 2013/03/05 14:08:39 ultrabug Exp $
-
-EAPI=4
-SCONS_MIN_VERSION="1.2.0"
-
-inherit eutils flag-o-matic multilib pax-utils scons-utils user 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
-	mms-agent? ( http://dev.gentoo.org/~ultrabug/20120514-10gen-mms-agent.zip )"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mms-agent static-libs v8"
-
-PDEPEND="mms-agent? ( dev-python/pymongo )"
-RDEPEND="
-	v8? ( dev-lang/v8 )
-	>=dev-libs/boost-1.50
-	dev-libs/libpcre[cxx]
-	net-libs/libpcap
-	app-arch/snappy"
-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="  --cc=$(tc-getCC) --cxx=$(tc-getCXX) --sharedclient"
-	scons_opts+=" --use-system-pcre"
-	scons_opts+=" --use-system-snappy"
-
-	if use v8; then
-		scons_opts+=" --usev8"
-	else
-		scons_opts+=" --usesm"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.0-fix-scons.patch"
-	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
-	epatch "${FILESDIR}/${PN}-2.0-r1-boost-1.50.patch"
-
-	# drop -Werror
-	sed -i -e '/Werror/d' SConstruct || die
-}
-
-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"
-
-	use v8 && pax-mark m "${D}"/usr/bin/{mongo,mongod}
-
-	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}
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	if use mms-agent; then
-		local MY_PN="mms-agent"
-		local MY_D="/opt/${MY_PN}"
-		insinto ${MY_D}
-		doins "${WORKDIR}/${MY_PN}/"*
-		fowners -R mongodb:mongodb ${MY_D}
-		newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
-		newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
-	fi
-}
-
-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}"
-}
diff --git a/dev-db/mongodb/mongodb-2.2.0-r1.ebuild b/dev-db/mongodb/mongodb-2.2.0-r1.ebuild
deleted file mode 100644
index dacba831162b..000000000000
--- a/dev-db/mongodb/mongodb-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.0-r1.ebuild,v 1.3 2013/03/11 10:12:04 ultrabug Exp $
-
-EAPI=4
-SCONS_MIN_VERSION="1.2.0"
-BOOST_MAX_SLOT="1.49"
-inherit eutils flag-o-matic multilib pax-utils scons-utils user 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
-	mms-agent? ( http://dev.gentoo.org/~ultrabug/20120830-10gen-mms-agent.zip )"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mms-agent static-libs v8"
-
-PDEPEND="mms-agent? ( dev-python/pymongo )"
-RDEPEND="
-	v8? ( dev-lang/v8 )
-	<dev-libs/boost-1.50
-	dev-libs/libpcre[cxx]
-	dev-util/google-perftools
-	net-libs/libpcap
-	app-arch/snappy"
-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="  --cc=$(tc-getCC) --cxx=$(tc-getCXX) --sharedclient"
-	scons_opts+=" --use-system-tcmalloc"
-	scons_opts+=" --use-system-pcre"
-	scons_opts+=" --use-system-snappy"
-	scons_opts+=" --use-system-boost"
-
-	if use v8; then
-		scons_opts+=" --usev8"
-	else
-		scons_opts+=" --usesm"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.2-r1-fix-scons.patch"
-	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
-	epatch "${FILESDIR}/${PN}-2.2-fix-sharedclient.patch"
-
-	# FIXME: apply only this fix [1] on x86 boxes as it breaks /usr/lib symlink
-	# on amd64 machines [2].
-	# [1] https://jira.mongodb.org/browse/SERVER-5575
-	# [2] https://bugs.gentoo.org/show_bug.cgi?id=434664
-	if use !prefix && [[ "$(get_libdir)" == "lib" ]]; then
-		epatch "${FILESDIR}/${PN}-2.2-fix-x86client.patch"
-	fi
-}
-
-src_compile() {
-	escons ${scons_opts} all
-}
-
-src_install() {
-	escons ${scons_opts} --full --nostrip install --prefix="${ED}"/usr
-
-	use static-libs || rm "${ED}/usr/$(get_libdir)/libmongoclient.a"
-
-	use v8 && pax-mark m "${ED}"/usr/bin/{mongo,mongod}
-
-	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}
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	if use mms-agent; then
-		local MY_PN="mms-agent"
-		local MY_D="/opt/${MY_PN}"
-		insinto ${MY_D}
-		doins "${WORKDIR}/${MY_PN}/"*
-		fowners -R mongodb:mongodb ${MY_D}
-		newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
-		newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
-	fi
-}
-
-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}"
-}
diff --git a/dev-db/mongodb/mongodb-2.2.0-r2.ebuild b/dev-db/mongodb/mongodb-2.2.0-r2.ebuild
deleted file mode 100644
index ec0db37d4e01..000000000000
--- a/dev-db/mongodb/mongodb-2.2.0-r2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.0-r2.ebuild,v 1.3 2013/03/11 10:12:04 ultrabug Exp $
-
-EAPI=4
-SCONS_MIN_VERSION="1.2.0"
-
-inherit eutils flag-o-matic multilib pax-utils scons-utils user 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
-	mms-agent? ( http://dev.gentoo.org/~ultrabug/20120830-10gen-mms-agent.zip )"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mms-agent static-libs v8"
-
-PDEPEND="mms-agent? ( dev-python/pymongo )"
-RDEPEND="
-	v8? ( dev-lang/v8 )
-	>=dev-libs/boost-1.50
-	dev-libs/libpcre[cxx]
-	dev-util/google-perftools
-	net-libs/libpcap
-	app-arch/snappy"
-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="  --cc=$(tc-getCC) --cxx=$(tc-getCXX) --sharedclient"
-	scons_opts+=" --use-system-tcmalloc"
-	scons_opts+=" --use-system-pcre"
-	scons_opts+=" --use-system-snappy"
-	scons_opts+=" --use-system-boost"
-
-	if use v8; then
-		scons_opts+=" --usev8"
-	else
-		scons_opts+=" --usesm"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.2-r1-fix-scons.patch"
-	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
-	epatch "${FILESDIR}/${PN}-2.2-r2-boost-1.50.patch"
-	epatch "${FILESDIR}/${PN}-2.2-fix-sharedclient.patch"
-
-	# FIXME: apply only this fix [1] on x86 boxes as it breaks /usr/lib symlink
-	# on amd64 machines [2].
-	# [1] https://jira.mongodb.org/browse/SERVER-5575
-	# [2] https://bugs.gentoo.org/show_bug.cgi?id=434664
-	if use !prefix && [[ "$(get_libdir)" == "lib" ]]; then
-		epatch "${FILESDIR}/${PN}-2.2-fix-x86client.patch"
-	fi
-}
-
-src_compile() {
-	escons ${scons_opts} all
-}
-
-src_install() {
-	escons ${scons_opts} --full --nostrip install --prefix="${ED}"/usr
-
-	use static-libs || rm "${ED}/usr/$(get_libdir)/libmongoclient.a"
-
-	use v8 && pax-mark m "${ED}"/usr/bin/{mongo,mongod}
-
-	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}
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	if use mms-agent; then
-		local MY_PN="mms-agent"
-		local MY_D="/opt/${MY_PN}"
-		insinto ${MY_D}
-		doins "${WORKDIR}/${MY_PN}/"*
-		fowners -R mongodb:mongodb ${MY_D}
-		newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
-		newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
-	fi
-}
-
-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}"
-}
diff --git a/dev-db/mongodb/mongodb-2.2.4.ebuild b/dev-db/mongodb/mongodb-2.2.6.ebuild
index 2fd9b6b78d9b..93c1ece3b6bd 100644
--- a/dev-db/mongodb/mongodb-2.2.4.ebuild
+++ b/dev-db/mongodb/mongodb-2.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.4.ebuild,v 1.2 2013/07/15 07:52:50 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.6.ebuild,v 1.1 2013/08/21 12:41:54 ultrabug Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@@ -12,7 +12,7 @@ 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
-	mms-agent? ( http://dev.gentoo.org/~ultrabug/20121128-10gen-mms-agent.zip )"
+	mms-agent? ( http://dev.gentoo.org/~ultrabug/20130821-10gen-mms-agent.zip )"
 
 LICENSE="AGPL-3 Apache-2.0"
 SLOT="0"
@@ -84,9 +84,9 @@ src_install() {
 	doman debian/mongo*.1
 	dodoc README docs/building.md
 
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
 	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN/db/s}.initd" ${PN/db/s}
+	newinitd "${FILESDIR}/${PN/db/s}.initd-r1" ${PN/db/s}
 	newconfd "${FILESDIR}/${PN/db/s}.confd" ${PN/db/s}
 
 	insinto /etc/logrotate.d/
diff --git a/dev-db/mongodb/mongodb-2.4.5.ebuild b/dev-db/mongodb/mongodb-2.4.5.ebuild
deleted file mode 100644
index a7ffdcda9bc4..000000000000
--- a/dev-db/mongodb/mongodb-2.4.5.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.4.5.ebuild,v 1.3 2013/07/18 16:34:32 ultrabug Exp $
-
-EAPI=4
-SCONS_MIN_VERSION="1.2.0"
-
-inherit eutils flag-o-matic multilib pax-utils scons-utils user 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
-	mms-agent? ( http://dev.gentoo.org/~ultrabug/20130605-10gen-mms-agent.zip )"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="kerberos mms-agent sharedclient spidermonkey ssl static-libs"
-
-PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )"
-RDEPEND="
-	<dev-lang/v8-3.19
-	>=dev-libs/boost-1.50[threads(+)]
-	dev-libs/libpcre[cxx]
-	dev-util/google-perftools
-	net-libs/libpcap
-	app-arch/snappy
-	ssl? ( >=dev-libs/openssl-1.0.1c )"
-DEPEND="${RDEPEND}
-	sys-libs/readline
-	sys-libs/ncurses
-	kerberos? ( dev-libs/cyrus-sasl[kerberos] )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup mongodb
-	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
-	scons_opts+=" --use-system-tcmalloc"
-	scons_opts+=" --use-system-pcre"
-	scons_opts+=" --use-system-snappy"
-	scons_opts+=" --use-system-boost"
-
-	if use kerberos; then
-		scons_opts+=" --use-sasl-client"
-	fi
-
-	if use sharedclient; then
-		scons_opts+=" --sharedclient"
-	fi
-
-	if use spidermonkey; then
-		scons_opts+=" --usesm"
-	else
-		scons_opts+=" --use-system-v8"
-	fi
-
-	if use ssl; then
-		scons_opts+=" --ssl"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.4.5-fix-scons.patch"
-	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
-
-	# bug #462606
-	sed -i -e "s@\$INSTALL_DIR/lib@\$INSTALL_DIR/$(get_libdir)@g" src/SConscript.client || die
-}
-
-src_compile() {
-	escons ${scons_opts} all
-}
-
-src_install() {
-	escons ${scons_opts} --full --nostrip install --prefix="${ED}"/usr
-
-	use static-libs || find "${ED}"/usr/ -type f -name "*.a" -delete
-
-	if ! use spidermonkey; then
-		pax-mark m "${ED}"/usr/bin/{mongo,mongod}
-	fi
-
-	for x in /var/{lib,log}/${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}
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	if use mms-agent; then
-		local MY_PN="mms-agent"
-		local MY_D="/opt/${MY_PN}"
-		insinto ${MY_D}
-		doins "${WORKDIR}/${MY_PN}/"*
-		fowners -R mongodb:mongodb ${MY_D}
-		newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
-		newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
-	fi
-}
-
-pkg_preinst() {
-	# wrt bug #461466
-	if [[ "$(get_libdir)" == "lib64" ]]; then
-		rmdir "${ED}"/usr/lib/ &>/dev/null
-	fi
-}
-
-src_test() {
-	escons ${scons_opts} test
-	"${S}"/test --dbpath=unittest || die
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} < 2.4 ]]; 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}"
-}
diff --git a/dev-db/mongodb/mongodb-2.4.6_rc1.ebuild b/dev-db/mongodb/mongodb-2.4.6.ebuild
index bf7acc32a091..ace5439c2d80 100644
--- a/dev-db/mongodb/mongodb-2.4.6_rc1.ebuild
+++ b/dev-db/mongodb/mongodb-2.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.4.6_rc1.ebuild,v 1.1 2013/08/16 12:54:43 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.4.6.ebuild,v 1.1 2013/08/21 12:41:54 ultrabug Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@@ -12,16 +12,18 @@ 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
-	mms-agent? ( http://dev.gentoo.org/~ultrabug/20130605-10gen-mms-agent.zip )"
+	mms-agent? ( http://dev.gentoo.org/~ultrabug/20130821-10gen-mms-agent.zip )"
 
 LICENSE="AGPL-3 Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="kerberos mms-agent sharedclient spidermonkey ssl static-libs"
+IUSE="-embedded-v8 kerberos mms-agent sharedclient spidermonkey ssl static-libs"
 
 PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )"
 RDEPEND="
-	!spidermonkey? ( <dev-lang/v8-3.19 )
+	!spidermonkey? (
+		!embedded-v8? ( <dev-lang/v8-3.19 )
+	)
 	>=dev-libs/boost-1.50[threads(+)]
 	dev-libs/libpcre[cxx]
 	dev-util/google-perftools
@@ -56,7 +58,11 @@ pkg_setup() {
 	if use spidermonkey; then
 		scons_opts+=" --usesm"
 	else
-		scons_opts+=" --use-system-v8"
+		if use embedded-v8; then
+			scons_opts+=" --usev8"
+		else
+			scons_opts+=" --use-system-v8"
+		fi
 	fi
 
 	if use ssl; then
@@ -125,6 +131,14 @@ src_test() {
 }
 
 pkg_postinst() {
+	if use embedded-v8; then
+		ewarn "You chose to build ${PN} using embedded v8."
+		ewarn "This is not recommended by Gentoo and should be used to resolve"
+		ewarn "blockers with packages requiring >=v8-3.19 only !"
+		ewarn "See the following bug [1] and jira issue [2] for more info."
+		ewarn "    [1] https://bugs.gentoo.org/show_bug.cgi?id=471582"
+		ewarn "    [2] https://jira.mongodb.org/browse/SERVER-10282"
+	fi
 	if [[ ${REPLACING_VERSIONS} < 2.4 ]]; then
 		ewarn "You just upgraded from a previous version of mongodb !"
 		ewarn "Make sure you run 'mongod --upgrade' before using this version."