fix #445686, drop old wrt #376983

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

6 files changed, 61 insertions, 37 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index fd87c149f542..0ea34f7b892d 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.54 2012/11/28 11:23:52 ultrabug Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.55 2013/01/18 11:19:27 ultrabug Exp $
+
+*mongodb-2.2.2-r1 (18 Jan 2013)
+
+  18 Jan 2013; Ultrabug <ultrabug@gentoo.org> -mongodb-1.8.5.ebuild,
+  +mongodb-2.2.2-r1.ebuild, files/mms-agent.initd, files/mongodb.initd,
+  files/mongos.initd:
+  Do not keepdir /var/run wrt #445686, obsolete version 1.8.5 moved to ultrabug
+  overlay wrt #376983
 
 *mongodb-2.0.8-r2 (28 Nov 2012)
 *mongodb-2.0.8-r1 (28 Nov 2012)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index a0a5b1c03db9..16ad324a0220 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -2,7 +2,7 @@
 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 mms-agent.initd 1277 SHA256 fda9a9eb7e2abceef572ffbad0987b74670b6b5e0c50d93f58ef8141825a2cea SHA512 32bdcadf7395f371809b253934f8c3dd0074e6aafccfab091f8bf699524eb32ffdc787b479e08056e2fac933f1627a5f1cc03842a2f8b939f8b68bb2e6da71c2 WHIRLPOOL a9f78afe5286e2762c27ab0a272e4e5719e070cbd9ab5f551ef322346bb3ff46d0b49c76906fe63f8c78c9bf6a11d720d2908044d5666e5dd98afdef55fca76e
 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
@@ -15,21 +15,18 @@ AUX mongodb-2.2-r1-fix-scons.patch 1950 SHA256 cd136dea1ee03cfe8009cfe1e78747811
 AUX mongodb-2.2-r2-boost-1.50.patch 9980 SHA256 e289811f7abb9525e7ba1c2904ab8c26b687c7c45601e8b7b7f83a8a2523526b SHA512 83b181301037c35810970e1163b4d01593bc60edce77514d99f74552ea981f0455552306a1f843cb4fae72489abd2ce8a91705a878ef540811f28c53dda2a5c0 WHIRLPOOL 03e4c56f1b364fb6917be67cff641799e85790714b240030c1fdbcc066d7b127db6533e53165bd8eaf2bca6e284f3be3899fafa1f78ce0734d9da4e14f18e8e8
 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
+AUX mongodb.initd 1213 SHA256 ee590071ade60cffdd28ce5bd1e685bcfb49878fb88a21adea0cf30867587ade SHA512 c0634af4653a3b3ca1a72671460e8ea11cce99b84a48782c5cdcc27453d7ead1e89a61d0ce225febda68913dd04e972b4d6a911060b1e5c4ecfbfc1e991e7b12 WHIRLPOOL 033940ab5396f02663ca7eabc99f0fe64268e190e0fc63ef0acaac541bfc67c38c20ddfe8bb1f89398220326875d1986db8112127a42e441ac8448d303c8535f
 AUX mongodb.logrotate 205 SHA256 76994c32d999def5c925bd7be3f96687b3406f1d67b89aa6a4df8053025b1e01 SHA512 8c089b1a11f494e4148fb4646265964c925bf937633a65e395ee1361d42facf837871dd493a9a2e0f480ae0e0829dbd3ed60794c5334e2716332e131fc5c2c51 WHIRLPOOL c1d94339a6e58363ba37bfd0f878ea6db403eaee02aa030891bfd54af1a61e34622286e560ba5217201435a745217b2da55d857fece83d5a94b12d915ad2940c
 AUX mongos.confd 345 SHA256 2afd582564623da0e928ca667d37bef467334c82d08b49301f1f6c16ba177767 SHA512 61d8734cef644187eeadc821c89e63a3fbf61860fe2db6e74557b1c6760fe83ba7549cb04f9e3aacea4d8e7e4d81a3b1bc0d5e29715eca33c4761adb17ea9ab7 WHIRLPOOL 39c338211f2dcc4dacc4e6463657339287a5da6f20b02c68f1bb5b084d5db14eed4da435b3ed2319d3bf9c415dd6a9d4a6a84c105872fd5513c6146c2b5afc1b
