Use upstream embedded spidermonkey (bug 390631); build against boost indeoendent of eselect

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

5 files changed, 201 insertions, 2 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index f06c6d1af860..813587746b16 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,14 @@
 # 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.46 2012/10/07 14:59:52 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.47 2012/10/09 18:54:01 axs Exp $
+
+*mongodb-2.2.0-r1 (09 Oct 2012)
+
+  09 Oct 2012; Ian Stakenvicius <axs@gentoo.org>
+  +files/mongodb-2.2-r1-fix-boost.patch, +files/mongodb-2.2-r1-fix-scons.patch,
+  +mongodb-2.2.0-r1.ebuild:
+  Use upstream embedded spidermonkey (bug 390631); build against boost
+  indeoendent of eselect
 
   07 Oct 2012; Fabian Groffen <grobian@gentoo.org> mongodb-2.2.0.ebuild:
   Fix for Prefix
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index dcac4cc3e9bd..8d95a703f838 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX mms-agent.confd 205 SHA256 29e678e722268311fb59f5af57ac3fbadb9e930cd3cb1ce9e4dc33d30e021e40 SHA512 e81e68ebad2d409a9e631de0aaf264eab99b3faa5c313a7c96a6672a6c51d3243100f5ef599bf2a347b4f9e1b1a6ebf95fa890cb614d9745c58430fadd8ee13a WHIRLPOOL 24d98082e138dbcee0a276c4874d88a23f7f53d1bf0f6a7f2e979c005413f14809269622ecd013913221a267eb1fc806130d69915ce5cd38a646b498912ca729
 AUX mms-agent.initd 1231 SHA256 0691afaed977e2a3b6764002300ebfbb66ccc78f08629d06579a09aa0c48ec05 SHA512 be341f87633122961e59fddc19f141a303eff2c5cce692a0cf6109977c11ca032c394e6d71a06b2c55c9f06483e5276f7029a1991d161e832ef6cd6b6ddce989 WHIRLPOOL 9b148fc423a7c00f6f7ccc8de32749bd01573a1d358b08f40b354b9244011b390ab32960df11bf399eddb53811c10e6080ab330da5aedf20eb7314ed90e292fa
 AUX mongodb-1.8-fix-scons.patch 1859 SHA256 2b1a2180e73ad18c6fc884678dcdfb081c9ed6e967e137ba761683075cd59a1a SHA512 a1a6d8bebabb91bbd6ef78d09d49cc6fad3e8f2ca392182feec68ad03709620a2f0de390981bdbd27d1782626368d34ed7e79932e41a37aa55584e580cf719d9 WHIRLPOOL 55a707d3bcfe8d31396fd58d093f9e62bbe51a521f76005426dbebf3eff7da63ba575861a9c6749693273b00070fe4cbbac93cc8a52eb3e84caa746f8bb1ba07
@@ -6,6 +9,8 @@ AUX mongodb-2.0-fix-scons.patch 1674 SHA256 eed2195cc758676efba624cac13ad03d0ab3
 AUX mongodb-2.2-fix-scons.patch 1954 SHA256 b45b6128eb49d47841feba656a95dfe3c1d580e63e5e61315a8aa13abb1a9d0d SHA512 4aa5a80abc0ef537e9620cffe9d69f92a1e1b881c59e6d0ea208bf62b184097cc274424b9d5ed9d7c62a5310fb73b1dd2371a1596225e1f54abd1d746c91ffa7 WHIRLPOOL 1893f1cca511432107a8c9f0e358d7a55ece58d1cd30d925e1e14ed1015acc1b9411d7503f5da8eea93464c5e108e3d99166d57859792cf3e843786c91f9dfd1
 AUX mongodb-2.2-fix-sconscript.patch 602 SHA256 00a4e718c38991f008d20fb3caefeb5eb260cb81ee433bb1bf558149b6af63f4 SHA512 85019d63312d60cbba2fe13f35c06cf3afb5829003e6b415686d6cbdb59da63c6244c01c8f91aac727bdd4fc96861e7228fba148353f72ceeead52bf21b4b755 WHIRLPOOL f949888e8c7f2a793812f5699013de83fc786fe904723c0bc3e642a28d9564b58d94db22255b8348669c17e508f5709d455e82f2ad61ffe3f86c588e35e7ef91
 AUX mongodb-2.2-fix-x86client.patch 447 SHA256 ca00fedc9f87bc3e013a2d4345fc125b22d614e111cc11c233f544940574c058 SHA512 2f7d0e9e35a043d9006fd429f36cd6b45ed4edd98ce653b35b237e0313d2d7ef39ae85dcd31713bae7ab68e40a38534bba5f7746653e9380f2106865a8b3b9a5 WHIRLPOOL 7ae858dc87968cde6512d4ce746081110ebd99de5ae0127aafa6276e0e9d5bc547add2cf4e1769900bc79b5331b72049bb2e2f51e57960bece13692976fef583
