Sync with portage [Sat Sep 24 22:40:03 MSK 2016].

8 years ago · efbead9297
parent 732d206c63
commit efbead9297
7996 changed files with 12382 additions and 13971 deletions
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.20.1.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.20.1.ebuild
@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"

 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"

 COMMON_DEPEND="
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.20.2.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.20.2.ebuild
@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 LICENSE="LGPL-2+"
 SLOT="2"
 IUSE="X +introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"

 # x11-libs/libSM is needed until upstream #719808 is solved either
 # making the dep unneeded or fixing their configure
--- a/app-admin/drush/drush-6.7.0.ebuild
+++ b/app-admin/drush/drush-6.7.0.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""

 DEPEND=""
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@ -1,2 +1,4 @@
 DIST puppet-agent_1.6.2-1xenial_amd64.deb 13882068 SHA256 e4921a53f71bb16d9b19b261d1cf415d2be03ae8e8605a36037d080e1fd928e3 SHA512 1621c1458a973a39104a6a5750ee02bb50cbaab2010097db9a4e0e7a668576c93012ac7c1408c470bc6debfda2bbd15e147e852cc0b944619c49879bd3b676d8 WHIRLPOOL 6dbedd797a0fc8503176103f6992af76898663f059412816fdeeb2780c7142538c26c31e300dee593b6b9efd4fd6173eddfcae3dec1ae5975e27daaf1169ccd2
 DIST puppet-agent_1.6.2-1xenial_i386.deb 15231484 SHA256 b58a9e73df92181700183a32803f01d00dff8d7b5d8565ec1cc512a850301f79 SHA512 8ddbb5e7da0cb94e3948c3d993fda364b5f6cb22514218d02df685826658d5649d066e4121881d0ea4b7d17b524d26df140915ef158b86c5a134ca3ee3206148 WHIRLPOOL 64173df8aad4056621252e9d9cbc5f04cd18753377e80d1fe663478518d10484d48cc162d213e4ad0f535c4c23626cb32166f5896624e8772899acb05325152d
+DIST puppet-agent_1.7.0-1xenial_amd64.deb 13880620 SHA256 804cce57baca64f50d1f78a1fa2b7668aec99a78ea4d19e12935f1c9811c44b6 SHA512 2414a42c86a84ab3235b99a6e824bcbd93b432572a64e7faab29ca9b027da27aefd168d060f9bac73663639cbf5213a74bb14e152a60a307efea6704a183424b WHIRLPOOL 1fec15a704f1a836bca4fc58dbb369b3e5e6c171f998a08e78ba642c96b9cce84de0bb22435c230038714f4b7be405154856ebb39aa96a7733b7c8f02974c587
+DIST puppet-agent_1.7.0-1xenial_i386.deb 15233100 SHA256 bb602489cff71e228496b819242dde362f6486290ef60ff500025294dfb072ff SHA512 720572147d4808045960ab630ab23b7de9ea0eb6d0c388c0ad814eebc07fbe466bf7161c9d357e4562a0a92a41e348f7cf247364acae63f831787b3e0daa3de2 WHIRLPOOL 0dd236d25d99e9aa5c5c3611568fc42945e537b4e9f65e89e7b8b27aa48b64e9a9108e682adcb71982b101f8ccfb78abe695e66f9d850cdba9b13439f9d655ef
--- a/app-admin/puppet-agent/puppet-agent-1.7.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-1.7.0.ebuild
@ -0,0 +1,99 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils systemd unpacker user
+
+DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/xenial/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1xenial"
+SRC_URI="
+	amd64? ( ${SRC_BASE}_amd64.deb )
+	x86?   ( ${SRC_BASE}_i386.deb )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/augeas
+	!app-admin/mcollective
+	!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	!app-emulation/virt-what"
+
+DEPEND="
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	sys-apps/dmidecode
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="
+	/opt/puppetlabs/puppet
+	/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/*
+	/opt/puppetlabs/puppet/lib/engines/*
+	/opt/puppetlabs/puppet/lib/virt-what/*
+	/opt/puppetlabs/puppet/lib/*
+	/opt/puppetlabs/puppet/bin/*"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/run/puppet puppet
+}
+
+src_install() {
+	# conf.d
+	doconfd etc/default/puppet
+	doconfd etc/default/mcollective
+	# logrotate.d
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/mcollective
+	# puppet itself
+	insinto /etc/puppetlabs
+	doins -r etc/puppetlabs/*
+	# logdir for systemd
+	dodir var/log/puppetlabs/puppet/
+	fperms 0750 var/log/puppetlabs/puppet/
+	# the rest
+	insinto /opt
+	dodir opt/puppetlabs/puppet/cache
+	doins -r opt/*
+	fperms 0750 /opt/puppetlabs/puppet/cache
+	# init
+	newinitd "${FILESDIR}/puppet.initd" puppet
+	newinitd "${FILESDIR}/mcollective.initd" mcollective
+	systemd_dounit "${FILESDIR}/puppet.service"
+	systemd_dounit "${FILESDIR}/mcollective.service"
+	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+	dosym /opt/puppetlabs/bin/facter /usr/bin/facter
+	dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
+	dosym /opt/puppetlabs/bin/mco /usr/bin/mco
+	dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
+	dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
+	dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+	dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
+	dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
+	dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
+}
--- a/app-admin/puppetserver/puppetserver-2.4.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-2.4.0.ebuild
@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"

 RDEPEND+="
 		>=virtual/jdk-1.7.0
--- a/app-admin/sysstat/sysstat-11.4.0.ebuild
+++ b/app-admin/sysstat/sysstat-11.4.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}${P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="debug isag nls lm_sensors selinux static"

 CDEPEND="
--- a/app-backup/rsnapshot/rsnapshot-1.4.1.ebuild
+++ b/app-backup/rsnapshot/rsnapshot-1.4.1.ebuild
@ -12,7 +12,7 @@ SRC_URI="http://www.rsnapshot.org/downloads/${P}.tar.gz"

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

 RDEPEND=">=dev-lang/perl-5.8.2
 		dev-perl/Lchown
--- a/app-crypt/gcr/gcr-3.20.0.ebuild
+++ b/app-crypt/gcr/gcr-3.20.0.ebuild
@ -17,7 +17,7 @@ SLOT="0/1" # subslot = suffix of libgcr-3
 IUSE="debug gtk +introspection vala"
 REQUIRED_USE="vala? ( introspection )"

-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"

 COMMON_DEPEND="
 	>=app-crypt/p11-kit-0.19
--- a/app-crypt/gpgme/files/gpgme-1.7.0-build-python.patch
+++ b/app-crypt/gpgme/files/gpgme-1.7.0-build-python.patch
@ -0,0 +1,115 @@
+From e5bccea346379a70fd9cb910c4ead9642227747f Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 24 Sep 2016 01:26:19 +0300
+Subject: [PATCH] build: lang: python: cleanups
+
+1. Make setup.py executable when generated.
+
+2. Add prepare target to enable prepare the source tree without building
+   anything. This is handy to enable standard distutils build outside of
+   gpgme build system.
+
+3. Treat data.h in similar manner as other VPATH issues, just symlink it
+   to the srcdir to simplify build, remove the CFLAGS requirement of
+   distutils.
+
+The above does not alter the behavior of current build but supports the
+following sequence:
+
+$ mkdir build
+$ cd build
+$ ../configure --enable-languages=
+$ make
+$ cd lang/python
+$ make prepare
+$ ./setup.py build
+$ ./setup.py install
+
+Notice the standard use of distutils which is required for package
+manager to control the python selection and build process.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ configure.ac            |  2 +-
+ lang/python/Makefile.am | 16 ++++++++++------
+ lang/python/gpgme.i     |  2 +-
+ 3 files changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4a29f2f..efa1f19 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -886,9 +886,9 @@ AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd])
+ AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([lang/qt/doc/Doxyfile])])
+ AC_CONFIG_FILES(lang/qt/doc/Makefile)
+ AC_CONFIG_FILES([lang/python/Makefile
+-		 lang/python/setup.py
+ 		 lang/python/pyme/version.py
+ 		 lang/python/tests/Makefile])
+AC_CONFIG_FILES([lang/python/setup.py], [chmod a+x lang/python/setup.py])
+ AC_OUTPUT
+ 
+ echo "
+diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
+index 2271ce0..9866f53 100644
+--- a/lang/python/Makefile.am
+++ b/lang/python/Makefile.am
+@@ -46,24 +46,28 @@ COPY_FILES_PYME = \
+ 
+ # For VPATH builds we need to copy some files because Python's
+ # distutils are not VPATH-aware.
+-copystamp: $(COPY_FILES) $(COPY_FILES_PYME)
+copystamp: $(COPY_FILES) $(COPY_FILES_PYME) data.h
+ 	if test "$(srcdir)" != "$(builddir)" ; then \
+ 	  cp -R $(COPY_FILES) . ; \
+ 	  cp -R $(COPY_FILES_PYME) pyme ; \
+ 	fi
+ 	touch $@
+ 
+data.h:
+	ln -s "$(top_srcdir)/src/data.h"
+
+ all-local: copystamp
+ 	for PYTHON in $(PYTHONS); do \
+-	  CFLAGS="$(CFLAGS) -I$(top_srcdir)" \
+-	    $$PYTHON setup.py build --verbose ; \
+	  $$PYTHON setup.py build --verbose ; \
+ 	done
+ 
+ dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc: copystamp
+-	CFLAGS="$(CFLAGS) -I$(top_srcdir)" \
+-	  $(PYTHON) setup.py sdist --verbose
+	$(PYTHON) setup.py sdist --verbose
+ 	gpg2 --detach-sign --armor dist/pyme3-$(VERSION).tar.gz
+ 
+.PHONY: prepare
+prepare: copystamp
+
+ .PHONY: sdist
+ sdist: dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc
+ 
+@@ -72,7 +76,7 @@ upload: dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc
+ 	twine upload $^
+ 
+ CLEANFILES = gpgme.h errors.i gpgme_wrap.c pyme/gpgme.py \
+-	  copystamp
+	  data.h copystamp
+ 
+ # Remove the rest.
+ #
+diff --git a/lang/python/gpgme.i b/lang/python/gpgme.i
+index 84addae..ac666f4 100644
+--- a/lang/python/gpgme.i
+++ b/lang/python/gpgme.i
+@@ -183,7 +183,7 @@
+    representation of struct gpgme_data for an very efficient check if
+    the buffer has been modified.  */
+ %{
+-#include "src/data.h"	/* For struct gpgme_data.  */
+#include "data.h"	/* For struct gpgme_data.  */
+ %}
+ #endif
+ 
+-- 
+2.7.3
+
--- a/app-crypt/gpgme/files/gpgme-1.7.0-build-tests-disable.patch
+++ b/app-crypt/gpgme/files/gpgme-1.7.0-build-tests-disable.patch
@ -0,0 +1,40 @@
+From 516022b0cd1a43973a467bb5b7e6813b9444d608 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 23 Sep 2016 22:46:39 +0300
+Subject: [PATCH] build: tests: remove non working
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ lang/qt/tests/Makefile.am | 2 +-
+ tests/gpg/Makefile.am     | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
+index a41dc8c..e05c8a3 100644
+--- a/lang/qt/tests/Makefile.am
+++ b/lang/qt/tests/Makefile.am
+@@ -25,7 +25,7 @@ TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir)
+ EXTRA_DIST = initial.test
+ 
+ TESTS = initial.test t-keylist t-keylocate t-ownertrust t-tofuinfo \
+-        t-encrypt t-wkspublish
+        t-wkspublish
+ 
+ moc_files = t-keylist.moc t-keylocate.moc t-ownertrust.moc t-tofuinfo.moc \
+             t-encrypt.moc t-support.hmoc t-wkspublish.moc
+diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
+index 9877843..90a1dfd 100644
+--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
+@@ -36,7 +36,7 @@ endif
+ 
+ c_tests = \
+         t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers		\
+-	t-decrypt t-verify t-decrypt-verify t-sig-notation t-export	\
+	t-decrypt t-verify t-decrypt-verify t-export	\
+ 	t-import t-trustlist t-edit t-keylist t-keylist-sig t-wait	\
+ 	t-encrypt-large t-file-name t-gpgconf t-encrypt-mixed $(tests_unix)
+ 
+-- 
+2.7.3
+
--- a/app-crypt/gpgme/files/gpgme-1.7.0-build-tests.patch
+++ b/app-crypt/gpgme/files/gpgme-1.7.0-build-tests.patch
@ -0,0 +1,82 @@
+From c2f352363615a4581e01999eb4230f4921cc6f9f Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 23 Sep 2016 23:05:35 +0300
+Subject: [PATCH] build: avoid build tests if not required
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ lang/qt/tests/Makefile.am  | 2 +-
+ tests/Makefile.am          | 2 +-
+ tests/gpg/Makefile.am      | 2 +-
+ tests/gpgsm/Makefile.am    | 2 +-
+ tests/opassuan/Makefile.am | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
+index 36ecfe4..63186e7 100644
+--- a/lang/qt/tests/Makefile.am
+++ b/lang/qt/tests/Makefile.am
+@@ -62,7 +62,7 @@ nodist_t_keylist_SOURCES = $(moc_files)
+ 
+ BUILT_SOURCES = $(moc_files)
+ 
+-noinst_PROGRAMS = t-keylist t-keylocate t-ownertrust t-tofuinfo t-encrypt \
+check_PROGRAMS = t-keylist t-keylocate t-ownertrust t-tofuinfo t-encrypt \
+     run-keyformailboxjob t-wkspublish
+ 
+ CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index c71914f..b698e11 100644
+--- a/tests/Makefile.am
+++ b/tests/Makefile.am
+@@ -31,7 +31,7 @@ LDADD = ../src/libgpgme.la @GPG_ERROR_LIBS@
+ 
+ noinst_HEADERS = run-support.h
+ 
+-noinst_PROGRAMS = $(TESTS) run-keylist run-export run-import run-sign \
+check_PROGRAMS = $(TESTS) run-keylist run-export run-import run-sign \
+ 		  run-verify run-encrypt run-identify run-decrypt run-genkey \
+ 		  run-keysign run-tofu
+ 
+diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
+index 90a1dfd..671a2f3 100644
+--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
+@@ -64,7 +64,7 @@ LDADD = ../../src/libgpgme.la
+ t_thread1_LDADD = ../../src/libgpgme-pthread.la -lpthread
+ 
+ # We don't run t-genkey in the test suite, because it takes too long
+-noinst_PROGRAMS = $(c_tests) t-genkey
+check_PROGRAMS = $(c_tests) t-genkey
+ 
+ clean-local:
+ 	-$(top_srcdir)/tests/start-stop-agent --stop
+diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am
+index 41645b6..1bdb712 100644
+--- a/tests/gpgsm/Makefile.am
+++ b/tests/gpgsm/Makefile.am
+@@ -40,7 +40,7 @@ LDADD = ../../src/libgpgme.la
+ 
+ # We don't run t-genkey in the test suite, because it takes too long
+ # and needs a working pinentry.
+-noinst_PROGRAMS = $(c_tests) t-genkey cms-keylist cms-decrypt
+check_PROGRAMS = $(c_tests) t-genkey cms-keylist cms-decrypt
+ 
+ key_id = 32100C27173EF6E9C4E9A25D3D69F86D37A4F939
+ 
+diff --git a/tests/opassuan/Makefile.am b/tests/opassuan/Makefile.am
+index 31d26ed..608b608 100644
+--- a/tests/opassuan/Makefile.am
+++ b/tests/opassuan/Makefile.am
+@@ -27,7 +27,7 @@ EXTRA_DIST =
+ AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
+ LDADD = ../../src/libgpgme.la
+ 
+-noinst_PROGRAMS = $(TESTS) t-command
+check_PROGRAMS = $(TESTS) t-command
+ 
+ DISTCLEANFILES =
+ 
+-- 
+2.7.3
+
--- a/app-crypt/gpgme/gpgme-1.7.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.7.0.ebuild
@ -4,7 +4,10 @@

 EAPI="6"

