Version bump, drop old.

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

6 files changed, 83 insertions, 117 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/Manifest b/dev-db/mongodb/Manifest
index e53d2944f853..bc2d7f7ac01b 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -6,6 +6,8 @@ AUX mms-agent.initd 1231 SHA256 0691afaed977e2a3b6764002300ebfbb66ccc78f08629d06
 AUX mongodb-1.8-fix-scons.patch 1859 SHA256 2b1a2180e73ad18c6fc884678dcdfb081c9ed6e967e137ba761683075cd59a1a SHA512 a1a6d8bebabb91bbd6ef78d09d49cc6fad3e8f2ca392182feec68ad03709620a2f0de390981bdbd27d1782626368d34ed7e79932e41a37aa55584e580cf719d9 WHIRLPOOL 55a707d3bcfe8d31396fd58d093f9e62bbe51a521f76005426dbebf3eff7da63ba575861a9c6749693273b00070fe4cbbac93cc8a52eb3e84caa746f8bb1ba07
 AUX mongodb-1.8.5-fix-smokepy.patch 1262 SHA256 68f44868b107aebb0c2cdea8aa33cc785ef9f700f9cb66b10a9db60947bab22e SHA512 f88e79d511c02cd8a512233cb390943827b6a12e863f65bef53e78e501186616b470a0e3e5646d860e6055add462b5dbf8b4a207b5fdc5f4857ab1e838f668e9 WHIRLPOOL 6702cd53e1e116783bb2acd0f795b4e49c88ddada67f86e2bc96673713be37f40e8b22fe94eda66716520a0a96509ad0603add58f8dd2be26cd66302b0b69388
 AUX mongodb-2.0-fix-scons.patch 1674 SHA256 eed2195cc758676efba624cac13ad03d0ab3feb0bb12d67e192d236abf5f0594 SHA512 42510c21c2cd9c3de066b565e556998bbe61469a53cc1871a6a498cc32702f47818ccaf08a2183ff7719ceb4566c4144de610952ca093646bfe74c70c58247ad WHIRLPOOL a27f5dc7210294300cb24a871c68b335efbe708555a61ed00c651f1f0f5d26ee474aa90c8cd87d1a610d1628bcb8fd9917e1c0ee2060be7588443c07de628d45
+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-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
@@ -14,20 +16,19 @@ AUX mongos.confd 345 SHA256 2afd582564623da0e928ca667d37bef467334c82d08b49301f1f
 AUX mongos.initd 1407 SHA256 a93069d7c7c3602437ce783c1aecd931854973230baae092ccee2cd9c078da7e SHA512 e2cb77ff29989f66b3d49c87ddc68224e4b1b5d64fece78cf82edcd7f93836e7583a77509a1d7c654846b107d378b9d94a044712aa0d281e3dae8cf1febbdc5f WHIRLPOOL fc196a8ae992f1b42f20843ca3f9d4ea62f0bcd74373153d1d6c63a7d68f67c719e22867d3e0a0acbdec88f3a921fcef3d1419662097685cfca5ec55ede723e9
 DIST 20111027-10gen-mms-agent.zip 25241 SHA256 e5625ce9029a376674d24b242527459403ac782d18c78d91beab93fa8f6783f1 SHA512 4064134ec33af7e9bc95a68082b08eb6ea203d94be807a49db86630383db3f5c73f45caee9c08de86afc48ee62e5f96de95bf44837fb395d048d3cde7bb55d15 WHIRLPOOL 44d58f24afa121eda7adc90bfc7740efa3492028928fb9d43111d02fedbd0431bcbced9cafc5430c07bdf6707f3f8f5ebc466f8f8d9bdd26e30e88a056ac2cc6
 DIST 20120514-10gen-mms-agent.zip 30130 SHA256 a305434e79ba97f1bac6a8942ee5fccb8fde11dedc9ae4bd8eb5f6ad2beaef88 SHA512 8faab37d31fa681d6abe0f969996426041fe7dfd3a5991f46b3a48fe2b000fe073eec17ea7fdc8aab6d55df9b9f2486c10c80675ec1090a59c1b9c5e94b605e3 WHIRLPOOL 53cb78049aab3f6f1866840aaf2eba84d772d75a13183767db62efefedf86d37b944944fee7a7cc897b753c1211df89c20614b2aba3beb07b4705dedf159628f
