[gentoo-commits] dev/ultrabug:master commit in: dev-db/mongodb/, dev-db/mongodb/files/

[Alexys Jacob]

commit:     e86ef1cc440a7e54c452fbdc4bbb18ce2541f966
Author:     Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  2 13:20:09 2015 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Mon Mar  2 13:20:09 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=e86ef1cc

WIP mongodb-3.0.0 ebuild

---
 dev-db/mongodb/Manifest                            |  22 ++--
 dev-db/mongodb/files/mms-agent.confd               |   9 --
 dev-db/mongodb/files/mms-agent.initd               |  41 ------
 .../mongodb/files/mongodb-2.2-r1-fix-boost.patch   |  13 --
 dev-db/mongodb/files/mongodb-2.4.8-fix-grsec.patch |  24 ----
 ...x-scons.patch => mongodb-3.0.0-fix-scons.patch} |  35 +++--
 dev-db/mongodb/files/mongodb.conf                  |   8 --
 dev-db/mongodb/files/mongodb.conf-r3               |  34 +++++
 dev-db/mongodb/files/mongodb.confd                 |  14 --
 dev-db/mongodb/files/mongodb.confd-r2              |  12 ++
 dev-db/mongodb/files/mongodb.initd-r1              |  40 ------
 dev-db/mongodb/files/mongodb.initd-r2              |  27 ++++
 dev-db/mongodb/files/mongos.conf-r2                |  30 +++++
 dev-db/mongodb/files/mongos.confd                  |  16 ---
 dev-db/mongodb/files/mongos.confd-r2               |  12 ++
 dev-db/mongodb/files/mongos.initd-r1               |  50 -------
 dev-db/mongodb/files/mongos.initd-r2               |  27 ++++
 dev-db/mongodb/mongodb-2.5.4.ebuild                | 145 ---------------------
 dev-db/mongodb/mongodb-3.0.0_rc11.ebuild           | 144 ++++++++++++++++++++
 19 files changed, 320 insertions(+), 383 deletions(-)

diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index c5a53ce..6ad2cec 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,16 +1,12 @@
-AUX mms-agent.confd 205 SHA256 29e678e722268311fb59f5af57ac3fbadb9e930cd3cb1ce9e4dc33d30e021e40 SHA512 e81e68ebad2d409a9e631de0aaf264eab99b3faa5c313a7c96a6672a6c51d3243100f5ef599bf2a347b4f9e1b1a6ebf95fa890cb614d9745c58430fadd8ee13a WHIRLPOOL 24d98082e138dbcee0a276c4874d88a23f7f53d1bf0f6a7f2e979c005413f14809269622ecd013913221a267eb1fc806130d69915ce5cd38a646b498912ca729
-AUX mms-agent.initd 1277 SHA256 fda9a9eb7e2abceef572ffbad0987b74670b6b5e0c50d93f58ef8141825a2cea SHA512 32bdcadf7395f371809b253934f8c3dd0074e6aafccfab091f8bf699524eb32ffdc787b479e08056e2fac933f1627a5f1cc03842a2f8b939f8b68bb2e6da71c2 WHIRLPOOL a9f78afe5286e2762c27ab0a272e4e5719e070cbd9ab5f551ef322346bb3ff46d0b49c76906fe63f8c78c9bf6a11d720d2908044d5666e5dd98afdef55fca76e
-AUX mongodb-2.2-r1-fix-boost.patch 870 SHA256 885991e16aecc66d88b40418531a66449ab8e434ca677acc7814e7485231e841 SHA512 902c11e15e26be6c64053b4f3c0d0fda1670373fa3a5805063b49957843173b3663f6271ae541bb07aedf884a9861099bb1f452761f7baeaa819f14eb0755336 WHIRLPOOL b5df66a5e90202db903989c66b7423103ca1a666a477175c1746c94d5cf250ac4ceb2d237737ee2bfc158a8f9c611916e91d5133ba94e544abbaaec8b0d0361a
-AUX mongodb-2.4.8-fix-grsec.patch 824 SHA256 65a50faa697f4e76eaf87b459121b8ba7c04d028a5524939296db2ca701cf2fb SHA512 7dac727a63dab7713a85f7d483f68a6fe9ed7c5ef06324a899a558d118857e9937c5e48e1fe2ae2063d1442c17b68b60b6c14934184a2badf4ecc9b3f68731bd WHIRLPOOL feef78707135bd128c21a5c344bbf25eef1ef796b236461656baa6299a0335759fff42103c36aebca1afcb23697f4ff42df382ceb2d05d0f90e913cfdac0e597
-AUX mongodb-2.5.4-fix-scons.patch 1355 SHA256 02b90cf2a6f35df5021d8985b1bddd8c0f65d4764f59469c3c51e46864bac02f SHA512 f2f0e1439bab449951696f6d49f32e89dba0f848391475354d0b4d34e325a88604c8e87d2fe85701b5dcb7958a22714df283e79ba61bbd0b93f5b20d0914923c WHIRLPOOL 7fb2929f03744819395c00ef2eefc3fcb91fa00dc436348a69dbca55d2ac1c18c9d76c7d29dfb47aff751088d9798061f588bb4b22a94353229d39d65f6090af
-AUX mongodb.conf 246 SHA256 8010ce728d657524cd76b5afda7ffbc1cc389642336b12b89cec5df2b09fc0e4 SHA512 05dead727d3ea5fe8af1a3c3888693f6b3e2b8cb7f197a5d793352e10d2c524e96c9a5c55ad2e88c1114643a9612ec0b26a2574b48a5260a9b51ec8941461f1c WHIRLPOOL 17a27daaa7892140d741256cf9acaf2f2909a545f350c936183aeb7b6671c25a3dc11f191b01ed008195965b8cc39b49f1a3a8c69cfd90c4ca57b9fa2732beff
-AUX mongodb.confd 361 SHA256 a4ca29c577428c02cd0b0a8b46756df5f53a05519c9d13c270533cf99b9b819d SHA512 9bcd870742c31bf25f34188ddc3c414de1103e9860dea9f54eee276b89bc2cf1226abab1749c5cda6a6fb0880e541373754e5e83d63cc7189d4b9c274fd555c3 WHIRLPOOL 35d785763d0cb1e21516a3fa15332d6c93d35e6faea02b60f81c389878dd89fe026504c6cfce5e9abfc8353f74b0e959a7501373d2a389f269c6952d33e8d2e8
-AUX mongodb.initd-r1 1215 SHA256 d56c5e301a7c35bcc60fa60859eee56342be7e4911edd19e519804bcf08a5ef0 SHA512 d09b6786f986edafceba4042dbfd29f336996af93f11cd92c3dcc267d7cb522946e6800cb75fae9d02ee1490856b218be96012b132766deb0240fdaf4a65e6b7 WHIRLPOOL 416fdef48831961d410fb85f18148f70455bfc005e1f788c0f3fa035e8a4fc0c1001b1a1b37878018bdd3ba927843d7b0a0ca4c2850c9d57e21c74388cb1e077
+AUX mongodb-3.0.0-fix-scons.patch 1809 SHA256 ee6d798b9855b304a42766cc018ecb4c76f26db24f4a64d75186ca15b55b3369 SHA512 5395e1d42697b3ce45d33148d7b47c40002be46eed44bf15c7efca3ab0fcf0360cb7e347bd2784fc59adaf9b2c20069618a870fa02c6cee139e7384fe1d3ec42 WHIRLPOOL cab688cf65d5537874252a4af0fab6de6982381b02418a102b9485a1fd664bec0d6a6d033b590ef03980ab577c4646cdd820b303ec8d31d4b2055ecfef0e4696
+AUX mongodb.conf-r3 722 SHA256 b4009296b3e794fa1686aec0502b01431e94fc4754cb66d1f00bad64dcb24e72 SHA512 ef193bfed673477aa0e868114bd52be6675492c164f218c71ccd02c4a620b5c4799ea1d18df0c3f2b364027b9f25e60ac4475bb216b25e1dc10bfd00a9f5d45d WHIRLPOOL f536abc8102f20c94bf19c9691345a31eaed84768a413d508437b0aab5100e36cb29f193e0d90e1b76d13892789bd9a9bd815d0f76491df0db375315df7a135e
+AUX mongodb.confd-r2 549 SHA256 6275df7b1bbee218545331d68da3814d0e0fa89d3b30e21370bbeb776dd19e0a SHA512 75f11e8350e98b90eccafd577d794e4b05f36ede8d95e7839e9fa1eb77ea7bd9cdd2fdd07719abb78a714cd7d72109c177d265d6417ef198a4217453c0a4db68 WHIRLPOOL 974eeb5dd58d52670121b2e8e687250cae4d5c49ec020dc30746bf39356762d63f41371526744f2b9fdd657134e7570d7501a3ce5995e830e039cc9eeb8a427e
+AUX mongodb.initd-r2 767 SHA256 0b626b9961dbf4b30e41831305718db4091d781cc773df7abba852a3ed1307fc SHA512 f3e6c247e7d368d1ffba04aab4a555235dcac8c0982c256448f37368f87acea467eee8e63cdb92884de8db560e1a7ccd25abe9c747c2d467bdf43836aa8ea9ca WHIRLPOOL a7909eb3bcaff5ac74e0fb46589e88b0e7b7f197106546b77f5840865914fbc6855ab3a995d3e32ecb59ebaa55d75303042c43ad477afdb445a28811d98a254a
 AUX mongodb.logrotate 205 SHA256 76994c32d999def5c925bd7be3f96687b3406f1d67b89aa6a4df8053025b1e01 SHA512 8c089b1a11f494e4148fb4646265964c925bf937633a65e395ee1361d42facf837871dd493a9a2e0f480ae0e0829dbd3ed60794c5334e2716332e131fc5c2c51 WHIRLPOOL c1d94339a6e58363ba37bfd0f878ea6db403eaee02aa030891bfd54af1a61e34622286e560ba5217201435a745217b2da55d857fece83d5a94b12d915ad2940c
 AUX mongodb.service 220 SHA256 19f55ab28652b3817e98fc3f15cc2f6f3255a5e1dfd7b0d5a27c9ba22fd2703e SHA512 177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9 WHIRLPOOL 0f6e032acbc7f625b03dcec990126cef064925a341e38c27cddbed5a951c8cfeded00ee3b8b0d9044245c833e86748262434665342e6baa98500fb02c07f4281
