Sync with portage [Thu Nov 12 10:37:40 MSK 2015].

app-accessibility/caribou/caribou-0.4.19.ebuild

@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Caribou"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

app-accessibility/orca/orca-3.16.3.ebuild

@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
 
 LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 
 IUSE="+braille"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

app-accessibility/speech-dispatcher/speech-dispatcher-0.8.1.ebuild

@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python3_3 python3_4 python3_5 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit eutils python-r1
 

app-admin/conky/conky-1.10.0.ebuild

@@ -67,7 +67,7 @@ DEPEND="
 	app-text/docbook2X
 	"
 
-CONFIG_CHECK=IPV6
+CONFIG_CHECK=~IPV6
 
 DOCS=( README TODO ChangeLog NEWS AUTHORS )
 

app-crypt/eid-mw/Manifest

@@ -1,3 +1,4 @@
 DIST eid-mw-4.0.6-1480.tar.gz 4292450 SHA256 1ff3a7740a30891df2da12fca66cb5324dc286f9490ee839d61d9f1028b9127c SHA512 4b6ba684a43183e11cf29a73bee7bc6ecda24aa15029e55593d6ad3cc9f58726d551089c3c9f95f07d03847df70f2662a0ea9e3db5dd5591cc9b8b0e839d364b WHIRLPOOL cca8b871a2780dae282f5eed12cd79df0bb9d57c3c968ca740b7063ca3c48425be492d3dfcb7bee5c0037b14571df8b76b825540f52025b14afed8f718d56c22
 DIST eid-mw-4.0.6-1620.tar.gz 4335514 SHA256 1ecb30f9f318bdb61a8d774fe76b948eb5841d4de6fee106029ed78daa7efbf2 SHA512 511bf6cf7a9a4d0a2232d95f1a6ba6f4fa8ee174cf919f88e1fa0c71357b9717544a6006ad412d7a0b4090c4c56ca86f8e6f69dabc6912bfd77a2e948cae8104 WHIRLPOOL b89ae4ba659e8dedd93f70368af1e058468cfd3761bec099276fadc017dcf21d245ceb8db001c3e82f30c7e6f670e13ab6c17e221c8c8ee02a45cc5833f39867
 DIST eid-mw-4.1.4-v4.1.4.tar.gz 3475913 SHA256 2996960ea92504c7cee1953ccf4520ba78979c7771645e2b2c1207f94be0a308 SHA512 efcc4dbd0fa383896df9f5a7492b18beb5259cfa368a919ae18bd996e5976a67d0570c0fbccd5ab38ea95c31f48b92c145c526aa59866217a418a80a550d502f WHIRLPOOL 11e35b3649a0c3bd40e4c901ba4d922305dc2b4098018bd018ee71b963b08898e6295e4f71cb7180b0fc8e64d1afe01ce49bcaa36a60c065c2de84b81d19e398
+DIST eid-mw-4.1.9-v4.1.9.tar.gz 3475708 SHA256 0c46c73b805884dd4ae739eb6025c137c1055ad119eac1ab37cb83eb32d92953 SHA512 bc61b3f212bfedf6f47f2841bc6c9b1198be5e3c7b382e3e28635c9e6f5c4ed8ccb118b105f668969fba31e49750cb1c5b129cd5b67a2725af122a8eae491b1c WHIRLPOOL 06b1f9780e984ac6c562bacab03936cd759ea1fce45687f09ae314d4fa77edce02c7ba4db5a9bc3fd739392f8b7b182b19b2734c1d21d63f6995c3cd572695d9

app-crypt/eid-mw/eid-mw-4.1.4.ebuild

@@ -20,7 +20,7 @@ fi
 
 SLOT="0"
 LICENSE="LGPL-3"
-DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the Belgian Federal Government"
+DESCRIPTION="Belgian Electronic Identity Card middleware by the Belgian Federal Government"
 
 HOMEPAGE="http://eid.belgium.be"
 

app-crypt/eid-mw/eid-mw-4.1.9.ebuild