-AUX mongos.initd 1407 SHA256 a93069d7c7c3602437ce783c1aecd931854973230baae092ccee2cd9c078da7e SHA512 e2cb77ff29989f66b3d49c87ddc68224e4b1b5d64fece78cf82edcd7f93836e7583a77509a1d7c654846b107d378b9d94a044712aa0d281e3dae8cf1febbdc5f WHIRLPOOL fc196a8ae992f1b42f20843ca3f9d4ea62f0bcd74373153d1d6c63a7d68f67c719e22867d3e0a0acbdec88f3a921fcef3d1419662097685cfca5ec55ede723e9
-DIST 20111027-10gen-mms-agent.zip 25241 SHA256 e5625ce9029a376674d24b242527459403ac782d18c78d91beab93fa8f6783f1 SHA512 4064134ec33af7e9bc95a68082b08eb6ea203d94be807a49db86630383db3f5c73f45caee9c08de86afc48ee62e5f96de95bf44837fb395d048d3cde7bb55d15 WHIRLPOOL 44d58f24afa121eda7adc90bfc7740efa3492028928fb9d43111d02fedbd0431bcbced9cafc5430c07bdf6707f3f8f5ebc466f8f8d9bdd26e30e88a056ac2cc6
+AUX mongos.initd 1367 SHA256 e5f725d50cf737c33b7caf974c9ec3b4cadf016d0656196b7177edf5d1c2c4c8 SHA512 9a295086e7834de220682fd0a4e3f400031e54ca4009e811a2880118e4599ab48640a0ae27c86b520b4769a926de712908a9e9416a63fc6fe01823619ea43743 WHIRLPOOL e27230ee6d35b5f327cde9c5686d9e64091162de21bccd31b6b2b320cd6d49f773ba23ba14ec366b6bd2590047a0f05629248b1ae29fdf1e895cca572d20ca08
 DIST 20120514-10gen-mms-agent.zip 30130 SHA256 a305434e79ba97f1bac6a8942ee5fccb8fde11dedc9ae4bd8eb5f6ad2beaef88 SHA512 8faab37d31fa681d6abe0f969996426041fe7dfd3a5991f46b3a48fe2b000fe073eec17ea7fdc8aab6d55df9b9f2486c10c80675ec1090a59c1b9c5e94b605e3 WHIRLPOOL 53cb78049aab3f6f1866840aaf2eba84d772d75a13183767db62efefedf86d37b944944fee7a7cc897b753c1211df89c20614b2aba3beb07b4705dedf159628f
 DIST 20120830-10gen-mms-agent.zip 30259 SHA256 9232813052f05376670724ae3da7ccff2a0515e8342d07c520cf6b9ae3e781d6 SHA512 84a7c07ffb18a34c5fc21e73b99f0b42a7b28a8aa33d56156c93a34c5cc9fba545788903117f3bfbe35d7b3a0f50e01c4ff8c9053cbf23317c84d739440878c8 WHIRLPOOL 61e89b7608f90b1994471f856aeae34e8cc1ec6d8168e804f5b3c2207702ac2334dc9ee18cf4e31facb212380a4956b008a3b296424d13e15178c65e868073ce
 DIST 20121128-10gen-mms-agent.zip 31408 SHA256 be5314dcf2dbfe22b6acd6901fa7d436c336884738cf59f8a4aacf2ccf331052 SHA512 7077c8212089b335710319ba83255c676cbafa415b5adbfdd323f46c66129efd8b561fcdc2cbf892a9d43cb22b1ae7685bb2c427b3b0c001ffe910874fa9d817 WHIRLPOOL 90cc005441acff46a83a899c7e33852799b45a31d790c25642636fdd8ddda50e1e8e58835d4cb1eca89244a9f2622cff10a1d0e20d1f4d5c3509b0de6baf276b