-AUX mongos.confd 345 SHA256 2afd582564623da0e928ca667d37bef467334c82d08b49301f1f6c16ba177767 SHA512 61d8734cef644187eeadc821c89e63a3fbf61860fe2db6e74557b1c6760fe83ba7549cb04f9e3aacea4d8e7e4d81a3b1bc0d5e29715eca33c4761adb17ea9ab7 WHIRLPOOL 39c338211f2dcc4dacc4e6463657339287a5da6f20b02c68f1bb5b084d5db14eed4da435b3ed2319d3bf9c415dd6a9d4a6a84c105872fd5513c6146c2b5afc1b
-AUX mongos.initd-r1 1370 SHA256 d4c9f32f0f001ae7cfe2b35034fd8e5a24a83fd1bc89941550c68fd98a3c9454 SHA512 28aea696b53bb557d41c5cb501ae30a72470750eb49e59442df67e98b087008fdc75e41d516443b7cc5cb5eb9aa710b98455d7955a4c1b76869ef841e67417b4 WHIRLPOOL db36b6250ef6fdbd4aec5bd249593ba81a2af44aefc26ad3ab2b04af5a4b6e84e416e0b90c4f3bb98dcaf182aeb1eab93bb8bebcdbe539881ca2c595e3e5d137
-DIST 20130821-10gen-mms-agent.zip 31918 SHA256 b48f35fe2ad058dc4ebcab01dad1229c0597e78a9011b57cd1030a05cdd16e7c SHA512 9467d229829076733a023d81e377479e1e4c71c4d2c1d163928abf7215bc87809a304768f83b531b6f585d19b18585f9d0d35fd74762cf180586be11536eb1a8 WHIRLPOOL d632c1761d1f47f2139a046d58af09641a0c8d9f3168d7ebc99dac5c6a3b5b0846cba8eac581b67d35c5e7580c6910759503b85e7ca74e5930c0e0dac3d77c97
-DIST mongodb-src-r2.5.4.tar.gz 14198740 SHA256 18a83049fabb3bbc6e9519c3e20b6c4e412ae1f0f8e4c7684994e3ed919f969c SHA512 23bda909d4c74aef080e0a3c1ead92cb2a96a68f85e6835da1b2a2edfb88271cd5ca6379a4bfcba1902dd9c7c192efc6bd22795efd8c9be6290c7575b80b098a WHIRLPOOL 8932c85cd759fb67db1655e24278c90beb27d01696959e2e9c07848a51442d23197dc7bb94e59231c722a8754c551fc77b3b231a968578298c30b7e5f5b0b03c
-EBUILD mongodb-2.5.4.ebuild 3676 SHA256 4e79b23d37a5a168d26dc9d01b86eb836dc992efca0a8dab1a4b6e789a68bd99 SHA512 83e3fa6f61d97d23c16c167b7d5011338eac82d4d1188ec3f7e981aefbc1eb5ce17419c2a123bb2af973ce754edf1c686759f74933b9d42f04e53db4245b7e3e WHIRLPOOL d77ade6020bafe46d9ef4a88745ed15a88bcf6c3ad199354e60563ab3588dcf7ff72589ec38d1a49b8736ac4a03e50f3008db5ce06050c743fd8fbd693cbfbdc
+AUX mongos.conf-r2 648 SHA256 d1bf479cee999b4e59e5100c134cd3e7af4bb126342418100cf8f9a08a26f6a7 SHA512 5aa8ced8d83572358e008c0df45dbe72a2e9c0003c9f49514d6b91bf9b75d4fb48b189ffe00d14e5675679943a05215a9873c5c9bde9ab1be4ed4813e75714e3 WHIRLPOOL f1036ea1bd7efa54d28d131dd1bfd1e06c1c3ffbf247ee68a33eee0383d87bf3bfa6639040e6b68a0a14cce0bd77bd5b91a8e245f615007fccccb0cbe2becd84
+AUX mongos.confd-r2 546 SHA256 1378a880ffde0efae213ac6d6d4bbe2181c92fbb06535a58c2dab06ef88ee8e3 SHA512 30e208690b5f28bd0442b7ed302d9be991aedd27203f24e5849201d33291ad7f0f9153ae3a00b55697d79a45c40d7b3792ff45f0c24ef2cf4e88222f88ea1400 WHIRLPOOL 68b8eed779e19261c4d13ebd6be8c11b6df94e748bb8f03d632ecbfc5fcd151a693e51c5a4ad4f0af9439d07dedafc29bd9b86b5a532bad48d570fca73002987
+AUX mongos.initd-r2 766 SHA256 673c0662c0638a77cb5f630605a828a6191abd0c4e9bd295b43d7b4aefeb2e1a SHA512 620062890f13bee96a1ff3b1c6900b8e08358481aae7476187eddee8f56f89e4a3d4351df88c9264fdf5e773f57e1c28337b6086a33fa97246005bfd027e0b6d WHIRLPOOL 74094c383596a1c24ced57aea1943ec86e6c98dad3a615fbf9bfc59969aaee2571c7f99a44de879864466fba9efd780f7187a5a95da04faf094f0ce3cd8031f7
+DIST mongodb-src-r3.0.0-rc11.tar.gz 25593196 SHA256 abf4d95593eff55d029620734fe72cddee72f3a86c549af0323b9e2715a674ef SHA512 2b04bf2dfd7e474a09103104d09bd911beb73b93b80074395d87c43badd25343d003f7649abef9fffb01bf54159bf599e63492b2401effedfda48c798d25ec58 WHIRLPOOL 01606d06084f88c18963522909ad251ec64adb29b2369b7a01a9e9049b3143f936b26bfcb74abf53851ee30ec86de0c352fdcb91ded04fbf13bd00ffd7023ac3
+EBUILD mongodb-3.0.0_rc11.ebuild 3965 SHA256 52964eae4ce388c6193c91034448c60a052dbe2a6ed7e901ad3fa46d14df260d SHA512 9f263de53de421872d39a6e219540a9fa1cecce95aeb0cac215a01fa482270e82236a3c484920ed44eb5673707effd3f1d2b936b10f693d4de31b353326cfe03 WHIRLPOOL 8f34660cb02823b5222785763dda9e43bcf8804613624067ea075226d87c06ec6b1a1d7c303c2d38938a063591ac33f2e79e8ba43defe3d1c896fb2f628991b4
 MISC metadata.xml 1090 SHA256 bb0066679f4a7ee9f21238becfdf1cb6e38489c1a9d46e0671d4098455f886ea SHA512 b4e4fec0815ac98c85b437f2155f4620b91fe24e81f559b92901038f68534e07dc91ae77ac609311e9febbe64b8ef0ad5ad164346cdb466e28bf1732ed18048a WHIRLPOOL b5305d0cbc7398d66d9e26b14adeaccfeeee8d0d24fad8bb957517273b97f94b0feb1afc1bdefaa01ea06502c570376e8e7a0ce68dca76c8ae5dbbf686d6458a