+AUX mongodb-2.2-r1-fix-boost.patch 870 SHA256 885991e16aecc66d88b40418531a66449ab8e434ca677acc7814e7485231e841 SHA512 902c11e15e26be6c64053b4f3c0d0fda1670373fa3a5805063b49957843173b3663f6271ae541bb07aedf884a9861099bb1f452761f7baeaa819f14eb0755336 WHIRLPOOL b5df66a5e90202db903989c66b7423103ca1a666a477175c1746c94d5cf250ac4ceb2d237737ee2bfc158a8f9c611916e91d5133ba94e544abbaaec8b0d0361a
+AUX mongodb-2.2-r1-fix-scons.patch 1950 SHA256 cd136dea1ee03cfe8009cfe1e787478115f1f73209f3a770794c36813d1374df SHA512 741c4438b1f2060023ddb053317021f680a33d535299350f8775f602fd0221e7f96be0ca2694861611dfe449cb09fea4f3075018a6fc9f3c32ee978c075f3e97 WHIRLPOOL a8d592c4a6483445cb95ae7045b3b7025379b83446673af3d23f68c135ffe9fe5060d4d7a508a9ae7a5774191aa9a2df383fb77b0dbdd02b31b1cb089000395b
 AUX mongodb-linux3.patch 1588 SHA256 bc96fad782e5396cc4464e7d7bff6abb1f054c4ff034fbeebea44a1e7a41945b SHA512 de37834e2b71b392eac70b7152e6b0676c5527e70ee28afa7b8e918d45b4d5fb8482c68925d778ee1b6a3eef5272bfa8babe1a7a2bc810d1b6dc075d370a681a WHIRLPOOL a98c65827098c729b86782db9ec92a8a006d79487b4ab202b4bdb370403c7f867ec011f281e2a3ed27b013aa0584a219877ebc022836700aecde424f956c7a06
 AUX mongodb.confd 361 SHA256 a4ca29c577428c02cd0b0a8b46756df5f53a05519c9d13c270533cf99b9b819d SHA512 9bcd870742c31bf25f34188ddc3c414de1103e9860dea9f54eee276b89bc2cf1226abab1749c5cda6a6fb0880e541373754e5e83d63cc7189d4b9c274fd555c3 WHIRLPOOL 35d785763d0cb1e21516a3fa15332d6c93d35e6faea02b60f81c389878dd89fe026504c6cfce5e9abfc8353f74b0e959a7501373d2a389f269c6952d33e8d2e8
 AUX mongodb.initd 1254 SHA256 b39bf365963f849c5102147da324dae140be6ac17db96fe512c0220803477642 SHA512 f81e56ce893a95b1d980dcdf17c1d395e9062dde28a12a48d8bf31d5ef888bff63c7894a7a97fbb31ceff70371488ab2d4bdec474b8ad7b163c397dd46056196 WHIRLPOOL 6dae08004ff053df104a7645d61cd8dd691758db20e5a153e0d4f5404c18542d7d82d67f973206d178da77fed42dbc54abfa6d3f7507a824569e4ddd858fe012