@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools mozextension multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
+		https://github.com/Fedict/${PN}.git"
+	inherit git-2
+	SRC_URI=""
+else
+	MY_P="${P}-v${PV}"
+	SRC_URI="https://downloads.services.belgium.be/eid/${MY_P}.tar.gz"
+	KEYWORDS="~x86 ~amd64 ~arm"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+SLOT="0"
+LICENSE="LGPL-3"
+DESCRIPTION="Belgian Electronic Identity Card middleware by the Belgian Federal Government"
+
+HOMEPAGE="http://eid.belgium.be"
+
+IUSE="+gtk +xpi +dialogs"
+
+REQUIRED_USE="
+	dialogs? ( gtk )"
+
+RDEPEND="gtk? ( x11-libs/gtk+:* )
+	>=sys-apps/pcsc-lite-1.2.9
+	xpi? ( || ( >=www-client/firefox-bin-3.6.24
+		>=www-client/firefox-3.6.20 ) )
+	!app-misc/beid-runtime"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	use gtk || epatch "${FILESDIR}"/gtk_not_required_4.1.4.patch
+
+	if [[ ${PV} == "9999" ]] ; then
+		# Only in current git. Hopefully, in next release.
+		sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac
+		sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in
+	fi
+
+	if [[ ${PV} == "9999" ]] || ! use gtk ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf $(use_enable dialogs) --disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if [[ ${PV} != "9999" ]] ; then
+		# Automatically done in current git. Hopefully, in next release.
+		rm doc/sdk/include/rsaref220/win32.h
+		doheader -r doc/sdk/include/*
+	fi
+	if use xpi; then
+		declare MOZILLA_FIVE_HOME
+		if has_version '>=www-client/firefox-3.6.20'; then
+			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
+			xpi_install	"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+		fi
+		if has_version '>=www-client/firefox-bin-3.6.24'; then
+			MOZILLA_FIVE_HOME="/opt/firefox"
+			xpi_install	"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+		fi
+	fi
+	rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la
+}

app-crypt/keybase/keybase-0.8.18.ebuild

@@ -12,7 +12,7 @@ SRC_URI="https://github.com/keybase/node-client/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="

app-doc/gnucash-docs/gnucash-docs-2.6.9.ebuild

@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gnucash/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="test"
 
 RDEPEND="!<=app-office/gnucash-2.2.1"

app-editors/gedit/gedit-3.16.4.ebuild

@@ -25,7 +25,7 @@ REQUIRED_USE="
 	python? ( ^^ ( $(python_gen_useflags '*') ) )
 "
 
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
 
 # X libs are not needed for OSX (aqua)
 COMMON_DEPEND="

app-editors/leo/Manifest

@@ -1,3 +1 @@
-DIST Leo-4.11-final.zip 7282503 SHA256 eb1fd0e07533db4886fd7962a7d7431244b75239fd161395859e20a7e0f6ba62 SHA512 01bd8e433d25d16d3a824fb917da1f974a3a06fa19f25c0686031e03af62bad281fc10a62ac95ef463b0cc0acdb8c566f25b434a28dd12469cc489f4fc60e526 WHIRLPOOL 64c2d229c2a2ad6887739ee94de98c89f09d5fb1f2246fc446b4bb52496d52e412bcdf258fbbe12b85ed17372c2bd4272c246da65234114087fee02d27c7ac2b
-DIST Leo-5.0-final.zip 8628999 SHA256 5635ac753b011a43a3096e5dc18e2d5c6e9f628a40c0ba628c789bccb10928d1 SHA512 771b00857143ea6de48bc0f1ace5c4518265462c8720a5b52868cf0490f4de7f4d987fd939141e00bf0c7abaddf1cb4b18a6186151739f6ec2024fd50d564c6e WHIRLPOOL b9cc3c22dcc4da204a00cdd2eec48f3e001cd5e4ba20e730f4bef0aadbc4e6c6f03521e1e04bc313b8f29479f1e839dbaac322af8b32a99bb46304677f135db1
 DIST Leo-5.1-final.zip 9028778 SHA256 2d742f9825959ba5c7624d1179b9f3065e14e055c90272fbce199f91770de826 SHA512 a8e1d42c0b7c8f6aa4465295515ef19965a03142997a1b65304fd72a2c541248b7dba66d7be295465fd6dbdd7fcd5c6e6542d222edb71ddcab093c0c360340b1 WHIRLPOOL b1a5bb5ba2a2a6c8afe3339a0097d0dadd01e7c18b3270784f69eb608691808bc99cf887be1079340f797b9659cd00ba2d372d3e37bf62b28774ed571a743301

app-editors/leo/leo-4.11.ebuild

@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-PYTHON_DEPEND="2:2.6"
-PYTHON_USE_WITH="tk"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-pypy-* *-jython"
-
-inherit distutils eutils
-
-MY_P="Leo-${PV}-final"
-
-DESCRIPTION="Leo: Literate Editor with Outlines"
-HOMEPAGE="http://leo.sourceforge.net/ https://pypi.python.org/pypi/leo"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="app-text/silvercity
-	dev-python/PyQt4[X]"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	distutils_src_install
-	dohtml -r leo/doc/html/* || die "dohtml failed"
-}

app-editors/leo/leo-5.0.ebuild

@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# Not py3 prepared
-# https://bugs.launchpad.net/leo-editor/+bug/1399895
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQUIRED_USE="tk"
-
-inherit distutils-r1
-
-MY_P="Leo-${PV}-final"
-MY_PN="Leo${PV}-final"
-
-DESCRIPTION="Leo: Literate Editor with Outlines"
-HOMEPAGE="https://github.com/leo-editor/leo-editor/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-
-RDEPEND="app-text/silvercity[${PYTHON_USEDEP}]
-	dev-python/PyQt4[X,${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}"
-
-python_install_all() {
-	use doc && local HTML_DOCS=( leo/doc/html/. )
-	distutils-r1_python_install_all
-}

app-editors/leo/leo-5.1.ebuild

@@ -19,7 +19,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="doc"
 
 RDEPEND="app-text/silvercity[${PYTHON_USEDEP}]

app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild

@@ -13,7 +13,7 @@ SRC_URI="http://caml.inria.fr/distrib/${MY_P%.*}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${MY_P}/emacs"
 SITEFILE="50${PN}-gentoo-3.12.1.el"

app-emulation/vice/Manifest

@@ -1,2 +1,3 @@
+DIST vice-2.4.20.tar.gz 25156408 SHA256 e5d3d125940f0fafe409aabeec9de4e3ae8d9c19a731aa7ec6a57f6d2b897c5f SHA512 a27b1672ca356d0e8f2890c91e449b78ef76512f6d81bdf25350b90c1f472d57ae6d23646d0176c5544c47d81023aa3deb172e3a02eeb0022ea32a13311b5a76 WHIRLPOOL 5f25bfa72ade54dbe09699b5932df2c37017c3993daba048eb09f723a4351300b6722cf06ceb264202459051780a775f45b787b6ea60db78560d5c65da684541
 DIST vice-2.4.22.tar.gz 25180343 SHA256 767e00eb9dbd1a9bcc6db8b4cd1697b8bc744b1d507bbac930975ee130378d9d SHA512 b43e609ae2f43717d10e079d3b8ac284e5c4920ed222c7502e9a7b75dfe32784628031ae6cf8672c8d9d50576fb714cecdd1a9292bf53477f4bbd52c10403975 WHIRLPOOL 580de25d739585c0316c91aba44bb17b2cd4cc19f162e3c5e53b8a7a9e3f694e8c5d8d549b232259d5c9ed077549410b220169a3c026ebad55bc7c537922be81
 DIST vice-2.4.tar.gz 13656511 SHA256 ff8b8d5f0f497d1f8e75b95bbc4204993a789284a08a8a59ba727ad81dcace10 SHA512 ad197fc35eb80c9738b7f4f551d350dbb4440c7c8103e5d472b7f7ea5106c1356e9d6e3f481552a028a313129ef233833d3147e03f6f00b9890229d5708e3ebb WHIRLPOOL 80f89f7c144fe1ef2305e109049b49e47dfa4af9b69d0d848bf7b06bd0f2d210669acece363b550abad1c50f53dd45a30397eb1bfacfaa443c9e865c686d0823

app-emulation/vice/files/vice-2.4.20-autotools.patch

@@ -0,0 +1,11 @@
+--- vice-2.4.7.orig/configure.ac
++++ vice-2.4.7/configure.ac
+@@ -124,7 +118,7 @@
+ AC_SUBST(VICE_VERSION)
+ 
+ AM_INIT_AUTOMAKE(vice, $VICE_VERSION)
+-AM_CONFIG_HEADER(src/config.h)
++AC_CONFIG_HEADERS(src/config.h)
+ 
+ if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
+   VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR",0,0"

app-emulation/vice/files/vice-2.4.20-format.patch

@@ -0,0 +1,20 @@
+--- src/main.c.old	2015-10-19 17:25:07.549164652 +0200
++++ src/main.c	2015-10-19 17:25:33.106694706 +0200
+@@ -227,7 +227,7 @@
+     for (i = 0; core_team[i].name; i++) {
+         n += strlen(core_team[i].name);
+         if (n > 74) {
+-            log_message(LOG_DEFAULT, tmp);
++            log_message(LOG_DEFAULT, "%s", tmp);
+             n = 0; *tmp = 0;
+         }
+         strcat(tmp, core_team[i].name);
+@@ -235,7 +235,7 @@
+             strcat(tmp, ", ");
+         } else {
+             strcat(tmp, ".");
+-            log_message(LOG_DEFAULT, tmp);
++            log_message(LOG_DEFAULT, "%s", tmp);
+         }
+     }
+     lib_free(tmp);

app-emulation/vice/files/vice-2.4.20-xf86extensions.patch

@@ -0,0 +1,15 @@
+--- a/trunk/vice/src/arch/unix/x11/gnome/x11ui.c
++++ b/trunk/vice/src/arch/unix/x11/gnome/x11ui.c
+@@ -102,9 +102,10 @@
+ #include "ui-threads.h"
+ #endif
+ 
+-#ifdef USE_XF86_EXTENSIONS
++#if defined(USE_XF86_EXTENSIONS) || !defined(HAVE_VTE)
+ #include <gdk/gdkx.h>
+ #endif
++
+ #include "x11ui.h"
+ 
+ #ifdef DEBUG_X11UI
+

app-emulation/vice/metadata.xml

@@ -5,6 +5,7 @@
 	<use>
 		<flag name="ethernet">Enable ethernet emulation</flag>
 		<flag name="fullscreen">Enable the ability to run fullscreen</flag>
+		<flag name="gtk2">Use GTK+2 for GUI instead of GTK+3</flag>
 		<flag name="memmap">Enable extra monitor features</flag>
 		<flag name="sdlsound">Use <pkg>media-libs/libsdl</pkg> for sound support</flag>
 		<flag name="vte">Enable support for <pkg>x11-libs/vte</pkg> in the GTK+ interface</flag>

app-emulation/vice/vice-2.4.20.ebuild

@@ -0,0 +1,173 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils toolchain-funcs flag-o-matic games
+
+DESCRIPTION="The Versatile Commodore 8-bit Emulator"
+HOMEPAGE="http://vice-emu.sourceforge.net/"
+SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE="Xaw3d alsa ethernet ffmpeg fullscreen +gtk2 ipv6 lame nls oss png pulseaudio sdl +sdlsound threads vte zlib"
+
+# upstream says gtk3 and sdl2 shouldn't be exposed yet.
+#REQUIRED_USE="?? ( gtk2 gtk3 sdl )"
+REQUIRED_USE="?? ( gtk2 sdl )"
+
+GTK_COMMON="
+	x11-libs/pango
+	x11-libs/cairo"
+#	gtk3? (
+#		x11-libs/gtk+:3
+#		vte? ( x11-libs/vte:2.90 )
+#		${GTK_COMMON}
+#	)
+RDEPEND="
+	virtual/jpeg:0
+	virtual/opengl
+	media-libs/giflib
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdlsound? ( media-libs/libsdl[sound] )
+	ethernet? (
+	    >=net-libs/libpcap-0.9.8
+	    >=net-libs/libnet-1.1.2.1:1.1
+	)
+	ffmpeg? ( virtual/ffmpeg )
+	lame? ( media-sound/lame )
+	nls? ( virtual/libintl )
+	png? ( media-libs/libpng:0 )
+	zlib? ( sys-libs/zlib )
+	sdl? (
+		media-libs/libsdl[joystick,video]
+	)
+	!sdl? (
+		fullscreen? (
+			x11-libs/libXrandr
+			x11-libs/libXxf86vm )
+		x11-libs/libX11
+		x11-libs/libXext
+		sys-libs/readline
+	)
+	gtk2? (
+		x11-libs/gtk+:2
+		vte? ( x11-libs/vte:0 )
+		x11-libs/gtkglext
+		${GTK_COMMON}
+	)
+	!sdl? ( !gtk2? (
+		x11-libs/libXmu
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libXv
+		Xaw3d? ( x11-libs/libXaw3d )
+		!Xaw3d? ( x11-libs/libXaw )
+	) )
+	"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	!sdl? (
+		fullscreen? ( x11-proto/xf86vidmodeproto )
+		!gtk2? (
+			x11-libs/libICE
+			x11-libs/libSM
+		)
+	)
+	x11-apps/bdftopcf
+	x11-apps/mkfontdir
+	x11-proto/xproto
+	x11-proto/xextproto
+	media-libs/fontconfig
+	x11-proto/videoproto
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-autotools.patch \
+		"${FILESDIR}"/${P}-format.patch \
+		"${FILESDIR}"/${P}-xf86extensions.patch
+	sed -i \
+		-e 's/building//' \
+		doc/Makefile.am || die
+	sed -i \
+		-e "/^docdir =/s:=.*:=/usr/share/doc/${PF}:" \
+		doc/Makefile.am \
+		doc/readmes/Makefile.am || die
+	sed -i \
+		-e "/^docdir =/s:=.*:=/usr/share/doc/${PF}/html:" \
+		doc/html/Makefile.am || die
+	sed -i \
+		-e "s:/usr/local/lib/VICE:$(games_get_libdir)/${PN}:" \
+		man/vice.1 \
+		$(grep -rl --exclude="*texi" /usr/local/lib doc) || die
+	sed -i \
+		-e "/VICEDIR=/s:=.*:=\"$(games_get_libdir)/${PN}\";:" \
+		configure.ac || die
+	sed -i \
+		-e "s:\(#define LIBDIR \).*:\1\"$(games_get_libdir)/${PN}\":" \
+		-e "s:\(#define DOCDIR \).*:\1\"/usr/share/doc/${PF}\":" \
+		src/arch/unix/archdep.h \
+		src/arch/sdl/archdep_unix.h || die
+	rm -rf src/lib/{libffmpeg,liblame} || die
+	sed -i \
+		-e '/SUBDIRS/s/libffmpeg//;' \
+		-e '/SUBDIRS/s/liblame//;' \
+		src/lib/Makefile.am || die
+	AT_NO_RECURSIVE=1 eautoreconf
+}
+
+src_configure() {
+	local gui_arg snd_arg
+
+	snd_arg+=" $(use_with alsa)"
+	snd_arg+=" $(use_with oss)"
+	snd_arg+=" $(use_with pulseaudio pulse)"
+	snd_arg+=" $(use_with sdlsound)"
+
+	gui_arg+=" $(use_enable sdl sdlui)"
+	# The gtk UI code has raw calls to XOpenDisplay and
+	# is missing -lX11 if vte doesn't pull it in.
+	#if use gtk2 || use gtk3 ; then
+	if use gtk2 ; then
+		use vte || append-libs -lX11
+	fi
+	gui_arg+=" $(use_enable gtk2 gnomeui)"
+	#gui_arg+=" $(use_enable gtk3 gnomeui3)"
+	gui_arg+=" $(use_enable Xaw3d xaw3d)"
+
+	# --with-readline is forced to avoid using the embedded copy
+	# don't try to actually run fc-cache (bug #280976)
+	FCCACHE=/bin/true \
+	PKG_CONFIG=$(tc-getPKG_CONFIG) \
+	egamesconf \
+		--enable-parsid \
+		--with-resid \
+		--with-readline \
+		--without-arts \
+		--without-midas \
+		$(use_enable ethernet) \
+		$(use_enable ffmpeg) \
+		$(use_enable ffmpeg external-ffmpeg) \
+		$(use_enable fullscreen) \
+		$(use_enable ipv6) \
+		$(use_enable lame) \
+		$(use_enable nls) \
+		$(use_enable vte) \
+		$(use_with png) \
+		$(use_with threads uithreads) \
+		$(use_with zlib) \
+		${gui_arg} \
+		${snd_arg} \
+		--disable-option-checking
+		# --disable-option-checking has to be last
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog FEEDBACK README" \
+		default
+	prepgamesdirs
+}

app-emulation/virtualbox-additions/Manifest

@@ -1,5 +1,5 @@
 DIST VBoxGuestAdditions_4.3.28.iso 58241024 SHA256 9f52e186d6c9407b2676d4b2ed1cdf96940ec129cc2bd92e54b24526271a9733 SHA512 78055f389dc1a7bd62577f1fa670b8f8899ab3a58a87953d30fcaea1cd0c77f8662e15fea932c434309747971a2a61b61854b6f087654d9d2fb2de07fb6f1b5c WHIRLPOOL 64275e44c01f4f260899a7c16aaeb494ebe81277e7cbdec87e487736833cc239338f3c32c00759244b3be55c5754788593b81d06dab7d9ab26991369fa9d65fd
 DIST VBoxGuestAdditions_4.3.30.iso 58257408 SHA256 432c2da1d9a939de7ba1d2cfb10595031374af9ce66417a43979d1794beedbb1 SHA512 a782e47381b708aee8a8f2c1d6608d51d09a2fb0d55ea3b543530a31cbf489043f05d4c334a9e269b922318339cb78a897603b8bce2749fe02088a6e9a4fd177 WHIRLPOOL c70b9e630820f7be38e38fd7ce20073c3766758950f60367a3a6e666644f10baadbfb5a9dc67c7c8364770e7ae28d27d632c53699fd6d1102bf672672419f1f2
 DIST VBoxGuestAdditions_4.3.32.iso 58349568 SHA256 187f49b567dea056d9de255c155f8eaa3449dffe08ccf22ae8ab1dda708f78fe SHA512 3938ade4fd030f2471b34b11296af3874c3936659c635a9d7e222697f2dc72c65fc4f73f42800def8a8bcc518951bb9a3504156811af18e00722a6f61c03b6a4 WHIRLPOOL 8e5f25709ea1b74f94f303f29ef7d1601f29681515981b2f16fddd4af4c9bec842101bfab7626112777284c3f243f8e4a66a23d09a23af353e4f1e0645043618
-DIST VBoxGuestAdditions_5.0.6.iso 58966016 SHA256 59ed9911c2bb22357345448c3df6104938b45fa780311d20c330e39c6e309991 SHA512 8d9252b4961da760e71a94acd0292f23373b6ef2f9cfee48053efffbc9ec8f396a71f87e48eedf36f73c884774f1898567e2eeb454f4d343f85973d3b548b85f WHIRLPOOL 73164707e2e5aed992080ea80479d885383be47918e11ba387fb8f9ba7d1db585e3fcaf14ec904cc02af7b05cc00cf0a540ef9ae14adeb877a4f5f7d196e8aa8
+DIST VBoxGuestAdditions_5.0.10.iso 59002880 SHA256 8f7ffee3fac75793e48d1859b65a95879b3ed5bc1c3164c967e85d69244c594b SHA512 95080cc991f99d11aea771088b980faa42c9f0d33ee31afc53de758d49cb62db0275bd5907ff2bf29382194e6227e965986ccdbec7bf50e254e178689e291b65 WHIRLPOOL 24a2c79f3868d14da387c4f282af848411d0a78a8c4431b72f64474cc05ca2bb24aef923e3e1d9e0f1ae17cc342aa821c2ad782d8af233f3c09c4b26afb4c7f9
 DIST VBoxGuestAdditions_5.0.8.iso 58992640 SHA256 a6ab45a043e460c87f145ec626c1cc2a1ae74222f15aa725004cdc84bf48e9f3 SHA512 8a808b964b916930748cdde96cbf0b3657506758155336b5d7a294cde28129cff50ec5e88fdd5e0c3bad8a5df99e8244c08677811aa4e3982f4255273d66820a WHIRLPOOL a2fe1cb6c334f44a4dd962a0479b1a2956ebd9a9d5aee9c6a3a2203c22a1f764aa1829f1a813d14f60cfdebef27ddb59c554a0db50b18641df2da6a1d67d20c5

app-emulation/virtualbox-bin/Manifest

@@ -1,7 +1,7 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.28-100309.tar.gz 15961939 SHA256 72e101d9dc5eabeb76d1ab5bd6d2f817a11c89adfe8bb72cc5d614a2eef532d1 SHA512 57ad44a99a7abcad195e6ceccc1fe7b494979da65601a52e0be8336bb819812d5cef48a8bc0fe9f74f3a05238e6fd29562ac678d4ef7e0c78587fe81c287a65e WHIRLPOOL fb08189c53841664119bffb4de6a76d6f72fb035f887ed5e948f38faa5be2891e35de0806da02d299e818370285bcddba06eb84bea7db4d3cfa09d92f8042db7
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.30-101610.tar.gz 15983777 SHA256 770d49247976f2a0d14a66196dddf864c6b9d185671e2a29cab459fc28f105db SHA512 f5d8275fe3e1ea60e8d15af3b0c7382faab172df39369c8904ff734a5105daed87a48215880b2e286c6735ead341c237d2260e6ee923f513818f85cf0b452def WHIRLPOOL 3b1e29a44413ebc65dc250b2366b1fe75d6ea48fd94b722c8ec9eb7e97e6981470e9201c9840d566953c9c9bdd4a7893f9d525b3fac7150ca24391f696bba9c4
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.32-103443.tar.gz 15994576 SHA256 3f041c019985c35974bf034a9f7d941149fcc3e23a6200b47579140405af5f88 SHA512 212c21f6fc0af093e2d409827348d776377164b9c78b6c01dc710d4a63f53fa7ef52a66491d81b96dc64af4747d79ca0d0df55b052cf6b1c8ceb239c32dc1c75 WHIRLPOOL d67b55c409c6e06080010a25a4a64e660dcd0efaadffe2311166bed06c3f494a5f20cff131a42e07e82aba3cab7f53dea101fb3e5fabeecc2bdb0dd4a167c0ce
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.6-103037.tar.gz 16874845 SHA256 4eed4f3d253bffe4ce61ee9431d79cbe1f897b3583efc2ff3746f453450787b5 SHA512 fb3fb06e88cc5bded6246375727df2deebb6c0dbb889b8516e0bab0af0c05ef3e1baa8c1eb94d34af2e63600bc36814eab8d8f25abb0fd1ad982ea242f456468 WHIRLPOOL 51ddd27d61e214cb41c5d8c50b0d5d01f885f4ae9facabd3cece500fd41b2a72d42b6ad766aa52e9c315c6fca2dca0f07a1a6b1fa0dc2b87f2cd3c4bf1e54aaa
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.10-104061.tar.gz 16918255 SHA256 c846fa26fec8587e57180c85c408cad377c48ad26830b0dc839ebf9025e3d29c SHA512 ae6bab29c14b1ace849ebf5715360fc0921950c62345e18709347f44c07f88727bf1785d53437e39d67f8c56d92cef1f6e3d03c3f7d6dd76c6d4d9ee7f1f1d5b WHIRLPOOL 822c3c9b20f9171b3e9d1896c2ff648ead049d63e45b8353da5d37e7f874433878fedcfb2f10ae5f50e4860466560a37b6102e8ffb3e9625106ce5188f491726
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.8-103449.tar.gz 16880584 SHA256 febd2c99909cb932a98c2b9f73ce8eb03fc183c8c8f2fc874985cf3d598f6b94 SHA512 6a29aa1c52b460bded6e342cc66bb28d93f7f4c71eb108854dd2ba6934ae399e6ee7bd8acd29dda934f2933eb05b2e3878568fee76e5eb55ae43a695123568df WHIRLPOOL d6865e702c787c441da30a49e5aaff818a7530f2a82313c326a509cb3bb98f7cf22d511e3265b99a14402b2b9a7c4614d40ed570e6a6ba5522f4752248e2f338
 DIST VirtualBox-4.3.28-100309-Linux_amd64.run 85677523 SHA256 8c862533f876dc32fbfae993597b1123e2feac81a302c60e73b7ee891e17a77f SHA512 75dc2cd257b187b0a497b87c2f1e576a57ceece290327a98804c903810522444b0a64a704bc51a25945dbaa5c0caf30898ba258829577e2f17f7c736fcf59bb0 WHIRLPOOL c8d5d885807ad633bf1c4c6f98cac8dddf4002dc2e21ed2d2fb2f0a859f447b7ce06d1c49c4daff4147b25ca4992da14b6b75b39f47075c861732e6ef00091d1
 DIST VirtualBox-4.3.28-100309-Linux_x86.run 85083598 SHA256 aeb224d7136314865db8175db665408a3dc08f50ed68fbd4bf1568b32b7ea2f6 SHA512 110e20a45657c7677fcab0158d31052c909893b8f618adad2a2c95ad119d47d7c35d4aedf3692dd650fda62ba0747acf202364c14034e5c10d17cd45a9918707 WHIRLPOOL 35c97248985d11c77194ac03448357331e08b7ef64a77ba416564b6051eaf74ffb5a0acdf835bfcf71657c5fdd58066947b0ba1c42e91d34dbf026434f662f67
@@ -9,12 +9,12 @@ DIST VirtualBox-4.3.30-101610-Linux_amd64.run 81069522 SHA256 5745bc9b1edd1d7d28
 DIST VirtualBox-4.3.30-101610-Linux_x86.run 80537038 SHA256 c8e42d247ecfa1ff3e3da6c7988a58e2d64fbb54598e9b08211308226d61c42a SHA512 629907432887606b1e31328a751c5ec3c764e90b3eae4a984c5d9e6b5f77b626e8eafa235bb55a0e1725fe95324dcb3cc1c8e2f441d716a8408d1e1ddf0e5dde WHIRLPOOL c10976693284b7b1c178aa036eb5d28ce76366362ac00eb0f686e8f99ddb93df508654d8acab0912714d3f9215d8f217a91999c25877fb2b973171b9be8b7d09
 DIST VirtualBox-4.3.32-103443-Linux_amd64.run 81100243 SHA256 e99dbf0e382081fa78cbc5803b473e2fe4bc945eb50cf0b5717853f4cdb34da3 SHA512 c68cf69de524ec0229d07943087bc433b0902710f48ddd67106f0f10500d38d38a0e3ff97e40bc81495f12f2bcd68ee0f3d19fda46c999960fd1b3f64bf220f3 WHIRLPOOL 15aa5ce0b49ac7c75fc6191e4a0283a721db247a667f63b94f04dbf1f00122958c8945181f4ec5791b1a6ba6425f98a3bf92f80eebf29b831260cc8274cf1cd7
 DIST VirtualBox-4.3.32-103443-Linux_x86.run 80496078 SHA256 89e3493052b43574454c1f6bed2a1ddf3504dbcf5096cb2f541b242dd6636cfc SHA512 66455075385879364afe7c77051d7b7873dff543647bbbdcdb9e0e63ef9fa2c49a11a45ac3c2cb96cbb59fe75e5e502c3d4cd99ac1ba8c580e65ae3e3da5c427 WHIRLPOOL bdbd2b62fc8bf83604ffa217f5e592ff48058a6f6c10e0fb07e214847d6cc915f858fef03b6c196625339f3d31f2ce6c4614b9ae206eacfb35957253893bea06
-DIST VirtualBox-5.0.6-103037-Linux_amd64.run 84407761 SHA256 938b7b247e3260cc148f17a34f47c3363d377fd9e47add1635570908bedaf4a4 SHA512 87b4e1eb5896a87fc5004c09281d7f963dc3f07cf7405be48082a6f24225f3052577ec9c21f157cafe6f0188371142643723714d7f586a814f9e549cace480b1 WHIRLPOOL ec066521a2f73e02578e0528fabbab691bd1d196cf7bd764cdf3fa6f4f0429683320a45a1e7fc23f9f6a6ddfb8024367945f2ae75d2c7c20e609788b8e5a5a2b
+DIST VirtualBox-5.0.10-104061-Linux_amd64.run 84448721 SHA256 77c3500f460f24850c796fbef84d7ecd7cf05b5a34256e712172e6f159f119e9 SHA512 431edd417f7e7931dfa4314ef095aedc3eb489349d16a13cb8bae1c9fbf6b19aed00e845b9389ff1805959649b8cabb6b8e38c36cb7b65f8450d403f68b6d414 WHIRLPOOL 0d598ec0be6a8ea41c3908c47c072480bd37542a633493834367941c063734104d73f2cb2c8ceb2d34625d89249e18bc98383970f5647c69858b1caa0c7e9447
-DIST VirtualBox-5.0.6-103037-Linux_x86.run 83527117 SHA256 557992579e2abca01e6a3b22d779174192fa3f7b037230fd1d47bfd70d52cbc5 SHA512 8611733e6ddd5903b29221172f530887c659f96b1a317c0dcff40a2184f299c26b53e77fd61e5bb0e6475082453c7d30191f6e195942ed31f43fa6b72353edee WHIRLPOOL 4bba29189ccaecfc88347a1015abb3dd888222d65b2a6e45a453871af7c7d5fe86702e1cd7ec655793d79139828cfb35ee4424a16a940f41215708f6ed0907ed
+DIST VirtualBox-5.0.10-104061-Linux_x86.run 83537357 SHA256 7860f1a07f2535873ccfe2a46f63d71fa8ee491e7f194e577001d2f27ba4f7c3 SHA512 657071112ce8b54335d1ff67feab8785c13e5e09370763472d8f99970bef41aa4da3a4db158d5f778e8a39af05464538047c71742156a5749c2858cf7d6a04aa WHIRLPOOL 78718e91978e13eacbc4ac9b035b07043effb5785ffec3475f710e775b94736df98c4b45a6fdcd93733e418fc62a91992cf761c41b98e7288ec4714599669aab
 DIST VirtualBox-5.0.8-103449-Linux_amd64.run 84540882 SHA256 91bea0393f0b0afdc139660f23d77512723d367446d482545ded2eeeaba851d0 SHA512 5ab4d98070ba062cdacd88f60454333bdfa416fe0065978d3358fe1aaa7bb839f4a940630e9bb2f0e114879f2a839e3e1daf6d5000d11094c56951decda5babf WHIRLPOOL 915e6c7f30012087d9e37283fe3f073b9119aaadfb8a996899d9201003a8b30a490a5ecd9c61e3c919e957cda5ba9483df15d59d7ea2a13b600818ec9cc5f9d4
 DIST VirtualBox-5.0.8-103449-Linux_x86.run 83752397 SHA256 3b18e5bb5cde12d4d91add03c500862292cf44a4d4e9831ab8668312644562f8 SHA512 d4b7d602ebfc93df92f6dd4b3e050ab765c2f0caf7bbf0b85e674f8a349f9fe6c878777e85fffb3b74888252dd94c7c3d0447e6463ac2d6d39af3a20a67f7397 WHIRLPOOL 94cdd4d5f1b4504ab681aa511cbb2befcf1cebbd61b9eeec694b4758d887769b458daa20afc68a5fbadabbe97627e7c81718f17f5902f5de3e80ce6b59d3fb25
 DIST VirtualBoxSDK-4.3.28-100309.zip 11698378 SHA256 fe0cc316cecb3dfe9bbb925e6c023620d4cfd8e137b2a9b9f40f22f527af16fa SHA512 6af7d2107cff080281a356cbf522961b2e9d1917e861e410b169ce5ca3cefe05cc87e4e01f78ae171f8716f7006c031f14fc01d8d282a872a4f619638049b11a WHIRLPOOL 23a77dbc410a28b2799264da88d79b2c4335c07da67dd8bf4be26cac271e3ed38a9bf4fb2966ec0a3c06fb869bb252f5fa6a34a9a9c62cbb9a2fb0ad76442f66
 DIST VirtualBoxSDK-4.3.30-101610.zip 11436700 SHA256 6d8f1a006d56dfa1bbec10a35369c80c75845fdc6127c4d806b5c69cec03ab7e SHA512 2b2b3220d9ce908813699f8fc4cee80de5b29cb134ec968c2ccbb78c40b8d0d8aeb666996627f0f13cd036ef0376582c48f6c12b45acb7593d8b0eefd6eba960 WHIRLPOOL fe82cacecfedc05b6d92feac5285bc41100a9538f6cb37027c85ee08e051580243e2635af9d873c67970ecab5e8ee8eee0cee89e50be59895b44862264aa3fdf
 DIST VirtualBoxSDK-4.3.32-103443.zip 11435565 SHA256 84ff42f0e9d8f8945387247e7f57123d37cc2c53035ab1eca5414ca82102613a SHA512 914951d91adfa0d77e29863c7108d2e116a01562d0e0454b1203ae7d6e7e0a224f65a51cbf1e83b8067cb40da65708d2022ab5be35f2905a28f032653c827869 WHIRLPOOL 2e53a6f2d6e6e4f328139b03de8bf09b1a72ca3981addef7a2d02d8dbc02e8ea6c319b16facdcdb1be5d941d7d24b64598990112d3d52ca5e5c9b0a2c4d8e89e
-DIST VirtualBoxSDK-5.0.6-103037.zip 9634988 SHA256 e4df6402b1ddb067f54923d211bd32bc2d6117b91295707be707bb2c8e7e408e SHA512 aee6e59a22c2ec7c99fe22054d7bdd0a5f2ed627c76b530c17fcdbd430343b20ebbbda11bce3c905ff4641d050b75f989f84ed49507ad4dca4c47364b8eda0f7 WHIRLPOOL c4e5f8aac4c0d885f78dfea562375a16157553148480bf441378f15569287fbd28f5a44b2d18ad6e393a1ede9cb907ad750c003ba61346d88279484ad944688a
+DIST VirtualBoxSDK-5.0.10-104061.zip 9634423 SHA256 270b9e8eb29ca7490cabe94cb7992c1a91f3bb002d1698d64ab4c787e55e9d80 SHA512 69dbbd49b1bee9ccc23bc5e9b2fd001043687d3993d0ecc285158aeca1282cd18b8308aa340e2d7b18c9c170c55f229df7041408a1e9811d78ba890c0ebc4ed0 WHIRLPOOL 1ea777baff50ba59544e0dde00b9969477b229f6d9db705a5e64d035f9ca532dce3f453e0e59fe7a12976d431e9048d43a7c23f42bdbd58e25b1014e6366abfc
 DIST VirtualBoxSDK-5.0.8-103449.zip 9635495 SHA256 c79826d184058701d0d2dbd345b7f188cee5dcac4297895f326cc18fc1253e92 SHA512 7161e8366cc9487bcadabc4a9ed9b27df6abdbc7d3fd82b9f824cc3a3054a6840526204b4e0366962a50d54f19f528f90efcb27cd2ddbf7b9e36d27ae7a573de WHIRLPOOL 933b70e5ebf33f3512e8f25312d27ebcbd3b272f9e07e41edad60f7e3fe6dc88f3b5a9d3b00c2e6d23d2ae8ec9c2d7e6f64680678a168e4d67f94bd9d8b15b65

app-emulation/virtualbox-extpack-oracle/Manifest

@@ -1,5 +1,5 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.28-100309.tar.gz 15961939 SHA256 72e101d9dc5eabeb76d1ab5bd6d2f817a11c89adfe8bb72cc5d614a2eef532d1 SHA512 57ad44a99a7abcad195e6ceccc1fe7b494979da65601a52e0be8336bb819812d5cef48a8bc0fe9f74f3a05238e6fd29562ac678d4ef7e0c78587fe81c287a65e WHIRLPOOL fb08189c53841664119bffb4de6a76d6f72fb035f887ed5e948f38faa5be2891e35de0806da02d299e818370285bcddba06eb84bea7db4d3cfa09d92f8042db7
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.30-101610.tar.gz 15983777 SHA256 770d49247976f2a0d14a66196dddf864c6b9d185671e2a29cab459fc28f105db SHA512 f5d8275fe3e1ea60e8d15af3b0c7382faab172df39369c8904ff734a5105daed87a48215880b2e286c6735ead341c237d2260e6ee923f513818f85cf0b452def WHIRLPOOL 3b1e29a44413ebc65dc250b2366b1fe75d6ea48fd94b722c8ec9eb7e97e6981470e9201c9840d566953c9c9bdd4a7893f9d525b3fac7150ca24391f696bba9c4
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.32-103443.tar.gz 15994576 SHA256 3f041c019985c35974bf034a9f7d941149fcc3e23a6200b47579140405af5f88 SHA512 212c21f6fc0af093e2d409827348d776377164b9c78b6c01dc710d4a63f53fa7ef52a66491d81b96dc64af4747d79ca0d0df55b052cf6b1c8ceb239c32dc1c75 WHIRLPOOL d67b55c409c6e06080010a25a4a64e660dcd0efaadffe2311166bed06c3f494a5f20cff131a42e07e82aba3cab7f53dea101fb3e5fabeecc2bdb0dd4a167c0ce
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.6-103037.tar.gz 16874845 SHA256 4eed4f3d253bffe4ce61ee9431d79cbe1f897b3583efc2ff3746f453450787b5 SHA512 fb3fb06e88cc5bded6246375727df2deebb6c0dbb889b8516e0bab0af0c05ef3e1baa8c1eb94d34af2e63600bc36814eab8d8f25abb0fd1ad982ea242f456468 WHIRLPOOL 51ddd27d61e214cb41c5d8c50b0d5d01f885f4ae9facabd3cece500fd41b2a72d42b6ad766aa52e9c315c6fca2dca0f07a1a6b1fa0dc2b87f2cd3c4bf1e54aaa
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.10-104061.tar.gz 16918255 SHA256 c846fa26fec8587e57180c85c408cad377c48ad26830b0dc839ebf9025e3d29c SHA512 ae6bab29c14b1ace849ebf5715360fc0921950c62345e18709347f44c07f88727bf1785d53437e39d67f8c56d92cef1f6e3d03c3f7d6dd76c6d4d9ee7f1f1d5b WHIRLPOOL 822c3c9b20f9171b3e9d1896c2ff648ead049d63e45b8353da5d37e7f874433878fedcfb2f10ae5f50e4860466560a37b6102e8ffb3e9625106ce5188f491726
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.8-103449.tar.gz 16880584 SHA256 febd2c99909cb932a98c2b9f73ce8eb03fc183c8c8f2fc874985cf3d598f6b94 SHA512 6a29aa1c52b460bded6e342cc66bb28d93f7f4c71eb108854dd2ba6934ae399e6ee7bd8acd29dda934f2933eb05b2e3878568fee76e5eb55ae43a695123568df WHIRLPOOL d6865e702c787c441da30a49e5aaff818a7530f2a82313c326a509cb3bb98f7cf22d511e3265b99a14402b2b9a7c4614d40ed570e6a6ba5522f4752248e2f338

app-emulation/virtualbox-guest-additions/Manifest

@@ -1,5 +1,5 @@
 DIST VirtualBox-4.3.28.tar.bz2 100092002 SHA256 e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31 SHA512 b6e849a1420515b6dbda8cee0ab64940dd93296ec58cde76676ac257ff3dad0459aa1fd0bda7e1d0abc751d2d59f055465b198a546fdbb4e70e934a78654a8fc WHIRLPOOL 1b739f1f989032e07829a23ffadadd49e31109d70b0effbc44126a48a165218ff3ebafa576fa0e4f2af76a404033b60e5c9804ac43db5dd3024f1eca25ca70da
 DIST VirtualBox-4.3.30.tar.bz2 97428942 SHA256 ea9569ec16cd6202ee61bcadb2506d31ac12fd343adb91565773a05eaaea9a36 SHA512 d0817335cf4bd196da93b91ede6bc9e48ca0d471166ab2790dbf508a4574e4ace54a86053932abf3b4e804c583e80a713d2ab2e556dc15bee6ef3a62f88b95fc WHIRLPOOL 47cbd702e83cc737e04b5862cc6c52e32be244dc1dc0145f582f57b2f19bb898f0f4b200576a28f10a3290691f1ffd43c256e8c8eb5545a9723be8eefca88a38
 DIST VirtualBox-4.3.32.tar.bz2 98168101 SHA256 dc5bf4e6f9989792d31bac174d20d7fc9e638654fa5a99c02b20a60557927261 SHA512 856b36cd90647cdceb7e182d066e9e1489d2bae0b71ce8b2f6324cd2d9854806eaea0fe0aad2d4e8b84bd836c688e13258ae69e094320572729b7d886c8d35f0 WHIRLPOOL 441041947dcd190d73a9cc5007bc0001b6eeb36ba958f4a09fca775670faff690423095d334e258fc0d6dcbef01d74a085505c8549397ced5dbe75ca96724144
-DIST VirtualBox-5.0.6.tar.bz2 109863328 SHA256 22d63f28c43165a31dcccdec1c65f376f46d7e09555c47611cfaafb5576a5843 SHA512 3e51c9476c29a3ba79adda2d3b0c0b516459f58c8aa5e7b795be1aa2468b8e61241bbe5615787d7302a5f95230a446377bd8698f801c2114b26a471ae8bbbc11 WHIRLPOOL 11603c9aa14acac87032b5d8fc1f8d0a567632ca591230e0cc5c1d9a1ae9b39ebccb1a3bb85e1845abc01b04da550a2ef889e1bf91da0bb82df1fafa384f88b4
+DIST VirtualBox-5.0.10.tar.bz2 110904399 SHA256 56eafae439b91ea3c3748f2128b2969ba76983acf821acaa08e043c129b45a89 SHA512 8836e5b57ed46b57b12a9fdb6a632e895c3106dad58c3ab3e28f9178ce69499c493a935b6df8b872dc4677c12eb826a46113bdb902e4fb3d2f8ee6d768e53930 WHIRLPOOL 05516c1d9a3cd876a67a73b86df47ec7d1ef08ed921cb3e25ef483676413982ac8a7ce6562f3003240d862a33759aee5e6c94a303a2a35b66025d72cb15d4404
 DIST VirtualBox-5.0.8.tar.bz2 110540476 SHA256 e043518b7ab150e478c00b622360a5feb95f4e5b19e72bfcc71174356e2dacb3 SHA512 2a8e0f3e5fbb4b45786aa48cb408cf712cd968af65b25219eb39d54274612978704359b620179d751e828783950eb29d4cf330ac408a84dd65edbd0d98e25aa4 WHIRLPOOL 2b054cdb5c7c39008e876f0703e154509f4a79183aa85c4998717ae07a72e015a71bd22dc0427c8a464b3e16db92ebe9d731971f9788fbe56c8cc936669496fe

app-emulation/virtualbox-modules/Manifest

@@ -1,5 +1,5 @@
 DIST vbox-kernel-module-src-4.3.28.tar.xz 539876 SHA256 fb052997ec4992b0ee102475051b5d7bd8485e17405c6b3dcc94e1fa4a53b761 SHA512 637149f8595cb023e75116f83237bb4cef1b05627f58d475fa952ac86a85aa3cbab5f0cec723d730979f831999c920f35248e5f8db8f6987fb4c15c4a29bd517 WHIRLPOOL ab1ed07ee148a1ef352c0fda3f09865405be4146b987a5dffcb753d7512a00aa88c2ba1f7184b56d694c88320b350c6ececd3bec5636dd1586fc14a6be8a874d
 DIST vbox-kernel-module-src-4.3.30.tar.xz 540712 SHA256 28d89c06a4db190ec690980d68552745fb87ee2e23a3fe53edb29edda889f9d8 SHA512 8536d4bd105edf0fc112488232f7c85d8606b28b6cbeb28ee56bc135f693d1059328e75023299a67033bc1d486aea6a81c0fb23d51af500968119aa2f05156dc WHIRLPOOL 17452456aa127ca4ba53b2883f43970980f26094b80feaaa49b4773c386834d59f67afe21649539edc6dabde8725fd49c968002df9f2eb0e1ea8e888a2f8089b
 DIST vbox-kernel-module-src-4.3.32.tar.xz 546132 SHA256 4f0cf8a2d0f6714a5825551fa6ad38b85a70aac3a9949771bdcd85916ed12dae SHA512 7289dc1dd3a7e8812a57d3d1411c99ac25ddb33991e06e49a6212b030c6b6c2f08075c471f474c539b26be8a221934261af8f67a1aa4572f2e9cdb7433623a57 WHIRLPOOL 771c655bb5a7179d798330e438a3799d79cd1711844e491badaf7b6e0cb25fe2017a753675b0700b6ee2d8251bcc603f84a703cbe73b5bfcb46859b781d7c2d9
-DIST vbox-kernel-module-src-5.0.6.tar.xz 593640 SHA256 57b6ea7e772dbe032d8a024e48ad572c76dc4165ce2fb99cd45317c97466912f SHA512 88f1c61a6e749ba7076a3727baadf8ff7e0c3a70c279c6261757c7b8f0b3debd70a8cca21aea9e8b3a67feb0044c4e29439a075ccca3aaec0c0220f5a9264ac9 WHIRLPOOL c01fc142d650ef402601f457d83aeb3911200f3b7d5fbc4004c1da80832a911be01903f65ea92de592ff7e1f10688f77106a100d5fec8887767c8e8a7eb92a0d
+DIST vbox-kernel-module-src-5.0.10.tar.xz 592612 SHA256 d62362fe55291e94dfde20461549a4898fa782869e0cf88301cc3c09e6638f30 SHA512 e9a6166912f0550dde2fc2d62a104480ed179c3121c43ca66e4ee17ade51c71b3d9bfb2fc00a9af318a8fe0b2115f650023a80612d3f279d2b3b33a767664bbb WHIRLPOOL 4889f17ca4b33a12bc1d99e9ac5418834003957d8590ffcad9875ba5172edb26055c74c3d0daf0dba2c7b0c60faf3eb1ac92c94c63b74abe7965a46ef080d972
 DIST vbox-kernel-module-src-5.0.8.tar.xz 594164 SHA256 16513e3bec113e6e594a58ff0999ba70de4214c889dafed90ca181a6a603457d SHA512 91faf0054cd359a7455c1933dea3a37829f092eb966d8d2c6855061d3ecadfa1ea91a2258479f5696f373577f7aef1939bdd5808f9ca336e15f5476f4f6d464e WHIRLPOOL 837578475126fe8484e89140248971ce89e637a629a26b1324dc0b8b22d65fe351a1860d5c009223723a9d420d1a6f859c12c17ade510451177a6213f1905328

app-emulation/virtualbox/Manifest

@@ -1,7 +1,7 @@
 DIST VirtualBox-4.3.28.tar.bz2 100092002 SHA256 e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31 SHA512 b6e849a1420515b6dbda8cee0ab64940dd93296ec58cde76676ac257ff3dad0459aa1fd0bda7e1d0abc751d2d59f055465b198a546fdbb4e70e934a78654a8fc WHIRLPOOL 1b739f1f989032e07829a23ffadadd49e31109d70b0effbc44126a48a165218ff3ebafa576fa0e4f2af76a404033b60e5c9804ac43db5dd3024f1eca25ca70da
 DIST VirtualBox-4.3.30.tar.bz2 97428942 SHA256 ea9569ec16cd6202ee61bcadb2506d31ac12fd343adb91565773a05eaaea9a36 SHA512 d0817335cf4bd196da93b91ede6bc9e48ca0d471166ab2790dbf508a4574e4ace54a86053932abf3b4e804c583e80a713d2ab2e556dc15bee6ef3a62f88b95fc WHIRLPOOL 47cbd702e83cc737e04b5862cc6c52e32be244dc1dc0145f582f57b2f19bb898f0f4b200576a28f10a3290691f1ffd43c256e8c8eb5545a9723be8eefca88a38
 DIST VirtualBox-4.3.32.tar.bz2 98168101 SHA256 dc5bf4e6f9989792d31bac174d20d7fc9e638654fa5a99c02b20a60557927261 SHA512 856b36cd90647cdceb7e182d066e9e1489d2bae0b71ce8b2f6324cd2d9854806eaea0fe0aad2d4e8b84bd836c688e13258ae69e094320572729b7d886c8d35f0 WHIRLPOOL 441041947dcd190d73a9cc5007bc0001b6eeb36ba958f4a09fca775670faff690423095d334e258fc0d6dcbef01d74a085505c8549397ced5dbe75ca96724144
-DIST VirtualBox-5.0.6.tar.bz2 109863328 SHA256 22d63f28c43165a31dcccdec1c65f376f46d7e09555c47611cfaafb5576a5843 SHA512 3e51c9476c29a3ba79adda2d3b0c0b516459f58c8aa5e7b795be1aa2468b8e61241bbe5615787d7302a5f95230a446377bd8698f801c2114b26a471ae8bbbc11 WHIRLPOOL 11603c9aa14acac87032b5d8fc1f8d0a567632ca591230e0cc5c1d9a1ae9b39ebccb1a3bb85e1845abc01b04da550a2ef889e1bf91da0bb82df1fafa384f88b4
+DIST VirtualBox-5.0.10.tar.bz2 110904399 SHA256 56eafae439b91ea3c3748f2128b2969ba76983acf821acaa08e043c129b45a89 SHA512 8836e5b57ed46b57b12a9fdb6a632e895c3106dad58c3ab3e28f9178ce69499c493a935b6df8b872dc4677c12eb826a46113bdb902e4fb3d2f8ee6d768e53930 WHIRLPOOL 05516c1d9a3cd876a67a73b86df47ec7d1ef08ed921cb3e25ef483676413982ac8a7ce6562f3003240d862a33759aee5e6c94a303a2a35b66025d72cb15d4404
 DIST VirtualBox-5.0.8.tar.bz2 110540476 SHA256 e043518b7ab150e478c00b622360a5feb95f4e5b19e72bfcc71174356e2dacb3 SHA512 2a8e0f3e5fbb4b45786aa48cb408cf712cd968af65b25219eb39d54274612978704359b620179d751e828783950eb29d4cf330ac408a84dd65edbd0d98e25aa4 WHIRLPOOL 2b054cdb5c7c39008e876f0703e154509f4a79183aa85c4998717ae07a72e015a71bd22dc0427c8a464b3e16db92ebe9d731971f9788fbe56c8cc936669496fe
 DIST virtualbox-4.3.16-patches-01.tar.xz 4288 SHA256 270c4f01b2c13c4133987b3acc073dfbf78840212cf09f083dbf8fc80407ce6f SHA512 595f88c4b388b4807347c15c1750ec73aceba1c82ad993e9a05c7b78dfece7b679aff0338b3a48e2ccee7911fb5ed0dba803052332a270230078551f747052bc WHIRLPOOL 2157ee3fb9beed906cff28647c869e37d62551ad8c93801c0f0ec6893675f11786aa6d92acf11c348d30aa58b6e03a3faa879c664dddac6e5b8525035986c9ca
 DIST virtualbox-5.0.2-patches-01.tar.xz 4556 SHA256 8fcfa7972b0942f3e65bda73a35a6feb234aad770016fb4caafba105757d7ada SHA512 14ce8f0b17e593b2de676e0beaab688f29606aaea330151038fbb9259d3f5e4c22f254d1fa6cc45f968d81cf9f7d71deb9a7a32f565d07c1d9fa615431472ca9 WHIRLPOOL be73fd5576732f70f6ebb33a9d604d46a8fabdbdb0e187af3435f75412e21f62c0774130a9a6315e6b87ecf96d02398ffce828b3ab8f584716ed9a12e06d7cde

app-emulation/virtualbox/virtualbox-5.0.10.ebuild

@@ -171,6 +171,7 @@ src_prepare() {
 		EPATCH_EXCLUDE="050_${PN}-5.0.2-nopie.patch"
 	fi
 
+	EPATCH_EXCLUDE="007_virtualbox-4.3.16-gsoap2813.patch" \
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}/patches"
@@ -289,26 +290,20 @@ src_install() {
 	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
 	# VBoxXPCOMIPCD (bug #524202)
 	for each in VBox{Manage,SVC,XPCOMIPCD} ; do
-		if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each} ; then
+		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
-			ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/${each}"
-		fi
 	done
 
 	if ! use headless ; then
 		doins VBoxSDL
 		fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxSDL
 		fperms 4750 /usr/$(get_libdir)/${PN}/VBoxSDL
-		if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxSDL ; then
+		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxSDL
-			ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxSDL"
-		fi
 
 		if use opengl && use qt4 ; then
 			doins VBoxTestOGL
 			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
 			fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
-			if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxTestOGL ; then
+			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxTestOGL
-				ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxTestOGL"
-			fi
 		fi
 
 		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
@@ -317,9 +312,7 @@ src_install() {
 			doins VirtualBox
 			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
 			fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
-			if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox ; then
+			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox
-				ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VirtualBox"
-			fi
 
 			dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
 
@@ -338,9 +331,7 @@ src_install() {
 	doins VBoxHeadless
 	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
 	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
-	if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless ; then
+	pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless
-		ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxHeadless"
-	fi
 
 	insinto /usr/$(get_libdir)/${PN}
 	# Install EFI Firmware files (bug #320757)

app-emulation/xen/xen-4.5.2-r1.ebuild

@@ -14,7 +14,7 @@ if [[ $PV == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git"
 	live_eclass="git-2"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 -x86"
+	KEYWORDS="amd64 ~arm ~arm64 -x86"
 	UPSTREAM_VER=
 	SECURITY_VER=0
 	GENTOO_VER=

app-i18n/fcitx/fcitx-4.2.8.5.ebuild

@@ -11,7 +11,7 @@ SRC_URI="http://download.fcitx-im.org/fcitx/${P}_dict.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 ~x86"
+KEYWORDS="amd64 hppa ppc ppc64 x86"
 IUSE="+X +autostart +cairo +dbus debug +enchant gtk gtk3 icu introspection lua
 nls opencc +pango qt4 static-libs +table test +xml"
 

app-i18n/ibus/ibus-1.5.11.ebuild

@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/ibus/ibus/wiki"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
 REQUIRED_USE="
 	|| ( gtk gtk3 X )

app-misc/tmux/tmux-2.1.ebuild

@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug selinux vim-syntax"
 
 CDEPEND="

app-misc/workrave/workrave-1.10.8.ebuild

@@ -15,7 +15,7 @@ SRC_URI="https://github.com/rcaelers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 # dbus support looks to be used only for trying to use panel applets on gnome3!
 IUSE="ayatana doc gnome gstreamer introspection mate nls pulseaudio test xfce"

app-mobilephone/gnokii/gnokii-0.6.31.ebuild

@@ -9,7 +9,7 @@ inherit eutils linux-info autotools
 HOMEPAGE="http://www.gnokii.org/"
 if [ "$PV" != "9999" ]; then
 	SRC_URI="http://www.gnokii.org/download/${PN}/${P}.tar.bz2"
-	KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 else
 	SRC_URI=""
 	KEYWORDS=""

app-office/gnucash/files/gnucash-2.6.9-automagic-guile.patch

@@ -0,0 +1,88 @@
+From a42d0a1d9e3311a5e2356676fef7843f1726d343 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Wed, 11 Nov 2015 13:35:46 +0100
+Subject: [PATCH] Make guile support selectable
+
+---
+ configure.ac | 55 +++++++++++++++++++++++++++++++++++++------------------
+ 1 file changed, 37 insertions(+), 18 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 48ab828..ce7ba74 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -538,26 +538,45 @@ AC_CHECK_FUNCS(gethostid link)
+ ### --------------------------------------------------------------------------
+ ### Guile version checks
+ 
++GUILE_EFFECTIVE_VERSION=0
+ # - check minimum version
+ # - determine GUILE_CFLAGS and GUILE_LIBS
+-gnc_have_guile_2=no
+-gnc_have_guile_www=no
+-PKG_CHECK_MODULES(GUILE,
+-                  [guile-2.0 >= 2.0.0],
+-		  [gnc_have_guile_2=yes
+-		  GUILE_EFFECTIVE_VERSION=2.0
+-		  AC_PATH_PROG([GUILD], guild)],
+-   [PKG_CHECK_MODULES(GUILE,
+-                  [guile-1.8 >= 1.8.5],
+-		  [GUILE_EFFECTIVE_VERSION=1.8],
+-                  [AC_MSG_ERROR([
+-    guile does not appear to be installed correctly, or is not in the
+-    correct version range.  Perhaps you have not installed the guile
+-    development packages?  Gnucash requires at least version 1.8.5 to build.
+-  ])])
+-])
+ 
+-AM_CONDITIONAL(GNC_HAVE_GUILE_2, test "x${gnc_have_guile_2}" = xyes)
++AC_ARG_WITH([guile],
++    AS_HELP_STRING([--with-guile=1.8|2.0|auto],
++                   [which guile version to compile against @<:@default: auto@:>@]),
++    [],
++    [with_guile=auto]
++)
++
++AS_IF([test "$with_guile" = "2.0"],
++      [PKG_CHECK_MODULES(GUILE, [guile-2.0 >= 2.0.0],
++                         [GUILE_EFFECTIVE_VERSION=2.0
++                          AC_PATH_PROG([GUILD], guild)])],
++      [test "$with_guile" = "1.8"],
++      [PKG_CHECK_MODULES(GUILE, [guile-1.8 >= 1.8.5],
++                         [GUILE_EFFECTIVE_VERSION=1.8])],
++      [test "$with_guile" = "auto"],
++      [PKG_CHECK_MODULES(GUILE, [guile-2.0 >= 2.0.0],
++          [GUILE_EFFECTIVE_VERSION=2.0
++           AC_PATH_PROG([GUILD], guild)],
++          [PKG_CHECK_MODULES(GUILE, [guile-1.8 >= 1.8.5],
++                             [GUILE_EFFECTIVE_VERSION=1.8],
++                             [GUILE_EFFECTIVE_VERSION=0])
++          ])],
++      # else
++      [AC_MSG_ERROR([invalid guile version specified])]
++)
++
++AS_IF([test "$GUILE_EFFECTIVE_VERSION" = "0"],
++      [AC_MSG_ERROR([
++       guile does not appear to be installed correctly, or is not in the
++       correct version range.  Perhaps you have not installed the guile
++       development packages?  Gnucash requires at least version 1.8.5 to build.
++       ])]
++)
++
++AM_CONDITIONAL(GNC_HAVE_GUILE_2, [test "$GUILE_EFFECTIVE_VERSION" = "2.0"])
+ AC_SUBST(GUILE_EFFECTIVE_VERSION)
+ AC_SUBST(GUILE, [`pwd`/gnc-guile])
+ 
+@@ -584,7 +603,7 @@ if test "${BUILDING_FROM_VCS}" = yes
+ then
+     AX_PKG_SWIG(2.0.10, [gnc_have_swig_2_0_10=yes], [gnc_have_swig_2_0_10=no])
+ 
+-    if test "${gnc_have_guile_2}" = yes
++    if test "${GUILE_EFFECTIVE_VERSION}" = "2.0"
+     then
+         if test "${gnc_have_swig_2_0_10}" = no
+         then
+-- 
+2.6.3
+

app-office/gnucash/gnucash-2.6.9.ebuild

@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="chipcard debug +doc gnome-keyring hbci mysql ofx postgres python quotes sqlite"
 
 # FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.ac)
@@ -64,6 +64,9 @@ src_prepare() {
 	# Skip test that needs some locales to be present
 	sed -i -e '/test_suite_gnc_date/d' src/libqof/qof/test/test-qof.c || die
 
+	# Fix automagic on guile detection
+	epatch "${FILESDIR}"/${PN}-2.6.9-automagic-guile.patch
+
 	eautoreconf
 	gnome2_src_prepare
 }
@@ -79,16 +82,6 @@ src_configure() {
 		myconf+=" --disable-dbi"
 	fi
 
-	# guile wrongly exports LDFLAGS as LIBS which breaks modules
-	# Filter until a better ebuild is available, bug #202205
-	local GUILE_LIBS=""
-	local lib
-	for lib in $(guile-config link); do
-		if [ "${lib#-Wl}" = "$lib" ]; then
-			GUILE_LIBS="$GUILE_LIBS $lib"
-		fi
-	done
-
 	# gtkmm is experimental and shouldn't be enabled, upstream bug #684166
 	gnome2_src_configure \
 		$(use_enable debug) \
@@ -96,11 +89,12 @@ src_configure() {
 		$(use_enable ofx) \
 		$(use_enable hbci aqbanking) \
 		$(use_enable python) \
+		--with-guile=1.8 \
 		--disable-doxygen \
 		--disable-gtkmm \
 		--enable-locale-specific-tax \
 		--disable-error-on-warning \
-		 GUILE_LIBS="${GUILE_LIBS}" ${myconf}
+		${myconf}
 }
 
 src_test() {

app-office/gnumeric/gnumeric-1.12.24.ebuild

@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnumeric.org/"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 
 IUSE="+introspection libgda perl python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

app-office/openoffice-bin/openoffice-bin-4.1.2.ebuild

@@ -42,7 +42,7 @@ done
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	!app-office/openoffice

app-office/texstudio/texstudio-2.10.2.ebuild

@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/TeXstudio%20${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ppc64 x86 ~x86-fbsd"
 IUSE="video qt4 +qt5"
 
 REQUIRED_USE="^^ ( qt4 qt5 )"

app-officeext/ooofbtools/ooofbtools-2.38.ebuild

@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/fbtools/files/release/${MY_PN}-${PV}.zip"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=""
 RDEPEND="dev-libs/libxml2"

app-portage/elogviewer/elogviewer-2.6.ebuild

@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="|| (

app-portage/gentoolkit/gentoolkit-0.3.0.8-r2.ebuild

@@ -5,7 +5,7 @@
 EAPI="5"
 
 PYTHON_COMPAT=(python{2_7,3_3})
-PYTHON_REQ_USE="xml(+)"
+PYTHON_REQ_USE="xml(+),threads(+)"
 
 inherit distutils-r1
 

app-portage/gentoolkit/gentoolkit-0.3.0.9-r1.ebuild

@@ -5,7 +5,7 @@
 EAPI="5"
 
 PYTHON_COMPAT=(python{2_7,3_3} pypy)
-PYTHON_REQ_USE="xml(+)"
+PYTHON_REQ_USE="xml(+),threads(+)"
 
 inherit distutils-r1
 

app-portage/gentoolkit/gentoolkit-0.3.0.9-r2.ebuild

@@ -5,7 +5,7 @@
 EAPI="5"
 
 PYTHON_COMPAT=(python{2_7,3_3,3_4} pypy)
-PYTHON_REQ_USE="xml(+)"
+PYTHON_REQ_USE="xml(+),threads(+)"
 
 inherit distutils-r1
 

app-portage/gentoolkit/gentoolkit-0.3.0.9.ebuild

@@ -5,7 +5,7 @@
 EAPI="5"
 
 PYTHON_COMPAT=(python{2_7,3_3})
-PYTHON_REQ_USE="xml(+)"
+PYTHON_REQ_USE="xml(+),threads(+)"
 
 inherit distutils-r1
 

app-portage/gentoolkit/gentoolkit-9999.ebuild

@@ -5,7 +5,7 @@
 EAPI="5"
 
 PYTHON_COMPAT=(python{2_7,3_3,3_4} pypy)
-PYTHON_REQ_USE="xml(+)"
+PYTHON_REQ_USE="xml(+),threads(+)"
 
 inherit distutils-r1 git-r3
 

app-text/iso-codes/iso-codes-3.63.ebuild

@@ -14,7 +14,7 @@ SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=""

dev-java/annogen/annogen-0.1.0-r1.ebuild

@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source examples"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A tool which helps you work with JSR175 annotations"
-HOMEPAGE="https://github.com/codehaus/annogen"
-SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-CDEPEND="java-virtuals/jdk-with-com-sun:0
-	dev-java/ant-core:0
-	dev-java/qdox:1.6"
-
-RDEPEND=">=virtual/jdk-1.6
-		${CDEPEND}"
-
-DEPEND=">=virtual/jre-1.6
-		app-arch/unzip
-		${CDEPEND}"
-
-S="${WORKDIR}"
-
-# com.sun.mirror.declaration was removed from JDK 7 onwards.
-# These two files are just interfaces anyway.
-JAVA_RM_FILES=(
-	org/codehaus/annogen/view/MirrorAnnoViewer.java
-	org/codehaus/annogen/override/MirrorElementIdPool.java
-)
-
-src_unpack() {
-	default
-	unzip -o -q "${S}/${PN}-src-${PV}.zip" || die
-}
-
-java_prepare() {
-	find -name '*.jar' -exec rm -v {} + || die
-	mkdir "${S}"/classes || die
-}
-
-# Well. I don't like this way of doing things but it works.
-# I've tried to rewrite this ebuild using the java-ant-2 eclass.
-# It was an unfruitful try.
-src_compile() {
-	find org -name "*.java" > "${T}/src.list" || die
-
-	ejavac -d "${S}"/classes \
-		-classpath $(java-pkg_getjars qdox-1.6,ant-core):$(java-config --tools) \
-		"@${T}/src.list"
-
-	cd "${S}"/classes || die
-	jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-
-	# For if this is ever needed:
-	# java-pkg_register-ant-task
-
-	use doc && java-pkg_dojavadoc docs
-	use source && java-pkg_dosrc org
-	use examples && java-pkg_doexamples "examples"
-}

dev-java/annogen/annogen-0.1.0-r2.ebuild

@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A tool which helps you work with JSR175 annotations"
+HOMEPAGE="https://github.com/codehaus/annogen"
+SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+
+CDEPEND="
+	dev-java/qdox:1.6
+	dev-java/ant-core:0
+	java-virtuals/jdk-with-com-sun:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	>=virtual/jre-1.6"
+
+# com.sun.mirror.declaration was removed from JDK 7 onwards.
+# These two files are just interfaces anyway.
+JAVA_RM_FILES=(
+	org/codehaus/annogen/view/MirrorAnnoViewer.java
+	org/codehaus/annogen/override/MirrorElementIdPool.java
+)
+
+JAVA_GENTOO_CLASSPATH="
+	ant-core
+	qdox-1.6
+"
+
+src_unpack() {
+	default
+	unzip -o -q "${S}/${PN}-src-${PV}.zip" || die
+}
+
+java_prepare() {
+	java-pkg_clean
+	rm -rf examples || die
+}
+
+src_compile() {
+	# Needed for com.sun.* imports
+	JAVA_GENTOO_CLASSPATH_EXTRA="$(java-config -t)" \
+		java-pkg-simple_src_compile
+}

dev-java/annogen/annogen-0.1.0.ebuild

@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source examples"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A tool which helps you work with JSR175 annotations"
-HOMEPAGE="http://annogen.codehaus.org/"
-SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-
-CDEPEND="java-virtuals/stax-api:0
-	java-virtuals/jdk-with-com-sun:0
-	dev-java/ant-core:0
-	dev-java/qdox:1.6"
-
-RDEPEND=">=virtual/jdk-1.6
-		${CDEPEND}"
-
-DEPEND=">=virtual/jre-1.6
-		app-arch/unzip
-		${CDEPEND}"
-
-S="${WORKDIR}"
-
-# com.sun.mirror.declaration was removed from JDK 7 onwards.
-# These two files are just interfaces anyway.
-JAVA_RM_FILES=(
-	org/codehaus/annogen/view/MirrorAnnoViewer.java
-	org/codehaus/annogen/override/MirrorElementIdPool.java
-)
-
-src_unpack() {
-	default
-	unzip -o -q "${S}/${PN}-src-${PV}.zip" || die
-}
-
-java_prepare() {
-	find -name '*.jar' -exec rm -v {} + || die
-
-	mkdir "${S}"/classes || die
-}
-
-src_compile() {
-	find org -name "*.java" > "${T}/src.list" || die
-
-	ejavac -d "${S}"/classes \
-		-classpath $(java-pkg_getjars stax-api,qdox-1.6,ant-core):$(java-config --tools) \
-		"@${T}/src.list"
-
-	cd "${S}"/classes || die
-	jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-
-	# For if this is ever needed:
-	# java-pkg_register-ant-task
-
-	use doc && java-pkg_dojavadoc docs
-	use source && java-pkg_dosrc org
-	use examples && java-pkg_doexamples "examples"
-}

dev-java/jacoco/Manifest

@@ -0,0 +1,4 @@
+DIST jacoco-0.7.5-agent.jar 4078 SHA256 df73da4b6e8f4772678077f8a7cad5b3fcea75162aa6812930bd91f049bc6169 SHA512 bb374677679bb00de2029a0247af0117393bf691b1ad54f43756e6a17dfb5745f90a3c4d6470278f56e6dfde24e54e45663938d037cd3aeb0d24780b17575e56 WHIRLPOOL 0df8fed3c57b35c5e7a33b864f1b08b235f7e1917030388f97f567812699df6a81de8a80b107a0774ebac5f165a5e3e91ec80cf897a9d99a0ba1ae71ffef4608
+DIST jacoco-0.7.5-ant.jar 18060 SHA256 5fb791065d3eb23d8aca02076cfd526d41bc76d03841933684a7b4eeca4e5bca SHA512 1404727c1ebd9af8f6be47e0b7dc0b717a8f235a10e0fcb9d0472b8286a6a0c719877947cefe472fecdf2388b46810668650fed5567038310cec37f7f11c04c6 WHIRLPOOL 6c779cf65214f670dfb3acba5e1579f3bef1f20eb902bb3611598c937fcc71ac7b9d33679ffdc325b5e0468208c07aa6d9f8c161a16c459bc49a0e7212068cfe
+DIST jacoco-0.7.5-core.jar 111749 SHA256 4a5ce92a3f3264d74033f43fecb6f644be6342ffe58b1cd322808c84cb47eb26 SHA512 7dfb16ff621b8eca76cfaeb468f9448b7c1f2bf2cffd324a5069822a03d6b70a7b9e63a08f78dc0bad7c6854e8b1059f36095a01e155f1767da6ca88913c3989 WHIRLPOOL 125a609bb62d804e4c5be9bca82dd0e177d22dc701c81d12a729640c218ce07ecadffe2a08bea5fb6d87071740d79ce825963be5fe1ad874062b71d077848437
+DIST jacoco-0.7.5-report.jar 112315 SHA256 edb049aad135e7b2bdf07b144c024860b263809f604b38678db6100a8343e3e7 SHA512 3347130757022da94b41a6b0d001d8b59e000630834de7972248ce53b447f28aeaf902226acf2485e8afbd797b84af00fdd1ea2c6f24d93ec60407e229f8a796 WHIRLPOOL 627235042c6cd995e01363ee7d484b74cba6f25a1be300aee46af0059a4597f1a16292953a4550e8a543610ca387fcd7a1c3e30a2a05b4ebfde60f8ca708463d

dev-java/jacoco/jacoco-0.7.5.ebuild

@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DATE="201505241946"
+
+DESCRIPTION="Java Code Coverage library."
+HOMEPAGE="http://eclemma.org/jacoco/"
+SRC_URI="
+	https://repo1.maven.org/maven2/org/${PN}/org.${PN}.report/${PV}.${DATE}/org.${PN}.report-${PV}.${DATE}-sources.jar -> ${P}-report.jar
+	https://repo1.maven.org/maven2/org/${PN}/org.${PN}.agent/${PV}.${DATE}/org.${PN}.agent-${PV}.${DATE}-sources.jar -> ${P}-agent.jar
+	https://repo1.maven.org/maven2/org/${PN}/org.${PN}.core/${PV}.${DATE}/org.${PN}.core-${PV}.${DATE}-sources.jar -> ${P}-core.jar
+	https://repo1.maven.org/maven2/org/${PN}/org.${PN}.ant/${PV}.${DATE}/org.${PN}.ant-${PV}.${DATE}-sources.jar -> ${P}-ant.jar"
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+CDEPEND="
+	dev-java/ant-core:0
+	dev-java/asm:4"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="
+	asm-4
+	ant-core
+"

dev-java/jacoco/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <maintainer>
+    <email>monsieurp@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>

dev-java/jss/jss-4.3.2.ebuild

@@ -17,7 +17,7 @@ HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/JSS"
 SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.bz2"
 LICENSE="MPL-1.1"
 SLOT="3.4"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples test"
 
 CDEPEND=">=dev-libs/nspr-4.7.1

dev-java/piccolo/piccolo-1.04.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,10 +14,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-RDEPEND=">=virtual/jre-1.4"
+RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.4
+DEPEND=">=virtual/jdk-1.6
 	app-arch/unzip"
 
 EANT_BUILD_TARGET="build"

dev-java/rat/Manifest

@@ -0,0 +1,2 @@
+DIST apache-rat-core-0.11-sources.jar 124710 SHA256 22fbef361d39b2cb8f36d830afe15d5592bd0ac6fda29b6bbb1314b7bfb5b35d SHA512 1f75e6830bffa7b1a2410aa421a548a4c78db6686c8f940471e38d1bb455201cbfd797be3bb5da027966ee39bb93e7c7b393e3d7ff330866235fafffe1ee6991 WHIRLPOOL 047d337a69eb135c8aeaadf051c1979d257d1442455a56e87b889e3a413c1b5e47c7a4e8053ec9b871b1e98c15eac81ae3cc038b36ba1a7cca530a63a0ec3ee7
+DIST apache-rat-tasks-0.11-sources.jar 17602 SHA256 c2bc9b978eb3cb6fde38165d2eedd4e70a84edbb70df8521e04cb07662aace0f SHA512 54430fd7f8c227fe9fa14bbd44adc1222e8b7de0bbc5a5b861f4df773f5db0fdaf80b6ab327e17cdf57af54447d13f3431e8cdf86728af6f8a84e85c89376565 WHIRLPOOL 55d01e4426c50cadc5db7031eb709cd9669baaf1121de4433458faaa86c882c81e4313c9611c115c86854bfd922449eca33027da031316e8e1fa0867ca946249

dev-java/rat/metadata.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+  <herd>java</herd>
 </pkgmetadata>

dev-java/rat/rat-0.11.ebuild

@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="apache-${PN}"
+
+DESCRIPTION="Apache Rat is a release audit tool, focused on licenses."
+HOMEPAGE="https://creadur.apache.org/rat/"
+
+SRC_URI="
+	https://repo1.maven.org/maven2/org/apache/${PN}/${MY_PN}-core/${PV}/${MY_PN}-core-${PV}-sources.jar
+	https://repo1.maven.org/maven2/org/apache/${PN}/${MY_PN}-tasks/${PV}/${MY_PN}-tasks-${PV}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+	dev-java/ant-core:0
+	dev-java/commons-io:1
+	dev-java/commons-cli:1
+	dev-java/commons-lang:2.1
+	dev-java/commons-compress:0
+	dev-java/commons-collections:0
+"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="
+	ant-core
+	commons-io-1
+	commons-cli-1
+	commons-compress
+	commons-lang-2.1
+	commons-collections
+"
+
+src_install() {
+	java-pkg_dolauncher "${MY_PN}" --main org.apache.rat.Report
+	java-pkg-simple_src_install
+}

dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-SchemaCompiler.java.patch

@@ -0,0 +1,14 @@
+--- src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompiler.java.orig	2015-11-11 15:58:46.578486000 +0000
++++ src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompiler.java	2015-11-11 15:59:05.351486000 +0000
+@@ -217,8 +217,9 @@
+         boolean debug = (cl.getOpt("debug") != null);
+ 
+         String allowmdef = cl.getOpt("allowmdef");
+-        Set mdefNamespaces = (allowmdef == null ? Collections.EMPTY_SET :
+-                new HashSet(Arrays.asList(XmlListImpl.split_list(allowmdef))));
++        Set mdefNamespaces = Collections.EMPTY_SET;
++        // Set mdefNamespaces = (allowmdef == null ? Collections.EMPTY_SET :
++        //         new HashSet(Arrays.asList(XmlListImpl.split_list(allowmdef))));
+ 
+         List extensions = new ArrayList();
+         if (cl.getOpt("extension") != null) {

dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild

@@ -1,12 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
-
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 MY_P="xmlbeans-${PV}"
 
@@ -16,24 +15,36 @@ SRC_URI="http://archive.apache.org/dist/xmlbeans/source/${MY_P}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-COMMON_DEP="dev-java/annogen:0
+CDEPEND="
-	dev-java/ant-core:0
+	dev-java/saxon:9
 	dev-java/jsr173:0
+	dev-java/annogen:0
 	dev-java/piccolo:0
-	dev-java/saxon:9
+	dev-java/ant-core:0
 	dev-java/xml-commons-resolver:0"
 
-RDEPEND=">=virtual/jre-1.6
+RDEPEND="
-	${COMMON_DEP}"
+	${CDEPEND}
+	>=virtual/jre-1.6"
 
-DEPEND=">=virtual/jdk-1.6
+DEPEND="
-	${COMMON_DEP}"
+	${CDEPEND}
+	>=virtual/jdk-1.6"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-jamsupport.patch
+	"${FILESDIR}"/${P}-piccolo.patch
+	"${FILESDIR}"/${P}-jam.patch
+	"${FILESDIR}"/${P}-SchemaCompiler.java.patch
+)
+
 java_prepare() {
+	epatch "${PATCHES[@]}"
+
 	# Preserve the old xbean jar, which is required for bootstrapping schemas.
 	mv external/lib/oldxbean.jar "${T}"/ || die
 
@@ -41,33 +52,34 @@ java_prepare() {
 	find . -name '*.jar' -exec rm -v {} + || die
 
 	pushd external/lib > /dev/null || die
-		find . -iname '*.zip' -exec rm -v {} + || die
 
-		# Symlink the dependencies.
+	find . -iname '*.zip' -exec rm -v {} + || die
-		java-pkg_jar-from jsr173{,.jar,_1.0_api_bundle.jar}
-		java-pkg_jar-from jsr173{,.jar,_1.0_api.jar}
 
-		mkdir xml-commons-resolver-1.1 || die
+	# Symlink the dependencies.
-		java-pkg_jar-from xml-commons-resolver{,.jar} xcresolver.zip
+	java-pkg_jar-from jsr173{,.jar,_1.0_api_bundle.jar}
-		java-pkg_jar-from xml-commons-resolver{,.jar,-1.1/resolver.jar}
+	java-pkg_jar-from jsr173{,.jar,_1.0_api.jar}
 
-		# Put back the preserved old xbean jar.
+	mkdir xml-commons-resolver-1.1 || die
-		mv "${T}"/oldxbean.jar . || die
+	java-pkg_jar-from xml-commons-resolver{,.jar} xcresolver.zip
-	popd > /dev/null || die
+	java-pkg_jar-from xml-commons-resolver{,.jar,-1.1/resolver.jar}
 
-	# Remove broken jamsupport.
+	# Put back the preserved old xbean jar.
-	epatch "${FILESDIR}"/${P}-remove-jamsupport.patch
+	mv "${T}"/oldxbean.jar . || die
 
-	# Patch package imports.
+	popd > /dev/null || die
-	epatch "${FILESDIR}"/${P}-piccolo.patch
-	epatch "${FILESDIR}"/${P}-jam.patch
 
 	# Create empty directories to let the build pass.
-	mkdir -p build/classes/{jam,piccolo}
+	mkdir -p build/classes/{jam,piccolo} || die
 }
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="annogen,ant-core,piccolo,saxon-9"
+
+EANT_GENTOO_CLASSPATH="
+	annogen
+	piccolo
+	ant-core
+	saxon-9
+"
 
 EANT_BUILD_TARGET="deploy"
 EANT_DOC_TARGET="docs"
@@ -88,8 +100,7 @@ src_install() {
 	use source && java-pkg_dosrc src/*
 }
 
-pkg_postinst()
+pkg_postinst() {
-{
 	ewarn "This package uses an old binary xbean to bootstrap its schemas."
 	ewarn "If you do not trust the binary part of this build, please unmerge."
 }

dev-lang/mozart/metadata.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+  <maintainer>
-  <email>keri@gentoo.org</email>
+    <email>keri@gentoo.org</email>
-  <name>Keri Harris</name>
+    <name>Keri Harris</name>
-</maintainer>
+  </maintainer>
 </pkgmetadata>

dev-lang/mozart/mozart-1.4.0-r2.ebuild

@@ -1,131 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit elisp-common eutils
-
-PATCHSET_VER="5"
-MY_P="mozart-${PV}.20080704"
-
-DESCRIPTION="Advanced development platform for intelligent, distributed applications"
-HOMEPAGE="http://www.mozart-oz.org/"
-SRC_URI="
-	http://www.mozart-oz.org/download/mozart-ftp/store/1.4.0-2008-07-02-tar/mozart-1.4.0.20080704-src.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz
-	doc? ( http://www.mozart-oz.org/download/mozart-ftp/store/1.4.0-2008-07-02-tar/mozart-1.4.0.20080704-doc.tar.gz )"
-
-SLOT="0"
-LICENSE="Mozart"
-KEYWORDS="-amd64 ppc -ppc64 x86"
-IUSE="doc emacs examples gdbm static tcl threads tk"
-
-RDEPEND="
-	dev-lang/perl
-	dev-libs/gmp
-	sys-libs/zlib
-	emacs? ( virtual/emacs )
-	gdbm? ( sys-libs/gdbm  )
-	tcl? (
-		tk? (
-			dev-lang/tk:0
-			dev-lang/tcl:0
-		)
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-SITEFILE=50${PN}-gentoo.el
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-}
-
-src_configure() {
-	local myconf="\
-			--without-global-oz \
-			--enable-opt=none"
-
-	if use tcl && use tk ; then
-		myconf="${myconf} --enable-wish"
-	else
-		myconf="${myconf} --disable-wish"
-	fi
-
-	econf \
-		${myconf} \
-		--disable-doc \
-		--enable-contrib \
-		--disable-contrib-micq \
-		$(use_enable doc contrib-doc) \
-		$(use_enable gdbm contrib-gdbm) \
-		$(use_enable tk contrib-tk) \
-		$(use_enable emacs compile-elisp) \
-		$(use_enable static link-static) \
-		$(use_enable threads threaded)
-}
-
-src_compile() {
-	emake bootstrap || die "emake bootstrap failed"
-}
-
-src_test() {
-	# Mozart tests must be run single-threaded
-	cd "${S}"/share/test
-	emake -j1 boot-oztest || die "emake boot-oztest failed"
-	emake -j1 boot-check || die "emake boot-check failed"
-}
-
-src_install() {
-	emake \
-		PREFIX="${D}"/usr/lib/mozart \
-		ELISPDIR="${D}${SITELISP}/${PN}" \
-		install || die "emake install failed"
-
-	dosym /usr/lib/mozart/bin/convertTextPickle /usr/bin/convertTextPickle || die
-	dosym /usr/lib/mozart/bin/oldpickle2text /usr/bin/oldpickle2text || die
-	dosym /usr/lib/mozart/bin/ozc /usr/bin/ozc || die
-	dosym /usr/lib/mozart/bin/ozd /usr/bin/ozd || die
-	dosym /usr/lib/mozart/bin/ozengine /usr/bin/ozengine || die
-	dosym /usr/lib/mozart/bin/ozl /usr/bin/ozl || die
-	dosym /usr/lib/mozart/bin/ozplatform /usr/bin/ozplatform || die
-	dosym /usr/lib/mozart/bin/oztool /usr/bin/oztool || die
-	dosym /usr/lib/mozart/bin/pickle2text /usr/bin/pickle2text || die
-	dosym /usr/lib/mozart/bin/text2pickle /usr/bin/text2pickle || die
-
-	if use emacs; then
-		dosym /usr/lib/mozart/bin/oz /usr/bin/oz || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-
-	if use doc ; then
-		dohtml -r "${WORKDIR}"/mozart/doc/* || die
-	fi
-
-	if use examples; then
-		cd "${S}"/share
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/* || die
-		doins -r demo/* || die
-		rm -rf $(find "${D}"/usr/share/doc/${PF}/examples \
-			-name Makefile -o -name Makefile.in)
-	fi
-
-	cd "${S}"
-	dodoc README || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

dev-lang/mozart/mozart-1.4.0-r3.ebuild

@@ -18,12 +18,12 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="Mozart"
-KEYWORDS="-amd64 ppc -ppc64 ~x86"
+KEYWORDS="-amd64 ppc -ppc64 x86"
 IUSE="doc emacs examples gdbm static tcl threads tk"
 
 RDEPEND="
 	dev-lang/perl
-	dev-libs/gmp
+	dev-libs/gmp:0=
 	sys-libs/zlib
 	emacs? ( virtual/emacs )
 	gdbm? ( sys-libs/gdbm  )

dev-lang/ocaml/ocaml-4.02.3.ebuild

@@ -17,7 +17,7 @@ LICENSE="QPL-1.0 LGPL-2"
 # Everytime ocaml is updated to a new version, everything ocaml must be rebuilt,
 # so here we go with the subslot.
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="emacs latex ncurses +ocamlopt X xemacs"
 
 RDEPEND="

dev-lang/python/python-2.7.10-r2.ebuild

@@ -306,7 +306,8 @@ src_install() {
 		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
 
 	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+	python_export python${SLOT} EPYTHON PYTHON
+	export PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${SLOT}/site-packages"
 
 	# if not using a cross-compiler, use the fresh binary
 	if ! tc-is-cross-compiler; then

dev-lang/python/python-2.7.10-r3.ebuild

@@ -0,0 +1,348 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+WANT_LIBTOOL="none"
+
+inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
+
+MY_P="Python-${PV}"
+PATCHSET_VERSION="2.7.10-0"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="http://www.python.org/"
+SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
+
+LICENSE="PSF-2"
+SLOT="2.7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:0=
+	>=sys-libs/zlib-1.1.3:0=
+	virtual/libffi
+	virtual/libintl
+	berkdb? ( || (
+		sys-libs/db:5.3
+		sys-libs/db:5.2
+		sys-libs/db:5.1
+		sys-libs/db:5.0
+		sys-libs/db:4.8
+		sys-libs/db:4.7
+		sys-libs/db:4.6
+		sys-libs/db:4.5
+		sys-libs/db:4.4
+		sys-libs/db:4.3
+		sys-libs/db:4.2
+	) )
+	gdbm? ( sys-libs/gdbm:0=[berkdb] )
+	ncurses? (
+		>=sys-libs/ncurses-5.2:0=
+		readline? ( >=sys-libs/readline-4.1:0= )
+	)
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	tk? (
+		>=dev-lang/tcl-8.0:0=
+		>=dev-lang/tk-8.0:0=
+		dev-tcltk/blt:0=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1 )
+	!!<sys-apps/portage-2.1.9"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/autoconf-2.65
+	!sys-devel/gcc[libffi]"
+RDEPEND+=" !build? ( app-misc/mime-types )
+	doc? ( dev-python/python-docs:${SLOT} )"
+PDEPEND="app-eselect/eselect-python
+	app-admin/python-updater"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use berkdb; then
+		ewarn "'bsddb' module is out-of-date and no longer maintained inside"
+		ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
+		ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
+		ewarn "is provided by dev-python/bsddb3."
+	else
+		if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
+			ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"
+			ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
+			ewarn "You might need to migrate your databases."
+		fi
+	fi
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -r Modules/expat || die
+	rm -r Modules/_ctypes/libffi* || die
+	rm -r Modules/zlib || die
+
+	if tc-is-cross-compiler; then
+		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
+	fi
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+	# Fix for cross-compiling.
+	epatch "${FILESDIR}/python-2.7.5-nonfatal-compileall.patch"
+	epatch "${FILESDIR}/python-2.7.9-ncurses-pkg-config.patch"
+	epatch "${FILESDIR}/python-2.7.10-cross-compile-warn-test.patch"
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		Lib/distutils/command/install.py \
+		Lib/distutils/sysconfig.py \
+		Lib/site.py \
+		Lib/sysconfig.py \
+		Lib/test/test_site.py \
+		Makefile.pre.in \
+		Modules/Setup.dist \
+		Modules/getpath.c \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+		# dbm module can be linked against berkdb or gdbm.
+		# Defaults to gdbm when both are enabled, #204343.
+		local disable
+		use berkdb   || use gdbm || disable+=" dbm"
+		use berkdb   || disable+=" _bsddb"
+		use gdbm     || disable+=" gdbm"
+		use ncurses  || disable+=" _curses _curses_panel"
+		use readline || disable+=" readline"
+		use sqlite   || disable+=" _sqlite3"
+		use ssl      || export PYTHON_DISABLE_SSL="1"
+		use tk       || disable+=" _tkinter"
+		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+		export PYTHON_DISABLE_MODULES="${disable}"
+
+		if ! use xml; then
+			ewarn "You have configured Python without XML support."
+			ewarn "This is NOT a recommended configuration as you"
+			ewarn "may face problems parsing any XML documents."
+		fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	if tc-is-cross-compiler; then
+		# Force some tests that try to poke fs paths.
+		export ac_cv_file__dev_ptc=no
+		export ac_cv_file__dev_ptmx=yes
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
+	tc-export CXX
+	# The configure script fails to use pkg-config correctly.
+	# http://bugs.python.org/issue15506
+	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
+
+	# Set LDFLAGS so we link modules with -lpython2.7 correctly.
+	# Needed on FreeBSD unless Python 2.7 is already installed.
+	# Please query BSD team before removing this!
+	append-ldflags "-L."
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+	if use berkdb; then
+		dbmliborder+="${dbmliborder:+:}bdb"
+	fi
+
+	BUILD_DIR="${WORKDIR}/${CHOST}"
+	mkdir -p "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+
+	ECONF_SOURCE="${S}" OPT="" \
+	econf \
+		--with-fpectl \
+		--enable-shared \
+		$(use_enable ipv6) \
+		$(use_with threads) \
+		$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
+		--infodir='${prefix}/share/info' \
+		--mandir='${prefix}/share/man' \
+		--with-dbmliborder="${dbmliborder}" \
+		--with-libc="" \
+		--enable-loadable-sqlite-extensions \
+		--with-system-expat \
+		--with-system-ffi \
+		--without-ensurepip
+
+	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+src_compile() {
+	# Avoid invoking pgen for cross-compiles.
+	touch Include/graminit.h Python/graminit.c
+
+	cd "${BUILD_DIR}" || die
+	emake
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	cd "${BUILD_DIR}" || die
+
+	# Skip failing tests.
+	local skipped_tests="distutils gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# Rerun failed tests in verbose mode (regrtest -w).
+	emake test EXTRATESTOPTS="-w" < /dev/tty
+	local result="$?"
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
+	elog "and run the tests separately."
+
+	if [[ "${result}" -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
+
+	cd "${BUILD_DIR}" || die
+	emake DESTDIR="${D}" altinstall
+
+	sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed"
+
+	# Fix collisions between different slots of Python.
+	mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
+	mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
+	mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
+	rm -f "${ED}usr/bin/smtpd.py"
+
+		use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*} || die
+		use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+		use tk || rm -r "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk} || die
+		use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
+
+	use threads || rm -r "${libdir}/multiprocessing" || die
+	use wininst || rm -r "${libdir}/distutils/command/"wininst-*.exe || die
+
+	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r "${S}"/Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${SLOT}:" \
+		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
+
+	# for python-exec
+	python_export python${SLOT} EPYTHON PYTHON
+	export PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${SLOT}/site-packages"
+
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+	fi
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py
+	python_domodule epython.py
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
+		python_updater_warning="1"
+	fi
+}
+
+eselect_python_update() {
+	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
+		eselect python update
+	fi
+
+	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
+		eselect python update --python${PV%%.*}
+	fi
+}
+
+pkg_postinst() {
+	eselect_python_update
+
+	if [[ "${python_updater_warning}" == "1" ]]; then
+		ewarn "You have just upgraded from an older version of Python."
+		ewarn "You should switch active version of Python ${PV%%.*} and run"
+		ewarn "'python-updater [options]' to rebuild Python modules."
+	fi
+}
+
+pkg_postrm() {
+	eselect_python_update
+}

dev-lang/python/python-2.7.10.ebuild

@@ -314,7 +314,8 @@ src_install() {
 		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
 
 	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+	python_export python${SLOT} EPYTHON PYTHON
+	export PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${SLOT}/site-packages"
 
 	# if not using a cross-compiler, use the fresh binary
 	if ! tc-is-cross-compiler; then

dev-lang/python/python-2.7.9-r1.ebuild

@@ -315,7 +315,8 @@ src_install() {
 		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
 
 	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+	python_export python${SLOT} EPYTHON PYTHON
+	export PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${SLOT}/site-packages"
 
 	# if not using a cross-compiler, use the fresh binary
 	if ! tc-is-cross-compiler; then

dev-lang/python/python-3.3.5-r1.ebuild

@@ -280,7 +280,8 @@ src_install() {
 		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
 
 	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+	python_export python${SLOT} EPYTHON PYTHON
+	export PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${SLOT}/site-packages"
 
 	# if not using a cross-compiler, use the fresh binary
 	if ! tc-is-cross-compiler; then

dev-lang/python/python-3.3.5-r2.ebuild

@@ -286,7 +286,8 @@ src_install() {
 		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
 
 	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+	python_export python${SLOT} EPYTHON PYTHON
+	export PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${SLOT}/site-packages"
 
 	# if not using a cross-compiler, use the fresh binary
 	if ! tc-is-cross-compiler; then

dev-lang/python/python-3.3.5-r3.ebuild

@@ -0,0 +1,337 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+WANT_AUTOMAKE="none"
+WANT_LIBTOOL="none"
+
+inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
+
+MY_P="Python-${PV}"
+PATCHSET_VERSION="${PV}-0"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="http://www.python.org/"
+SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz
+	mirror://gentoo/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
+
+LICENSE="PSF-2"
+SLOT="3.3/3.3m"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+PYVER=${SLOT%/*}
+
+RDEPEND="app-arch/bzip2:0=
+	app-arch/xz-utils:0=
+	>=sys-libs/zlib-1.1.3:0=
+	virtual/libffi
+	virtual/libintl
+	!build? (
+		gdbm? ( sys-libs/gdbm:0=[berkdb] )
+		ncurses? (
+			>=sys-libs/ncurses-5.2:0=
+			readline? ( >=sys-libs/readline-4.1:0= )
+		)
+		sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+		tk? (
+			>=dev-lang/tcl-8.0:0=
+			>=dev-lang/tk-8.0:0=
+			dev-tcltk/blt:0=
+			dev-tcltk/tix
+		)
+		xml? ( >=dev-libs/expat-2.1:0= )
+	)
+	!!<sys-apps/sandbox-2.6-r1"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/autoconf-2.65
+	!sys-devel/gcc[libffi]"
+RDEPEND+=" !build? ( app-misc/mime-types )
+	doc? ( dev-python/python-docs:${PYVER} )"
+PDEPEND="app-eselect/eselect-python
+	app-admin/python-updater"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat
+	rm -fr Modules/_ctypes/libffi*
+	rm -fr Modules/zlib
+
+	if tc-is-cross-compiler; then
+		# Invokes BUILDPYTHON, which is built for the host arch
+		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
+	fi
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	epatch "${FILESDIR}/${PN}-3.3.5-ncurses-pkg-config.patch"
+	epatch "${FILESDIR}/${PN}-3.4-gcc-5.patch" #547626
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		Lib/distutils/command/install.py \
+		Lib/distutils/sysconfig.py \
+		Lib/site.py \
+		Lib/sysconfig.py \
+		Lib/test/test_site.py \
+		Makefile.pre.in \
+		Modules/Setup.dist \
+		Modules/getpath.c \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	# bug #514686
+	epatch "${FILESDIR}/${PN}-3.3-CVE-2014-4616.patch"
+
+	epatch "${FILESDIR}"/${PN}-3.3-libressl.patch
+
+	epatch_user
+
+	eautoconf
+	eautoheader
+}
+
+src_configure() {
+	if use build; then
+		# Disable extraneous modules with extra dependencies.
+		export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
+		export PYTHON_DISABLE_SSL="1"
+	else
+		local disable
+		use gdbm     || disable+=" gdbm"
+		use ncurses  || disable+=" _curses _curses_panel"
+		use readline || disable+=" readline"
+		use sqlite   || disable+=" _sqlite3"
+		use ssl      || export PYTHON_DISABLE_SSL="1"
+		use tk       || disable+=" _tkinter"
+		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+		export PYTHON_DISABLE_MODULES="${disable}"
+
+		if ! use xml; then
+			ewarn "You have configured Python without XML support."
+			ewarn "This is NOT a recommended configuration as you"
+			ewarn "may face problems parsing any XML documents."
+		fi
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+	# The configure script fails to use pkg-config correctly.
+	# http://bugs.python.org/issue15506
+	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
+
+	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
+	# Needed on FreeBSD unless Python 3.2 is already installed.
+	# Please query BSD team before removing this!
+	append-ldflags "-L."
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	BUILD_DIR="${WORKDIR}/${CHOST}"
+	mkdir -p "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+
+	ECONF_SOURCE="${S}" OPT="" \
+	econf \
+		--with-fpectl \
+		--enable-shared \
+		$(use_enable ipv6) \
+		$(use_with threads) \
+		--infodir='${prefix}/share/info' \
+		--mandir='${prefix}/share/man' \
+		--with-computed-gotos \
+		--with-dbmliborder="${dbmliborder}" \
+		--with-libc="" \
+		--enable-loadable-sqlite-extensions \
+		--with-system-expat \
+		--with-system-ffi
+
+	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+src_compile() {
+	# Avoid invoking pgen for cross-compiles.
+	touch Include/graminit.h Python/graminit.c || die
+
+	cd "${BUILD_DIR}" || die
+	emake CPPFLAGS="" CFLAGS="" LDFLAGS=""
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	cd "${BUILD_DIR}" || die
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	PYTHONDONTWRITEBYTECODE="" emake test EXTRATESTOPTS="-u -network" FLAGS="" CFLAGS="" LDFLAGS="" < /dev/tty
+	local result="$?"
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${PYVER}/test'"
+	elog "and run the tests separately."
+
+	if [[ "${result}" -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/$(get_libdir)/python${PYVER}
+
+	cd "${BUILD_DIR}" || die
+
+	emake DESTDIR="${D}" altinstall
+
+	sed \
+		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+		-e "s/\(PY_LDFLAGS=\).*/\1/" \
+		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+	# Fix collisions between different slots of Python.
+	rm -f "${ED}usr/$(get_libdir)/libpython3.so"
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}usr/include"; echo python*)
+	# Replace python3.X with a symlink if appropriate
+	if [[ ${abiver} != python${PYVER} ]]; then
+		rm "${ED}usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+	fi
+
+	if use build; then
+		rm -fr "${ED}usr/bin/idle${PYVER}" "${libdir}/"{idlelib,sqlite3,test,tkinter}
+	else
+		use elibc_uclibc && rm -fr "${libdir}/test"
+		use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
+		use tk || rm -fr "${ED}usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*}
+	fi
+
+	use threads || rm -fr "${libdir}/multiprocessing"
+	use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
+
+	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
+		doins -r "${S}"/Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# for python-exec
+	python_export python${PYVER} EPYTHON PYTHON
+	export PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${PYVER}/site-packages"
+
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+	fi
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py
+	python_domodule epython.py
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
+		python_updater_warning="1"
+	fi
+}
+
+eselect_python_update() {
+	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
+		eselect python update
+	fi
+
+	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
+		eselect python update --python${PV%%.*}
+	fi
+}
+
+pkg_postinst() {
+	eselect_python_update
+
+	if [[ "${python_updater_warning}" == "1" ]]; then
+		ewarn "You have just upgraded from an older version of Python."
+		ewarn
+		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
+		ewarn
+		ewarn "For legacy packages, you should switch active version of Python and run 'python-updater [options]' to rebuild Python modules."
+	fi
+}
+
+pkg_postrm() {
+	eselect_python_update
+}