diff --git a/dev-db/mongodb/files/mms-agent.confd b/dev-db/mongodb/files/mms-agent.confd
deleted file mode 100644
index d19b21e..0000000
--- a/dev-db/mongodb/files/mms-agent.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# Your API key  - See: http://mms.10gen.com/settings
-API_KEY=""
-SECRET_KEY=""
-
-# Seconds between Mongo status checks
-#COLLECTION_INTERVAL=56
-
-# Seconds between cloud configuration checks
-#CONF_INTERVAL=120
\ No newline at end of file

diff --git a/dev-db/mongodb/files/mms-agent.initd b/dev-db/mongodb/files/mms-agent.initd
deleted file mode 100644
index b296be7..0000000
--- a/dev-db/mongodb/files/mms-agent.initd
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/sbin/runscript
-# 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.3 2013/01/18 11:19:27 ultrabug Exp $
-
-ROOTDIR=/opt/mms-agent
-PIDFILE=/var/run/mm-agent.pid
-EXEC="/usr/bin/env python agent.py"
-LOGFILE=/var/log/mongodb/mms-agent.log
-
-depend() {
-	need net
-	use syslog
-}
-
-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
-
-	# Tune the agent
-	[ -z "${COLLECTION_INTERVAL}" ] || sed -i \
-		-e "s/^collection_interval.*/collection_interval = ${COLLECTION_INTERVAL}/g" ${ROOTDIR}/settings.py &>/dev/null
-	[ -z "${CONF_INTERVAL}" ] || sed -i \
-		-e "s/^conf_interval.*/conf_interval = ${CONF_INTERVAL}/g" ${ROOTDIR}/settings.py &>/dev/null
-
-	start-stop-daemon --start --chdir ${ROOTDIR} --exec ${EXEC} \
-		--pidfile "${PIDFILE}" --make-pidfile --background \
-		--user mongodb:mongodb --stdout ${LOGFILE} --stderr ${LOGFILE}
-	eend $?
-}
-
-stop() {
-	ebegin "Requesting ${SVCNAME} to stop"
-	start-stop-daemon --stop --pidfile "${PIDFILE}"
-	eend $?
-}

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
deleted file mode 100644
index b6c9a1e..0000000
--- a/dev-db/mongodb/files/mongodb-2.2-r1-fix-boost.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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.4.8-fix-grsec.patch b/dev-db/mongodb/files/mongodb-2.4.8-fix-grsec.patch
deleted file mode 100644
index cff7d0f..0000000
--- a/dev-db/mongodb/files/mongodb-2.4.8-fix-grsec.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/mongo/db/db.cpp	2013-12-31 10:47:50.125065072 +0100
-+++ b/src/mongo/db/db.cpp	2013-12-31 10:50:49.252477950 +0100
-@@ -528,6 +528,7 @@
-     /// warn if readahead > 256KB (gridfs chunk size)
-     static void checkReadAhead(const string& dir) {
- #ifdef __linux__
-+    try {
-         const dev_t dev = getPartition(dir);
- 
-         // This path handles the case where the filesystem uses the whole device (including LVM)
-@@ -561,6 +562,13 @@
-                 }
-             }
-         }
-+    }
-+    catch (const std::exception& e) {
-+        log() << "unable to validate readahead settings due to error: " << e.what()
-+              << startupWarningsLog;
-+        log() << "for more information, see http://dochub.mongodb.org/core/readahead"
-+              << startupWarningsLog;
-+    }
- #endif // __linux__
-     }
- 