@@ -20,6 +25,14 @@ DIST mongodb-src-r2.0.7.tar.gz 2982999 SHA256 b204d94bc912692bdc154402fbfc2e5c4b
 DIST mongodb-src-r2.2.0.tar.gz 10150762 SHA256 084626e476ac747dfae143889c24a10f739cd54480af9bf253f50999f065608b SHA512 b040efe01457703d14d63f69b3fff79a09d6068a89b17d52ad7eb430f81d3f60fdba711cee628d55456a772d7e36fde7c683d4d71fa7d95225e436e28ccac163 WHIRLPOOL 43d12039aff75bdb12c41721ccf259b379245a655aba72472f2a973dad921d9a384f79356d6bfa9795b609f2011324b1e7100ff94b8b92f2834c40a3a9bbe653
 EBUILD mongodb-1.8.5.ebuild 2533 SHA256 98c542e4b5c4234d23d8419f3baf32b228cd83d58ef924d359a876ea83576770 SHA512 3afceeb057a613cb90c05f10c5639c109698ea45ba81ea16e783eef98654d62818ec34d9ed4e3d94d95e53a460541cf9941bbb0977c512c89c2363fe90635714 WHIRLPOOL aaba10b2c4d96b8e120ae7d895b9dac3eb16ff0d321df38b3c58f0eaa5053dfa0a843c39a93560674996403385251fe4a98dc356fabd468aef419d82cc4b80b9
 EBUILD mongodb-2.0.7.ebuild 2790 SHA256 5f10bf9022a6a971bc995684fa5e7d967f9f1d2670cb010e8f3eb67312df5abf SHA512 f1bb5dee03a9ce98d9317fa28988020bd06829b555a1ee1f461dfdc24a14d5a279c5bfbc14e283086e3561521b7d192994d0eb3a7c8343a7a2664d0939044028 WHIRLPOOL 7faf7fd087349a41e1273c7afedcd7b8e7aec4ab7e9252bb6aa51443b59072dd1a44b04ffd0c9d34dd2308a1ca573cad4e1065d45d0ae7e11df810f230062df8
+EBUILD mongodb-2.2.0-r1.ebuild 3239 SHA256 9543629080b0ac832ec09ee61cfa6cafdf6025453af1a34350320cc9c2a9af56 SHA512 e53d34be7593e5764550060fb6ac7a20a03444c539df07d9b6c58092ec5bf8212305034bd759c96d446342f6faf689a845f54ec6fa13c319d88e66dd7d8801db WHIRLPOOL 57a7ffe63bc205cd47d0048f73b4ec4b4777a1483eaac5f7fd8c5ef708eae88363bc069e3134527326cc947c875f964611d67cef0f0b23e8bc0dd2fa60662333
 EBUILD mongodb-2.2.0.ebuild 3190 SHA256 b809833037f38aea05c198f54f3a7e800ec1b34c7a02cc5bfa05e0c100d85ac1 SHA512 44ceb251a3e7bcd47efcc5b907a5bbc6da4f8515e4e23e2c05563eaf2dfa288c36970903c5619aae3524087698247f1e872d5416c37211f8cdbfc0b9d6dac991 WHIRLPOOL 5f020cacabf0d625a76d5d8140a6c3956ed4089eaa00c01f4d60b6e14ee1f5bc4c33df5f312737e2dadfe6be046293e0ca0be0dd8db12b4bd7222e351fcdf477
