Sync with portage [Thu Nov 24 22:38:26 MSK 2016].

2016-11-24 22:38:26 +03:00 · 2016-11-24 22:38:26 +03:00 · 1b2e83bb86
commit 1b2e83bb86
parent 1562f4ee8a
238 changed files with 3657 additions and 1732 deletions
--- a/app-arch/gnome-autoar/gnome-autoar-0.1.1.ebuild
+++ b/app-arch/gnome-autoar/gnome-autoar-0.1.1.ebuild
@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-autoar"
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
 IUSE="gtk +introspection"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~x86"

 RDEPEND="
 	>=app-arch/libarchive-3.2.0
--- a/app-dicts/dikt/Manifest
+++ b/app-dicts/dikt/Manifest
@ -1 +1 @@
-DIST dikt-2l.tar.xz 51948 SHA256 172dfa23400c57d715eb8f99e855f2370b86f8f61fd648e2d507ba238b9e71c1 SHA512 d75e13eca4bd9db20a5b25c56022d2a3c1df5a3e6d940af13fd768d9b77a24af23c0d04ee215f26b6c6beddd1a91f4e6a922884ad3cda551ca30ba37a50184c8 WHIRLPOOL e6ea03658771879e243dd9829cc61daaa9fc705197039f20f1c7ff990b201aebce7b5e702cec52a77df306582ccad227347096f38d1537437d7d3e4b7f3ed913
+DIST dikt-2s.tar.xz 52604 SHA256 92eaf11cd7dbc998933cfff61ac9564919b3a8bab1a89a453f82d9b9f471dd47 SHA512 2f3a21f5daed636123c3902959c5bbb292c566cb878dde94ea111f62c16a16aacb5ad99a8845f20e47081b26b7174c5f478269c30fa3369ccfaec2ede4676d72 WHIRLPOOL 9f913fd22f235dbbbea5b1a3d643c9c968a504c8bd1063fb074cde1d19764f610f2e0bb84609bd5008849846161fd6dc0003377404b34467d0a6b07d52e731c4
--- a/app-dicts/dikt/dikt-2l.ebuild
+++ b/app-dicts/dikt/dikt-2l.ebuild
@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde4-base
-
-DESCRIPTION="A dictionary for KDE"
-HOMEPAGE="http://www.dikt.ml/index.html"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.txz -> ${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DOCS=( README )
--- a/app-dicts/dikt/dikt-2s.ebuild
+++ b/app-dicts/dikt/dikt-2s.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="A dictionary application that implements the Dict protocol"
+HOMEPAGE="https://www.dikt.tv/"
+SRC_URI="https://bitbucket.org/dikt/code/downloads/${P}.txz -> ${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!app-dicts/dikt:4
+"
+
+PATCHES=( "${FILESDIR}/${P}-deps.patch" )
--- a/app-dicts/dikt/files/dikt-2s-deps.patch
+++ b/app-dicts/dikt/files/dikt-2s-deps.patch
@ -0,0 +1,15 @@
+Do not try to search for unused dependencies.
+
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -12,8 +12,8 @@
+ include(KDECMakeSettings)
+ include(KDECompilerSettings)
+ 
+-find_package(Qt5 CONFIG REQUIRED Core DBus Network Widgets PrintSupport)
+-find_package(KF5 REQUIRED COMPONENTS Config I18n KIO WindowSystem XmlGui GuiAddons IconThemes DBusAddons)
+find_package(Qt5 CONFIG REQUIRED Core Network Widgets PrintSupport)
+find_package(KF5 REQUIRED COMPONENTS Config I18n KIO XmlGui GuiAddons IconThemes DBusAddons)
+ 
+ add_definitions(
+ 	-DQT_USE_QSTRINGBUILDER
--- a/app-dicts/dikt/metadata.xml
+++ b/app-dicts/dikt/metadata.xml
@ -6,6 +6,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="google-code">dikt</remote-id>
+		<remote-id type="bitbucket">dikt/code</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/app-doc/casting-spels-emacs/casting-spels-emacs-19-r2.ebuild
+++ b/app-doc/casting-spels-emacs/casting-spels-emacs-19-r2.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit elisp-common
+
+DESCRIPTION="Casting SPELs in Lisp - A Comic Book (Emacs Lisp Edition)"
+HOMEPAGE="http://www.lisperati.com/casting-spels-emacs/html/casting-spels-emacs-1.html
+	https://www.gnu.org/software/emacs/casting-spels-emacs/"
+SRC_URI="https://casting-spels-emacs.googlecode.com/files/${PN}-v${PV}.zip"
+
+LICENSE="GPL-2+ FDL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="virtual/emacs"
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	sed -i 's/\r$//' *.txt html/*.html {lisp,test}/*.el || die
+	# needs cl extensions
+	eapply "${FILESDIR}/${P}-require-cl.patch"
+	eapply_user
+}
+
+src_install() {
+	elisp-install ${PN} lisp/*.el
+	dodoc README.txt test/walk-through-commands.el
+	docinto html
+	dodoc html/*.html
+	docinto html/images
+	dodoc images/*.jpg images/*.png
+	dosym html/images /usr/share/doc/${PF}/images
+	dosym ${SITELISP}/${PN} /usr/share/doc/${PF}/lisp
+}
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@ -1,3 +1,2 @@
 DIST docker-compose-1.8.1.tar.gz 151478 SHA256 1c72725a0a5cd41f56021cb51c6cba86932fb5b4155378ce883500d2644efc84 SHA512 8b33bf5b1fa3eeb5c5724e7ada8c61cf054a5cc1af68c9c9ab40955958f0f6a537f5bad8d54367dddc5ae66930d0555c83da47a48fc43f623d92fd60ad01cb62 WHIRLPOOL 5dca7ff3303833a45b0e7f462a375c58f68f4a19659e66b93bfc564701df8dfba70311151eb674a84c5a3b81703ddcc8809c6c7b89574c738ac9db96a32c93e6
 DIST docker-compose-1.9.0.tar.gz 156392 SHA256 98fb664c79c06a0777af2540b83eaa63c6a05ae7eb9e7417193899df2f96e27f SHA512 9d145807406ce4de3e91245bba4f774d80e0a39a81115fc111624e1a56b7e8a7505d49700df68b062efc65f8de661c8dca08067615a7504b3d7adf6c15d156d0 WHIRLPOOL ca64f1e8e9c830c3cab01193be0d809cbb80fbea2a451dd7f51ff688d76a376a047bdc781471b292de06a275f933ebf755c4b24cc60fe19fe77fb4729101b9e5
-DIST docker-compose-1.9.0_rc4.tar.gz 156319 SHA256 41925ed34fdfb998dce903db30de8f3655ba9e6797b1ce659fca40f6ca8134d1 SHA512 55cf4a8d4641830c3d683a1aa9d8eb8feefef095b857774d9c23c4743808d6694b9381498ac5e803a32112af48ef428fa209433c9aaa115c98b77b7ed388abf6 WHIRLPOOL a8cd0bf69d842c21932a64dd284b9b8ecb87973312284811f55aa070fa72c093ee2a89bff5109ebb7b86730fd9f71e8e7e97d3360be5fee84f6f37bad87e81aa
--- a/app-emulation/docker-compose/docker-compose-1.9.0_rc4.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.9.0_rc4.ebuild
@ -1,67 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit bash-completion-r1 distutils-r1 vcs-snapshot
-
-MY_PV=${PV//_/}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-CDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/cached-property-2[${PYTHON_USEDEP}]
-	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-	<dev-python/dockerpty-0.5[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-1.10.6[${PYTHON_USEDEP}]
-	<dev-python/docker-py-2.0[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	<dev-python/docopt-0.7[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	<dev-python/pyyaml-4[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
-	<dev-python/requests-2.12[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]
-	>=dev-python/texttable-0.8.1[${PYTHON_USEDEP}]
-	<dev-python/texttable-0.9[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	<dev-python/websocket-client-1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '<dev-python/enum34-2[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_test() {
-	${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp contrib/completion/bash/docker-compose ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/*
-
-	distutils-r1_python_install_all
-}
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@ -1,3 +1,4 @@
 DIST docker-1.11.0.tar.gz 10637394 SHA256 088869b9a19ae17656e068aa6d3d473866e8133365427c601c671da1b2189057 SHA512 ecb7f531a5632fd6274e3eec59a5194c61d0788ab9f3864845cbc248232c2f14671a26c34abab8c5ca85ce6106ae72ea3ae4e5d133ad1efb126069ae82a2dba0 WHIRLPOOL 20b0ef1642d2fea2ae186a17786d95f138fb7df92daa104f00c481488f82eadd5e8f27a0a8e926d68f495fd62bc132d83817a0831f84b3786474a9408d87878f
 DIST docker-1.12.3.tar.gz 13678274 SHA256 cf4f876593abde06b4c19f971163a853a21b1992d75bd2fe5d8bea9015b09f87 SHA512 8577bcfe892d1fae6ca4edcd72c1a1c0a223ea3e322f3b63674dcb4833605c2dd2365cf376e4e08c0a900db50a927aaa0518ceb25f9542fe30c52a28903b0201 WHIRLPOOL 853f0a55836d4a34010f87399e875b9402703f1fb665e760255b198da6a68417c50b162cffe65e2c704e076be0520e3ecdb1418749cd3ddf63f426851bc0fbde
 DIST docker-1.13.0_rc1.tar.gz 7845975 SHA256 5b868b8a77c794d9a8604a0151cc1bb04fff1ece121e7f9e7315d99a2b6f5c1c SHA512 6d5819dc4164184ea5dba99e42f2e4e4ef8a49988804730492f31e7bc8a109486b2cefc71fe88f565a44f6090bccb7b18e5e3e73b79cc724086c60655918ffeb WHIRLPOOL 6357049db5a2d664fe1fff4e6a3c7a94ce6497562fadf82dac26819144eb7c591b63c8d5fa1106246e7899647d1910dbdeba0ee432b18976a6599c5224a984de
+DIST docker-1.13.0_rc2.tar.gz 7708479 SHA256 290ecfbcdf117b4358be383243294c35bfc46ee4321d1e5f44ee2e48299c5104 SHA512 f8910a29166a9356a41b4ac744ef97bd3dfbaf302ebb756e97a737081d8ac16f81f9a017741f8cd2f134a481316364e74f69f7bd8794b470a077f447a7d42aff WHIRLPOOL ac7edb8af35af107344c41f34bf150208c41497f16d0394004b33788cdb8b8adb774b2158c8ea68bdd6d623639a2f62cb6e8180c07318a0a41ed53132fc63818
--- a/app-emulation/docker/docker-1.13.0_rc2.ebuild
+++ b/app-emulation/docker/docker-1.13.0_rc2.ebuild
@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	MY_PV="${PV/_/-}"
-	DOCKER_GITCOMMIT="75fd88b"
+	DOCKER_GITCOMMIT="1f9b3ef"
 	EGIT_COMMIT="v${MY_PV}"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
@ -244,7 +244,7 @@ src_install() {
 	dosym containerd /usr/bin/docker-containerd
 	dosym containerd-shim /usr/bin/docker-containerd-shim
 	dosym runc /usr/bin/docker-runc
-	use container-init && dosym tini-static /usr/bin/docker-init
+	use container-init && dosym tini /usr/bin/docker-init

 	newinitd contrib/init/openrc/docker.initd docker
 	newconfd contrib/init/openrc/docker.confd docker
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@ -1,3 +1,4 @@
 DIST free42-1.5.10.tgz 22616956 SHA256 960d94cce3d67047d8968b4ee8b4d324bf1257002d67f971bd1f6e2552a870d1 SHA512 dfdcbdb051aa7cf7a60c27e44ae8dc5458dd418e08cd71e79eff443d09f8021efacc87e06531f312521e5b1f5af0aa72e77b0ce18b8d657499ad174b6a12578e WHIRLPOOL 8324418ab0047e05136937aa6741a4faa518f39eae203eec181958fdc6aa42f577c66716deb81b0dc6d833f79e4e49cfda37fc80e3917f0157583feac1b66985
+DIST free42-1.5.12.tgz 22691715 SHA256 77f053fbfc597229f4e7d4e66d80aad0252e18bd8c3e05c757c02af5c4cdf268 SHA512 85e595f14e1ee5cf498dc9aa641edb841db450dbeca67b4a5c7853e7c2d655e3d40ca9332d0fed70c3a3e397553bc4655f87a27aefca4c0eb89d16a6fafae843 WHIRLPOOL 5c0d762660d239c6157a18bbd353734d4af9afb5d665cc75c200e92509457b898693540732be05afeb0514c5c2604207a97c0adbb22121789170de94f538de84
 DIST free42-1.5.7.tgz 8159655 SHA256 63c868880e0c18374f4b309dc19e2ea36b9463471d2d77563f53036eea645316 SHA512 fb18712643f73388512fc4dc069d55ef3597f5e6a4e1b47bcd12ab05224027c4ec981ade2398fd8c1e4534003ee6c4de2b7402bade66a3dbe90a46299e7132a3 WHIRLPOOL 0504da8589d3dbf9270a914b2cb6ad86982b926f40abee43d6bbe3f8ec997efe8b0ae50b9d61952e5acd3f2a70d34e16cf0e665cec06d555b0c92438c7a32a43
 DIST free42-1.5.8.tgz 45400324 SHA256 f8ffa54a5f77b5061e1a983962e989fc6679f7e128d996a0550922e366855f2f SHA512 1abaeea314b55f456b65eef530fe692534d92dde95876982c6df1715853055632a4a2305774dc691ca0af28632a393d8d9872bd86353c09d57d2dc8a0ef6cfe2 WHIRLPOOL 9b0abef9d548f09e567e8debe15f9a0635038d6ef655a64885ebc02eb241a0f577ca40b4bdc39c881fe8b2c6f4d97e5575c715a05ccc06df37f90bc5d28d16e8
--- a/app-emulation/free42/files/free42-1.5.12-fix-build-intel-lib.patch
+++ b/app-emulation/free42/files/free42-1.5.12-fix-build-intel-lib.patch
@ -0,0 +1,12 @@
+diff -Nuar a/gtk/build-intel-lib.sh b/gtk/build-intel-lib.sh
+--- a/gtk/build-intel-lib.sh	2016-09-04 18:56:12.000000000 +0200
+++ b/gtk/build-intel-lib.sh	2016-09-24 19:39:49.284126118 +0200
+@@ -4,7 +4,7 @@
+ cd IntelRDFPMathLib20U1
+ patch -p0 <../intel-lib-linux.patch
+ cd LIBRARY
+-make CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0
+make A=a CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0
+ mv libbid.a ../../gcc111libbid.a
+ cd ../..
+ ( echo '#ifdef FREE42_FPTEST'; echo 'const char *readtest_lines[] = {'; tr -d '\r' < IntelRDFPMathLib20U1/TESTS/readtest.in | sed 's/^\(.*\)$/"\1",/'; echo '0 };'; echo '#endif' ) > readtest_lines.cc
--- a/app-emulation/free42/files/free42-1.5.12-fix-makefile.patch
+++ b/app-emulation/free42/files/free42-1.5.12-fix-makefile.patch
@ -0,0 +1,38 @@
+diff -Nuar a/gtk/Makefile b/gtk/Makefile
+--- a/gtk/Makefile	2016-09-04 18:56:12.000000000 +0200
+++ b/gtk/Makefile	2016-09-24 16:13:34.824116365 +0200
+@@ -15,11 +15,10 @@
+ # along with this program; if not, see http://www.gnu.org/licenses/.
+ ###############################################################################
+ 
+-CFLAGS = -MMD \
+CFLAGS := -MMD \
+ 	 -Wall \
+ 	 -Wno-parentheses \
+ 	 -Wno-write-strings \
+-	 -g \
+ 	 -I/usr/X11R6/include \
+ 	 $(shell pkg-config --cflags gtk+-2.0) \
+ 	 -DVERSION="\"$(shell cat ../VERSION)\"" \
+@@ -27,14 +26,16 @@
+ 	 -DDECIMAL_GLOBAL_ROUNDING=1 \
+ 	 -DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \
+ 	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \
+-	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1
+	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \
+	 ${CFLAGS}
+ 
+-CXXFLAGS = $(CFLAGS) \
+CXXFLAGS := $(CFLAGS) \
+ 	 -fno-exceptions \
+ 	 -fno-rtti \
+-	 -D_WCHAR_T_DEFINED
+	 -D_WCHAR_T_DEFINED \
+	 ${CXXFLAGS}
+ 
+-LDFLAGS = -L/usr/X11R6/lib
+LDFLAGS := -L/usr/X11R6/lib ${LDFLAGS}
+-LIBS = gcc111libbid.a -lXmu $(shell pkg-config --libs gtk+-2.0)
+LIBS = gcc111libbid.a -lX11 -ldl -lXmu $(shell pkg-config --libs gtk+-2.0)
+ 
+ ifeq "$(shell uname -s)" "Linux"
--- a/app-emulation/free42/free42-1.5.12.ebuild
+++ b/app-emulation/free42/free42-1.5.12.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="An HP-42S Calculator Simulator"
+HOMEPAGE="http://thomasokken.com/free42/"
+SRC_URI="mirror://gentoo/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa"
+
+DEPEND="dev-libs/atk
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/pango
+	alsa? ( media-libs/alsa-lib )"
+
+RDEPEND="${DEPEND}
+	x11-libs/libX11
+	x11-libs/libXmu"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	sed -i -e 's/print_gif_name\[FILENAMELEN\]/print_gif_name\[1000\]/' \
+		"${S}/gtk/shell_main.cc" || die
+	epatch "${FILESDIR}"/${P}-fix-makefile.patch
+	epatch "${FILESDIR}"/${P}-fix-build-intel-lib.patch
+	eapply_user
+}
+
+src_compile() {
+	local myconf
+	use alsa && myconf="AUDIO_ALSA=yes"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C "${S}/gtk"
+}
+
+src_install() {
+	dodoc CREDITS HISTORY README TODO
+	dobin gtk/free42dec
+}
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@ -3,6 +3,7 @@ DIST VBoxGuestAdditions_4.3.40.iso 57272320 SHA256 50714af11f98e7ae137ada9b28f9a
 DIST VBoxGuestAdditions_5.0.16.iso 60063744 SHA256 8190f1e4031f8195971c2a97d2d3b1cf2d86fc83219f750d05cee9255c7dad85 SHA512 8a9d3fcb96a450163f357b92f8149f58700ec65c127fb872b103554417979fbe624a9e1bced3bb6cbf4b0bb6a5c3bbcae9581836cc5d3fde7a034d4032e519f9 WHIRLPOOL 89ed9064014a715a892388b5dbe3c4b577a5a813580be4fd2bd604672354f258b00a619980ba1369aeaceff6a77c6d370cc2b6bf3c17d2cd73a5c8fc9dcad1e8
 DIST VBoxGuestAdditions_5.0.26.iso 58232832 SHA256 7458ee5a7121a7d243fd6a7528ba427945d9120c5efc7cd75b3951fb01f09c59 SHA512 57daf36caadace9e64c601b4b15f10da394c67574b886c2c2f20aad4692e49f99eca8a611ecd9cd6b3bf7609fa3433cff9b31a6ea38355247a049b4fa3fbb4bb WHIRLPOOL d6ca418b6e7845d407fd30690720f6072cb9d9e5b001526e38c2cfb9f54c591539bc488971d95b6c5158da47ec36a91a7effebf0f4b452bf9eed2382b328ea0d
 DIST VBoxGuestAdditions_5.0.28.iso 58460160 SHA256 ba73986c3a14266ed3d51924e2247dfc5cf320445db02e4e50fcf509794a4deb SHA512 3d8beb9f53c80363b0f555ad3e2f176c72f6a6c58641d35803871d4795bf77c07b8dbf7c6b78df4b34e5c8d449ea81b97879a700ab482063342fc1f63f5aacfe WHIRLPOOL dd3f43f1e90df539b8d112d0a74edbbd45ba6a0c726b7dc3242495c99ae61d8596aa79ef687334b852e8a6838a1b5f08765909de6dea6f8c24c72da8f81c47d2
+DIST VBoxGuestAdditions_5.0.30.iso 58458112 SHA256 096cf810de3d951c60c857e0b8cf534dd1237d0a09759ab696e8a2c579df75fd SHA512 cff0be3271603b2c7466b5cad7f0a43699444d7fb49ee9df656962623663156bfbaed83414480e45b277b8f4d2abb8b8f7caa30230a6be3328ad6faf6ef41de5 WHIRLPOOL 3b1a90c636c8b24e23bc8b168a7a8b074ba0a4c1bab732ab1e6ca5ac9ca0e28d0634730c395350d4bbddd5c6887c6832ca4fb45a3e9f1676f86a9e376999a7cc
 DIST VBoxGuestAdditions_5.1.10.iso 59408384 SHA256 29fa0af66a3dd273b0c383c4adee31a52061d52f57d176b67f444698300b8c41 SHA512 aa8b1a4bea270033bfaf5073c1a85cf6a0900853cc53275fe922ee5ac8b5b87a13329373c4fa6ae79c38a2c0654ecfc99d1bb4a94a16c32be0e830affb771390 WHIRLPOOL 0cd9b7928e6690fab74fc922e8c7b019b3fa07e64262e9b7c16705de9dfa61bd36fef61a1b84188e4928274b68304033969dcdc88f2342cf8afec4d05f08e001
 DIST VBoxGuestAdditions_5.1.6.iso 59258880 SHA256 cbcf9b9b1000e09911b3d20e1efe529aef8a945cf130f6abffc14a39522cc1ed SHA512 14548ef172609d1b3c4eec65b38cbe461f6a9240d0a77f4078de18c0b95c6bea59aa65ffb8bd1501843d00554e1bbf160cdb67628ff7a3e57c3aff4216d40f9b WHIRLPOOL 64f35f8b55df3ab49a159f405ab9762ff49087dd57d377938ef7568a919727d975badfb337ac26370054714f566131728fed501e42ddc637975513f423e3076d
 DIST VBoxGuestAdditions_5.1.8.iso 59314176 SHA256 347fd39df6ddee8079ad41fbc038e2fb64952a40255d75292e8e49a0a0cbf657 SHA512 bdf41fe0c2203c3abaca9ab948a53eeade67f1193a3c195fe15f460d5dcb8905c81d033ebf28569fbd134fe6b3b84c89a18b17d4c81f06ee393cac22df88e841 WHIRLPOOL 20f9f7facbbe5c8c409061a16659ccb5fa9f62dae2c335ca432fb9da597f8c7932e115716dfdf04812e0268af6b8241645f584cfaf8bddf956941212540318be
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.0.30.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.0.30.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils
+
+MY_PN=VBoxGuestAdditions
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=${MY_PN}_${MY_PV}
+
+DESCRIPTION="CD image containing guest additions for VirtualBox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
+
+LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	!=app-emulation/virtualbox-9999"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	return 0
+}
+
+src_install() {
+	insinto /usr/share/${PN/-additions}
+	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
+}
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@ -3,6 +3,7 @@ DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.40-110317.tar.gz 15877616 SHA256 51
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.16-105871.tar.gz 16896587 SHA256 c234e158c49f4f92c38e41918c117d756a81236ff1030a896e44faf88284ecc7 SHA512 39a7c6726e57c89a970e771f80369617c95e154498174deed025ca953e85197981215dd1250317285213a8e9bf6b7140e06311bd6df464613bfe90a37ef1c3c8 WHIRLPOOL 8bdf4a499e8d2d463249fb98ea35ee3a91d81004418e171396c0a26d91f3de9eda6fe632a1d85df58e1de1c32c5c939a365277ad836c685f83600277bd7282bf
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.26-108824.tar.gz 16425147 SHA256 2f2302c7ba3d00a1258fe8e7767a6eb08dccdc3c31f6e3eeb74063c2c268b104 SHA512 7bcc226db7fb8fe9d021ba0c6206a19c3f1aea397b271d7da294a8ffcc976a8512eacdf07f40af1fdf4317b5fe2093869d742a2f5e2b3090ee006807acd0521e WHIRLPOOL a8ccf09d9094f380c93ebb951df6aaad6c13e76392235db41af7fcfcf882302b714a428f13368d790edc9ac5ba2a6f7cb0fb442b4252f0d6de4a2454895f69f4
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.28-111378.tar.gz 18960364 SHA256 1fb0c1bb37ee3c19af2add07e61b6a1837239e30a54b6f6474131f08c448a46d SHA512 55a127b9537c59ede23a5acf2b37926afd9d71a6a41fd104ea72655645469b50fa7717630a9064b5ec92b32cdb55282767f9e267e8a7c734e023a339aa9ff318 WHIRLPOOL 1729182ca0a195eb52ffa761e0bd502235049771978c1b781773fc70ecfe0885bb413675dcf3cd685d277c3ae9b0f510626dc2ba1318263ac671cb8875be3ccf
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.30-112061.tar.gz 18968644 SHA256 f0880b7948bdc185d7e7be0fc98b551296ed9578f21e38d01b43771323a71a3d SHA512 d78676179f39b9c016bed2a5534f1392993c138137c8fe304fa7468b99f53fb112a2107f83d4ccc01c89d5f8175f6d1e7da0c75ef20438bd1224cedc5e3fc199 WHIRLPOOL f5c2bf3b73b70bf9d135bff2743afd874d7a8cb5e83e32ad972ed16e0c04275193f531fe3a35fea3f38e19f7c80959ae1d6e53ac8e67139ca997a2f7b23bfe05
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.10-112026.tar.gz 19475614 SHA256 3982657fd4853bcbc79b9162e618545a479b65aca08e9ced43a904aeeba3ffa5 SHA512 5225f640424f7a35a76c009e67890a5314a2063f7e82a1ff2df806e2fa43a932f06c1873357c6b1b48c78c43ad2a3ececc77044e3a47934ffc240983e09804d9 WHIRLPOOL a4b1eae59a4a9212530ca65bf3fe9eae7bb69176eb1755f5948948884bfb981ef7081bca98397a99035fe433685a6412ddd507d747fe2fce868f9e0d0d93dad7
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.6-110634.tar.gz 16919742 SHA256 607ac3636bd49a738d5c48159b39261369b5487f71fb10afa2ecf869627a12de SHA512 1cbadf0c5bbafa7f83996cd6cbe3cf42c4cbd644ff692269f684ea9e394880c8367fb8f7796a4e17d6dc9495e8b533d9498db4ba1e351204c0370ec5819df681 WHIRLPOOL e9741c01e091695f5058018dd79a08c788060ed2c6dbbfe1546d5f3d08fb16e49c2e22342daa2d007ea847aeb8d731343235a86589b5fbbba5cdebbcdfb55823
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.8-111374.tar.gz 19457682 SHA256 d28bcd01c14eb07eedd2b964d1abe4876f0a7e0e89530e7ba285a5d6267bf322 SHA512 8539c4cb60b672a06b0f87763686af7f8b8a125ad02b7d30c76da17399aa95455bf9d7c5105072ff5b973fac89d09b7c21698dcf46779bfc1a306d524c1be5ef WHIRLPOOL 61b9f4a69629e8c75dcb86fccd2168d312a0a2e31ea5e51fd80dc0f7601508bc40510422bbaeb30a82fa76e19d87f6221eaafdeedcf1a20f0e902571749a70a0
@ -16,6 +17,8 @@ DIST VirtualBox-5.0.26-108824-Linux_amd64.run 84110803 SHA256 a9bc3b32a64116b463
 DIST VirtualBox-5.0.26-108824-Linux_x86.run 83189198 SHA256 d93b3c0e3c3c01cf0e39c4fe1788f80c1234d27908a3fa30d5fe9f4ad2629dc3 SHA512 9432d5cad24c4329ed70ccd77fe0ae7a3fb74a685dbaa8591313f2330c9fa9fbe06aabfd15a8df00e7e49fbf5261a294f2d418b03b6fdb06a2cd6769a5e61932 WHIRLPOOL b20dde531692924990d5944361a43129f845657994d1d12f80d3a878a4b9746bcac86fcb2f277ba47ca5e94a8d78e591c532e0e52eae260227c3805ac8f6873e
 DIST VirtualBox-5.0.28-111378-Linux_amd64.run 84418003 SHA256 5ffbdc83f113f5037a41ddd38f0354b6f697a9b37805fd2bcd696f0dab781abe SHA512 1be6c345ccc32d69c7b4025277e8bff6d8d0a499109b7ad253a9ff860315f5d93b6bcbb7d1d979ab899f841ab674df127616698d4ba55265254bb1688ec67dd5 WHIRLPOOL d11cb430e3e5a8d88b0fe0ed4e2f3dcbd442b90d039a003a3653a85eefa28ded23abc0d48b8dcbdaac941f0ae65a7f7a6f87fac9074502ba168451f6e96ad80c
 DIST VirtualBox-5.0.28-111378-Linux_x86.run 83711438 SHA256 1cfc283b9258924d643240a6d978a25bc4cea45bbdc6c0db29611b8845069125 SHA512 cfeffc6f942de464fac20ce7d0e392e9aacb41adb2b69ca714fa8c071ca4d3683a47f59dd1ebc205fdf40ff4f861a42ecf44884118de2219acb5b3b5e9dcfd73 WHIRLPOOL 733125429929b2389d6b49af313a2730e473846dacc5d9e8dfcb6c9bb7425f3db0b9913c15a808df9b1ecfb7be1c37b1c18c9a7e2a63d88ac3d1cb56b2d4aa47
+DIST VirtualBox-5.0.30-112061-Linux_amd64.run 84479441 SHA256 243f1290764b6da28cda2f51739ba1dec7dc4670ee9ea26d67afc0a5e9dca3b1 SHA512 47a6aff0da961b16eba94dba80ed6a87e09c682b2f1fa51ef3db2a42e7552ef8ecc8fe651a85ccf2523e858c5db72a2b606f9a1dafe3f1ef1acdcb3a5d709a7e WHIRLPOOL fa698f9b38bdff68cf49fefb6cc3fb04eab875c9e9c184162b07e6ffaabaef317e5bd06a88a19ab40040ac9d24f9f4c7c3c46656a3b8c6815f6e2db8ad934eb4
+DIST VirtualBox-5.0.30-112061-Linux_x86.run 83721678 SHA256 1d62d1ab6a97a85c08edc20ec4449cd6058403d78abac401455682ad91081592 SHA512 9b19ee57a98edd1cd43a34db729334376bbfc1214edfc6c605094bd47d6cc7878439257a4b96b689db86436dbc3e3f997f518ebd7a8d6d8841dbfbdab175d853 WHIRLPOOL 44c680cc8ec8fb02a6641d962b1705e2e3aef4ec1a43f3566273325f80be667f96e58a1a03dfc279f886a100709c134edb1d1ecd4f823864d620b8dac869a900
 DIST VirtualBox-5.1.10-112026-Linux_amd64.run 87367122 SHA256 2b190706e7812e86d18feff70d8f28b1e5b0772f2c8476d8ba8f59ec57d7daaf SHA512 eca9efa5e31a12973f998ad2eb6102975e3f6434f2b5be798fbd0c085fe4a4fd9424bea3fe97d9c3f165d526b28ac5d2f2970a2dca5179fc9e2c4e797a7d5d9c WHIRLPOOL ff7ab19a36c2aeccdd76c0af88249940c94cc994e4b70dd9e5a8839c0ce814952ff379d0ccc81214feab3f8f0e500b57a71873c97bd5a00f8506a048e1fd486e
 DIST VirtualBox-5.1.10-112026-Linux_x86.run 86486478 SHA256 9489d543f9c977f3103f7f69167baff861cb7be2e4338e641835e60a8e1d29c7 SHA512 cb91712e99777f44a65772b2b6ebe2f882bc5b6468f2521536ed101871d627f9ef1d0875513c98757e1bb8af9756f6f2010f5a54b4ad2d217ce30d65f6f8c63a WHIRLPOOL 4c1b6271b32786510bbff04353ca96911befb91365f833e3fd95d6dffc7f88580af2baa2320e24b01923162b2013dba0c474f4a3e2ce4882ce51b4923dd97dda
 DIST VirtualBox-5.1.6-110634-Linux_amd64.run 86998481 SHA256 530897a9278ad9ef115239582cc767d16d25146c7611035760f83d4ec7522078 SHA512 b19dba07ff07414cb651592c1eb8e7b10b4423b97fa6f088c906a2b72558d2d7ad43f434cfadf29e8c07e570f16615f12f02feae7bfb7c4b652f93eb4dde86a2 WHIRLPOOL d97c1f269976b19cb19378ab189a26ec304a46b0f18086102f276f953ea446fb64b0ecda0f7d9cf9b7c0eb962d623d1dd823873242ec6f8410ca288a7245ae3e
@ -27,6 +30,7 @@ DIST VirtualBoxSDK-4.3.40-110317.zip 11469196 SHA256 e227edd309cce72921797641cbd
 DIST VirtualBoxSDK-5.0.16-105871.zip 9639569 SHA256 df1bd5ed7f7fe9c401555498a1abed6f1f98e001c0069f16d401ccf3afe3061b SHA512 f4e1af1d97a26818722124fbbaffa6d61369b1a5f3b350b749284afdde038802f4a0e93e9bbb4c9ab0f49aad1f4fa19bbc4b0bdb04aa172a433a77a538816e25 WHIRLPOOL 0598061b47e5d0ef775665300ab61ad7b94638d32fb358a9c189536b00b2456ce4c90dfbcc00bac86da736289253e84a3b586b8b7d1da4087db76e8845a8ca33
 DIST VirtualBoxSDK-5.0.26-108824.zip 9674060 SHA256 285bf821feb23f50bbabfa016c42e48f924418e9b47257bd3f572510da7ebef6 SHA512 a1971897b14546cccef89477da0dad014a8d04494d6c5e29674caa32274c4a74310ca454d5d367bf19b8b244b981fcb7508bf02cfe07637df5292987092698ff WHIRLPOOL 06f77c9555b77c7493ec590598ce94362ac24c8af988c8154fe7e1a50cc887169703b2ad7aa68a4e1a62805f6ed6ff00db7f15c1e887b5901cddf2780234556c
 DIST VirtualBoxSDK-5.0.28-111378.zip 9674263 SHA256 fa72c8d95f286f81ffdb945638064cf6b13a542446184f4b11b3d30ad9c5595c SHA512 b4a346b2196b568a37be5116d65f25ec274b489d5972e4f4bb9ddfbaf43f1044e33cd2dc8aab325914ced9af50269d919a0ccbc8f323477578a7603f302611b5 WHIRLPOOL 8ba7e66efc46882e8c8dbbd4d843cb4fa2882d805aed81e217b9fbaa61287b679c47ba0995252ca4275a484ae28036fa342cae0a7d4580816ec83085efd6e5e6
+DIST VirtualBoxSDK-5.0.30-112061.zip 9675696 SHA256 b184628df4028bcd00821d36f766fc1b70068f0c1846ad90555eeddcc862fcde SHA512 7a1863fb4e2c0966d1f185f6dee8bbb4066ea757108dbb2a541de9c85d548e5df09842f4ced18651684eb438f8ab76b12b5f7273e23b202c01edc7e0898c8af8 WHIRLPOOL fe60205dea450d313ff1155f47bea3e65977ca3648bfc56f52dc73362b24a6b1a497b5bb249365a491f8dd14ae947e8e6d3447de2bdf4cf842910b7805ebc24d
 DIST VirtualBoxSDK-5.1.10-112026.zip 9858551 SHA256 96f908a7bb2672b03aba3dc586a278562af1b3be4e70c326da96a32e41882484 SHA512 1916f1693041684c6c97dcba8768952cad4c3030e5026a001607fbcc6d5829256f55c4b42081ecce85b3b7a864bd9df4b8204ab8ac53e22c69ce21696e13f901 WHIRLPOOL 5a710ef43bd47a66b28f3fbd9938764d9822898bec760a56a51b0cea34153f9811295c8738c7993be4f2bc7df711eec0888bde3dcfe0bb060be62450ffc7025c
 DIST VirtualBoxSDK-5.1.6-110634.zip 9861672 SHA256 ecf5abaa1d73f4771659cd04bceff90f907c5cf60756c156ac0284ba9614a452 SHA512 97c8b3795049a590360a5a95594a4031cefa3439a17006222742fe732b5ed5fa8b747124a85975ae1f69defcf01af1137d4565fc7fb3b8774ff1d2004f313046 WHIRLPOOL d9a97aa766612586bf3259533f6a85a2ba7e936318995c17b0adfc57b0b486f92472cd47ea3716ca211eb4d67e81df94b45825bbf1c5afded7a71acba997aeac
 DIST VirtualBoxSDK-5.1.8-111374.zip 9860397 SHA256 62848668bf749e991edc21bd310e18684c13466b3322fe0921fe5ced4000bf84 SHA512 5b36922ec020487e8e16d97f1b3ff2fc40586224b779c600607136eb4eccdd2992618edc35bb9b12495d8ee894315c8ba08f3747b2a6d5b6edb0915629d3f005 WHIRLPOOL 4e22f955768b12ddc0b577b062e1cadbd50c9b2f34bb680c9c75d7acd3407b5f63d52f8ee3c0411aa5f34fd490d07cfeb0d5cb4063352fed4c643de1bdb8924f
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.30.112061.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.0.30.112061.ebuild
@ -0,0 +1,288 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils fdo-mime gnome2 pax-utils python-r1 udev unpacker versionator
+
+MAIN_PV="$(get_version_component_range 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+fi
+VBOX_BUILD_ID="$(get_version_component_range 4)"
+VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
+MY_P="VirtualBox-${VBOX_PV}-Linux"
+# needed as sometimes the extpack gets another build ID
+EXTP_PV="${VBOX_PV}"
+EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack"
+EXTP_P="${EXTP_PN}-${EXTP_PV}"
+# needed as sometimes the SDK gets another build ID
+SDK_PV="${VBOX_PV}"
+SDK_P="VirtualBoxSDK-${SDK_PV}"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
+	x86? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
+	http://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
+
+LICENSE="GPL-2 PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
+RESTRICT="mirror"
+
+if [[ "${PV}" != *beta* ]] ; then
+	SRC_URI+="
+		sdk? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )"
+	IUSE+=" sdk"
+fi
+
+DEPEND="app-arch/unzip
+	${PYTHON_DEPS}"
+
+RDEPEND="!!app-emulation/virtualbox
+	!app-emulation/virtualbox-additions
+	~app-emulation/virtualbox-modules-${MAIN_PV}
+	!headless? (
+		x11-libs/libXcursor
+		media-libs/libsdl[X]
+		x11-libs/libXrender
+		x11-libs/libXfixes
+		media-libs/libpng
+		x11-libs/libXi
+		x11-libs/libXrandr
+		x11-libs/libXinerama
+		x11-libs/libXft
+		media-libs/freetype
+		media-libs/fontconfig
+		x11-libs/libXext
+		dev-libs/glib
+		chm? ( dev-libs/expat )
+	)
+	dev-libs/libxml2
+	sys-fs/lvm2
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXdmcp
+	${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+S=${WORKDIR}
+
+QA_PREBUILT="opt/VirtualBox/*"
+
+PYTHON_UPDATER_IGNORE="1"
+
+src_unpack() {
+	unpack_makeself ${MY_P}_${ARCH}.run
+	unpack ./VirtualBox.tar.bz2
+
+	mkdir "${S}"/${EXTP_PN} || die
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	unpack ${EXTP_P}.tar.gz
+	popd &>/dev/null || die
+
+	if [[ "${PV}" != *beta* ]] && use sdk ; then
+		unpack VirtualBoxSDK-${SDK_PV}.zip
+	fi
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# create virtualbox configurations files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-config" vbox.cfg
+
+	if ! use headless ; then
+		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
+
+		# set up symlinks (bug #572012)
+		dosym /opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
+
+		local size ico icofile
+		for size in 16 24 32 48 64 72 96 128 256 ; do
+			pushd "${S}"/icons/${size}x${size} &>/dev/null || die
+			if [[ -f "virtualbox.png" ]] ; then
+				doicon -s ${size} virtualbox.png
+			fi
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="virtualbox-${ico}.png"
+				if [[ -f "${icofile}" ]] ; then
+					doicon -s ${size} ${icofile}
+				fi
+			done
+			popd &>/dev/null || die
+		done
+		doicon -s scalable "${S}"/icons/scalable/virtualbox.svg
+		insinto /usr/share/pixmaps
+		newins "${S}"/icons/48x48/virtualbox.png ${PN}.png
+	fi
+
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+	popd &>/dev/null || die
+	rm -rf "${S}"/${EXTP_PN}
+
+	insinto /opt/VirtualBox
+	dodir /opt/bin
+
+	doins UserManual.pdf
+
+	if [[ "${PV}" != *beta* ]] && use sdk ; then
+		doins -r sdk
+	fi
+
+	if use additions; then
+		doins -r additions
+	fi
+
+	if use vboxwebsrv; then
+		doins vboxwebsrv
+		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
+		fperms 0750 /opt/VirtualBox/vboxwebsrv
+		dosym /opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	if use rdesktop-vrdp; then
+		doins rdesktop-vrdp
+		doins -r rdesktop-vrdp-keymaps
+		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
+		dosym /opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
+	fi
+
+	if ! use headless && use chm; then
+		doins kchmviewer VirtualBox.chm
+		fowners root:vboxusers /opt/VirtualBox/kchmviewer
+		fperms 0750 /opt/VirtualBox/kchmviewer
+	fi
+
+	# This ebuild / package supports only py2.7.  When py3 comes is unknown.
+	# The compile phase makes VBoxPython2_7.so.
+	# py3 support would presumably require a binary pre-compiled by py3.
+	use python && doins VBoxPython.so VBoxPython2_7.so
+
+	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
+		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
+		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
+		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
+		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
+		VBoxPython?_*.so
+
+	if use headless ; then
+		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
+	fi
+
+	doins -r * || die
+
+	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
+	dosym /opt/VirtualBox/VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
+	dosym /opt/VirtualBox/VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
+	dosym /opt/VirtualBox/VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
+	dosym /opt/VirtualBox/VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
+	dosym /opt/VirtualBox/VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
+
+	local each
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do
+		fowners root:vboxusers /opt/VirtualBox/${each}
+		fperms 0750 /opt/VirtualBox/${each}
+		pax-mark -m "${D}"/opt/VirtualBox/${each}
+	done
+	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
+	fperms 4750 /opt/VirtualBox/VBoxNetDHCP
+	fperms 4750 /opt/VirtualBox/VBoxNetNAT
+
+	if ! use headless ; then
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		for each in VBox{SDL,Headless} VirtualBox; do
+			fowners root:vboxusers /opt/VirtualBox/${each}
+			fperms 4510 /opt/VirtualBox/${each}
+			pax-mark -m "${D}"/opt/VirtualBox/${each}
+		done
+
+		dosym /opt/VirtualBox/VBox.sh /opt/bin/VirtualBox
+		dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxSDL
+	else
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
+		fperms 4510 /opt/VirtualBox/VBoxHeadless
+		pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
+	fi
+
+	exeinto /opt/VirtualBox
+	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
+	fowners root:vboxusers /opt/VirtualBox/VBox.sh
+	fperms 0750 /opt/VirtualBox/VBox.sh
+
+	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxManage
+	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxVRDP
+	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxHeadless
+	dosym /opt/VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	local udevdir="$(get_udevdir)"
+	insinto ${udevdir}/rules.d
+	doins "${FILESDIR}"/10-virtualbox.rules
+	sed "s@%UDEVDIR%@${udevdir}@" \
+		-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+	# move udev scripts into ${udevdir} (bug #372491)
+	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
+	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	gnome2_icon_cache_update
+
+	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
+
+	elog ""
+	if ! use headless ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\""
+		elog ""
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
+	elog "an overview about the different features of ${PN}"
+	elog "and virtualbox-ose"
+	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@ -3,6 +3,7 @@ DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.40-110317.tar.gz 15877616 SHA256 51
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.16-105871.tar.gz 16896587 SHA256 c234e158c49f4f92c38e41918c117d756a81236ff1030a896e44faf88284ecc7 SHA512 39a7c6726e57c89a970e771f80369617c95e154498174deed025ca953e85197981215dd1250317285213a8e9bf6b7140e06311bd6df464613bfe90a37ef1c3c8 WHIRLPOOL 8bdf4a499e8d2d463249fb98ea35ee3a91d81004418e171396c0a26d91f3de9eda6fe632a1d85df58e1de1c32c5c939a365277ad836c685f83600277bd7282bf
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.26-108824.tar.gz 16425147 SHA256 2f2302c7ba3d00a1258fe8e7767a6eb08dccdc3c31f6e3eeb74063c2c268b104 SHA512 7bcc226db7fb8fe9d021ba0c6206a19c3f1aea397b271d7da294a8ffcc976a8512eacdf07f40af1fdf4317b5fe2093869d742a2f5e2b3090ee006807acd0521e WHIRLPOOL a8ccf09d9094f380c93ebb951df6aaad6c13e76392235db41af7fcfcf882302b714a428f13368d790edc9ac5ba2a6f7cb0fb442b4252f0d6de4a2454895f69f4
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.28-111378.tar.gz 18960364 SHA256 1fb0c1bb37ee3c19af2add07e61b6a1837239e30a54b6f6474131f08c448a46d SHA512 55a127b9537c59ede23a5acf2b37926afd9d71a6a41fd104ea72655645469b50fa7717630a9064b5ec92b32cdb55282767f9e267e8a7c734e023a339aa9ff318 WHIRLPOOL 1729182ca0a195eb52ffa761e0bd502235049771978c1b781773fc70ecfe0885bb413675dcf3cd685d277c3ae9b0f510626dc2ba1318263ac671cb8875be3ccf
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.30-112061.tar.gz 18968644 SHA256 f0880b7948bdc185d7e7be0fc98b551296ed9578f21e38d01b43771323a71a3d SHA512 d78676179f39b9c016bed2a5534f1392993c138137c8fe304fa7468b99f53fb112a2107f83d4ccc01c89d5f8175f6d1e7da0c75ef20438bd1224cedc5e3fc199 WHIRLPOOL f5c2bf3b73b70bf9d135bff2743afd874d7a8cb5e83e32ad972ed16e0c04275193f531fe3a35fea3f38e19f7c80959ae1d6e53ac8e67139ca997a2f7b23bfe05
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.10-112026.tar.gz 19475614 SHA256 3982657fd4853bcbc79b9162e618545a479b65aca08e9ced43a904aeeba3ffa5 SHA512 5225f640424f7a35a76c009e67890a5314a2063f7e82a1ff2df806e2fa43a932f06c1873357c6b1b48c78c43ad2a3ececc77044e3a47934ffc240983e09804d9 WHIRLPOOL a4b1eae59a4a9212530ca65bf3fe9eae7bb69176eb1755f5948948884bfb981ef7081bca98397a99035fe433685a6412ddd507d747fe2fce868f9e0d0d93dad7
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.6-110634.tar.gz 16919742 SHA256 607ac3636bd49a738d5c48159b39261369b5487f71fb10afa2ecf869627a12de SHA512 1cbadf0c5bbafa7f83996cd6cbe3cf42c4cbd644ff692269f684ea9e394880c8367fb8f7796a4e17d6dc9495e8b533d9498db4ba1e351204c0370ec5819df681 WHIRLPOOL e9741c01e091695f5058018dd79a08c788060ed2c6dbbfe1546d5f3d08fb16e49c2e22342daa2d007ea847aeb8d731343235a86589b5fbbba5cdebbcdfb55823
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.8-111374.tar.gz 19457682 SHA256 d28bcd01c14eb07eedd2b964d1abe4876f0a7e0e89530e7ba285a5d6267bf322 SHA512 8539c4cb60b672a06b0f87763686af7f8b8a125ad02b7d30c76da17399aa95455bf9d7c5105072ff5b973fac89d09b7c21698dcf46779bfc1a306d524c1be5ef WHIRLPOOL 61b9f4a69629e8c75dcb86fccd2168d312a0a2e31ea5e51fd80dc0f7601508bc40510422bbaeb30a82fa76e19d87f6221eaafdeedcf1a20f0e902571749a70a0
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.30.112061.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.30.112061.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils multilib versionator
+
+MAIN_PV="$(get_version_component_range 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
+	DEP_PV="${MY_PV}"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+	DEP_PV="${MAIN_PV}"
+fi
+VBOX_BUILD_ID="$(get_version_component_range 4)"
+MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
+MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
+
+DESCRIPTION="PUEL extensions for VirtualBox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
+
+LICENSE="PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror strip"
+
+RDEPEND="~app-emulation/virtualbox-${DEP_PV}"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
+
+src_install() {
+	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+}
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@ -3,6 +3,7 @@ DIST VirtualBox-4.3.40.tar.bz2 98760522 SHA256 4bbea49ee1eaa600db7af64b05c8ce6a1
 DIST VirtualBox-5.0.16.tar.bz2 111062984 SHA256 f5a44d33a1db911f445b2eb2d22d9293a96a535cba488b5a235577ef868fa63c SHA512 3da3a227360fb50d299e99770378f65e8cb99525377343fa8faff2360be66643d46f68323d6a8b8d4d26182082f171bb35ab2497167bf6df18827a5ea7742074 WHIRLPOOL ea709057c588f28820790c2b193decba9ee0c57e0f82aa4361ca87aef661315182e18b5ee29558e47ed92f6037eb91befa5390680661a7b9f2248c7819b4a85c
 DIST VirtualBox-5.0.20.tar.bz2 111231246 SHA256 af9c0787aae22964a1192cefbf9aa91a40c1d41e5fea485adebf09ab922d4c2b SHA512 a039455eed3715b9aa42e2dc6b65ea68b27899c0bcf0065a93c53d1093cce56ebf8a6982cd804208ef9e51794eab9c5c4f3b20550d41532fd4addbd7afda0f8e WHIRLPOOL f74f0a910e5e3f7b1704f57e9831f88b1036efbc61e3b97779f5b2a337ad70d55638b59f356c769d4b6bfd5955348d490f5080b04a3f494f25eb176944756cfd
 DIST VirtualBox-5.0.28.tar.bz2 111513040 SHA256 21434481e00791014209aaf00ffa8dad0b393ba5abb270a241e9aa22285b910d SHA512 66698c6fb76f65102c969565d1d0d138dd022f02c581cd3dc8a09a7ffff2ec1e628b35aa99ae5904448b57eebc14017a441755567455cb4562b34ea2efdabd75 WHIRLPOOL 89b059a785ea2cddcf27f7c49a13bca939219b37fd33296edb6354236729e3cf81627fd9a16edd03a4f16e0896bee50dc13f75dc27e98e53b464d137825012dc
+DIST VirtualBox-5.0.30.tar.bz2 111511741 SHA256 105590354b12a8dfa92329ffd9b4e87a14d1037ae0e869638ae5ab35f584ee63 SHA512 6c2c6b4378c2936ac1cafbd10307792001bb814655679a6bd7a19abdbb633a643a02224ba7e3cf8d24bfd15fda1c9f0a408f3ab4ebda98bb63354d41b6092d88 WHIRLPOOL 85ec6727cef1a7c6eb0050463677ecae6774797040bdab1cc38d7b8f00b9c4d7499dc275eb0e6a679a457eb2586e6c84dcfbc2e0da93c09bc68b5b1faae3965d
 DIST VirtualBox-5.1.10.tar.bz2 114912508 SHA256 98073b1b2adee4e6553df73cb5bb6ea8ed7c3a41a475757716fd9400393bea40 SHA512 b4418545919adfa1f06d86dddf56f95bdfe1dd6664bbe4574765cbf8eb54273d8d56954e55d1afe8b2aab9fbc82055867a129e40eba30cc5baddd417f9a8f722 WHIRLPOOL edd54a8a35c90a4e428ea5704400137a1b65bbe98bc81b3e1216373eeff91d33bb670fee249d3fbdcadf39354af1e62a426ab5c67916078e41815a84d9a2e029
 DIST VirtualBox-5.1.6.tar.bz2 114669517 SHA256 2e0112b0d85841587b8f212e6ba8f6c35b31e1cce6b6999497dc917cd37e6911 SHA512 7b10c203692a091b3de8dda147b386e17fa7d2bdb56031163e0551e54c1ff6a8e953361d51cc6f7bb6978544a6517e843b446e866aa1fa6f96b4677dda27daa4 WHIRLPOOL ba6ea523dc06622854b304b408f2ce402d164ae4dbc5eeb4cc675c3e4c7d8e12db1a3bcee7d19f67d274ff92b32e143c111d5d732b463c48d72d4036910ce141
 DIST VirtualBox-5.1.8.tar.bz2 114688166 SHA256 e447031de468aee746529b2cf60768922f9beff22a13c54284aa430f5e925933 SHA512 178299173ee0062e23aee779faa893a42815d17163eab9ba2ed8b46be63a7110fe1690792de21514dc05ccd5a1752ea0f11357220e0e6f91f101dea3416e819c WHIRLPOOL 20ea8d253d177fd11c4349656aaa0f87f0fb76018511b345e85800d4dd8ab1e2e05c300a1f932670e5f5fac6ea547bfaa0a52b8526c4f363358911c770444a81
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.30.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.30.ebuild
@ -0,0 +1,220 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils linux-mod systemd user toolchain-funcs
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="X? ( x11-apps/xrandr
+		x11-apps/xrefresh
+		x11-libs/libXmu
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM
+		x11-libs/libICE
+		x11-proto/glproto )
+	sys-apps/dbus
+	!!x11-drivers/xf86-input-virtualbox"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998_pre20131130
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/pam
+	sys-power/iasl
+	X? ( x11-proto/renderproto )
+	!X? ( x11-proto/xproto )"
+PDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV} )"
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
+		vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
+	use X && MODULE_NAMES+=" vboxvideo(misc:${WORKDIR}/vboxvideo::${WORKDIR}/vboxvideo)"
+
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
+	enewgroup vboxguest
+	enewuser vboxguest -1 /bin/sh /dev/null vboxguest
+	# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
+	enewgroup vboxsf
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Create and unpack a tarball with the sources of the Linux guest
+	# kernel modules, to include all the needed files
+	"${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
+	unpack ./vbox-kmod.tar.gz
+
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	cd "${S}"
+	rm -rf kBuild/bin tools
+}
+
+src_prepare() {
+	# PaX fixes (see bug #298988)
+	pushd "${WORKDIR}" &>/dev/null || die
+	eapply "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
+	popd &>/dev/null || die
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
+	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
+
+	# stupid new header references...
+	for vboxheader in {product,revision,version}-generated.h ; do
+		for mdir in vbox{guest,sf} ; do
+			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+				"${WORKDIR}/${mdir}/${vboxheader}"
+		done
+	done
+
+	# Remove pointless GCC version limitations in check_gcc()
+	sed -e "/\s*-o\s*\\\(\s*\$cc_maj\s*-eq\s*[5-9]\s*-a\s*\$cc_min\s*-gt\s*[0-5]\s*\\\)\s*\\\/d" \
+		-i configure || die
+
+	eapply_user
+}
+
+src_configure() {
+	# build the user-space tools, warnings are harmless
+	local cmd=(
+		./configure
+		--nofatal
+		--disable-xpcom
+		--disable-sdl-ttf
+		--disable-pulse
+		--disable-alsa
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--target-arch=${ARCH}
+		--with-linux="${KV_OUT_DIR}"
+		--build-headless
+	)
+	echo "${cmd[@]}"
+	"${cmd[@]}" || die "configure failed"
+	source ./env.sh
+	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_compile() {
+	MAKE="kmk" \
+	emake TOOL_YASM_AS=yasm \
+	VBOX_ONLY_ADDITIONS=1 \
+	KBUILD_VERBOSE=2
+
+	# Now creating the kernel modules. We must do this _after_
+	# we compiled the user-space tools as we need two of the
+	# automatically generated header files. (>=3.2.0)
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
+
+	insinto /sbin
+	newins mount.vboxsf mount.vboxsf
+	fperms 4755 /sbin/mount.vboxsf
+
+	newinitd "${FILESDIR}"/${PN}-8.initd ${PN}
+
+	insinto /usr/sbin/
+	newins VBoxService vboxguest-service
+	fperms 0755 /usr/sbin/vboxguest-service
+
+	insinto /usr/bin
+	doins VBoxControl
+	fperms 0755 /usr/bin/VBoxControl
+
+	# VBoxClient user service and xrandr wrapper
+	if use X ; then
+		doins VBoxClient
+		fperms 0755 /usr/bin/VBoxClient
+
+		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
+			|| die
+		newins 98vboxadd-xclient VBoxClient-all
+		fperms 0755 /usr/bin/VBoxClient-all
+		popd &>/dev/null || die
+	fi
+
+	# udev rule for vboxdrv
+	local udev_rules_dir="/lib/udev/rules.d"
+	dodir ${udev_rules_dir}
+	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+
+	# VBoxClient autostart file
+	insinto /etc/xdg/autostart
+	doins "${FILESDIR}"/vboxclient.desktop
+
+	# sample xorg.conf
+	insinto /usr/share/doc/${PF}
+	doins "${FILESDIR}"/xorg.conf.vbox
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	if ! use X ; then
+		elog "use flag X is off, enable it to install the"
+		elog "X Window System video driver."
+	fi
+	elog ""
+	elog "Please add users to the \"vboxguest\" group so they can"
+	elog "benefit from seamless mode, auto-resize and clipboard."
+	elog ""
+	elog "The vboxsf group has been added to make automount services work."
+	elog "These services are part of the shared folders support."
+	elog ""
+	elog "Please add:"
+	elog "/etc/init.d/${PN}"
+	elog "to the default runlevel in order to start"
+	elog "needed services."
+	elog "To use the VirtualBox X driver, use the following"
+	elog "file as your /etc/X11/xorg.conf:"
+	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
+	elog ""
+	elog "Also make sure you use the Mesa library for OpenGL:"
+	elog "    eselect opengl set xorg-x11"
+	elog ""
+	elog "An autostart .desktop file has been installed to start"
+	elog "VBoxClient in desktop sessions."
+	elog ""
+	elog "You can mount shared folders with:"
+	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
+	elog ""
+	elog "Warning:"
+	elog "this ebuild is only needed if you are running gentoo"
+	elog "inside a VirtualBox Virtual Machine, you don't need"
+	elog "it to run VirtualBox itself."
+	elog ""
+}
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@ -3,6 +3,7 @@ DIST vbox-kernel-module-src-4.3.40.tar.xz 544344 SHA256 38f65c921607cff377e87d7d
 DIST vbox-kernel-module-src-5.0.16.tar.xz 593944 SHA256 8905e174069a6caf0200808fda6726704a947ab56fc48c3b6ebbf8831dde4123 SHA512 5311f6cfd917c04bcb51182ad414c0930fb85a73a90d81156f08640cdb4e4d442ed46a10b62b5d07ed81aa1ad65430d5186e95cc64293502c9b84937a6470bb4 WHIRLPOOL daf741cd8465ce65ae0e3f304b7c49d55be828da5fc285ac3a2b8e6fc7e68865b184b738a79fa7fbf1e106d647200a40224902ef7041e4dd5ab2c9ef054e4199
 DIST vbox-kernel-module-src-5.0.26.tar.xz 595160 SHA256 9988ef07a618e3406a4ef7786ca39b4aced58f5d08af6e88af747f8de9c4f7a5 SHA512 6ca6dc35aaeebdca88f37288c6316d09575663f3c3f66ffbc16ac90d5cf15e06ce0c6dfa76487ce7cf6264ac79263820087a77c29faf15c5b7e0371bc7adc1b4 WHIRLPOOL ea9d8a3cbb0940215f9995e016ee6ac6146ef2bab742712e6cbabdd4522f8252b2ce12bce6b70c405b8c813790f7085d61894013d4699bc32712534b649f3f23
 DIST vbox-kernel-module-src-5.0.28.tar.xz 596376 SHA256 3d0ced516260a20ad39c64013edb9ef561f6d7eed424ea87953704b748a82521 SHA512 2e249206128f7817a0e99cc6e422fb69cd81ca8b4c4e0a6eb7abadecd82da7c528817bd2d8a318a0ece1deb3972ebf7a038dcc1061b8517340490b21f9eb8f82 WHIRLPOOL 43dd8a458fd7e71a5bbbec52eda0be204629219939b8d9308a7fde76675eb6e9ed202b654539e777a172dee05d02875c8da7b3917eb003d84da7f374fe21b95c
+DIST vbox-kernel-module-src-5.0.30.tar.xz 596412 SHA256 98fce7b9a3f165a26af7e37bdca70f668ffda27e8c9fbcf9c4b5da3dbb8aa68b SHA512 7c2067ae60ff6b2188b26728e9c6e479a9789265d1e7f8e3bc04e65f4ad94900abcff51a9508f08414ae106240e24c16a590b64f906b5eab9ef8ca248a59d20b WHIRLPOOL f62c94453d32eebbf1511fc2fe1014735aecf47a4809c82565352b445dac98919910b223160a577300d89cd67a7109f6d3953d10bc38b8042e44de656e3f223d
 DIST vbox-kernel-module-src-5.1.10.tar.xz 613008 SHA256 478c67f279d8c0be0a9155028aa25d05c8a061a3db427e6b3574d82d86c371e3 SHA512 ce964f87c6304cade692671a7ca370313f5d3058cee4c9a5a1a9e0a2ba25f41b2d835a799d83e427ed12b74432ecdf895e11ae623ae25e18bbfa203514386c94 WHIRLPOOL 00445d5428b35aadbe1862a99b3602b760ea3d16324b9dcd31aa64ff0440d17cbdab2e6472d6deee78eeada20b50275c12610ce5640b83e0139a831831ef7a15
 DIST vbox-kernel-module-src-5.1.6.tar.xz 610772 SHA256 06355e4e98500e02abffb62653ce4500c046ebbb93578f86747111aabdbc6613 SHA512 ead370ce2bb880e587cf6092628fc18590ef2151b21616e6a366faaf6b47fc17b515b3188b8a1d8a00c4c9624113fe79c2095dca72a6394b3cf337328efd053f WHIRLPOOL 334b7285a715382d877305d54afae8fea2cee5318ce6181d5de9eaae2bca52056e7ba280ad8303222cf760b030211312938e1c1bfb6bca3e8b9d1caa3665951a
 DIST vbox-kernel-module-src-5.1.8.tar.xz 612740 SHA256 a9448ae2cb0468b9dbc94cbcdafc7d8c49787bc6246e69d9cc905dfe61d0f3c8 SHA512 56ebaaab238d1a4b9b632cea9a9653849c88af23fff64bf6fb7b96b9a0890108f83fca33562abbad51358dd5757c57b619beb466f703bb2bf1d103631655ec45 WHIRLPOOL 396a44167f337e9a0acd1cee2cd325d493486786976ce9a34f44eee7fb2443730fc57a07a7e89f0f190a8cc6f5bc89692066af44a34a86a61b63a5c20e112cba
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.0.30.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.0.30.ebuild
@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from virtualbox-bin
+
+EAPI=6
+
+inherit eutils linux-mod user
+
+MY_P=vbox-kernel-module-src-${PV}
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel"
+
+RDEPEND="!=app-emulation/virtualbox-9999"
+
+S=${WORKDIR}
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
+
+pkg_setup() {
+	enewgroup vboxusers
+
+	CONFIG_CHECK="!TRIM_UNUSED_KSYMS"
+	ERROR_TRIM_UNUSED_KSYMS="The kernel option CONFIG_TRIM_UNUSED_KSYMS removed kernel symbols that are needed by ${PN} to load correctly."
+
+	linux-mod_pkg_setup
+
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
+}
+
+src_prepare() {
+	if kernel_is -ge 2 6 33 ; then
+		# evil patch for new kernels - header moved
+		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
+	fi
+
+	if use pax_kernel && kernel_is -ge 3 0 0 ; then
+		epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
+	fi
+
+	default
+}
+
+src_install() {
+	linux-mod_src_install
+	insinto /usr/lib/modules-load.d/
+	doins "${FILESDIR}"/virtualbox.conf
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	elog "If you are using sys-apps/openrc, please add \"vboxdrv\", \"vboxnetflt\","
+	elog "\"vboxnetadp\" and \"vboxpci\" to:"
+	elog "  /etc/conf.d/modules"
+}
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@ -3,6 +3,7 @@ DIST VirtualBox-4.3.40.tar.bz2 98760522 SHA256 4bbea49ee1eaa600db7af64b05c8ce6a1
 DIST VirtualBox-5.0.16.tar.bz2 111062984 SHA256 f5a44d33a1db911f445b2eb2d22d9293a96a535cba488b5a235577ef868fa63c SHA512 3da3a227360fb50d299e99770378f65e8cb99525377343fa8faff2360be66643d46f68323d6a8b8d4d26182082f171bb35ab2497167bf6df18827a5ea7742074 WHIRLPOOL ea709057c588f28820790c2b193decba9ee0c57e0f82aa4361ca87aef661315182e18b5ee29558e47ed92f6037eb91befa5390680661a7b9f2248c7819b4a85c
 DIST VirtualBox-5.0.26.tar.bz2 111244869 SHA256 78dec1369d2c8feefea3c682d95e76c0e99414c56626388035cf4061d4dad62e SHA512 c593a1a4cc683717eb2c10eaf1a205f2f835c619751daee18a445a3a673fb9824bacdff1b66bd4f1e5eace04a5f5cf186e326933bd8cc41e705191b8570eeb46 WHIRLPOOL 5c6b429db9e83ea78fa691a36907b23d72a107a471c91752403959489cec140111da2b9e7b69ea4f7f37ccbf7dd5bde556369177956a86f502d2439dff1fc8f6
 DIST VirtualBox-5.0.28.tar.bz2 111513040 SHA256 21434481e00791014209aaf00ffa8dad0b393ba5abb270a241e9aa22285b910d SHA512 66698c6fb76f65102c969565d1d0d138dd022f02c581cd3dc8a09a7ffff2ec1e628b35aa99ae5904448b57eebc14017a441755567455cb4562b34ea2efdabd75 WHIRLPOOL 89b059a785ea2cddcf27f7c49a13bca939219b37fd33296edb6354236729e3cf81627fd9a16edd03a4f16e0896bee50dc13f75dc27e98e53b464d137825012dc
+DIST VirtualBox-5.0.30.tar.bz2 111511741 SHA256 105590354b12a8dfa92329ffd9b4e87a14d1037ae0e869638ae5ab35f584ee63 SHA512 6c2c6b4378c2936ac1cafbd10307792001bb814655679a6bd7a19abdbb633a643a02224ba7e3cf8d24bfd15fda1c9f0a408f3ab4ebda98bb63354d41b6092d88 WHIRLPOOL 85ec6727cef1a7c6eb0050463677ecae6774797040bdab1cc38d7b8f00b9c4d7499dc275eb0e6a679a457eb2586e6c84dcfbc2e0da93c09bc68b5b1faae3965d
 DIST VirtualBox-5.1.10.tar.bz2 114912508 SHA256 98073b1b2adee4e6553df73cb5bb6ea8ed7c3a41a475757716fd9400393bea40 SHA512 b4418545919adfa1f06d86dddf56f95bdfe1dd6664bbe4574765cbf8eb54273d8d56954e55d1afe8b2aab9fbc82055867a129e40eba30cc5baddd417f9a8f722 WHIRLPOOL edd54a8a35c90a4e428ea5704400137a1b65bbe98bc81b3e1216373eeff91d33bb670fee249d3fbdcadf39354af1e62a426ab5c67916078e41815a84d9a2e029
 DIST VirtualBox-5.1.6.tar.bz2 114669517 SHA256 2e0112b0d85841587b8f212e6ba8f6c35b31e1cce6b6999497dc917cd37e6911 SHA512 7b10c203692a091b3de8dda147b386e17fa7d2bdb56031163e0551e54c1ff6a8e953361d51cc6f7bb6978544a6517e843b446e866aa1fa6f96b4677dda27daa4 WHIRLPOOL ba6ea523dc06622854b304b408f2ce402d164ae4dbc5eeb4cc675c3e4c7d8e12db1a3bcee7d19f67d274ff92b32e143c111d5d732b463c48d72d4036910ce141
 DIST VirtualBox-5.1.8.tar.bz2 114688166 SHA256 e447031de468aee746529b2cf60768922f9beff22a13c54284aa430f5e925933 SHA512 178299173ee0062e23aee779faa893a42815d17163eab9ba2ed8b46be63a7110fe1690792de21514dc05ccd5a1752ea0f11357220e0e6f91f101dea3416e819c WHIRLPOOL 20ea8d253d177fd11c4349656aaa0f87f0fb76018511b345e85800d4dd8ab1e2e05c300a1f932670e5f5fac6ea547bfaa0a52b8526c4f363358911c770444a81
--- a/app-emulation/virtualbox/virtualbox-5.0.30.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.0.30.ebuild
@ -0,0 +1,436 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils fdo-mime flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 toolchain-funcs udev
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.0.16-patches-01.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="http://www.virtualbox.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug doc headless java libressl lvm pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	sys-libs/zlib
+	!headless? (
+		media-libs/libsdl:0[X,video]
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		opengl? ( virtual/opengl media-libs/freeglut )
+		qt4? (
+			dev-qt/qtgui:4
+			dev-qt/qtcore:4
+			opengl? ( dev-qt/qtopengl:4 )
+			x11-libs/libXinerama
+		)
+	)
+	java? ( >=virtual/jre-1.6:= )
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:0= )
+	lvm? ( sys-fs/lvm2 )
+	udev? ( >=virtual/udev-171 )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998_pre20131130
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	doc? (
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	!headless? ( x11-libs/libXinerama )
+	java? ( >=virtual/jre-1.6:= )
+	pam? ( sys-libs/pam )
+	pulseaudio? ( media-sound/pulseaudio )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+	${PYTHON_DEPS}"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+	usr/lib/virtualbox/VBoxSDL.so
+	usr/lib/virtualbox/VBoxSharedFolders.so
+	usr/lib/virtualbox/VBoxDD2.so
+	usr/lib/virtualbox/VBoxOGLrenderspu.so
+	usr/lib/virtualbox/VBoxPython.so
+	usr/lib/virtualbox/VBoxDD.so
+	usr/lib/virtualbox/VBoxDDU.so
+	usr/lib/virtualbox/VBoxREM64.so
+	usr/lib/virtualbox/VBoxSharedClipboard.so
+	usr/lib/virtualbox/VBoxHeadless.so
+	usr/lib/virtualbox/VBoxRT.so
+	usr/lib/virtualbox/VBoxREM.so
+	usr/lib/virtualbox/VBoxSettings.so
+	usr/lib/virtualbox/VBoxKeyboard.so
+	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
+	usr/lib/virtualbox/VBoxVMM.so
+	usr/lib/virtualbox/VirtualBox.so
+	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
+	usr/lib/virtualbox/components/VBoxC.so
+	usr/lib/virtualbox/components/VBoxSVCM.so
+	usr/lib/virtualbox/components/VBoxDDU.so
+	usr/lib/virtualbox/components/VBoxRT.so
+	usr/lib/virtualbox/components/VBoxREM.so
+	usr/lib/virtualbox/components/VBoxVMM.so
+	usr/lib/virtualbox/VBoxREM32.so
+	usr/lib/virtualbox/VBoxPython2_7.so
+	usr/lib/virtualbox/VBoxXPCOMC.so
+	usr/lib/virtualbox/VBoxOGLhostcrutil.so
+	usr/lib/virtualbox/VBoxNetDHCP.so
+	usr/lib/virtualbox/VBoxNetNAT.so"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+pkg_setup() {
+	if ! use headless && ! use qt4 ; then
+		einfo "No USE=\"qt4\" selected, this build will not include"
+		einfo "any Qt frontend."
+	elif use headless && use qt4 ; then
+		einfo "You selected USE=\"headless qt4\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+
+	tc-ld-disable-gold #bug 488176
+	tc-export CC CXX LD AR RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Remove pointless GCC version limitations in check_gcc()
+	sed -e "/\s*-o\s*\\\(\s*\$cc_maj\s*-eq\s*[5-9]\s*-a\s*\$cc_min\s*-gt\s*[0-5]\s*\\\)\s*\\\/d" \
+		-i configure || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		elog "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	if ! gcc-specs-pie ; then
+		rm "${WORKDIR}/patches/050_${PN}-5.0.2-nopie.patch" || die
+	fi
+
+	eapply "${WORKDIR}/patches"
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf
+	use alsa       || myconf+=( --disable-alsa )
+	use debug      && myconf+=( --build-debug )
+	use doc        || myconf+=( --disable-docs )
+	use java       || myconf+=( --disable-java )
+	use lvm        || myconf+=( --disable-devmapper )
+	use opengl     || myconf+=( --disable-opengl )
+	use pulseaudio || myconf+=( --disable-pulse )
+	use python     || myconf+=( --disable-python )
+	use vboxwebsrv && myconf+=( --enable-webservice )
+	use vnc        && myconf+=( --enable-vnc )
+	if ! use headless ; then
+		use qt4 || myconf+=( --disable-qt4 )
+	else
+		myconf+=( --build-headless --disable-opengl )
+	fi
+	if use amd64 && ! has_multilib_profile ; then
+		myconf+=( --disable-vmmraw )
+	fi
+	# not an autoconf script
+	./configure \
+		--with-gcc="$(tc-getCC)" \
+		--with-g++="$(tc-getCXX)" \
+		--disable-dbus \
+		--disable-kmods \
+		${myconf[@]} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	# and strip all flags
+	# strip-flags
+
+	MAKEJOBS=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+')
+	MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+') #'
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+	MAKE="kmk" emake \
+		VBOX_BUILD_PUBLISHER=_Gentoo \
+		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
+		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
+		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
+		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
+		VBOX_GCC_OPT="${CXXFLAGS}" \
+		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
+		all
+}
+
+src_install() {
+	local binpath="release"
+	use debug && binpath="debug"
+	cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binray given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the right libdir
+	sed -i \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${PN}-ose-5-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	# *.rc files for x86_64 are only available on multilib systems
+	local rcfiles="*.rc"
+	if use amd64 && ! has_multilib_profile ; then
+		rcfiles=""
+	fi
+	for each in VBox{ExtPackHelperApp,Manage,SVC,Tunctl,XPCOMIPCD} *so *r0 ${rcfiles} ; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root in any case.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 4750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
+	for fwfile in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${fwfile} 0644
+	done
+	popd &>/dev/null || die
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${D}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{headless,manage} VBox{Headless,Manage,VRDP} ; do
+		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
+
+	# VRDPAuth only works with this (bug #351949)
+	dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if ! use headless ; then
+		vbox_inst VBoxSDL 4750
+		pax-mark -m "${D}"${vbox_inst_path}/VBoxSDL
+
+		for each in vboxsdl VBoxSDL ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+
+		if use opengl && use qt4 ; then
+			vbox_inst VBoxTestOGL
+			pax-mark -m "${D}"${vbox_inst_path}/VBoxTestOGL
+		fi
+
+		if use qt4 ; then
+			vbox_inst VirtualBox 4750
+			pax-mark -m "${D}"${vbox_inst_path}/VirtualBox
+
+			for each in virtualbox VirtualBox ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+
+			insinto /usr/share/${PN}
+			doins -r nls
+
+			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+	fi
+
+	if use lvm ; then
+		vbox_inst VBoxVolInfo 4750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk ; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java ; then
+			java-pkg_regjar "${D}${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${D}${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev ; then
+		# New way of handling USB device nodes for VBox (bug #356215)
+		local udevdir="$(get_udevdir)"
+		insinto ${udevdir}
+		doins VBoxCreateUSBNode.sh
+		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
+		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
+			> "${T}"/10-virtualbox.rules || die
+		doins "${T}"/10-virtualbox.rules
+	fi
+
+	if use vboxwebsrv ; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	if use udev ; then
+		udevadm control --reload-rules \
+			&& udevadm trigger --subsystem-match=usb
+	fi
+
+	if ! use headless && use qt4 ; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "IMPORTANT!"
+	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
+	elog "\"env-update\" as root and logout and relogin as the user you wish"
+	elog "to run ${PN} as."
+	elog ""
+	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
+	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	elog "package."
+	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
+	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
+	elog "image, please emerge"
+	elog "  app-emulation/virtualbox-additions"
+	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	if ! use udev ; then
+		elog ""
+		elog "WARNING!"
+		elog "Without USE=udev, USB devices will likely not work in ${PN}."
+	elif [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
--- a/app-eselect/eselect-python/eselect-python-20140125-r2.ebuild
+++ b/app-eselect/eselect-python/eselect-python-20140125-r2.ebuild
@ -37,6 +37,8 @@ src_install() {
 pkg_postinst() {
 	if has_version 'dev-lang/python'; then
 		eselect python update --if-unset
+		# Regen python-config wrapper
+		eselect python set $(eselect python show)
 	fi
 	if has_version '=dev-lang/python-2*'; then
 		eselect python update --python2 --if-unset
--- a/app-misc/muttprint/muttprint-0.73-r4.ebuild
+++ b/app-misc/muttprint/muttprint-0.73-r4.ebuild
@ -23,6 +23,8 @@ DEPEND="dev-lang/perl
 		app-text/docbook-sgml-utils[jadetex] )"

 RDEPEND="dev-lang/perl
+	dev-perl/TimeDate
+	dev-perl/Text-Iconv
 	virtual/latex-base
 	dev-texlive/texlive-latexextra"

--- a/app-text/referencer/Manifest
+++ b/app-text/referencer/Manifest
@ -1,3 +1,2 @@
-DIST referencer-1.2.0.tar.gz 675680 SHA256 68731beb242ed2e20c01e7be0e68ce64260dbd3af930c96f8f0eb8e47e88a81d SHA512 4a8a848298c563c775d1fe912b02a82f98a1db92e13865e79c57dda15a6bbc545996080b26f71609cf8965c6c58e827a3ce6f071b3896246e00a6bb073869d9d WHIRLPOOL ffb808616c249266c31191d3c3a88cd20281bf043c7de350599ad5867e406fd08c4418695685291ca8c193cae9cd316ab6cd443719f08850c4e4de2ef5d1ab2c
 DIST referencer-1.2.1.tar.gz 678290 SHA256 449c7ccd6c07770b9a1ff3db4d34eb0ec5a47f6790a80ad1f0f66ea55e5cb4f3 SHA512 16a0af053c7a494f954da373397bf9a5736e1d6c79d041bfeab8f3f2a69952f13fcccd1fcbf49d83afa1521d4f245ee4ac55a1249d6fd7a21394f4926a3bd06e WHIRLPOOL 96975c37a7dc0ae558bfc3954ced2f29e08793259d6443b701af95ba0d58ad58da22e8a81bf90671bcf40ce78dc2fee764095cd4bdde34ad3ea3489b89765409
 DIST referencer-1.2.2.tar.gz 694421 SHA256 992d36a2cc10347704e4c77ead94d5e8952b0512a8885e0991461df88b31d964 SHA512 de8d759890f283e7863e6174334bcb051edf70f87a6fb06f724ffa1699be60c83d0191bde0324b571fab0801752a5b92fb507a3cd337fa9adb5ea7d22b280907 WHIRLPOOL c1466878e40c4a46dbac084422b0a023e3a189405a2eab181cb3923090c9e078313c6b24eac66faf48e00f634c87e96572cd30607253239ab769c5402c19b49d
--- a/app-text/referencer/files/referencer-desktop-file-validate.patch
+++ b/app-text/referencer/files/referencer-desktop-file-validate.patch
@ -1,10 +0,0 @@
--- a/data/referencer.desktop.in.in	2012-10-31 17:27:17.609179000 +0100
-+++ b/data/referencer.desktop.in.in	2012-10-31 17:47:22.059903251 +0100
-@@ -6,6 +6,6 @@
- Icon=referencer
- Terminal=false
- Type=Application
-Categories=GNOME;Application;Office;
-+Categories=GTK;GNOME;Office;
- StartupNotify=true
- MimeType=application/x-referencer;
--- a/app-text/referencer/referencer-1.2.0-r1.ebuild
+++ b/app-text/referencer/referencer-1.2.0-r1.ebuild
@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit fdo-mime eutils python-single-r1 flag-o-matic
-
-DESCRIPTION="Application to organise documents or references, and to generate BibTeX files"
-HOMEPAGE="https://launchpad.net/referencer"
-SRC_URI="https://launchpad.net/${PN}/1./${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=app-text/poppler-0.12.3-r3
-	>=dev-cpp/gtkmm-2.8:*
-	>=dev-cpp/libglademm-2.6.0
-	>=dev-cpp/gconfmm-2.14.0
-	>=dev-cpp/gtkmm-utils-0.4.1
-	>=dev-libs/boost-1.52.0-r4"
-
-DEPEND="${RDEPEND}
-	>=app-text/gnome-doc-utils-0.3.2
-	virtual/pkgconfig
-	>=dev-lang/perl-5.8.1
-	dev-perl/libxml-perl
-	dev-util/intltool
-	app-text/rarian"
-
-src_prepare () {
-	epatch "${FILESDIR}/${PN}-desktop-file-validate.patch"
-	python_fix_shebang plugins
-}
-
-src_configure() {
-	append-cxxflags -std=gnu++11
-	econf --disable-update-mime-database --enable-python
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_mime_database_update
-}
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@ -1,2 +1,4 @@
 DIST eigen-2.0.17.tar.bz2 367890 SHA256 7255e856ed367ce6e6e2d4153b0e4e753c8b8d36918bf440dd34ad56aff09960 SHA512 8fa0e4507864f61c30de14e3b29d963eb8b777d1a6bb04192d53e1f4c9db323b9fab2ddcedb63bf2af243fe0e26dcd717e97eb72216b6a1d444e455520192c72 WHIRLPOOL d80f12b378e23b758e4dbd173b87bed93bc42a97f2541b653b4373ea6ce0803bd712de00cf5a014a72cd439bb3ad10fd24b2ef8982975e044ff4d7bb2b63f585
+DIST eigen-3.2.10.tar.bz2 1168527 SHA256 760e6656426fde71cc48586c971390816f456d30f0b5d7d4ad5274d8d2cb0a6d SHA512 413c01a5b1b5d2e4366bc9289b1d613b21157e702b1c0d544e41ba5726acfbe0b60921ded37926010e9ce3642939e3ad39038e053d392b90a7a6302955ec5058 WHIRLPOOL f8d6498ab32197e0193ef7f9bae3f360f2a4cc321c34c90d2b72347ca5fd47a028fdc120dafd663520583ef471b4d756ab5cedea4f6d5344e76991a7afe4779b
 DIST eigen-3.2.8.tar.bz2 1161201 SHA256 722a63d672b70f39c271c5e2a4a43ba14d12015674331790414fcb167c357e55 SHA512 53c27ba530c985dfef52188e03273eeef33abbc67e3f150cacd3371c8b9ddbd399228730595821c4c56c061d109cf509266c1dab2b8a7c730902cbd6fb18c100 WHIRLPOOL 75e54f5620299f49a540483b0b4163e3cf6c48695f30f5e258343925cb488c3915588862a3fbe2341b5dbe17ea20756409265000f19ea2f45e7706837cb2488a
+DIST eigen-3.2.9.tar.bz2 1163762 SHA256 4d1e036ec1ed4f4805d5c6752b76072d67538889f4003fadf2f6e00a825845ff SHA512 2734ce70e0b04dc5839715a3cc9b8f90e05b341cfca42a7d586df213a9a14fe5642c76ccf36c16d020ae167c0d6e4d5cc306f0b3bf1f519c58372b0736ca7e63 WHIRLPOOL 7caba7b0676bc5dc203c8d8b5f57fc3a31a95171ddbb63b21ba8c84e58e5c5fde242d232299183e41886e970c3ea84bce821d506b6c32526ae44703ee3a599f9
--- a/dev-cpp/eigen/eigen-3.2.10.ebuild
+++ b/dev-cpp/eigen/eigen-3.2.10.ebuild
@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+FORTRAN_NEEDED="test"
+
+inherit cmake-utils fortran-2
+
+DESCRIPTION="C++ template library for linear algebra"
+HOMEPAGE="http://eigen.tuxfamily.org/"
+SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="LGPL-2 GPL-3"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="altivec debug doc openmp test"
+IUSE+=" cpu_flags_x86_sse2"
+IUSE+=" cpu_flags_x86_sse3"
+IUSE+=" cpu_flags_x86_sse4_1"
+IUSE+=" cpu_flags_x86_sse4_2"
+IUSE+=" cpu_flags_x86_ssse3"
+#IUSE+=" cpu_flags_x86_x87"
+
+RDEPEND="!dev-cpp/eigen:0"
+DEPEND="
+	doc? ( app-doc/doxygen[dot,latex] )
+	test? (
+		dev-libs/gmp:0
+		dev-libs/mpfr:0
+		media-libs/freeglut
+		media-libs/glew
+		sci-libs/adolc
+		sci-libs/cholmod
+		sci-libs/fftw:3.0
+		sci-libs/pastix
+		sci-libs/umfpack
+		sci-libs/scotch
+		sci-libs/spqr
+		sci-libs/superlu
+		dev-qt/qtcore:4
+		virtual/opengl
+		virtual/pkgconfig
+	)
+	"
+# Missing:
+# METIS-5
+# GOOGLEHASH
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.7-adaolc-backport.patch
+)
+
+src_unpack() {
+	default
+	mv ${PN}* ${P} || die
+}
+
+src_prepare() {
+	sed \
+		-e 's:-g2::g' \
+		-i cmake/EigenConfigureTesting.cmake || die
+
+	sed -i CMakeLists.txt \
+		-e "/add_subdirectory(demos/d" \
+		|| die "sed disable unused bundles failed"
+
+	if ! use test; then
+		sed -i CMakeLists.txt \
+			-e "/add_subdirectory(blas/d" \
+			-e "/add_subdirectory(lapack/d" \
+			|| die "sed disable unused bundles failed"
+	fi
+
+	sed -i -e "/Unknown build type/d" CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile doc
+}
+
+src_test() {
+	local mycmakeargs=(
+		-DEIGEN_BUILD_TESTS=ON
+		-DEIGEN_TEST_ALTIVEC="$(usex altivec)"
+		-DEIGEN_TEST_OPENMP="$(usex openmp)"
+		-DEIGEN_TEST_SSE2="$(usex cpu_flags_x86_sse2)"
+		-DEIGEN_TEST_SSE3="$(usex cpu_flags_x86_sse3)"
+		-DEIGEN_TEST_SSE4_1="$(usex cpu_flags_x86_sse4_1)"
+		-DEIGEN_TEST_SSE4_2="$(usex cpu_flags_x86_sse4_2)"
+		-DEIGEN_TEST_SSSE3="$(usex cpu_flags_x86_ssse3)"
+#		-DEIGEN_TEST_X87="$(usex cpu_flags_x86_x87)"
+	)
+	cmake-utils_src_configure
+	cmake-utils_src_compile blas
+	cmake-utils_src_compile buildtests
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+	use doc && dodoc -r "${BUILD_DIR}"/doc/html
+
+	# Debian installs it and some projects started using it.
+	insinto /usr/share/cmake/Modules/
+	doins "${S}/cmake/FindEigen3.cmake"
+}
--- a/dev-cpp/eigen/eigen-3.2.9.ebuild
+++ b/dev-cpp/eigen/eigen-3.2.9.ebuild
@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+FORTRAN_NEEDED="test"
+
+inherit cmake-utils fortran-2
+
+DESCRIPTION="C++ template library for linear algebra"
+HOMEPAGE="http://eigen.tuxfamily.org/"
+SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="LGPL-2 GPL-3"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="altivec debug doc openmp test"
+IUSE+=" cpu_flags_x86_sse2"
+IUSE+=" cpu_flags_x86_sse3"
+IUSE+=" cpu_flags_x86_sse4_1"
+IUSE+=" cpu_flags_x86_sse4_2"
+IUSE+=" cpu_flags_x86_ssse3"
+#IUSE+=" cpu_flags_x86_x87"
+
+RDEPEND="!dev-cpp/eigen:0"
+DEPEND="
+	doc? ( app-doc/doxygen[dot,latex] )
+	test? (
+		dev-libs/gmp:0
+		dev-libs/mpfr:0
+		media-libs/freeglut
+		media-libs/glew
+		sci-libs/adolc
+		sci-libs/cholmod
+		sci-libs/fftw:3.0
+		sci-libs/pastix
+		sci-libs/umfpack
+		sci-libs/scotch
+		sci-libs/spqr
+		sci-libs/superlu
+		dev-qt/qtcore:4
+		virtual/opengl
+		virtual/pkgconfig
+	)
+	"
+# Missing:
+# METIS-5
+# GOOGLEHASH
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.7-adaolc-backport.patch
+)
+
+src_unpack() {
+	default
+	mv ${PN}* ${P} || die
+}
+
+src_prepare() {
+	sed \
+		-e 's:-g2::g' \
+		-i cmake/EigenConfigureTesting.cmake || die
+
+	sed -i CMakeLists.txt \
+		-e "/add_subdirectory(demos/d" \
+		|| die "sed disable unused bundles failed"
+
+	if ! use test; then
+		sed -i CMakeLists.txt \
+			-e "/add_subdirectory(blas/d" \
+			-e "/add_subdirectory(lapack/d" \
+			|| die "sed disable unused bundles failed"
+	fi
+
+	sed -i -e "/Unknown build type/d" CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile doc
+}
+
+src_test() {
+	local mycmakeargs=(
+		-DEIGEN_BUILD_TESTS=ON
+		-DEIGEN_TEST_ALTIVEC="$(usex altivec)"
+		-DEIGEN_TEST_OPENMP="$(usex openmp)"
+		-DEIGEN_TEST_SSE2="$(usex cpu_flags_x86_sse2)"
+		-DEIGEN_TEST_SSE3="$(usex cpu_flags_x86_sse3)"
+		-DEIGEN_TEST_SSE4_1="$(usex cpu_flags_x86_sse4_1)"
+		-DEIGEN_TEST_SSE4_2="$(usex cpu_flags_x86_sse4_2)"
+		-DEIGEN_TEST_SSSE3="$(usex cpu_flags_x86_ssse3)"
+#		-DEIGEN_TEST_X87="$(usex cpu_flags_x86_x87)"
+	)
+	cmake-utils_src_configure
+	cmake-utils_src_compile blas
+	cmake-utils_src_compile buildtests
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+	use doc && dodoc -r "${BUILD_DIR}"/doc/html
+
+	# Debian installs it and some projects started using it.
+	insinto /usr/share/cmake/Modules/
+	doins "${S}/cmake/FindEigen3.cmake"
+}
--- a/dev-db/tokumx/tokumx-2.0.2.ebuild
+++ b/dev-db/tokumx/tokumx-2.0.2.ebuild
@ -6,7 +6,7 @@ EAPI=6
 CMAKE_BUILD_TYPE=Release
 PYTHON_COMPAT=( python2_7 )

-inherit python-r1 cmake-utils pax-utils
+inherit python-r1 cmake-utils pax-utils check-reqs

 MY_P=${PN}-enterprise-${PV}

@ -33,8 +33,8 @@ DEPEND="${RDEPEND}
 "

 S="${WORKDIR}/${MY_P}"
-#BUILD_DIR="${MY_P}/build"
 QA_PRESTRIPPED="/usr/lib64/libHotBackup.so"
+CHECKREQS_DISK_BUILD="13G"

 src_prepare() {
 	eapply "${FILESDIR}/${P}-no-werror.patch"
--- a/dev-games/openscenegraph/openscenegraph-3.2.1-r1.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.2.1-r1.ebuild
@ -1,149 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils cmake-utils flag-o-matic wxwidgets
-
-MY_PN="OpenSceneGraph"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Open source high performance 3D graphics toolkit"
-HOMEPAGE="http://www.openscenegraph.org/projects/osg/"
-SRC_URI="http://www.openscenegraph.org/downloads/developer_releases/${MY_P}.zip"
-
-LICENSE="wxWinLL-3 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="asio curl debug doc examples ffmpeg fltk fox gdal gif glut gtk jpeg jpeg2k
-openexr openinventor osgapps pdf png qt4 qt5 sdl svg tiff truetype vnc wxwidgets
-xine xrandr zlib"
-
-REQUIRED_USE="
-	qt4? ( !qt5 )
-	qt5? ( !qt4 )
-"
-
-# TODO: COLLADA, FBX, GTA, ITK, OpenVRML, Performer, DCMTK
-RDEPEND="
-	x11-libs/libSM
-	x11-libs/libXext
-	virtual/glu
-	virtual/opengl
-	asio? ( dev-cpp/asio )
-	curl? ( net-misc/curl )
-	examples? (
-		fltk? ( x11-libs/fltk:1[opengl] )
-		fox? ( x11-libs/fox:1.6[opengl] )
-		glut? ( media-libs/freeglut )
-		gtk? ( x11-libs/gtkglext )
-		sdl? ( media-libs/libsdl )
-		wxwidgets? ( x11-libs/wxGTK[opengl,X] )
-	)
-	ffmpeg? ( virtual/ffmpeg )
-	gdal? ( sci-libs/gdal )
-	gif? ( media-libs/giflib )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper:= )
-	openexr? (
-		media-libs/ilmbase
-		media-libs/openexr
-	)
-	openinventor? ( media-libs/coin )
-	pdf? ( app-text/poppler[cairo] )
-	png? ( media-libs/libpng:0= )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtopengl:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-	)
-	svg? (
-		gnome-base/librsvg
-		x11-libs/cairo
-	)
-	tiff? ( media-libs/tiff:0 )
-	truetype? ( media-libs/freetype:2 )
-	vnc? ( net-libs/libvncserver )
-	xine? ( media-libs/xine-lib )
-	xrandr? ( x11-libs/libXrandr )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	virtual/pkgconfig
-	x11-proto/xextproto
-	doc? ( app-doc/doxygen )
-	xrandr? ( x11-proto/randrproto )
-"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=(AUTHORS.txt ChangeLog NEWS.txt)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.1-cmake.patch
-	"${FILESDIR}"/${PN}-3.2.1-gdal-2.0.patch
-)
-
-src_configure() {
-	if use examples && use wxwidgets; then
-		WX_GTK_VER="2.8"
-		need-wxwidgets unicode
-	fi
-
-	# Needed by FFmpeg
-	append-cppflags -D__STDC_CONSTANT_MACROS
-
-	mycmakeargs=(
-		-DDYNAMIC_OPENSCENEGRAPH=ON
-		-DWITH_ITK=OFF
-		-DGENTOO_DOCDIR="/usr/share/doc/${PF}"
-		$(cmake-utils_use_with asio)
-		$(cmake-utils_use_with curl)
-		$(cmake-utils_use_build doc DOCUMENTATION)
-		$(cmake-utils_use_build osgapps OSG_APPLICATIONS)
-		$(cmake-utils_use_build examples OSG_EXAMPLES)
-		$(cmake-utils_use_with ffmpeg FFmpeg)
-		$(cmake-utils_use_with fltk)
-		$(cmake-utils_use_with fox)
-		$(cmake-utils_use_with gdal)
-		$(cmake-utils_use_with gif GIFLIB)
-		$(cmake-utils_use_with glut)
-		$(cmake-utils_use_with gtk GtkGl)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with jpeg2k Jasper)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with openinventor Inventor)
-		$(cmake-utils_use_with pdf Poppler-glib)
-		$(cmake-utils_use_with png)
-		$(cmake-utils_use_with sdl)
-		$(cmake-utils_use_with svg rsvg)
-		$(cmake-utils_use_with tiff)
-		$(cmake-utils_use_with truetype Freetype)
-		$(cmake-utils_use_with vnc LibVNCServer)
-		$(cmake-utils_use_with wxwidgets wxWidgets)
-		$(cmake-utils_use_with xine)
-		$(cmake-utils_use xrandr OSGVIEWER_USE_XRANDR)
-		$(cmake-utils_use_with zlib)
-	)
-	if use qt4; then
-		mycmakeargs+=( -DOSG_USE_QT=ON -DDESIRED_QT_VERSION=4 )
-	elif use qt5; then
-		mycmakeargs+=( -DOSG_USE_QT=ON -DDESIRED_QT_VERSION=5 )
-	else
-		mycmakeargs+=( -DOSG_USE_QT=OFF )
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile doc_openscenegraph doc_openthreads
-}
--- a/dev-games/openscenegraph/openscenegraph-3.2.1-r2.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.2.1-r2.ebuild
@ -12,7 +12,7 @@ MY_P=${MY_PN}-${PV}

 DESCRIPTION="Open source high performance 3D graphics toolkit"
 HOMEPAGE="http://www.openscenegraph.org/projects/osg/"
-SRC_URI="http://www.openscenegraph.org/downloads/developer_releases/${MY_P}.zip"
+SRC_URI="http://trac.openscenegraph.org/downloads/developer_releases/${MY_P}.zip"

 LICENSE="wxWinLL-3 LGPL-2.1"
 SLOT="0"
--- a/dev-games/openscenegraph/openscenegraph-3.2.1.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.2.1.ebuild
@ -1,132 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils cmake-utils flag-o-matic wxwidgets
-
-MY_PN="OpenSceneGraph"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Open source high performance 3D graphics toolkit"
-HOMEPAGE="http://www.openscenegraph.org/projects/osg/"
-SRC_URI="http://www.openscenegraph.org/downloads/developer_releases/${MY_P}.zip"
-
-LICENSE="wxWinLL-3 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="asio curl debug doc examples ffmpeg fltk fox gdal gif glut gtk jpeg jpeg2k
-openexr openinventor osgapps pdf png qt4 sdl svg tiff truetype vnc wxwidgets
-xine xrandr zlib"
-
-# TODO: COLLADA, FBX, GTA, ITK, OpenVRML, Performer, DCMTK
-RDEPEND="
-	x11-libs/libSM
-	x11-libs/libXext
-	virtual/glu
-	virtual/opengl
-	asio? ( dev-cpp/asio )
-	curl? ( net-misc/curl )
-	examples? (
-		fltk? ( x11-libs/fltk:1[opengl] )
-		fox? ( x11-libs/fox:1.6[opengl] )
-		glut? ( media-libs/freeglut )
-		gtk? ( x11-libs/gtkglext )
-		sdl? ( media-libs/libsdl )
-		wxwidgets? ( x11-libs/wxGTK[opengl,X] )
-	)
-	ffmpeg? ( virtual/ffmpeg )
-	gdal? ( sci-libs/gdal )
-	gif? ( media-libs/giflib )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper:= )
-	openexr? (
-		media-libs/ilmbase
-		media-libs/openexr
-	)
-	openinventor? ( media-libs/coin )
-	pdf? ( app-text/poppler[cairo] )
-	png? ( media-libs/libpng:0= )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtopengl:4
-	)
-	svg? (
-		gnome-base/librsvg
-		x11-libs/cairo
-	)
-	tiff? ( media-libs/tiff:0 )
-	truetype? ( media-libs/freetype:2 )
-	vnc? ( net-libs/libvncserver )
-	xine? ( media-libs/xine-lib )
-	xrandr? ( x11-libs/libXrandr )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	virtual/pkgconfig
-	x11-proto/xextproto
-	doc? ( app-doc/doxygen )
-	xrandr? ( x11-proto/randrproto )
-"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=(AUTHORS.txt ChangeLog NEWS.txt)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.1-cmake.patch
-)
-
-src_configure() {
-	if use examples && use wxwidgets; then
-		WX_GTK_VER="2.8"
-		need-wxwidgets unicode
-	fi
-
-	# Needed by FFmpeg
-	append-cppflags -D__STDC_CONSTANT_MACROS
-
-	mycmakeargs=(
-		-DDESIRED_QT_VERSION=4
-		-DDYNAMIC_OPENSCENEGRAPH=ON
-		-DWITH_ITK=OFF
-		-DGENTOO_DOCDIR="/usr/share/doc/${PF}"
-		$(cmake-utils_use_with asio)
-		$(cmake-utils_use_with curl)
-		$(cmake-utils_use_build doc DOCUMENTATION)
-		$(cmake-utils_use_build osgapps OSG_APPLICATIONS)
-		$(cmake-utils_use_build examples OSG_EXAMPLES)
-		$(cmake-utils_use_with ffmpeg FFmpeg)
-		$(cmake-utils_use_with fltk)
-		$(cmake-utils_use_with fox)
-		$(cmake-utils_use_with gdal)
-		$(cmake-utils_use_with gif GIFLIB)
-		$(cmake-utils_use_with glut)
-		$(cmake-utils_use_with gtk GtkGl)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with jpeg2k Jasper)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with openinventor Inventor)
-		$(cmake-utils_use_with pdf Poppler-glib)
-		$(cmake-utils_use_with png)
-		$(cmake-utils_use qt4 OSG_USE_QT)
-		$(cmake-utils_use_with sdl)
-		$(cmake-utils_use_with svg rsvg)
-		$(cmake-utils_use_with tiff)
-		$(cmake-utils_use_with truetype Freetype)
-		$(cmake-utils_use_with vnc LibVNCServer)
-		$(cmake-utils_use_with wxwidgets wxWidgets)
-		$(cmake-utils_use_with xine)
-		$(cmake-utils_use xrandr OSGVIEWER_USE_XRANDR)
-		$(cmake-utils_use_with zlib)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile doc_openscenegraph doc_openthreads
-}
--- a/dev-lang/mono/mono-4.9.0.729.ebuild
+++ b/dev-lang/mono/mono-4.9.0.729.ebuild
@ -29,6 +29,7 @@ DEPEND="${COMMONDEPEND}
 	sys-devel/bc
 	virtual/yacc
 	pax_kernel? ( sys-apps/elfix )
+	dev-util/cmake
 	!dev-lang/mono-basic
 "

--- a/dev-libs/libuv/libuv-1.10.0.ebuild
+++ b/dev-libs/libuv/libuv-1.10.0.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 RESTRICT="test"

--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@ -1,4 +1 @@
-DIST re2-20130115.tgz 1020951 SHA256 a95d83ed8203817587f7cc368b6f7199d8a4b1558372c306b07201058b92e1fe SHA512 ef1378d89397bf594ece7817ef91171e467a3408046f769eca08beba900a0e70f652e7c4e3b667b3a9d5cef044b08ed74ef7d564ffb965ab75bb9a3964c9ab5a WHIRLPOOL 2cbf47b1816e35e5c7f359a310b4421ad635d1513167ffabf98db84397be800f8b98d4808705754f0e2db14bbeb0d62e47ac3abb385e299c503126a9f874daf5
-DIST re2-20130712.tgz 1028311 SHA256 c30e43524280ebc2b9afa8c40ad477d0b2665bc81b663e9ae1b8b48e053af54b SHA512 910e7c7f5b3268746355c2e14dc6a4e32105207abcf8cb56b76fc554be41768e4e4a6b526c9335e95be0bb111025876b61ede1cfebcbec4a4062d53bb1448e08 WHIRLPOOL e5cf26a6c8586503c1639dd3f528cace8a4d7ca4c4ff97e08b12f45753ff67ad78656513658eabd678ac8ab88f1de5279960428fffe1b9e0535afdba44e7e8a3
-DIST re2-20140304.tgz 1050493 SHA256 0bffd1a57de2f4b218ca0f77d8850bfd59c82944a98256c6edba25260e0196a7 SHA512 a426e8d69d2c7614087990180539c5b1aa2c544dee14b144098f810b76b6062d7de9efaf1e90e83c61c8e4382a066201862d09965f1a6a9f86e2912011ad9d40 WHIRLPOOL d998a6dd9edac52fe0c4ed7e895940380d9b67220711d68aed02294c8f65a644a59f77bddce116ccf79860c633046fa2b5060ef45d5cb5ea5bc0c1965cdce052
 DIST re2-2016-05-01.tar.gz 399509 SHA256 d9d13f0ea4e1c6628b1cb85eeee284d4fdd4948da94b1f205096254927092e3d SHA512 6d37ab1eae51a73f60d3c8280ea1162c420638363f0eb1313d7c2d5cee65a5abd4c2927da1a53572afbcb7d07fac2993a7e54c6cbc85e24aaae93c46dab19b14 WHIRLPOOL b601349800341d213b01219cf2171873be551488c71c2c06fbab1da27c20719fca12e0cfac30ac4e8ed0eb062a445b4c008491fd0e379f629434e0c9b4649a7e
--- a/dev-libs/re2/re2-0_p20130115-r1.ebuild
+++ b/dev-libs/re2/re2-0_p20130115-r1.ebuild
@ -1,56 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib multilib-build toolchain-funcs
-
-DESCRIPTION="An efficent, principled regular expression library"
-HOMEPAGE="https://code.google.com/p/re2/"
-SRC_URI="https://re2.googlecode.com/files/${PN}-${PV##*_p}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-# TODO: the directory in the tarball should really be versioned.
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	# Fix problems with FilteredRE2 symbols not being exported.
-	epatch "${FILESDIR}/${PN}-symbols-r0.patch"
-	multilib_copy_sources
-}
-
-mymake() {
-	cd "${BUILD_DIR}" || die
-	local makeopts=(
-		AR="$(tc-getAR)"
-		CXX="$(tc-getCXX)"
-		CXXFLAGS="${CXXFLAGS} -pthread"
-		LDFLAGS="${LDFLAGS} -pthread"
-		NM="$(tc-getNM)"
-	)
-	emake "${makeopts[@]}" "$@"
-}
-
-src_compile() {
-	multilib_foreach_abi mymake
-}
-
-src_test() {
-	multilib_foreach_abi mymake shared-test
-}
-
-src_install() {
-	myinstall() {
-		cd "${BUILD_DIR}" || die
-		emake DESTDIR="${ED}" prefix=usr libdir=usr/$(get_libdir) install
-		multilib_check_headers
-	}
-	multilib_foreach_abi myinstall
-	dodoc AUTHORS CONTRIBUTORS README doc/syntax.txt
-	dohtml doc/syntax.html
-}
--- a/dev-libs/re2/re2-0_p20130115.ebuild
+++ b/dev-libs/re2/re2-0_p20130115.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="An efficent, principled regular expression library"
-HOMEPAGE="https://code.google.com/p/re2/"
-SRC_URI="https://re2.googlecode.com/files/${PN}-${PV##*_p}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-# TODO: the directory in the tarball should really be versioned.
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	# Fix problems with FilteredRE2 symbols not being exported.
-	epatch "${FILESDIR}/${PN}-symbols-r0.patch"
-}
-
-src_compile() {
-	makeopts=(
-		AR="$(tc-getAR)"
-		CXX="$(tc-getCXX)"
-		CXXFLAGS="${CXXFLAGS} -pthread"
-		LDFLAGS="${LDFLAGS} -pthread"
-		NM="$(tc-getNM)"
-	)
-	emake "${makeopts[@]}"
-}
-
-src_test() {
-	emake "${makeopts[@]}" shared-test
-}
-
-src_install() {
-	emake DESTDIR="${ED}" prefix=usr libdir=usr/$(get_libdir) install
-	# TODO: the upstream should not build static library at all.
-	rm "${ED}/usr/$(get_libdir)/libre2.a" || die
-	dodoc AUTHORS CONTRIBUTORS README doc/syntax.txt
-	dohtml doc/syntax.html
-}
--- a/dev-libs/re2/re2-0_p20130712.ebuild
+++ b/dev-libs/re2/re2-0_p20130712.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib multilib-minimal toolchain-funcs
-
-DESCRIPTION="An efficent, principled regular expression library"
-HOMEPAGE="https://code.google.com/p/re2/"
-SRC_URI="https://re2.googlecode.com/files/${PN}-${PV##*_p}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-# TODO: the directory in the tarball should really be versioned.
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-compile-r0.patch"
-	multilib_copy_sources
-}
-
-mymake() {
-	local makeopts=(
-		AR="$(tc-getAR)"
-		CXX="$(tc-getCXX)"
-		CXXFLAGS="${CXXFLAGS} -pthread"
-		LDFLAGS="${LDFLAGS} -pthread"
-		NM="$(tc-getNM)"
-	)
-	emake "${makeopts[@]}" "$@"
-}
-
-multilib_src_compile() {
-	mymake
-}
-
-multilib_src_test() {
-	mymake static-test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${ED}" prefix=usr libdir=usr/$(get_libdir) install
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS CONTRIBUTORS README doc/syntax.txt
-	dohtml doc/syntax.html
-}
--- a/dev-libs/re2/re2-0_p20140304.ebuild
+++ b/dev-libs/re2/re2-0_p20140304.ebuild
@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic eutils multilib multilib-minimal toolchain-funcs
-
-DESCRIPTION="An efficent, principled regular expression library"
-HOMEPAGE="https://code.google.com/p/re2/"
-SRC_URI="https://re2.googlecode.com/files/${PN}-${PV##*_p}.tgz"
-
-LICENSE="BSD"
-# Symbols removed in version 20140110
-# http://upstream-tracker.org/compat_reports/re2/20131024_to_20140110/abi_compat_report.html
-# https://code.google.com/p/re2/issues/detail?id=111
-SLOT="0/0.20140110"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-# TODO: the directory in the tarball should really be versioned.
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	multilib_copy_sources
-}
-
-src_configure() {
-	tc-export AR CXX NM
-	append-cxxflags -pthread
-	append-ldflags -pthread
-}
-
-multilib_src_test() {
-	emake static-test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${ED}" prefix=usr libdir=usr/$(get_libdir) install
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS CONTRIBUTORS README doc/syntax.txt
-	dohtml doc/syntax.html
-}
--- a/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.200.0.ebuild
+++ b/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.200.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Execute code after a scope finished compilation"

 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~ppc-aix ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~x86 ~ppc-aix ~x64-macos"
 IUSE="test"

 RDEPEND="
--- a/dev-perl/Chatbot-Eliza/Chatbot-Eliza-1.60.0.ebuild
+++ b/dev-perl/Chatbot-Eliza/Chatbot-Eliza-1.60.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A clone of the classic Eliza program"

 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~x86"
 IUSE="test"

 RDEPEND="
--- a/dev-perl/DateTime/DateTime-1.360.0.ebuild
+++ b/dev-perl/DateTime/DateTime-1.360.0.ebuild
@ -12,7 +12,7 @@ DESCRIPTION="A date and time object"

 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-aix ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~x86 ~ppc-aix ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="test"

 CONFLICTS="
--- a/dev-perl/Devel-Caller/Devel-Caller-2.60.0.ebuild
+++ b/dev-perl/Devel-Caller/Devel-Caller-2.60.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Meatier versions of caller"

 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ppc x86"
 IUSE=""

 DEPEND="dev-perl/PadWalker"
--- a/dev-perl/Devel-LexAlias/Devel-LexAlias-0.50.0.ebuild
+++ b/dev-perl/Devel-LexAlias/Devel-LexAlias-0.50.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Alias lexical variables"

 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ppc x86"
 IUSE=""

 DEPEND=">=dev-perl/Devel-Caller-2.03"
--- a/dev-perl/Eval-Closure/Eval-Closure-0.130.0.ebuild
+++ b/dev-perl/Eval-Closure/Eval-Closure-0.130.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="safely and cleanly create closures via string eval"

 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ppc x86 ~x86-fbsd ~x64-macos"
 IUSE="test minimal"

 # Scalar::Util -> Scalar-List-Utils
--- a/dev-perl/File-Share/File-Share-0.250.0.ebuild
+++ b/dev-perl/File-Share/File-Share-0.250.0.ebuild
@ -10,7 +10,7 @@ inherit perl-module

 DESCRIPTION="Extend File::ShareDir to local libraries"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~x86"
 IUSE="test"

 RDEPEND=">=dev-perl/File-ShareDir-1.30.0"
--- a/dev-perl/PDF-Create/PDF-Create-1.370.0.ebuild
+++ b/dev-perl/PDF-Create/PDF-Create-1.370.0.ebuild
@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Create PDF documents in Perl"

 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~x86"
 IUSE="test examples"

 RDEPEND="
--- a/dev-perl/Specio/Specio-0.310.0.ebuild
+++ b/dev-perl/Specio/Specio-0.310.0.ebuild
@ -10,7 +10,7 @@ inherit perl-module

 DESCRIPTION="Type constraints and coercions for Perl"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~x86"
 IUSE="test"

 PATCHES=("${FILESDIR}/${PN}-${DIST_VERSION}-installskip.patch")
--- a/dev-perl/Test-Needs/Test-Needs-0.2.2.ebuild
+++ b/dev-perl/Test-Needs/Test-Needs-0.2.2.ebuild
@ -10,7 +10,7 @@ inherit perl-module

 DESCRIPTION="Skip tests when modules not available"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~x86"
 IUSE="test"

 RDEPEND=""
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@ -1,6 +1,3 @@
-DIST docker-py-1.10.3.tar.gz 121064 SHA256 3042c0b3ca5333aaaa53f0aa7acc19b5a1258b0f2fcf0a90da0f96659f52f64a SHA512 39bb7440849fcc815f6a36dfe402e76635d01584f9af3d17610d0c70719f46aa16b697058feeda961b9830e463fba5aeac2cc28752881ea0bf1cd0c6ca41acb7 WHIRLPOOL 92a0b7dd9a3fdedee7538bc1518035bca470c91a436516c87b2645b50a36fd5b884517f92759bd4e7f02cd6545335072bd801692cbb5c2b424cb6f4320ddea27
-DIST docker-py-1.10.4.tar.gz 122223 SHA256 8b0054aa1afce641df369ccec5e350c3d2dbe9deef2b3ad11222f7becfab8081 SHA512 bdfbaff471ecb16c5b283a960d2366ada80bce3fbc67c962f14bd1a254a59f85bbdc9e47873e409118d09594dfb2fa1fd5a522beaa668a2a63bd46dbd58b0dc3 WHIRLPOOL 0d56f43001130aef6d4a9f963d211c1f6f3617b09ec64e9b6e15404ba1c5a692ed28e29be4022d4218b5b615f3bbeac1d81caf9fcf6108224752eb82b544be4a
 DIST docker-py-1.10.6.tar.gz 122462 SHA256 dd1aa55dbe507538318e51e5303077d146d5176abd6b05fe9bcde24c289410bc SHA512 6360f9743472c42b3b080204195a0ba62ec85503cc3d4053dca1fb68e8dbed54bd90ed530d9b6ed0b29367aecbe3731d076c89e8d49365c133754bc38c3f15b9 WHIRLPOOL 3f42a0e597e63d0b821c1887b680b2faa8f696b65aa0851acaf00ccbc3ed2b271b1bbcc5390b99f6402b56f6a1a116fe76bf6a5f542b8beb9f8213e81df18f08
 DIST docker-py-1.2.2.tar.gz 69685 SHA256 85284a5b1a965e01a5d0a91f9f639ad5069143a276c123198fdafc3659280b38 SHA512 bf00b19e0ab56e5c0e8459234d09722ca504ecd933bfba61cb4ab4805410f53f6ad6083f2e964ef5a6eded2ea05aa01a89c27621064386bae145c7258ed996ad WHIRLPOOL bd7ff4579f924e02d18581b1aca00790dcb84afda03e4cde70b349bfdb4ad43aa2e06da2bcbe780f6074d98f9af9b14fb9d2ab4da9265e56b73288902c9ede7a
 DIST docker-py-1.9.0.tar.gz 105939 SHA256 0ff58798c8cf79c7e459505786b3b83ca0552a077945b8fe20fc38ff3f732361 SHA512 49e6d4e8ab30c4e54165e7eff9e3034a1fe102348020bad2c5aefa238c44efdf39711536a7727fd9689e2e90483a348930bb91f1e76cade546161c82990f78ed WHIRLPOOL d60bca034f91569f37bef65ff42fcf950dfbc02bc42053bb650a9188661a8c0d9c21cb03128782a15799e6f208e88b32618286615ef94ba9396a4940ae3b6603
-DIST docker-py-1.9.0_rc2.tar.gz 105689 SHA256 30770466eef8fe5db3ac75ede506bb412de8a59600954089b385b4d134d54051 SHA512 8c4993aea477ae640660d10f80ca0a9b5f40f1d7a446cc67d392b824c78272ee32d42004952a70a3a55a105f313c06338266b206f4193cab736fa84c3c9b4d8c WHIRLPOOL bf1329f20095d519756a68bc3bd2a95d6d476366e1cfdc38eb38a6ad4a25da11964a20d039fb32af69dd4bd76b578b43b3b6b468767ba2fc8305b088019ae17c
--- a/dev-python/docker-py/docker-py-1.10.3.ebuild
+++ b/dev-python/docker-py/docker-py-1.10.3.ebuild
@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Python client for Docker"
-HOMEPAGE="https://github.com/docker/docker-py"
-SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( ~dev-python/mkdocs-0.15.3[${PYTHON_USEDEP}] )
-	test? (
-		~dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8.0[${PYTHON_USEDEP}]
-		<=dev-python/pytest-3.0.0[${PYTHON_USEDEP}]
-		~dev-python/pytest-cov-2.1.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/docker-pycreds-0.2.1[${PYTHON_USEDEP}]
-	<dev-python/requests-2.11[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_3' 'python3_4' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-"
-
-python_compile_all() {
-	if use doc; then
-		mkdocs build -d 'mkdocs_site' || die "docs failed to build"
-	fi
-}
-
-python_test() {
-	py.test tests/unit/ | die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( mkdocs_site/. )
-
-	distutils-r1_python_install_all
-}
--- a/dev-python/docker-py/docker-py-1.10.4.ebuild
+++ b/dev-python/docker-py/docker-py-1.10.4.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Python client for Docker"
-HOMEPAGE="https://github.com/docker/docker-py"
-SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/mkdocs-0.14.0[${PYTHON_USEDEP}] )
-	test? (
-		~dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		~dev-python/pytest-2.7.2[${PYTHON_USEDEP}]
-		~dev-python/pytest-cov-2.1.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/docker-pycreds-0.2.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_3' 'python3_4' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-"
-
-python_compile_all() {
-	if use doc; then
-		mkdocs build -d 'mkdocs_site' || die "docs failed to build"
-	fi
-}
-
-python_test() {
-	py.test tests/unit/ | die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( mkdocs_site/. )
-
-	distutils-r1_python_install_all
-}
--- a/dev-python/docker-py/docker-py-1.9.0_rc2.ebuild
+++ b/dev-python/docker-py/docker-py-1.9.0_rc2.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PV=${PV//_/-}
-
-DESCRIPTION="Python client for Docker"
-HOMEPAGE="https://github.com/docker/docker-py"
-SRC_URI="https://github.com/docker/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/mkdocs-0.14.0[${PYTHON_USEDEP}] )
-	test? (
-		~dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		~dev-python/pytest-2.7.2[${PYTHON_USEDEP}]
-		~dev-python/pytest-cov-2.1.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_3' 'python3_4' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-"
-
-python_compile_all() {
-	if use doc; then
-		mkdocs build -d 'mkdocs_site' || die "docs failed to build"
-	fi
-}
-
-python_test() {
-	py.test tests/unit/ | die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( mkdocs_site/. )
-
-	distutils-r1_python_install_all
-}
--- a/dev-python/dockerpty/Manifest
+++ b/dev-python/dockerpty/Manifest
@ -1,3 +1,2 @@
-DIST dockerpty-0.3.3.tar.gz 18583 SHA256 4b59a42c9b13c878439ccb2f75d017f88f306ab33fae7b20d8ac1f7e3fa72af7 SHA512 c5e0686c19b3ee3762c79d8f66602e25f3decd14c3ae35f514464c5e4c627e7653ca86f9e602535cb65c0d15d00ca5c687576214efe87a7309abca11cd6b8ea5 WHIRLPOOL 69bbf8bee0f52689e22827789fc05b64e6c09014e98a4075a746865567f8c790a533ce21f5e41319892b567fdbded6f428e0969a5b9c27b8726254d56901f6fa
 DIST dockerpty-0.3.4.tar.gz 18611 SHA256 d041b268264905818ca7cfc52e14b738c1ff2c21ef59ccbed5d5ef81d4a7591e SHA512 dee0cf8ae926bae3f5e96643e912d3cc2dbd782594fa148addac996909e7fec84e1e1579a8d00ce46479041e85496b0615cb4a68b635288d04a4ef73ad27b10d WHIRLPOOL ddd768c2b650301ac4c27fc9394d47f65303734abbbc1da7ddfdbd31ca89578a952b189e709a51134d0946985608af7ecb16108a52c8c6205b7ab58c0b7e7b61
 DIST dockerpty-0.4.1.tar.gz 19608 SHA256 fd9acb9fa7a464b668dcc50612975f3c7f1485cc0213d19de8381cb641b49459 SHA512 1f27a1d1cf9bfa21a77f2c0695334ec09a81ed5b70190b16fb23ec0e2ab4cb84af334b5e9275265eff2d8014aac5f96890276bed5775bb805c3f30260c99da70 WHIRLPOOL 8ab9edfff1d1a795f548ae66ea71064138a91b5a3b9909dea079b872a0b38e662d1cf14c19b10dce5c5671290c983e03e13e879709e7900e53d3faa8af76d207
--- a/dev-python/dockerpty/dockerpty-0.3.3.ebuild
+++ b/dev-python/dockerpty/dockerpty-0.3.3.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Python library to use the pseudo-tty of a docker container"
-HOMEPAGE="https://github.com/d11wtq/dockerpty"
-SRC_URI="https://github.com/d11wtq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/behave-1.2.4[${PYTHON_USEDEP}]
-		>=dev-python/docker-py-0.7.1[${PYTHON_USEDEP}]
-		>=dev-python/expects-0.4[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.5.2[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND=">=dev-python/six-1.3.0[${PYTHON_USEDEP}]"
-
-python_test() {
-	local RUN_FEATURES=0
-
-	ewarn "${PN} tests require portage to be in the docker group!"
-	getent group docker |& grep portage 1>/dev/null 2>&1
-	RUN_FEATURES+=${?}
-
-	ewarn "${PN} tests require a running docker service!"
-	which docker 1>/dev/null 2>&1 && docker info 1>/dev/null 2>&1
-	RUN_FEATURES+=${?}
-
-	if [[ ${RUN_FEATURES} -eq 0 ]]; then
-		behave || die "Feature tests failed under ${EPYTHON}"
-
-	fi
-
-	py.test tests || die "Tests failed under ${EPYTHON}"
-}
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@ -1,3 +1,2 @@
-DIST httplib2-0.8.tar.gz 148284 SHA256 af689bc3cb10a95721eb0d0cf806202a699e7799dacd3497f63b48b2ba429c3f SHA512 3b95b2f64f7b24a638792562e2d8645f9087ab716a105c8771e002507fde3cca9eb7e5de27140a7aed075e70ebd83fbfbda798714a94153b6233b2b704db1176 WHIRLPOOL 3aa30e5e4cdb08cb6e8544d2fb82eb02492ce04a5752255ae281389fcc382aceecdb060a3cda0a926eba4bbe15563d379851c97cbcabbb17106696f4a90d4987
 DIST httplib2-0.9.1.tar.gz 205074 SHA256 bc6339919a5235b9d1aaee011ca5464184098f0c47c9098001f91c97176583f5 SHA512 2005d55c94971163b42366a33578f068b3e1316d59b4d834dc2d2ebcfa050d1492a27d0eefaceea48ed0cc41d8d6d3eb1b401658546a317ff82f0901a441f716 WHIRLPOOL 0d680d8a5745313c64cf0704d1e0aafd14e71a923ef3290caa118b867dc2722f087c6cc2977f104a025a2409d86a4561aac5f39718d80c083d58cd953d32b69d
 DIST httplib2-0.9.2.tar.gz 205165 SHA256 c3aba1c9539711551f4d83e857b316b5134a1c4ddce98a875b7027be7dd6d988 SHA512 cf1684f2d072588bc676c02491667480bdd2be0b3494703129d9cfa339d1233e14c0b4895b174d4c2ec5e2f5ae265d165b4e001b180f39f81db2178f91a032f8 WHIRLPOOL d795a016202821870e890531011e7c1c51dbc52f78f79ccf078e85fb3c1155dcf996b2e629b450ba79e34ccdda41e3df3d80293e102c39a76a57d174e51a884e
--- a/dev-python/httplib2/httplib2-0.8.ebuild
+++ b/dev-python/httplib2/httplib2-0.8.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A comprehensive HTTP client library"
-HOMEPAGE="https://code.google.com/p/httplib2/ https://pypi.python.org/pypi/httplib2"
-SRC_URI="https://httplib2.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# tests connect to random remote sites
-RESTRICT="test"
-
-python_test() {
-	if [[ ${EPYTHON} == python2.7 ]] ; then
-		cd python2 || die
-	else
-		cd python3 || die
-	fi
-
-	"${PYTHON}" httplib2test.py || die
-}
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@ -1,4 +1,4 @@
-DIST pyglet-1.1.4.tar.gz 2946601 SHA256 1d9b2a5e3a37a9068aee70100d19bfa83a6bbf6d4a2af8adb4231a601a101611 SHA512 26e1b652bd0e2666014bd29c4456570eee5fdbcce694f49f424fdab3583d0fb67d835e9f0e09f0459dc65cf3c042fffbfbeb321b286890be03260c9ee30bf187 WHIRLPOOL 89424736a0da9abd62813159ff6367b2c536b9cbfe63aaaf1733c712161453a77b3086ca0f4a840a1f682f2bd5334e0decb28d71b7dc187135a799c711ce6afc
+DIST pyglet-1.1.4.tar.gz 2946835 SHA256 63a7936dffe4fc0475617a4d804a4b63ab13949cb30afd3c62ab98d8384f7ff3 SHA512 e1acd2e145bddbed2da1e8d66222b7057ecfcc97f93f4972741e87ec8584a944e2cc0c972aa985cb1f51e0dd2e4bbf1332201e8eb66f29945cfdac1b9ac63b64 WHIRLPOOL f31dc562b940454766a188d0ce9ac8a462a9c24e995d28cacafe1437c1f1dc609410b748d9a31f2fe8c85aac7fbfa4bc54ec2c5470560f31251af64dda258c6c
 DIST pyglet-1.2.2.tar.gz 2120758 SHA256 6b54c3881a5eb086f2733c24aada1b65625b45b36172cd7f63fbde2cf43138df SHA512 012dcf6f62a823a391f7ac81b4a6dc89cf2bfd1f3f895dfa115011efdcbd1327821a11c47d455ed4e2a3edbd041f8a5e5b3c5f27b336a6c4d17c028a8999dc69 WHIRLPOOL ab2f402076b2aed110cde901e49b003e336eb634ad8b3f084dd1a980a1079959639ec1773b3106185f443a50ed6db39c833133442b002a64d9254285372bcdb5
 DIST pyglet-1.2.3.tar.gz 2121343 SHA256 06c857039420bd21baad35fac99dca7f97951350c2df5a79bdcf89eb708907cb SHA512 dbc766b382b1fa79205d9777e8dcc0ecfa00d312671f10d4e9580ae648997d4a41db8bffc072893109df6772fa8d72c8fdf128e0421d992d14332fac11d4d4c4 WHIRLPOOL 38d23907825312d1140a294d6ec3152e373ae466a73766a067f8362937d48bc7be14b9f847cc3386a41adb927196fda4cdc62fb8d9f7d0c9ea9ec548f6213afc
 DIST pyglet-1.2.4.tar.gz 2122017 SHA256 9f62ffbbcf2b202d084bf158685e77d28b8f4f5f2738f4c5e63a947a07503445 SHA512 70cd781936db8c8c156499e524ee73520bc90c19461074264abd62a4854307ef090af5faba521686f247fb4cbee552a428892f59a5b382429acfc000f4c2e22d WHIRLPOOL 24aa15be5819d659274a65eb39a3dcc44c74ddab3d48f8755d1a927427ce4bf05e07b6ebc3a92e1b06e8a1de97f599cb52c506732d3ec6a8a76346c9efd241c9
--- a/dev-python/pyglet/metadata.xml
+++ b/dev-python/pyglet/metadata.xml
@ -16,7 +16,6 @@
  multiple windows and fully aware of multi-monitor setups.
  pyglet might be seen as an alternative to PyGame.</longdescription>
  <upstream>
-    <remote-id type="google-code">pyglet</remote-id>
    <remote-id type="pypi">pyglet</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/pyglet/pyglet-1.1.4-r2.ebuild
+++ b/dev-python/pyglet/pyglet-1.1.4-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -10,7 +10,7 @@ inherit distutils-r1

 DESCRIPTION="Cross-platform windowing and multimedia library for Python"
 HOMEPAGE="http://www.pyglet.org/"
-SRC_URI="https://pyglet.googlecode.com/files/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
--- a/dev-python/pyglet/pyglet-1.2.2.ebuild
+++ b/dev-python/pyglet/pyglet-1.2.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -10,9 +10,7 @@ inherit distutils-r1 virtualx

 DESCRIPTION="Cross-platform windowing and multimedia library for Python"
 HOMEPAGE="http://www.pyglet.org/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://pyglet.googlecode.com/files/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
--- a/dev-python/pyglet/pyglet-1.2.3.ebuild
+++ b/dev-python/pyglet/pyglet-1.2.3.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -10,9 +10,7 @@ inherit distutils-r1 virtualx

 DESCRIPTION="Cross-platform windowing and multimedia library for Python"
 HOMEPAGE="http://www.pyglet.org/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://pyglet.googlecode.com/files/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
--- a/dev-python/pyglet/pyglet-1.2.4.ebuild
+++ b/dev-python/pyglet/pyglet-1.2.4.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -10,9 +10,7 @@ inherit distutils-r1 virtualx

 DESCRIPTION="Cross-platform windowing and multimedia library for Python"
 HOMEPAGE="http://www.pyglet.org/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://pyglet.googlecode.com/files/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
--- a/dev-python/typing/typing-3.5.2.2.ebuild
+++ b/dev-python/typing/typing-3.5.2.2.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~alpha ~amd64"
 IUSE=""

 DEPEND=""
--- a/dev-ruby/tins/Manifest
+++ b/dev-ruby/tins/Manifest
@ -1,7 +1,5 @@
-DIST tins-1.10.1.gem 301056 SHA256 16c2b411d50f923d8e1af4190151db9bd960eb79c48d4d33b331c7880a03afd0 SHA512 1d4ab33d71a575de944da509524ea04a915af0645d42b3b0b07a3116f8181b65d86b5b7391aaa48a5cf388477fc31ccc84d22fa700ec47f9381f7a636e5fe68a WHIRLPOOL 602db6c04b3401acdf752ef1cfc6ea7a16f0d44348ce6e3844c406e277f09f266f4ffb53a55f4b337041194f362ea319fe51efa543297d2bbcbd2d76614a0c3e
 DIST tins-1.10.2.gem 301056 SHA256 aa7c664c38c0fba74d3ecc86c7f115625d883075c8b06d71ecf3bf63bc0b8061 SHA512 f2c86e9ee94560a928dab3ef1bc60b176ed9d2961a05215370e017f5eb6546950c3b2524f0e76dd7e1d7d001ffc504ec9a8d543ae404b1edaab9265474edb80c WHIRLPOOL ff1a4145cb1088d234b7e5825cd2e5be685c55aad974b606a8b7c66178bb0101b70c250ecb32ae5030af4f6f48d9af2b11295f00dd1faab2117cd0586f0bce06
 DIST tins-1.11.0.gem 302592 SHA256 b8b9e817007ca0866e1e0e94042beea177c60309ab34a16cce2c76c9c91720d2 SHA512 c81df06c1995c2597bf403205716ad0c688e67a82bc5a843a566b5c93ef85c35034ae8badee768769d034f80bcffe62fcd2f106e4bddb457ff15d3601dc2dae3 WHIRLPOOL 8ee3c32879423877bd74b52b27c4547b7c22335371ef2f091f528432b01949548712ddc820fbf64210a2aea3af934f06e3d31b800fa092a2b86e6ad0a3078796
 DIST tins-1.12.0.gem 302592 SHA256 f1d874386ab15d32cd9ade46f6dac5a1e7964025d639c908f9a4af15a32dca79 SHA512 f5b4f6060f3e80cc5332fb47ce8fcad5bfea627a3ca0b849b55a3919ab6fdd94189e8306fc5a593be7852e06cc5ac46dce9d8dd3b1fb022e252a2a0a783b36ed WHIRLPOOL 075f651a0211a8053bcdce74c7cc6080b65f624c147f6b17f7bcbd8f99d30a7b78a70078679cf861553200e711bf162604cafd988ccf2c96676fca5bda31cfe2
+DIST tins-1.13.0.gem 303616 SHA256 26dc5c81fa03c9f263f3dd1b8129d8587df9b1654bb8f65a7fc32846eeb37a5d SHA512 1925453899da7b0658d49ba97b682b6d8fb5f5d2db6c8e8a44e4da2a6cf229ed5bb77b350ce824e90bd19f8b5c40cbe28a481bc9e79ad1e8f11bade8cb1423cb WHIRLPOOL 44e5e82c4dcc54426454157fec2bec7bd3cec1034a8c1408abcab1d4c78024a60a4d5ccc94491987eb4039695a8979fe9faf7718672b654509182c44fc37a87c
 DIST tins-1.6.0.gem 299008 SHA256 1f82e41851f343147e8acda8b02a67e990e38d4755e1e7a8de7cd913fcce0a0b SHA512 33d576a0960d841f72a3f3c9017f873d0445fd569ded852d614b4a2b32e59ae784a47246b584bc4e0d16d5be4d63c1d7834b32c2bea2129a75dde9b1723ccd01 WHIRLPOOL 257e019636565081197c3d353396db2937043886696bb6be294b0930a6e1f7ada1a21fd863d1ac29b649bba3875d7d4b868ded70480a0dec0ba27a6764debac1
-DIST tins-1.8.2.gem 300032 SHA256 f3964e4bf0c9b795834c76faa90918e8848806bedfd9a954c73f742874a11156 SHA512 9ade583904002473ebc0a193be5733f60be0192594e419e7123f9653841b44738936c794bc78ace024fb4fde3117a3446cc29461f0b5e2bb8c0e38416adbf7d1 WHIRLPOOL a9679ae660cee4e4622005fe6dc305592bce3fd81b06573cda7d5ca74e9ef56a71b20ed7f80a33fe23d7d9e124361171d00bf3aa83dd151df431108a288e7791
-DIST tins-1.9.0.gem 301056 SHA256 2d17beff65a34ef74ca1a6721428a6436cf0473b6d701fa68289d3cd2c450deb SHA512 6ef081d492030dc42a548e849699f0b8650d50644dc2c0aacf9b9a1694ff02c1da19bca8926d42d042537c2ea672b1e49dcd88a3fc41d9daf675029db1bc06b2 WHIRLPOOL 33925783766a8814afb6b966d92e63f7202147c9974f72db29af8c7d1df8a1341330a72c407e90dc3251fe96e804dffe103ec62c2edd8eca31f656aaf3adc938
--- a/dev-ruby/tins/tins-1.10.1.ebuild
+++ b/dev-ruby/tins/tins-1.10.1.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="All the stuff that isn't good enough for a real library"
-HOMEPAGE="https://github.com/flori/tins"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib tests/*_test.rb
-}
--- a/dev-ruby/tins/tins-1.13.0.ebuild
+++ b/dev-ruby/tins/tins-1.13.0.ebuild
@ -3,7 +3,7 @@
 # $Id$

 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby21 ruby22 ruby23"

 RUBY_FAKEGEM_RECIPE_TEST="none"

--- a/dev-ruby/tins/tins-1.8.2.ebuild
+++ b/dev-ruby/tins/tins-1.8.2.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="All the stuff that isn't good enough for a real library"
-HOMEPAGE="https://github.com/flori/tins"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib tests/*_test.rb
-}
--- a/dev-ruby/web-console/Manifest
+++ b/dev-ruby/web-console/Manifest
@ -1,3 +1,4 @@
 DIST web-console-2.2.1.tar.gz 37554 SHA256 147727d34bd4165a0c214a7f2761e2999dd4355f11661acb6da43f414fa33f9e SHA512 832838a975f805b8c35fb03233fc1a39c90ba5c36908b4e3fb355bcad3b7b7113cbbb2544474948453353a89953cdd2fecdd71bdbeab5ab06f71bd7f67a3be31 WHIRLPOOL d4d1e55a1864daab086e86e33debc800afb90c099556199c7cc13bfbd25098420df1756171f2722aecb449fec1df60a3f79725216ff3b28b8658de3369f0aa10
 DIST web-console-2.3.0.tar.gz 47641 SHA256 8caf3bc1a9c426bb5f1745ec23da191589af4dc8e8ca9d0a359ecc9f8bf68efb SHA512 36136242012053c2049b0faef682a8fe79f931904cd1007a6e08f36aca7a8923fc47fc058304f11cc0b205db876ca77b1cca65048c8ba4db401123ed9c05c834 WHIRLPOOL fce26e3ab6a11187c3cbeb25d6529fd60d83bdcd384e221b9e7c68e2a48639ee2c9a04c9ee7d91d7ba3bd77fbdaa05e4fe333f4f38637264e18536d4e8ce82a9
 DIST web-console-3.3.1.tar.gz 46556 SHA256 767c2aec4501d5b3bc81958ff374ea8a5367ea52606df1ea235b62fe36afbebe SHA512 8acb619b47c4b91fde647b83c01ae57f25a329b2597801e51c5e2d4dfec0a232e9335528672ff036a2391677ba88679ae69fc9aeebd960071b7a8541bfe9667f WHIRLPOOL 3717e6aebf6de9a759ac8f305c28e02c6acc46f4ff7f00fa294ce98f84f03069c64e566a1832babde4aee610fb5e20997d7fd136961ebc766481147a877a2609
+DIST web-console-3.4.0.tar.gz 51684 SHA256 3e9082320ef4297a824890df6e59b5497a76d8e370a7d267454a0e92f9552516 SHA512 2373c1b79b6feff46fd0883cf2da6fd7eab2db0f5070c383635567a36d3979ddc50ca3b32887e96c003df8fb9ed32e636d55dd72ed06630fe534a0224d7ce74b WHIRLPOOL 6fc066be04506ae69de3065bbb7ca2d4faa23630cd8d4872798fd49b522b6b62353c2b5f8c2ff48569975aa0d52e384adb266bf9fd4d3d232eefa0cd542cf18d
--- a/dev-ruby/web-console/web-console-3.4.0.ebuild
+++ b/dev-ruby/web-console/web-console-3.4.0.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.markdown"
+
+RUBY_FAKEGEM_GEMSPEC="web-console.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A debugging tool for your Ruby on Rails applications"
+HOMEPAGE="https://github.com/rails/web-console"
+SRC_URI="https://github.com/rails/web-console/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/actionview-5.0:*
+	>=dev-ruby/activemodel-5.0:*
+	dev-ruby/debug_inspector
+	>=dev-ruby/railties-5.0:*
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	>=dev-ruby/rails-5.0
+	dev-ruby/sqlite3
+	dev-ruby/mocha
+	www-servers/puma
+)"
+
+all_ruby_prepare() {
+	# Use an installed rails version rather than live source from github.
+	sed -i -e '/\(rack\|rails\|simplecov\)/ s/,/#/'  \
+		-e '/simplecov/d' Gemfile || die
+
+	sed -i -e '/simplecov/I s:^:#:' test/test_helper.rb || die
+}
--- a/dev-util/ald/ald-0.1.7-r2.ebuild
+++ b/dev-util/ald/ald-0.1.7-r2.ebuild
@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI="4"
+EAPI="6"

 inherit autotools

-DESCRIPTION="Assembly Language Debugger - a tool for debugging executable programs at the assembly level"
+DESCRIPTION="Assembly Language Debugger"
 HOMEPAGE="http://ald.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ald/${P}.tar.gz"

@ -15,15 +15,13 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE="debug ncurses"

-DEPEND="ncurses? ( sys-libs/ncurses )"
+DEPEND="ncurses? ( sys-libs/ncurses:= )"
 RDEPEND="${DEPEND}"

-DOCS=( BUGS ChangeLog README TODO )
-
 src_prepare() {
 	# respect CFLAGS (bug #240268)
 	sed -i -e "/^CFLAGS/d" configure.ac || die 'sed on CFLAGS failed'
-
+	eapply_user
 	eautoreconf
 }

--- a/dev-util/ald/metadata.xml
+++ b/dev-util/ald/metadata.xml
@ -5,7 +5,11 @@
    <email>bircoph@gentoo.org</email>
    <name>Andrew Savchenko</name>
  </maintainer>
-	<upstream>
-		<remote-id type="sourceforge">ald</remote-id>
-	</upstream>
+  <upstream>
+    <remote-id type="sourceforge">ald</remote-id>
+  </upstream>
+ <longdescription>
+    Assembly Language Debugger --- a tool for debugging executable programs at the assembly level.
+    It currently runs only on Intel x86 platforms.
+ </longdescription>
 </pkgmetadata>
--- a/dev-util/cmake/cmake-3.7.0.ebuild
+++ b/dev-util/cmake/cmake-3.7.0.ebuild
@ -22,6 +22,7 @@ IUSE="doc emacs system-jsoncpp ncurses qt5"
 RDEPEND="
 	>=app-arch/libarchive-3.0.0:=
 	>=dev-libs/expat-2.0.1
+	>=dev-libs/libuv-1.0.0:=
 	>=net-misc/curl-7.21.5[ssl]
 	sys-libs/zlib
 	virtual/pkgconfig
@ -35,7 +36,6 @@ RDEPEND="
 	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
 "
 DEPEND="${RDEPEND}
-	dev-libs/libuv
 	doc? ( dev-python/sphinx )
 "

@ -184,7 +184,7 @@ src_install() {

 	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}

-	rm -rf "${ED}"/usr/share/cmake/{completions,editors} || die
+	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
 }

 pkg_postinst() {
--- a/dev-util/drone/Manifest
+++ b/dev-util/drone/Manifest
@ -1 +1,5 @@
 DIST drone-0.5.0_pre20161019.tar.gz 3453600 SHA256 bd282a85fb6a28f504851d58b2482c220b1ab660ac970f224eae2e2c98b75c00 SHA512 fe6168cc584ce3e3d4c484fd769a6cf3a520648f347b5f29765914b4d16667b423e14cf8043179d5b03a4f0c7e2009e141cab10bcb0cd875a53961adaa2f5efc WHIRLPOOL a5e0eafe53d0de04dd990ceb8356e1f0990466024619fdcdb14770052ed952fbffe20e158590d8d608402fe1759ccac3d3e60f1bff3df48cbe055f157e5a1f09
+DIST drone-0.5.0_pre20161121.tar.gz 3450875 SHA256 fd01a2c1189e9060f2e30c61cb79449d0f23e4c37142be85263730895984efc6 SHA512 3a13f9bf2daebdd61f85432167ae308f439580368f348785fb502694353fe0148f1106978bb4e4457328c24776c099b51e1c6bb58e1c657f2f15e506816ed92f WHIRLPOOL 3276c26fd786c697f586a30c92e553872395fc2b224594d64e9d00e82f07716d62b8c629b904d61ed3cd57732b5d93714de06733dc114ffe8545fd9bf030c1aa
+DIST drone-mq-866849da524e700ba7af26f7d6fa4d0d40541115.tar.gz 220425 SHA256 31cb8902e971c100b74932450e44f6a9501a40fd9152554b9c47ac1eb155e789 SHA512 d46148277cd0cecf7aba958fa8d861e5d836430f859513728d4cae5e8aa012c83383bdfc98bc232027553f140043e85aa241717bdbd4b81c7dde7230c0ddaebc WHIRLPOOL 55602e59ff5ad5aab6d3a0b75f6f80f4f79731ebe9a64d91e9b22eded350ec28a5788a7d64752854f4fa1aebd678c1a9c03c57715c3cc5a42c1f7ea9f891a98a
+DIST golang-crypto-ede567c8e044a5913dad1d1af3696d9da953104c.tar.gz 1298821 SHA256 e5b6d4c0067dae5d8141a7adae18cea855b586f81a6849d01d2bafd21d03384e SHA512 afe9b63065310802da8517e420fc6690e0d321b373618bc889a0084349d1c8d0a21ed1754ece133827563d817ea16be7cd593436a04177ef318f7f2a40f5b6ad WHIRLPOOL 33df01ef99e3b0c2afb82ea2b146e40f4fe0c03209cc7572de09a89e5af96985e384cfb3eda47e532e7baeac7c497471c4df7eca00c3a75c2f92c2595fd21a18
+DIST tidwall-redlog-54086c8553cd23aba652513a87d2b085ea961541.tar.gz 3771 SHA256 b88b43d5f4125e9768027f0c0a4c0e98aee8063792e503f8f62eca40a0cb0439 SHA512 08b373cfd61223e66b1762b54c2591cf1f9892d62a997169809ad68ed52886d12d07340e68cbb08c26f65eab0d8fe843a007cc0d2c63b75415752b87e85f99e7 WHIRLPOOL c651eb6d5f10f2891fa1f213b2f6850252218d11216f2c30ee3cb0bfa4daaaa7b68d07fa8863617ebdec058f44aeb66cb42741d3a9dcf5c1aa7fd8ae616def88
--- a/dev-util/drone/drone-0.5.0_pre20161121.ebuild
+++ b/dev-util/drone/drone-0.5.0_pre20161121.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/drone/drone/..."
+EGIT_COMMIT="1dbf78235606ecd715f84f004e6459225c101031"
+ARCHIVE_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="A Continuous Delivery platform built on Docker, written in Go"
+HOMEPAGE="https://github.com/drone/drone"
+SRC_URI="${ARCHIVE_URI}
+	https://github.com/drone/mq/archive/866849da524e700ba7af26f7d6fa4d0d40541115.tar.gz -> drone-mq-866849da524e700ba7af26f7d6fa4d0d40541115.tar.gz
+	https://github.com/tidwall/redlog/archive/54086c8553cd23aba652513a87d2b085ea961541.tar.gz -> tidwall-redlog-54086c8553cd23aba652513a87d2b085ea961541.tar.gz
+	https://github.com/golang/crypto/archive/ede567c8e044a5913dad1d1af3696d9da953104c.tar.gz -> golang-crypto-ede567c8e044a5913dad1d1af3696d9da953104c.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0/${PVR}"
+IUSE=""
+
+DEPEND="dev-go/go-bindata
+	dev-util/drone-ui:="
+
+_golang-include-src() {
+	local VENDORPN=$1 TARBALL=$2
+	mkdir -p "${WORKDIR}/${P}/src/${VENDORPN}" || die
+	tar -C "${WORKDIR}/${P}/src/${VENDORPN}" -x --strip-components 1\
+		-f "${DISTDIR}"/${TARBALL} || die
+}
+
+src_unpack() {
+	golang-vcs-snapshot_src_unpack
+	_golang-include-src github.com/drone/mq drone-mq-866849da524e700ba7af26f7d6fa4d0d40541115.tar.gz
+	_golang-include-src github.com/tidwall/redlog tidwall-redlog-54086c8553cd23aba652513a87d2b085ea961541.tar.gz
+	_golang-include-src golang.org/x/crypto golang-crypto-ede567c8e044a5913dad1d1af3696d9da953104c.tar.gz
+}
+src_compile() {
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)"	emake -C src/github.com/drone/drone gen || die
+	pushd src || die
+	DRONE_BUILD_NUMBER="${EGIT_COMMIT:0:7}" GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)"\
+		go install -ldflags "-extldflags '-static' -X github.com/drone/drone/version.VersionDev=${EGIT_COMMIT:0:7}" github.com/drone/drone/drone || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/*
+}
--- a/dev-util/rbtools/Manifest
+++ b/dev-util/rbtools/Manifest
@ -1 +1,2 @@
 DIST RBTools-0.7.6.tar.gz 162080 SHA256 b2c5abedc4330534888629558c25ff80cf7b35fea60d1362423e8a9d64e7cf75 SHA512 46a141370f79f4a9bcf417a2fca0fae6f1cc3d0ce2de9fd5f06df7162ecf051b418d12795adce9b12ed8244800da17f87df8b3f04c79c269b3b292a2033bc958 WHIRLPOOL 2ed6cb094c726c7215d4efa8e55855541d19df2bdfe942e4a4628815fdada7babf5d6364e43eb7459683fdd8fded1de4753d02cc4ee08cce75905518e71cfb8f
+DIST RBTools-0.7.7.tar.gz 169305 SHA256 98d74c8947bc02d313e34ebee6c7cfd171a818539ea66c104974df984cd2c98a SHA512 f1d40c5a6941903a3253d9bc73f17fd78183dcf9c75074bc3a670af96333c4596260d2f48de3021aeffc57769947c2bb20d765487f426329fd74a970873b90da WHIRLPOOL ee7cc5230a1513f4bd4696509706e2f62c1dac027a7cab3991a640a68ffe93d13328dd6710d55a26c7df27d5d22acfa37452d389ec3fa4b3a7ae1d9176f46f83
--- a/dev-util/rbtools/rbtools-0.7.7.ebuild
+++ b/dev-util/rbtools/rbtools-0.7.7.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 versionator
+
+MY_PN="RBTools"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Command line tools for use with Review Board"
+HOMEPAGE="https://www.reviewboard.org/"
+SRC_URI="https://downloads.reviewboard.org/releases/${MY_PN}/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/six-1.8.0[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+DOCS=( AUTHORS NEWS README.md )
+
+S=${WORKDIR}/${MY_P}
--- a/media-gfx/pydot/metadata.xml
+++ b/media-gfx/pydot/metadata.xml
@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
+  <!-- maintainer-needed -->
  <longdescription>Python bindings for Graphviz</longdescription>
-  <upstream>
-    <remote-id type="google-code">pydot</remote-id>
-  </upstream>
 </pkgmetadata>
--- a/media-gfx/pydot/pydot-1.0.28-r2.ebuild
+++ b/media-gfx/pydot/pydot-1.0.28-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -9,8 +9,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1

 DESCRIPTION="Python interface to Graphviz's Dot language"
-HOMEPAGE="https://code.google.com/p/pydot/ https://pypi.python.org/pypi/pydot"
-SRC_URI="https://pydot.googlecode.com/files/${P}.tar.gz"
+HOMEPAGE="https://pypi.python.org/pypi/pydot"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
--- a/media-libs/libvpx/libvpx-1.3.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.3.0.ebuild
@ -14,7 +14,7 @@ elif [[ ${PV} == *pre* ]]; then
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
 	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 else
-	SRC_URI="https://webm.googlecode.com/files/${PN}-v${PV}.tar.bz2"
+	SRC_URI="http://storage.googleapis.com/downloads.webmproject.org/releases/webm/${PN}-v${PV}.tar.bz2"
 	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
--- a/media-libs/libvpx/metadata.xml
+++ b/media-libs/libvpx/metadata.xml
@ -13,7 +13,4 @@
 		<flag name="postproc">Enable additional post processing filters</flag>
 		<flag name="svc">Enable spatial-svc support (experimental)</flag>
 	</use>
-	<upstream>
-		<remote-id type="google-code">webm</remote-id>
-	</upstream>
 </pkgmetadata>
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Thu, 24 Nov 2016 05:13:29 +0000
+Thu, 24 Nov 2016 19:13:16 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Thu, 24 Nov 2016 05:13:29 +0000
+Thu, 24 Nov 2016 19:13:16 +0000
--- a/metadata/md5-cache/app-arch/gnome-autoar-0.1.1
+++ b/metadata/md5-cache/app-arch/gnome-autoar-0.1.1
@ -4,10 +4,10 @@ DESCRIPTION=Automatic archives creating and extracting library
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gnome-autoar
 IUSE=gtk +introspection
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~alpha ~amd64 ~x86
 LICENSE=LGPL-2+ GPL-2+
 RDEPEND=>=app-arch/libarchive-3.2.0 >=dev-libs/glib-2.35.6:2 gtk? ( >=x11-libs/gtk+-3.2:3 ) introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-autoar/0.1/gnome-autoar-0.1.1.tar.xz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=733d7eba7ad5e107c06d9bf16427a7eb
+_md5_=64d5f9fc4348cf4c6bb1a7c83793f06f
--- a/metadata/md5-cache/app-dicts/dikt-2l
+++ b/metadata/md5-cache/app-dicts/dikt-2l
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
-DESCRIPTION=A dictionary for KDE
-EAPI=5
-HOMEPAGE=http://www.dikt.ml/index.html
-IUSE=debug aqua
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
-SLOT=4
-SRC_URI=https://dikt.googlecode.com/files/dikt-2l.txz -> dikt-2l.tar.xz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3aea2e5e87187af355006e7b4fcf39eb
--- a/metadata/md5-cache/app-dicts/dikt-2s
+++ b/metadata/md5-cache/app-dicts/dikt-2s
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/kguiaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A dictionary application that implements the Dict protocol
+EAPI=6
+HOMEPAGE=https://www.dikt.tv/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/kguiaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !app-dicts/dikt:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.6.1:5
+SLOT=5
+SRC_URI=https://bitbucket.org/dikt/code/downloads/dikt-2s.txz -> dikt-2s.tar.xz
+_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	b80ab2c131e6011994cf3b553fc21f63	kde5-functions	391cd05771548da2a3942eb1992669b1	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=0e4e4cb743ca671d127521705add3c7a
--- a/metadata/md5-cache/app-doc/casting-spels-emacs-19-r2
+++ b/metadata/md5-cache/app-doc/casting-spels-emacs-19-r2
@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=app-arch/unzip
+DESCRIPTION=Casting SPELs in Lisp - A Comic Book (Emacs Lisp Edition)
+EAPI=6
+HOMEPAGE=http://www.lisperati.com/casting-spels-emacs/html/casting-spels-emacs-1.html https://www.gnu.org/software/emacs/casting-spels-emacs/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ FDL-1.2
+RDEPEND=virtual/emacs
+SLOT=0
+SRC_URI=https://casting-spels-emacs.googlecode.com/files/casting-spels-emacs-v19.zip
+_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74
+_md5_=b239a12bb0281977edd22d5ec1fbefcc
--- a/metadata/md5-cache/app-emulation/docker-1.13.0_rc2
+++ b/metadata/md5-cache/app-emulation/docker-1.13.0_rc2
@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 >app-emulation/containerd-0.2.2 app-emulation/runc[apparmor?,seccomp?] app-emulation/docker-proxy container-init? ( >=sys-process/tini-0.13.0[static] )
 RESTRICT=installsources strip
 SLOT=0
-SRC_URI=https://github.com/docker/docker/archive/v1.13.0-rc1.tar.gz -> docker-1.13.0_rc1.tar.gz
+SRC_URI=https://github.com/docker/docker/archive/v1.13.0-rc2.tar.gz -> docker-1.13.0_rc2.tar.gz
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	golang-base	08fe6e0e2b4750daff8887a7f0e1f873	golang-vcs-snapshot	1caa6d8238d2378ad688ae068ff22e5a	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	udev	73058269b3e70e34e084fa3981282338	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c66e2d4dd8a2ad2b73cd49ba61972f97
+_md5_=0f9ac31c83684650cfa4243b0f05d14e
--- a/metadata/md5-cache/app-emulation/docker-compose-1.9.0_rc4
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.9.0_rc4
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/cached-property-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/dockerpty-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/dockerpty-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/docker-py-1.10.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/docker-py-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/docopt-0.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/docopt-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/jsonschema-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pyyaml-4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/requests-2.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/six-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/texttable-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/texttable-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/websocket-client-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Multi-container orchestration for Docker
-EAPI=5
-HOMEPAGE=https://www.docker.com/
-IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/cached-property-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/dockerpty-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/dockerpty-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/docker-py-1.10.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/docker-py-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/docopt-0.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/docopt-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/jsonschema-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pyyaml-4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/requests-2.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/six-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/texttable-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/texttable-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/websocket-client-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/d/docker-compose/docker-compose-1.9.0rc4.tar.gz -> docker-compose-1.9.0_rc4.tar.gz
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6b3b788f5ca9086a842671bbad9d961f
--- a/metadata/md5-cache/app-emulation/free42-1.5.12
+++ b/metadata/md5-cache/app-emulation/free42-1.5.12
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango alsa? ( media-libs/alsa-lib )
+DESCRIPTION=An HP-42S Calculator Simulator
+EAPI=6
+HOMEPAGE=http://thomasokken.com/free42/
+IUSE=alsa
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango alsa? ( media-libs/alsa-lib ) x11-libs/libX11 x11-libs/libXmu
+SLOT=0
+SRC_URI=mirror://gentoo/free42-1.5.12.tgz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=5da8c1a80cdfaf5244ac90c9376e25e1
--- a/metadata/md5-cache/app-emulation/virtualbox-5.0.30
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.0.30
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.0.30 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 opengl? ( dev-qt/qtopengl:4 ) x11-libs/libXinerama ) ) java? ( >=virtual/jre-1.6:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-util/kbuild-0.1.9998_pre20131130 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) doc? ( dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) !headless? ( x11-libs/libXinerama ) java? ( >=virtual/jre-1.6:= ) pam? ( sys-libs/pam ) pulseaudio? ( media-sound/pulseaudio ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
+EAPI=6
+HOMEPAGE=http://www.virtualbox.org/
+IUSE=alsa debug doc headless java libressl lvm pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.0.30 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 opengl? ( dev-qt/qtopengl:4 ) x11-libs/libXinerama ) ) java? ( >=virtual/jre-1.6:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
+SLOT=0
+SRC_URI=http://download.virtualbox.org/virtualbox/5.0.30/VirtualBox-5.0.30.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.0.16-patches-01.tar.xz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a50950a73b5d5db46f42638e2996a087	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	udev	73058269b3e70e34e084fa3981282338	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=4932e56150434f071bc32d91ec8b8738
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-5.0.30
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-5.0.30
@ -0,0 +1,12 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=CD image containing guest additions for VirtualBox
+EAPI=6
+HOMEPAGE=http://www.virtualbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
+RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://download.virtualbox.org/virtualbox/5.0.30/VBoxGuestAdditions_5.0.30.iso
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=b27b885a124c2d8d2a73cfd5bfe56cac
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.0.30.112061
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-5.0.30.112061
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise as well as home use
+EAPI=5
+HOMEPAGE=http://www.virtualbox.org/
+IUSE=+additions +chm headless python vboxwebsrv rdesktop-vrdp sdk debug python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 PUEL
+RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-5.0.30 !headless? ( x11-libs/libXcursor media-libs/libsdl[X] x11-libs/libXrender x11-libs/libXfixes media-libs/libpng x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-libs/libXft media-libs/freetype media-libs/fontconfig x11-libs/libXext dev-libs/glib chm? ( dev-libs/expat ) ) dev-libs/libxml2 sys-fs/lvm2 x11-libs/libXau x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=amd64? ( http://download.virtualbox.org/virtualbox/5.0.30/VirtualBox-5.0.30-112061-Linux_amd64.run ) x86? ( http://download.virtualbox.org/virtualbox/5.0.30/VirtualBox-5.0.30-112061-Linux_x86.run ) http://download.virtualbox.org/virtualbox/5.0.30/Oracle_VM_VirtualBox_Extension_Pack-5.0.30-112061.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.0.30-112061.tar.gz sdk? ( http://download.virtualbox.org/virtualbox/5.0.30/VirtualBoxSDK-5.0.30-112061.zip )
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	udev	73058269b3e70e34e084fa3981282338	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=01e8bce2b5ab96778e74c4f9d23041c9
--- a/Show more
+++ b/Show more