Bump for 2.x pre-release version.

(Portage version: 2.1.10.34/cvs/Linux x86_64)

3 files changed, 143 insertions, 1 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index 79ae856e1cd0..c9620aa91b3b 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,12 @@
 # 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.25 2011/10/27 13:34:28 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.26 2011/11/16 09:44:09 ultrabug Exp $
+
+*mongodb-2.0.2_pre20111116 (16 Nov 2011)
+
+  16 Nov 2011; Ultrabug <ultrabug@gentoo.org>
+  +mongodb-2.0.2_pre20111116.ebuild, +files/mongodb-2.0-fix-scons.patch:
+  Bump for 2.x pre-release version.
 
   27 Oct 2011; Ultrabug <ultrabug@gentoo.org> mongodb-1.8.4-r1.ebuild:
   Fixed mms-agent SRC_URI
diff --git a/dev-db/mongodb/files/mongodb-2.0-fix-scons.patch b/dev-db/mongodb/files/mongodb-2.0-fix-scons.patch
new file mode 100644
index 000000000000..adadde14ef75
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-2.0-fix-scons.patch
@@ -0,0 +1,36 @@
+--- a/SConstruct	2011-11-14 15:05:46.000000000 +0100
++++ b/SConstruct	2011-11-15 21:12:23.707935731 +0100
+@@ -689,15 +689,16 @@
+         env["CXX"] = "distcc " + env["CXX"]
+         
+     # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used. 
+-    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 -pipe " )
+         if not has_option('clang'): 
+             env.Append( CPPFLAGS=" -fno-builtin-memcmp " ) # glibc's memcmp is faster than gcc's
+ 
+     env.Append( CPPDEFINES="_FILE_OFFSET_BITS=64" )
++    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=[] )
+ 
+@@ -707,12 +708,13 @@
+ 
+     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( CXXFLAGS=" -O3 " )
+         #env.Append( CPPFLAGS=" -fprofile-generate" )
+         #env.Append( LINKFLAGS=" -fprofile-generate" )
+         # then:
diff --git a/dev-db/mongodb/mongodb-2.0.2_pre20111116.ebuild b/dev-db/mongodb/mongodb-2.0.2_pre20111116.ebuild
new file mode 100644
index 000000000000..b4dc77fceaae
--- /dev/null
+++ b/dev-db/mongodb/mongodb-2.0.2_pre20111116.ebuild
@@ -0,0 +1,100 @@
+# 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-2.0.2_pre20111116.ebuild,v 1.1 2011/11/16 09:44:09 ultrabug 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="https://github.com/mongodb/mongo/tarball/0655ba4ec87e4dd91c5639707d6f6f208d719d61 -> ${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 )
+	v8? ( dev-lang/v8 )
+	dev-libs/boost
+	dev-libs/libpcre[cxx]
+	net-libs/libpcap
+	app-arch/snappy
+	"
+DEPEND="${RDEPEND}
+	sys-libs/readline
+	sys-libs/ncurses"
+
+S="${WORKDIR}/mongodb-mongo-0655ba4"
+
+pkg_setup() {
+	enewgroup mongodb
+	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+	scons_opts=" --cxx=$(tc-getCXX) --use-system-all --sharedclient"
+	if use v8; then
+		scons_opts+=" --usev8"
+	else
+		scons_opts+=" --usesm"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.0-fix-scons.patch"
+	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
+}
+
+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}
+
+	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}"
+}