-MISC ChangeLog 10317 SHA256 7a11169fb19baa8e32a59ab536eaca75bdc5b152bb14086b221a0db45a25693e SHA512 1ecf27ca10b3f82359cee849b8d9970558314dcf44ba551a4d049417e56a2eb7ed3989284cc368f0d4e33a4487e8e55e6f8707849167f23ca9114f9bb4a66e06 WHIRLPOOL 2efda02fac7ebf896af0ba3cd471684f0bb794e8b137a2ece46aba020ab88c7f4875565de32ad9f3dc31963377141e94d2f93538934f95ecbabfea39805b423c
+MISC ChangeLog 10600 SHA256 6fb7ffa2cb4e504dcd58f7bca4d625786355bdc3dc8116872beccfb1c4b07723 SHA512 249984846b0ce1c4e3f361bb730d0b5748f03b6d5c6b8f038af71d5e4130d60f6cb5819b29806faa68c83b3ec57130aad91f33c13303889852052156ac945baa WHIRLPOOL 27f9957964698b06bd4d4518ec10dd79c97a653434a2b99b597cdce5b0c70dddfdeaeb08a7b448812751b986953c48126c78833e31bd2e52dd5f7871cbf20807
 MISC metadata.xml 997 SHA256 5393635a3190ef1304fc71686a7ee121d5175c5cf2e484b6be61a799a167e7d7 SHA512 b595fc3acff1f39a346a12cbe4ece1cb63b2e2e4b8dde93821d58ff01baa192ad115dff3edc2d34d15636fbcde3f5af29c57cd61d6338e8f7e60dcc70b2511da WHIRLPOOL 2fb6476062286ecaea8482593cee51491eb1ea5acf1f0527012bcfb296ff05d2d5cc42a5bfcdb0b31bfea2382f6e096dfa08ae03b834eb00b59eb8fcad02af29
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlB0cs8ACgkQ2ugaI38ACPDdcAEAuhOOXReBLAQqE/QFCX3kW+1r
+q7Lr0SD70Hgm5u7CsjQBAKXuulfzW7ALw8IVDXMdaGaD2SZvNAwki2neq3HH1J0n
+=hTVa
+-----END PGP SIGNATURE-----
diff --git a/dev-db/mongodb/files/mongodb-2.2-r1-fix-boost.patch b/dev-db/mongodb/files/mongodb-2.2-r1-fix-boost.patch
new file mode 100644
index 000000000000..b6c9a1eb55df
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-2.2-r1-fix-boost.patch
@@ -0,0 +1,13 @@
+--- mongodb-src-r2.2.0/SConstruct.old	2012-10-09 12:41:25.000000000 -0400
++++ mongodb-src-r2.2.0/SConstruct	2012-10-09 12:41:41.000000000 -0400
+@@ -171,8 +171,8 @@
+ add_option( "extrapathdyn", "comma separated list of add'l paths  (--extrapath /opt/foo/,/foo) dynamic linking" , 1 , True )
+ add_option( "extralib", "comma separated list of libraries  (--extralib js_static,readline" , 1 , True )
+ 
+-add_option( "boost-compiler", "compiler used for boost (gcc41)" , 1 , True , "boostCompiler" )
+-add_option( "boost-version", "boost version for linking(1_38)" , 1 , True , "boostVersion" )
++add_option( "boost-compiler", "compiler used for boost (gcc41)" , 1 , False , "boostCompiler" )
++add_option( "boost-version", "boost version for linking(1_38)" , 1 , False , "boostVersion" )
+ 
+ add_option( "no-glibc-check" , "don't check for new versions of glibc" , 0 , False )
+ 
diff --git a/dev-db/mongodb/files/mongodb-2.2-r1-fix-scons.patch b/dev-db/mongodb/files/mongodb-2.2-r1-fix-scons.patch
new file mode 100644
index 000000000000..2d08fb454dfa
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-2.2-r1-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=['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/mongodb-2.2.0-r1.ebuild b/dev-db/mongodb/mongodb-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..dbe5590cb1d7
--- /dev/null
+++ b/dev-db/mongodb/mongodb-2.2.0-r1.ebuild
@@ -0,0 +1,119 @@
+# 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.2.0-r1.ebuild,v 1.1 2012/10/09 18:54:01 axs Exp $
+
+EAPI=4
+SCONS_MIN_VERSION="1.2.0"
+BOOST_MAX_SLOT="1.49"
+inherit eutils boost-utils 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)"
+	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
+
+	local boostver=$(boost-utils_get_best_slot)
+	scons_opts+=" --boost-version=${boostver/./_}"
+	append-cxxflags "-I$(boost-utils_get_includedir)"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.2-r1-fix-scons.patch"
+	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.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}"
+}