Sync with portage [Mon Sep 7 10:38:59 MSK 2015].

2015-09-07 10:39:00 +03:00 · 2015-09-07 10:39:00 +03:00 · 0b02c43a18
commit 0b02c43a18
parent 45bd469601
1819 changed files with 13163 additions and 4233 deletions
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@ -1 +1,2 @@
 DIST ansible-1.9.2.tar.gz 927525 SHA256 c25ef4738b08fdfb3094247c012f3fd1b29972acbd37f988070b2a85f5fbee00 SHA512 6c0b3eaac11e11bf90f5b63c54da86df0cb33b0ee98c987c48a68fa643b39e9f0817884767f2bd9c0f6e8852d37fd1b197d5299abc574fccc181fbb22985d4ad WHIRLPOOL 19d50845b9920d85c5ce0380303144e7a4237e673dd4beb5ff020042d7bac59dc0706cff88f08155029ce1a3aa9decc3c54261f9f16524b6e5e3b42e599d3a6b
+DIST ansible-1.9.3.tar.gz 936633 SHA256 2594f642fd800056a427c1026410dc6ed8dfa7c0033f5c3d187abdb2b0d4eeed SHA512 280d7506417affc11fe8c8715f82ffb011991e48e96db73aca915e1393d51073564c78a98b018c380b7fb8e697ce0fac6208822da44f2bac545f142707325d43 WHIRLPOOL 5738bcd263ca32279bbca30e3f1b5c53e5bd72a18025fdb82393a8d85e5a826b3be4ce78cbbc648133768d212fa49d1c3320af4b34f948c1b1cee40d73147f8a
--- a/app-admin/ansible/ansible-1.9.3.ebuild
+++ b/app-admin/ansible/ansible-1.9.3.ebuild
@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils readme.gentoo
+
+DESCRIPTION="Radically simple deployment, model-driven configuration management, and command execution framework"
+HOMEPAGE="http://ansible.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="test"
+
+RDEPEND="
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/keyczar[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	EXAMPLES=( examples )
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+
+	newenvd "${FILESDIR}"/${PN}.env 95ansible
+}
+
+src_install() {
+	distutils-r1_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	optfeature "Alternative ssh transport" dev-python/paramiko
+}
--- a/app-admin/apache-tools/apache-tools-2.2.31.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.2.31.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="ssl"
 RESTRICT="test"

--- a/app-admin/cgmanager/cgmanager-0.39.ebuild
+++ b/app-admin/cgmanager/cgmanager-0.39.ebuild
@ -13,11 +13,11 @@ SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="pam"
+IUSE="pam selinux"

-RDEPEND="
-	sys-libs/libnih[dbus]
-	sys-apps/dbus"
+RDEPEND="sys-libs/libnih[dbus]
+	sys-apps/dbus
+	selinux? ( sec-policy/selinux-cgmanager )"
 DEPEND="${RDEPEND}"

 src_prepare() {
--- a/app-admin/denyhosts/denyhosts-2.9.ebuild
+++ b/app-admin/denyhosts/denyhosts-2.9.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ppc ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ppc ~sparc x86"
 IUSE=""

 DEPEND=""
--- a/app-admin/logrotate/logrotate-3.9.1.ebuild
+++ b/app-admin/logrotate/logrotate-3.9.1.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://fedorahosted.org/releases/l/o/logrotate/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acl +cron selinux"

 CDEPEND="
--- a/app-admin/syslog-ng/syslog-ng-3.6.4.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.6.4.ebuild
@ -13,7 +13,7 @@ SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${MY_PV}/sourc

 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="amqp caps dbi geoip ipv6 json mongodb pacct redis smtp spoof-source ssl systemd tcpd"
 RESTRICT="test"

--- a/app-arch/gcab/gcab-0.6.ebuild
+++ b/app-arch/gcab/gcab-0.6.ebuild
@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/msitools"

 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"

--- a/app-arch/star/star-1.5.3.ebuild
+++ b/app-arch/star/star-1.5.3.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/s-tar/${P}.tar.bz2"

 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="acl xattr"

 DEPEND="
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@ -1,7 +1,4 @@
-DIST unrarsrc-5.0.14.tar.gz 209707 SHA256 e276ea30a2dc9b8961a4268772e5b6caccaa984664e2d5255a43fcb0f5d59806 SHA512 91b05bd2974e0a1cb8bd8f01ee90637c9c48da71a4ffa74e161de969f17bedbcda0cfbac128d366ffa5065e8195004fe82763a2a1e8628f0016621b1c2d364f2 WHIRLPOOL 665833a5cac5cfddaa6bf852b6820e8447604019286f7f81dce910ad49b8eccf5a4ceab2c1177837e71492ba0c37d2d288b78eb0a531fd47d34cdd8256fd7f19
 DIST unrarsrc-5.1.6.tar.gz 215185 SHA256 3c38eaabc655527244fd0c3ba3beff567ea24aad37d448488643242fd4cf41a5 SHA512 a7a7800ac94850320ce3e2dd24c5005694dd59360b7f3fc7886ef241153e471459b0b9397d1dacbc3adcd19044cdcb8a8a847e16d7b224af149a1455f46fcaa0 WHIRLPOOL bcb9d1b60f42357cb236cbb5e86eb19dd4ed623244036fc1e8fc3759eef3d4002e6ffc90d3cf5b5200e81fe018a2215c0238ee2aac7148e51f130e43ad3e5ea0
-DIST unrarsrc-5.2.1.tar.gz 217272 SHA256 a075a8943412abb2ff5600038330a3d5a8f5a39cbe8e92543cc2c45b6247d05d SHA512 bd89acbed0377f48c88e5b9f6c3701dff1d0a5a65e74e9668690daf0ce0188c74914ed7edb093c0139b0507cf0785790fd8505be7d54204d16bcfced64b4dc29 WHIRLPOOL 6e21e981663eaa14e5d94553cb8fb93db601fe1058f73fc32d3f9a30f399210e71c657d342495d1be18b0e011a5677084242e01b5dff8aa476379bcbae1f7857
-DIST unrarsrc-5.2.2.tar.gz 217481 SHA256 4c134a739467dd0a18bd8aaa48f32750335c842d8a27e11b955ccc33a73ac834 SHA512 ae1d9c3009b9e632bffff54553c0ccc347e59a77236b0a76d9fe603285e17229ce295e718ca6e7658fb050a3145a03dcb2daa6e704cd459d2b7a6eb1a101daa3 WHIRLPOOL 6e3e98be8df13729b89a0c64e775c148ac560c31bb2ff8d61c7ba3ba75421da698e702336604944787eee5e3edc774ee09df62395610c4af0f6262f5870134be
-DIST unrarsrc-5.2.3.tar.gz 217841 SHA256 d249d34541dba39234cdf661ccec80e44334efe50c3ca1d7c51186cd5d26e072 SHA512 94ff765c2aa4ede7d5f2f35c3c35c634b7691559ac9bc978a4f760e22e005422a3a0d36ab09e4c492cea456161cc13dbf256eb2ead23a7976e79bf3cc89903ed WHIRLPOOL dbb7408444078a0ad507fba2d2a483c91a9519193635b25a04c076b92c27c7af9e53481cd89927ca040e03422b5a36e1192f906043706bf9ad2a80f867c27b0f
 DIST unrarsrc-5.2.7.tar.gz 218880 SHA256 ef14757e943787b439fedf2c564c1f38d0db315528a928e0de170860717e2fac SHA512 95e06451e2bec46a12e5b9b1423c3ea31ce86859f8086812d9c442aaa69627f72635a6a8c197b30dbc7e99bbf7c7caaa25d703caecbe03c697cc0e5b7644d638 WHIRLPOOL 49f5492a7441192d96616f892012ca2dac8a94063e806ece3c62bf13d29beb9d2d0368a186c0f0bff8814c9e6af542ba6b447a61683295f560f120ff75507379
 DIST unrarsrc-5.3.2.tar.gz 221786 SHA256 2d8712eed32367b1a404633f230f94f545c1f2ce0552f851266b00c261a786ea SHA512 ea3ee5dd3c15a52f577896bca0d5136c9a6e76a5552d6f56be519eb59c2cc137aba0dafe53dfb50c768e8e7f2e1c1c067a3e4d0c67383da3ae1da58ed68fe99b WHIRLPOOL 07454ef4e00ad8982cd4658aa35a120d8318b3bc7979360abdb7973855e1d6e78cd28473cf4127aa7673b26c27c7e379e483017f0f29b49b6c65d08271326d05
+DIST unrarsrc-5.3.3.tar.gz 221930 SHA256 099c67a2fdb76e55386e4496d28cf6fd1ffd9ac394b95c46b73926c5f69bd107 SHA512 5dffa77043992b72dab10752c547c30d2ff884a18c8b19ddbbcd711e4a9f7f82020edfeb560bd10122c18296aaf08d27c7c1db4f6b62e3ec2a4cd0c449ec7d52 WHIRLPOOL 8be0c41a1ac81d9e9a16ce6b7cbc3479929ec65df8040a58a91c0c89d9b02a8ccde584e829e6ceea6ffa645939d68998f46627ba7df54942f76595cea8f26aaf
--- a/app-arch/unrar/unrar-5.0.14.ebuild
+++ b/app-arch/unrar/unrar-5.0.14.ebuild
@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_PN=${PN}src
-
-DESCRIPTION="Uncompress rar files"
-HOMEPAGE="http://www.rarlab.com/rar_add.htm"
-SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="unRAR"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
-
-S=${WORKDIR}/unrar
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.0.2-build.patch
-	sed -i \
-		-e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" \
-		-e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" \
-		makefile || die
-}
-
-src_compile() {
-	unrar_make() {
-		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
-	}
-
-	unrar_make CXXFLAGS+=" -fPIC" lib
-	ln -s libunrar$(get_libname ${PV%.*.*}) libunrar$(get_libname)
-	ln -s libunrar$(get_libname ${PV%.*.*}) libunrar$(get_libname ${PV})
-
-	# The stupid code compiles a lot of objects differently if
-	# they're going into a lib (-DRARDLL) or into the main app.
-	# So for now, we can't link the main app against the lib.
-	unrar_make clean
-	unrar_make
-}
-
-src_install() {
-	dobin unrar
-	dodoc readme.txt
-
-	dolib.so libunrar*
-
-	insinto /usr/include/libunrar${PV%.*.*}
-	doins *.hpp
-	dosym libunrar${PV%.*.*} /usr/include/libunrar
-}
--- a/app-arch/unrar/unrar-5.2.1.ebuild
+++ b/app-arch/unrar/unrar-5.2.1.ebuild
@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_PN=${PN}src
-
-DESCRIPTION="Uncompress rar files"
-HOMEPAGE="http://www.rarlab.com/rar_add.htm"
-SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="unRAR"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
-
-S=${WORKDIR}/unrar
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.0.2-build.patch
-	epatch "${FILESDIR}"/${PN}-5.2.2-no-auto-clean.patch #528218
-	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
-	else
-		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
-	fi
-	sed -i "${sed_args[@]}" makefile
-}
-
-src_compile() {
-	unrar_make() {
-		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
-	}
-
-	unrar_make CXXFLAGS+=" -fPIC" lib
-	ln -s libunrar$(get_libname ${PV%.*.*}) libunrar$(get_libname)
-	ln -s libunrar$(get_libname ${PV%.*.*}) libunrar$(get_libname ${PV})
-
-	# The stupid code compiles a lot of objects differently if
-	# they're going into a lib (-DRARDLL) or into the main app.
-	# So for now, we can't link the main app against the lib.
-	unrar_make clean
-	unrar_make
-}
-
-src_install() {
-	dobin unrar
-	dodoc readme.txt
-
-	dolib.so libunrar*
-
-	insinto /usr/include/libunrar${PV%.*.*}
-	doins *.hpp
-	dosym libunrar${PV%.*.*} /usr/include/libunrar
-}
--- a/app-arch/unrar/unrar-5.2.3.ebuild
+++ b/app-arch/unrar/unrar-5.2.3.ebuild
@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_PN=${PN}src
-
-DESCRIPTION="Uncompress rar files"
-HOMEPAGE="http://www.rarlab.com/rar_add.htm"
-SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="unRAR"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
-
-S=${WORKDIR}/unrar
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.0.2-build.patch
-	epatch "${FILESDIR}"/${PN}-5.2.2-no-auto-clean.patch #528218
-	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
-	else
-		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
-	fi
-	sed -i "${sed_args[@]}" makefile
-}
-
-src_configure() {
-	mkdir -p build-{lib,bin}
-	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
-	cp build-{lib,bin}/Makefile || die
-}
-
-src_compile() {
-	unrar_make() {
-		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
-	}
-
-	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
-	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname)
-	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV})
-
-	unrar_make -C build-bin
-}
-
-src_install() {
-	dobin build-bin/unrar
-	dodoc readme.txt
-
-	dolib.so build-lib/libunrar*
-
-	insinto /usr/include/libunrar${PV%.*.*}
-	doins *.hpp
-	dosym libunrar${PV%.*.*} /usr/include/libunrar
-}
--- a/app-arch/unrar/unrar-5.3.3.ebuild
+++ b/app-arch/unrar/unrar-5.3.3.ebuild
@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI="5"
+
 inherit eutils flag-o-matic multilib toolchain-funcs

 MY_PN=${PN}src
