fix #457694 thx to Balint SZENTE

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

9 files changed, 77 insertions, 143 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index 04ff1ff99b17..1bd97427a8a6 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-db/mongodb
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.57 2013/03/05 14:08:39 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.58 2013/03/11 10:12:04 ultrabug Exp $
+
+*mongodb-2.2.3-r1 (11 Mar 2013)
+*mongodb-2.2.2-r2 (11 Mar 2013)
+
+  11 Mar 2013; Ultrabug <ultrabug@gentoo.org> mongodb-2.2.0-r1.ebuild,
+  mongodb-2.2.0-r2.ebuild, -mongodb-2.2.1.ebuild, -mongodb-2.2.2-r1.ebuild,
+  +mongodb-2.2.2-r2.ebuild, -mongodb-2.2.3.ebuild, +mongodb-2.2.3-r1.ebuild,
+  +files/mongodb-2.2-fix-sharedclient.patch,
+  files/mongodb-2.2-fix-x86client.patch:
+  install the mongoclient shared library wrt #460764 for 2.2.x versions thx to
+  Balint SZENTE, drop useless version
 
   05 Mar 2013; Ultrabug <ultrabug@gentoo.org> mongodb-2.0.7-r1.ebuild,
   mongodb-2.0.7-r2.ebuild, mongodb-2.0.8-r1.ebuild, mongodb-2.0.8-r2.ebuild:
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index c79cfdfcd5fa..acbcfd403a97 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -9,7 +9,8 @@ AUX mongodb-2.0-fix-scons.patch 1674 SHA256 eed2195cc758676efba624cac13ad03d0ab3
 AUX mongodb-2.0-r1-boost-1.50.patch 12282 SHA256 f224ee1e29e3cf7f93f91c5665398ed53f2b0dfc74bdf2eaac37efb303c4c432 SHA512 c4d18e78f482cf5423846082b112dc0c59aab3e70e601e9190aa60ec514773a4ecc93ec893a005002f57b4bad906faae3799e1b53ba1afe89f0d68e24cf8b5aa WHIRLPOOL 885a280fff1e00c1e7cc0f85b72a0c0ae2d889418c4245b81f37b8cd1943cc816c228b4efc166b416ace86d3f94bec57830f0c7982c79ecff1877d2009683ce5
 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-fix-sharedclient.patch 1281 SHA256 d30f74e091b08f475699913fabd43c32b085241680440177bb281e2317c1de1e SHA512 aa1cc55a595f40467c023626979934e4e15bc0a5432aab4450833021499fe0989a725f0d2659f693e849ede5d990de95a225c9ec39404b2d51f34f5a6c91ed6d WHIRLPOOL 9e29eafa482ba575ba1ba6add5bde3a0479c9cbddc993986fd18ea3f40b7e0b0a41e6da496b3a6ac5998bfb96b66b6ef248b5d71aa29b1559c44e403ceccf305
+AUX mongodb-2.2-fix-x86client.patch 743 SHA256 1cab0f44dad67a01f160d7a7322e5d3301b9d54c9fc4ea393844c2c4d8e4dc1e SHA512 aca84b3480e26727b8b13d731722bb3b7a85be8c45e3ac07c11526e965b131c9358b189f2ae6e6ceff180923346d012976364fffc00ee382415fb1fc183b6c67 WHIRLPOOL 36160796454431d9ed089dae6a1d543c2c4ef9bbd554c920f939ea83a6ab77e0d4fe16bdecdde5cdcef068e44969eb20cfa53a90af510b4c72c425bb4244f4e6
 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-2.2-r2-boost-1.50.patch 9980 SHA256 e289811f7abb9525e7ba1c2904ab8c26b687c7c45601e8b7b7f83a8a2523526b SHA512 83b181301037c35810970e1163b4d01593bc60edce77514d99f74552ea981f0455552306a1f843cb4fae72489abd2ce8a91705a878ef540811f28c53dda2a5c0 WHIRLPOOL 03e4c56f1b364fb6917be67cff641799e85790714b240030c1fdbcc066d7b127db6533e53165bd8eaf2bca6e284f3be3899fafa1f78ce0734d9da4e14f18e8e8