dev-lang/python/python-3.4.3-r2.ebuild

@@ -267,7 +267,8 @@ src_install() {
 		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
 
 	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+	python_export python${SLOT} EPYTHON PYTHON
+	export PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${SLOT}/site-packages"
 
 	# if not using a cross-compiler, use the fresh binary
 	if ! tc-is-cross-compiler; then

dev-lang/python/python-3.4.3-r3.ebuild

@@ -0,0 +1,318 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+WANT_LIBTOOL="none"
+
+inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
+
+MY_P="Python-${PV/_/}"
+PATCHSET_VERSION="3.4.3-0"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="http://www.python.org/"
+SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
+
+LICENSE="PSF-2"
+SLOT="3.4/3.4m"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:0=
+	app-arch/xz-utils:0=
+	>=sys-libs/zlib-1.1.3:0=
+	virtual/libffi
+	virtual/libintl
+	gdbm? ( sys-libs/gdbm:0=[berkdb] )
+	ncurses? (
+		>=sys-libs/ncurses-5.2:0=
+		readline? ( >=sys-libs/readline-4.1:0= )
+	)
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	tk? (
+		>=dev-lang/tcl-8.0:0=
+		>=dev-lang/tk-8.0:0=
+		dev-tcltk/blt:0=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:0= )
+	!!<sys-apps/sandbox-2.6-r1"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/autoconf-2.65
+	!sys-devel/gcc[libffi]"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+PDEPEND="app-eselect/eselect-python
+	app-admin/python-updater"
+
+S="${WORKDIR}/${MY_P}"
+
+PYVER=${SLOT%/*}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat
+	rm -fr Modules/_ctypes/libffi*
+	rm -fr Modules/zlib
+
+	if tc-is-cross-compiler; then
+		# Invokes BUILDPYTHON, which is built for the host arch
+		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
+	fi
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	epatch "${FILESDIR}/${PN}-3.4.3-ncurses-pkg-config.patch"
+	epatch "${FILESDIR}/${PN}-3.4-gcc-5.patch" #547626
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		Lib/distutils/command/install.py \
+		Lib/distutils/sysconfig.py \
+		Lib/site.py \
+		Lib/sysconfig.py \
+		Lib/test/test_site.py \
+		Makefile.pre.in \
+		Modules/Setup.dist \
+		Modules/getpath.c \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local disable
+	use gdbm     || disable+=" gdbm"
+	use ncurses  || disable+=" _curses _curses_panel"
+	use readline || disable+=" readline"
+	use sqlite   || disable+=" _sqlite3"
+	use ssl      || export PYTHON_DISABLE_SSL="1"
+	use tk       || disable+=" _tkinter"
+	use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	# The configure script fails to use pkg-config correctly.
+	# http://bugs.python.org/issue15506
+	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
+
+	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
+	# Needed on FreeBSD unless Python 3.2 is already installed.
+	# Please query BSD team before removing this!
+	append-ldflags "-L."
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	BUILD_DIR="${WORKDIR}/${CHOST}"
+	mkdir -p "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+
+	ECONF_SOURCE="${S}" OPT="" \
+	econf \
+		--with-fpectl \
+		--enable-shared \
+		$(use_enable ipv6) \
+		$(use_with threads) \
+		--infodir='${prefix}/share/info' \
+		--mandir='${prefix}/share/man' \
+		--with-computed-gotos \
+		--with-dbmliborder="${dbmliborder}" \
+		--with-libc="" \
+		--enable-loadable-sqlite-extensions \
+		--with-system-expat \
+		--with-system-ffi \
+		--without-ensurepip
+
+	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+src_compile() {
+	# Avoid invoking pgen for cross-compiles.
+	touch Include/graminit.h Python/graminit.c || die
+
+	cd "${BUILD_DIR}" || die
+
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	cd "${BUILD_DIR}" || die
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	local -x PYTHONDONTWRITEBYTECODE=
+	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local result=$?
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${PYVER}/test'"
+	elog "and run the tests separately."
+
+	if [[ ${result} -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/$(get_libdir)/python${PYVER}
+
+	cd "${BUILD_DIR}" || die
+
+	emake DESTDIR="${D}" altinstall
+
+	sed \
+		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+		-e "s/\(PY_LDFLAGS=\).*/\1/" \
+		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+	# Fix collisions between different slots of Python.
+	rm -f "${ED}usr/$(get_libdir)/libpython3.so"
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}usr/include"; echo python*)
+	# Replace python3.X with a symlink if appropriate
+	if [[ ${abiver} != python${PYVER} ]]; then
+		rm "${ED}usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+	fi
+
+	use elibc_uclibc && rm -fr "${libdir}/test"
+	use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
+	use tk || rm -fr "${ED}usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*}
+
+	use threads || rm -fr "${libdir}/multiprocessing"
+	use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
+
+	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
+		doins -r "${S}"/Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# for python-exec
+	python_export python${PYVER} EPYTHON PYTHON PYTHON_SITEDIR
+	export PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${PYVER}/site-packages"
+
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+	fi
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py
+	python_domodule epython.py
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
+		python_updater_warning="1"
+	fi
+}
+
+eselect_python_update() {
+	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
+		eselect python update
+	fi
+
+	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
+		eselect python update --python${PV%%.*}
+	fi
+}
+
+pkg_postinst() {
+	eselect_python_update
+
+	if [[ "${python_updater_warning}" == "1" ]]; then
+		ewarn "You have just upgraded from an older version of Python."
+		ewarn
+		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
+	fi
+}
+
+pkg_postrm() {
+	eselect_python_update
+}