-DIST mongodb-src-r1.8.5.tar.gz 1729485 SHA256 3e4ef7a9b326c6516c66e3ad0dc093711a3a8b62019d22131a4786119644cf7a SHA512 503d825625f320686d3428afe9d1f31b458c332d04e0e334c75d460152431aa00f9d199ba76c7766c1f7e8932198a9e6492a5893c49ec428251a22968e598e62 WHIRLPOOL f1fa164c728cafc051ced303e4b5d4fc820a2ca4cc7f075c4260523816aed9ce0c3f57779acc33a5206010549f2de4e149e6d9caa0e3094aca27f983ad4352ec
 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
-EBUILD mongodb-1.8.5.ebuild 2533 SHA256 98c542e4b5c4234d23d8419f3baf32b228cd83d58ef924d359a876ea83576770 SHA512 3afceeb057a613cb90c05f10c5639c109698ea45ba81ea16e783eef98654d62818ec34d9ed4e3d94d95e53a460541cf9941bbb0977c512c89c2363fe90635714 WHIRLPOOL aaba10b2c4d96b8e120ae7d895b9dac3eb16ff0d321df38b3c58f0eaa5053dfa0a843c39a93560674996403385251fe4a98dc356fabd468aef419d82cc4b80b9
 EBUILD mongodb-2.0.7-r1.ebuild 2697 SHA256 f0d0a33f8402c1d9590b78619c99cc34ee28f6331cc42be85ed1c35cf2b623a6 SHA512 ce40e655615964bbfc6e09a5d11fe0b125871f1c4c253e7436660c540fdb51ecb946d6771c2c105b1f1732c9a661e85c59dc56a326a9bf05a0233f8196f8cc81 WHIRLPOOL 91e132fd484b1b0190ddf508903c16a1e87d3fb2ed34958beaf8d3115d33e49a0dae351753ed18d7b7282f37bf3b7fa98a0edacd95c727db1abd5e7bd314dc5f
 EBUILD mongodb-2.0.7-r2.ebuild 2750 SHA256 83412b9cd73c04f7bed2d1588e61b6ae21a7624f42254adc2b10358e2130c739 SHA512 69d5e7588fc1d4fde4cd05652c737dcc35e5006f22ffb256c00b3a703a29dab601bb757f20d6a5745ff92dba31581cf8a440ef3650c1a973210234f1cd43827a WHIRLPOOL 3b1ebeb11d222180b5b9663f1af1e32162c6bd5841b5f98f00c6b2a6ce9f9d696cf4abbf8156377c0e59ab2ca20ecb5c89e33a6fda6b64ec6be08bf666f0a6ff
 EBUILD mongodb-2.0.8-r1.ebuild 2696 SHA256 dab0712c79422a36f35ae1448845d24f63e6441f9e50b75f37f1a390ac2e343d SHA512 6a2f74233f41f1a6bb42ed1fbb0c62252af6a2572699bbbfd62c033df026878d6d893b7b7f482fb124ff6bb9ad6651b3a0e3f9b8fddfb0d0d29454f752af6075 WHIRLPOOL e065820397177d9fe6325d4c4970f925d337d3f6a87a3a626c25370b5ed4b109d5e2b58a4e6d62e854cc5f9a3755f75e631688813830d5a4500c90b44f4b4f71
@@ -37,13 +34,14 @@ EBUILD mongodb-2.0.8-r2.ebuild 2749 SHA256 5a64c36a7819a24c32cfdb8ee9f1a5b99262f
 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.2.ebuild 3128 SHA256 4c30594e49d63e1378f791e335f47b2aa98e8ab26acd666bcfd663606248cf7b SHA512 9299f6a89147a44ad036680b50a55bd645eda5b099c669a71386e2d7d59293e6bf537727b4ec07b998d0ab15f7b3d03f808091bcec55b74419975d613c5a543b WHIRLPOOL 3cb9e202bdb97f12805396154650e150abaadb7f8da1e3466c0a3cbd311023bdd446f7817e4cf18e4c50c602e8479b95da83a591113b16e15426662ece0627b1