@ -29,7 +30,7 @@ src_prepare() {
 	else
 		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
 	fi
-	sed -i "${sed_args[@]}" makefile
+	sed -i "${sed_args[@]}" makefile || die
 }

 src_configure() {
@ -44,8 +45,8 @@ src_compile() {
 	}

 	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
-	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname)
-	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV})
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die

 	unrar_make -C build-bin
 }
--- a/app-backup/bacula/bacula-7.2.0.ebuild
+++ b/app-backup/bacula/bacula-7.2.0.ebuild
@ -143,13 +143,6 @@ src_prepare() {
 	# bug 504370
 	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die

-	# Fix tmpfiles config for client-only (no bacula user) install
-	# NOTE: Change only first occurance (user) not second (group)
-	# bug 528398
-	if use bacula-clientonly; then
-		sed -i -e 's/bacula/root/' platforms/systemd/bacula.conf.in || die
-	fi
-
 	# fix bundled libtool (bug 466696)
 	# But first move directory with M4 macros out of the way.
 	# It is only needed by autoconf and gives errors during elibtoolize.
--- a/app-dicts/prime-dict/prime-dict-1.0.0-r2.ebuild
+++ b/app-dicts/prime-dict/prime-dict-1.0.0-r2.ebuild
@ -13,7 +13,7 @@ SRC_URI="http://prime.sourceforge.jp/src/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ppc ~ppc64 ~sparc x86"
 IUSE=""

 each_ruby_configure() {
--- a/app-editors/emacs/emacs-24.5.ebuild
+++ b/app-editors/emacs/emacs-24.5.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz

 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"

--- a/app-editors/gvim/gvim-7.4.769.ebuild
+++ b/app-editors/gvim/gvim-7.4.769.ebuild
@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${MY_PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 fi

 DESCRIPTION="GUI version of the Vim text editor"
--- a/app-editors/vim-core/vim-core-7.4.769.ebuild
+++ b/app-editors/vim-core/vim-core-7.4.769.ebuild
@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${MY_PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2"
-	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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi

 DESCRIPTION="vim and gvim shared files"
--- a/app-editors/vim/vim-7.4.769.ebuild
+++ b/app-editors/vim/vim-7.4.769.ebuild
@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2"
-	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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi

 DESCRIPTION="Vim, an improved vi-style text editor"
--- a/app-emulation/qemu/files/qemu-2.4.0-CVE-2015-5225.patch
+++ b/app-emulation/qemu/files/qemu-2.4.0-CVE-2015-5225.patch
@ -0,0 +1,86 @@
+https://bugs.gentoo.org/558416
+
+fix from upstream git
+
+From eb8934b0418b3b1d125edddc4fc334a54334a49b Mon Sep 17 00:00:00 2001
+From: Gerd Hoffmann <kraxel@redhat.com>
+Date: Mon, 17 Aug 2015 19:56:53 +0200
+Subject: [PATCH] vnc: fix memory corruption (CVE-2015-5225)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The _cmp_bytes variable added by commit "bea60dd ui/vnc: fix potential
+memory corruption issues" can become negative.  Result is (possibly
+exploitable) memory corruption.  Reason for that is it uses the stride
+instead of bytes per scanline to apply limits.
+
+For the server surface is is actually fine.  vnc creates that itself,
+there is never any padding and thus scanline length always equals stride.
+
+For the guest surface scanline length and stride are typically identical
+too, but it doesn't has to be that way.  So add and use a new variable
+(guest_ll) for the guest scanline length.  Also rename min_stride to
+line_bytes to make more clear what it actually is.  Finally sprinkle
+in an assert() to make sure we never use a negative _cmp_bytes again.
+
+Reported-by: 范祚至(库特) <zuozhi.fzz@alibaba-inc.com>
+Reviewed-by: P J P <ppandit@redhat.com>
+Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
+---
+ ui/vnc.c | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/ui/vnc.c b/ui/vnc.c
+index e26973a..caf82f5 100644
+--- a/ui/vnc.c
+++ b/ui/vnc.c
+@@ -2872,7 +2872,7 @@ static int vnc_refresh_server_surface(VncDisplay *vd)
+                     pixman_image_get_width(vd->server));
+     int height = MIN(pixman_image_get_height(vd->guest.fb),
+                      pixman_image_get_height(vd->server));
+-    int cmp_bytes, server_stride, min_stride, guest_stride, y = 0;
+    int cmp_bytes, server_stride, line_bytes, guest_ll, guest_stride, y = 0;
+     uint8_t *guest_row0 = NULL, *server_row0;
+     VncState *vs;
+     int has_dirty = 0;
+@@ -2891,17 +2891,21 @@ static int vnc_refresh_server_surface(VncDisplay *vd)
+      * Update server dirty map.
+      */
+     server_row0 = (uint8_t *)pixman_image_get_data(vd->server);
+-    server_stride = guest_stride = pixman_image_get_stride(vd->server);
+    server_stride = guest_stride = guest_ll =
+        pixman_image_get_stride(vd->server);
+     cmp_bytes = MIN(VNC_DIRTY_PIXELS_PER_BIT * VNC_SERVER_FB_BYTES,
+                     server_stride);
+     if (vd->guest.format != VNC_SERVER_FB_FORMAT) {
+         int width = pixman_image_get_width(vd->server);
+         tmpbuf = qemu_pixman_linebuf_create(VNC_SERVER_FB_FORMAT, width);
+     } else {
+        int guest_bpp =
+            PIXMAN_FORMAT_BPP(pixman_image_get_format(vd->guest.fb));
+         guest_row0 = (uint8_t *)pixman_image_get_data(vd->guest.fb);
+         guest_stride = pixman_image_get_stride(vd->guest.fb);
+        guest_ll = pixman_image_get_width(vd->guest.fb) * ((guest_bpp + 7) / 8);
+     }
+-    min_stride = MIN(server_stride, guest_stride);
+    line_bytes = MIN(server_stride, guest_ll);
+ 
+     for (;;) {
+         int x;
+@@ -2932,9 +2936,10 @@ static int vnc_refresh_server_surface(VncDisplay *vd)
+             if (!test_and_clear_bit(x, vd->guest.dirty[y])) {
+                 continue;
+             }
+-            if ((x + 1) * cmp_bytes > min_stride) {
+-                _cmp_bytes = min_stride - x * cmp_bytes;
+            if ((x + 1) * cmp_bytes > line_bytes) {
+                _cmp_bytes = line_bytes - x * cmp_bytes;
+             }
+            assert(_cmp_bytes >= 0);
+             if (memcmp(server_ptr, guest_ptr, _cmp_bytes) == 0) {
+                 continue;
+             }
+-- 
+2.5.0
+
--- a/app-emulation/qemu/files/qemu-2.4.0-block-mirror-crash.patch
+++ b/app-emulation/qemu/files/qemu-2.4.0-block-mirror-crash.patch
@ -0,0 +1,124 @@
+https://bugs.gentoo.org/558396
+
+fix from upstream git
+
+From e424aff5f307227b1c2512bbb8ece891bb895cef Mon Sep 17 00:00:00 2001
+From: Kevin Wolf <kwolf@redhat.com>
+Date: Thu, 13 Aug 2015 10:41:50 +0200
+Subject: [PATCH] mirror: Fix coroutine reentrance
+
+This fixes a regression introduced by commit dcfb3beb ("mirror: Do zero
+write on target if sectors not allocated"), which was reported to cause
+aborts with the message "Co-routine re-entered recursively".
+
+The cause for this bug is the following code in mirror_iteration_done():
+
+    if (s->common.busy) {
+        qemu_coroutine_enter(s->common.co, NULL);
+    }
+
+This has always been ugly because - unlike most places that reenter - it
+doesn't have a specific yield that it pairs with, but is more
+uncontrolled.  What we really mean here is "reenter the coroutine if
+it's in one of the four explicit yields in mirror.c".
+
+This used to be equivalent with s->common.busy because neither
+mirror_run() nor mirror_iteration() call any function that could yield.
+However since commit dcfb3beb this doesn't hold true any more:
+bdrv_get_block_status_above() can yield.
+
+So what happens is that bdrv_get_block_status_above() wants to take a
+lock that is already held, so it adds itself to the queue of waiting
+coroutines and yields. Instead of being woken up by the unlock function,
+however, it gets woken up by mirror_iteration_done(), which is obviously
+wrong.
+
+In most cases the code actually happens to cope fairly well with such
+cases, but in this specific case, the unlock must already have scheduled
+the coroutine for wakeup when mirror_iteration_done() reentered it. And
+then the coroutine happened to process the scheduled restarts and tried
+to reenter itself recursively.
+
+This patch fixes the problem by pairing the reenter in
+mirror_iteration_done() with specific yields instead of abusing
+s->common.busy.
+
+Cc: qemu-stable@nongnu.org
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Reviewed-by: Jeff Cody <jcody@redhat.com>
+Message-id: 1439455310-11263-1-git-send-email-kwolf@redhat.com
+Signed-off-by: Jeff Cody <jcody@redhat.com>
+---
+ block/mirror.c | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/block/mirror.c b/block/mirror.c
+index 0841964..9474443 100644
+--- a/block/mirror.c
+++ b/block/mirror.c
+@@ -60,6 +60,7 @@ typedef struct MirrorBlockJob {
+     int sectors_in_flight;
+     int ret;
+     bool unmap;
+    bool waiting_for_io;
+ } MirrorBlockJob;
+ 
+ typedef struct MirrorOp {
+@@ -114,11 +115,7 @@ static void mirror_iteration_done(MirrorOp *op, int ret)
+     qemu_iovec_destroy(&op->qiov);
+     g_slice_free(MirrorOp, op);
+ 
+-    /* Enter coroutine when it is not sleeping.  The coroutine sleeps to
+-     * rate-limit itself.  The coroutine will eventually resume since there is
+-     * a sleep timeout so don't wake it early.
+-     */
+-    if (s->common.busy) {
+    if (s->waiting_for_io) {
+         qemu_coroutine_enter(s->common.co, NULL);
+     }
+ }
+@@ -203,7 +200,9 @@ static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s)
+     /* Wait for I/O to this cluster (from a previous iteration) to be done.  */
+     while (test_bit(next_chunk, s->in_flight_bitmap)) {
+         trace_mirror_yield_in_flight(s, sector_num, s->in_flight);
+        s->waiting_for_io = true;
+         qemu_coroutine_yield();
+        s->waiting_for_io = false;
+     }
+ 
+     do {
+@@ -239,7 +238,9 @@ static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s)
+          */
+         while (nb_chunks == 0 && s->buf_free_count < added_chunks) {
+             trace_mirror_yield_buf_busy(s, nb_chunks, s->in_flight);
+            s->waiting_for_io = true;
+             qemu_coroutine_yield();
+            s->waiting_for_io = false;
+         }
+         if (s->buf_free_count < nb_chunks + added_chunks) {
+             trace_mirror_break_buf_busy(s, nb_chunks, s->in_flight);
+@@ -337,7 +338,9 @@ static void mirror_free_init(MirrorBlockJob *s)
+ static void mirror_drain(MirrorBlockJob *s)
+ {
+     while (s->in_flight > 0) {
+        s->waiting_for_io = true;
+         qemu_coroutine_yield();
+        s->waiting_for_io = false;
+     }
+ }
+ 
+@@ -510,7 +513,9 @@ static void coroutine_fn mirror_run(void *opaque)
+             if (s->in_flight == MAX_IN_FLIGHT || s->buf_free_count == 0 ||
+                 (cnt == 0 && s->in_flight > 0)) {
+                 trace_mirror_yield(s, s->in_flight, s->buf_free_count, cnt);
+                s->waiting_for_io = true;
+                 qemu_coroutine_yield();
+                s->waiting_for_io = false;
+                 continue;
+             } else if (cnt != 0) {
+                 delay_ns = mirror_iteration(s);
+-- 
+2.5.0
+
--- a/app-emulation/qemu/files/qemu-2.4.0-e1000-loop.patch
+++ b/app-emulation/qemu/files/qemu-2.4.0-e1000-loop.patch
@ -0,0 +1,39 @@
+https://bugs.gentoo.org/559656
+
+https://lists.gnu.org/archive/html/qemu-devel/2015-09/msg01199.html
+
+From: Stefan Hajnoczi <stefanha@redhat.com>
+Subject: [PATCH] e1000: Avoid infinite loop in processing	transmit descriptor
+Newsgroups: gmane.comp.emulators.qemu
+Date: 2015-09-04 16:21:06 GMT (2 days, 12 hours and 51 minutes ago)
+From: P J P <pjp@fedoraproject.org>
+
+While processing transmit descriptors, it could lead to an infinite
+loop if 'bytes' was to become zero; Add a check to avoid it.
+
+[The guest can force 'bytes' to 0 by setting the hdr_len and mss
+descriptor fields to 0.
+--Stefan]
+
+Signed-off-by: P J P <pjp@fedoraproject.org>
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+---
+ hw/net/e1000.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/hw/net/e1000.c b/hw/net/e1000.c
+index 5c6bcd0..09c9e9d 100644
+--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
+@@ -740,7 +740,8 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
+                 memmove(tp->data, tp->header, tp->hdr_len);
+                 tp->size = tp->hdr_len;
+             }
+-        } while (split_size -= bytes);
+            split_size -= bytes;
+        } while (bytes && split_size);
+     } else if (!tp->tse && tp->cptse) {
+         // context descriptor TSE is not set, while data descriptor TSE is set
+         DBGOUT(TXERR, "TCP segmentation error\n");
+-- 
+2.4.3
--- a/app-emulation/qemu/qemu-2.4.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-2.4.0-r1.ebuild
@ -39,8 +39,8 @@ virtfs +vnc vte xattr xen xfs"
 COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips
 mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32
 x86_64"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 sparc32plus"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb tricore xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus"

 use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
 use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
@ -134,7 +134,7 @@ USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
 X86_FIRMWARE_DEPEND="
 	>=sys-firmware/ipxe-1.0.0_p20130624
 	pin-upstream-blobs? (
-		~sys-firmware/seabios-1.7.5
+		~sys-firmware/seabios-1.8.2
 		~sys-firmware/sgabios-0.1_pre8
 		~sys-firmware/vgabios-0.7a
 	)
@ -268,7 +268,29 @@ pkg_setup() {
 	enewgroup kvm 78
 }

+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+	local var=$1 mak=$2
+	local detected sorted
+
+	pushd "${S}"/default-configs >/dev/null || die
+
+	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | sort -u))
+	sorted=$(echo $(printf '%s\n' ${!var} | sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "${var}: ${sorted}"
+		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+		die "sync ${var} to the list of targets"
+	fi
+
+	popd >/dev/null
+}
+
 src_prepare() {
+	check_targets IUSE_SOFTMMU_TARGETS softmmu
+	check_targets IUSE_USER_TARGETS linux-user
+
 	# Alter target makefiles to accept CFLAGS set via flag-o
 	sed -i -r \
 		-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
@ -278,6 +300,9 @@ src_prepare() {
 	use nls || rm -f po/*.po

 	epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
+	epatch "${FILESDIR}"/${P}-block-mirror-crash.patch #558396
+	epatch "${FILESDIR}"/${P}-CVE-2015-5225.patch #558416
+	epatch "${FILESDIR}"/${PN}-2.4.0-e1000-loop.patch #559656
 	[[ -n ${BACKPORTS} ]] && \
 		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
 			epatch
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@ -39,8 +39,8 @@ virtfs +vnc vte xattr xen xfs"
 COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips
 mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32
 x86_64"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 sparc32plus"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb tricore xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus"

 use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
 use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
@ -134,7 +134,7 @@ USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
 X86_FIRMWARE_DEPEND="
 	>=sys-firmware/ipxe-1.0.0_p20130624
 	pin-upstream-blobs? (
-		~sys-firmware/seabios-1.7.5
+		~sys-firmware/seabios-1.8.2
 		~sys-firmware/sgabios-0.1_pre8
 		~sys-firmware/vgabios-0.7a
 	)
@ -268,7 +268,29 @@ pkg_setup() {
 	enewgroup kvm 78
 }

+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+	local var=$1 mak=$2
+	local detected sorted
+
+	pushd "${S}"/default-configs >/dev/null || die
+
+	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | sort -u))
+	sorted=$(echo $(printf '%s\n' ${!var} | sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "${var}: ${sorted}"
+		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+		die "sync ${var} to the list of targets"
+	fi
+
+	popd >/dev/null
+}
+
 src_prepare() {
+	check_targets IUSE_SOFTMMU_TARGETS softmmu
+	check_targets IUSE_USER_TARGETS linux-user
+
 	# Alter target makefiles to accept CFLAGS set via flag-o
 	sed -i -r \
 		-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@ -0,0 +1,2 @@
+DIST rkt-0.8.0.tar.gz 1749853 SHA256 c9eb0126b8ff2f059d7cedaab17ca73dce256f342092c9bf4a7ae20661f2a5aa SHA512 4e2c27fb40cd3d27de062631105db3ea04ed902f48abb647a8e4de249478dd8a145ac0b77fd5b261cc680df1bcaa4067accb8a597def9b3963108e2c1f3d9d5a WHIRLPOOL f65ddd8908ec30cfefa06e60cd4d8cdb2099ab279b6350790eb3e436b88c792efe28cea53569f48d42f6eec682635a4212f16fea9d184e6baa97877a643e1106
+DIST rkt-pxe-738.1.0.img 151780780 SHA256 805a4c491281553c8927f3dd1a7bec50cca29209d0a7264870e7155d794ecbe6 SHA512 7774cc64dfa874f08f48cba0c15103e9eca86ffd87dcb24f765a9b56074e72f6862a663a4007a0a7dd296740ae91bf4edf7290fa35659b0b1572fe2f5dad3256 WHIRLPOOL 5973a6036d650c576bb0bd365c8c9ea35776501c1fd2baf1d7c00d06496fab35e9c796096ef89b095e7a922e2062dce6c0d1c85cd3101022e0aca84277d18cb9
--- a/app-emulation/rkt/metadata.xml
+++ b/app-emulation/rkt/metadata.xml
@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>mail@stefanjunker.de</email>
+		<name>Stefan Junker</name>
+	</maintainer>	
+	<maintainer>
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<longdescription lang="en">
+		rkt is a new container runtime, designed for composability, security,
+		and speed. Today we are releasing a prototype version on GitHub to begin
+		gathering feedback from our community and explain why we are building
+		rkt. 
+	</longdescription>
+	<use>
+		<flag name="actool">Install the actool for ACI manipulation</flag>
+		<flag name="rkt_stage1_coreos">Download and use a prebuilt stage1.aci from CoreOS</flag>
+		<flag name="rkt_stage1_src">Build the stage1.aci from source</flag>
+		<flag name="rkt_stage1_host">Assemble stage1.aci from host binaries</flag>
+	</use>
+</pkgmetadata>
--- a/app-emulation/rkt/rkt-0.8.0.ebuild
+++ b/app-emulation/rkt/rkt-0.8.0.ebuild
@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=yes
+AUTOTOOLS_IN_SOURCE_BUILD=yes
+
+inherit autotools-utils flag-o-matic systemd toolchain-funcs
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="738.1.0"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )"
+
+DESCRIPTION="A CLI for running app containers, and an implementation of the App
+Container Spec."
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc examples +rkt_stage1_coreos rkt_stage1_src +actool systemd"
+REQUIRED_USE="^^ ( rkt_stage1_coreos rkt_stage1_src )"
+
+DEPEND=">=dev-lang/go-1.4.1
+	app-arch/cpio
+	sys-fs/squashfs-tools
+	dev-perl/Capture-Tiny
+	rkt_stage1_src? (
+		>=sys-apps/systemd-222
+		app-shells/bash:0
+	)"
+RDEPEND="!app-emulation/rocket"
+
+BUILDDIR="build-${P}"
+
+src_configure() {
+	local myeconfargs=(
+		--with-stage1-image-path="/usr/share/rkt/stage1.aci"
+	)
+
+	if use rkt_stage1_src; then
+		myeconfargs+=( --with-stage1="src" )
+	elif use rkt_stage1_coreos; then
+		myeconfargs+=( --with-stage1="coreos" )
+		mkdir -p "${BUILDDIR}/tmp/usr_from_coreos/" || die
+		cp "${DISTDIR}/${PXE_FILE}" "${BUILDDIR}/tmp/usr_from_coreos/pxe.img" || die
+	fi
+
+	# Go's 6l linker does not support PIE, disable so cgo binaries
+	# which use 6l+gcc for linking can be built correctly.
+	if gcc-specs-pie; then
+		append-ldflags -nopie
+	fi
+
+	export CC=$(tc-getCC)
+	export CGO_ENABLED=1
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+	export CGO_LDFLAGS="${LDFLAGS}"
+	export BUILDDIR
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	dodoc README.md
+	use doc && dodoc -r Documentation
+	use examples && dodoc -r examples
+	use actool && dobin "${S}/${BUILDDIR}/bin/actool"
+
+	dobin "${S}/${BUILDDIR}/bin/rkt"
+
+	insinto /usr/share/rkt/
+	doins "${S}/${BUILDDIR}/bin/stage1.aci"
+
+	systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
+	systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
+	systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
+	systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
+}
--- a/app-emulation/rkt/rkt-9999.ebuild
+++ b/app-emulation/rkt/rkt-9999.ebuild
@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=yes
+AUTOTOOLS_IN_SOURCE_BUILD=yes
+
+inherit autotools-utils flag-o-matic systemd toolchain-funcs
+inherit git-r3
+
+EGIT_REPO_URI="https://github.com/coreos/rkt.git"
+
+KEYWORDS=""
+PXE_VERSION="738.1.0"
+EGIT_BRANCH="master"
+
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI="rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )"
+
+DESCRIPTION="A CLI for running app containers, and an implementation of the App
+Container Spec."
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc examples +rkt_stage1_coreos rkt_stage1_host rkt_stage1_src +actool systemd"
+REQUIRED_USE="^^ ( rkt_stage1_coreos rkt_stage1_host rkt_stage1_src )"
+
+DEPEND=">=dev-lang/go-1.4.1
+	app-arch/cpio
+	sys-fs/squashfs-tools
+	dev-perl/Capture-Tiny
+	rkt_stage1_src? (
+		>=sys-apps/systemd-222
+		app-shells/bash:0
+	)"
+RDEPEND="!app-emulation/rocket
+	rkt_stage1_host? (
+		>=sys-apps/systemd-222
+		app-shells/bash:0
+	)"
+
+BUILDDIR="build-${P}"
+
+src_configure() {
+	local myeconfargs=(
+		--with-stage1-image-path="/usr/share/rkt/stage1.aci"
+	)
+
+	if use rkt_stage1_host; then
+		myeconfargs+=( --with-stage1="host" )
+	elif use rkt_stage1_src; then
+		myeconfargs+=( --with-stage1="src" )
+	elif use rkt_stage1_coreos; then
+		myeconfargs+=( --with-stage1="coreos" )
+		mkdir -p "${BUILDDIR}/tmp/usr_from_coreos/" || die
+		cp "${DISTDIR}/${PXE_FILE}" "${BUILDDIR}/tmp/usr_from_coreos/pxe.img" || die
+	fi
+
+	# Go's 6l linker does not support PIE, disable so cgo binaries
+	# which use 6l+gcc for linking can be built correctly.
+	if gcc-specs-pie; then
+		append-ldflags -nopie
+	fi
+
+	export CC=$(tc-getCC)
+	export CGO_ENABLED=1
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+	export CGO_LDFLAGS="${LDFLAGS}"
+	export BUILDDIR
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	dodoc README.md
+	use doc && dodoc -r Documentation
+	use examples && dodoc -r examples
+	use actool && dobin "${S}/${BUILDDIR}/bin/actool"
+
+	dobin "${S}/${BUILDDIR}/bin/rkt"
+
+	insinto /usr/share/rkt/
+	doins "${S}/${BUILDDIR}/bin/stage1.aci"
+
+	systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
+	systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
+	systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
+	systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
+}
--- a/app-misc/jot/jot-9.0-r1.ebuild
+++ b/app-misc/jot/jot-9.0-r1.ebuild
@ -14,7 +14,7 @@ SRC_URI="http://www.mit.edu/afs/athena/system/rhlinux/athena-${PV}/free/SRPMS/at

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""

 S="${WORKDIR}/athena-${P}"
--- a/app-misc/mmv/mmv-1.01b_p18.ebuild
+++ b/app-misc/mmv/mmv-1.01b_p18.ebuild
@ -17,7 +17,7 @@ SRC_URI="

 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""

 S="${WORKDIR}"/${PN}-${MY_VER}.orig
--- a/app-misc/vifm/vifm-0.8.ebuild
+++ b/app-misc/vifm/vifm-0.8.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/vifm/${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~s390 ~x86"
+KEYWORDS="amd64 ppc ~s390 ~x86"
 IUSE="X developer +extended-keys gtk +magic vim vim-syntax"

 DEPEND="
--- a/app-shells/bash/bash-4.3_p39.ebuild
+++ b/app-shells/bash/bash-4.3_p39.ebuild
@ -38,7 +38,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"

 DEPEND=">=sys-libs/ncurses-5.2-r2
--- a/app-shells/mksh/mksh-51.ebuild
+++ b/app-shells/mksh/mksh-51.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="http://mirbsd.de/mksh"
 SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 DEPEND="static? ( dev-libs/klibc )"
 RDEPEND=""
--- a/app-text/discount/discount-2.1.8a-r1.ebuild
+++ b/app-text/discount/discount-2.1.8a-r1.ebuild
@ -12,7 +12,7 @@ SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~ia64 ppc ~ppc64 ~sparc ~x86"
 IUSE="minimal"

 src_prepare() {
--- a/app-text/multitail/multitail-6.4.1.ebuild
+++ b/app-text/multitail/multitail-6.4.1.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 hppa ~ia64 ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
 IUSE="debug examples unicode"

 RDEPEND="
--- a/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
+++ b/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
@ -12,7 +12,7 @@ SRC_URI="http://www.hyperrealm.com/${PN}/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~mips ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 hppa ~mips ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""

 PATCHES=(
--- a/app-text/tesseract/tesseract-3.04.00-r2.ebuild
+++ b/app-text/tesseract/tesseract-3.04.00-r2.ebuild
@ -59,7 +59,7 @@ SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ppc ~ppc64 ~sparc ~x86"

 IUSE="doc examples jpeg opencl osd png +scrollview static-libs tiff training -webp linguas_ar linguas_bg linguas_ca linguas_chr linguas_cs linguas_de linguas_da linguas_el linguas_es linguas_fi linguas_fr linguas_he linguas_hi linguas_hu linguas_id linguas_it linguas_jp linguas_ko linguas_lt linguas_lv linguas_nl linguas_no linguas_pl linguas_pt linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tl linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW"

--- a/dev-cpp/tbb/tbb-4.3.20150611.ebuild
+++ b/dev-cpp/tbb/tbb-4.3.20150611.ebuild
@ -16,7 +16,7 @@ HOMEPAGE="http://www.threadingbuildingblocks.org/"
 SRC_URI="http://threadingbuildingblocks.org/sites/default/files/software_releases/source/${MYP}_src.tgz"
 LICENSE="GPL-2-with-exceptions"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug doc examples"

 DEPEND=""
--- a/dev-db/mariadb/mariadb-10.0.21.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.21.ebuild
@ -11,7 +11,7 @@ inherit toolchain-funcs mysql-multilib
 IUSE="$IUSE"

 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"

 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''
--- a/dev-db/mysql/mysql-5.6.26.ebuild
+++ b/dev-db/mysql/mysql-5.6.26.ebuild
@ -14,7 +14,7 @@ inherit toolchain-funcs mysql-multilib
 IUSE="$IUSE"

 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"

 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''
--- a/dev-db/postgresql/files/postgresql-9.4-alpha-fix-read-memory-barrier.patch
+++ b/dev-db/postgresql/files/postgresql-9.4-alpha-fix-read-memory-barrier.patch
@ -0,0 +1,13 @@
+Index: postgresql-9.4-9.4~beta2/src/include/storage/barrier.h
+===================================================================
+--- postgresql-9.4-9.4~beta2.orig/src/include/storage/barrier.h
+++ postgresql-9.4-9.4~beta2/src/include/storage/barrier.h
+@@ -117,7 +117,7 @@ extern slock_t dummy_spinlock;
+  * read barrier to cover that case.  We might need to add that later.
+  */
+ #define pg_memory_barrier()		__asm__ __volatile__ ("mb" : : : "memory")
+-#define pg_read_barrier()		__asm__ __volatile__ ("rmb" : : : "memory")
+#define pg_read_barrier()		__asm__ __volatile__ ("mb" : : : "memory")
+ #define pg_write_barrier()		__asm__ __volatile__ ("wmb" : : : "memory")
+ #elif defined(__hppa) || defined(__hppa__)		/* HP PA-RISC */
+ 
--- a/dev-db/postgresql/files/postgresql-9.5-no-server.patch
+++ b/dev-db/postgresql/files/postgresql-9.5-no-server.patch
@ -1,8 +1,7 @@
-diff --git a/contrib/Makefile b/contrib/Makefile
-index b37d0dd..b56fbf6 100644
--- a/contrib/Makefile
-+++ b/contrib/Makefile
-@@ -5,64 +5,9 @@ top_builddir = ..
+diff -ru a/contrib/Makefile b/contrib/Makefile
+--- a/contrib/Makefile	2015-06-29 15:42:18.000000000 -0400
+++ b/contrib/Makefile	2015-09-06 07:50:51.258463861 -0400
+@@ -5,56 +5,9 @@
 include $(top_builddir)/src/Makefile.global
 
 SUBDIRS = \
@ -17,7 +16,6 @@ index b37d0dd..b56fbf6 100644
 -		dblink		\
 -		dict_int	\
 -		dict_xsyn	\
-		dummy_seclabel	\
 -		earthdistance	\
 -		file_fdw	\
 -		fuzzystrmatch	\
@ -30,47 +28,39 @@ index b37d0dd..b56fbf6 100644
 		oid2name	\
 -		pageinspect	\
 -		passwordcheck	\
-		pg_archivecleanup \
 -		pg_buffercache	\
 -		pg_freespacemap \
 -		pg_prewarm	\
 -		pg_standby	\
 -		pg_stat_statements \
-		pg_test_fsync	\
-		pg_test_timing	\
 -		pg_trgm		\
-		pg_upgrade	\
-		pg_upgrade_support \
- 		pgbench		\
 -		pgcrypto	\
 -		pgrowlocks	\
 -		pgstattuple	\
-		pg_xlogdump	\
 -		postgres_fdw	\
 -		seg		\
 -		spi		\
 -		tablefunc	\
 -		tcn		\
 -		test_decoding	\
-		test_parser	\
-		test_shm_mq	\
+-		tsm_system_rows \
+-		tsm_system_time \
 -		tsearch2	\
 -		unaccent	\
-		vacuumlo	\
-		worker_spi
-
+ 		vacuumlo
+ 
 -ifeq ($(with_openssl),yes)
 -SUBDIRS += sslinfo
 -else
 -ALWAYS_SUBDIRS += sslinfo
 -endif
-+		vacuumlo
- 
+-
 ifneq ($(with_uuid),no)
 SUBDIRS += uuid-ossp
-diff -Naur a/src/backend/Makefile b/src/backend/Makefile
--- a/src/backend/Makefile	2013-05-06 20:57:06.000000000 +0000
-+++ b/src/backend/Makefile	2013-06-09 01:50:19.655864258 +0000
+ else
+diff -ru a/src/backend/Makefile b/src/backend/Makefile
+--- a/src/backend/Makefile	2015-06-29 15:42:18.000000000 -0400
+++ b/src/backend/Makefile	2015-09-06 08:01:36.775374842 -0400
@@ -47,7 +47,7 @@
 
 ##########################################################################
@ -80,7 +70,7 @@ diff -Naur a/src/backend/Makefile b/src/backend/Makefile
 
 ifneq ($(PORTNAME), cygwin)
 ifneq ($(PORTNAME), win32)
-@@ -116,7 +116,7 @@
+@@ -106,7 +106,7 @@
 endif # aix
 
 # Update the commonly used headers before building the subdirectories
@ -89,7 +79,7 @@ diff -Naur a/src/backend/Makefile b/src/backend/Makefile
 
 # run this unconditionally to avoid needing to know its dependencies here:
 submake-schemapg:
-@@ -209,23 +209,8 @@
+@@ -199,23 +199,7 @@
 
 ##########################################################################
 
@ -111,26 +101,36 @@ diff -Naur a/src/backend/Makefile b/src/backend/Makefile
 -	$(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample'
 -	$(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample'
 +install:
-+
 
 install-bin: postgres $(POSTGRES_IMP) installdirs
 	$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
-diff -Naur a/src/bin/Makefile b/src/bin/Makefile
--- a/src/bin/Makefile	2013-05-06 20:57:06.000000000 +0000
-+++ b/src/bin/Makefile	2013-06-09 01:51:56.143824442 +0000
-@@ -13,8 +13,7 @@
- top_builddir = ../..
+diff -ru a/src/bin/Makefile b/src/bin/Makefile
+--- a/src/bin/Makefile	2015-06-29 15:42:18.000000000 -0400
+++ b/src/bin/Makefile	2015-09-06 08:03:27.014847309 -0400
+@@ -14,20 +14,8 @@
 include $(top_builddir)/src/Makefile.global
 
-SUBDIRS = initdb pg_ctl pg_dump \
-	psql scripts pg_config pg_controldata pg_resetxlog pg_basebackup
-+SUBDIRS = pg_dump psql scripts pg_config
+ SUBDIRS = \
+-	initdb \
+-	pg_archivecleanup \
+-	pg_basebackup \
+ 	pg_config \
+-	pg_controldata \
+-	pg_ctl \
+ 	pg_dump \
+-	pg_resetxlog \
+-	pg_rewind \
+-	pg_test_fsync \
+-	pg_test_timing \
+-	pg_upgrade \
+-	pg_xlogdump \
+-	pgbench \
+ 	psql \
+ 	scripts
 
- ifeq ($(PORTNAME), win32)
- SUBDIRS += pgevent
-diff -Naur a/src/Makefile b/src/Makefile
--- a/src/Makefile	2013-05-06 20:57:06.000000000 +0000
-+++ b/src/Makefile	2013-06-09 01:54:30.479704228 +0000
+diff -ru a/src/Makefile b/src/Makefile
+--- a/src/Makefile	2015-06-29 15:42:18.000000000 -0400
+++ b/src/Makefile	2015-09-06 08:04:25.274568519 -0400
@@ -15,17 +15,11 @@
 SUBDIRS = \
 	common \
--- a/dev-db/postgresql/postgresql-9.4.4-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.4-r1.ebuild
@ -0,0 +1,422 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
+
+inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+		systemd user versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+		 zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python
+	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Fix bug 555198: Correct typo in assembly code for alpha architecture
+	epatch "${FILESDIR}/${PN}-${SLOT}-alpha-fix-read-memory-barrier.patch"
+
+	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
+
+	# Fix bug 486556 where the server would crash at start up because of
+	# an infinite loop caused by a self-referencing symlink.
+	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/${PF}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !pg_legacytimestamp integer-datetimes) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+
+		docinto sgml
+		dodoc doc/src/sgml/*.{sgml,dsl}
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.service" | \
+			systemd_newunit - ${PN}-${SLOT}.service
+
+		systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
+
+		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 0775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT%/}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [ "$correct" != "true" ] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized"
+		fi
+	done
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
--- a/dev-db/vsqlite++/Manifest
+++ b/dev-db/vsqlite++/Manifest
@ -1,2 +1 @@
-DIST vsqlite++-0.3.12.tar.gz 23720 SHA256 655d53abe7b21b024111565cf9da8ccaa90540e5ff36d7d227c2eaa22305e925 SHA512 5e134de01a3f2c8adab40ae4f598b5c3b095b7503bf1bcc1aae012d3b087ff68b7cd1fc4dbea74b8cfeac82e9a18428efccea3c1e5a229c2aec05f8228c28344 WHIRLPOOL 66c1252ecc2d05ad2a3690141efe4dace892a839b8b649cbf7b96e55de30bc5d384bd22394d94ca112b0f26380baf6b5db0a6c94d469b9cc5777986e9ae61842
 DIST vsqlite++-0.3.13.tar.gz 28195 SHA256 73dea3c0b4b7769254da17182efbf9fc16893c50ed0d544abfdde127b69467d5 SHA512 70fcd16348e3b2a0854b1d496c68fda7e354068aefbd6a5ad21d7a42afebd2bd746f604240475acfeebe00898ab156f9dfd687346fdf5c77d775262db3a5666e WHIRLPOOL 02d79a14dabbc7a2191f40370d94071c95c4dcb72f4eb6ba68b38872296a92473ddfd06a702bb6862fa2a5eac9ac921dd93e3312615bc587b319cf7a64ee5427
--- a/dev-db/vsqlite++/vsqlite++-0.3.12.ebuild
+++ b/dev-db/vsqlite++/vsqlite++-0.3.12.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-AUTOTOOLS_IN_SOURCE_BUILD=1
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils
-
-DESCRIPTION="VSQLite++ - A welldesigned and portable SQLite3 Wrapper for C++"
-HOMEPAGE="http://evilissimo.fedorapeople.org/releases/vsqlite--/"
-SRC_URI="https://github.com/vinzenz/vsqlite--/archive/${PV}.tar.gz -> ${P}.tar.gz"
-IUSE="static-libs"
-
-LICENSE="BSD"
-
-SLOT="0"
-
-KEYWORDS="amd64 ppc x86"
-
-DEPEND=">=dev-libs/boost-1.33.1"
-
-RDEPEND="${DEPEND}
-		dev-db/sqlite:3"
-
-DOCS=(AUTHORS COPYING ChangeLog INSTALL NEWS README TODO VERSION)
-
-# package name is vsqlite++, but github / homepage name is vsqlite--
-S="${WORKDIR}/vsqlite---${PV}"
-
-src_prepare() {
-	## remove O3 in AM_CXXFLAGS
-	sed -i -e 's/-O3//' Makefile.am || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
--- a/dev-db/vsqlite++/vsqlite++-0.3.13-r1.ebuild
+++ b/dev-db/vsqlite++/vsqlite++-0.3.13-r1.ebuild
@ -17,7 +17,7 @@ LICENSE="BSD"

 SLOT="0"

-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"

 DEPEND=">=dev-libs/boost-1.33.1"

--- a/dev-java/cal10n/cal10n-0.8.1.ebuild
+++ b/dev-java/cal10n/cal10n-0.8.1.ebuild
@ -14,7 +14,7 @@ SRC_URI="http://repo1.maven.org/maven2/ch/qos/${PN}/${PN}-api/${PV}/${PN}-api-${

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""

 RDEPEND=">=virtual/jre-1.5"
--- a/dev-java/glassfish-servlet-api/Manifest
+++ b/dev-java/glassfish-servlet-api/Manifest
@ -1,2 +1 @@
-DIST glassfish-v2-b44-src.zip 35200817 SHA256 331f6a65aa94b9d79f5b0a726d71afc4726032b3e9d62f2c7ab6fc679790e1b7 SHA512 2c236f37c08ec465959e80c90e3a2f8cdf9d143dc93c7a6bbdcc6e015125f167153f6abfaba4390a5d179b43130458b996498d3f1390588477462bd45ea367ee WHIRLPOOL 71c9b9cbcc194ffe03f4a604b570d618f88b7f08955b573f6b218683fba854267ee83915d26d909d8caf92779a2e15752d6fbce6c402d8ca69b108d18042845b
 DIST javax.servlet-3.1.1-sources.jar 211576 SHA256 c17212d132bf33dc9dcc44ed0e945e92a08cc8ec494ce7cd62de9f9514d63826 SHA512 7f152a389481e0381f041d97a6774a3e762a86b2a8a5413901c472fc2882b9cabd141dd85b46b8a7006cbe677c29c4caee09f3fc934afae857a6c1362efdc7bc WHIRLPOOL 9d794227cc6a119ef61122ec63515e18199bb4239382129b56f88ff74d5fb5b08a2b3259a1cfcde14a0761561beefd0152c853476d6d65039de76d791bd4090c
--- a/dev-java/glassfish-servlet-api/files/build_xml.patch
+++ b/dev-java/glassfish-servlet-api/files/build_xml.patch
@ -1,12 +0,0 @@
--- build.xml	2007-04-27 03:38:38.000000000 -0400
-+++ build.xml	2007-04-27 03:39:17.000000000 -0400
-@@ -28,7 +28,9 @@
-              target="dist" inheritAll="false"/>
-         <ant dir="${servlet.api.home}/src/jsr245" 
-              target="dist" inheritAll="false"/>
-+<!--
-       <antcall target="prepare-jar"/>
-+-->
-     </target>
- 
-     <!-- build pwc-->
--- a/dev-java/glassfish-servlet-api/glassfish-servlet-api-2_beta44.ebuild
+++ b/dev-java/glassfish-servlet-api/glassfish-servlet-api-2_beta44.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-
-inherit base java-pkg-2 java-ant-2
-
-MY_PV="${PV/_beta/-b}"
-DESCRIPTION="Glassfish reference implementation of Servlet API 2.5 and JSP API 2.1"
-HOMEPAGE="https://glassfish.dev.java.net/javaee5/webtier/webtierhome.html"
-SRC_URI="http://download.java.net/javaee5/trunk/promoted/source/glassfish-v${MY_PV}-src.zip"
-LICENSE="CDDL"
-SLOT="2.5"
-KEYWORDS="amd64 x86"
-
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip"
-
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/glassfish/servlet-api/"
-
-PATCHES=( "${FILESDIR}/build_xml.patch" )
-
-src_compile() {
-	eant build $(use doc || echo -Ddocs.uptodate=true)
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/src/jakarta-servletapi-5/jsr154/dist/lib/*.jar
-	java-pkg_dojar "${S}"/src/jsr245/dist/lib/*.jar
-
-	use doc && java-pkg_dojavadoc src/jsr245/build/docs/api
-	use source && java-pkg_dosrc src/*
-}
--- a/dev-java/glassfish-servlet-api/glassfish-servlet-api-3.1.1.ebuild
+++ b/dev-java/glassfish-servlet-api/glassfish-servlet-api-3.1.1.ebuild
@ -15,7 +15,7 @@ HOMEPAGE="https://glassfish.dev.java.net/javaee5/webtier/webtierhome.html"
 SRC_URI="http://central.maven.org/maven2/org/glassfish/javax.servlet/${PV}/${MY_P}-sources.jar"
 LICENSE="CDDL"
 SLOT="3.1.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"

 DEPEND=">=virtual/jdk-1.6
 	app-arch/unzip"
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.13.8.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-6.1.13.8.ebuild
@ -24,7 +24,7 @@ done

 LICENSE="GPL-2-with-linking-exception"
 SLOT="6"
-KEYWORDS="-* ~amd64 ~ppc ~x86"
+KEYWORDS="-* amd64 ~ppc x86"

 IUSE="+awt +alsa cjk +cups doc examples +gtk nsplugin selinux source webstart"
 REQUIRED_USE="gtk? ( awt ) nsplugin? ( awt )"
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.6.1.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.6.1.ebuild
@ -24,7 +24,7 @@ done

 LICENSE="GPL-2-with-linking-exception"
 SLOT="7"
-KEYWORDS="-* ~amd64 ~arm ~x86"
+KEYWORDS="-* amd64 ~arm x86"

 IUSE="+awt +alsa cjk +cups doc examples +gtk nsplugin pulseaudio selinux source webstart"
 REQUIRED_USE="gtk? ( awt ) nsplugin? ( awt )"
--- a/dev-java/java-apicheck/Manifest
+++ b/dev-java/java-apicheck/Manifest
@ -0,0 +1 @@
+DIST java-apicheck-0_p20150907.tar.gz 1550 SHA256 4f8a108e78b556d3400e334d3cd0b972628a8cee97bfe903e656ddbb46368449 SHA512 68a3a5443ea26840a526c2e53451e47e441f6ec15b2ddffef8f5d63a50f1129d18cd65506ecfe0bbf3f9829514697648eff8f64e558f0bd5376b0bf2add70b70 WHIRLPOOL 0640404622635f36c2dab7623510b5ea913a409382b77699c0dea5904fdedf0d83ba5bdf3e2247d3ed3b3b33a2dd271b9ba1d4b2913428adfa01381be1cdbdef
--- a/dev-java/java-apicheck/java-apicheck-0_p20150907.ebuild
+++ b/dev-java/java-apicheck/java-apicheck-0_p20150907.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="Command line tool to check Java packages for API compatibility"
+HOMEPAGE="https://github.com/gentoo/java-apicheck/"
+SRC_URI="https://github.com/gentoo/java-apicheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-java/japitools
+	dev-java/java-config
+	"
+
+src_install() {
+	dobin ${PN}
+}
--- a/dev-java/java-apicheck/metadata.xml
+++ b/dev-java/java-apicheck/metadata.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
--- a/dev-java/jsoup/Manifest
+++ b/dev-java/jsoup/Manifest
@ -1,3 +1 @@
-DIST jsoup-1.7.2.tar.gz 292926 SHA256 b778e2b3687c4ca2255e9a9f5038f54470c0dfee8f9758937afc1f50fac78b38 SHA512 de400a755b4ecf7962b66f2a3f232895c5ce365c18e9c4af4dc654094357248e7f694217a33b8a0415767c1c50c532f6d70f01e04475ecf0c7d1b5607432967f WHIRLPOOL 67ae0eb1459161a46a5bb2c2ce8c646febe0fe5c8f0cbae8c4d620d713c2d6cf982fd4d8364204c72d07fbef0a9df32b5226cb65a718e3b811912b09b7a15911
-DIST jsoup-1.8.1.a.tar.gz 303388 SHA256 788832a1a3fa639fecb71b52c5b1c062663f5b3a21c1451968910c4731393b60 SHA512 4afcc42187fd034e2c6f45d369c4fdd0cc7523f4aa2f2526a21aebdebb8608e1ced51f3d6c8de02ac519eccd5ef415e9b7619450fb2e958a0f7a4d5bf492ed8a WHIRLPOOL 7c1f8a0db34b8907bbc2ce849d85a845956059520202346a1d608e43cb264d2b478738868a2d183d97eff85b8df085ced10130400f2612a26faff7f688e4e698
 DIST jsoup-1.8.3a.zip 370626 SHA256 3a2dd962eb3f3bf0ef14f526d89795836d06bff411e68f0adfcc4a8dd5915876 SHA512 d044231fc70ff6d5428707d56853db77feedbb29a4ea1a501e6fcbaaecb2743bdeeaa8dcf4c76f7d278905b31e83707ad2644e7876a44c9d2325537d647aab85 WHIRLPOOL e1b5d4ed64b4460223b38aea43466465638236edf0ef6bd987430e16bb2bd12796a4900da797320c5bebcd8de0f823533f2a40bfb6cc50ad30183912eb34eee7
--- a/dev-java/jsoup/jsoup-1.7.2.ebuild
+++ b/dev-java/jsoup/jsoup-1.7.2.ebuild
@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple vcs-snapshot
-
-DESCRIPTION="Java HTML parser that makes sense of real-world HTML soup"
-HOMEPAGE="http://jsoup.org/"
-SRC_URI="https://github.com/jhy/${PN}/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
-	test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src/main/java"
-
-java_prepare() {
-	rm pom.xml || die
-	mkdir -p target/classes/org/jsoup/nodes/ || die
-	cp src/main/java/org/jsoup/nodes/*.properties target/classes/org/jsoup/nodes/ || die
-}
-
-src_test() {
-	testcp="${S}/${PN}.jar:$(java-pkg_getjars junit-4):target/tests"
-
-	mkdir target/tests || die
-	ejavac -cp "${testcp}" -d target/tests $(find src/test/java -name "*.java")
-	cp -r src/test/resources/* target/tests || die
-
-	tests=$(find target/tests -name "*Test.class" \
-			| sed -e 's/target\/tests\///g' -e "s/\.class//" -e "s/\//./g" \
-			| grep -vP '\$');
-	ejunit4 -cp "${testcp}" ${tests}
-}
--- a/dev-java/jsoup/jsoup-1.8.1.ebuild
+++ b/dev-java/jsoup/jsoup-1.8.1.ebuild
@ -1,48 +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 test"
-
-inherit java-pkg-2 java-pkg-simple 
-
-MY_PV="${PV}.a"
-
-DESCRIPTION="Java HTML parser that makes sense of real-world HTML soup"
-HOMEPAGE="http://jsoup.org/"
-SRC_URI="https://github.com/jhy/${PN}/archive/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
-	test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-JAVA_SRC_DIR="src/main/java"
-
-java_prepare() {
-	rm pom.xml || die
-	mkdir -p target/classes/org/jsoup/nodes/ || die
-	cp src/main/java/org/jsoup/nodes/*.properties target/classes/org/jsoup/nodes/ || die
-}
-
-src_test() {
-	testcp="${S}/${PN}.jar:$(java-pkg_getjars junit-4):target/tests"
-
-	mkdir target/tests || die
-	ejavac -cp "${testcp}" -d target/tests $(find src/test/java -name "*.java")
-	cp -r src/test/resources/* target/tests || die
-
-	tests=$(find target/tests -name "*Test.class" \
-			| sed -e 's/target\/tests\///g' -e "s/\.class//" -e "s/\//./g" \
-			| grep -vP '\$');
-	ejunit4 -cp "${testcp}" ${tests}
-}
--- a/dev-java/jsoup/jsoup-1.8.3.ebuild
+++ b/dev-java/jsoup/jsoup-1.8.3.ebuild
@ -17,7 +17,7 @@ SRC_URI="https://github.com/jhy/${PN}/archive/${PN}-${MY_PV}.zip"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"

 IUSE=""

--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.60-r1.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.60-r1.ebuild
@ -108,7 +108,8 @@ RDEPEND="!x64-macos? (

 # A PaX header isn't created by scanelf so depend on paxctl to avoid
 # fallback marking. See bug #427642.
-DEPEND="jce? ( app-arch/unzip )
+DEPEND="app-arch/zip
+	jce? ( app-arch/unzip )
 	examples? ( x64-macos? ( app-arch/unzip ) )
 	pax_kernel? ( sys-apps/paxctl )"

@ -181,6 +182,11 @@ src_prepare() {
 	if use jce ; then
 		mv "${WORKDIR}"/${JCE_DIR} jre/lib/security/ || die
 	fi
+
+	# Delete Oracle's evil usage tracker. Not just because it's evil but
+	# because it breaks the sandbox during builds and we can't find any
+	# other feasible way to disable it or make it write somewhere else.
+	zip -d jre/lib/rt.jar sun/usagetracker/\* || die
 }

 src_install() {
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60-r1.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60-r1.ebuild
@ -80,7 +80,8 @@ RDEPEND="!x64-macos? (

 # A PaX header isn't created by scanelf so depend on paxctl to avoid
 # fallback marking. See bug #427642.
-DEPEND="jce? ( app-arch/unzip )
+DEPEND="app-arch/zip
+	jce? ( app-arch/unzip )
 	pax_kernel? ( sys-apps/paxctl )"

 S="${WORKDIR}/jre"
@ -121,6 +122,11 @@ src_prepare() {
 	if use jce ; then
 		mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die
 	fi
+
+	# Delete Oracle's evil usage tracker. Not just because it's evil but
+	# because it breaks the sandbox during builds and we can't find any
+	# other feasible way to disable it or make it write somewhere else.
+	zip -d lib/rt.jar sun/usagetracker/\* || die
 }

 src_install() {
--- a/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild
+++ b/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild
@ -14,7 +14,7 @@ SRC_URI="http://www.slf4j.org/dist/${P/-ext/}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""

 COMMON_DEP="dev-java/slf4j-api:0
--- a/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild
+++ b/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild
@ -13,7 +13,7 @@ SRC_URI="http://www.slf4j.org/dist/${P/-simple/}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="test"

 COMMON_DEP="dev-java/slf4j-api:0"
--- a/dev-lang/php/php-5.4.44.ebuild
+++ b/dev-lang/php/php-5.4.44.ebuild
@ -6,7 +6,7 @@ EAPI=5

 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd

-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"

 function php_get_uri ()
 {
--- a/dev-lang/php/php-5.5.28.ebuild
+++ b/dev-lang/php/php-5.5.28.ebuild
@ -6,7 +6,7 @@ EAPI=5

 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd

-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"

 function php_get_uri ()
 {
--- a/dev-lang/php/php-5.6.12.ebuild
+++ b/dev-lang/php/php-5.6.12.ebuild
@ -6,7 +6,7 @@ EAPI=5

 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd

-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"

 function php_get_uri ()
 {
--- a/dev-lang/python/python-2.7.10-r1.ebuild
+++ b/dev-lang/python/python-2.7.10-r1.ebuild
@ -0,0 +1,345 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+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 +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
+	>=sys-libs/zlib-1.1.3
+	virtual/libffi
+	virtual/libintl
+	xml? ( >=dev-libs/expat-2.1 )
+		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[berkdb] )
+		ncurses? (
+			>=sys-libs/ncurses-5.2
+			readline? ( >=sys-libs/readline-4.1 )
+		)
+		sqlite? ( >=dev-db/sqlite-3.3.8:3 )
+		ssl? ( dev-libs/openssl )
+		tk? (
+			>=dev-lang/tk-8.0
+			dev-tcltk/blt
+			dev-tcltk/tix
+		)
+	!!<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"
+
+	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"
+
+	# Backwards compat with Gentoo divergence.
+	dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
+
+	# 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 PYTHON_SITEDIR
+
+	# 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
+}
--- a/dev-lang/python/python-3.4.3-r1.ebuild
+++ b/dev-lang/python/python-3.4.3-r1.ebuild
@ -0,0 +1,306 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+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"
+#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 +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
+	app-arch/xz-utils
+	>=sys-libs/zlib-1.1.3
+	virtual/libffi
+	virtual/libintl
+	xml? ( >=dev-libs/expat-2.1 )
+		gdbm? ( sys-libs/gdbm[berkdb] )
+		ncurses? (
+			>=sys-libs/ncurses-5.2
+			readline? ( >=sys-libs/readline-4.1 )
+		)
+		sqlite? ( >=dev-db/sqlite-3.3.8:3 )
+		ssl? ( dev-libs/openssl )
+		tk? (
+			>=dev-lang/tk-8.0
+			dev-tcltk/blt
+			dev-tcltk/tix
+		)
+	!!<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}"
+
+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"
+
+	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@@"
+
+	# Disable ABI flags.
+	sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.ac || die "sed failed"
+
+	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${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/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+		-e "s/\(PY_LDFLAGS=\).*/\1/" \
+		-i "${libdir}/config-${SLOT}/Makefile" || die "sed failed"
+
+	# Backwards compat with Gentoo divergence.
+	dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
+
+	# Fix collisions between different slots of Python.
+	rm -f "${ED}usr/$(get_libdir)/libpython3.so"
+
+		use elibc_uclibc && rm -fr "${libdir}/test"
+		use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
+		use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${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-${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 PYTHON_SITEDIR
+
+	# 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}-${SLOT}_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
+}
--- a/dev-libs/appstream-glib/appstream-glib-0.4.0.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.4.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="http://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"

 LICENSE="LGPL-2.1"
 SLOT="0/7"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+introspection nls"

 # FIXME: yaml is optional with --enable-dep11 but not
--- a/dev-libs/appstream-glib/appstream-glib-0.5.0.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.5.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="http://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"

 LICENSE="LGPL-2.1"
 SLOT="0/7"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+introspection nls"

 # FIXME: yaml is optional with --enable-dep11 but not
--- a/dev-libs/jansson/jansson-2.7.ebuild
+++ b/dev-libs/jansson/jansson-2.7.ebuild
@ -13,7 +13,7 @@ SRC_URI="http://www.digip.org/jansson/releases/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh sparc x86"
 IUSE="doc static-libs"

 DEPEND="doc? ( >=dev-python/sphinx-1.0.4 )"
--- a/dev-libs/libcgroup/libcgroup-0.41-r2.ebuild
+++ b/dev-libs/libcgroup/libcgroup-0.41-r2.ebuild
@ -58,6 +58,7 @@ src_configure() {

 	use elibc_musl && append-ldflags "-lfts"
 	econf \
+		$(use_enable static-libs static) \
 		$(use_enable daemon) \
 		$(use_enable pam) \
 		$(use_enable tools) \
@ -72,6 +73,7 @@ src_test() {
 }

 src_install() {
+	default
 	prune_libtool_files --all

 	insinto /etc/cgroup
--- a/dev-libs/libev/libev-4.19.ebuild
+++ b/dev-libs/libev/libev-4.19.ebuild
@ -13,7 +13,7 @@ SRC_URI="http://dist.schmorp.de/libev/${P}.tar.gz

 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="elibc_glibc static-libs"

 # Bug #283558
--- a/dev-libs/libexplain/libexplain-1.4.ebuild
+++ b/dev-libs/libexplain/libexplain-1.4.ebuild
@ -14,7 +14,7 @@ HOMEPAGE="http://libexplain.sourceforge.net/"
 SRC_URI="http://libexplain.sourceforge.net/${P}.tar.gz"

 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-3 LGPL-3"
 IUSE="static-libs"

--- a/dev-libs/libgcrypt/libgcrypt-1.6.3-r4.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.6.3-r4.ebuild
@ -66,7 +66,7 @@ multilib_src_configure() {

 multilib_src_compile() {
 	emake
-	multilib_is_native_abi && use doc && emake -C doc gcrypt.pdf
+	multilib_is_native_abi && use doc && ARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
 }

 multilib_src_install() {
--- a/dev-libs/libgcrypt/libgcrypt-1.6.3-r5.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.6.3-r5.ebuild
@ -65,7 +65,7 @@ multilib_src_configure() {

 multilib_src_compile() {
 	emake
-	multilib_is_native_abi && use doc && emake -C doc gcrypt.pdf
+	multilib_is_native_abi && use doc && ARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
 }

 multilib_src_install() {
--- a/dev-libs/libgpg-error/libgpg-error-1.19.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.19.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"

 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-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 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp nls static-libs"

 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@ -1,3 +1,4 @@
+DIST libinput-0.7.0.tar.xz 440228 SHA256 129f485afe5e4a9394641293991c97cb99f5f3338340d0d65b704ff463d1579e SHA512 0e03ab7ca98c4574997742b7d8912000fb176d7a3e2c381b7e63139f78455374f8f38284e226fe443d5a524f34be8995317b91fc0190795a97b10af060423b77 WHIRLPOOL 664510fc33cb718b56600553332bb3eb587b3f4a40f81d4a80dd218882aba204522bcbbfab98f3ae0c6447d3a39cc98b9d88aea5f8e3c21da0803b93d64ad321
 DIST libinput-0.9.0.tar.xz 510512 SHA256 309043976f41f5451c2a4b1c25bc2993b18aecb22524d797f21eb6b6c968ff0d SHA512 a6f718215428eda45ac00c25d0b62ada84bf924822cb66e0a9b28f4cfc36e7d1678f2dfb47afae16ce4c277d589adcf97aefe8e2e5a154873b649fe4a84527a1 WHIRLPOOL 23da6dbcd7b17000cea641e0931db8a9b2ad34b0655e4e31b0419ff4799adc59d2646b10316e073ad49695ebd652c150abf05c39d15c735ecb1d97f6f8c1d8de
 DIST libinput-1.0.0.tar.xz 785056 SHA256 afbd2751c000a4e5833624b6177a6919ad259f0bca44093947421c885fd42c0f SHA512 b6fc7973982cb2826fc5beb514e954d7673023628739a86d18b2522b1ad0ecf55f9d6c83e6307c10c633c57d6b61227898aded6a22a2de536c0f14f27d23b903 WHIRLPOOL 13304875b753127ada76bf18ba56ea9828d6532db5eefce56439ede83eeeb43b6da6aa59f763d2c912de838221ee53fd7d02bf865e80316a24c412ea001d3043
 DIST libinput-1.0.1.tar.xz 800244 SHA256 482fb35119b457ba65a8bebaa47e4f6b4dbd77e59c320014a22296847b7ff99e SHA512 17efc6ddd58aadcd30aecb4d1b8b6ad32f6f61c592f29b0a99aac7d49e5cb814038874d9e8996cd6726f15c58bf4239169564c650a3250a87a9ec6fd3110c5bb WHIRLPOOL 0bba6b4a58ca0020ebcbffe5675d75832b4ed67a350ca141d990f9db522a2eee942543f475d76c1f2b816b849074f4a50e30bcb3adc99bd4abdea1a43800a2d5
--- a/dev-libs/libinput/libinput-0.7.0.ebuild
+++ b/dev-libs/libinput/libinput-0.7.0.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/"
+SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+# License appears to be a variant of libtiff
+LICENSE="libtiff"
+SLOT="0/5"
+KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 x86"
+IUSE=""
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/libevdev-0.4
+	>=sys-libs/mtdev-1.1
+	virtual/libudev
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Doc handling in kinda strange but everything
+	# is available in the tarball already.
+	sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
+		-i Makefile.am Makefile.in || die
+}
+
+src_configure() {
+	# gui can be built but will not be installed
+	econf \
+		--disable-event-gui \
+		--disable-tests
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc -r doc/html
+	prune_libtool_files
+}
--- a/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
+++ b/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
@ -15,7 +15,7 @@ SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug hsieh +libevent sasl static-libs"

 DEPEND="net-misc/memcached
--- a/dev-libs/libnl/libnl-3.2.26.ebuild
+++ b/dev-libs/libnl/libnl-3.2.26.ebuild
@ -16,7 +16,7 @@ SRC_URI="
 "
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="static-libs python utils"

 RDEPEND="python? ( ${PYTHON_DEPS} )
--- a/dev-libs/libtar/libtar-1.2.20-r3.ebuild
+++ b/dev-libs/libtar/libtar-1.2.20-r3.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static-libs zlib"

 RDEPEND="zlib? ( sys-libs/zlib )
--- a/dev-libs/ntl/ntl-9.3.0.ebuild
+++ b/dev-libs/ntl/ntl-9.3.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://www.shoup.net/ntl/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs test"

 RDEPEND="dev-libs/gmp:=
--- a/dev-libs/qjson/qjson-0.8.1-r1.ebuild
+++ b/dev-libs/qjson/qjson-0.8.1-r1.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://github/flavio/qjson/${P}.tar.bz2"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug doc test"

 RDEPEND=">=dev-qt/qtcore-4.8.6:4[${MULTILIB_USEDEP}]"
--- a/dev-perl/Archive-Zip/Archive-Zip-1.450.0.ebuild
+++ b/dev-perl/Archive-Zip/Archive-Zip-1.450.0.ebuild
@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=PHRED
-MODULE_VERSION=1.45
-inherit perl-module
-
-DESCRIPTION="A wrapper that lets you read Zip archive members as if they were files"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="
-	>=virtual/perl-Compress-Raw-Zlib-2.17
-	>=virtual/perl-File-Spec-0.800.0
-"
-RDEPEND="${DEPEND}"
-
-SRC_TEST="do"
--- a/dev-perl/Archive-Zip/Archive-Zip-1.500.0.ebuild
+++ b/dev-perl/Archive-Zip/Archive-Zip-1.500.0.ebuild
@ -5,7 +5,7 @@
 EAPI=5

 MODULE_AUTHOR=PHRED
-MODULE_VERSION=1.46
+MODULE_VERSION=1.50
 inherit perl-module

 DESCRIPTION="A wrapper that lets you read Zip archive members as if they were files"
@ -25,4 +25,4 @@ DEPEND="${RDEPEND}
 	test? ( >=virtual/perl-Test-Simple-0.880.0 )
 "

-SRC_TEST=do
+SRC_TEST="do parallel"
--- a/dev-perl/Archive-Zip/Manifest
+++ b/dev-perl/Archive-Zip/Manifest
@ -1,5 +1,4 @@
 DIST Archive-Zip-1.37.tar.gz 184345 SHA256 ba789436dc82db02a7f3d2e9d120d0221edc83d8c7ec72519648ae64bbc4ce05 SHA512 416dc16286edef085a9fd11b3f98c3abf6345a70552cf4f0d4e0da364b39d400cb259a09f1b33b82ff4aa6494a88e85e59afd80a94ae8446c329eb8a3af63ef1 WHIRLPOOL 07103e2d5a2f23e911b9bc9b3e784e21645864f2e6b08042c577deeaf5b27799c3df0fc8c2a89dfc805840ac0349e88053b173e8db51aefacb2dc7e225d5a8d1
-DIST Archive-Zip-1.45.tar.gz 186378 SHA256 bc423f96ee07512c968fa788eeccf4b0100f0c4b85f0cacc638b0d658f2f7c7c SHA512 53831db7dd17d3418c593a9961679bfc6cfe067b1f31794664bc60439b332a2e054e8145a156e3eae95f6712dd8cbcc44ed29d7ae8a4fa0f4f1b97ea924e88d4 WHIRLPOOL c71e4c5a05da18ac1f69fccd5b2c35385818bc827d029f1483c7bb07f342def9b1a1a2593fc870c8b30104d4117ff95b2b5316a454f9b0722656bb9e25a7ce6e
-DIST Archive-Zip-1.46.tar.gz 186426 SHA256 6630ebeba753a7025126028eb290040ce44d86e8ced77017e31b75863348e524 SHA512 b1aee295cd6b9f64b5168d978ac5ba756c503c868b952b0ce345914196b9f249a54ed1a063c43d11b41bf247e0bfe51c6dc0219e93c545823b61a7b969e81981 WHIRLPOOL c9a444aa9d494d2621a8615d9dd5ca80708bf3295db916bbba0e52d41d23256975e34468fe009261610fb901ecea69e3e3b6dbd132c9622a3ec209f45f945b8d
 DIST Archive-Zip-1.48.tar.gz 192695 SHA256 01cb4fbc491f9890ceabc33e9888f85261f3d17f884d2b9d8e54564befd9e09f SHA512 b636c870712d51afe1934ef6246e6654e0248052df49dcafdccf9bcde377f4822bd78a48ec39d9971fdaa80b5eb68ee9956553f98004e8edb9f9cc80903d1728 WHIRLPOOL 61c2972db1b953f8a9953ffa7b22a378519c5d817e106214c6d5598ec006bd7d7bb3bcdd383c5d60e244c4c80262224b555b91102794cc98ea263362a529c788
 DIST Archive-Zip-1.49.tar.gz 192903 SHA256 991622ea495daf395abcd69c3b9b8ac92a10435c8d9562d50e30ef395dcc9451 SHA512 78e34f4a122ff5ad516d9efa983de8ba7995b87107148658e5d4100d3d428c361c4ab2674fce1bc87cc4068bdd3277ea810a878175a5c3b4eed691c79a260664 WHIRLPOOL 77d57b0bf8c5b9820dd13302797a278b2db5ad3f5cd8df981115a7eff3ed794ca5b93d3df3403013ae4a124b26911891e6b365bca6e44950375a0086feba4254
+DIST Archive-Zip-1.50.tar.gz 188086 SHA256 514020ac15a3442867267f294f155065b4c0b1a09e6106837359d28d1e3e0eeb SHA512 3b79da1edb1e0c9bc72206a33d7ec1e44eec008b28de17236f7f40808deccf8c394c6fc66eb0efe9b60490a58b4e72f6c428a157147b812e1b148db867a2582d WHIRLPOOL cb252199d4c2ffbca5e8e4b4cef968e655bdf63b997a56a55ef22e9c11d4f5c0cc08a99d0facca75a4890a04fe8e389bf3644f894ddec38fe54e3d77856288cc
--- a/dev-perl/B-Hooks-Parser/B-Hooks-Parser-0.120.0-r1.ebuild
+++ b/dev-perl/B-Hooks-Parser/B-Hooks-Parser-0.120.0-r1.ebuild
@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=ETHER
-MODULE_VERSION=0.12
-inherit perl-module
-
-DESCRIPTION="Interface to perls parser variables"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-perl/B-Hooks-OP-Check"
-DEPEND="${RDEPEND}
-	>=dev-perl/ExtUtils-Depends-0.302
-	test? ( dev-perl/Test-Exception
-		dev-perl/B-Hooks-EndOfScope )"
-SRC_TEST=do
--- a/dev-perl/B-Hooks-Parser/B-Hooks-Parser-0.160.0.ebuild
+++ b/dev-perl/B-Hooks-Parser/B-Hooks-Parser-0.160.0.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=ETHER
+MODULE_VERSION=0.16
+inherit perl-module
+
+DESCRIPTION="Interface to perls parser variables"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-perl/B-Hooks-OP-Check-0.180.0"
+DEPEND="${RDEPEND}
+	>=dev-perl/ExtUtils-Depends-0.302.0
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Test-Exception
+		dev-perl/B-Hooks-EndOfScope
+		virtual/perl-File-Spec
+		virtual/perl-Test-Simple
+	)
+"
+
+SRC_TEST="do parallel"
--- a/dev-perl/B-Hooks-Parser/Manifest
+++ b/dev-perl/B-Hooks-Parser/Manifest
@ -1,2 +1,2 @@
-DIST B-Hooks-Parser-0.12.tar.gz 72662 SHA256 cddbc1e664975ef1e35b5f9361ff993d9005507201463f9e5561a056ffbadb25 SHA512 d6c6cbe521362ec9b5efd7d4b920f26bd35a8d37073d2f803d9e0a6d1965b712ea4ba5d2cc8f4d8195fd3f71c7a247202055295395df733c997eb0c3d290a7e5 WHIRLPOOL 9c38e6b29193de7f1748130e3e25d24168beab0b43da3bdfe64355925fd11c21ece983f313d594a60c7e634b00da6ce68b163116662a88aa952cb66b7c71c415
 DIST B-Hooks-Parser-0.13.tar.gz 83951 SHA256 f6c838e59f52e21ccc0b2c9d85d6f7ba33119098ad3a261698b01690c2619646 SHA512 f1729830350d25f5decc4b08be23591920683d86d910bec99b478e58905dee6cc384af305b665a8a90dc48b9b819df6cbc975cf606b495448d25d00e3357a149 WHIRLPOOL d6505cbb95834b0a6084af24ba4f1ba96704016cf0180a79e479036d98567c29fbc42f60b91e5c72068e5403dc581d56c5b0493e173965ee571f9ce442094725
+DIST B-Hooks-Parser-0.16.tar.gz 84593 SHA256 24e65268da41976fe3055091554848f6ef6eedd0c5c1a708b0fca5fe10cabab6 SHA512 5079b7233b5d69c4347cace3131e736c973d6c63daf063b39338d2b91dd44880fbfb255b9e9aac291ec0614e747115d14c2b7e13425336b97352ee1a41a10a2a WHIRLPOOL 9c53d5621b1648ef3636282cf51cc23b619fc4ece408a29e4980789fbf053642d89c98ae319c17a8217789727a6239e99d5be2fd05f04fa5861cecccd7d7bd83
--- a/dev-perl/CPAN-Changes/CPAN-Changes-0.400.2.ebuild
+++ b/dev-perl/CPAN-Changes/CPAN-Changes-0.400.2.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=HAARG
+MODULE_VERSION=0.400002
+inherit perl-module
+
+DESCRIPTION='Read and write Changes files'
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=virtual/perl-Text-Tabs+Wrap-0.3.0
+	>=virtual/perl-version-0.990.600
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.960.0 )
+"
+
+SRC_TEST="do parallel"
--- a/dev-perl/CPAN-Changes/Manifest
+++ b/dev-perl/CPAN-Changes/Manifest
@ -1,2 +1,3 @@
 DIST CPAN-Changes-0.27.tar.gz 35558 SHA256 386ca683109fa0a88064c2105dab5ea361d8e6de96cb065e8501ddffb6ffb191 SHA512 0034d51f27111bc376220afb35c72b958c6debd7c9f5cf5778705a45fa85a9f8609d0bdd62928a30a6d203301140591d96a8964308ca4a6617847e35099d72ac WHIRLPOOL a127fe1f00062373a4b54d55cf33be3cd5a2d24210f7f381ac7006f05b3c18e8988ab1a1b1bf853083bbdb700aae770b7d1323cd3607174e670f2056fb284d87
 DIST CPAN-Changes-0.30.tar.gz 37095 SHA256 e4ac13555163f22a7f99a9494f9db28c68b02447e08bce230515fc36a5cfa1ab SHA512 d262881ac574328714aa4b10b5e2e3d0c2f282dcd9f98b93df2ddb854b9601a9b2c324e22fbb1a8a491e67ddd334879a88bd6f407421366fa3b2eb3e6af40f4d WHIRLPOOL 1befce0638bf63ebc7ac29104f925a87398a6bce4fd7c57330eaa9f5fe20eb9af57037ef800129fa675a786be06884199f37a02a2e6073ea22623891432de116
+DIST CPAN-Changes-0.400002.tar.gz 21361 SHA256 01eedea90d07468cb58e4a50bfa3bb1d4eeda9073596add1118fc359153abe8d SHA512 d359073d9d5ed2126835d4895c1ee5288cc09e72202ba77441bb25cf13e9cd0f16d4040b7e2cf1785efd6e8ccbe7908415fb4fefeebe9c0548d838d2ac850dfb WHIRLPOOL 4a3cdd3cab1bee0b69372b0b5096ffdb625d013cf47744d7e2d466fa0d400bb2bb57057dd21d1cdb588df852f2792cd662128fba84cda7a0ff5762786cd90a8d
--- a/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild
+++ b/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=STEPHEN
+MODULE_VERSION=1.124
+inherit perl-module
+
+DESCRIPTION="Extract data from Macintosh BinHex files"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Exporter
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/File-Slurp
+		virtual/perl-File-Temp
+		virtual/perl-autodie
+		virtual/perl-Test-Simple
+		dev-perl/Test-Most
+	)
+"
+
+SRC_TEST="do parallel"
--- a/dev-perl/Convert-BinHex/Manifest
+++ b/dev-perl/Convert-BinHex/Manifest
@ -1 +1,2 @@
 DIST Convert-BinHex-1.123.tar.gz 75876 SHA256 bd2028056297087a94d14d5390878f9aa69b0a6d186fe23f0925271e5bcfc440 SHA512 dc856ce8db67217e6e60daa59de2255348d0e5f9fc2d40e71a5f8fa36619a22e7deb9517b8fe7621d7f608f33ec12cd78bfd7ab65bd65e371ee720170c29129f WHIRLPOOL 97f3314e5a3903ae80dd39638dd9095f7bd35aca31eaf3093b39a8a5e7b941ac6d981f3fc611f1224521ad4c0a38a23bbd474099f0a2b054fe095bafdbe18e68
+DIST Convert-BinHex-1.124.tar.gz 73095 SHA256 42907b960ca70aa7be69b340ed567e8dd0b9d5e06541a5d89aa3a34255dabdb9 SHA512 79cc903c3c68680309ceab8312f909c32b8b90bdde3424081c1b81fac0371799f11a6d37702d14a58a5ca843706e3c4e8adf61daafd5fc2ab3922e49de8ec697 WHIRLPOOL 82c6e6003f183ccaba5e00d1e8ef24bd8f633d2b455521e1e13ea138a5753c36b8dfb763b8fb47283d7f21d4bad132114c1bd9262bab4202be6a5659f3fe4a7e
--- a/dev-perl/Convert-Binary-C/Convert-Binary-C-0.770.0.ebuild
+++ b/dev-perl/Convert-Binary-C/Convert-Binary-C-0.770.0.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=MHX
+MODULE_VERSION=0.77
+inherit perl-module
+
+DESCRIPTION="Binary Data Conversion using C Types"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="virtual/perl-ExtUtils-MakeMaker"
+
+MAKEOPTS+=" -j1"
+SRC_TEST="do"
--- a/dev-perl/Convert-Binary-C/Manifest
+++ b/dev-perl/Convert-Binary-C/Manifest
@ -1 +1,2 @@
 DIST Convert-Binary-C-0.76.tar.gz 1562755 SHA256 4f0ce8dcee618f9a2309161994545b1d019742387627bf647459033ae94952e5 SHA512 d86b436866ce4ab3d346807dad8db7e453119334593cc203e96dc6c07214bf13717ad2a0ad0cc164d0a41429a161c17c82f711232572a4ab71eabba11649ae10 WHIRLPOOL 95fadda022c3147d274abd90156a536e401f45dce4f4767c4f372d4551273b119705f86e7198ca3c0d23dc1fcb2782307f21c3953b39871be1a67367a43b7a87
+DIST Convert-Binary-C-0.77.tar.gz 1562435 SHA256 fe33824fbdd20920658b36e0cd50bcb0d2924c83ab3240b861340d558dd7fc91 SHA512 662f1dc2080f3e432727553067826f09d20f30f0dbe09154eea4cbbdd5020d32f6839806365741e4aa54e8cb85eb948787904204cb2e029b9ec7eae605599d45 WHIRLPOOL 35227fcf1d1833c92ad9ea6a9e28a122307868285f0a7709c7392c6d626477b6e1a9c35a399590303c18f08dc48f35a7e17b6384a5ddb84d39b566dda148c9b8
--- a/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0.ebuild
+++ b/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=MLEHMANN
+MODULE_VERSION=1.5
+inherit perl-module
+
+DESCRIPTION="A Perl interface to the uulib library"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+PATCHES=( "${FILESDIR}/${P}-unbundle.patch" )
+
+RDEPEND="
+	>=dev-libs/uulib-0.5.20-r1
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.520.0
+	dev-perl/Canary-Stability
+"
+
+SRC_TEST="do parallel"
--- a/dev-perl/Convert-UUlib/Manifest
+++ b/dev-perl/Convert-UUlib/Manifest
@ -1 +1,2 @@
 DIST Convert-UUlib-1.4.tar.gz 232006 SHA256 a85fe375bad0b7b8411719b27ac395ba804356d2fc528e9f127e1018cd95efcf SHA512 97dae96b173cfdaf35126f70a883b3462977c3bfb281334f2e54c66ba518ce936ae3046d911ed0a39974df47d0b46bc286afb01faa0d934895402049b3f79cfd WHIRLPOOL d195a34fc1dec5dfd971d6908afef9f7e68856ca82104dea92514132ff1dbf846e322265a17c531746cf76e8892aa2ea5f8c694d10aa6ed7eec3262a5058489b
+DIST Convert-UUlib-1.5.tar.gz 236213 SHA256 0cd81bc21377fad191f89aa427733efe5b7e75ca1889e9317945ad448c6388ea SHA512 92c8b6f3a72546dca21018ddf2863113904f550e3ed950a1898ed4abfcc48738e9ca374f5adbc3226df2db6beeb0e12879ae52cdd067a030c199766d53603ec1 WHIRLPOOL 59faba3ce22e4e9c7f464f2e1980524cb29cb0cf6b145765f4f2291e545ec74a27955b63375a3b9dad69a085800ed18bcc8f494dcfdbb0bce2b7363e356978ec
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST java-apicheck-0_p20150907.tar.gz 1550 SHA256 4f8a108e78b556d3400e334d3cd0b972628a8cee97bfe903e656ddbb46368449 SHA512 68a3a5443ea26840a526c2e53451e47e441f6ec15b2ddffef8f5d63a50f1129d18cd65506ecfe0bbf3f9829514697648eff8f64e558f0bd5376b0bf2add70b70 WHIRLPOOL 0640404622635f36c2dab7623510b5ea913a409382b77699c0dea5904fdedf0d83ba5bdf3e2247d3ed3b3b33a2dd271b9ba1d4b2913428adfa01381be1cdbdef`