-inherit eutils qmake-utils
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools distutils-r1 eutils

 DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
 HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
@ -13,12 +16,17 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="1/11" # subslot = soname major version
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp static-libs cxx qt5 test"
+IUSE="common-lisp static-libs cxx python qt5 test"

 RDEPEND="app-crypt/gnupg
 	>=dev-libs/libassuan-2.0.2
 	>=dev-libs/libgpg-error-1.11
-	qt5? ( dev-qt/qtcore:5 )"
+	qt5? (
+		dev-qt/qtcore:5
+		!kde-apps/gpgmepp:4
+		!kde-apps/kdepimlibs:4
+	)
+	python? ( ${PYTHON_DEPS} )"
 		#doc? ( app-doc/doxygen[dot] )
 DEPEND="${RDEPEND}
 	qt5? (
@ -29,18 +37,28 @@ REQUIRED_USE="qt5? ( cxx )"

 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.8-et_EE.patch
+	"${FILESDIR}"/${P}-build-tests.patch
+	"${FILESDIR}"/${P}-build-tests-disable.patch
+	"${FILESDIR}"/${P}-build-python.patch
 )

+do_python() {
+	if use python; then
+		pushd lang/python > /dev/null || die
+		distutils-r1_src_${EBUILD_PHASE}
+		popd > /dev/null
+	fi
+}
+
 src_prepare() {
 	default
-
-	# remove non working tests
-	sed -i 's/\tt-sig-notation\$(EXEEXT)/\t/' tests/gpg/Makefile.in || die
-	sed -i 's/ t-encrypt\$(EXEEXT)//' lang/qt/tests/Makefile.in || die
+	eautoreconf
+	do_python
 }

 src_configure() {
-	local languages=( "cl" )
+	local languages=()
+	use common-lisp && languages+=( "cl" )
 	use cxx && languages+=( "cpp" )
 	if use qt5; then
 		languages+=( "qt" )
@ -52,11 +70,19 @@ src_configure() {
 		--includedir="${EPREFIX}/usr/include/gpgme" \
 		--enable-languages="${languages[*]}" \
 		$(use_enable static-libs static)
+
+	use python && make -C lang/python prepare
+
+	do_python
+}
+
+src_compile() {
+	default
+	do_python
 }

 src_install() {
 	default
+	do_python
 	prune_libtool_files
-
-	use common-lisp || rm -fr "${ED}usr/share/common-lisp"
 }
--- a/app-eselect/eselect-php/eselect-php-0.9.2.ebuild
+++ b/app-eselect/eselect-php/eselect-php-0.9.2.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~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 ~arm64 ~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"
 IUSE="fpm apache2"

 # The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@ -1,2 +1,3 @@
 DIST byobu_5.111.orig.tar.gz 664384 SHA256 b28c93f72cd9a62e1b1aa11abc8d8863f06c43da2c7089f6529683bbf13a50fc SHA512 f4b20fd3ac01b4361a9ea02428326c3920a8bf728b03c309d491413daf603b3b2807ab1770274034f08299947d66a759777a1b2ddd087d7c9c19c67c7baec48a WHIRLPOOL 32cddcc542137a438bffde637190663d7f56ba44de622110134b79f536b5f33ff3e80a28824d33b12ad792efd27e9bf898ee13e186df7923f46dce29d0a01b44
+DIST byobu_5.112.orig.tar.gz 664274 SHA256 4d67fb7bc18cb6ceb74f800fc312c3a1c6b1cb19c1d6e0e6cfe60fd8900e7b2b SHA512 57545ac86e1f6bf6601250bfd9d46ada17b22728a17453f9810b723c393655db97723d068b2452467dc4b4e9c2d9d52b76011191f4f09c01ad4bb91d93f15bea WHIRLPOOL 5a30f25a50ebf2a6ca30765a18d1850dc1c6433aed39e2dc56d9da1cbd4a3aec3c4d9d8d74fe6b965e912abd52d289b8f801050c9454ff865e508281b9014de5
 DIST byobu_5.94.orig.tar.gz 660103 SHA256 4917013f590110d25b18293a51af02bd1ebcd1c665474f62e2566fb9b8f62916 SHA512 b4e07d7d197f8796c26f33aa08c1d61dab463ce5cd2d646bf32c4c5a4be17ffe2b8996cb305c999ca0be20a1fab81c24dbd0eae5588b74e8da1e7726c293b2e6 WHIRLPOOL d2832c4ecac9d4d6907051d33efb8f51816866ce4bd0d75d5684322dd83a56d0a4717d2b6fd7736a0ca488d5e2e648a0e48a09de6a0bffcd779aa63cefd50c4c
--- a/app-misc/byobu/byobu-5.112.ebuild
+++ b/app-misc/byobu/byobu-5.112.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
+HOMEPAGE="http://byobu.co"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="screen"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/newt[${PYTHON_USEDEP}]
+	screen? ( app-misc/screen )
+	!screen? ( app-misc/tmux )"
+
+src_prepare() {
+	default
+
+	python_fix_shebang .
+
+	# Set default system backend to screen
+	if use screen ; then
+		sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
+	fi
+}
+
+src_install() {
+	default
+
+	# Create symlinks for backends
+	dosym ${PN} /usr/bin/${PN}-screen
+	dosym ${PN} /usr/bin/${PN}-tmux
+
+	docompress -x /usr/share/doc/${PN}
+}
--- a/app-misc/sphinx/sphinx-2.2.11.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11.ebuild
@ -14,7 +14,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug +id64 mysql odbc postgres re2 stemmer syslog xml"

 RDEPEND="mysql? ( virtual/mysql )
--- a/app-misc/srm/srm-1.2.15.ebuild
+++ b/app-misc/srm/srm-1.2.15.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

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

 DEPEND="!app-misc/secure-delete
--- a/app-misc/task/Manifest
+++ b/app-misc/task/Manifest
@ -1,3 +1 @@
-DIST task-2.4.4.tar.gz 2352265 SHA256 7ff406414e0be480f91981831507ac255297aab33d8246f98dbfd2b1b2df8e3b SHA512 23565dc21bb5a05af5fe44235756ac5ecbd3b7cd94b2edc2ed0b0bd4efc5a12739cc8e3474174878595188ba726428b865dee3a79f0ad2550d5a0bc25415b103 WHIRLPOOL f071926d77a228289e2fb6a9e5c53e9db9e2d278879bf6249b04b0e7f7afe5f4195f9ea3fb42ac4aac318d0f53eda378ac24c73321d99a83c0f22295ad1dcaf4
-DIST task-2.5.0.tar.gz 900285 SHA256 4d8e67415a6993108c11b8eeef99b76a991af11b22874adbb7ae367e09334636 SHA512 911ed33553c71d0578dda20774ff1c5762700957ed637ed849ef51c4cd00a53feabc18c477dbc4b618371d9ddc8fec71795f96d8474acbec8a91be8bb1ff1bfd WHIRLPOOL e17995f173c6935f46ab476517e16157771a52bb930a6287e3f17b68ebae19db380da0643ae7a1fe6ce549ccb11d8ebe71ed45b5b650eef4343902b70459e1e6
 DIST task-2.5.1.tar.gz 903428 SHA256 d87bcee58106eb8a79b850e9abc153d98b79e00d50eade0d63917154984f2a15 SHA512 ec17e5cefff55ecd2c1cb717801c02683d94030906c8d86450c3c79c0bc5a18d82559a5e9e26a91411a1025a241b78ddbc1de51cafc1a2dd531e8229e5e61c10 WHIRLPOOL e4502a4f545eb5c044943758e3b4710db34c9011ccb58b95e70486c09593620a91cf547100025182867b69c87099cd8614b6bc28e21d5e0c0b88216f6df419ac
--- a/app-misc/task/task-2.4.4.ebuild
+++ b/app-misc/task/task-2.4.4.ebuild
@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils cmake-utils bash-completion-r1
-
-DESCRIPTION="Taskwarrior is a command-line todo list manager"
-HOMEPAGE="http://taskwarrior.org/"
-SRC_URI="http://taskwarrior.org/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x64-macos"
-IUSE="gnutls vim-syntax zsh-completion"
-
-DEPEND="sys-libs/readline:0
-	gnutls? ( net-libs/gnutls )
-	elibc_glibc? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# use the correct directory locations
-	sed -i "s:/usr/local/bin:${EPREFIX}/usr/bin:" \
-		scripts/add-ons/* || die
-
-	# don't automatically install scripts
-	sed -i '/scripts/d' CMakeLists.txt || die
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_use gnutls GNUTLS)
-		-DTASK_DOCDIR=share/doc/${PF}
-		-DTASK_RCDIR=share/${PN}/rc
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newbashcomp scripts/bash/task.sh task
-
-	if use vim-syntax ; then
-		rm scripts/vim/README
-		insinto /usr/share/vim/vimfiles
-		doins -r scripts/vim/*
-	fi
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		doins scripts/zsh/*
-	fi
-
-	exeinto /usr/share/${PN}/scripts
-	doexe scripts/add-ons/*
-}
--- a/app-misc/task/task-2.5.0.ebuild
+++ b/app-misc/task/task-2.5.0.ebuild
@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils cmake-utils bash-completion-r1
-
-DESCRIPTION="Taskwarrior is a command-line todo list manager"
-HOMEPAGE="http://taskwarrior.org/"
-SRC_URI="http://taskwarrior.org/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
-IUSE="gnutls vim-syntax zsh-completion"
-
-DEPEND="sys-libs/readline:0
-	gnutls? ( net-libs/gnutls )
-	elibc_glibc? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# use the correct directory locations
-	sed -i "s:/usr/local/bin:${EPREFIX}/usr/bin:" \
-		scripts/add-ons/* || die
-
-	# don't automatically install scripts
-	sed -i '/scripts/d' CMakeLists.txt || die
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_use gnutls GNUTLS)
-		-DTASK_DOCDIR=share/doc/${PF}
-		-DTASK_RCDIR=share/${PN}/rc
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newbashcomp scripts/bash/task.sh task
-
-	if use vim-syntax ; then
-		rm scripts/vim/README
-		insinto /usr/share/vim/vimfiles
-		doins -r scripts/vim/*
-	fi
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		doins scripts/zsh/*
-	fi
-
-	exeinto /usr/share/${PN}/scripts
-	doexe scripts/add-ons/*
-}
--- a/app-misc/task/task-2.5.1.ebuild
+++ b/app-misc/task/task-2.5.1.ebuild
@ -12,7 +12,7 @@ SRC_URI="http://taskwarrior.org/download/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm x86 ~x64-macos"
 IUSE="gnutls vim-syntax zsh-completion"

 DEPEND="sys-libs/readline:0
--- a/app-misc/terminal-colors/Manifest
+++ b/app-misc/terminal-colors/Manifest
@ -1,3 +1 @@
-DIST terminal-colors-2.0.bz2 4604 SHA256 50c7c7647b3cbbf55ea8314ad81d71bbe301e7b7f7241017a6d16f7ff93ce66b SHA512 b5f253841d29057ca4236b5291fb58f0ed2e02404bf3145f7ca28c49e5cd22ae98df4b40ddc7b5f74c562cf87cc192f3d8c600fd83aefd850f25e03544ddcc25 WHIRLPOOL 70d302038257959e3c9c62788811d9db70acec36ec866c608c0dbe0640266ebb44b5ed382659288820bdf7a9e372c18e5c04f4afd555b78baecdcaf175386184
-DIST terminal-colors-2.1.bz2 4836 SHA256 519652ebd0fbdb4728a34b23994b52a63f07b582375641527d52cd273c90283b SHA512 7bce1ba6eac6897fa7a63b3339d4493817f205f7fdb4e93454fdbc3b169235cd9bc32505b9896d6f6cac493c584e49bc2fd23ba3ce2b66ef85ac38079186e579 WHIRLPOOL d58d0db20d0426d526788d3c1ad34ea0a1f9294252ff830d1ff23d09f95e455a260398a8c98efd2045b6de2345d4a6c6e570f89d6e5372b28506c0cec1778ad5
 DIST terminal-colors-2.2.bz2 4826 SHA256 0daaffc2cb96af416e3292869762ced792511ae71f1661d94bada52314243009 SHA512 ddd1a3cf6786011372ca83b3fe86a88c863a1fa1b5cf8450cabd364a3330847145cf4bd5eb8d50baa7c26b17c392eb0f629007dbb765b36b3904d0783216ce36 WHIRLPOOL 6160962dd908788bddd33650a95d4c6a45b2b6c69cfa566c48c28383977b3ed75dbf5129c3d54268af9ad48c37eb3ef6594b23b60579d1e078dfe7e73cbd466e
--- a/app-misc/terminal-colors/terminal-colors-2.0.ebuild
+++ b/app-misc/terminal-colors/terminal-colors-2.0.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} )
-PYTHON_REQ_USE="ncurses"
-
-inherit python-r1
-
-DESCRIPTION="A tool to display color charts for 8, 16, 88, and 256 color terminals"
-HOMEPAGE="http://zhar.net/projects/shell/terminal-colors"
-SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="${PYTHON_DEPS}"
-
-S=${WORKDIR}
-
-src_install() {
-	python_foreach_impl python_newscript ${P} ${PN}
-}
--- a/app-misc/terminal-colors/terminal-colors-2.1.ebuild
+++ b/app-misc/terminal-colors/terminal-colors-2.1.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} )
-PYTHON_REQ_USE="ncurses"
-
-inherit python-r1
-
-DESCRIPTION="A tool to display color charts for 8, 16, 88, and 256 color terminals"
-HOMEPAGE="http://zhar.net/projects/shell/terminal-colors"
-SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="${PYTHON_DEPS}"
-
-S=${WORKDIR}
-
-src_install() {
-	python_foreach_impl python_newscript ${P} ${PN}
-}
--- a/app-misc/terminal-colors/terminal-colors-2.2.ebuild
+++ b/app-misc/terminal-colors/terminal-colors-2.2.ebuild
@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 PYTHON_REQ_USE="ncurses"

 inherit python-r1
@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.bz2"

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"

 RDEPEND="${PYTHON_DEPS}"

--- a/app-office/scribus/scribus-1.4.6.ebuild
+++ b/app-office/scribus/scribus-1.4.6.ebuild
@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 hppa ppc ppc64 ~sparc x86"
 IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk"

 # a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
--- a/app-portage/euscan/metadata.xml
+++ b/app-portage/euscan/metadata.xml
@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<maintainer type="person">
+        <email>patrick@gentoo.org</email>
+</maintainer>
+<maintainer type="person">
+        <email>alicef@gentoo.org</email>
+        <name>Alice Ferrazzi</name>
+</maintainer>
 </pkgmetadata>
--- a/app-portage/gentoolkit/gentoolkit-0.3.2-r1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.2-r1.ebuild
@ -17,7 +17,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""

-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~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 ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

 DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
--- a/app-portage/repoman/repoman-2.3.0-r1.ebuild
+++ b/app-portage/repoman/repoman-2.3.0-r1.ebuild
@ -17,7 +17,7 @@ DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"

 LICENSE="GPL-2"
-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"
 SLOT="0"
 IUSE=""

--- a/app-text/iso-codes/iso-codes-3.70.ebuild
+++ b/app-text/iso-codes/iso-codes-3.70.ebuild
@ -14,7 +14,7 @@ SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"

 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""

 RDEPEND=""
--- a/app-text/languagetool/Manifest
+++ b/app-text/languagetool/Manifest
@ -0,0 +1 @@
+DIST LanguageTool-3.4.zip 95764120 SHA256 ff36380c5807c5bdc67d222c5f2adeeb0a047a02661885c29cd8297443846c9c SHA512 450c5faa98b61cd2ed132f1e3ff592914e0abd58ed02d9c372fb9ef57d566d32d7bbb3a3ecf6a3d26248379bbecd35934e4ae0e33bb5ae821eaa0eb17d6e07e2 WHIRLPOOL 9f44486917581ed723f61d5d8af7100c4ab679a7ca36362b2426f04575bf90966e2a5b6de15b28cbec517bae5f1d6ae1ec18c6c9b0643880130da03e838dc09d
--- a/app-text/languagetool/languagetool-3.4.ebuild
+++ b/app-text/languagetool/languagetool-3.4.ebuild
@ -0,0 +1,75 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit java-pkg-2
+
+MY_PN=LanguageTool
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="a proof-reading tool for many languages"
+HOMEPAGE="http://www.languagetool.org/"
+SRC_URI="http://www.languagetool.org/download/${MY_P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8
+	dev-java/commons-cli:1
+	dev-java/commons-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/guava:18
+	dev-java/hamcrest-core:1.3
+	dev-java/jna:0
+	dev-java/slf4j-api:0
+	dev-java/slf4j-nop:0
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	default
+}
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins *.jar
+	doins -r org META-INF
+
+	cat >>"${T}/${PN}" <<-EOF
+		#!/bin/sh
+		cd "${EROOT}usr/share/${PN}"
+		java -jar ${PN}-commandline.jar \$@
+	EOF
+
+	cat >>"${T}/${PN}-gui" <<-EOF
+		#!/bin/sh
+		cd "${EROOT}usr/share/${PN}"
+		java -jar ${PN}.jar \$@
+	EOF
+	exeinto /usr/bin
+	doexe "${T}"/${PN} "${T}"/${PN}-gui
+
+	dodoc CHANGES.md README.md
+
+	pushd libs >/dev/null || die
+	rm {commons-lang,commons-logging,jna,junit}.jar || die
+	java-pkg_jarinto /usr/share/${PN}/libs
+	java-pkg_jar-from commons-lang-2.1
+	java-pkg_jar-from commons-logging commons-logging.jar
+	java-pkg_jar-from commons-cli-1 commons-cli.jar
+	java-pkg_jar-from guava-18 guava.jar
+	java-pkg_jar-from hamcrest-core-1.3 hamcrest-core.jar
+	java-pkg_jar-from jna jna.jar
+	java-pkg_jar-from slf4j-api slf4j-api.jar
+	java-pkg_jar-from slf4j-nop slf4j-nop.jar
+	java-pkg_dojar *.jar
+	popd >/dev/null || die
+}
--- a/app-text/languagetool/metadata.xml
+++ b/app-text/languagetool/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+</pkgmetadata>
--- a/app-text/lcdf-typetools/Manifest
+++ b/app-text/lcdf-typetools/Manifest
@ -1,4 +1,2 @@
-DIST lcdf-typetools-2.104.tar.gz 636875 SHA256 d7985458ead0850cb9549ff1d619ffc18da5d7be892be5e1fce6048d510f0fff SHA512 0d41386787aa18e5a7a85158ebba2046480c2320cbdfeaad75092962335f8f97a0ceede1aa301197d6c971bd6be729960c636fb14a8ce21e4c7f3f0e57257388 WHIRLPOOL 327e88a89cedb4a66fe93878c68dff11cb2b1d8d189eb3107f1782e67a70444ccee2b1ee6362f189441695f5e02a334311f9458a4a3f1d752fe22d863a2f3d20
-DIST lcdf-typetools-2.105.tar.gz 640159 SHA256 c8b6a58e2f8f61ff3c21fd61452032c83938c91fde00f302b8f9391b16c6b63a SHA512 52670a7faca7da175819420c68aa9b34d3d488ed5d25f13e9d0930e9442857c481575c89a379183c9cd4a1b2a0786bcd8ffe33682e284b8f6e12ca917bb97538 WHIRLPOOL 729766b968ad48495edb952f89d13cb7e59c37b46606f12d0a7748feb8e722fb67e3f981a63c64fb1b81129d8059a985bf08a2978f33e0586aa3f8ab95f034f0
 DIST lcdf-typetools-2.106.tar.gz 643503 SHA256 503c3869f73a392ae0ba41e0fc4f7672e70e2d66e8a81f3bb183f495183fa967 SHA512 039215132585214e6518864161885f7a06f08f8b36b002a961b1d83182e388b31eb034eaa4466ba56a2af52e1cfb202e88f004be17c22df1343f94481e3114cf WHIRLPOOL 6ec074348f3a1f17d06b7f70f5b170d70b63055d81556ba8c2c14c50e7be4f0070f3ad685a1624a8e10a78db931cd798f7656a08b7fa0c324d663f4d0fcfad51
 DIST lcdf-typetools-2.97.tar.gz 616431 SHA256 761746041c669fa3673a3e90ec7a247abd0e2782bdddf0fc5d7ab70b33b6f975 SHA512 8812436843721b7134ec796549092854050d1e9017fef048a62e7aa0e866d20e9757b246dbad738cdf8d8583afada3a2db9c6c7dc2546154cafd4dcd0f27f7f2 WHIRLPOOL 767a2a74a9f9b7a0c29407178b96a1455da39239b835f59def2ae77db068655a8953362c6f8d48a8a31fb6fc40dea405c0e6eb276fe60750e9dfbb11954bd972
--- a/app-text/lcdf-typetools/lcdf-typetools-2.104.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.104.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Font utilities for eg manipulating OTF"
-SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
-HOMEPAGE="http://www.lcdf.org/type/#typetools"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="+kpathsea"
-
-RDEPEND="kpathsea? ( virtual/tex-base dev-libs/kpathsea )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	use kpathsea && has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
-	econf $(use_with kpathsea)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc NEWS README ONEWS
-}
--- a/app-text/lcdf-typetools/lcdf-typetools-2.105.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.105.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Font utilities for eg manipulating OTF"
-SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
-HOMEPAGE="http://www.lcdf.org/type/#typetools"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="+kpathsea"
-
-RDEPEND="kpathsea? ( virtual/tex-base dev-libs/kpathsea )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	use kpathsea && has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
-	econf $(use_with kpathsea)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc NEWS README.md ONEWS
-}
--- a/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild
@ -9,7 +9,7 @@ inherit toolchain-funcs flag-o-matic
 DESCRIPTION="Font utilities for eg manipulating OTF"
 SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
 HOMEPAGE="http://www.lcdf.org/type/#typetools"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="+kpathsea"
--- a/app-text/libgxps/libgxps-0.2.4.ebuild
+++ b/app-text/libgxps/libgxps-0.2.4.ebuild
@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgxps"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug +introspection jpeg lcms static-libs tiff"

 RDEPEND="
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.72.ebuild
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.72.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/agmartin/${PN}/repository/archive.tar.gz?ref=v${PV}

 LICENSE="GPL-3+ MIT SGMLUG"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
 IUSE="doc"

 RDEPEND="
--- a/app-text/pdfgrep/pdfgrep-1.4.1-r1.ebuild
+++ b/app-text/pdfgrep/pdfgrep-1.4.1-r1.ebuild
@ -10,7 +10,7 @@ SRC_URI="https://pdfgrep.org/download/${P}.tar.gz"

 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+pcre test unac"

 RDEPEND="
--- a/app-text/wgetpaste/wgetpaste-2.28.ebuild
+++ b/app-text/wgetpaste/wgetpaste-2.28.ebuild
@ -10,7 +10,7 @@ SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"

 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""

 DEPEND=""
--- a/app-text/wv/wv-1.2.9-r2.ebuild
+++ b/app-text/wv/wv-1.2.9-r2.ebuild
@ -10,7 +10,7 @@ SRC_URI="http://abiword.org/downloads/${PN}/${PV}/${P}.tar.gz"
 HOMEPAGE="http://wvware.sourceforge.net/"

 IUSE="tools wmf"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 SLOT="0"
 LICENSE="GPL-2"

--- a/app-vim/languagetool/Manifest
+++ b/app-vim/languagetool/Manifest
@ -0,0 +1 @@
+DIST languagetool-1.29.tar.bz2 8059 SHA256 92fd4bf94c65828f1c309da5257336a2287c07cae7ab6a4709ae1b79dcbbbcca SHA512 09b5bdc1d3590afe26578f687064a7a62493a11fafca903759dc1e9048cb22a04c6352127b13e4a63acb867d73d943b56fcae7f733350626f05b66a6d1f1626d WHIRLPOOL d5c8d411b465fdad629493e834d154e7e3a25898b20bc009c4ff9977593ab46ca6e0f6f57ae7933da08b9f7283ebc793106a4eb31a17d670050a94f27a2f2af5
--- a/app-vim/languagetool/files/languagetool-1.29-script.patch
+++ b/app-vim/languagetool/files/languagetool-1.29-script.patch
@ -0,0 +1,38 @@
+Use launcher script instead of directly running from the jar file.
+
+--- languagetool-1.29/plugin/LanguageTool.vim
+++ languagetool-1.29/plugin/LanguageTool.vim
+@@ -162,23 +162,6 @@
+       endif
+     endif
+   endif
+-
+-  let s:languagetool_jar = exists("g:languagetool_jar")
+-  \ ? g:languagetool_jar
+-  \ : $HOME . '/languagetool/languagetool-commandline.jar'
+-
+-  if !filereadable(s:languagetool_jar)
+-    " Hmmm, can't find the jar file.  Try again with expand() in case user
+-    " set it up as: let g:languagetool_jar = '$HOME/languagetool-commandline.jar'
+-    let l:languagetool_jar = expand(s:languagetool_jar)
+-    if !filereadable(expand(l:languagetool_jar))
+-      echomsg "LanguageTool cannot be found at: " . s:languagetool_jar
+-      echomsg "You need to install LanguageTool and/or set up g:languagetool_jar"
+-      echomsg "to indicate the location of the languagetool-commandline.jar file."
+-      return -1
+-    endif
+-    let s:languagetool_jar = l:languagetool_jar
+-  endif
+   return 0
+ endfunction
+ 
+@@ -242,8 +225,7 @@
+   let l:range = a:line1 . ',' . a:line2
+   silent exe l:range . 'w!' . l:tmpfilename
+ 
+-  let l:languagetool_cmd = 'java'
+-  \ . ' -jar '  . s:languagetool_jar
+  let l:languagetool_cmd = 'languagetool'
+   \ . ' -c '    . s:languagetool_encoding
+   \ . (empty(s:languagetool_disable_rules) ? '' : ' -d '.s:languagetool_disable_rules)
+   \ . ' -l '    . s:languagetool_lang
--- a/app-vim/languagetool/languagetool-1.29.ebuild
+++ b/app-vim/languagetool/languagetool-1.29.ebuild
@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit vim-plugin
+
+MY_PN=LanguageTool
+DESCRIPTION="grammar checker for various languages"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3223"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${MY_PN}"
+
+RDEPEND="app-text/languagetool"
+
+PATCHES=( "${FILESDIR}"/${P}-script.patch )
--- a/app-vim/languagetool/metadata.xml
+++ b/app-vim/languagetool/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+</pkgmetadata>
--- a/app-vim/perlomni/Manifest
+++ b/app-vim/perlomni/Manifest
@ -0,0 +1 @@
+DIST perlomni-2.5.zip 26871 SHA256 b13f8ed41ecdfa779875c48ac2df1241272ac03cef53271054dc6e9c0b011288 SHA512 aeb4bb6efef859145a942271ac4e08c99af3aed45024ca2d5affe2e72c356fa4e8f9cef78ff8a1796426ec9d2339ea2b83f07b224a1b4b98598aec5f6f45b0d7 WHIRLPOOL a8f62ff6c7a0535d0177bea205206505ad3d578c50a2ce8880fa2cfb32ba3e8fa6f750908ec846ac0a7b2af546c34043676c8747b11504487e178f93ecbc4089
--- a/app-vim/perlomni/metadata.xml
+++ b/app-vim/perlomni/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>monsieurp@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
--- a/app-vim/perlomni/perlomni-2.5.ebuild
+++ b/app-vim/perlomni/perlomni-2.5.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Perl omni completion"
+HOMEPAGE="https://github.com/c9s/perlomni.vim"
+SRC_URI="https://github.com/c9s/${PN}.vim/archive/v${PV}.zip -> ${P}.zip"
+LICENSE="vim.org"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DEPEND="
+	app-arch/unzip
+	dev-lang/perl"
+
+S="${WORKDIR}/${PN}.vim-${PV}"
+
+src_prepare() {
+	default
+	rm -v Makefile config.mk README.mkd README.mkd.old win32-install.bat TODO || die
+}
+
+src_compile() {
+	:;
+}
--- a/dev-cpp/glibmm/glibmm-2.48.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.48.1.ebuild
@ -10,7 +10,7 @@ HOMEPAGE="http://www.gtkmm.org"

 LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug examples test"

 RDEPEND="
--- a/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="http://www.gtkmm.org"

 LICENSE="LGPL-2.1+"
 SLOT="2.4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc examples test"

 COMMON_DEPEND="
--- a/dev-cpp/gtkmm/gtkmm-3.20.1.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.20.1.ebuild
@ -10,7 +10,7 @@ HOMEPAGE="http://www.gtkmm.org"

 LICENSE="LGPL-2.1+"
 SLOT="3.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"

 IUSE="aqua doc examples test wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
--- a/dev-cpp/pangomm/pangomm-2.40.1.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.40.1.ebuild
@ -10,7 +10,7 @@ HOMEPAGE="http://www.gtkmm.org"

 LICENSE="LGPL-2.1+"
 SLOT="1.4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc"

 COMMON_DEPEND="
--- a/dev-db/couchdb/couchdb-1.6.1-r2.ebuild
+++ b/dev-db/couchdb/couchdb-1.6.1-r2.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://apache/couchdb/source/${PV}/apache-${P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="libressl selinux test"

 RDEPEND=">=dev-libs/icu-4.3.1:=
--- a/dev-db/mongodb/mongodb-2.6.12.ebuild
+++ b/dev-db/mongodb/mongodb-2.6.12.ebuild
@ -19,7 +19,7 @@ SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz

 LICENSE="AGPL-3 Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug kerberos mms-agent ssl static-libs"

 PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )"
--- a/dev-db/mysql/mysql-5.6.33.ebuild
+++ b/dev-db/mysql/mysql-5.6.33.ebuild
@ -15,7 +15,7 @@ inherit mysql-multilib-r1
 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/phpmyadmin/phpmyadmin-4.0.10.17.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.0.10.17.ebuild
@ -15,7 +15,7 @@ HOMEPAGE="http://www.phpmyadmin.net/"
 SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"

 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"

 RDEPEND="
--- a/dev-db/phpmyadmin/phpmyadmin-4.4.15.8.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.4.15.8.ebuild
@ -15,7 +15,7 @@ HOMEPAGE="https://www.phpmyadmin.net/"
 SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"

 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"

 RDEPEND="
--- a/dev-db/postgis/postgis-2.1.8.ebuild
+++ b/dev-db/postgis/postgis-2.1.8.ebuild
@ -16,7 +16,7 @@ HOMEPAGE="http://postgis.net"
 SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc gtk static-libs test"

 RDEPEND="
--- a/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
+++ b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
@ -12,7 +12,7 @@ SRC_URI="${HOMEPAGE}${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="bzip2 debug doc examples threads zlib"

 DEPEND="bzip2? ( app-arch/bzip2 )
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@ -1,9 +1,12 @@
 DIST otp_doc_html_17.5.tar.gz 33510258 SHA256 baba1d373c1faacf4a1a6ec1220d57d0cb2b977edb74f32cd58dc786361c6cf5 SHA512 d3e455452e6d6e241c40de6e41a7b1069f8daa45c8d2340adb62f8867948261692c8465db7e288378942ebe86fd938847756992600da93aa99cb294fadcb5211 WHIRLPOOL 9657c1fd133fa713d0f30bae0394f47f43b090149ec3457a177bd9f129c052b73f1e757762ced02c1c8bcbaec294e845859b18b0e2004429e04df8e04e36cade
 DIST otp_doc_html_18.3.tar.gz 34285271 SHA256 8fd6980fd05367735779a487df107ace7c53733f52fbe56de7ca7844a355676f SHA512 0ac429f67ca9ae7f235cda72eb0f4e5b0b43ae90b70c706aeea08be0ad88968677ccc80eb1ba006e90c9f024de586ffd91741d4cef4d614d1dfac51b407d2659 WHIRLPOOL 7d64c2ec433b4bc2da4c56290ad6d21b85d15f72fe9b78654955d27e65b26e1b929d0c9b7d5f60c25c1f16db8d22e36c2ad6ca2a75044707ccd1eea1197fa15d
 DIST otp_doc_html_19.0.tar.gz 34550919 SHA256 b6f7c4e964673333f6c3eea8530dd988b41339b8912ae293f6f1b429489159ff SHA512 51d6da443d028fe533f12e2f2b8e12cb301977bc91cdf08530d1db53b707d60bf8ef8319b23d85ad1efbd5aaf08910b2f2a99e961b772a47e9647a03166f7d9f WHIRLPOOL 22ccd960ca4258a8afed3e68d6d3f7ef37842fd92c224f2cf6d942fcafee2539e7f91984286988b2f2bca63cb71cc8f8100e3d7f3df497f8d1d3bbeff5f6ffdd
+DIST otp_doc_html_19.1.tar.gz 34624316 SHA256 76c89aee1ac69b5107114b0065189101e3f42d53e929d8ef8f08b5c586f15930 SHA512 2c6448af0be4bf35427950aca82eac3aac7554575ba07a8ba8942c27e1eb668461fde00604c3be28fbaca8a1e28ee4861608e33a9c79bc951bb695f99b1c1ac8 WHIRLPOOL 5c344246b32f21abc5ad8403c136263a6f9f5f2664b8027ad7f574e1b7cfa9b127f7863547550114b889daba363c19936cf7a0199a0bf5b4da8ac23c02dd24d0
 DIST otp_doc_man_17.5.tar.gz 1363320 SHA256 85b1b2a1011fc01af550f1fe9e5a599a4c5f2a35d264d2804af1d05590a857c3 SHA512 98d241aa127cfe377e5efc52284cd324713cacefc96db5992275c4f8712a9e35e43f0dbc0d2a8d58a1127fbfa3f762eb001aea1bb1c9fa82205a3d83659ad548 WHIRLPOOL b790046a449824aa02e11bef6b84a7027351edba0fffd241221e690739df30c9c692074b7354612970d8d02b3c1bccfdbd81bb988af9874d181f177ffed49e2c
 DIST otp_doc_man_18.3.tar.gz 1395166 SHA256 978be100e9016874921b3ad1a65ee46b7b6a1e597b8db2ec4b5ef436d4c9ecc2 SHA512 d45d72d7ee7492e081dd5fac1a4d1cea93fe5f5287900be13c92e1c1802f7ec77573eeb4d271497154b9e0723c393700f35982ceedbe29be6cb759a0ebe83325 WHIRLPOOL 03b57a87573630a2826dd5e9a597ab0bb67daa73e4b2b733982b6ce4a3cf6a32c5ad17cb3ba3fc0a29248c867b1ba303098c7f61c0cfe42636621aa8a370790f
 DIST otp_doc_man_19.0.tar.gz 1405918 SHA256 c7a3d6d85a5a2b96d844297a3fa1bee448c3dd86237734688466249fd5a1401e SHA512 bb31563542c51eaf94e8780717f57718ab49592f7718e0dee855f3dfeae809d67cc3ed750d28c0fa53e3bae29dd27c9511d9228bde21bf010cd1d8588d4b1b7b WHIRLPOOL 53889e4dd5140bdcb1e3311edbabebd80a13c032581d67987e705989022c0b4459742b6fbb7b9ba062a212ea2c3460579c59f8dd02636172e663390935f097db
+DIST otp_doc_man_19.1.tar.gz 1405580 SHA256 7200e9e5b3a229a6b3838046e1b3e64afc869265539d49d0e4853212f19c0c79 SHA512 4ee35feeff70419ff5500e00dc17e34fdea8be21342d41cf1e255b84a1826b51057046be543ee1052153ae8c8cd215f4720cecae7d9fe1576cbd681dcf4b2334 WHIRLPOOL e94333be9d1d9239d1dc6e9bbcc6930b148eda8d8a73e3d21896e498c331c062ea1541d8fa03a2d0dd6f21510874f5aa6062b22a3738c85d1b18a30b09fb5482
 DIST otp_src_17.5.tar.gz 67242289 SHA256 3c28820c981b30c50df8ac2a4a238e5813454fa3ed2ad530bc7948a282846474 SHA512 cfd082c8baee7ded370a34f15a1ba3b846b7d81e06edc36c62308c9220697925f1feda91eeecb70fc658f8987087256f51a2ebd0c526d16eeb09c72889d2390d WHIRLPOOL 3c3d987981383bf148b9788fae0574da398ff63d81eea13da0463bed303922d06fe54354de1cd3d37091eb23438939c645176ab565877f06cc1f11235c4d8d3d
 DIST otp_src_18.3.tar.gz 68292101 SHA256 fdab8129a1cb935db09f1832e3a7d511a4aeb2b9bb3602ca6a7ccb9730d5c9c3 SHA512 f4a69bb14743d9f913d7060cfb6426f7c54693d07ed439506ede5160a0ba5a79a81cf08a56aaa02c68b3377cd22fed66a0fbeb216378330d7ad5c6348ed82014 WHIRLPOOL 493fe8f803194647ab0c113d8f67f5f97636321618296969d9da0396cc9b083b6deffd42638fe3e3eb0b63c4ff996fb4b2c4559c6039add94f7dad62205b815b
 DIST otp_src_19.0.tar.gz 68022550 SHA256 3fdc27a2a826e7f3d9cda43302d27d98704d6b41ce29a8a5df747a161da53bb1 SHA512 fdab82883f7be04cca91041819d15e0b065bdd049b134d056fe4ea12657f1c6f77aeebd778c09b4064e6d974734fe087592739181e14fe60597dbe37f492684f WHIRLPOOL b3b70b04b7189606dc89a3acaebc2fc0b8f8c2bbca20ab4556641bc51d3fcf784155a3ad406d6e0b1c2be12a243ff51a019038b3ab103c91c5b9af2e13a1a09f
+DIST otp_src_19.1.tar.gz 68103074 SHA256 fed4cbbc1ee5cc8efc2b8f14c3db97bfde1de967703f5f9a95f8ab6852737e23 SHA512 bd1c243393c867c91768367613aedb40d56889add149390c81f22e022e76b716d6e9a4d5db7e6477ceb1216c26c18c962abdfd8215a87420758f5ef2063b9714 WHIRLPOOL 3422ad4ab48916f79bcfd2b4550059f88e4e55340a9eb298a9039f07f899e6430eb2fd346bf52931acc2a03e86f3fc5571e9e577fce83bd2040c6cb37fb5348f
--- a/dev-lang/erlang/erlang-19.1.ebuild
+++ b/dev-lang/erlang/erlang-19.1.ebuild
@ -0,0 +1,155 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER="3.0"
+
+inherit autotools elisp-common eutils java-pkg-opt-2 multilib systemd versionator wxwidgets
+
+# NOTE: If you need symlinks for binaries please tell maintainers or
+# open up a bug to let it be created.
+
+DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
+HOMEPAGE="http://www.erlang.org/"
+SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
+	http://erlang.org/download/otp_doc_man_${PV}.tar.gz
+	doc? ( http://erlang.org/download/otp_doc_html_${PV}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="compat-ethread dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.7d:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	emacs? ( virtual/emacs )
+	java? ( >=virtual/jdk-1.2:* )
+	odbc? ( dev-db/unixODBC )"
+DEPEND="${RDEPEND}
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] virtual/glu )
+	sctp? ( net-misc/lksctp-tools )
+	tk? ( dev-lang/tk )"
+
+S="${WORKDIR}/otp_src_${PV}"
+
+SITEFILE=50${PN}-gentoo.el
+
+src_prepare() {
+	epatch "${FILESDIR}"/18.2.1-wx3.0.patch
+
+	use odbc || sed -i 's: odbc : :' lib/Makefile
+
+	# bug 263129, don't ignore LDFLAGS, reported upstream
+	sed -e 's:LDFLAGS = \$(DED_LDFLAGS):LDFLAGS += \$(DED_LDFLAGS):' -i "${S}"/lib/megaco/src/flex/Makefile.in
+
+	# don't ignore LDFLAGS, reported upstream
+	sed -e 's:LDFLAGS =  \$(ODBC_LIB) \$(EI_LDFLAGS):LDFLAGS += \$(ODBC_LIB) \$(EI_LDFLAGS):' -i "${S}"/lib/odbc/c_src/Makefile.in
+
+	if ! use wxwidgets; then
+		sed -i 's: wx : :' lib/Makefile
+		rm -rf lib/wx
+	fi
+
+	# Nasty workaround, reported upstream
+	cp "${S}"/lib/configure.in.src "${S}"/lib/configure.in
+
+	# bug 383697
+	sed -i '1i#define OF(x) x' erts/emulator/drivers/common/gzio.c
+
+	cd erts && mv configure.in configure.ac && eautoreconf
+}
+
+src_configure() {
+	use wxwidgets && need-wxwidgets unicode
+	use java || export JAVAC=false
+
+	econf \
+		--enable-threads \
+		$(use_enable sctp) \
+		$(use_enable systemd) \
+		$(use_enable hipe) \
+		$(use_with ssl ssl "${EPREFIX}"/usr) \
+		$(use_enable ssl dynamic-ssl-lib) \
+		$(use_enable kpoll kernel-poll) \
+		$(use_enable smp smp-support) \
+		$(use compat-ethread && echo "--enable-ethread-pre-pentium4-compatibility") \
+		$(use x64-macos && echo "--enable-darwin-64bit") \
+		$(use_enable dirty-schedulers)
+}
+
+src_compile() {
+	use java || export JAVAC=false
+	emake
+
+	if use emacs ; then
+		pushd lib/tools/emacs
+		elisp-compile *.el
+		popd
+	fi
+}
+
+extract_version() {
+	sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
+}
+
+src_install() {
+	local ERL_LIBDIR=/usr/$(get_libdir)/erlang
+	local ERL_INTERFACE_VER=$(extract_version lib/erl_interface EI_VSN)
+	local ERL_ERTS_VER=$(extract_version erts VSN)
+
+	emake INSTALL_PREFIX="${D}" install
+	dodoc AUTHORS README.md
+
+	dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
+	dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
+	dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
+	dosym \
+		"${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
+		/usr/bin/erl_call
+	dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
+	use smp && dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
+
+	## Clean up the no longer needed files
+	rm "${ED}/${ERL_LIBDIR}/Install"
+
+	for i in "${WORKDIR}"/man/man* ; do
+		dodir "${ERL_LIBDIR}/${i##${WORKDIR}}"
+	done
+	for file in "${WORKDIR}"/man/man*/*.[1-9]; do
+		# doman sucks so we can't use it
+		cp ${file} "${ED}/${ERL_LIBDIR}"/man/man${file##*.}/
+	done
+	# extend MANPATH, so the normal man command can find it
+	# see bug 189639
+	dodir /etc/env.d/
+	echo "MANPATH=\"${EPREFIX}${ERL_LIBDIR}/man\"" > "${ED}/etc/env.d/90erlang"
+
+	if use doc ; then
+		dohtml -A README,erl,hrl,c,h,kwc,info -r \
+			"${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-*
+	fi
+
+	if use emacs ; then
+		pushd "${S}"
+		elisp-install erlang lib/tools/emacs/*.{el,elc}
+		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
+			"${FILESDIR}"/${SITEFILE} > "${T}"/${SITEFILE}
+		elisp-site-file-install "${T}"/${SITEFILE}
+		popd
+	fi
+
+	newinitd "${FILESDIR}"/epmd.init epmd
+	systemd_dounit "${FILESDIR}"/epmd.service
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
--- a/dev-lang/erlang/metadata.xml
+++ b/dev-lang/erlang/metadata.xml
@ -10,6 +10,7 @@
    <flag name="halfword">Enable halfword emulator</flag>
    <flag name="kpoll">Enable kernel polling support</flag>
    <flag name="compat-ethread">Enable compatibility with pre-pentium 4 CPUs in the ethread library.</flag>
+    <flag name="dirty-schedulers">Enable dirty schedulers</flag>
  </use>
 <longdescription>
 Erlang is a programming language designed at the Ericsson 
--- a/dev-lang/php/php-5.6.26.ebuild
+++ b/dev-lang/php/php-5.6.26.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="http://php.net/"
 SRC_URI="http://php.net/distributions/${P}.tar.xz"
 LICENSE="PHP-3"
 SLOT="$(get_version_component_range 1-2)"
-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"

 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2"
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@ -1,20 +1,12 @@
 DIST Python-2.7.10.tar.xz 12250696 SHA256 1cd3730781b91caf0fa1c4d472dc29274186480161a150294c42ce9b5c5effc0 SHA512 67615a6defbcda062f15a09f9dd3b9441afd01a8cc3255e5bc45b925378a0ddc38d468b7701176f6cc153ec52a4f21671b433780d9bde343aa9b9c1b2ae29feb WHIRLPOOL 3a9dcfc55b107dc55ad0ae93fb24a11eab7d4d9b4cfbe6b6830a090b6e5f71bb2ac91526b89c6f3e4f2610fa1a2cc4e82b58a83c599aa71f94894c74181b504b
-DIST Python-2.7.11.tar.xz 12277476 SHA256 962b4c45af50124ea61f11a30deb4342fc0bc21126790fa1d7f6c79809413f46 SHA512 72166763a2fe6aab45ecf378f55a1efc7322d1742c4638bae84f4ed4b9fb4c01f2a0293733c64426ae2c70df24d95ff2b1e2a4f3c2715de00d8f320d4d939ea0 WHIRLPOOL 7ebcff7a2fe775a21a3847dee10369b73aaea8685eb63b4bc33dab0f562b8fb984c398cb34e8158cf1e24f106002829649540aad30a5ec7f4de0018ce7449f69
 DIST Python-2.7.12.tar.xz 12390820 SHA256 d7837121dd5652a05fef807c361909d255d173280c4e1a4ded94d73d80a1f978 SHA512 6ddbbce47cc49597433d98ca05c2f62f07ed1070807b645602a8e9e9b996adc6fa66fa20a33cd7d23d4e7e925e25071d7301d288149fbe4e8c5f06d5438dda1f WHIRLPOOL fe4224f4c3dc8dc5c49005051da0069922c86f39880a0072c09fac422e1913d924ac695e22be11603a961329dd8c17b1cf7696b31b62ef93398e42745a6446d6
 DIST Python-3.3.5.tar.xz 12116308 SHA256 abe99b484434503d8b23be0f243ec27139e743a4798cd71c1dce3cf40e63b6e5 SHA512 562ebd85291f29ff18d37f05682763fc45aa9d070688006f4ef5c89392a48022357c3ca9ee1d795e9e863bdef413e6bab77b8d65581d374a76dbe7cacec65550 WHIRLPOOL f4b6010d32b28b7bb038cbb7c5f98d325cc4253fd1be9a0a1089ed6fd7dd414c5169931d21ef819137d5c1084517a650828f260cf2a1d8ce871bc67aeef3fff8
 DIST Python-3.4.3.tar.xz 14421964 SHA256 b5b3963533768d5fc325a4d7a6bd6f666726002d696f1d399ec06b043ea996b8 SHA512 55b2d7c07da8ad3a3971b4687da2e45809c6f1474732e93b0432f121f287d0b63ad8a9bf381987ea70f47a03d9474c3e55b7d86d14800bf7ef29b3324d8d35b9 WHIRLPOOL f851dedc6a1ea35adec83d60784a5fbcd9dfcf6aa8858bb5ada114fa2ff55add1fbf323ab94ec039ecdedb26d59e8f2e6e171cd9fc1ed41ad9cfa434a555cff3
-DIST Python-3.4.4.tar.xz 14307620 SHA256 a797d3820155ec6cb654a652b9acfb11792d4e7d568eef1f9199009e042b6ba2 SHA512 2e114636f2b8bc02f30816cc69781e24065855bc294bb500b8cc44913a21fb6061a6918d4ac810511c829f183ec026897f73848cc026679b34fa6ff5d6e8166f WHIRLPOOL 9031e5de8527a40447290a360764cb546031aeb68918334ecc2f263f5d777f59769e8647d17810792ad855da971db0d4430d107b790c29a0cb872cb876af2b54
 DIST Python-3.4.5.tar.xz 14516820 SHA256 ee64b1c8a47461009abf25252332d29a4e587cb4f0c1c96aa793a3732e9d898a SHA512 b548a5338d141b3086dea372fa2cc245ba5350ee9f0d1304ef6222dc45380b66d380b092e547d54206d56ca68563b95036f445f97f72bb0ef1d48f81a74a3d4c WHIRLPOOL 43e0aed0177d46148964447b4fb24475c4c736afb2ba84ec393fbf55db3da3f192308f9c8f236deaa7a608dac56946ee7755970fadaa82bf406c910a05f36883
-DIST Python-3.5.0.tar.xz 14808460 SHA256 d6d7aa1634a5eeeca6ed4fca266982a04f84bd8f3945a9179e20b24ad2e2be91 SHA512 f06bd652484aa89371021d0f9fcb08e6e905e90b39ae065d7df75b367e66b7ea43a818ca33ce04aa3d6746b5e8b1b83e90b709ac2203324fb7a595c1017be149 WHIRLPOOL aef3970297911324537e4e1e9d0e179c925bf51fea9d6a6413a08e3f349fd244d834e6fe732e9120669b762c302b47f821de170ce083d2cc39b7e35f51fdd1f0
-DIST Python-3.5.1.tar.xz 14830408 SHA256 c6d57c0c366d9060ab6c0cdf889ebf3d92711d466cc0119c441dbf2746f725c9 SHA512 261c9e42ae351853c718707a8887817e308b3ba7a37e9463a0bc8f50ee9be9ac1a011b2891f8877ecdb40beab99279bcfa8e04f813b8998fcf6cefb7fd52d850 WHIRLPOOL 7ff4ddb852c74f75d1f327e418f5af09ae66403cc3fb2431ab31786c046cec2d761ee57e8c6674a92bb08f95cfff7c7c7d5ddd965994096a0380fbd6b55fcc8f
 DIST Python-3.5.2.tar.xz 15222676 SHA256 0010f56100b9b74259ebcd5d4b295a32324b58b517403a10d1a2aa7cb22bca40 SHA512 c07c3366f1c81e214241444bb9da6db9d11da32ad66bfa29cdad5a3b2e34e4d870bda6d4ce3c3910b582942e91f1d8c8a1c1a7b9464cc147b83c9e0007012742 WHIRLPOOL cf55d67f362b6a7529d43bb5aa8014c8349be190c6d4dae9d48de1679ab8623087478f41686cdced981cf18bb3d107052732cd437ff31ba5de2cc06b04ec2289
 DIST python-gentoo-patches-2.7.10-0.tar.xz 12892 SHA256 c9a838bd62ae50cc385da23a837acfd05f2b74e4f086c9c76eb4d3aa5366ef6d SHA512 5f100944635e360691dc0a2b340a906646c4ae9ee558246ddffc56e8b15d389f25f1fbdc1db4cc08e7d29560d04d66b058b3904902899d58ecae8c408ebdf056 WHIRLPOOL f69e9a518bb7ee50c1b262a21e70e1e2443f859ee6d2f4fa84421120dbd054a06ce8dd6cfea8512cbc64bce806322b879c25c561d5eb05e1ba6cc15035b373a9
-DIST python-gentoo-patches-2.7.11-0.tar.xz 12916 SHA256 e14b47bb1fd64d366d7dfb8339cc2cbf4a53fc288b11dd83f575eb36a8a6408d SHA512 f0447bb699a163afc08df39b111394377539935546ae23732d7239e78d2bff0c04bc94949f86aef0c1be83736127dbd25c2c531e49befed2d638c3cd4940ac52 WHIRLPOOL 305992849d9d244da1e308e739c9bf62a3ef5c74eb65c765bdc666fb5767eb16c7a609f7c442c17da17f76c3ab81e4b09fa8c21e43f89366539a6a9d656bea77
 DIST python-gentoo-patches-2.7.12-0.tar.xz 13576 SHA256 cd842eec7202df57c153adc1fbb81e70b26ef651f8e9346e065d8577b93f343b SHA512 8bf530fca15c47fa5d9bc958e433b35943a12c98e4172806a45aa60dc85ec92f8ab6ffcd90f752dc5bf8ffc711414894c15820c4b6ef72dbcedc2808119fb1f6 WHIRLPOOL 54b8ca6a4371d460dadccfdffcc096c12930d58714eef95117a658d7a1337ea89c45c69553b5b993017211faaa0f8d670e09a8452e53c0fb176be3e908524ee6
 DIST python-gentoo-patches-3.3.5-0.tar.xz 12892 SHA256 a7240de9598033cb40f8f273d8104d4e2b1dcaea028d45ac28efaa3c680ff6f7 SHA512 27eef4c2b3f631b000db3f6a5c426d9b498d63a08fe82b1ab7c2c010fb72208109461a5f008d47703852526655b70a734ea95be8742897026db5750bb9cc9d16 WHIRLPOOL edab9222d7da94cab3b1de0e1a27c6c7dbd49194b813a0a1cf9e532063029c4e4f19151c9f4878eeabed3168ff1f97eae7f008280c7ed2897fc14c5516c68d7e
 DIST python-gentoo-patches-3.4.3-0.tar.xz 11736 SHA256 917a9d98d40a91379c81ea57922a8632ba3c6f6db6f304ed6262bc88c5044946 SHA512 7ad1b30cf8bb7900fe518ed71e4ee55dd92ce7e23ae583a1f2f851b26cfa8c4f4271d28f418e780f3725a48d4ca8eeb8fd083f850810c66c29fb08c430828d72 WHIRLPOOL 074e8c0055b49a028eebda21d1acfb8a25ec968eb8b350c2bed37e042f9f354871e413db13e0ef2fe41d7e56d647178a7b3622019f36c4819c2c68f088366eb1
-DIST python-gentoo-patches-3.4.4-0.tar.xz 11748 SHA256 94aa14d0f7894b99d2ee9d3448f999aeea5faa1c41350a2fb92c912bbebb9292 SHA512 e9852063fbab34cead5bc6f39d8fe28105d51767930174d418ed3dfcd661b8011f2eb1bc60900e6bbc7069ca72b6633bf7bb0bce54d28d16d0202eedd5b5db2d WHIRLPOOL 2bf1a8e18c77c834ce6a110699a5214e22ad311bba769eb4374192ed73554d0b5ff66caca20d3522c1ef3aec9e585266e7ae8a5efc28901b0f67c87d541010ab
 DIST python-gentoo-patches-3.4.5-0.tar.xz 12044 SHA256 84ee7630670a1dac4bbbc55fabf5f99b5b29007de4f140ad956e93d2e7aba8fa SHA512 108a4845667ecdf4001fcbeffab0cfbbac87439a449a7351428b0f3e2f159e3848ee0c0dfa45c9fba893b9f9584b33722fc8bb0bd7485a1d0909c3a35ede6ed8 WHIRLPOOL f0248faa0b4ce5679e37381bba90f8a4d361a49db792787bffc06a54a4bc82fea4d53255120f10e6dbf51b99e12417fc1b469be9624e73508fa3a212a38e7352
-DIST python-gentoo-patches-3.5.0-0.tar.xz 11872 SHA256 8d1830aee5f7e019250447ee084203e26143bdf47c95435861e3e0eda5106eb6 SHA512 d7b6c7fdfdea9d7577b14febf2e4680839908a8eba05f3bc17e71f2fe4c360816a8126de5fa69cfba6930be9793bf1b9cafcde2ae621c1150cb9f1ffecc4a3d4 WHIRLPOOL 01202442c789cd9f54748ec80f9c5b1d2728c5df876a2c8fa417c3078a6e9cc55103ee07fce76f402b15afe1625c5b0497734dc4b601fb304e75bf652ce2f058
-DIST python-gentoo-patches-3.5.1-0.tar.xz 11788 SHA256 668fabdb9326ba3df81dd299619d5245b7806934e9341ef89a06f90c9a98018b SHA512 3948af801e3e70b55b15165d6cc56fb33cdb9fcc9d80b913550c8609273bad28db0c10ec64cb14d010b80020716a1e45d720e08864f6ac850291cb1713800a1a WHIRLPOOL 2fd3b25186c26412dc642f76228d8e75f24cdc7452407dd105f027be5841b1b865f6b5b74a0072a0299153e5d5af699542253b366e4eb78dfbf114ad02b14bcc
 DIST python-gentoo-patches-3.5.2-0.tar.xz 12008 SHA256 eb898fb448bd40f086ae2910e94c608faa932eb377fe40bd34f4390b4c37aac1 SHA512 e2ef1b8f10f9ea849bf52a0be65d48f7cfecf07bdf151cbbd7e3a1c9428a8d96e901650496c4ae7fd0093af8cc90de8df674dc1a4c66ad21916a4ee45a81efc8 WHIRLPOOL 66b99c7c50e3eaca783f773349b3e8a357f706a7da6a66bd2e0a53946bc81d965ac99d8fd4c50ba7e42052aa84508c8aede5eacedbb95f040a48cf1a5de6b6b0
--- a/dev-lang/python/python-2.7.11-r2.ebuild
+++ b/dev-lang/python/python-2.7.11-r2.ebuild
@ -1,357 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
-
-MY_P="Python-${PV}"
-PATCHSET_VERSION="2.7.11-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/~djc/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="2.7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:0=
-	>=sys-libs/zlib-1.1.3:0=
-	virtual/libffi
-	virtual/libintl
-	berkdb? ( || (
-		sys-libs/db:5.3
-		sys-libs/db:5.2
-		sys-libs/db:5.1
-		sys-libs/db:5.0
-		sys-libs/db:4.8
-		sys-libs/db:4.7
-		sys-libs/db:4.6
-		sys-libs/db:4.5
-		sys-libs/db:4.4
-		sys-libs/db:4.3
-		sys-libs/db:4.2
-	) )
-	gdbm? ( sys-libs/gdbm:0=[berkdb] )
-	ncurses? (
-		>=sys-libs/ncurses-5.2:0=
-		readline? ( >=sys-libs/readline-4.1:0= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	tk? (
-		>=dev-lang/tcl-8.0:0=
-		>=dev-lang/tk-8.0:0=
-		dev-tcltk/blt:0=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1 )
-	!!<sys-apps/portage-2.1.9"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )
-	doc? ( dev-python/python-docs:${SLOT} )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use berkdb; then
-		ewarn "'bsddb' module is out-of-date and no longer maintained inside"
-		ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
-		ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
-		ewarn "is provided by dev-python/bsddb3."
-	else
-		if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
-			ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"
-			ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
-			ewarn "You might need to migrate your databases."
-		fi
-	fi
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -r Modules/expat || die
-	rm -r Modules/_ctypes/libffi* || die
-	rm -r Modules/zlib || die
-
-	if tc-is-cross-compiler; then
-		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
-	fi
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	# Fix for cross-compiling.
-	epatch "${FILESDIR}/python-2.7.5-nonfatal-compileall.patch"
-	epatch "${FILESDIR}/python-2.7.9-ncurses-pkg-config.patch"
-	epatch "${FILESDIR}/python-2.7.10-cross-compile-warn-test.patch"
-	epatch "${FILESDIR}/python-2.7.10-system-libffi.patch"
-
-	epatch_user
-
-	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@@"
-
-	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
-
-	# 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-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
-
-	cd "${BUILD_DIR}" || die
-	emake
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	cd "${BUILD_DIR}" || die
-
-	# Skip failing tests.
-	local skipped_tests="distutils gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# Rerun failed tests in verbose mode (regrtest -w).
-	emake test EXTRATESTOPTS="-w" < /dev/tty
-	local result="$?"
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
-	elog "and run the tests separately."
-
-	if [[ "${result}" -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
-
-	cd "${BUILD_DIR}" || die
-	emake DESTDIR="${D}" altinstall
-
-	sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed"
-
-	# Fix collisions between different slots of Python.
-	mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
-	mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
-	mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
-	rm -f "${ED}usr/bin/smtpd.py"
-
-		use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*} || die
-		use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-		use tk || rm -r "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk} || die
-		use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
-
-	use threads || rm -r "${libdir}/multiprocessing" || die
-	use wininst || rm -r "${libdir}/distutils/command/"wininst-*.exe || die
-
-	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r "${S}"/Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${SLOT}:" \
-		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-
-	# for python-exec
-	local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
-
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
-	else
-		vars=( PYTHON "${vars[@]}" )
-	fi
-
-	python_export "python${SLOT}" "${vars[@]}"
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${SLOT%.*}
-	mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die
-	# python and pythonX
-	ln -s "../../../bin/python${SLOT}" \
-		"${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
-	ln -s "python${pymajor}" \
-		"${D}${PYTHON_SCRIPTDIR}/python" || die
-	# python-config and pythonX-config
-	ln -s "../../../bin/python${SLOT}-config" \
-		"${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${D}${PYTHON_SCRIPTDIR}/python-config" || die
-	# 2to3, pydoc, pyvenv
-	ln -s "../../../bin/2to3-${SLOT}" \
-		"${D}${PYTHON_SCRIPTDIR}/2to3" || die
-	ln -s "../../../bin/pydoc${SLOT}" \
-		"${D}${PYTHON_SCRIPTDIR}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${SLOT}" \
-			"${D}${PYTHON_SCRIPTDIR}/idle" || die
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-}
-
-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
@ -173,6 +173,10 @@ src_configure() {
 }

 src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+
 	# Avoid invoking pgen for cross-compiles.
 	touch Include/graminit.h Python/graminit.c || die

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

 src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+
 	# Avoid invoking pgen for cross-compiles.
 	touch Include/graminit.h Python/graminit.c || die

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

 src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+
 	cd "${BUILD_DIR}" || die

 	emake CPPFLAGS= CFLAGS= LDFLAGS=
--- a/dev-lang/vala/vala-0.32.1.ebuild
+++ b/dev-lang/vala/vala-0.32.1.ebuild
@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"

 LICENSE="LGPL-2.1"
 SLOT="0.32"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="test"

 RDEPEND="
--- a/dev-libs/atk/atk-2.20.0.ebuild
+++ b/dev-libs/atk/atk-2.20.0.ebuild
@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"

 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="+introspection nls test"

 RDEPEND="
--- a/dev-libs/confuse/confuse-3.0.ebuild
+++ b/dev-libs/confuse/confuse-3.0.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/martinh/libconfuse/releases/download/v${PV}/${P}.tar

 LICENSE="ISC"
 SLOT="0/1.0.0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"

 IUSE="nls static-libs"

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

 RDEPEND="
 	>=dev-libs/glib-2.36:2
--- a/dev-libs/glib/glib-2.48.2.ebuild
+++ b/dev-libs/glib/glib-2.48.2.ebuild
@ -28,7 +28,7 @@ REQUIRED_USE="
 	test? ( ${PYTHON_REQUIRED_USE} )
 "

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

 RDEPEND="
 	!<dev-util/gdbus-codegen-${PV}
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.48.0.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.48.0.ebuild
@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"

 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
--- a/dev-libs/gobject-introspection/gobject-introspection-1.48.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.48.0.ebuild
@ -18,7 +18,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	test? ( cairo )
 "
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

 # virtual/pkgconfig needed at runtime, bug #505408
 # We force glib and goi to be in sync by this way as explained in bug #518424
--- a/dev-libs/json-glib/json-glib-1.2.2.ebuild
+++ b/dev-libs/json-glib/json-glib-1.2.2.ebuild
@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib"

 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug +introspection"

 RDEPEND="
--- a/dev-libs/libIDL/libIDL-0.8.14-r2.ebuild
+++ b/dev-libs/libIDL/libIDL-0.8.14-r2.ebuild
@ -12,7 +12,7 @@ HOMEPAGE="https://www.gnome.org/"

 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""

 RDEPEND=">=dev-libs/glib-2.44.1-r1:2[${MULTILIB_USEDEP}]"
--- a/dev-libs/libgdata/libgdata-0.17.5.ebuild
+++ b/dev-libs/libgdata/libgdata-0.17.5.ebuild
@ -19,7 +19,7 @@ REQUIRED_USE="
 	vala? ( introspection )
 "

-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"

 # configure checks for gtk:3, but only uses it for demos which are not installed
 RDEPEND="
--- a/dev-libs/libgudev/libgudev-230-r1.ebuild
+++ b/dev-libs/libgudev/libgudev-230-r1.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgudev"

 LICENSE="LGPL-2.1"
 SLOT="0/0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="introspection static-libs"

 COMMON_DEPEND="
--- a/dev-libs/libinput/libinput-1.4.2.ebuild
+++ b/dev-libs/libinput/libinput-1.4.2.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"

 LICENSE="MIT"
 SLOT="0/10"
-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="input_devices_wacom test"
 # Tests require write access to udev rules directory which is a no-no for live system.
 # Other tests are just about logs, exported symbols and autotest of the test library.
--- a/dev-libs/libsigc++/libsigc++-2.8.0.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.8.0.ebuild
@ -10,7 +10,7 @@ HOMEPAGE="http://libsigc.sourceforge.net/"

 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"

 RDEPEND=""
--- a/dev-libs/vala-common/vala-common-0.32.1.ebuild
+++ b/dev-libs/vala-common/vala-common-0.32.1.ebuild
@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""

 # Previously ${PN} was part of dev-lang/vala
--- a/dev-perl/XML-DOM/Manifest
+++ b/dev-perl/XML-DOM/Manifest
@ -1,2 +1,3 @@
 DIST XML-DOM-1.44.tar.gz 117024 SHA256 f6af32c74c84b3b173eca9baac521a0f9b030c9a0395fcafd4235a84d8ad0ae4 SHA512 fa4e4534971683281a3b7adf0a322fa98569bf3fc4f18c7a1e2c1bd13a2c44d3d3b985038c006ecc61c755580992c9085d6dce1551e7425db77aadafaadf4437 WHIRLPOOL b7ed7a5e1d14751b2b87afdbdbd4a42f6d8878055cfc830ca82a18054df859f3d255cfce10618e59e59b5d3d490466299996b2f6d204e5976f5f60e6a6381d0f
 DIST XML-DOM-1.45.tar.gz 116855 SHA256 bed14e6ba8d970345946927b19faa1282b26ce1c2cc1d2324090a32a417478cb SHA512 559082f36d96dee28fd8ade7867b56abbd904e8fd6f585a4a2b348b2a6ae7e7892a2974b3d1983a296044e08ce346fdd006999aab364638d8c998dcee441fccf WHIRLPOOL 9833256b82d59b1eab9792e12d4132d02f1ed0d46ee3f22d536bffe94c12becc6c8f99e486e97dfaf5ead03fd33dfcab190471426a43b12f1ea85b57c06fcf8e
+DIST XML-DOM-1.46.tar.gz 117291 SHA256 8ba24b0b459b01d6c5e5b0408829c7d5dfe47ff79b3548c813759048099b175e SHA512 0fc96571996262bb0a99bd5f85e5d9e0f9c71c604c46c74129f0f560aa2749f7b945c591bfc13b9178d2b8d83826d5306f4ac71db33b51c55ce4d76398bab13d WHIRLPOOL feb3256486d19ceb552d652549f2cb252a1e7920baf5b06eb25d4856efe6004e345c64891599d9d9708fbb6571d35110dc574bf909a69c2f0b2e05313610f983
--- a/dev-perl/XML-DOM/XML-DOM-1.460.0.ebuild
+++ b/dev-perl/XML-DOM/XML-DOM-1.460.0.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=TJMATHER
+DIST_VERSION=1.46
+inherit perl-module
+
+DESCRIPTION="A Perl module for an DOM Level 1 compliant interface"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/libwww-perl
+	>=dev-perl/XML-Parser-2.300.0
+	dev-perl/XML-RegExp
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=dev-perl/libxml-perl-0.70.0
+	)
+"
--- a/dev-perl/XML-DT/XML-DT-0.670.0.ebuild
+++ b/dev-perl/XML-DT/XML-DT-0.670.0.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=AMBS
-MODULE_SECTION=XML
-MODULE_VERSION=0.66
-inherit perl-module
-
-DESCRIPTION="A perl XML down translate module"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-perl/libwww-perl
-	>=dev-perl/XML-LibXML-1.600.0
-	>=dev-perl/XML-DTDParser-2.0.0
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
-	)
-"
-
-SRC_TEST="do"
--- a/dev-perl/XML-Entities/Manifest
+++ b/dev-perl/XML-Entities/Manifest
@ -1,2 +1 @@
-DIST XML-Entities-1.0001.tar.gz 21770 SHA256 3498107938e4cc725f3d2e4fdf45b4a491a0e9d05f5f201c93986b90ea8e8c19 SHA512 35228f7e774407657c5b9bde6504dc2dbea1a8872ca21637a50117121e19a84f4a6fe1ca5d4f498be714e283354797f65622cc73bb73824b8a84ba028fa98eca WHIRLPOOL 51245cbf69cfbd21dd712e5257d41363a0da871c0bdac759f1c1acbc11693558273d9ee6d5aa25659112b2cda6542441e38b973ac4d021da737d55576c07ab31
 DIST XML-Entities-1.0002.tar.gz 20640 SHA256 c32aa4f309573d7648ab2e416f62b6b20652f2ad9cfd3eec82fd51101fe7310d SHA512 e25c45ca23fdc7d6038a4350985ee73a460370f62717197700842364a9c93ddba30dbb0d16ba2f5db10e99ad81311f4aaed20bb1a3811bba121f6ccf36137108 WHIRLPOOL d4aac8d4406e78ca2a58d8e277e01ad89accf219c0d432a7eff0b7ebef117915fb941ec00cefabfa2b1d3c39da8c145c8f3d40b6b3354f1d4a3e411e96e46089
--- a/dev-perl/XML-Entities/XML-Entities-1.0.100.ebuild
+++ b/dev-perl/XML-Entities/XML-Entities-1.0.100.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=SIXTEASE
-MODULE_VERSION=1.0001
-inherit perl-module
-
-DESCRIPTION="Decode strings with XML entities"
-
-LICENSE="|| ( Artistic GPL-1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="virtual/perl-Carp"
-
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? ( virtual/perl-Test-Simple )"
-
-SRC_TEST="do"
-
-S=${WORKDIR}/${PN}
--- a/dev-perl/XML-Feed/Manifest
+++ b/dev-perl/XML-Feed/Manifest
@ -1,2 +1 @@
-DIST XML-Feed-0.52.tar.gz 53209 SHA256 a58b2e78a4e91a51ca9d84d7dc574eadcd60ee9a9ad8058b20f7f04b4a10232e SHA512 47416579ddef2d1f21a16662bed1a11a80fce865cc680df78e65b8d0ded66e45f05edbe44ca8bfe6d94c4f5590eda7358c36082be3d8e116f888bb563240dabe WHIRLPOOL 449fa1f612c0396ad82139e987f02283405bd34eb7ca92bb09284652be0fb94a5f9d4891b6da6f874bc113e924b3df5cd908c93f0cd79db2fcfcc7dbb4685222
 DIST XML-Feed-0.53.tar.gz 54588 SHA256 ece0396db666758f1104908deb67b6e29aa726b02327422fc7134d6e5e31611d SHA512 6a68939d8ff02124b86f38a2c82344e616e40732bd1e564a1bb8e15c8b406b8548d0630cf7c1a52744706c07d383b494b4876683c1ae3d43493bcf5138c582df WHIRLPOOL 9b620f8ced930119642c0843ec8456a1372ab034c6d7232f9dbc184d49251bb05b1733694f23d446a9f13523133950b606c478e64b945093b2e37a5e8ecae235
--- a/dev-perl/XML-Feed/XML-Feed-0.520.0.ebuild
+++ b/dev-perl/XML-Feed/XML-Feed-0.520.0.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=DAVECROSS
-MODULE_VERSION=0.52
-inherit perl-module
-
-DESCRIPTION="Syndication feed parser and auto-discovery"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-perl/Class-ErrorHandler
-	dev-perl/Feed-Find
-	dev-perl/URI-Fetch
-	>=dev-perl/XML-RSS-1.470.0
-	>=dev-perl/XML-Atom-0.380.0
-	dev-perl/DateTime
-	dev-perl/DateTime-Format-Mail
-	dev-perl/DateTime-Format-W3CDTF
-	dev-perl/HTML-Parser
-	dev-perl/libwww-perl
-	dev-perl/Module-Pluggable"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? ( virtual/perl-Test-Simple )
-"
-
-SRC_TEST=do
-
-src_test() {
-	perl_rm_files t/pod{,-coverage}.t
-	perl-module_src_test
-}
--- a/dev-perl/XML-LibXML-Simple/Manifest
+++ b/dev-perl/XML-LibXML-Simple/Manifest
@ -1,2 +1 @@
-DIST XML-LibXML-Simple-0.95.tar.gz 21968 SHA256 b1272256cee7b4341368819f25dc66555b00dea0bca11d890cb0e2b78ac40e63 SHA512 45352738649d48e374d337ee9cec93a0d8ddffa47aa7d098d67a23f479a4d3d6d40a33dfec223651fcd89ed2c8b22caf881c7472ad52d6a2cb8b54605769a670 WHIRLPOOL 5f7bcdd00105688ee8c09fbda6b263a6387de9a2fb665200ba0af35f8d037de068ebaa5092eed22a21fe596075be5681433bab404e97b472f74d560da6911a7d
 DIST XML-LibXML-Simple-0.97.tar.gz 22927 SHA256 1ccc5fb166586232c939b27244abf1bb7627c7d2fbabe33a654cfcf6c7a416bd SHA512 5607218a0ee7cd08f6e166af30f38ac7942e36e32469836f9b09d3802f32d8c5ca965fe6870823679523721241530eab9a5235dc376b2ce362d70a78b9c2d8f7 WHIRLPOOL 51c1c0ef466ac62041a9b11716cbeb4f9a190dc61621b96be1207b35f9fc4fc07828e4b9e4f6ccd10c11d87d4c3b53296401a3c26c1871e8d55b2d3292a2482f
--- a/dev-perl/XML-LibXML-Simple/XML-LibXML-Simple-0.950.0.ebuild
+++ b/dev-perl/XML-LibXML-Simple/XML-LibXML-Simple-0.950.0.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=MARKOV
-MODULE_VERSION=0.95
-inherit perl-module
-
-DESCRIPTION="XML::LibXML based XML::Simple clone"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-perl/File-Slurp-Tiny
-	>=dev-perl/XML-LibXML-1.640.0
-"
-DEPEND="${RDEPEND}
-"
-
-SRC_TEST=do
--- a/dev-perl/XML-LibXML/Manifest
+++ b/dev-perl/XML-LibXML/Manifest
@ -1,3 +1,3 @@
 DIST XML-LibXML-2.0121.tar.gz 464562 SHA256 ec431011cb37a04640fd2316f64d0405a274eece2c6f3847f7fbd336eb1c0dc9 SHA512 1833d1e14d8a3b361bcacde910807a56e21cd08204f3fa58888a8c9219bd9228bfdc211af8f74b91ceda3135b4e72cbc60ef1d783afbe0febd100117904f29f1 WHIRLPOOL 8168fcb40e9cfd7d9802f443124a1a38419b5e74b5560b95cfb66f4bc37110a2ac11515b365c4c90bd6007cb5a98c0045bc460566e7f52f758958019953411fe
-DIST XML-LibXML-2.0124.tar.gz 465948 SHA256 f053434d68d94586ba062c8ded33a448b2943f9ae9e46db4293a97673e755240 SHA512 aa4b72ddf10ca1dab917b7988f8c715659d7659ccf6150eb88d9f6c64823daa2e5500f9b7031ec3abe88de647c7e2bc87da79d37086a1cf3d0b94de082981f71 WHIRLPOOL 545d9d494b43e4aff2951a9598194c116c25adeef58d9003b0e56cf8b179347fc10d09061a03119ca3c306b638444c75bb0f44fdc2a90cc3e667e89404c09076
 DIST XML-LibXML-2.0126.tar.gz 465800 SHA256 0e735ab72e2ba77070a58a737fd6c61fa6aa198527abc59a5d5627f0650a60af SHA512 b7e5cfdf299c6eabbecacf3a8b5192439b251aa15304a08296481daae2ff01f4d2fab74c38b42c2c63a2fa9f485d287a72ea06ebc58e679ac39cf6544f3cf60c WHIRLPOOL 341b49339342abdf93df0d7dd322b0209bd9a3fca2ffdfdb8e51055d1adab5093f221deaf43330668d17b4795a6c65e029e6bc51bda34184dd91f28e723d7de9
+DIST XML-LibXML-2.0128.tar.gz 466334 SHA256 26e7ba451f3bade4d29ff00653a2ee01d13fe38b9a2ebcd0b0f3f82f9f688f2b SHA512 c388570d0a140f3b92ab9922d9c917fba791e804b160822eeff91923891059ba189ad3743f2ffd13f7f4c92a3e8db1ee5fae588007d3fcf50251d9803e8e261b WHIRLPOOL d5aa29ca1254e6c94b8b765c2d0f05ebfaef30c3f67c7d5f4ee0f6c08619627cb98590f915ec115e28898bc44f7cd675a3c5a3f7abe827ec2d57baa5c76734d2
--- a/dev-perl/XML-LibXML/XML-LibXML-2.12.800.ebuild
+++ b/dev-perl/XML-LibXML/XML-LibXML-2.12.800.ebuild
@ -5,7 +5,7 @@
 EAPI=6

 DIST_AUTHOR=SHLOMIF
-DIST_VERSION=2.0124
+DIST_VERSION=2.0128
 DIST_EXAMPLES=("example/*")
 inherit perl-module

@ -18,6 +18,7 @@ IUSE="test minimal"
 RDEPEND="
 	>=dev-perl/XML-SAX-0.120.0
 	>=dev-libs/libxml2-2.6.21
+	dev-perl/XML-SAX-Base
 	>=dev-perl/XML-NamespaceSupport-1.70.0
 "
 DEPEND="${RDEPEND}
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST LanguageTool-3.4.zip 95764120 SHA256 ff36380c5807c5bdc67d222c5f2adeeb0a047a02661885c29cd8297443846c9c SHA512 450c5faa98b61cd2ed132f1e3ff592914e0abd58ed02d9c372fb9ef57d566d32d7bbb3a3ecf6a3d26248379bbecd35934e4ae0e33bb5ae821eaa0eb17d6e07e2 WHIRLPOOL 9f44486917581ed723f61d5d8af7100c4ab679a7ca36362b2426f04575bf90966e2a5b6de15b28cbec517bae5f1d6ae1ec18c6c9b0643880130da03e838dc09d`
				`@ -0,0 +1 @@`
				`DIST languagetool-1.29.tar.bz2 8059 SHA256 92fd4bf94c65828f1c309da5257336a2287c07cae7ab6a4709ae1b79dcbbbcca SHA512 09b5bdc1d3590afe26578f687064a7a62493a11fafca903759dc1e9048cb22a04c6352127b13e4a63acb867d73d943b56fcae7f733350626f05b66a6d1f1626d WHIRLPOOL d5c8d411b465fdad629493e834d154e7e3a25898b20bc009c4ff9977593ab46ca6e0f6f57ae7933da08b9f7283ebc793106a4eb31a17d670050a94f27a2f2af5`
				`@ -0,0 +1 @@`
				`DIST perlomni-2.5.zip 26871 SHA256 b13f8ed41ecdfa779875c48ac2df1241272ac03cef53271054dc6e9c0b011288 SHA512 aeb4bb6efef859145a942271ac4e08c99af3aed45024ca2d5affe2e72c356fa4e8f9cef78ff8a1796426ec9d2339ea2b83f07b224a1b4b98598aec5f6f45b0d7 WHIRLPOOL a8f62ff6c7a0535d0177bea205206505ad3d578c50a2ce8880fa2cfb32ba3e8fa6f750908ec846ac0a7b2af546c34043676c8747b11504487e178f93ecbc4089`