-MISC ChangeLog 12194 SHA256 d991e21bd7b356b41e3691a31c88c7f182b5f7c409f5c81a194ad1916ab46a81 SHA512 29664e84ba40c8a834ca4cdfd45be3ee6e0c3d2469ecf423846c94a02dd9febe14101323de9e762c49df2397f9ec0d7eb087af17634eac0a766fea9f8ef1f765 WHIRLPOOL 0e2dd898e3537e9ac9e4f696ca40087be25d4a1d5f9214752cb5cb27b2a6bc271b2ff9572395a0fad34d34ff344036dc4f69a485c3fa1268b400dcd79fe6d577
+MISC ChangeLog 12493 SHA256 54704cd5bcad44cbaf6c32e690d4c4a22f6c5ebc27ca7638a0555b3f9f788905 SHA512 445251e8e6bc7b73935e65399588485ec3281da67dc829ee53b0fb60d49e06a37cdb4a917c52c2b19e81a2e6e243fcae227bc0f628b7a6d56406c545a521735c WHIRLPOOL 077540945e8b1f956fea00f604479a137333ba0eefd0cf7409dbfff05c1a47511442fdf020f1cd192e9bc7b436e40cac224a0c76845144a8e1fee9da85cc9c2d
 MISC metadata.xml 997 SHA256 5393635a3190ef1304fc71686a7ee121d5175c5cf2e484b6be61a799a167e7d7 SHA512 b595fc3acff1f39a346a12cbe4ece1cb63b2e2e4b8dde93821d58ff01baa192ad115dff3edc2d34d15636fbcde3f5af29c57cd61d6338e8f7e60dcc70b2511da WHIRLPOOL 2fb6476062286ecaea8482593cee51491eb1ea5acf1f0527012bcfb296ff05d2d5cc42a5bfcdb0b31bfea2382f6e096dfa08ae03b834eb00b59eb8fcad02af29
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlC19E4ACgkQKiQSS7ZY+hOi8QD/ZDa1k0SnU8aHptSCk5udh/YM
-Qi6bIOX1y3M7IWesnbIBAJUTeS/GBLlK/8fZQE2tJ4fIZ4jbx9zPtbZsvQGvJvAs
-=2YNo
+iF4EAREIAAYFAlD5L8cACgkQKiQSS7ZY+hNEBgD/SwedFo8Ae7+vtYtILHIdOj3t
+j+T41bnj3i2kUlouaWwA/2Nob/lhAF6l8VblC71mokacFbuhtnvB6iV0qbgpNbGl
+=mtel
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mongodb/files/mms-agent.initd b/dev-db/mongodb/files/mms-agent.initd
index 45e42eaa1e1a..b296be7fc51b 100644
--- a/dev-db/mongodb/files/mms-agent.initd
+++ b/dev-db/mongodb/files/mms-agent.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2011 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/files/mms-agent.initd,v 1.2 2011/10/27 12:55:50 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mms-agent.initd,v 1.3 2013/01/18 11:19:27 ultrabug Exp $
 
 ROOTDIR=/opt/mms-agent
 PIDFILE=/var/run/mm-agent.pid
