Version bump, drop old.

(Portage version: 2.1.11.11/cvs/Linux x86_64)

5 files changed, 74 insertions, 109 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index d77b3dbd7865..bee4e39d6bab 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/mongodb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.41 2012/08/20 08:46:47 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.42 2012/08/30 10:14:54 ultrabug Exp $
+
+*mongodb-2.2.0 (30 Aug 2012)
+
+  30 Aug 2012; Ultrabug <ultrabug@gentoo.org> -mongodb-1.8.4-r1.ebuild,
+  -mongodb-2.0.6.ebuild, +mongodb-2.2.0.ebuild,
+  +files/mongodb-2.2-fix-scons.patch, +files/mongodb-2.2-fix-sconscript.patch:
+  Version bump, drop old.
 
 *mongodb-2.0.7 (20 Aug 2012)
 *mongodb-1.8.5 (20 Aug 2012)
diff --git a/dev-db/mongodb/files/mongodb-2.2-fix-scons.patch b/dev-db/mongodb/files/mongodb-2.2-fix-scons.patch
new file mode 100644
index 000000000000..2d29d1e3faee
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-2.2-fix-scons.patch
@@ -0,0 +1,46 @@
+--- 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
new file mode 100644
index 000000000000..43b9db6530dc
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-2.2-fix-sconscript.patch
@@ -0,0 +1,11 @@
+--- 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/mongodb-1.8.4-r1.ebuild b/dev-db/mongodb/mongodb-1.8.4-r1.ebuild
deleted file mode 100644
index 99f191846486..000000000000
--- a/dev-db/mongodb/mongodb-1.8.4-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.8.4-r1.ebuild,v 1.4 2012/06/04 06:34:29 zmedico Exp $
-
-EAPI=4
-SCONS_MIN_VERSION="1.2.0"
-
-inherit eutils 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/20111027-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/spidermonkey-1.8.2* )
-	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"
-	epatch "${FILESDIR}/${PN}-linux3.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"
-
-	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}
-
-	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.6.ebuild b/dev-db/mongodb/mongodb-2.2.0.ebuild
index 0d2df6ee7cd3..53dc0bac736d 100644
--- a/dev-db/mongodb/mongodb-2.0.6.ebuild
+++ b/dev-db/mongodb/mongodb-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.0.6.ebuild,v 1.1 2012/06/06 07:44:16 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.0.ebuild,v 1.1 2012/08/30 10:14: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/20120514-10gen-mms-agent.zip )"
+	mms-agent? ( http://dev.gentoo.org/~ultrabug/20120830-10gen-mms-agent.zip )"
 
 LICENSE="AGPL-3 Apache-2.0"
 SLOT="0"
@@ -27,6 +27,7 @@ RDEPEND="!v8? ( <dev-lang/spidermonkey-1.8[unicode] )
 	net-libs/libpcap
 	app-arch/snappy"
 DEPEND="${RDEPEND}
+	dev-util/google-perftools
 	sys-libs/readline
 	sys-libs/ncurses"
 
@@ -36,7 +37,7 @@ pkg_setup() {
 	enewgroup mongodb
 	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
 
-	scons_opts=" --cxx=$(tc-getCXX) --use-system-all --sharedclient"
+	scons_opts=" --cxx=$(tc-getCXX) --use-system-all"
 	if use v8; then
 		scons_opts+=" --usev8"
 	else
@@ -45,15 +46,12 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.0-fix-scons.patch"
+	epatch "${FILESDIR}/${PN}-2.2-fix-scons.patch"
+	epatch "${FILESDIR}/${PN}-2.2-fix-sconscript.patch"
 
-	# drop -Werror
-	sed -i -e '/Werror/d' SConstruct || die
-
-	sed -i -e "s@jsapi.h@js/jsapi.h@g" \
-		-e "s@jsobj.h@js/jsobj.h@g" \
-		-e "s@jsdate.h@js/jsdate.h@g" \
-		-e "s@jsregexp.h@js/jsregexp.h@g" scripting/engine_spidermonkey.h || die
+	sed -e 's@third_party/js-1.7/@/usr/include/js/@g' \
+		-i src/mongo/scripting/engine_spidermonkey.h  \
+		-i src/mongo/scripting/engine_spidermonkey.cpp || die
 }
 
 src_compile() {