diff --git a/dev-db/mongodb/files/mongodb-2.5.4-fix-scons.patch b/dev-db/mongodb/files/mongodb-3.0.0-fix-scons.patch
similarity index 53%
rename from dev-db/mongodb/files/mongodb-2.5.4-fix-scons.patch
rename to dev-db/mongodb/files/mongodb-3.0.0-fix-scons.patch
index 79076a0..a2965ca 100644
--- a/dev-db/mongodb/files/mongodb-2.5.4-fix-scons.patch
+++ b/dev-db/mongodb/files/mongodb-3.0.0-fix-scons.patch
@@ -1,6 +1,6 @@
---- a/SConstruct	2014-01-13 11:53:09.523206053 +0100
-+++ b/SConstruct	2014-01-13 11:55:03.561532653 +0100
-@@ -837,18 +837,16 @@
+--- SConstruct.orig	2015-02-05 16:33:41.000000000 +0000
++++ SConstruct	2015-02-18 08:21:23.120134258 +0000
+@@ -1008,7 +1008,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",
@@ -8,25 +8,40 @@
                           "-pthread",
                           "-Wall",
                           "-Wsign-compare",
-                          "-Wno-unknown-pragmas",
+@@ -1016,13 +1015,13 @@
                           "-Winvalid-pch"] )
      # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
--    if linux or darwin:
--        env.Append( CCFLAGS=["-Werror", "-pipe"] )
+     if linux or darwin:
+-        env.Append( CCFLAGS=["-pipe"] )
+         if not has_option("disable-warnings-as-errors"):
+             env.Append( CCFLAGS=["-Werror"] )
  
      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"] )
++    env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
++    env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
  
      # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
-@@ -866,7 +864,7 @@
+     # startup.
+@@ -1039,7 +1038,7 @@
      if not darwin:
          env.Append( LINKFLAGS=["-rdynamic"] )
  
 -    env.Append( LIBS=[] )
-+    env.Append( LIBS=['pcre', 'pcrecpp', 'snappy'] )
++    env.Append( LIBS=['pcre', 'pcrecpp', 'snappy', 'yaml-cpp'] )
  
      #make scons colorgcc friendly
      for key in ('HOME', 'TERM'):
+@@ -1053,11 +1052,6 @@
+         env.Append( CPPDEFINES=["MONGO_GCOV"] )
+         env.Append( LINKFLAGS=" -fprofile-arcs -ftest-coverage " )
+ 
+-    if optBuild:
+-        env.Append( CCFLAGS=["-O3"] )
+-    else:
+-        env.Append( CCFLAGS=["-O0"] )
+-
+     if debugBuild:
+         if not optBuild:
+             env.Append( CCFLAGS=["-fstack-protector"] )

diff --git a/dev-db/mongodb/files/mongodb.conf b/dev-db/mongodb/files/mongodb.conf
deleted file mode 100644
index c5272b7..0000000
--- a/dev-db/mongodb/files/mongodb.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# See http://www.mongodb.org/display/DOCS/File+Based+Configuration for format details
-# Run mongod --help to see a list of options
-
-bind_ip = 127.0.0.1
-quiet = true
-dbpath = /var/lib/mongodb
-logpath = /var/log/mongodb/mongod.log
-logappend = true

diff --git a/dev-db/mongodb/files/mongodb.conf-r3 b/dev-db/mongodb/files/mongodb.conf-r3
new file mode 100644
index 0000000..83b4cc0
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb.conf-r3
@@ -0,0 +1,34 @@
+# !! IMPORTANT !!
+#
+# This file uses the YAML format as described in the documentation:
+#   http://docs.mongodb.org/manual/reference/configuration-options/
+
+storage:
+    dbPath: "/var/lib/mongodb"
+    #engine: wiredTiger
+
+systemLog:
+    destination: file
+    path: "/var/log/mongodb/mongodb.log"
+    quiet: true
+    logAppend: true
+
+net:
+    port: 27017
+    bindIp: 127.0.0.1
+    #ssl:
+    #    mode: disabled
+
+#security:
+    #keyFile:
+    #clusterAuthMode:
+
+#replication:
+    #replSetName:
+
+# Specifies one of the MongoDB parameters described here:
+#   http://docs.mongodb.org/manual/reference/parameters/
+#
+# You can specify multiple setParameter fields such as:
+#   setParameter: {enableTestCommands: 1}
+#setParameter:

diff --git a/dev-db/mongodb/files/mongodb.confd b/dev-db/mongodb/files/mongodb.confd
deleted file mode 100644
index 4f76c5a..0000000
--- a/dev-db/mongodb/files/mongodb.confd
+++ /dev/null
@@ -1,14 +0,0 @@
-# Mongodb essentials
-MONGODB_EXEC="/usr/bin/mongod"
-MONGODB_RUN="/var/run/mongodb"
-MONGODB_DATA="/var/lib/mongodb"
-MONGODB_USER="mongodb"
-
-# Listen to specified IP, comment this to listen to all
-MONGODB_IP="127.0.0.1"
-
-# Listen to specified port
-MONGODB_PORT="27017"
-
-# Set extra options here, such as disabling the admin web server
-MONGODB_OPTIONS="--journal"