-DIST mongodb-src-r1.8.4.tar.gz 1727826 SHA256 c4e27bf22f2353e28ce169dbdbc24205baf863d1f61bd9a31b2230386cada4ae SHA512 3f0f96f772f3d01fbd2fae7887eb3d0cad711af074ce4234a7bc3212dbbd09e4cacbb5d268b3f89d515d110a5a042f7846d9df222e65ea040f1401981abe4acd WHIRLPOOL b178e012672f7f09270b9c94d267e860a77d5911809aa2f4b6aafd8d7cb79dfb9340a2b1428487253567c2af87952b4a58b9ca021655fb47f2523c92f39da257
+DIST 20120830-10gen-mms-agent.zip 30259 SHA256 9232813052f05376670724ae3da7ccff2a0515e8342d07c520cf6b9ae3e781d6 SHA512 84a7c07ffb18a34c5fc21e73b99f0b42a7b28a8aa33d56156c93a34c5cc9fba545788903117f3bfbe35d7b3a0f50e01c4ff8c9053cbf23317c84d739440878c8 WHIRLPOOL 61e89b7608f90b1994471f856aeae34e8cc1ec6d8168e804f5b3c2207702ac2334dc9ee18cf4e31facb212380a4956b008a3b296424d13e15178c65e868073ce
 DIST mongodb-src-r1.8.5.tar.gz 1729485 SHA256 3e4ef7a9b326c6516c66e3ad0dc093711a3a8b62019d22131a4786119644cf7a SHA512 503d825625f320686d3428afe9d1f31b458c332d04e0e334c75d460152431aa00f9d199ba76c7766c1f7e8932198a9e6492a5893c49ec428251a22968e598e62 WHIRLPOOL f1fa164c728cafc051ced303e4b5d4fc820a2ca4cc7f075c4260523816aed9ce0c3f57779acc33a5206010549f2de4e149e6d9caa0e3094aca27f983ad4352ec
-DIST mongodb-src-r2.0.6.tar.gz 2973489 SHA256 a972725a7dc3d079f8070d3631956141a7fe2f422d350e6cd3288c9e19fa314e SHA512 e19165e3f721c5bcac9a82b3965dceeebec9f1cefbbb6ef4f87c6f523179e8501d5e9bc5da569627a3e5e7eba7065be36cdbddf2acfa13e9e7ea85c56465971d WHIRLPOOL 11e2ca8de849f89f71e6cf27973ce498c50a8354e4c9ce8a02c0190c9a64d9656a7d60902c4b077df1bbf89a187e64ca3df774de70697cb0bfaf1bcb492d478d
 DIST mongodb-src-r2.0.7.tar.gz 2982999 SHA256 b204d94bc912692bdc154402fbfc2e5c4bd60b09dcbe244f3b2b7657f0a82736 SHA512 4c92d99433388f6829e990f3a065b7d897c0ef83a8b41e99613b1b7fbccd8d1797a048c4340d6dafed956dcb06785ac9784a4b68990020c5052b11368ec98806 WHIRLPOOL 159952c811eae62cdb6b4ad577351a8f6537b8fae1b2d2ad5e4dbdf07e14944aebff765ee896f48ce53cbd7d53b6bb0fc2da470226488f2957b5c6e6df07f3e4
