Bump for 2.x pre-release version.

Package-Manager: portage-2.1.10.34/cvs/Linux x86_64

4 files changed, 147 insertions, 12 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/Manifest b/dev-db/mongodb/Manifest
index c2d10c0b5e6c..2750fe2ac60a 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX mms-agent.confd 205 RMD160 ee93fed685f22bf27801becfc0f7da1c2cf50d78 SHA1 d20dfbb32374a6eebf1dad430148faa352dfb0dc SHA256 29e678e722268311fb59f5af57ac3fbadb9e930cd3cb1ce9e4dc33d30e021e40
 AUX mms-agent.initd 1231 RMD160 dda8b391c205069241ac8b26054f0b1c13b8592a SHA1 79c4a9df6d2c96cd2ec48a187b816c88953b25e6 SHA256 0691afaed977e2a3b6764002300ebfbb66ccc78f08629d06579a09aa0c48ec05
 AUX mongodb-1.8-fix-scons.patch 1859 RMD160 71700297d66808d2503f8a5eb56e10398e282ee7 SHA1 cba8225b2cd79477c0882a312707fbb58a59b70a SHA256 2b1a2180e73ad18c6fc884678dcdfb081c9ed6e967e137ba761683075cd59a1a
+AUX mongodb-2.0-fix-scons.patch 1700 RMD160 502c618ab5d5320d4dff00155efcce55be6880e2 SHA1 007db6cad6dc582d7a023ecdf07cdef5aad70dee SHA256 a43c36f562bd0a709fe890adc554baa1d499e5568217e68c641f6023c02b6145
 AUX mongodb-linux3.patch 1588 RMD160 879245215595e6f16ef6c04157a9b50b96638d48 SHA1 1ab387e8b6ddc46dbb3dde654e0e01a565c25222 SHA256 bc96fad782e5396cc4464e7d7bff6abb1f054c4ff034fbeebea44a1e7a41945b
 AUX mongodb.confd 361 RMD160 26e8d39513b44d989ee64c30669967237cabbaa8 SHA1 837b3603de36bf8ebab9a6f2c1652a853cdf02ef SHA256 a4ca29c577428c02cd0b0a8b46756df5f53a05519c9d13c270533cf99b9b819d
 AUX mongodb.initd 1254 RMD160 d4fb23a7533480c687e8d1bb01e08780991400ea SHA1 cefff6f1290595929feec0f996c99f9790c06536 SHA256 b39bf365963f849c5102147da324dae140be6ac17db96fe512c0220803477642
@@ -13,15 +11,10 @@ DIST 20111027-10gen-mms-agent.zip 25241 RMD160 418b238a317583bace686f1386b2a4d0c
 DIST mongodb-src-r1.8.2.tar.gz 1722704 RMD160 3c1e33ed9ff3dd3c653112a46cf178d07b93e32c SHA1 d2145e5b4a6df2e94aec76bef3a9399c11e8571a SHA256 1dd376b15e2b7288a77da2e1b0c6ffa5d2c62cdaf4bccfd9aa51c075a1f1bfb8
 DIST mongodb-src-r1.8.3.tar.gz 1726144 RMD160 9662b6963e7e6a4b5adcbea3faa36dd50a794457 SHA1 3c5c9819ef20c759aec1dc6800a3c4d4f6841299 SHA256 ee121c9698a48b819f1c5b5ba10a98d565bd732d527743f1475f54f697dd63e2
 DIST mongodb-src-r1.8.4.tar.gz 1727826 RMD160 6b561592b4f58f08ca2789e5ab92a3d31597912e SHA1 d296a6e04057e17989de5c7ded3a8c4d28285156 SHA256 c4e27bf22f2353e28ce169dbdbc24205baf863d1f61bd9a31b2230386cada4ae
+DIST mongodb-src-r2.0.2_pre20111116.tar.gz 2822830 RMD160 a5e7a564a074bd800eb5423ba0a15f9f8179434c SHA1 febe43c9fe84bfc58f9498b85cb0b34a8627d067 SHA256 a77a67e698714d121caa5ba4c398ac1bf82f37040ba06df84d52587682ceff29
 EBUILD mongodb-1.8.2-r1.ebuild 2016 RMD160 8b8f5a5d3a6d63a075778ec801f70deb8b45836a SHA1 8f94e36e099fedc6b8ee80e1dcd71e6691a8184c SHA256 7f6b7ebd5f443bac0cf4b0bd5415496f63e4ef611d04aa6dfccd22b82a67ed97
 EBUILD mongodb-1.8.3.ebuild 2013 RMD160 d4b6aa684d5ff860fe570ed597128344ff15cb7e SHA1 ff8deee519548ef021632e671707728d5b321824 SHA256 42b7bb8edb6b19f3cb98681fc07f143722d0e61d73b8458c4479a53659154923
 EBUILD mongodb-1.8.4-r1.ebuild 2416 RMD160 3d4796a1bae38ee88f840c187210670a0587ba18 SHA1 a2eca19cc6a570c1fd3eea5ab9642511f6052056 SHA256 19fd7efd7411cba453a224ba95904c31c5d0233d46c9683ec41fb0c6c309ad83
-MISC ChangeLog 6661 RMD160 92b3a3c24f5a381776dc9c0dd8af4dd6492eafba SHA1 40afef9c15d416eff0ce3b6b007df90db7e6012a SHA256 9178e1424b0a48a0a2a74f49c221ac60ee98bddcc89bd18ae01868f3a2d97d87
+EBUILD mongodb-2.0.2_pre20111116.ebuild 2660 RMD160 1695bb7c896cdc000418739f1f32f08991a20fc1 SHA1 b28fe37dd946ce9498ac9f94cbffe3271ad45acc SHA256 9a227188d6d25061440b28dc56dff2ed259887e4ec9ae9ba1d3499c6b9c1e3b7
+MISC ChangeLog 6859 RMD160 37f382b7dc6bc8d51ee645a968e090e3826adfc7 SHA1 d5bbcfa4c8f17f49ba81eee2e2e05612ac5b8d13 SHA256 b2fd0ad509a34b5dc35ac101013890dcd5e217894b54b2fc0a2f304a942e8868
 MISC metadata.xml 1094 RMD160 382287bd018ebf994f0997376095d1735858ca0f SHA1 4063b9bc6bb3d95e4b1a5aab9bf63ea567f92329 SHA256 8b325542cc2200f22d21915688992073cc1b0a8c5c4f08f34771df2ac6a9cfaf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iF4EAREIAAYFAk6pXe0ACgkQKiQSS7ZY+hORBQD+Ljh5D0z/0iQTdO+SW18tZ9Qs
-LRNfQ/pXIwElCF+TEhoBAJGmmwMM2nStcUMf+lK2pePp0UzDDASs6gQSBRXh7uUS
-=tKAl
------END PGP SIGNATURE-----
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}"
+}