diff --git a/dev-db/mongodb/files/mongodb.confd-r2 b/dev-db/mongodb/files/mongodb.confd-r2
new file mode 100644
index 0000000..dddb67e
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb.confd-r2
@@ -0,0 +1,12 @@
+# !! IMPORTANT !!
+#
+# This file is ONLY used to override some of the init script configuration.
+#
+# You should NOT use this file to configure your mongodb instance,
+# see the /etc/mongodb.conf file instead.
+#
+# Available init script modifiers :
+# - config_file : the configuration file to use (default : /etc/mongodb.conf)
+# - user : the user used to run your mongodb instance (default : mongodb)
+# - group : the group used to run your mongodb instance (default : mongodb)
+# - run_dir : the run directory for your PID files (default : /run/mongodb)

diff --git a/dev-db/mongodb/files/mongodb.initd-r1 b/dev-db/mongodb/files/mongodb.initd-r1
deleted file mode 100644
index 2e4c01a..0000000
--- a/dev-db/mongodb/files/mongodb.initd-r1
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/runscript
-# 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-r1,v 1.1 2013/08/16 12:54:44 ultrabug Exp $
-
-depend() {
-	use net
-}
-
-start() {
-	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}"
-
-	# Baselayout-1 user should use --chuid instead of --user
-	local USEROPT="--user"
-	if [ ! -f /etc/init.d/sysfs ]; then
-		USEROPT="--chuid"
-	fi
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --background --start --make-pidfile \
-		--pidfile ${MONGODB_RUN:-/var/run/mongodb}/${SVCNAME}.pid \
-		${USEROPT} ${MONGODB_USER:-mongodb} \
-		--exec ${MONGODB_EXEC:-/usr/bin/mongod} \
-		-- \
-		--port ${MONGODB_PORT:-27017} \
-		--dbpath ${MONGODB_DATA:-/var/lib/mongodb} \
-		--unixSocketPrefix ${MONGODB_RUN:-/var/run/mongodb} \
-		--logappend --logpath /var/log/mongodb/${SVCNAME}.log \
-		${MONGODB_OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile ${MONGODB_RUN:-/var/run/mongodb}/${SVCNAME}.pid
-	eend $?
-}

diff --git a/dev-db/mongodb/files/mongodb.initd-r2 b/dev-db/mongodb/files/mongodb.initd-r2
new file mode 100644
index 0000000..7a9d4f3
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb.initd-r2
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mongodb.initd-r2,v 1.2 2014/05/26 08:03:45 ultrabug Exp $
+
+config_file=${config_file:-/etc/${SVCNAME}.conf}
+run_dir=${run_dir:-/run/mongodb}
+
+command="/usr/bin/mongod"
+command_args="--config ${config_file}"
+command_background="true"
+pidfile=${run_dir}/${SVCNAME}.pid
+user=${user:-mongodb}
+group=${group:-mongodb}
+start_stop_daemon_args="--user ${user} --group ${group}"
+
+depend() {
+	use net
+}
+
+start_pre() {
+    checkpath -d -m 0750 -o "${user}":"${group}" "${run_dir}"
+    if [ ! -f ${config_file} ]; then
+    	eerror "Missing configuration file ${config_file}"
+    	return 1
+    fi
+}

diff --git a/dev-db/mongodb/files/mongos.conf-r2 b/dev-db/mongodb/files/mongos.conf-r2
new file mode 100644
index 0000000..fc00689
--- /dev/null
+++ b/dev-db/mongodb/files/mongos.conf-r2
@@ -0,0 +1,30 @@
+# !! IMPORTANT !!
+#
+# This file uses the YAML format as described in the documentation:
+#   http://docs.mongodb.org/manual/reference/configuration-options/
+
+systemLog:
+    destination: file
+    path: "/var/log/mongodb/mongos.log"
+    quiet: true
+    logAppend: true
+
+net:
+    port: 27017
+    bindIp: 127.0.0.1
+    ssl:
+        mode: disabled
+
+#security:
+    #keyFile:
+    #clusterAuthMode:
+
+#sharding:
+    #configDB:
+
+# Specifies one of the MongoDB parameters described here:
+#   http://docs.mongodb.org/manual/reference/parameters/
+#
+# You can specify multiple setParameter fields such as:
+#   setParameter: {enableTestCommands: 1}
+#setParameter:

diff --git a/dev-db/mongodb/files/mongos.confd b/dev-db/mongodb/files/mongos.confd
deleted file mode 100644
index 644cd0a..0000000
--- a/dev-db/mongodb/files/mongos.confd
+++ /dev/null
@@ -1,16 +0,0 @@
-# Mongos essentials
-MONGOS_EXEC="/usr/bin/mongos"
-MONGOS_RUN="/var/run/mongodb"
-MONGOS_USER="mongodb"
-
-# Listen to specified IP, comment this to listen to all
-MONGOS_IP="127.0.0.1"
-
-# Listen to specified port
-MONGOS_PORT="27018"
-
-# 1 to 3 comma separated config servers (mandatory)
-MONGOS_CONFIGDB=""
-
-# Set extra options here
-MONGOS_OPTIONS=""

