diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index b3a6d96..284181f 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -2,4 +2,7 @@ AUX xen-4.6-efi.patch 1954 SHA256 6ac4fc1fc99e89a16838a54c8b0657a84caa296d739d1c
 AUX xen-4.8.0-coff-x86-64.patch 2044 SHA256 e90c1df0b8f00cddaf5bfba93c422f9d15a0380dc091ab48eaac81bfe52530ef SHA512 0b696b34d354af03c2b76db0485cd7cae539424d718b369ebd5f88d2ce4fb748d7e869ae6f6f68251eaf8a4da0122823947a8808283efdd8c914dc4bc8b77ebf WHIRLPOOL 474b01029f4e037ac35d7cbc1dc9ec62b40f5e4f5f3b890f22d49e6c0b25d3cb695c77219129e0da17869216ea9b3349f3a7ffa6718c3be858ad0e91741d3c0d
 DIST xen-4.8.2-upstream-patches-2.tar.xz 38852 SHA256 12c1f1fd2adba22b923d2ee944e6e66794701393966f9e9e2079961e202f6d64 SHA512 536823eabf03e92585a8c5cde90ce502672dd1ec080b28b39411d6a778b899436a57bfb633f11c94d48d2f963848b7771e469f5ea53e84b580976f631f69cc5d WHIRLPOOL 5baf92709da895eccbe8b154c1d1cdf4c2f0faf5166ef2e4bbf32ca6899d8b88aa67ccd765a15a2f9a6d5200d4a1eb832775891d41c00a950855e5d1d4358e35
 DIST xen-4.8.2.tar.gz 22522336 SHA256 cb1cc2f0985e3d8651215e5d24c1fcc3036994fa7cc495a5091a2c85ece2aff9 SHA512 7805531f73d23ecfff3439770e62d387f4254a444875670d53a0a739323e5d4d8f8fcc478f8936ee1ae8aff3e0229549e47c01c606365a8ce060dd5c503e87da WHIRLPOOL 8e54e79219f89640162673da471a02ee8a39bb884e2376a79a09226462903185b49a771fef51ceca54c4dd42a110ee1214db6dbf94235a156a17d6c597634c3d
+DIST xen-4.9.1-upstream-patches-1.tar.xz 24592 SHA256 b436f0a1ac5ce7e1c7313c4692c93e377f7409521c37e3f1d1a28f04b0e7f2f2 SHA512 edbc7cad2f6f8a5c7e8aac8efd5454428aa25e0e13018438f78c7f401cfb9173345267e16c7a5dfa78066a952980b172976409a0c63162094b7f507058e712ed WHIRLPOOL c2dbc66725a66b6a66a60b687f43c20e925ead19def9322c48a2ad053a3d07f4fd356b9b10b89c5e80bdf40ce25cb6c427268082b050e628b045b1e97686664b
+DIST xen-4.9.1.tar.gz 23368303 SHA256 ecf88b01f44cd8f4ef208af3f999dceb69bdd2a316d88dd9a9535ea7b49ed356 SHA512 9d22f0aa5dcd01a1c105d17c14bce570cc597e884ddb9b4a46b80a72f647625b76ae5213cede423d0458c14e1906983595a9269bb6e6ff2e9e7e4dea840f4274 WHIRLPOOL 38acd36f444798e97692189e9654c9392336adbbc6444a0409cf92dd29a818de958887ef0934967b2cf5ac41aa835a0657aafa147383bccf3afa28c6fde5dfd5
 EBUILD xen-4.8.2-r2.ebuild 4985 SHA256 3db78c062682a62cbc02a5c792532ef3faefa14d156817c72e5d2012cbb0236f SHA512 b846f341562e7eae25b668b9389ddd947868a848f53e5379909668bcf33a3420108cd7b229bbd67941bd7dd05d7f95fe6b3089eda03b3a2c9e6d56e932277484 WHIRLPOOL f78235e3727ea398cc8bd650a1b945730ee0d17bbbc31dc2d0cb49f75a17e22106934117df223096d6c3bbe68ca8c39f68933bf881d15ede1223d3c3072741a1