@@ -25,24 +26,22 @@ DIST 20121128-10gen-mms-agent.zip 31408 SHA256 be5314dcf2dbfe22b6acd6901fa7d436c
 DIST mongodb-src-r2.0.7.tar.gz 2982999 SHA256 b204d94bc912692bdc154402fbfc2e5c4bd60b09dcbe244f3b2b7657f0a82736 SHA512 4c92d99433388f6829e990f3a065b7d897c0ef83a8b41e99613b1b7fbccd8d1797a048c4340d6dafed956dcb06785ac9784a4b68990020c5052b11368ec98806 WHIRLPOOL 159952c811eae62cdb6b4ad577351a8f6537b8fae1b2d2ad5e4dbdf07e14944aebff765ee896f48ce53cbd7d53b6bb0fc2da470226488f2957b5c6e6df07f3e4
 DIST mongodb-src-r2.0.8.tar.gz 2983263 SHA256 882f0880609c9658793702af4da5183f49d85331600ae4d8997018367f4ae827 SHA512 f79ecc75bcf574886681b27198263cc9128ab6d865b71ae3a32ea366e9125f3c636fa45a7e94d8ee7acc04adb8da655f940da03e8a285d11d6b62b0c1cad23f5 WHIRLPOOL 21525830a69a8c734bdc39d979cd3abd3e7092ffa5b1e98392ca5e013e0bd7dd2e298792ba876e5c6098204fc73f35d5cf6186cb58e12f933de46fa903938c65
 DIST mongodb-src-r2.2.0.tar.gz 10150762 SHA256 084626e476ac747dfae143889c24a10f739cd54480af9bf253f50999f065608b SHA512 b040efe01457703d14d63f69b3fff79a09d6068a89b17d52ad7eb430f81d3f60fdba711cee628d55456a772d7e36fde7c683d4d71fa7d95225e436e28ccac163 WHIRLPOOL 43d12039aff75bdb12c41721ccf259b379245a655aba72472f2a973dad921d9a384f79356d6bfa9795b609f2011324b1e7100ff94b8b92f2834c40a3a9bbe653