diff --git a/dev-db/mongodb/files/mongos.confd-r2 b/dev-db/mongodb/files/mongos.confd-r2
new file mode 100644
index 0000000..0dc2a18
--- /dev/null
+++ b/dev-db/mongodb/files/mongos.confd-r2
@@ -0,0 +1,12 @@
+# !! IMPORTANT !!
+#
+# This file is ONLY used to override some of the init script configuration.
+#
+# You should NOT use this file to configure your mongos instance,
+# see the /etc/mongos.conf file instead.
+#
+# Available init script modifiers :
+# - config_file : the configuration file to use (default : /etc/mongos.conf)
+# - user : the user used to run your mongodb instance (default : mongodb)
+# - group : the group used to run your mongodb instance (default : mongodb)
+# - run_dir : the run directory for your PID files (default : /run/mongodb)

diff --git a/dev-db/mongodb/files/mongos.initd-r1 b/dev-db/mongodb/files/mongos.initd-r1
deleted file mode 100644
index fe08878..0000000
--- a/dev-db/mongodb/files/mongos.initd-r1
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/runscript
-# 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-r1,v 1.1 2013/08/16 12:54:44 ultrabug Exp $
-
-depend() {
-	use net
-}
-
-checkconfig() {
-	if [ -z "${MONGOS_CONFIGDB}" ]; then
-		eerror "MONGOS_CONFIGDB is not defined, check your configuration file !"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-
-	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}"
-
-	# Baselayout-1 user should use --chuid instead of --user
-	local USEROPT="--user"
-	if [ ! -f /etc/init.d/sysfs ]; then
-		USEROPT="--chuid"
-	fi
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --background --start --make-pidfile \
-		--pidfile ${MONGOS_RUN:-/var/run/mongodb}/${SVCNAME}.pid \
-		${USEROPT} ${MONGOS_USER:-mongodb} \
-		--exec ${MONGOS_EXEC:-/usr/bin/mongos} \
-		-- \
-		--port ${MONGOS_PORT:-27018} \
-		--unixSocketPrefix ${MONGOS_RUN:-/var/run/mongodb} \
-		--logappend --logpath /var/log/mongodb/${SVCNAME}.log \
-		--configdb ${MONGOS_CONFIGDB} \
-		${MONGOS_OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile ${MONGOS_RUN:-/var/run/mongodb}/${SVCNAME}.pid
-	eend $?
-}

diff --git a/dev-db/mongodb/files/mongos.initd-r2 b/dev-db/mongodb/files/mongos.initd-r2
new file mode 100644
index 0000000..eb26393
--- /dev/null
+++ b/dev-db/mongodb/files/mongos.initd-r2
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mongos.initd-r2,v 1.2 2014/05/26 08:03:45 ultrabug Exp $
+
+config_file=${config_file:-/etc/${SVCNAME}.conf}
+run_dir=${run_dir:-/run/mongodb}
+
+command="/usr/bin/mongos"
+command_args="--config ${config_file}"
+command_background="true"
+pidfile=${run_dir}/${SVCNAME}.pid
+user=${user:-mongodb}
+group=${group:-mongodb}
+start_stop_daemon_args="--user ${user} --group ${group}"
+
+depend() {
+	use net
+}
+
+start_pre() {
+    checkpath -d -m 0750 -o "${user}":"${group}" "${run_dir}"
+    if [ ! -f ${config_file} ]; then
+    	eerror "Missing configuration file ${config_file}"
+    	return 1
+    fi
+}