@@ -16,6 +16,8 @@ depend() {
 start() {
 	ebegin "Starting ${SVCNAME}"
 
+	checkpath -d -m 0755 -o root:root /var/run/
+
 	# Setup API/SECRETY KEYS
 	sed -i -e "s/^mms_key.*/mms_key = '${API_KEY}'/g" \
 		-e "s/^secret_key.*/secret_key = '${SECRET_KEY}'/g" ${ROOTDIR}/settings.py &>/dev/null
diff --git a/dev-db/mongodb/files/mongodb.initd b/dev-db/mongodb/files/mongodb.initd
index b4f05de52259..5b7b77eebf6b 100644
--- a/dev-db/mongodb/files/mongodb.initd
+++ b/dev-db/mongodb/files/mongodb.initd
@@ -1,15 +1,14 @@
 #!/sbin/runscript
-# Copyright 1999-2011 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/files/mongodb.initd,v 1.4 2011/08/26 12:38:49 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mongodb.initd,v 1.5 2013/01/18 11:19:27 ultrabug Exp $
 
 depend() {
 	need net
 }
 
 start() {
-	mkdir -p ${MONGODB_RUN:-/var/run/mongodb}
-	chown ${MONGODB_USER:-mongodb}: ${MONGODB_RUN:-/var/run/mongodb}
+	checkpath -d -m 0750 -o "${MONGODB_USER}":mongodb "${MONGODB_RUN}"
 
 	# Listen to MONGODB_IP if configured
 	[ -z "${MONGODB_IP}" ] || MONGODB_OPTIONS="--bind_ip ${MONGODB_IP} ${MONGODB_OPTIONS}"
diff --git a/dev-db/mongodb/files/mongos.initd b/dev-db/mongodb/files/mongos.initd
index 8a73340909f2..d0a4ea6525a5 100644
--- a/dev-db/mongodb/files/mongos.initd
+++ b/dev-db/mongodb/files/mongos.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2011 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/files/mongos.initd,v 1.2 2011/08/26 12:38:49 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mongos.initd,v 1.3 2013/01/18 11:19:27 ultrabug Exp $
 
 depend() {
 	need net
@@ -18,8 +18,7 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 
-	mkdir -p ${MONGOS_RUN:-/var/run/mongodb}
-	chown ${MONGOS_USER:-mongodb}: ${MONGOS_RUN:-/var/run/mongodb}
+	checkpath -d -m 0750 -o "${MONGOS_USER}":mongodb "${MONGOS_RUN}"
 
 	# Listen to MONGOS_IP if configured
 	[ -z "${MONGOS_IP}" ] || MONGOS_OPTIONS="--bind_ip ${MONGOS_IP} ${MONGOS_OPTIONS}"
diff --git a/dev-db/mongodb/mongodb-1.8.5.ebuild b/dev-db/mongodb/mongodb-2.2.2-r1.ebuild
index 13fd21119036..7509f10d9359 100644
--- a/dev-db/mongodb/mongodb-1.8.5.ebuild
+++ b/dev-db/mongodb/mongodb-2.2.2-r1.ebuild
@@ -1,18 +1,18 @@
-# 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-1.8.5.ebuild,v 1.1 2012/08/20 08:46:47 ultrabug Exp $
+# $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 $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
 
-inherit eutils multilib pax-utils scons-utils user versionator
+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/20111027-10gen-mms-agent.zip )"
+	mms-agent? ( http://dev.gentoo.org/~ultrabug/20121128-10gen-mms-agent.zip )"
 
 LICENSE="AGPL-3 Apache-2.0"
 SLOT="0"
@@ -20,11 +20,13 @@ KEYWORDS="~amd64 ~x86"
 IUSE="mms-agent static-libs v8"
 
 PDEPEND="mms-agent? ( dev-python/pymongo )"
-RDEPEND="!v8? ( =dev-lang/spidermonkey-1.8.2* )
+RDEPEND="
 	v8? ( dev-lang/v8 )
-	dev-libs/boost
+	>=dev-libs/boost-1.50[threads(+)]
 	dev-libs/libpcre[cxx]
-	net-libs/libpcap"
+	dev-util/google-perftools
+	net-libs/libpcap
+	app-arch/snappy"
 DEPEND="${RDEPEND}
 	sys-libs/readline
 	sys-libs/ncurses"
@@ -35,7 +37,12 @@ pkg_setup() {
 	enewgroup mongodb
 	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
 
-	scons_opts=" --cxx=$(tc-getCXX) --sharedclient"
+	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
@@ -44,9 +51,17 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.8-fix-scons.patch"
-	epatch "${FILESDIR}/${PN}-linux3.patch"
-	epatch "${FILESDIR}/${PN}-1.8.5-fix-smokepy.patch"
+	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() {
@@ -54,13 +69,13 @@ src_compile() {
 }
 
 src_install() {
-	escons ${scons_opts} --full --nostrip install --prefix="${D}"/usr
+	escons ${scons_opts} --full --nostrip install --prefix="${ED}"/usr
 
-	use static-libs || rm "${D}/usr/$(get_libdir)/libmongoclient.a"
+	use static-libs || rm "${ED}/usr/$(get_libdir)/libmongoclient.a"
 
-	use v8 && pax-mark m "${D}"/usr/bin/{mongo,mongod}
+	use v8 && pax-mark m "${ED}"/usr/bin/{mongo,mongod}
 
-	for x in /var/{lib,log,run}/${PN}; do
+	for x in /var/{lib,log}/${PN}; do
 		keepdir "${x}"
 		fowners mongodb:mongodb "${x}"
 	done
@@ -73,6 +88,9 @@ src_install() {
 	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}"