dev-lang/python/python-3.4.3.ebuild

@@ -275,7 +275,8 @@ src_install() {
 		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
 
 	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+	python_export python${SLOT} EPYTHON PYTHON
+	export PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${SLOT}/site-packages"
 
 	# if not using a cross-compiler, use the fresh binary
 	if ! tc-is-cross-compiler; then

dev-lang/python/python-3.5.0-r1.ebuild

@@ -273,7 +273,8 @@ src_install() {
 		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
 
 	# for python-exec
-	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+	python_export python${SLOT} EPYTHON PYTHON
+	export PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${SLOT}/site-packages"
 
 	# if not using a cross-compiler, use the fresh binary
 	if ! tc-is-cross-compiler; then

dev-lang/python/python-3.5.0-r2.ebuild

@@ -0,0 +1,321 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+WANT_LIBTOOL="none"
+
+inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs
+
+MY_P="Python-${PV/_/}"
+PATCHSET_VERSION="3.5.0-0"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="http://www.python.org/"
+SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
+
+LICENSE="PSF-2"
+SLOT="3.5/3.5m"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:0=
+	app-arch/xz-utils:0=
+	>=sys-libs/zlib-1.1.3:0=
+	virtual/libffi
+	virtual/libintl
+	gdbm? ( sys-libs/gdbm:0=[berkdb] )
+	ncurses? (
+		>=sys-libs/ncurses-5.2:0=
+		readline? ( >=sys-libs/readline-4.1:0= )
+	)
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	tk? (
+		>=dev-lang/tcl-8.0:0=
+		>=dev-lang/tk-8.0:0=
+		dev-tcltk/blt:0=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:0= )
+	!!<sys-apps/sandbox-2.6-r1"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	!sys-devel/gcc[libffi(-)]"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+PDEPEND="app-eselect/eselect-python"
+
+S="${WORKDIR}/${MY_P}"
+
+PYVER=${SLOT%/*}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat
+	rm -fr Modules/_ctypes/libffi*
+	rm -fr Modules/zlib
+
+	if tc-is-cross-compiler; then
+		# Invokes BUILDPYTHON, which is built for the host arch
+		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
+	fi
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	epatch "${FILESDIR}/${PN}-3.4.3-ncurses-pkg-config.patch"
+	epatch "${FILESDIR}/3.5-secondary-targets.patch"
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		configure.ac \
+		Lib/distutils/command/install.py \
+		Lib/distutils/sysconfig.py \
+		Lib/site.py \
+		Lib/sysconfig.py \
+		Lib/test/test_site.py \
+		Makefile.pre.in \
+		Modules/getpath.c \
+		Modules/Setup.dist \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	#sed -i -e 's/\$(GRAMMAR_H): \$(GRAMMAR_INPUT) \$(PGEN)/$(GRAMMAR_H): \$(GRAMMAR_INPUT)/' Makefile.pre.in || die
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local disable
+	use gdbm     || disable+=" gdbm"
+	use ncurses  || disable+=" _curses _curses_panel"
+	use readline || disable+=" readline"
+	use sqlite   || disable+=" _sqlite3"
+	use ssl      || export PYTHON_DISABLE_SSL="1"
+	use tk       || disable+=" _tkinter"
+	use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	# The configure script fails to use pkg-config correctly.
+	# http://bugs.python.org/issue15506
+	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
+
+	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
+	# Needed on FreeBSD unless Python 3.2 is already installed.
+	# Please query BSD team before removing this!
+	append-ldflags "-L."
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	BUILD_DIR="${WORKDIR}/${CHOST}"
+	mkdir -p "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+
+	local myeconfargs=(
+		--with-fpectl
+		--enable-shared
+		$(use_enable ipv6)
+		$(use_with threads)
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+	)
+
+	ECONF_SOURCE="${S}" OPT="" econf "${myeconfargs[@]}"
+
+	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+src_compile() {
+	# Avoid regenerating these for cross-compiles
+	touch Include/graminit.h Python/graminit.c Python/importlib.h Python/importlib_external.h || die
+
+	cd "${BUILD_DIR}" || die
+
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	cd "${BUILD_DIR}" || die
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	local -x PYTHONDONTWRITEBYTECODE=
+	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local result=$?
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${PYVER}/test'"
+	elog "and run the tests separately."
+
+	if [[ ${result} -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/$(get_libdir)/python${PYVER}
+
+	cd "${BUILD_DIR}" || die
+
+	emake DESTDIR="${D}" altinstall
+
+	sed \
+		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+		-e "s/\(PY_LDFLAGS=\).*/\1/" \
+		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+	# Fix collisions between different slots of Python.
+	rm -f "${ED}usr/$(get_libdir)/libpython3.so"
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}usr/include"; echo python*)
+	# Replace python3.X with a symlink if appropriate
+	if [[ ${abiver} != python${PYVER} ]]; then
+		rm "${ED}usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+	fi
+
+	use elibc_uclibc && rm -fr "${libdir}/test"
+	use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
+	use tk || rm -fr "${ED}usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*}
+
+	use threads || rm -fr "${libdir}/multiprocessing"
+	use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
+
+	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
+		doins -r "${S}"/Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# for python-exec
+	python_export python${PYVER} EPYTHON PYTHON
+	export PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${PYVER}/site-packages"
+
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+	fi
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py
+	python_domodule epython.py
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
+		python_updater_warning="1"
+	fi
+}
+
+eselect_python_update() {
+	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
+		eselect python update
+	fi
+
+	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
+		eselect python update --python${PV%%.*}
+	fi
+}
+
+pkg_postinst() {
+	eselect_python_update
+
+	if [[ "${python_updater_warning}" == "1" ]]; then
+		ewarn "You have just upgraded from an older version of Python."
+		ewarn
+		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
+	fi
+}
+
+pkg_postrm() {
+	eselect_python_update
+}

dev-lang/ruby/ruby-2.0.0_p647-r1.ebuild

@@ -33,7 +33,7 @@ SRC_URI="mirror://ruby/2.0/${MY_P}.tar.xz
 		 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline cpu_flags_x86_sse2"
 
 RDEPEND="

dev-lang/ruby/ruby-2.1.7.ebuild

@@ -34,7 +34,7 @@ SRC_URI="mirror://ruby/2.1/${MY_P}.tar.xz
 		 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline"
 
 RDEPEND="

dev-lang/swi-prolog/swi-prolog-7.2.3-r1.ebuild

@@ -15,7 +15,7 @@ SRC_URI="http://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="archive debug doc +gmp hardened java libressl minimal odbc +readline ssl static-libs test uuid zlib X"
 
 RDEPEND="sys-libs/ncurses:=

dev-libs/STLport/STLport-5.2.1-r3.ebuild

@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/stlport/${P}.tar.bz2
 
 LICENSE="boehm-gc HPND"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="boost debug static static-libs threads"
 
 DEPEND="boost? ( dev-libs/boost:= )"

dev-libs/boost/boost-1.57.0.ebuild

@@ -75,10 +75,19 @@ create_user-config.jam() {
 	fi
 
 	if python_bindings_needed; then
+		# boost expects libpython$(pyver) and doesn't allow overrides
+		# and the build system is so creepy that it's easier just to
+		# provide a symlink (linker's going to use SONAME anyway)
+		# TODO: replace it with proper override one day
+		ln -f -s "$(python_get_library_path)" "${T}/lib${EPYTHON}$(get_libname)" || die
+
 		if tc-is-cross-compiler; then
 			python_configuration="using python : ${EPYTHON#python} : : ${SYSROOT:-${EROOT}}/usr/include/${EPYTHON} : ${SYSROOT:-${EROOT}}/usr/$(get_libdir) ;"
 		else
-			python_configuration="using python : : ${PYTHON} ;"
+			# note: we need to provide version explicitly because of
+			# a bug in the build system:
+			# https://github.com/boostorg/build/pull/104
+			python_configuration="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) : ${T} ;"
 		fi
 	fi
 

dev-libs/boost/boost-1.58.0-r1.ebuild

@@ -74,10 +74,19 @@ create_user-config.jam() {
 	fi
 
 	if python_bindings_needed; then
+		# boost expects libpython$(pyver) and doesn't allow overrides
+		# and the build system is so creepy that it's easier just to
+		# provide a symlink (linker's going to use SONAME anyway)
+		# TODO: replace it with proper override one day
+		ln -f -s "$(python_get_library_path)" "${T}/lib${EPYTHON}$(get_libname)" || die
+
 		if tc-is-cross-compiler; then
 			python_configuration="using python : ${EPYTHON#python} : : ${SYSROOT:-${EROOT}}/usr/include/${EPYTHON} : ${SYSROOT:-${EROOT}}/usr/$(get_libdir) ;"
 		else
-			python_configuration="using python : : ${PYTHON} ;"
+			# note: we need to provide version explicitly because of
+			# a bug in the build system:
+			# https://github.com/boostorg/build/pull/104
+			python_configuration="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) : ${T} ;"
 		fi
 	fi
 

dev-libs/gjs/gjs-1.44.0.ebuild

@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk test"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.36:2

dev-libs/glib/glib-2.44.1-r1.ebuild

@@ -32,7 +32,7 @@ REQUIRED_USE="
 	test? ( ${PYTHON_REQUIRED_USE} )
 "
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 RDEPEND="
 	!<dev-util/gdbus-codegen-${PV}

dev-libs/libcroco/libcroco-0.6.9.ebuild

@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/libcroco/"
 
 LICENSE="LGPL-2"
 SLOT="0.6"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="

dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild

@@ -12,14 +12,14 @@ inherit multibuild multilib virtualx ${BZR_ECLASS} cmake-multilib
 DESCRIPTION="A library providing Qt implementation of DBusMenu specification"
 HOMEPAGE="https://launchpad.net/libdbusmenu-qt/"
 if [[ ${PV} == 9999* ]] ; then
-	KEYWORDS="ppc64"
+	KEYWORDS="ppc64 x86"
 else
 	MY_PV=${PV/_pre/+14.10.}
 	SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${MY_PV}.orig.tar.gz"
 	# upstream has no permissions to use some kde written code so repack git
 	# repo every time
 	#SRC_URI="https://dev.gentoo.org/~scarabeus/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	PATCHES=( "${FILESDIR}/${P}-optionaltests.patch" )
 fi
 

dev-libs/libgdata/libgdata-0.17.3.ebuild

@@ -16,7 +16,7 @@ SLOT="0/22" # subslot = libgdata soname version
 IUSE="gnome +introspection static-libs test vala"
 REQUIRED_IUSE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # gtk+ is needed for gdk
 # configure checks for gtk:3, but only uses it for demos which are not installed

dev-libs/libgusb/libgusb-0.2.7.ebuild

@@ -14,7 +14,7 @@ SRC_URI="http://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 IUSE="+introspection static-libs vala"
 REQUIRED_USE="vala? ( introspection )"

dev-libs/libpeas/libpeas-1.12.1-r1.ebuild

@@ -55,7 +55,7 @@ src_configure() {
 			"--enable-python${v}"
 			# it is just 'PYTHON' for py3 in the build system
 			"PYTHON${v#3}=${PYTHON}"
-			"PYTHON${v}_CONFIG=${PYTHON}-config"
+			"PYTHON${v}_CONFIG=$(python_get_PYTHON_CONFIG)"
 		)
 	}
 	use python && python_foreach_impl python_configure

dev-libs/libpeas/libpeas-1.14.0-r1.ebuild

@@ -77,7 +77,7 @@ src_configure() {
 			"--enable-python${v}"
 			# it is just 'PYTHON' for py3 in the build system
 			"PYTHON${v#3}=${PYTHON}"
-			"PYTHON${v}_CONFIG=${PYTHON}-config"
+			"PYTHON${v}_CONFIG=$(python_get_PYTHON_CONFIG)"
 		)
 	}
 	use python && python_foreach_impl python_configure

dev-libs/libpeas/libpeas-1.14.0.ebuild

@@ -65,7 +65,7 @@ src_configure() {
 			"--enable-python${v}"
 			# it is just 'PYTHON' for py3 in the build system
 			"PYTHON${v#3}=${PYTHON}"
-			"PYTHON${v}_CONFIG=${PYTHON}-config"
+			"PYTHON${v}_CONFIG=$(python_get_PYTHON_CONFIG)"
 		)
 	}
 	use python && python_foreach_impl python_configure