diff --git a/dev-db/mongodb/mongodb-2.5.4.ebuild b/dev-db/mongodb/mongodb-2.5.4.ebuild
deleted file mode 100644
index b0a470e..0000000
--- a/dev-db/mongodb/mongodb-2.5.4.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# 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.4.8.ebuild,v 1.3 2013/12/26 11:27:44 ultrabug Exp $
-
-EAPI=4
-SCONS_MIN_VERSION="1.2.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="2400M"
-
-inherit eutils flag-o-matic multilib pax-utils scons-utils systemd user versionator check-reqs
-
-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/20130821-10gen-mms-agent.zip )"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="kerberos mms-agent sharedclient spidermonkey ssl static-libs"
-
-PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )"
-RDEPEND="
-	>=dev-libs/boost-1.50[threads(+)]
-	dev-libs/libpcre[cxx]
-	dev-util/google-perftools[-minimal]
-	net-libs/libpcap
-	app-arch/snappy
-	ssl? ( >=dev-libs/openssl-1.0.1c )"
-DEPEND="${RDEPEND}
-	sys-libs/readline
-	sys-libs/ncurses
-	kerberos? ( dev-libs/cyrus-sasl[kerberos] )"
-
-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 prefix; then
-		scons_opts+=" --cpppath=${EPREFIX}/usr/include"
-		scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
-	fi
-
-	if use kerberos; then
-		scons_opts+=" --use-sasl-client"
-	fi
-
-	if use sharedclient; then
-		scons_opts+=" --sharedclient"
-	fi
-
-	if use spidermonkey; then
-		scons_opts+=" --usesm"
-	else
-		scons_opts+=" --usev8"
-	fi
-
-	if use ssl; then
-		scons_opts+=" --ssl"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.5.4-fix-scons.patch"
-	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
-
-	# bug #462606
-	sed -i -e "s@\$INSTALL_DIR/lib@\$INSTALL_DIR/$(get_libdir)@g" src/SConscript.client || die
-
-	# bug #482576
-	sed -i -e "/-Werror/d" src/third_party/v8/SConscript || die
-}
-
-src_compile() {
-	escons ${scons_opts} all
-}
-
-src_install() {
-	escons ${scons_opts} --full --nostrip install --prefix="${ED}"/usr
-
-	use static-libs || find "${ED}"/usr/ -type f -name "*.a" -delete
-
-	if ! use spidermonkey; then
-		pax-mark m "${ED}"/usr/bin/{mongo,mongod}
-	fi
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners mongodb:mongodb "${x}"
-	done
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN/db/s}.initd-r1" ${PN/db/s}
-	newconfd "${FILESDIR}/${PN/db/s}.confd" ${PN/db/s}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc
-	doins "${FILESDIR}"/${PN}.conf
-
-	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
-}
-
-pkg_preinst() {
-	# wrt bug #461466
-	if [[ "$(get_libdir)" == "lib64" ]]; then
-		rmdir "${ED}"/usr/lib/ &>/dev/null
-	fi
-}
-
-src_test() {
-	escons ${scons_opts} test
-	"${S}"/test --dbpath=unittest || die
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} < 2.4 ]]; 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-3.0.0_rc11.ebuild b/dev-db/mongodb/mongodb-3.0.0_rc11.ebuild
new file mode 100644
index 0000000..f4f11a2
--- /dev/null
+++ b/dev-db/mongodb/mongodb-3.0.0_rc11.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.6.8.ebuild,v 1.1 2015/02/27 09:55:48 ultrabug Exp $
+
+EAPI=5
+SCONS_MIN_VERSION="2.3.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit eutils flag-o-matic multilib pax-utils scons-utils systemd user versionator check-reqs
+
+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"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug kerberos mms-monitoring-agent ssl static-libs +tools"
+
+PDEPEND=""
+RDEPEND="
+	app-arch/snappy
+	>=dev-cpp/yaml-cpp-0.5.1
+	>=dev-libs/boost-1.50[threads(+)]
+	>=dev-libs/libpcre-8.30[cxx]
+	dev-libs/snowball-stemmer
+	dev-util/google-perftools[-minimal]
+	net-libs/libpcap
+	>=sys-devel/gcc-4.8.2
+	mms-monitoring-agent? ( app-admin/mms-monitoring-agent )
+	ssl? ( >=dev-libs/openssl-1.0.1g )
+	tools? ( =app-admin/mongo-tools-${PV} )"
+DEPEND="${RDEPEND}
+	sys-libs/ncurses
+	sys-libs/readline
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup mongodb
+	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+	scons_opts="--variant-dir=build --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
+	scons_opts+=" --disable-warnings-as-errors"
+	scons_opts+=" --use-system-boost"
+	scons_opts+=" --use-system-pcre"
+	scons_opts+=" --use-system-snappy"
+	scons_opts+=" --use-system-stemmer"
+	scons_opts+=" --use-system-tcmalloc"
+	scons_opts+=" --use-system-yaml"
+
+	if use debug; then
+		scons_opts+=" --dbg=on"
+	fi
+
+	if use prefix; then
+		scons_opts+=" --cpppath=${EPREFIX}/usr/include"
+		scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
+	fi
+
+	if use kerberos; then
+		scons_opts+=" --use-sasl-client"
+	fi
+
+	if use ssl; then
+		scons_opts+=" --ssl"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.0.0-fix-scons.patch"
+}
+
+src_compile() {
+	escons ${scons_opts} core tools
+}
+
+src_install() {
+	escons ${scons_opts} --nostrip install --prefix="${ED}"/usr
+
+	use static-libs || find "${ED}"/usr/ -type f -name "*.a" -delete
+
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners mongodb:mongodb "${x}"
+	done
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
+	newinitd "${FILESDIR}/${PN/db/s}.initd-r2" ${PN/db/s}
+	newconfd "${FILESDIR}/${PN/db/s}.confd-r2" ${PN/db/s}
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+}
+
+pkg_preinst() {
+	# wrt bug #461466
+	if [[ "$(get_libdir)" == "lib64" ]]; then
+		rmdir "${ED}"/usr/lib/ &>/dev/null
+	fi
+}
+
+src_test() {
+	escons ${scons_opts} test
+	"${S}"/test --dbpath=unittest || die
+}
+
+pkg_postinst() {
+	if [[ ${REPLACING_VERSIONS} < 3.0 ]]; then
+		ewarn "!! IMPORTANT !!"
+		ewarn " "
+		ewarn "${PN} configuration files have changed !"
+		ewarn " "
+		ewarn "Make sure you migrate from /etc/conf.d/${PN} to the new YAML standard in /etc/${PN}.conf"
+		ewarn "  http://docs.mongodb.org/manual/reference/configuration-options/"
+		ewarn " "
+		ewarn "Make sure you also follow the upgrading process :"
+		ewarn "  http://docs.mongodb.org/master/release-notes/3.0-upgrade/"
+		ewarn " "
+		ewarn "MongoDB 3.0 introduces the WiredTiger storage engine."
+		ewarn "WiredTiger is incompatible with MMAPv1 and you need to dump/reload your data if you want to use it."
+		ewarn "Once you have your data dumped, you need to set storage.engine: wiredTiger in /etc/${PN}.conf"
+		ewarn "  http://docs.mongodb.org/master/release-notes/3.0-upgrade/#change-storage-engine-to-wiredtiger"
+	fi
+}
+