-DIST mongodb-src-r2.2.1.tar.gz 10163588 SHA256 6ddc92c859c8d018bbdf5191c15e621dfe1505f71ddd039c26b20070f634a567 SHA512 d34182d397a34baeed02e8d50c46866bec7a70b1eedb7027c03eeb56f568dfe7fe0494aa83317acda305e8aed2dc118ff2c36dafcb8814bc4566ecafa83005e2 WHIRLPOOL ca22ad970114dce259ce95bfbb12a44244a1021888a43a142a4c94dd1fd8f2d64963845ff95eb1f45bb41fc3e75d25248133b47bcf1a0c241d2010eded0b6328
 DIST mongodb-src-r2.2.2.tar.gz 10171793 SHA256 e646abd0a9839dec11fa4f35089aad8e9aeef628bce7832ab40a3138c7462127 SHA512 004c321dc046ee59a3bdb2e672d6720d627b6a0d482afacf89b557846bc0600ac06623c94076fd41f62fc6d59660a8a80c5333d128e7482a9835e260f7238142 WHIRLPOOL 52f310acb1cbed1d296fbe3719c71c74cf3bf89ea1ad89bc8dbc6aafeafae3e719fdce479fcf5a9d95b29eaab2e6099111687ed748309a125c18dfb10782f20a
 DIST mongodb-src-r2.2.3.tar.gz 10178451 SHA256 dd292c73f8182eb201ae4dd4bd7132c79c56247a7bc4fcde9d09a5bc6c74978d SHA512 216bb448db731ff5b435edcc127ccd99ca6fc388d1814872915e3fb6584621263d1339d8bf4da8a37ae25911df3fc036fb0fb898998e0c37ec65f61d5e38d83a WHIRLPOOL ca9a78b8574e03ec40dc4a505f768c34af964435685768fb878d30827dcb6c4c6da32d13d705f6704febd299a5d0e03aa594a51ae6894b9bc14aad0134b8cf76
 EBUILD mongodb-2.0.7-r1.ebuild 2711 SHA256 5d1984f33f2b65ae656187e72e6ff1ba8efb01ff3c955d68aa415f90e7d743c0 SHA512 9da44d3e5c561bc6d1047acc27ee69aa994aeb3fdefd8950b2c7116f24aca19c9022fd2e8e20d19ae18c7315d0f54eea2dc6933f230ba7bd9acc63967d054a4e WHIRLPOOL e39cd55f6f2a207c0c4e2784e272a6b6c508931e1ec1b08893a02ef28f45a9574b12f36e3ab2c9b4ef5321397f40ee73acf884bb4b23897603d378590ce55947
 EBUILD mongodb-2.0.7-r2.ebuild 2764 SHA256 49ad98f7fe32140c1ce20efbd37cced09851c28c21f100bb744d0f160284a1d8 SHA512 07184bf67d1f6e6b6ca93e0fb9c5c93e64c08d6294e635622f0dc477fe3b93e6af7f3f8f7e9b1afe9c4c8a065d12d242e68f8d458e031bb2af0a678fa8c11771 WHIRLPOOL 92f1c2c0937277d0aab56981a1c8eefe97ba1c4f485cae47164a6dee21e9677ffdf744e2d057b15053ee895d38da2f8a5d8acd63801511c0e6e31b807721ffbb
 EBUILD mongodb-2.0.8-r1.ebuild 2711 SHA256 20c1e34c9aa9ed6f68e3254f0f3c994983c96353dd6d4a8d3c5d9f6bec43bf4e SHA512 11a6dfe0d6e79eda33c9e543c4272c24fd17459e70b4b95f123af6f6f2acffef4391d8140fca8eb4693761f68c6436dec093833f8fd4715dff7c02712d0b9707 WHIRLPOOL c030e509643fd1a4e58814b42f3439d7dbe42f91e0db1d8e67ed62be8479b36730a79835ef1709a9c0c0b5869f37f816c3239709a745db64464512e84e273336
 EBUILD mongodb-2.0.8-r2.ebuild 2764 SHA256 881e092666320cab5867607e776597990226c42f8030c4b8a606cbccbf4d73ac SHA512 d34fbb68bcffb3f12d75ef2b20584e9b0c21207402bdbf5617fe768ebe7fdf8669e180101b9d01d6ef6d3ff4ed14d2c6a44d98231f222540c3c32f8141055ab9 WHIRLPOOL 4649a6a7abbc46f027471d0d58982b3cae994cc812aa0a518bafcc54aa92c9caea9939351779f05419500a3d3e88ecb32eb6eabefb1cb4c9761a55ec2b5a1d65