dev-libs/libxml2/libxml2-2.9.2-r4.ebuild

@@ -14,7 +14,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug examples icu ipv6 lzma python readline static-libs test"
 
 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"

dev-libs/libxslt/files/libxslt-1.1.28-attribute-type-preprocessing.patch

@@ -0,0 +1,29 @@
+From 7ca19df892ca22d9314e95d59ce2abdeff46b617 Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Thu, 29 Oct 2015 19:33:23 +0800
+Subject: Fix for type confusion in preprocessing attributes
+
+CVE-2015-7995 http://www.openwall.com/lists/oss-security/2015/10/27/10
+We need to check that the parent node is an element before dereferencing
+its namespace
+---
+ libxslt/preproc.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libxslt/preproc.c b/libxslt/preproc.c
+index 0eb80a0..7f69325 100644
+--- a/libxslt/preproc.c
++++ b/libxslt/preproc.c
+@@ -2249,7 +2249,8 @@ xsltStylePreCompute(xsltStylesheetPtr style, xmlNodePtr inst) {
+ 	} else if (IS_XSLT_NAME(inst, "attribute")) {
+ 	    xmlNodePtr parent = inst->parent;
+ 
+-	    if ((parent == NULL) || (parent->ns == NULL) ||
++	    if ((parent == NULL) ||
++	        (parent->type != XML_ELEMENT_NODE) || (parent->ns == NULL) ||
+ 		((parent->ns != inst->ns) &&
+ 		 (!xmlStrEqual(parent->ns->href, inst->ns->href))) ||
+ 		(!xmlStrEqual(parent->name, BAD_CAST "attribute-set"))) {
+-- 
+cgit v0.11.2
+

dev-libs/libxslt/files/libxslt-1.1.28-broken-fprintf-parameters.patch

@@ -0,0 +1,52 @@
+From 90e8b9066d877e040e791bbf206db0e5653e017a Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Wed, 30 Jan 2013 17:31:37 +0100
+Subject: Fix a couple of places where (f)printf parameters were broken
+
+As reported by Thomas Jarosch <thomas.jarosch@intra2net.com>
+---
+ python/libxslt.c    | 10 +++++-----
+ xsltproc/xsltproc.c |  2 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/python/libxslt.c b/python/libxslt.c
+index 6a4f1c3..8dd6c78 100644
+--- a/python/libxslt.c
++++ b/python/libxslt.c
+@@ -356,15 +356,15 @@ libxslt_xsltRegisterExtModuleElement(PyObject *self ATTRIBUTE_UNUSED,
+     PyObject *pyobj_element_f;
+     PyObject *pyobj_precomp_f;
+ 
+-#ifdef DEBUG_EXTENSIONS
+-    printf("libxslt_xsltRegisterExtModuleElement called\n",
+-	   name, ns_uri);
+-#endif
+-
+     if (!PyArg_ParseTuple(args, (char *)"szOO:registerExtModuleElement",
+ 		          &name, &ns_uri, &pyobj_precomp_f, &pyobj_element_f))
+         return(NULL);
+ 
++#ifdef DEBUG_EXTENSIONS
++    printf("libxslt_xsltRegisterExtModuleElement called: %s %s\n",
++	   name, ns_uri);
++#endif
++
+     if ((name == NULL) || (pyobj_element_f == NULL) || (pyobj_precomp_f == NULL)) {
+ 	py_retval = libxml_intWrap(-1);
+ 	return(py_retval);
+diff --git a/xsltproc/xsltproc.c b/xsltproc/xsltproc.c
+index 35f37e8..dfd6d31 100644
+--- a/xsltproc/xsltproc.c
++++ b/xsltproc/xsltproc.c
+@@ -319,7 +319,7 @@ static void endTimer(char *format, ...)
+     va_start(ap, format);
+     vfprintf(stderr,format,ap);
+     va_end(ap);
+-    fprintf(stderr, " was not timed\n", msec);
++    fprintf(stderr, " was not timed\n");
+ #else
+   /* We don't have gettimeofday, time or stdarg.h, what crazy world is
+    * this ?!
+-- 
+cgit v0.11.2
+

dev-libs/libxslt/files/libxslt-1.1.28-disable-static-modules.patch

@@ -0,0 +1,33 @@
+From 06c9dba42097b06a18c81bb54a8da8b2bfaf991d Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Wed, 11 Nov 2015 20:01:14 +0100
+Subject: [PATCH 3/3] Disable static module for python module
+
+---
+ python/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/python/Makefile.am b/python/Makefile.am
+index cc13c62..62afd1b 100644
+--- a/python/Makefile.am
++++ b/python/Makefile.am
+@@ -27,6 +27,7 @@ python_PYTHON = libxslt.py
+ pyexec_LTLIBRARIES = libxsltmod.la
+ 
+ libxsltmod_la_CPPFLAGS = \
++	-shared \
+ 	-I$(top_srcdir)/libxslt \
+ 	-I$(top_srcdir) \
+ 	-I$(top_srcdir)/libexslt \
+@@ -34,7 +35,7 @@ libxsltmod_la_CPPFLAGS = \
+ libxsltmod_la_SOURCES = libxslt.c types.c
+ nodist_libxsltmod_la_SOURCES = libxslt-py.c
+ libxsltmod_la_LIBADD = $(mylibs) $(PYTHON_LIBS)
+-libxsltmod_la_LDFLAGS =  $(WIN32_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -avoid-version
++libxsltmod_la_LDFLAGS =  $(WIN32_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -avoid-version -shared
+ 
+ libxslt.py: $(srcdir)/libxsl.py libxsltclass.py
+ 	cat $(srcdir)/libxsl.py libxsltclass.py > $@
+-- 
+2.6.3
+