+EBUILD xen-4.9.1-r1.ebuild 4767 SHA256 b423063bb0b1846b73fbc2e7323ba4907e9eca0f720c5862516294c1ae1d93b6 SHA512 300783d5721fb5dbde9881cae28f660e138cddabb85a2112b0d926b65b970067c6680464864dea3f8ddb6e82981be78457c79e2e65ef580f90cf2aa6fe4ea741 WHIRLPOOL 44dbcb9600a343b5ec85d4ecfff234055feb91de390d7518415b2e97b967dcbe09d427db074ae252862bbb1f7a650709fed892e43b20838771ca6495057ba955
diff --git a/app-emulation/xen/xen-4.9.1-r1.ebuild b/app-emulation/xen/xen-4.9.1-r1.ebuild
new file mode 100644
index 0000000..4272073
--- /dev/null
+++ b/app-emulation/xen/xen-4.9.1-r1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm -x86"
+	UPSTREAM_VER=1
+	SECURITY_VER=
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		source "${WORKDIR}"/patches-security/${PV}.conf
+
+		local i
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+	fi
+
+	# Gentoo's patchset
+	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
+
+	eapply "${FILESDIR}"/${PN}-4.6-efi.patch
+	epatch "${FILESDIR}"/${PN}-4.8.0-coff-x86-64.patch
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="boot"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	default
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+	fi
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+
+	elog "You can optionally block the installation of /boot/xen-syms by an entry"
+	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+}
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
deleted file mode 100644
index 1ef27f8..0000000
--- a/dev-db/mongodb/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX mongodb-2.4-fix-v8-pythonpath.patch 439 SHA256 27728aaefca317287147d10c1b9e4331d4d4ab5c813356c32067699f22f4db72 SHA512 8d8a73eaf605cac50fe429c7141500bbc0e4f308c35b36b4ec48b4123f3241b6f5dc2670725bc7caba5769949b254874e9c36871142635c552a4c2d05a339d2c WHIRLPOOL ae1e88085c8db0f6244f3e286c8af5e8fb5b3966a204c0c104a094d27b5832b339b6ffe60f9a06ebdd1c8ec4eee94b3d89cf3b732fed88eb84668475c1e544aa
-AUX mongodb-2.6.10-fix-boost-1.57.patch 482 SHA256 e6a633a5bbafebe3e9b7e6f8775b189bda8840e2119c4df0ada97a2b1f492073 SHA512 23ce6b7c7b1d297ed45789e0b6486e699e2353bd4d3c7c0249b6df4efeb06695224e68f198f5a3c424e60fb20cb3f3d0b5d34f3ccc3ebcb9f964683acc5a4a5c WHIRLPOOL 167a68f3ff651fbc6347de4e780477ccb8b80ade178d573afc58b961a182ab5921d6bd3e30e1bf789b2276d76853f930bdf263cf97e36dab94794d9cb28a3f66
-AUX mongodb-2.6.2-fix-scons.patch 1448 SHA256 a2628d1ddb55d7a7adf9080d39ddd9a88980ecb27546fd04b74b01d478560165 SHA512 acda6ee27bf2b9a75bb2a1484fa8754e4dc700e5bd835e9f48b528a89e46a6236c38b68d42d58be6bd504d6287f673e6d71d07807e42c93fd0bd4d492387b8a6 WHIRLPOOL bf3ac06028abf8bacf9631cc763258c436842b45ce36283f5eb2083509c7e05fb854d1099c8f639c6c6282df14dc22bf1df2c416f784be9fa29afe58b775ec0e
-AUX mongodb.conf-r2 698 SHA256 780fa095f5eacee59f3f683f225fe545c8ec93a27157894885d5f4656a6ae15a SHA512 15480651b5e7b1927b95d633193aee08def71e2f9ef6438f93972e359b2605e51ce6f071f5fd64b73b2bf4db58710a04634a36144db2c2e585588098d69b66fb WHIRLPOOL 2d2d2bf793ae5b1c7c27be227001c3eeb1a76cd620ce8e3882e7d43f10625df8c21d8452dabeef4b8cb750246436d57ad900f915aadd74dcc02c9341ab5d343b
-AUX mongodb.confd-r2 549 SHA256 6275df7b1bbee218545331d68da3814d0e0fa89d3b30e21370bbeb776dd19e0a SHA512 75f11e8350e98b90eccafd577d794e4b05f36ede8d95e7839e9fa1eb77ea7bd9cdd2fdd07719abb78a714cd7d72109c177d265d6417ef198a4217453c0a4db68 WHIRLPOOL 974eeb5dd58d52670121b2e8e687250cae4d5c49ec020dc30746bf39356762d63f41371526744f2b9fdd657134e7570d7501a3ce5995e830e039cc9eeb8a427e
-AUX mongodb.initd-r2 661 SHA256 f635c2ff1d74f74e254751ce91d8cc7980ce1ce762411cdc587948ea33f35b3e SHA512 9acfc0caefa126ed953bcda408d57b5e64c263b32406e18b549806a37c2180520f51ba66eeb30a8b913cd36e04e5f1bc62edb877c9d8c06c96a22d46f924a388 WHIRLPOOL cbb12e8c020c7d52529a39cda996e42a10996da487770a7c114ad7c84b20f19c166b051e438db4d36da1e5bc2d3a1daaa8c8b397d7a1696b603468529df70697
-AUX mongodb.logrotate 205 SHA256 76994c32d999def5c925bd7be3f96687b3406f1d67b89aa6a4df8053025b1e01 SHA512 8c089b1a11f494e4148fb4646265964c925bf937633a65e395ee1361d42facf837871dd493a9a2e0f480ae0e0829dbd3ed60794c5334e2716332e131fc5c2c51 WHIRLPOOL c1d94339a6e58363ba37bfd0f878ea6db403eaee02aa030891bfd54af1a61e34622286e560ba5217201435a745217b2da55d857fece83d5a94b12d915ad2940c
-AUX mongodb.service 220 SHA256 19f55ab28652b3817e98fc3f15cc2f6f3255a5e1dfd7b0d5a27c9ba22fd2703e SHA512 177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9 WHIRLPOOL 0f6e032acbc7f625b03dcec990126cef064925a341e38c27cddbed5a951c8cfeded00ee3b8b0d9044245c833e86748262434665342e6baa98500fb02c07f4281
-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 661 SHA256 7fae734eb44382e81935424c2100c9a5c191cf563cfc3d3f619c7819fb481e02 SHA512 3745fcbd414485b5079e9648e6112fd5e1624f1d76ca140fbf22dc181e86cbf3948794662772225ffe7e65d7a2be4f1a04de8812359751532a9b9168a8351bd8 WHIRLPOOL db486e537353fe0fbdc67ad0452bcdc3e1bc4e9053d82dccb348286363d91fb0e1c02a0ed203d41f08a7246007fe461cf95595d9c25464d31f5a81625da59532
-DIST 20140409-mms-monitoring-agent.zip 40122 SHA256 9c4f89cfba10b4604512ab21eb082248104aeabe7e813b852db2b86f47d7ecb2 SHA512 5290a813c407251b5e4def813ce6fe7e09d6c3a1907fd409e326b15b07aed39f7db3a28710ecdaffe2771136c9433253c5d1857c823844a4b75dd38f1d15eefd WHIRLPOOL ce80870e2618f3d9ed80af41b1069ed5bd97af475089564eed1bc111e820c048bc5cbaa03f859349e772fe232f876127e0627c75c135a9b2e196ab13258ed9f1
-DIST mongodb-src-r2.6.12.tar.gz 16462842 SHA256 2dd51eabcfcd133573be74c0131c85b67764042833e7d94077e86adc0b9406dc SHA512 ceed10f2da50ca390f56cc79d39ea4db7a1ef6764e37dae61c3f3f664708be72de09443bbf94f8e58479e4f2923ff2ab9eee45652e82271b3bad591e03ef7657 WHIRLPOOL 1587ef45ee17f9e3357a92b480ea739192076ead280c44c801650d01d2ae29a627a96db611eac6c9b6b47e5e619e2362df94e1792348709b3ea5a4970a8751a0
-EBUILD mongodb-2.6.12.ebuild 4781 SHA256 24d663fc9cfa252830c8ffd2484560f758cc9d87ac2f0d099b3f4e7aec4ad9cf SHA512 c572d32feac37d6df642e67769d64cea1e54b6274386dbe1b4a52ddb1e50f67f1c530ae5b80ed53f11c26b06d2d1269437beb49740f9f1ab6e6d3440fb934368 WHIRLPOOL 2d07dd5b62eb79c56ac2edbf77ef47e67653867e46480290d5b8e65ee6e0c891fda9caefc6dfb8a476b6f7aa5ab4c745ac886d7d6e89c060db59e5abc42748b4
diff --git a/dev-db/mongodb/files/mongodb-2.4-fix-v8-pythonpath.patch b/dev-db/mongodb/files/mongodb-2.4-fix-v8-pythonpath.patch
deleted file mode 100644
index 19efad6..0000000
--- a/dev-db/mongodb/files/mongodb-2.4-fix-v8-pythonpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/third_party/v8/SConscript	2014-05-26 11:00:37.725508098 +0200
-+++ b/src/third_party/v8/SConscript	2014-05-26 11:01:13.265029083 +0200
-@@ -29,7 +29,7 @@
- import sys
- from os.path import join, dirname, abspath
- root_dir = dirname(File('SConscript').rfile().abspath)
--sys.path.append(join(root_dir, 'tools'))
-+sys.path.insert(0, join(root_dir, 'tools'))
- import js2c
- 
- Import("env windows linux darwin solaris freebsd debugBuild")
diff --git a/dev-db/mongodb/files/mongodb-2.6.10-fix-boost-1.57.patch b/dev-db/mongodb/files/mongodb-2.6.10-fix-boost-1.57.patch
deleted file mode 100644
index 5f289c0..0000000
--- a/dev-db/mongodb/files/mongodb-2.6.10-fix-boost-1.57.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up mongodb-src-r2.6.7/src/mongo/shell/linenoise_utf8.h\~ mongodb-src-r2.6.7/src/mongo/shell/linenoise_utf8.h
---- mongodb-src-r2.6.7/src/mongo/shell/linenoise_utf8.h~	2015-01-13 18:12:06.000000000 +0100
-+++ mongodb-src-r2.6.7/src/mongo/shell/linenoise_utf8.h	2015-01-28 22:22:50.538934558 +0100
-@@ -17,6 +17,7 @@
- 
- #include <boost/smart_ptr/scoped_array.hpp>
- #include <string.h>
-+#include <algorithm>
- 
- namespace linenoise_utf8 {
- 
-
-Diff finished.  Wed Jan 28 22:24:47 2015
diff --git a/dev-db/mongodb/files/mongodb-2.6.2-fix-scons.patch b/dev-db/mongodb/files/mongodb-2.6.2-fix-scons.patch
deleted file mode 100644
index 76feba7..0000000
--- a/dev-db/mongodb/files/mongodb-2.6.2-fix-scons.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/SConstruct	2014-06-16 19:32:46.274507258 +0200
-+++ b/SConstruct	2014-06-16 19:34:04.763586829 +0200
-@@ -813,7 +813,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",
-@@ -821,13 +820,13 @@
-                          "-Winvalid-pch"] )
-     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
-     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( 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
-     # startup.
-@@ -844,7 +843,7 @@
-     if not darwin:
-         env.Append( LINKFLAGS=["-rdynamic"] )
- 
--    env.Append( LIBS=[] )
-+    env.Append( LIBS=['pcre', 'pcrecpp', 'snappy', 'yaml-cpp'] )
- 
-     #make scons colorgcc friendly
-     for key in ('HOME', 'TERM'):
diff --git a/dev-db/mongodb/files/mongodb.conf-r2 b/dev-db/mongodb/files/mongodb.conf-r2
deleted file mode 100644
index 8e8a644..0000000
--- a/dev-db/mongodb/files/mongodb.conf-r2
+++ /dev/null
@@ -1,33 +0,0 @@
-# !! 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"
-
-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-r2 b/dev-db/mongodb/files/mongodb.confd-r2
deleted file mode 100644
index dddb67e..0000000
--- a/dev-db/mongodb/files/mongodb.confd-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-# !! 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-r2 b/dev-db/mongodb/files/mongodb.initd-r2
deleted file mode 100644
index 3063f12..0000000
--- a/dev-db/mongodb/files/mongodb.initd-r2
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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/mongodb.logrotate b/dev-db/mongodb/files/mongodb.logrotate
deleted file mode 100644
index f95a438..0000000
--- a/dev-db/mongodb/files/mongodb.logrotate
+++ /dev/null
@@ -1,13 +0,0 @@
-# Default log rotation / compression keeps 1 year of logs.
-/var/log/mongodb/*.log {
-	daily
-	rotate 365
-	dateext
-	copytruncate
-	delaycompress
-	compress
-	notifempty
-	extension gz
-	sharedscripts
-	missingok
-}
diff --git a/dev-db/mongodb/files/mongodb.service b/dev-db/mongodb/files/mongodb.service
deleted file mode 100644
index 78d5511..0000000
--- a/dev-db/mongodb/files/mongodb.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=High-performance, schema-free document-oriented database
-After=network.target
-
-[Service]
-User=mongodb
-ExecStart=/usr/bin/mongod --quiet --config /etc/mongodb.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/dev-db/mongodb/files/mongos.conf-r2 b/dev-db/mongodb/files/mongos.conf-r2
deleted file mode 100644
index fc00689..0000000
--- a/dev-db/mongodb/files/mongos.conf-r2
+++ /dev/null
@@ -1,30 +0,0 @@
-# !! 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-r2 b/dev-db/mongodb/files/mongos.confd-r2
deleted file mode 100644
index 0dc2a18..0000000
--- a/dev-db/mongodb/files/mongos.confd-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-# !! 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-r2 b/dev-db/mongodb/files/mongos.initd-r2
deleted file mode 100644
index e364fae..0000000
--- a/dev-db/mongodb/files/mongos.initd-r2
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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.6.12.ebuild b/dev-db/mongodb/mongodb-2.6.12.ebuild
deleted file mode 100644
index f7a0895..0000000
--- a/dev-db/mongodb/mongodb-2.6.12.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-SCONS_MIN_VERSION="1.2.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
-	mms-agent? ( https://dev.gentoo.org/~ultrabug/20140409-mms-monitoring-agent.zip )"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug kerberos mms-agent ssl static-libs"
-
-PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )"
-RDEPEND="
-	app-arch/snappy
-	>=dev-cpp/yaml-cpp-0.5.1
-	>=dev-libs/boost-1.50[threads(+)]
-	>=dev-libs/libpcre-8.37[cxx]
-	dev-libs/snowball-stemmer
-	dev-util/google-perftools[-minimal]
-	net-libs/libpcap
-	ssl? ( >=dev-libs/openssl-1.0.1g )"
-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"
-	scons_opts+=" --usev8"
-
-	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
-
-	if use amd64; then
-		scons_opts+=" --64"
-	fi
-	if use x86; then
-		scons_opts+=" --32"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.6.2-fix-scons.patch"
-	epatch "${FILESDIR}/${PN}-2.4-fix-v8-pythonpath.patch"
-	epatch "${FILESDIR}/${PN}-2.6.10-fix-boost-1.57.patch"
-
-	# fix yaml-cpp detection
-	sed -i -e "s/\[\"yaml\"\]/\[\"yaml-cpp\"\]/" SConstruct || die
-
-	# 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_configure() {
-	# filter some problematic flags
-	filter-flags "-march=*"
-	filter-flags -O?
-}
-
-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
-
-	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-r2" ${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}
-
-	if use mms-agent; then
-		local MY_PN="mms-agent"
-		local MY_D="/opt/${MY_PN}"
-
-		insinto /etc
-		newins "${WORKDIR}/${MY_PN}/settings.py" mms-agent.conf
-		rm "${WORKDIR}/${MY_PN}/settings.py"
-
-		insinto ${MY_D}
-		doins "${WORKDIR}/${MY_PN}/"*
-		dosym /etc/mms-agent.conf ${MY_D}/settings.py
-
-		fowners -R mongodb:mongodb ${MY_D}
-		newinitd "${FILESDIR}/${MY_PN}.initd-r2" ${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() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 2.6 ${v}; 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/2.6-upgrade/"
-			ewarn " "
-			if use mms-agent; then
-				ewarn "MMS Agent configuration file has been moved to :"
-				ewarn "  /etc/mms-agent.conf"
-			fi
-			break
-		else
-			if use mms-agent; then
-				elog "Edit your MMS Agent configuration file :"
-				elog "  /etc/mms-agent.conf"
-			fi
-		fi
-	done
-}