-EBUILD mongodb-1.8.4-r1.ebuild 2483 SHA256 c7cb43fbbe1984c82248b8bf71bca49747bf71ac16208877d0a1a81b82a466f4 SHA512 494c074fb84f6f8687f015d404505741201d0926fe5cb87a58b4301bcc81fd4e53b1974734b724e8054894895e6f6a0713c4098d8219608c646ffd01d9a969cb WHIRLPOOL 0b48930a2f5baa413038229364059ef71219b87b3fe7c5c7f869484a9adaec913040587cef8edb88f4344c74132844f076c752fa9ac605ca828e9283b3050a1a
+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.6.ebuild 2790 SHA256 f0c36ef7da1216be15ff0e9db18fa0896d446326c4f8668652f16e990a93ce65 SHA512 85ac291bff74a8d01ce9e725c03418f08aa26c1bd08b3278933dd94d29b195f254c4a249fc643b4b5e24e69c7058eab9e47fb8b06130b2f06990a26c12d303cc WHIRLPOOL 73448f60dd9ccc5778db164167a54a7bfb1c77b1ff351ad37f08d7aea50eb88cecd36c8f27ec5633f4bbdf8babe61c69d0c76e2dddfb6717c5f395442d953a95
 EBUILD mongodb-2.0.7.ebuild 2790 SHA256 5f10bf9022a6a971bc995684fa5e7d967f9f1d2670cb010e8f3eb67312df5abf SHA512 f1bb5dee03a9ce98d9317fa28988020bd06829b555a1ee1f461dfdc24a14d5a279c5bfbc14e283086e3561521b7d192994d0eb3a7c8343a7a2664d0939044028 WHIRLPOOL 7faf7fd087349a41e1273c7afedcd7b8e7aec4ab7e9252bb6aa51443b59072dd1a44b04ffd0c9d34dd2308a1ca573cad4e1065d45d0ae7e11df810f230062df8
-MISC ChangeLog 9427 SHA256 8c7282b8fb6a455004f89a2e80ff5517bf5a3f6f49707a5d43796a3590fba384 SHA512 58427bc448508a815381d18202180408b4148afc858631d4fd27641eb0b8f25014085a18d796acf1db07b86849e069797602817f6ddef089668222802d9101e1 WHIRLPOOL 8496b5dd88de4e98893ae5ba070eda737bb20f2110c8241bfc6d41312705008cd35f9744d66c59c1320a8fa52919448af40e949b2e5a7de9bf8a4af9c191f611
+EBUILD mongodb-2.2.0.ebuild 2777 SHA256 b0b032459953b06fbcc340b67059eeb9b5e1a190aedc191ceb60b11e6e3e2016 SHA512 e18e51fc16d8d6f6499f04c9d196412e2badf0261ea99fef04d60fb771783d495142a113c052b500640e5915f1ed2d58c74de7476b7a4e6f039c90cda03893b0 WHIRLPOOL 3bacbc9972cfe203303e1f704199b66e7949083d86b96054ffb29a67692c3f2fbd10f512e59e33df24125fd3e38c8953a5d792d862c7125647de2d5a998a0e74
+MISC ChangeLog 9683 SHA256 d5e8309b5e67d7c986c6efeade46faef81ddd25da511bb175907a8385c1d544b SHA512 2bbb01d8b707aaa715f5fae6432e560148c063f0c16b146590be217c6ef6ec6d1fa7a3375b0c62a672c32e943faeeee45bdd85ab15f952e999b373f1d0c7a409 WHIRLPOOL f15e05a5b343f61ac69fa9502874142b6ea5b69e2e320d222442dec431123e164e087940e0dc02cb928f7a91f50a7bd358fe64f644c7930817c686e6e5ca6684
 MISC metadata.xml 997 SHA256 5393635a3190ef1304fc71686a7ee121d5175c5cf2e484b6be61a799a167e7d7 SHA512 b595fc3acff1f39a346a12cbe4ece1cb63b2e2e4b8dde93821d58ff01baa192ad115dff3edc2d34d15636fbcde3f5af29c57cd61d6338e8f7e60dcc70b2511da WHIRLPOOL 2fb6476062286ecaea8482593cee51491eb1ea5acf1f0527012bcfb296ff05d2d5cc42a5bfcdb0b31bfea2382f6e096dfa08ae03b834eb00b59eb8fcad02af29
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAx+YEACgkQKiQSS7ZY+hOcKwEAtvqrJtmbpJUSfxdtAmysXrbh
-dzGNb3j3Bcg1dI/ZVJ0A/2vrHcp+ZYlRbiJMqxPR9Td3/Nte/wx3OgU9LeIzbGML
-=mP4W
+iF4EAREIAAYFAlA/PSgACgkQKiQSS7ZY+hNLqQEAr/qrCFUk+TNv5ck4hWCEt88Z
+426lujBlq5pzBYuO02YA/2NZKBNx7LK+R0Wn9DlOOcQAW31yvgWkTTj5QVWSSLf6
+=o125
 -----END PGP SIGNATURE-----
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() {