-EBUILD mongodb-2.2.0-r1.ebuild 3088 SHA256 c3c69f2872d3d78468f4460a4a806c23e7bb8ad8d65a29b2271a0900b2f8a64b SHA512 fae6cf094e00ec4f5b7d32c29bd342393799dd4a92befd267e5b8d0d15b31e151aea01e3d0745de7b76604ae183a8fe5026162e3b7ebf8f870914411e021ff8d WHIRLPOOL 198cfb3bf9b46efff5ef4e232efd74acaeaa641b8004a9e15094a330f2f14d5f558c9c3d01371065e2cc723f8a3bd12268de078a19291eba34cbabdddbb9e97b
-EBUILD mongodb-2.2.0-r2.ebuild 3120 SHA256 39bf4f355364b890eb7b81f791b30d46ace933963bf5241ff447d5559b2526b9 SHA512 bd08f9e6777dbfb13678fe2cdc7d652535dfc34bd3d86ce68e2194d6e984745c93e521c01b2ab02df84039bd06374357c86f2b1a3be2e303b05e4663c3297f12 WHIRLPOOL eb863ea79c1f12ad055d5366aabdc92dd52839c05ea85f006c14e78bac33e9f1d9b6f3b27820ecf97d3ae7e2dc8fb721522102bfdb3faada6387500be9a7ae80
-EBUILD mongodb-2.2.1.ebuild 3129 SHA256 ced24f577d2f53bcb517cf660856b375ca984de407f96b09fe70433b2ded5947 SHA512 4908377b86c66c7660ba4d8607206911443744a8f3da727f36e6c69c599d99371defc1ceeedf8be7377b993ac7cd781dd55bd9e5b1963a709a0b3922a45bcf9c WHIRLPOOL e1cc648878293256202bbab2c003612a01ef634aacc47a01b590c3b82ba973821ed1b5778f91123df865f2329c8393d03a2ccbe4df450327f82d8a379c522507
-EBUILD mongodb-2.2.2-r1.ebuild 3127 SHA256 e9520261ac1f7b2144b5d198bfbf894f5fdd0d6682b95fa1ec221d8a405e04b8 SHA512 0f61d477dcbe5b011443aeba6d43a7c79a6db020649ea0ee98b358587b119d7c3dc388413f3cbfa2c55f57cf8a41a2876ee3be28efa9bcaa79c9b5ceecb6f711 WHIRLPOOL e25fe1ffc3bbeb1c8e3425902a8cc75f14d5e8dd391772f5e72d89126e5b07174186ea8c3401b1a6d860d6dcd14f3a532b3c3c7f071516933ce5a6c983ee7478
-EBUILD mongodb-2.2.3.ebuild 3124 SHA256 69922e4b04cda7a65384590cebb0328e9a6a5a3dcfe2762028ee22402fe86e74 SHA512 30ce0b6fb1614117059dd66c8009ffbd76c30c72e39840ea661486dfd5f347c60603ac8d6456f908c534bf592dce12d4cc322f108ef3a0b98cc8df228ee9b7ed WHIRLPOOL 9694ffd32690597393cb733796599b6efcbfe81a29757b8fc536e9345c4db1d331e664b035170cc9810a859f5b687ce43084c117bcfbb8d63fed3591ec81dfa4
-MISC ChangeLog 12887 SHA256 b421503c1b95eb09281fa377aae2d93c0ccf77a2416760b50925b3d973aa9a59 SHA512 ce517fa6fe9d1c683c6ebc5cf2d786649903b1681166d5b262646afb0bf5e60729c910b870c4bc3fcdaafe294e2e025a3bd4dbcba4973cc26f9d1e088d06dacd WHIRLPOOL c31cdd6dbd49105106b6e7fbccabeefa8c710993666b9a8693ab7c420f12867516cc8529056ec0556f89a3dc90c6ee43c64b7195fec63b88bddf71470cfee875
+EBUILD mongodb-2.2.0-r1.ebuild 3157 SHA256 c85f2348548fa1ebe69e9109737ac7e90ddc1840262a73cf91cca3ef9625ea2b SHA512 5e09361f7b73f00a8096001aed0832cf0e638ae1ef640ae0ac3ca937118a741cffb010d4128cbf4cf9a114822c1d00b6ea5006ab132a882285af401a82a82a4d WHIRLPOOL a1d7a95f9cb5bf7bfd78bf4324c377c338995b53a12a581ead1614de72f6a3531cb3d9392b08a5ca0e5c56b4ef7bbefff68fb2a4d425402d712fb5d8d938e3e6
+EBUILD mongodb-2.2.0-r2.ebuild 3189 SHA256 59f1b99644fac57c495dc31dfa62d4ee6b95a1518f9498e4fec22120e3e77fe5 SHA512 0d6ce4381382aee7d0d3222076b86d8db78f3c51ac14bd9e8c90bdaba0dbca40af0e80b7b3a6c97dcf8304a718047c8f014276926c46303c96efa7e9c84e550e WHIRLPOOL 27bec29ed64b346c97846c9af2335336bedac138fc9d1a2b0ae68de05124104f271b1534f4610fd21a92f56452da83489844b5597f57ad01acededd5f2dcf761
+EBUILD mongodb-2.2.2-r2.ebuild 3197 SHA256 68ced62004b36e64ab9113af84b124da7dec528d0ffbe7e11d1513a6652c0231 SHA512 cc73b197a7e04bc98024844a342d943d110dfa5d5d9d8529406aca21ee61afdced3cc6b7399cc6c7f619cc8e5fbb733000c83f53b40efee8e4f41d1e9bfbb6e6 WHIRLPOOL ec704ab6673661aa5de6247d80bc0da42502cb03305d81c77aa79c749be6a70677422e91093e87d34fb1e9b224765bd1444b701dba992aeee7a623c4fafa6e7c
+EBUILD mongodb-2.2.3-r1.ebuild 3197 SHA256 fbf43f6554c8442810d49ca3e7d3025fd3f8c53348650b5110f7ffa1aac84cb9 SHA512 f7ed9b8cf551adaedb1411d7a547e1923a01b5abdccc0018164ed1c766af4b2fde97e71d9a873d6c78b12bfee7abb03fb2a9de6a8517032f0241c92124296f50 WHIRLPOOL 606256bb6be5610b1282e77f77cfebf075af741b7b6ed364071b97b54a3d8c4c48f39bd5d3a9537e369789c7055de0580cae0da10a70147f9fa687c3aadecb8f
+MISC ChangeLog 13380 SHA256 f3602a5b70b8a036c8ed56643b08214bc60296e980b50b72fb3adb3b1d389254 SHA512 c1a654d4296476747cc60cd3577b89a1433631a10e3a71bc2a09eeb64acd4f8ead320652d9d45f99c24c9830b73aa46da3142152329f8de7e7b8e400a653620d WHIRLPOOL d3ae2f89a4d7e4fa11a413dd37bf5ecc6a04da090de6a25160f9cab16546ccb0ad90bb73a3b312616be04ad312c3796760e53b9311a6c1f9c37dbe0ad51a82dc
 MISC metadata.xml 997 SHA256 5393635a3190ef1304fc71686a7ee121d5175c5cf2e484b6be61a799a167e7d7 SHA512 b595fc3acff1f39a346a12cbe4ece1cb63b2e2e4b8dde93821d58ff01baa192ad115dff3edc2d34d15636fbcde3f5af29c57cd61d6338e8f7e60dcc70b2511da WHIRLPOOL 2fb6476062286ecaea8482593cee51491eb1ea5acf1f0527012bcfb296ff05d2d5cc42a5bfcdb0b31bfea2382f6e096dfa08ae03b834eb00b59eb8fcad02af29
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlE1/G0ACgkQKiQSS7ZY+hNnUAD9Fy43nTzGSeVq/qVHaH/ZiXwW
-oot+HeoQFTH9A7wQVhcA/jijqNNL3MgLWNH46+szURqS99a8LPRAgY9t4TL47oxk
-=8t4P
+iF4EAREIAAYFAlE9rfsACgkQKiQSS7ZY+hM8NAD+Pukcqbom3s6mlSu9aLtdLm5w
+NzhLq5xsdCiNmk8Ry5YA/i3WnbB+Lu6I4Lx/+NP6MQGtT/9OOekjqtrZ+vsgO6ia
+=0yP8
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mongodb/files/mongodb-2.2-fix-sharedclient.patch b/dev-db/mongodb/files/mongodb-2.2-fix-sharedclient.patch
new file mode 100644
index 000000000000..21e3f66c7cb6
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-2.2-fix-sharedclient.patch
@@ -0,0 +1,34 @@
+diff -urN mongodb-src-r2.2.0.orig/src/SConscript.client mongodb-src-r2.2.0/src/SConscript.client
+--- mongodb-src-r2.2.0.orig/src/SConscript.client	2012-08-28 08:28:11.000000000 +0300
++++ mongodb-src-r2.2.0/src/SConscript.client	2013-03-08 10:32:46.776436389 +0200
+@@ -3,7 +3,7 @@
+ # This SConscript describes build and install rules for the Mongo C++ driver and associated exmaple
+ # programs.
+ 
+-Import('env clientEnv')
++Import('env clientEnv has_option')
+ 
+ clientSource = [
+     'mongo/bson/oid.cpp',
+@@ -96,9 +96,11 @@
+     clientHeaders.extend(Glob('mongo/%s/*.hpp' % path))
+ 
+ mongoclient_lib = env.Library('mongoclient', clientSource),
++if has_option( "sharedclient" ):
++    mongoclient_slib = env.SharedLibrary('mongoclient', clientSource)
+ mongoclient_install = env.Install('#/', [
+         mongoclient_lib,
+-        #env.SharedLibrary('mongoclient', clientSource),
++        mongoclient_slib,
+         ])
+ env.Alias('mongoclient', mongoclient_install)
+ 
+@@ -135,6 +137,8 @@
+ prefix = GetOption("prefix")
+ 
+ env.Install(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')
++if has_option( "sharedclient" ):
++    env.Install(prefix + "/lib", '${SHLIBPREFIX}mongoclient${SHLIBSUFFIX}')
+ 
+ for x in clientHeaderDirectories:
+     env.Install(prefix + "/include/mongo/" + x,
diff --git a/dev-db/mongodb/files/mongodb-2.2-fix-x86client.patch b/dev-db/mongodb/files/mongodb-2.2-fix-x86client.patch
index f289d18da24b..197372c4b14e 100644
--- a/dev-db/mongodb/files/mongodb-2.2-fix-x86client.patch
+++ b/dev-db/mongodb/files/mongodb-2.2-fix-x86client.patch
@@ -1,13 +1,15 @@
-diff --git a/src/SConscript.client b/src/SConscript.client
-index 7a6bdc9..3fb55e5 100644
---- a/src/SConscript.client
-+++ b/src/SConscript.client
-@@ -134,7 +134,7 @@ env.Install(
+diff -urN mongodb-src-r2.2.0.orig/src/SConscript.client mongodb-src-r2.2.0/src/SConscript.client
+--- mongodb-src-r2.2.0.orig/src/SConscript.client	2013-03-08 10:32:46.000000000 +0200
++++ mongodb-src-r2.2.0/src/SConscript.client	2013-03-08 10:34:04.208437762 +0200
+@@ -136,9 +136,9 @@
  # install
  prefix = GetOption("prefix")
  
 -env.Install(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')
 +env.InstallAs(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')
+ if has_option( "sharedclient" ):
+-    env.Install(prefix + "/lib", '${SHLIBPREFIX}mongoclient${SHLIBSUFFIX}')
++    env.InstallAs(prefix + "/lib", '${SHLIBPREFIX}mongoclient${SHLIBSUFFIX}')
  
  for x in clientHeaderDirectories:
      env.Install(prefix + "/include/mongo/" + x,
diff --git a/dev-db/mongodb/mongodb-2.2.0-r1.ebuild b/dev-db/mongodb/mongodb-2.2.0-r1.ebuild
index 039d469efb09..dacba831162b 100644
--- a/dev-db/mongodb/mongodb-2.2.0-r1.ebuild
+++ b/dev-db/mongodb/mongodb-2.2.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.2 2012/11/22 03:45:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.0-r1.ebuild,v 1.3 2013/03/11 10:12:04 ultrabug Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@@ -37,7 +37,7 @@ pkg_setup() {
 	enewgroup mongodb
 	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
 
-	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
+	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX) --sharedclient"
 	scons_opts+=" --use-system-tcmalloc"
 	scons_opts+=" --use-system-pcre"
 	scons_opts+=" --use-system-snappy"
@@ -53,6 +53,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.2-r1-fix-scons.patch"
 	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
+	epatch "${FILESDIR}/${PN}-2.2-fix-sharedclient.patch"
 
 	# FIXME: apply only this fix [1] on x86 boxes as it breaks /usr/lib symlink
 	# on amd64 machines [2].
diff --git a/dev-db/mongodb/mongodb-2.2.0-r2.ebuild b/dev-db/mongodb/mongodb-2.2.0-r2.ebuild
index 3499d22e1069..ec0db37d4e01 100644
--- a/dev-db/mongodb/mongodb-2.2.0-r2.ebuild
+++ b/dev-db/mongodb/mongodb-2.2.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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-r2.ebuild,v 1.2 2012/11/22 03:45:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.0-r2.ebuild,v 1.3 2013/03/11 10:12:04 ultrabug Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@@ -37,7 +37,7 @@ pkg_setup() {
 	enewgroup mongodb
 	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
 
-	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
+	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX) --sharedclient"
 	scons_opts+=" --use-system-tcmalloc"
 	scons_opts+=" --use-system-pcre"
 	scons_opts+=" --use-system-snappy"
@@ -54,6 +54,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.2-r1-fix-scons.patch"
 	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
 	epatch "${FILESDIR}/${PN}-2.2-r2-boost-1.50.patch"
+	epatch "${FILESDIR}/${PN}-2.2-fix-sharedclient.patch"
 
 	# FIXME: apply only this fix [1] on x86 boxes as it breaks /usr/lib symlink
 	# on amd64 machines [2].
diff --git a/dev-db/mongodb/mongodb-2.2.1.ebuild b/dev-db/mongodb/mongodb-2.2.1.ebuild
deleted file mode 100644
index fdf9c00cbd5b..000000000000
--- a/dev-db/mongodb/mongodb-2.2.1.ebuild
+++ /dev/null
@@ -1,116 +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-2.2.1.ebuild,v 1.2 2012/11/09 16:08:37 flameeyes Exp $
-
-EAPI=4
-SCONS_MIN_VERSION="1.2.0"
-
-inherit eutils 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[threads(+)]
-	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
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.2-r1-fix-scons.patch"
-	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
-	epatch "${FILESDIR}/${PN}-2.2-r2-boost-1.50.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}"
-}
diff --git a/dev-db/mongodb/mongodb-2.2.2-r1.ebuild b/dev-db/mongodb/mongodb-2.2.2-r2.ebuild
index 7509f10d9359..1a686f8c248d 100644
--- a/dev-db/mongodb/mongodb-2.2.2-r1.ebuild
+++ b/dev-db/mongodb/mongodb-2.2.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.2-r1.ebuild,v 1.1 2013/01/18 11:19:27 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.2-r2.ebuild,v 1.1 2013/03/11 10:12:04 ultrabug Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@@ -37,7 +37,7 @@ pkg_setup() {
 	enewgroup mongodb
 	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
 
-	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
+	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX) --sharedclient"
 	scons_opts+=" --use-system-tcmalloc"
 	scons_opts+=" --use-system-pcre"
 	scons_opts+=" --use-system-snappy"
@@ -54,6 +54,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.2-r1-fix-scons.patch"
 	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
 	epatch "${FILESDIR}/${PN}-2.2-r2-boost-1.50.patch"
+	epatch "${FILESDIR}/${PN}-2.2-fix-sharedclient.patch"
 
 	# FIXME: apply only this fix [1] on x86 boxes as it breaks /usr/lib symlink
 	# on amd64 machines [2].
diff --git a/dev-db/mongodb/mongodb-2.2.3.ebuild b/dev-db/mongodb/mongodb-2.2.3-r1.ebuild
index 373991c9acdd..f0170cbbebb7 100644
--- a/dev-db/mongodb/mongodb-2.2.3.ebuild
+++ b/dev-db/mongodb/mongodb-2.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.3.ebuild,v 1.1 2013/02/02 19:04:05 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.3-r1.ebuild,v 1.1 2013/03/11 10:12:04 ultrabug Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@@ -37,7 +37,7 @@ pkg_setup() {
 	enewgroup mongodb
 	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
 
-	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
+	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX) --sharedclient"
 	scons_opts+=" --use-system-tcmalloc"
 	scons_opts+=" --use-system-pcre"
 	scons_opts+=" --use-system-snappy"
@@ -54,6 +54,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.2-r1-fix-scons.patch"
 	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
 	epatch "${FILESDIR}/${PN}-2.2-r2-boost-1.50.patch"
+	epatch "${FILESDIR}/${PN}-2.2-fix-sharedclient.patch"
 
 	# FIXME: apply only this fix [1] on x86 boxes as it breaks /usr/lib symlink
 	# on amd64 machines [2].