Sync with portage [Wed Nov 1 08:50:15 MSK 2017].

7 years ago · e161f081be
parent 66f7d954ae
commit e161f081be
294 changed files with 3408 additions and 4858 deletions
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@ -2,5 +2,4 @@ DIST puppet-3.8.7.tar.gz 2650247 SHA256 50460a3dd8d25118e25eb01178d09743dabc01cd
 DIST puppet-4.10.1.tar.gz 2954351 SHA256 271738d2b5aaec8faafd543076ac0d9012fcd6051bccd2f70a66cd479362c605 SHA512 d232f062b93485f7eea8abb9c5420462e313e6050e7335159f051f7c7af86338c006ae4edc09e0e1370784ee7b076911ca563a4cfc6a1f2afc7179bed08d2032 WHIRLPOOL 1a5b8c3fc87fdb4e23196cc13ad46c963cdb6314cfc0e4d3a6d44adad4545289cf41886c6150ee14fcd0d30d9b29f32987c6e31a7c39077a2c53aac7147c69dd
 DIST puppet-4.10.6.tar.gz 2977099 SHA256 19250a3659339961953d48d71aa5951d52bcee3bac0a1e2f45042aa82fcf358a SHA512 f983005d161bbd5fb81dfd15a32cb0ae2417557bd4faa1a62d2fb10fffa55c91ea29c1577785af9642a2878c78405ab99c7e6ee4268fcedcc107c07a0a5bfdd1 WHIRLPOOL 4619f7e89a02560f2c6bd1194b1f50699348fcddf5889628884c807deb0afd9b530883d280db20086a787052d2456ef61b2eef84854e95724562f1a0225b2640
 DIST puppet-4.10.8.tar.gz 2979824 SHA256 2a11f9230f2b681173107fcfe6574dc38d8061c7d369fa88525dfb652fb7f198 SHA512 9f3384702dd4938e1e00aeceb0745b760de32000e0dd59d5b846d1120a46026499176a51d0409e3a0ae414efc0872854c204d1941385695a4c57c209fbd1f28d WHIRLPOOL 06ed0f915786e6d0c5698a8bebfb68628d96b236b667ec44c994c043949cb4a47c8d42b2fbe8391178f38862fe816237d28501b4e39a6326d74ef2d62eb438eb
-DIST puppet-4.8.1.tar.gz 2873371 SHA256 8b3ee6b60639e2a2839ad7403fab8f8ecc390a93e6e47b03f1b053aa262bcf17 SHA512 9ecde04c68874652b501e779764bb3227d226564e80f06c2c15bd982620529ec55f8e11911bcf68db994ee98287746761752538aa5aeee474ddf37f21976e2d1 WHIRLPOOL d3a4b0b4b15dceb75cb3f161b73843af53f5d21121ba1fb06fdae422ec458f62f5fa47d0f5c7bfb96e3e9b04eb62c4c1e1a97f7131101e4f6f4ff952127c0685
 DIST puppet-5.1.0.tar.gz 2734018 SHA256 ceb8059704d2e79c1f9147716b596261e1c6c38da3313a2283def777ecf9193c SHA512 07019f40c5b7f18243f13abb899c2ff2ea4b135895ab98c13da3df50f8e720e2759f8eb39e349ff04286da7de504cffea3df8acf9711e8591b25001a2a3f9c15 WHIRLPOOL a5e4e44c68a503307b01729546121a03a0271bc68f8db139e7d52981f9ce9f6db4e24b18a252633794e7de1c7aceb6d833c817a291099081b31190060bb59d50
--- a/app-admin/puppet/puppet-4.10.1.ebuild
+++ b/app-admin/puppet/puppet-4.10.1.ebuild
@ -15,7 +15,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"

 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
+KEYWORDS="amd64 hppa ~ppc x86"
 IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
 RESTRICT="test"

--- a/app-admin/puppet/puppet-4.8.1.ebuild
+++ b/app-admin/puppet/puppet-4.8.1.ebuild
@ -1,177 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	>=dev-ruby/rgen-0.6.5
-	dev-ruby/json:=
-	>=dev-ruby/facter-3.0.0
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#		dev-ruby/rspec-collection_matchers
-
-DEPEND+=" ${DEPEND}
-	emacs? ( virtual/emacs )
-	xemacs? ( app-editors/xemacs )"
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-all_ruby_compile() {
-	if use emacs ; then
-		elisp-compile ext/emacs/puppet-mode.el
-	fi
-
-	if use xemacs ; then
-		# Create a separate version for xemacs to be able to install
-		# emacs and xemacs in parallel.
-		mkdir ext/xemacs
-		cp ext/emacs/* ext/xemacs/
-		xemacs-elisp-compile ext/xemacs/puppet-mode.el
-	fi
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
-	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use emacs ; then
-		elisp-install ${PN} ext/emacs/puppet-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use xemacs ; then
-		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
-		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [ "$(get_major_version $v)" = "3" ]; then
-			elog
-			elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
-			elog "/etc/puppetlabs/puppet"
-			elog "Also, puppet now uses config directories for modules and manifests."
-			elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
-			elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
-			elog "for more information."
-			elog
-		fi
-	done
-
-	use emacs && elisp-site-regen
-	use xemacs && xemacs-elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use xemacs && xemacs-elisp-site-regen
-}
--- a/app-arch/dpkg/dpkg-1.18.18.ebuild
+++ b/app-arch/dpkg/dpkg-1.18.18.ebuild
@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 IUSE="+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib"

 RDEPEND="
--- a/app-cdr/bchunk/bchunk-1.2.0-r3.ebuild
+++ b/app-cdr/bchunk/bchunk-1.2.0-r3.ebuild
--- a/app-cdr/bchunk/bchunk-1.2.0-r4.ebuild
+++ b/app-cdr/bchunk/bchunk-1.2.0-r4.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Convert CD images from bin/cue to iso+wav/cdr"
+HOMEPAGE="http://he.fi/bchunk/"
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+DOCS=( "${P}.lsm" "${PN}.spec" README ChangeLog )
+PATCHES=( "${FILESDIR}/CVE-2017-15953.patch" "${FILESDIR}/CVE-2017-15955.patch" )
+
+src_install() {
+	dobin "${PN}"
+	doman "${PN}.1"
+	einstalldocs
+}
--- a/app-cdr/bchunk/files/CVE-2017-15953.patch
+++ b/app-cdr/bchunk/files/CVE-2017-15953.patch
@ -0,0 +1,25 @@
+--- a/bchunk.c	2017-10-30 18:03:58.658741629 +0000
+++ b/bchunk.c	2017-10-30 19:40:25.558131619 +0000
+@@ -18,6 +18,7 @@
+   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+   */
+
+#define _GNU_SOURCE
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -271,11 +272,10 @@
+ 	int16_t i;
+ 	float fl;
+ 	
+-	if (!(fname = malloc(strlen(bname) + 8))) {
+-		fprintf(stderr, "main(): malloc() failed, out of memory\n");
+	if (asprintf(&fname, "%s%2.2d.%s", bname, track->num, track->extension) == -1) {
+		fprintf(stderr, "writetrack(): asprintf() failed, out of memory\n");
+ 		exit(4);
+ 	}
+-	sprintf(fname, "%s%2.2d.%s", bname, track->num, track->extension);
+ 	
+ 	printf("%2d: %s ", track->num, fname);
+ 	
+
--- a/app-cdr/bchunk/files/CVE-2017-15955.patch
+++ b/app-cdr/bchunk/files/CVE-2017-15955.patch
@ -0,0 +1,32 @@
+--- a/bchunk.c	2017-10-30 18:03:58.658741629 +0000
+++ b/bchunk.c	2017-10-30 19:17:36.732855884 +0000
+@@ -426,11 +426,11 @@
+ 			printf("\nTrack ");
+ 			if (!(p = strchr(p, ' '))) {
+ 				fprintf(stderr, "... ouch, no space after TRACK.\n");
+-				continue;
+				exit(3);
+ 			}
+ 			p++;
+ 			if (!(t = strchr(p, ' '))) {
+ 				fprintf(stderr, "... ouch, no space after track number.\n");
+-				continue;
+				exit(3);
+ 			}
+ 			*t = '\0';
+
+@@ -460,12 +460,12 @@
+ 		} else if ((p = strstr(s, "INDEX"))) {
+ 			if (!(p = strchr(p, ' '))) {
+ 				printf("... ouch, no space after INDEX.\n");
+-				continue;
+				exit(3);
+ 			}
+ 			p++;
+ 			if (!(t = strchr(p, ' '))) {
+ 				printf("... ouch, no space after index number.\n");
+-				continue;
+				exit(3);
+ 			}
+ 			*t = '\0';
+ 			t++;
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@ -1,4 +1 @@
-DIST heimdal-1.5.3.tar.gz 6798305 SHA256 aac27bedb33c341b6aed202af07ccc816146a893148721f8123abbbf93bbfea5 SHA512 5c7890f60d6fe6b5034fca204eb7cdb33fdc397fe09b169212b6267310b83bb0b3b06a4c2888841be34c92cbd701bd95734b4019c33c147459c4a449861c4431 WHIRLPOOL 8202b1bdf76e84b4a0fea1aa89935dfb3fbcceca38c84ffb3e3e8454691398c9a7cecfad40c6661426be5e82f4e3f43b6d6494cf287900ff958e06603b602e19
-DIST heimdal-7.1.0.tar.gz 9925587 SHA256 cee58ab3a4ce79f243a3e73f465dac19fe2b93ef1c5ff244d6f1d689fedbde2d SHA512 5afc9d183ff0db6e82e83d47955cc77e775bc60569e2905f9106c31b8a33e8d67fbc042dd4836ebae094db38bf70ba858c224189fed8d55f277738ee6e76352e WHIRLPOOL cd6507c5f6a800e645a146d94fac41d1fbf4c3283c5c4ab4a40bd2229efa4f1a16be71aa74fc5d8f41023bdff8ff141419ce0b99f5cb7aaf09f22824db1d2df8
-DIST heimdal-7.3.0.tar.gz 9927966 SHA256 351df17c11f723681a4eab832e880af4a28693d1ed6996b02671d676dcb3b7b5 SHA512 2a2a76e073ce429086c6e673d83974ba57c7778500f9b007fba033a0e31aed4c4e060d123c10c6d54eda9cda35faabc3df5fa92b560531e92eb8f3dff4eb9dc2 WHIRLPOOL 2a60146a6ca0edcef6072cdbdb1a7a986da82a14b459062530b390ab5d895b0e671f4e46c9a707ea846bcbc832585b1a2e78a593f065c6929fdd2b4b41f49e95
 DIST heimdal-7.4.0.tar.gz 9928553 SHA256 3de14ecd36ad21c1694a13da347512b047f4010d176fe412820664cb5d1429ad SHA512 3bb83974180e0f6fe2e1b2a11c51cf136c9a64f13f9ed7592f0039ccccd03c1a22081b7d88ae631f94cf46589ed399b79666eb814104f915faa70b53749863a7 WHIRLPOOL 337a6da67bb48e08ecab2119598c19e2ca9b0cdbd7ca163f6ea55ccb0a1290cc2906eee106b625a43243edd7d1677ff36ae318ab82f2d3e439b8f25002f7f001
--- a/app-crypt/heimdal/files/heimdal_db6.patch
+++ b/app-crypt/heimdal/files/heimdal_db6.patch
@ -1,41 +0,0 @@
--- a/cf/db.m4
-+++ b/cf/db.m4
-@@ -51,6 +51,8 @@ dnl db_create is used by db3 and db4 and db5
-   #include <stdio.h>
-   #ifdef HAVE_DBHEADER
-   #include <$dbheader/db.h>
-+  #elif HAVE_DB6_DB_H
-+  #include <db6/db.h>
-   #elif HAVE_DB5_DB_H
-   #include <db5/db.h>
-   #elif HAVE_DB4_DB_H
--- a/lib/hdb/db3.c
-+++ b/lib/hdb/db3.c
-@@ -276,7 +276,7 @@
-     }
-     db->hdb_db = d;
- 
-#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 1)
-+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
-     ret = (*d->open)(db->hdb_db, NULL, fn, NULL, DB_BTREE, myflags, mode);
- #else
-     ret = (*d->open)(db->hdb_db, fn, NULL, DB_BTREE, myflags, mode);
-@@ -284,7 +284,7 @@
- 
-     if (ret == ENOENT) {
- 	/* try to open without .db extension */
-#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 1)
-+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
- 	ret = (*d->open)(db->hdb_db, NULL, db->hdb_name, NULL, DB_BTREE,
- 			 myflags, mode);
- #else
--- a/cf/db.m4
-+++ b/cf/db.m4
-@@ -38,6 +38,7 @@ AS_IF([test "x$with_berkeley_db" != xno],
- 		    fi
- 		   ])],
-     [AC_CHECK_HEADERS([					\
-+	           db6/db.h				\
- 	           db5/db.h				\
- 	           db4/db.h				\
- 	           db3/db.h				\
--- a/app-crypt/heimdal/files/heimdal_link_order.patch
+++ b/app-crypt/heimdal/files/heimdal_link_order.patch
@ -1,41 +0,0 @@
--- kadmin/Makefile.am.orig	2010-11-25 12:39:31.000000000 +0000
-+++ kadmin/Makefile.am	2011-02-14 21:37:29.000000000 +0000
-@@ -64,10 +64,10 @@
- 	$(top_builddir)/lib/krb5/libkrb5.la \
- 	$(LIB_hcrypto) \
- 	$(top_builddir)/lib/asn1/libasn1.la \
-	$(LIB_roken) \
- 	$(DBLIB)
- 
- kadmind_LDADD = $(top_builddir)/lib/kadm5/libkadm5srv.la \
-+	$(LIB_roken) \
- 	../lib/gssapi/libgssapi.la \
- 	$(LDADD_common) \
- 	$(LIB_pidfile) \
-@@ -78,12 +78,14 @@
- 	$(top_builddir)/lib/kadm5/libkadm5srv.la \
- 	$(top_builddir)/lib/sl/libsl.la \
- 	$(LIB_readline) \
-+	$(LIB_roken) \
- 	$(LDADD_common) \
- 	$(LIB_dlopen)
- 
- add_random_users_LDADD = \
- 	$(top_builddir)/lib/kadm5/libkadm5clnt.la \
- 	$(top_builddir)/lib/kadm5/libkadm5srv.la \
-+	$(LIB_roken) \
- 	$(LDADD_common) \
- 	$(LIB_dlopen)
- 
--- tests/plugin/check-pac.in.orig	2010-11-25 12:39:31.000000000 +0000
-+++ tests/plugin/check-pac.in	2011-02-16 13:24:50.000000000 +0000
-@@ -62,7 +62,8 @@
- test_apreq="${TESTS_ENVIRONMENT} ../../lib/krb5/test_ap-req"
- 
- KRB5_CONFIG="${objdir}/krb5.conf"
-export KRB5_CONFIG
-+LD_PRELOAD="../../lib/roken/.libs/libroken.so"
-+export KRB5_CONFIG LD_PRELOAD
- 
- rm -f ${keytabfile}
- rm -f current-db*
--- a/app-crypt/heimdal/files/heimdal_missing-include.patch
+++ b/app-crypt/heimdal/files/heimdal_missing-include.patch
@ -1,11 +0,0 @@
--- base/test_base.c	2011-09-30 15:58:45.000000000 +0300
-+++ base/test_base.c	2011-12-27 23:04:50.482955923 +0200
-@@ -39,6 +39,8 @@
- #include "heimbase.h"
- #include "heimbasepriv.h"
- 
-+#include <stdlib.h>
-+
- static void
- memory_free(heim_object_t obj)
- {
--- a/app-crypt/heimdal/files/heimdal_missing_symbols.patch
+++ b/app-crypt/heimdal/files/heimdal_missing_symbols.patch
@ -1,28 +0,0 @@
-Add missing symbols.  Cherry picked from upstream master.
-Bug #420821.
-
--- a/lib/krb5/version-script.map	2012-01-10 21:53:51.000000000 +0000
-+++ b/lib/krb5/version-script.map	2012-06-13 16:23:26.000000000 +0000
-@@ -42,6 +42,7 @@
- 		krb5_auth_con_getrcache;
- 		krb5_auth_con_getremoteseqnumber;
- 		krb5_auth_con_getremotesubkey;
-+		krb5_auth_con_getsendsubkey;
- 		krb5_auth_con_init;
- 		krb5_auth_con_removeflags;
- 		krb5_auth_con_setaddrs;
-@@ -383,6 +384,14 @@
- 		krb5_h_errno_to_heim_errno;
- 		krb5_have_error_string;
- 		krb5_hmac;
-+		krb5_init_creds_init;
-+		krb5_init_creds_set_service;
-+		krb5_init_creds_set_keytab;
-+		krb5_init_creds_get;
-+		krb5_init_creds_set_password;
-+		krb5_init_creds_free;
-+		krb5_init_creds_get_creds;
-+		krb5_init_creds_get_error;
- 		krb5_init_context;
- 		krb5_init_ets;
- 		krb5_initlog;
--- a/app-crypt/heimdal/files/heimdal_texinfo-5.patch
+++ b/app-crypt/heimdal/files/heimdal_texinfo-5.patch
@ -1,28 +0,0 @@
--- a/doc/whatis.texi
-+++ b/doc/whatis.texi
-@@ -35,10 +35,11 @@ services can authenticate each other.
- @end macro
- @end ifinfo
- 
-@tex
-@def@xsub#1{$_{#1}$}
-@global@let@sub=@xsub
-@end tex
-+@iftex
-+@macro sub{arg}
-+@textsubscript{\arg\}
-+@end macro
-+@end iftex
- 
- @ifhtml
- @macro sub{arg}
--- a/doc/win2k.texi
-+++ b/doc/win2k.texi
-@@ -311,4 +311,5 @@ Other useful programs include these:
- 
- @itemize @bullet
- @item pwdump2
-@uref{http://www.bindview.com/Support/RAZOR/Utilities/Windows/pwdump2_readme.cfm}@end itemize
-+@uref{http://www.bindview.com/Support/RAZOR/Utilities/Windows/pwdump2_readme.cfm}
-+@end itemize
-
--- a/app-crypt/heimdal/heimdal-1.5.3-r2.ebuild
+++ b/app-crypt/heimdal/heimdal-1.5.3-r2.ebuild
@ -1,193 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use eutils multilib multilib-minimal python-any-r1 toolchain-funcs virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="http://www.h5l.org/dist/src/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
-IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit selinux ssl static-libs threads test X"
-
-CDEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-	berkdb? ( >=sys-libs/db-4.8.30-r1[${MULTILIB_USEDEP}] )
-	!berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
-	caps? ( sys-libs/libcap-ng )
-	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	>=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}]
-	afs? ( net-fs/openafs )
-	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
-	X? ( x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXt )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-	!!app-crypt/mit-krb5
-	!!app-crypt/mit-krb5-appl"
-
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	>=sys-devel/autoconf-2.62
-	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-kerberos )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/krb5-types.h
-	/usr/include/cms_asn1.h
-	/usr/include/digest_asn1.h
-	/usr/include/hdb_asn1.h
-	/usr/include/krb5_asn1.h
-	/usr/include/pkcs12_asn1.h
-	/usr/include/pkinit_asn1.h
-	/usr/include/rfc2459_asn1.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/krb5-config
-)
-
-src_prepare() {
-	epatch "${FILESDIR}/heimdal_missing-include.patch"
-	epatch "${FILESDIR}/heimdal_db6.patch"
-	epatch "${FILESDIR}/heimdal_disable-check-iprop.patch"
-	epatch "${FILESDIR}/heimdal_link_order.patch"
-	epatch "${FILESDIR}/heimdal_missing_symbols.patch"
-	epatch "${FILESDIR}/heimdal_texinfo-5.patch"
-	epatch "${FILESDIR}/heimdal_tinfo.patch"
-	eautoreconf
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=()
-	if use berkdb; then
-		myconf+=(
-			--with-berkeley-db
-			--with-berkeley-db-include="$(db_includedir)"
-		)
-	else
-		myconf+=(
-			--without-berkeley-db
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-kcm \
-		--disable-osfc2 \
-		--enable-shared \
-		--with-libintl=/usr \
-		--with-readline=/usr \
-		--with-sqlite3=/usr \
-		--libexecdir=/usr/sbin \
-		$(use_enable afs afs-support) \
-		$(use_enable otp) \
-		$(use_enable pkinit kx509) \
-		$(use_enable pkinit pk-init) \
-		$(use_enable static-libs static) \
-		$(use_enable threads pthread-support) \
-		$(multilib_native_use_with caps capng) \
-		$(multilib_native_use_with hdb-ldap openldap /usr) \
-		$(use_with ipv6) \
-		$(use_with ssl openssl /usr) \
-		$(multilib_native_use_with X x) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake -j1
-	else
-		emake -C include -j1
-		emake -C base -j1
-		emake -C lib -j1
-		emake -C kdc -j1
-		emake -C tools -j1
-		emake -C tests/plugin -j1
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
-	else
-		emake -C include DESTDIR="${D}" install
-		emake -C base DESTDIR="${D}" install
-		emake -C lib DESTDIR="${D}" install
-		emake -C kdc DESTDIR="${D}" install
-		emake -C tools DESTDIR="${D}" install
-		emake -C tests/plugin DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog README NEWS TODO
-
-	# Begin client rename and install
-	for i in {telnetd,ftpd,rshd,popper}
-	do
-		mv "${D}"/usr/share/man/man8/{,k}${i}.8
-		mv "${D}"/usr/sbin/{,k}${i}
-	done
-
-	for i in {rcp,rsh,telnet,ftp,su,login,pagsh,kf}
-	do
-		mv "${D}"/usr/share/man/man1/{,k}${i}.1
-		mv "${D}"/usr/bin/{,k}${i}
-	done
-
-	mv "${D}"/usr/share/man/man5/{,k}ftpusers.5
-	mv "${D}"/usr/share/man/man5/{,k}login.access.5
-
-	newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
-	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
-	newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd
-	newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
-
-	newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
-	newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
-	newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
-	newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
-
-	insinto /etc
-	newins "${FILESDIR}"/krb5.conf krb5.conf.example
-
-	if use hdb-ldap; then
-		insinto /etc/openldap/schema
-		doins "${S}/lib/hdb/hdb.schema"
-	fi
-
-	prune_libtool_files
-
-	# default database dir
-	keepdir /var/heimdal
-
-	# Ugly hack for broken symlink - bug #417081
-	rm "${D}"/usr/share/man/man5/qop.5 || die
-	dosym mech.5 /usr/share/man/man5/qop.5
-}
--- a/app-crypt/heimdal/heimdal-7.1.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.1.0.ebuild
@ -1,175 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use eutils multilib multilib-minimal python-any-r1 virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
-IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X"
-
-CDEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-	)
-	berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
-	!berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
-	caps? ( sys-libs/libcap-ng )
-	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	>=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}]
-	afs? ( net-fs/openafs )
-	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
-	X? ( x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXt )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-	!!app-crypt/mit-krb5
-	!!app-crypt/mit-krb5-appl"
-
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	>=sys-devel/autoconf-2.62
-	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-kerberos )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/krb5-types.h
-	/usr/include/cms_asn1.h
-	/usr/include/digest_asn1.h
-	/usr/include/hdb_asn1.h
-	/usr/include/krb5_asn1.h
-	/usr/include/pkcs12_asn1.h
-	/usr/include/pkinit_asn1.h
-	/usr/include/rfc2459_asn1.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/krb5-config
-)
-
-src_prepare() {
-	eapply "${FILESDIR}/heimdal_disable-check-iprop.patch"
-	eapply "${FILESDIR}/heimdal_tinfo.patch"
-	eautoreconf
-	eapply_user
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=()
-	if use berkdb; then
-		myconf+=(
-			--with-berkeley-db
-			--with-berkeley-db-include="$(db_includedir)"
-		)
-	else
-		myconf+=(
-			--without-berkeley-db
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-kcm \
-		--disable-osfc2 \
-		--enable-shared \
-		--with-libintl=/usr \
-		--with-readline=/usr \
-		--with-sqlite3=/usr \
-		--libexecdir=/usr/sbin \
-		--enable-pthread-support \
-		$(use_enable afs afs-support) \
-		$(use_enable otp) \
-		$(use_enable pkinit kx509) \
-		$(use_enable pkinit pk-init) \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with caps capng) \
-		$(multilib_native_use_with hdb-ldap openldap /usr) \
-		$(use_with ipv6) \
-		$(use_with ssl openssl /usr) \
-		$(multilib_native_use_with X x) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake -j1
-	else
-		emake -C include -j1
-		emake -C lib -j1
-		emake -C kdc -j1
-		emake -C tools -j1
-		emake -C tests/plugin -j1
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
-	else
-		emake -C include DESTDIR="${D}" install
-		emake -C lib DESTDIR="${D}" install
-		emake -C kdc DESTDIR="${D}" install
-		emake -C tools DESTDIR="${D}" install
-		emake -C tests/plugin DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog* README NEWS TODO
-
-	# client rename
-	mv "${D}"/usr/share/man/man1/{,k}su.1
-	mv "${D}"/usr/bin/{,k}su
-
-	newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
-	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
-	newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd
-	newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
-
-	newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
-	newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
-	newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
-	newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
-
-	insinto /etc
-	newins "${S}"/krb5.conf krb5.conf.example
-
-	if use hdb-ldap; then
-		insinto /etc/openldap/schema
-		doins "${S}/lib/hdb/hdb.schema"
-	fi
-
-	prune_libtool_files
-
-	# default database dir
-	keepdir /var/heimdal
-}
--- a/app-crypt/heimdal/heimdal-7.3.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.3.0.ebuild
@ -1,175 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use eutils multilib multilib-minimal python-any-r1 virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
-IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X"
-
-CDEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-	)
-	berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
-	!berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
-	caps? ( sys-libs/libcap-ng )
-	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	>=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}]
-	afs? ( net-fs/openafs )
-	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
-	X? ( x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXt )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-	!!app-crypt/mit-krb5
-	!!app-crypt/mit-krb5-appl"
-
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	>=sys-devel/autoconf-2.62
-	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-kerberos )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/krb5-types.h
-	/usr/include/cms_asn1.h
-	/usr/include/digest_asn1.h
-	/usr/include/hdb_asn1.h
-	/usr/include/krb5_asn1.h
-	/usr/include/pkcs12_asn1.h
-	/usr/include/pkinit_asn1.h
-	/usr/include/rfc2459_asn1.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/krb5-config
-)
-
-src_prepare() {
-	eapply "${FILESDIR}/heimdal_disable-check-iprop.patch"
-	eapply "${FILESDIR}/heimdal_tinfo.patch"
-	eautoreconf
-	eapply_user
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=()
-	if use berkdb; then
-		myconf+=(
-			--with-berkeley-db
-			--with-berkeley-db-include="$(db_includedir)"
-		)
-	else
-		myconf+=(
-			--without-berkeley-db
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-kcm \
-		--disable-osfc2 \
-		--enable-shared \
-		--with-libintl=/usr \
-		--with-readline=/usr \
-		--with-sqlite3=/usr \
-		--libexecdir=/usr/sbin \
-		--enable-pthread-support \
-		$(use_enable afs afs-support) \
-		$(use_enable otp) \
-		$(use_enable pkinit kx509) \
-		$(use_enable pkinit pk-init) \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with caps capng) \
-		$(multilib_native_use_with hdb-ldap openldap /usr) \
-		$(use_with ipv6) \
-		$(use_with ssl openssl /usr) \
-		$(multilib_native_use_with X x) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake -j1
-	else
-		emake -C include -j1
-		emake -C lib -j1
-		emake -C kdc -j1
-		emake -C tools -j1
-		emake -C tests/plugin -j1
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
-	else
-		emake -C include DESTDIR="${D}" install
-		emake -C lib DESTDIR="${D}" install
-		emake -C kdc DESTDIR="${D}" install
-		emake -C tools DESTDIR="${D}" install
-		emake -C tests/plugin DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog* README NEWS TODO
-
-	# client rename
-	mv "${D}"/usr/share/man/man1/{,k}su.1
-	mv "${D}"/usr/bin/{,k}su
-
-	newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
-	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
-	newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd
-	newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
-
-	newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
-	newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
-	newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
-	newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
-
-	insinto /etc
-	newins "${S}"/krb5.conf krb5.conf.example
-
-	if use hdb-ldap; then
-		insinto /etc/openldap/schema
-		doins "${S}/lib/hdb/hdb.schema"
-	fi
-
-	prune_libtool_files
-
-	# default database dir
-	keepdir /var/heimdal
-}
--- a/app-crypt/keybase/Manifest
+++ b/app-crypt/keybase/Manifest
@ -1,7 +1,2 @@
-DIST keybase-0.8.25.tar.gz 7109238 SHA256 e34b128f48e27a1c3066b5f3f19d99df735f9be4f1c867d1d3d408c8e12983fd SHA512 b6986063c34a18bd91148e588d43545f8baf7849cf80ea03b88d26e1f3dd6684cc9e5ebd5e10ff5ac0639fa308c2e07f577b6a7ded6f5bf4bd4510e64bb31025 WHIRLPOOL 1413eed7f26ec6b2d17f63d6315baac48d6a7f0935c3608e4ffcd5cd8df7f13db01e8d93ce76b33b4e0ceb322f508a3601e37be6cad86c20e976bb33012f28db
-DIST keybase-1.0.15.tar.gz 45781588 SHA256 6fe66b07772ca000879bda65cb9d112d2dbbc301d6afa4d4b46055d385f86e36 SHA512 623a952d88e4c9519073c9e8c81b2d53bddd081e048dbe127b658f91e97a37493767ced36a07dcb65791f1f3abc398bcb6456a921b4301f86c31dda5b8fdccce WHIRLPOOL 64b8456bd12452a70920e3dea93b0fda6c2f0f3a48449d0aeefc1e335aaa140f25ed5f2c5bb3c61828dbe268851631553b760c0e1a6a43fdc3d1198d2d2420a5
-DIST keybase-1.0.16.tar.gz 41810206 SHA256 e8a7ecb56153c1068432ee7d13b861987066217eaa8d5346cc518468b618a112 SHA512 47fcc2034070e84f9d1f1925a98e030c95ccc766b52ac734c2b746bd719cabc3f3cac95ea00efacd42ccc95945318c5fa5e3272406f32c50530339fc4524ef23 WHIRLPOOL 1ea1d2b14852e63aadbf0607255ae0dd37d7e27b34d6ba86e8ae656146c0d81956c8ea65386f574893e5c5343f660ca7b131b9fd356a306566cd726217fe6794
-DIST keybase-1.0.17.tar.gz 33200376 SHA256 937b4bc61c889ef3982a5352d8a49cda8a4f4db28732d4cb21df1fe20128399c SHA512 56334779ab7c11a947557af7d22c662d862804104fff7c853776b0bb28116ae4b789abecd6b75d07a440fae0fc3af4438b85fbd271eb1310c8bf77ce1017e145 WHIRLPOOL f2d44ac207796b1d514e8bb87aced0ba0cd82f64fde87b910f603926364f70d7fdea79b23e1dc2c29efc0278f5c2eb80a53b3efac2d157008eb327a38622566c
-DIST keybase-1.0.18.tar.gz 19860878 SHA256 8a4ebcb3ce8e3ed3649be870ab407fafeaeaed23c399f18dc25cba50fbb7f5a6 SHA512 3b8938839421da0fca2958c576e5987abeaf178c01ad979fe0b88d55bc5e93180951747dbe59bec26597c1ce41075e80a76af5a3666e7c248b640ad6b1052ddc WHIRLPOOL c48d3417833a6f9bd835d85cd4116923bb35268182983181297e4811c4f76bf730713dfeb3d61dd89ae280b2e318e8fb34ae54f5dc515a96350f0cda12c9388c
-DIST keybase-1.0.20.tar.gz 21506558 SHA256 792545bd527ccc815f2edf8efebddefcd55417c25f6ef16b85e95e9d79227023 SHA512 dcb727b701d0178c94232e3746fd0de6f13121c10d8c6be714f082d382881d727e0b751e0deea184a4ee2bedcfe56b7ba72e60cab5671f2388d5d9f7f53ca05f WHIRLPOOL a91f657ffe4ed98fd4d76c77bd5cfc5263d5d2b1d228ed485ba02eabd5a395811a35152ac718919f2c82f7b128ace708adfcf6d2388bb5427ce49d4dc3c54e46
 DIST keybase-1.0.21.tar.gz 21127410 SHA256 a9bbaf16cb7b7cc3614ca5e76e0fb1b3bd164f38e14b9d49d4ca351941c8c0a3 SHA512 60801ece5dc0df9f0da58143baf00729e1a79183d2b8209c405749f422dd8cecf7f4059e0799c88ca6e3f1e5a7ad8bd6805dd2401b0945954c6b1465c04974b5 WHIRLPOOL 796d5e89f87575cfc621c714c304b0a502773511f5d43d178c0f4484e3386df6975f665b723ceb0f834fc5d4be0c5c288324a15e5d0d9b2633fb984e3f8cf183
+DIST keybase-1.0.33.tar.gz 29170354 SHA256 c8135d572899b0bf0205f7ddbe30d4bfa89f358f64678eb25dadfc0e0fa0dbe0 SHA512 d02933e88613102e27a4aa5f2494ae2b55456cab8c5cadad9c412069b24c574a20609fc83b88bc8f9aa00bfd300822bc4c882392f65fec3e7a8056cebc6fb9d4 WHIRLPOOL d11b7fa29f73e85df51dbc45c7be2441783ada43ddbe56ed684f8030663d640d930b2a9fc0663208664ae567ae8629d04ac786da5dd6b31b8d3517889479da1c
--- a/app-crypt/keybase/keybase-0.8.25.ebuild
+++ b/app-crypt/keybase/keybase-0.8.25.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Client for keybase.io"
-HOMEPAGE="https://keybase.io/"
-SRC_URI="https://github.com/keybase/node-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	net-libs/nodejs
-	app-crypt/gnupg"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	mv "node-client-${PV}" "${P}"
-}
-
-src_install() {
-	dodoc CHANGELOG.md README.md SIGNED.md
-	insinto "/opt/${PN}"
-	doins -r package.json bin certs json lib node_modules sql
-	dosym "${D}/opt/${PN}/bin/main.js" "${ROOT}/usr/bin/keybase"
-	chmod 0755 "${D}/opt/${PN}/bin/main.js" || die
-}
--- a/app-crypt/keybase/keybase-1.0.15.ebuild
+++ b/app-crypt/keybase/keybase-1.0.15.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils versionator
-
-MY_PV=$(replace_version_separator 3 '-')
-
-DESCRIPTION="Client for keybase.io"
-HOMEPAGE="https://keybase.io/"
-SRC_URI="https://github.com/keybase/client/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-lang/go-1.5:0"
-RDEPEND="
-	app-crypt/gnupg"
-
-S="${WORKDIR}/src/github.com/keybase/client"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	mkdir -p "$(dirname "${S}")" || die
-	mv "client-${MY_PV}" "${S}" || die
-}
-
-src_compile() {
-	GO15VENDOREXPERIMENT=1 \
-		GOPATH="${WORKDIR}:${S}/go/vendor" \
-		go build -v -x \
-		-tags production \
-		-o "${T}/keybase" \
-		github.com/keybase/client/go/keybase || die
-}
-
-src_install() {
-	dobin "${T}/keybase"
-}
--- a/app-crypt/keybase/keybase-1.0.16.ebuild
+++ b/app-crypt/keybase/keybase-1.0.16.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils versionator
-
-MY_PV=$(replace_version_separator 3 '-')
-
-DESCRIPTION="Client for keybase.io"
-HOMEPAGE="https://keybase.io/"
-SRC_URI="https://github.com/keybase/client/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-lang/go-1.5:0"
-RDEPEND="
-	app-crypt/gnupg"
-
-S="${WORKDIR}/src/github.com/keybase/client"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	mkdir -p "$(dirname "${S}")" || die
-	mv "client-${MY_PV}" "${S}" || die
-}
-
-src_compile() {
-	GO15VENDOREXPERIMENT=1 \
-		GOPATH="${WORKDIR}:${S}/go/vendor" \
-		go build -v -x \
-		-tags production \
-		-o "${T}/keybase" \
-		github.com/keybase/client/go/keybase || die
-}
-
-src_install() {
-	dobin "${T}/keybase"
-}
--- a/app-crypt/keybase/keybase-1.0.17-r1.ebuild
+++ b/app-crypt/keybase/keybase-1.0.17-r1.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils versionator
-
-MY_PV=$(replace_version_separator 3 '-')
-
-DESCRIPTION="Client for keybase.io"
-HOMEPAGE="https://keybase.io/"
-SRC_URI="https://github.com/keybase/client/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-lang/go-1.6:0"
-RDEPEND="
-	app-crypt/gnupg"
-
-S="${WORKDIR}/src/github.com/keybase/client"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	mkdir -p "$(dirname "${S}")" || die
-	mv "client-${MY_PV}" "${S}" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}:${S}/go/vendor" \
-		go build -v -x \
-		-tags production \
-		-o "${T}/keybase" \
-		github.com/keybase/client/go/keybase || die
-}
-
-src_install() {
-	dobin "${T}/keybase"
-}
-
-pkg_postinst() {
-	elog "Run the service: keybase service"
-	elog "Run the client:  keybase login"
-}
--- a/app-crypt/keybase/keybase-1.0.17.ebuild
+++ b/app-crypt/keybase/keybase-1.0.17.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils versionator
-
-MY_PV=$(replace_version_separator 3 '-')
-
-DESCRIPTION="Client for keybase.io"
-HOMEPAGE="https://keybase.io/"
-SRC_URI="https://github.com/keybase/client/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-lang/go-1.5:0"
-RDEPEND="
-	app-crypt/gnupg"
-
-S="${WORKDIR}/src/github.com/keybase/client"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	mkdir -p "$(dirname "${S}")" || die
-	mv "client-${MY_PV}" "${S}" || die
-}
-
-src_compile() {
-	GO15VENDOREXPERIMENT=1 \
-		GOPATH="${WORKDIR}:${S}/go/vendor" \
-		go build -v -x \
-		-tags production \
-		-o "${T}/keybase" \
-		github.com/keybase/client/go/keybase || die
-}
-
-src_install() {
-	dobin "${T}/keybase"
-}
--- a/app-crypt/keybase/keybase-1.0.18.ebuild
+++ b/app-crypt/keybase/keybase-1.0.18.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils versionator
-
-MY_PV=$(replace_version_separator 3 '-')
-
-DESCRIPTION="Client for keybase.io"
-HOMEPAGE="https://keybase.io/"
-SRC_URI="https://github.com/keybase/client/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-lang/go-1.6:0"
-RDEPEND="
-	app-crypt/gnupg"
-
-S="${WORKDIR}/src/github.com/keybase/client"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	mkdir -p "$(dirname "${S}")" || die
-	mv "client-${MY_PV}" "${S}" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}:${S}/go/vendor" \
-		go build -v -x \
-		-tags production \
-		-o "${T}/keybase" \
-		github.com/keybase/client/go/keybase || die
-}
-
-src_install() {
-	dobin "${T}/keybase"
-}
-
-pkg_postinst() {
-	elog "Run the service: keybase service"
-	elog "Run the client:  keybase login"
-}
--- a/app-crypt/keybase/keybase-1.0.33.ebuild
+++ b/app-crypt/keybase/keybase-1.0.33.ebuild
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-9999.ebuild
@ -54,7 +54,7 @@ src_prepare() {
 	replace-flags -Os -O2

 	# regenerate aclocal.m4 to support earlier automake versions
-	rm aclocal.m4 || die
+	rm -f aclocal.m4 || die

 	default
 	eautoreconf
--- a/app-text/jabref-bin/jabref-bin-4.0.ebuild
+++ b/app-text/jabref-bin/jabref-bin-4.0.ebuild
@ -3,6 +3,8 @@

 EAPI=6

+JAVA_PKG_WANT_TARGET=1.8
+
 inherit eutils java-pkg-2

 MY_PV_1="${PV/_beta/b}"
--- a/dev-db/mysql-init-scripts/files/init.d-2.2
+++ b/dev-db/mysql-init-scripts/files/init.d-2.2
@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2

 extra_commands="checkconfig"
-extra_stopped_commands="boostrap_galera"
+extra_stopped_commands="bootstrap_galera"

 description_checkconfig="Verify the server's configuration"
 description_boostrap_galera="Start a new Galera cluster with this server as the initial node"
--- a/dev-db/mysql-init-scripts/files/init.d-s6-2.2
+++ b/dev-db/mysql-init-scripts/files/init.d-s6-2.2
@ -38,7 +38,7 @@ bootstrap_galera() {


 extra_commands="checkconfig"
-extra_stopped_commands="boostrap_galera"
+extra_stopped_commands="bootstrap_galera"

 description_checkconfig="Verify the server's configuration"
 description_boostrap_galera="Start a new Galera cluster with this server as the initial node"
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r2.ebuild
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r2.ebuild
--- a/dev-games/openscenegraph/files/openscenegraph-3.2.1-cmake.patch
+++ b/dev-games/openscenegraph/files/openscenegraph-3.2.1-cmake.patch
@ -1,276 +0,0 @@
-diff -ruN OpenSceneGraph-3.2.1/CMakeLists.txt new/CMakeLists.txt
--- OpenSceneGraph-3.2.1/CMakeLists.txt	2014-07-04 13:29:02.000000000 +0200
-+++ new/CMakeLists.txt	2014-08-20 00:45:08.857600038 +0200
-@@ -486,6 +486,7 @@
- 
- # INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
- 
-+INCLUDE(MacroOptionalFindPackage)
- 
- ################################################################################
- # Set Version Info resource file
-@@ -515,37 +516,37 @@
-     ANDROID_3RD_PARTY()
- ELSE()
- # Common to all platforms except android:
-    FIND_PACKAGE(Freetype)
-    FIND_PACKAGE(Inventor)
-    FIND_PACKAGE(Jasper)
-    FIND_PACKAGE(OpenEXR)
-    FIND_PACKAGE(COLLADA)
-    FIND_PACKAGE(FBX)
-    FIND_PACKAGE(ZLIB)
-    FIND_PACKAGE(Xine)
-    FIND_PACKAGE(OpenVRML)
-    FIND_PACKAGE(Performer)
-    FIND_PACKAGE(GDAL)
-    FIND_PACKAGE(GTA)
-    FIND_PACKAGE(CURL)
-    FIND_PACKAGE(LibVNCServer)
-    FIND_PACKAGE(OurDCMTK)
-    FIND_PACKAGE(FFmpeg)
-+    MACRO_OPTIONAL_FIND_PACKAGE(Freetype)
-+    MACRO_OPTIONAL_FIND_PACKAGE(Inventor)
-+    MACRO_OPTIONAL_FIND_PACKAGE(Jasper)
-+    MACRO_OPTIONAL_FIND_PACKAGE(OpenEXR)
-+    MACRO_OPTIONAL_FIND_PACKAGE(COLLADA)
-+    MACRO_OPTIONAL_FIND_PACKAGE(FBX)
-+    MACRO_OPTIONAL_FIND_PACKAGE(ZLIB)
-+    MACRO_OPTIONAL_FIND_PACKAGE(Xine)
-+    MACRO_OPTIONAL_FIND_PACKAGE(OpenVRML)
-+    MACRO_OPTIONAL_FIND_PACKAGE(Performer)
-+    MACRO_OPTIONAL_FIND_PACKAGE(GDAL)
-+    MACRO_OPTIONAL_FIND_PACKAGE(GTA)
-+    MACRO_OPTIONAL_FIND_PACKAGE(CURL)
-+    MACRO_OPTIONAL_FIND_PACKAGE(LibVNCServer)
-+    MACRO_OPTIONAL_FIND_PACKAGE(OurDCMTK)
-+    MACRO_OPTIONAL_FIND_PACKAGE(FFmpeg)
-     FIND_PACKAGE(DirectShow)
-    FIND_PACKAGE(SDL)
-    FIND_PACKAGE(Poppler-glib)
-    FIND_PACKAGE(RSVG)
-    FIND_PACKAGE(GtkGl)
-+    MACRO_OPTIONAL_FIND_PACKAGE(SDL)
-+    MACRO_OPTIONAL_FIND_PACKAGE(Poppler-glib)
-+    MACRO_OPTIONAL_FIND_PACKAGE(RSVG)
-+    MACRO_OPTIONAL_FIND_PACKAGE(GtkGl)
-     FIND_PACKAGE(DirectInput)
-    FIND_PACKAGE(NVTT)
-+    MACRO_OPTIONAL_FIND_PACKAGE(NVTT)
-     IF (NOT WIN32)
-        FIND_PACKAGE(Asio)
-+        MACRO_OPTIONAL_FIND_PACKAGE(Asio)
-     ENDIF()
-     FIND_PACKAGE(ZeroConf)
- ENDIF()
- 
- IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8)
-    FIND_PACKAGE(ITK)
-+    MACRO_OPTIONAL_FIND_PACKAGE(ITK)
- ENDIF()
- 
- # Include macro utilities here
-@@ -604,12 +605,12 @@
- IF   (BUILD_OSG_EXAMPLES AND NOT ANDROID)
- 
- 
-    FIND_PACKAGE(FLTK)
-    FIND_PACKAGE(GLUT)
-    FIND_PACKAGE(FOX)
-+    MACRO_OPTIONAL_FIND_PACKAGE(FLTK)
-+    MACRO_OPTIONAL_FIND_PACKAGE(GLUT)
-+    MACRO_OPTIONAL_FIND_PACKAGE(FOX)
- 
-     SET(wxWidgets_USE_LIBS base core gl net)
-    FIND_PACKAGE(wxWidgets)
-+    MACRO_OPTIONAL_FIND_PACKAGE(wxWidgets)
- 
- ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
- 
-@@ -630,10 +631,10 @@
- # can use Quicktime.
- IF(NOT ANDROID)
-     IF(NOT APPLE)
-        FIND_PACKAGE(GIFLIB)
-        FIND_PACKAGE(JPEG)
-        FIND_PACKAGE(PNG)
-        FIND_PACKAGE(TIFF)
-+        MACRO_OPTIONAL_FIND_PACKAGE(GIFLIB)
-+        MACRO_OPTIONAL_FIND_PACKAGE(JPEG)
-+        MACRO_OPTIONAL_FIND_PACKAGE(PNG)
-+        MACRO_OPTIONAL_FIND_PACKAGE(TIFF)
-         # QuickTime is required for OS X, but optional for Windows.
-         IF(WIN32)
-             FIND_PACKAGE(QuickTime)
-@@ -689,15 +690,7 @@
-   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
- ENDIF()
- 
-IF(UNIX AND NOT WIN32 AND NOT APPLE)
-  IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
-      SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement")
-      MARK_AS_ADVANCED(LIB_POSTFIX)
-  ENDIF()
-ENDIF()
-IF(NOT DEFINED LIB_POSTFIX)
-    SET(LIB_POSTFIX "")
-ENDIF()
-+SET(LIB_POSTFIX ${LIB_SUFFIX})
- 
- # Here we apparantly do some funky stuff with making the bin/ and lib/
- # folders which is probably needed to work around a very old CMake bug?
-@@ -1001,7 +994,7 @@
-         ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
-     )
-     #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
-    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
-+    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openscenegraph-doc)
- 
-     # now set up openthreads documentation generation
-     IF(BUILD_REF_DOCS_TAGFILE)
-@@ -1017,7 +1010,7 @@
-         ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
-     )
-     #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
-    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)
-+    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openthreads-doc)
- 
-     # Process our other doxyfiles but don't create targets for these
-     CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile
-diff -ruN OpenSceneGraph-3.2.1/CMakeModules/COPYING-CMAKE-SCRIPTS new/CMakeModules/COPYING-CMAKE-SCRIPTS
--- OpenSceneGraph-3.2.1/CMakeModules/COPYING-CMAKE-SCRIPTS	1970-01-01 01:00:00.000000000 +0100
-+++ new/CMakeModules/COPYING-CMAKE-SCRIPTS	2014-08-20 00:27:15.371715620 +0200
-@@ -0,0 +1,22 @@
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions
-+are met:
-+
-+1. Redistributions of source code must retain the copyright
-+   notice, this list of conditions and the following disclaimer.
-+2. Redistributions in binary form must reproduce the copyright
-+   notice, this list of conditions and the following disclaimer in the
-+   documentation and/or other materials provided with the distribution.
-+3. The name of the author may not be used to endorse or promote products
-+   derived from this software without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-diff -ruN OpenSceneGraph-3.2.1/CMakeModules/FindFLTK.cmake new/CMakeModules/FindFLTK.cmake
--- OpenSceneGraph-3.2.1/CMakeModules/FindFLTK.cmake	2010-11-11 17:51:46.000000000 +0100
-+++ new/CMakeModules/FindFLTK.cmake	2014-08-20 00:29:31.229439251 +0200
-@@ -1,52 +0,0 @@
-# Locate FLTK
-# This module defines
-# FLTK_LIBRARY
-# FLTK_FOUND, if false, do not try to link to gdal 
-# FLTK_INCLUDE_DIR, where to find the headers
-#
-# $FLTK_DIR is an environment variable that would
-# correspond to the ./configure --prefix=$FLTK_DIR
-#
-# Created by Robert Osfield. 
-
-FIND_PATH(FLTK_INCLUDE_DIR Fl/Fl.H Fl/Fl.h
-    $ENV{FLTK_DIR}/include
-    $ENV{FLTK_DIR}
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/include
-    /usr/include
-    /sw/include # Fink
-    /opt/local/include # DarwinPorts
-    /opt/csw/include # Blastwave
-    /opt/include
-    /usr/freeware/include
-)
-
-MACRO(FIND_FLTK_LIBRARY MYLIBRARY MYLIBRARYNAME)
-
-    FIND_LIBRARY(${MYLIBRARY}
-        NAMES ${MYLIBRARYNAME}
-        PATHS
-        $ENV{FLTK_DIR}/lib
-        $ENV{FLTK_DIR}
-        ~/Library/Frameworks
-        /Library/Frameworks
-        /usr/local/lib
-        /usr/lib
-        /sw/lib
-        /opt/local/lib
-        /opt/csw/lib
-        /opt/lib
-        /usr/freeware/lib64
-    )
-
-ENDMACRO(FIND_FLTK_LIBRARY LIBRARY LIBRARYNAME)
-
-FIND_FLTK_LIBRARY(FLTK_LIBRARY fltk)
-FIND_FLTK_LIBRARY(FLTK_GL_LIBRARY fltk_gl)
-
-SET(FLTK_FOUND "NO")
-IF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR)
-    SET(FLTK_FOUND "YES")
-ENDIF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR)
-diff -ruN OpenSceneGraph-3.2.1/CMakeModules/MacroOptionalFindPackage.cmake new/CMakeModules/MacroOptionalFindPackage.cmake
--- OpenSceneGraph-3.2.1/CMakeModules/MacroOptionalFindPackage.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ new/CMakeModules/MacroOptionalFindPackage.cmake	2014-08-20 00:32:02.142858484 +0200
-@@ -0,0 +1,28 @@
-+# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION()
-+# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
-+# This macro is a combination of OPTION() and FIND_PACKAGE(), it
-+# works like FIND_PACKAGE(), but additionally it automatically creates
-+# an option name WITH_<name>, which can be disabled via the cmake GUI.
-+# or via -DWITH_<name>=OFF
-+# The standard <name>_FOUND variables can be used in the same way
-+# as when using the normal FIND_PACKAGE()
-+
-+# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
-+#
-+# Redistribution and use is allowed according to the terms of the BSD license.
-+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-+
-+
-+macro (MACRO_OPTIONAL_FIND_PACKAGE _name )
-+   option(WITH_${_name} "Search for ${_name} package" ON)
-+   if (WITH_${_name})
-+      find_package(${_name} ${ARGN})
-+   else (WITH_${_name})
-+      set(${_name}_FOUND)
-+      set(${_name}_INCLUDE_DIR)
-+      set(${_name}_INCLUDES)
-+      set(${_name}_LIBRARY)
-+      set(${_name}_LIBRARIES)
-+   endif (WITH_${_name})
-+endmacro (MACRO_OPTIONAL_FIND_PACKAGE)
-+
-diff -ruN OpenSceneGraph-3.2.1/CMakeModules/OsgMacroUtils.cmake new/CMakeModules/OsgMacroUtils.cmake
--- OpenSceneGraph-3.2.1/CMakeModules/OsgMacroUtils.cmake	2014-04-13 18:03:17.000000000 +0200
-+++ new/CMakeModules/OsgMacroUtils.cmake	2014-08-20 07:31:10.261828759 +0200
-@@ -453,7 +453,7 @@
-         IF(APPLE)
-             INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin )
-         ELSE(APPLE)
-            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples )
-+            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph-examples )
-         ENDIF(APPLE)
- 
- ENDMACRO(SETUP_EXAMPLE)
-diff -ruN OpenSceneGraph-3.2.1/examples/osgviewerFLTK/CMakeLists.txt new/examples/osgviewerFLTK/CMakeLists.txt
--- OpenSceneGraph-3.2.1/examples/osgviewerFLTK/CMakeLists.txt	2007-06-25 10:35:06.000000000 +0200
-+++ new/examples/osgviewerFLTK/CMakeLists.txt	2014-08-20 00:40:48.620538012 +0200
-@@ -1,6 +1,6 @@
- SET(TARGET_SRC osgviewerFLTK.cpp )
- 
-SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_LIBRARY} ${FLTK_GL_LIBRARY})
-+SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_BASE_LIBRARY} ${FLTK_GL_LIBRARY})
- 
- INCLUDE_DIRECTORIES(${FLTK_INCLUDE_DIR} )
- 
--- a/dev-games/openscenegraph/files/openscenegraph-3.2.1-gdal-2.0.patch
+++ b/dev-games/openscenegraph/files/openscenegraph-3.2.1-gdal-2.0.patch
@ -1,49 +0,0 @@
--- OpenSceneGraph-3.2.1/src/osgPlugins/ogr/ReaderWriterOGR.cpp
-+++ OpenSceneGraph-3.2.1/src/osgPlugins/ogr/ReaderWriterOGR.cpp
-@@ -134,11 +134,21 @@
- 
-     virtual ReadResult readFile(const std::string& fileName, const osgDB::ReaderWriter::Options* options) const
-     {
-+#if GDAL_VERSION_MAJOR < 2
-         if (OGRSFDriverRegistrar::GetRegistrar()->GetDriverCount() == 0)
-             OGRRegisterAll();
-+#else
-+        if (GDALGetDriverCount() == 0)
-+            GDALAllRegister();
-+#endif
- 
-         // Try to open data source
-+#if GDAL_VERSION_MAJOR < 2
-         OGRDataSource* file = OGRSFDriverRegistrar::Open(fileName.c_str());
-+#else
-+        GDALDataset       *file;
-+        file = (GDALDataset*) GDALOpenEx( fileName.c_str(), GDAL_OF_VECTOR, NULL, NULL, NULL );
-+#endif
-         if (!file)
-             return 0;
- 
-@@ -156,6 +166,7 @@
- 
-         osg::Group* group = new osg::Group;
- 
-+#if GDAL_VERSION_MAJOR < 2
-         for (int i = 0; i < file->GetLayerCount(); i++)
-         {
-             osg::Group* node = readLayer(file->GetLayer(i), file->GetName(), useRandomColorByFeature, addGroupPerFeature);
-@@ -163,6 +174,16 @@
-                 group->addChild( node );
-         }
-         OGRDataSource::DestroyDataSource( file );
-+#else
-+        for (int i = 0; i < file->GetLayerCount(); i++)
-+        {
-+            OGRLayer* layer = (OGRLayer *)GDALDatasetGetLayer(file, i); 
-+            osg::Group* node = readLayer(layer, layer->GetName(), useRandomColorByFeature, addGroupPerFeature);
-+            if (node)
-+                group->addChild( node );
-+        }
-+        GDALClose( file );
-+#endif
-         return group;
-     }
- 
--- a/dev-games/openscenegraph/files/openscenegraph-3.2.1-giflib5.patch
+++ b/dev-games/openscenegraph/files/openscenegraph-3.2.1-giflib5.patch
@ -1,24 +0,0 @@
-From: Alberto Luaces <aluaces@udc.es>
-Date: Sat, 19 Dec 2015 04:52:52 +0100
-Subject: Compatibility with giflib5.
-
---
- OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-Index: git2/OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp
-===================================================================
--- git2.orig/OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp
-+++ git2/OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp
-@@ -561,7 +561,11 @@ GifImageStream** obj)
-     *width_ret = giffile->SWidth;
-     *height_ret = giffile->SHeight;
-     *numComponents_ret = 4;
-+#if (GIFLIB_MAJOR >= 5&& !(GIFLIB_MAJOR == 5 && GIFLIB_MINOR == 0))
-+    DGifCloseFile(giffile, &Error);
-+#else
-     DGifCloseFile(giffile);
-+#endif
-     return buffer;
- }
- 
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@ -1,18 +1,12 @@
 DIST Python-2.7.12.tar.xz 12390820 SHA256 d7837121dd5652a05fef807c361909d255d173280c4e1a4ded94d73d80a1f978 SHA512 6ddbbce47cc49597433d98ca05c2f62f07ed1070807b645602a8e9e9b996adc6fa66fa20a33cd7d23d4e7e925e25071d7301d288149fbe4e8c5f06d5438dda1f WHIRLPOOL fe4224f4c3dc8dc5c49005051da0069922c86f39880a0072c09fac422e1913d924ac695e22be11603a961329dd8c17b1cf7696b31b62ef93398e42745a6446d6
-DIST Python-2.7.13.tar.xz 12495628 SHA256 35d543986882f78261f97787fd3e06274bfa6df29fac9b4a94f73930ff98f731 SHA512 f37c9a28ce129d01e63c84d7db627a06402854578f62d17927334ea21ede318e04bbf66e890e3f47c85333e6b19f6e5581fb3f3e27efd24be27017d1b6529c4b WHIRLPOOL 6bb6ad867c856bcaea97d5ad85882d990f5c8169a2450685cb77645f674bead83970c67a6a689ce0807856e366f320a0230250d2239f005f2a64cc32505507a5
 DIST Python-2.7.14.tar.xz 12576112 SHA256 71ffb26e09e78650e424929b2b457b9c912ac216576e6bd9e7d204ed03296a66 SHA512 78310b0be6388ffa15f29a80afb9ab3c03a572cb094e9da00cfe391afadb51696e41f592eb658d6a31a2f422fdac8a55214a382cbb8cfb43d4a127d5b35ea7f9 WHIRLPOOL c604d747daa874de926abb8ec142a7824f2706b79fd828aa189895ba0e7d4df044b9be58d49ab70a245e9e7abd5da4340abe54fa0ff9eab32a4dee7db7ee9d29
 DIST Python-3.4.5.tar.xz 14516820 SHA256 ee64b1c8a47461009abf25252332d29a4e587cb4f0c1c96aa793a3732e9d898a SHA512 b548a5338d141b3086dea372fa2cc245ba5350ee9f0d1304ef6222dc45380b66d380b092e547d54206d56ca68563b95036f445f97f72bb0ef1d48f81a74a3d4c WHIRLPOOL 43e0aed0177d46148964447b4fb24475c4c736afb2ba84ec393fbf55db3da3f192308f9c8f236deaa7a608dac56946ee7755970fadaa82bf406c910a05f36883
 DIST Python-3.4.6.tar.xz 14473592 SHA256 f13428bbe6aa9e3b9b6499502dc488c26096349ed7a21f7a0c1db90911115f40 SHA512 f6785cf6a99a8a27823baefe59cc20e34cbec01bb444c8600e7f49b5437159d5137f9d80fce26e219846d71bfe98f68bc6f0c87719a34db0050a4eaca95959ac WHIRLPOOL d76c18cd247a953ff836cea1ead6f9fb71637938f8bdc91376f06841069944863ac3f6fa536fd0102279e828149c3280b48a48c8d0eaca70df2941a3f38a18ed
-DIST Python-3.5.3.tar.xz 15213396 SHA256 eefe2ad6575855423ab630f5b51a8ef6e5556f774584c06beab4926f930ddbb0 SHA512 bbcc20e315c63dbc8901d7e7bfa29d4dbdad9335720757d8d679730319fd1d9fcfdb55cf62d620c9b052134170f162c28d653a8af60923185b8932524d827864 WHIRLPOOL 8aecc4dd97342d23b61cbef686f8324d4e9ee970e40745f88027bca63cf144cfa454e4d88ac52d508126c26f1ddb18617d0ff37f036438f08842998ed9e06066
 DIST Python-3.5.4.tar.xz 15332320 SHA256 94d93bfabb3b109f8a10365a325f920f9ec98c6e2380bf228f9700a14054c84c SHA512 dbbe2740ee1cce5404b7b6436a9b3887e15f415a1006efa22014ec7e5b1e48c43eed0ff98f6f5b365c527b8d2525be4ce72bbe404ce71c0835529fcd6f0267ff WHIRLPOOL 63bca2b7b6f5da024c30f84d7e4152a37232e3b277fc5ec58ede9a1da57a44e31bb5f2e5ee33874328526f8d7fdd05dc12df5c69fb827394d5b57907671d3dd3
-DIST Python-3.6.1.tar.xz 16872064 SHA256 a01810ddfcec216bcdb357a84bfaafdfaa0ca42bbdaa4cb7ff74f5a9961e4041 SHA512 8605fb7019386fec227d4b06d06f00ae500a8a89df289bfe6141bb56196c75483a60cc0ee553930742b31cefce68add5ccf226e0f27b7b915f5026d597e1ac29 WHIRLPOOL 94309888496431e974463c42375df5eb067321687d47e81efebd36aac322d44bb76f274c0595c7e9de2ea35ead594d0b261e1be2ec31914a812e654c71fff105
 DIST Python-3.6.3.tar.xz 16974296 SHA256 cda7d967c9a4bfa52337cdf551bcc5cff026b6ac50a8834e568ce4a794ca81da SHA512 32f24a3adcb7880003c7ecdc5e53e838e774adda76b308961d8215e28db630b2fa2828097817924c76afa4212b2df3362eb64d4e10f37c0147f512ec5aa8662b WHIRLPOOL cdd04d265568d577e97ce921bef63e78c493f05426adcc8bc2bb1e5dbf02e35c3a4361ff467b7021e917e5056cd12d75cb038e5977093649881f8c2c5aabcc28
 DIST python-gentoo-patches-2.7.12-0.tar.xz 13576 SHA256 cd842eec7202df57c153adc1fbb81e70b26ef651f8e9346e065d8577b93f343b SHA512 8bf530fca15c47fa5d9bc958e433b35943a12c98e4172806a45aa60dc85ec92f8ab6ffcd90f752dc5bf8ffc711414894c15820c4b6ef72dbcedc2808119fb1f6 WHIRLPOOL 54b8ca6a4371d460dadccfdffcc096c12930d58714eef95117a658d7a1337ea89c45c69553b5b993017211faaa0f8d670e09a8452e53c0fb176be3e908524ee6
-DIST python-gentoo-patches-2.7.13-0.tar.xz 13292 SHA256 271835eb36125d09cc5e904ef23a5263acd8e5f513202a8d4f8a9a0f64fc80a8 SHA512 d70f6baba1a465a752c515e33dfdee2a5cc75400fadfb8ea0bd1e82d50089abdf02d7726c697850dc47de2054aa494bbdc08de2673c260b54e609f29dab259ad WHIRLPOOL 6a6d8b099fa814839bf5b3455b3889205c649ef522b35c3a501831d63d0e916d7747b83ac9b8991f8f8c34b328478d84cf7a12a32161ce0fec37204f9c019e2d
 DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 SHA256 3567feeb8f0c66161efaea1922bbfe4e71f6051533ef5f54a74b6ccf9e0359b6 SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1 WHIRLPOOL ab77023ac66def132d1dce72f98add3108fd7be303ef5b167a2374df3a94949c75f089dcfdd84ed05a5eb813d6c22cfecd0de03b5819817a20b04f30030f5f6d
 DIST python-gentoo-patches-3.4.5-0.tar.xz 12044 SHA256 84ee7630670a1dac4bbbc55fabf5f99b5b29007de4f140ad956e93d2e7aba8fa SHA512 108a4845667ecdf4001fcbeffab0cfbbac87439a449a7351428b0f3e2f159e3848ee0c0dfa45c9fba893b9f9584b33722fc8bb0bd7485a1d0909c3a35ede6ed8 WHIRLPOOL f0248faa0b4ce5679e37381bba90f8a4d361a49db792787bffc06a54a4bc82fea4d53255120f10e6dbf51b99e12417fc1b469be9624e73508fa3a212a38e7352
 DIST python-gentoo-patches-3.4.6-0.tar.xz 11728 SHA256 93e7c8487deefc36c612403fb6c82e495c46846a1952f9ed85f82af41840be4a SHA512 41c22dc8f1db8800fc0b97eed2b27bf1873e5de1369bd4aecf7a7a91e609a78e45a4b56fc89d575317f33a7704c0c1cad1494e8a993415a198f256e8338f49ab WHIRLPOOL 851945e7ccea985a88bcbd71bc404bc34c27a0e335386e9ed15fa9876aab3285ff559936fb2dcadf7ac0594a7cb03ac3a9e4135b67b350c5fdf33e9a44ca0654
-DIST python-gentoo-patches-3.5.3-0.tar.xz 11740 SHA256 34e83921697c31a5470afc09b8601b4f54466ac75b3b8ed3ed71af218af10d1c SHA512 16357e49573ea6abe6f106327c0f733312653c68726c4c3f0d1ec21df6d22bc69e512a28131b3a81eb2261e32376811a839b16604e72c7fb5abb7a692840228d WHIRLPOOL 99d3eb0a132f674b998e467a5d89e73d26cf547613034938ad255ccad9d34852b6b18a3da39659c8164b196788bdc90bf2e8ebc5c8c0c4f6fb6fc45fcdd406f5
 DIST python-gentoo-patches-3.5.4-0.tar.xz 11704 SHA256 30c9dbcd5c11ed025b9d8dd201da84c5b9f9756f9b6ba77ccaebc6b79a91e320 SHA512 d395a87695f700598026038d6929ea5038abd7d494294037a4dfa02d5262203dbbaa6ae258a5a7f35ff5542f6266dcf69cc0b9c3df2a047cd2f6699a87e182ec WHIRLPOOL 2191dc89805c1bc11d125005a5c5dd0e5fe635eb0a3d6698bef8b55f54741edc3b3e2588bb21f5eda517963489c15296cd5fd265c8a548d78be6093698e6b002
-DIST python-gentoo-patches-3.6.0-0.tar.xz 10680 SHA256 ecf78d292f2fef1116b41c3884f492d41ea716a14f0a21755ba2f8d76aefe1a7 SHA512 f340643cf338c693ce315fab705ba888040a2989b0887686d43886319419245c24bb46ebb71cea422644f1f3beaf64289b773e72db3377187bf11a83f9313a90 WHIRLPOOL 4a4d12ea0dbb03b5d2730db40b5aebe4c1c937cfe63341c775431dc06a3b60552b9390fdf9b7fff5e50024a93d11b269ef80a95afcf308327943f7003dd4c379
 DIST python-gentoo-patches-3.6.2-0.tar.xz 10744 SHA256 56729f9848557c52361c71404e5583368f6a0e93b5b6c2e643b59cb079e253d9 SHA512 2aac1700c541202aa4f43bff4cb521b996d52ab350133318abaddb43f4b6e20548f37de472ace8024ef325ebf63fdfff0d43f8aa1f717d3c56f974b7aa1764e3 WHIRLPOOL 90d1f12bee812f350ca0330a97290ce0d5c5fa9ccd816441944f042ef561d9023f4b79239f6d559f38a486fea458e48bf11d33d5bd6fa605875b686a2a845bd1
--- a/dev-lang/python/python-2.7.13.ebuild
+++ b/dev-lang/python/python-2.7.13.ebuild
@ -1,365 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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.13-0"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="2.7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:0=
-	>=sys-libs/zlib-1.1.3:0=
-	virtual/libffi
-	virtual/libintl
-	berkdb? ( || (
-		sys-libs/db:5.3
-		sys-libs/db:5.2
-		sys-libs/db:5.1
-		sys-libs/db:5.0
-		sys-libs/db:4.8
-		sys-libs/db:4.7
-		sys-libs/db:4.6
-		sys-libs/db:4.5
-		sys-libs/db:4.4
-		sys-libs/db:4.3
-		sys-libs/db:4.2
-	) )
-	gdbm? ( sys-libs/gdbm:0=[berkdb] )
-	ncurses? (
-		>=sys-libs/ncurses-5.2:0=
-		readline? ( >=sys-libs/readline-4.1:0= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	tk? (
-		>=dev-lang/tcl-8.0:0=
-		>=dev-lang/tk-8.0:0=
-		dev-tcltk/blt:0=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1 )
-	!!<sys-apps/portage-2.1.9"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )
-	doc? ( dev-python/python-docs:${SLOT} )"
-PDEPEND=">=app-eselect/eselect-python-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
-
-	# Daylight saving time problem
-	# https://bugs.python.org/issue22067
-	# https://bugs.gentoo.org/610628
-	local -x TZ=UTC
-
-	# 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
-
-	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
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
--- a/dev-lang/python/python-2.7.14.ebuild
+++ b/dev-lang/python/python-2.7.14.ebuild
@ -16,7 +16,7 @@ SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.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"
+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.
@ -312,7 +312,7 @@ src_install() {
 	# 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}:}.
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
 	else
 		vars=( PYTHON "${vars[@]}" )
 	fi
--- a/dev-lang/python/python-3.4.5.ebuild
+++ b/dev-lang/python/python-3.4.5.ebuild
@ -284,7 +284,7 @@ src_install() {
 	# 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}:}.
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
 	else
 		vars=( PYTHON "${vars[@]}" )
 	fi
--- a/dev-lang/python/python-3.4.6.ebuild
+++ b/dev-lang/python/python-3.4.6.ebuild
@ -284,7 +284,7 @@ src_install() {
 	# 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}:}.
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
 	else
 		vars=( PYTHON "${vars[@]}" )
 	fi
--- a/dev-lang/python/python-3.5.3.ebuild
+++ b/dev-lang/python/python-3.5.3.ebuild
@ -1,362 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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.3-0"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://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}/${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() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-
-	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.4.ebuild
+++ b/dev-lang/python/python-3.5.4.ebuild
@ -290,7 +290,7 @@ src_install() {
 	# 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}:}.
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
 	else
 		vars=( PYTHON "${vars[@]}" )
 	fi
--- a/dev-lang/python/python-3.6.1-r1.ebuild
+++ b/dev-lang/python/python-3.6.1-r1.ebuild
@ -1,343 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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.6.0-0"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="3.6/3.6m"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build 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
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	epatch "${FILESDIR}/${PN}-3.5-distutils-OO-build.patch"
-	epatch "${FILESDIR}/3.6.1-test_socket-AEAD.patch"
-	epatch "${FILESDIR}/3.6-blake2.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 \
-		configure.ac \
-		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
-
-	# 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
-
-	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
-	)
-
-	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() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-
-	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
-
-	# 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}
-
-	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 sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	use tk || rm -r "${ED}usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	use threads || rm -r "${libdir}/multiprocessing" || die
-	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
-
-	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.6.3.ebuild
+++ b/dev-lang/python/python-3.6.3.ebuild
@ -270,7 +270,7 @@ src_install() {
 	# 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}:}.
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
 	else
 		vars=( PYTHON "${vars[@]}" )
 	fi
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild
@ -1,145 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-WANT_AUTOCONF="2.1"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-inherit autotools eutils toolchain-funcs multilib python-any-r1 versionator pax-utils
-
-MY_PN="js"
-TARBALL_PV="$(replace_all_version_separators '' $(get_version_component_range 1-3))"
-MY_P="${MY_PN}-${PV}"
-TARBALL_P="${MY_PN}${TARBALL_PV}-1.0.0"
-DESCRIPTION="Stand-alone JavaScript C library"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
-SRC_URI="https://archive.mozilla.org/pub/js/${TARBALL_P}.tar.gz
-	https://dev.gentoo.org/~axs/distfiles/${PN}-slot0-patches-01.tar.xz"
-
-LICENSE="NPL-1.1"
-SLOT="0/mozjs185"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
-IUSE="debug minimal static-libs test"
-
-S="${WORKDIR}/${MY_P}"
-BUILDDIR="${S}/js/src"
-
-RDEPEND=">=dev-libs/nspr-4.7.0
-	sys-libs/readline:0=
-	x64-macos? ( dev-libs/jemalloc )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-arch/zip
-	virtual/pkgconfig"
-
-pkg_setup(){
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		export LC_ALL="C"
-	fi
-}
-
-src_prepare() {
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43
-	epatch "${WORKDIR}"/sm0/${P}-fix-install-symlinks.patch
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=638056#c9
-	epatch "${WORKDIR}"/sm0/${P}-fix-ppc64.patch
-	# https://bugs.gentoo.org/show_bug.cgi?id=400727
-	# https://bugs.gentoo.org/show_bug.cgi?id=420471
-	epatch "${WORKDIR}"/sm0/${P}-arm_respect_cflags-3.patch
-	# https://bugs.gentoo.org/show_bug.cgi?id=438746
-	epatch "${WORKDIR}"/sm0/${PN}-1.8.7-freebsd-pthreads.patch
-	# https://bugs.gentoo.org/show_bug.cgi?id=441928
-	epatch "${WORKDIR}"/sm0/${PN}-1.8.5-perf_event-check.patch
-	# https://bugs.gentoo.org/show_bug.cgi?id=439260
-	epatch "${WORKDIR}"/sm0/${P}-symbol-versions.patch
-	# https://bugs.gentoo.org/show_bug.cgi?id=441934
-	epatch "${WORKDIR}"/sm0/${PN}-1.8.5-ia64-fix.patch
-	epatch "${WORKDIR}"/sm0/${PN}-1.8.5-ia64-static-strings.patch
-	# https://bugs.gentoo.org/show_bug.cgi?id=431560
-	epatch "${WORKDIR}"/sm0/${PN}-1.8.5-isfinite.patch
-	# https://bugs.gentoo.org/show_bug.cgi?id=552786
-	epatch "${FILESDIR}"/${PN}-perl-defined-array-check.patch
-
-	epatch_user
-
-	cd "${BUILDDIR}" || die
-	eautoconf
-}
-
-src_configure() {
-	cd "${BUILDDIR}" || die
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-	AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-	LD="$(tc-getLD)" \
-	econf \
-		${myopts} \
-		--enable-jemalloc \
-		--enable-readline \
-		--enable-threadsafe \
-		--with-system-nspr \
-		--disable-optimize \
-		--disable-profile-guided-optimization \
-		$(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests)
-}
-
-cross_make() {
-	emake \
-		CFLAGS="${BUILD_CFLAGS}" \
-		CXXFLAGS="${BUILD_CXXFLAGS}" \
-		AR="${BUILD_AR}" \
-		CC="${BUILD_CC}" \
-		CXX="${BUILD_CXX}" \
-		RANLIB="${BUILD_RANLIB}" \
-		"$@"
-}
-src_compile() {
-	cd "${BUILDDIR}" || die
-	if tc-is-cross-compiler; then
-		tc-export_build_env BUILD_{AR,CC,CXX,RANLIB}
-		cross_make jscpucfg host_jsoplengen host_jskwgen
-		cross_make -C config nsinstall
-		mv {,native-}jscpucfg || die
-		mv {,native-}host_jskwgen || die
-		mv {,native-}host_jsoplengen || die
-		mv config/{,native-}nsinstall || die
-		sed -i \
-			-e 's@./jscpucfg@./native-jscpucfg@' \
-			-e 's@./host_jskwgen@./native-host_jskwgen@' \
-			-e 's@./host_jsoplengen@./native-host_jsoplengen@' \
-			Makefile || die
-		sed -i -e 's@/nsinstall@/native-nsinstall@' config/config.mk || die
-		rm -f config/host_nsinstall.o \
-			config/host_pathsub.o \
-			host_jskwgen.o \
-			host_jsoplengen.o || die
-	fi
-	emake
-}
-
-src_test() {
-	cd "${BUILDDIR}/jsapi-tests" || die
-	# for bug 415791
-	pax-mark mr jsapi-tests
-	emake check
-}
-
-src_install() {
-	cd "${BUILDDIR}" || die
-	emake DESTDIR="${D}" install
-	# bug 437520 , exclude js shell for small systems
-	if ! use minimal ; then
-		dobin shell/js
-		pax-mark m "${ED}/usr/bin/js"
-	fi
-	dodoc ../../README
-	dohtml README.html
-
-	if ! use static-libs; then
-		# We can't actually disable building of static libraries
-		# They're used by the tests and in a few other places
-		find "${D}" -iname '*.a' -delete || die
-	fi
-}
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild
@ -19,7 +19,7 @@ SRC_URI="https://archive.mozilla.org/pub/js/${TARBALL_P}.tar.gz

 LICENSE="NPL-1.1"
 SLOT="0/mozjs185"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 IUSE="debug minimal static-libs test"

 S="${WORKDIR}/${MY_P}"
--- a/dev-libs/cgicc/cgicc-3.2.16.ebuild
+++ b/dev-libs/cgicc/cgicc-3.2.16.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"

 LICENSE="LGPL-3 doc? ( FDL-1.2 )"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples static-libs"

 RDEPEND=""
--- a/dev-libs/check/check-0.10.0-r1.ebuild
+++ b/dev-libs/check/check-0.10.0-r1.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

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

 RDEPEND="subunit? ( >=dev-python/subunit-0.0.10-r1[${MULTILIB_USEDEP}] )"
--- a/dev-libs/zthread/zthread-2.3.2-r1.ebuild
+++ b/dev-libs/zthread/zthread-2.3.2-r1.ebuild
@ -1,58 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils autotools
-
-MY_P=ZThread-${PV}
-
-DESCRIPTION="A platform-independent multi-threading and synchronization library for C++"
-HOMEPAGE="http://zthread.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zthread/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~mips ppc sparc x86"
-IUSE="debug doc kernel_linux static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	rm -f include/zthread/{.Barrier.h.swp,Barrier.h.orig} || die
-	epatch "${FILESDIR}"/${P}-no-fpermissive.diff
-
-	AT_M4DIR="share" eautoreconf
-}
-
-src_configure() {
-	local myconf
-	use debug && myconf="--enable-debug"
-
-	econf \
-		$(use_enable kernel_linux atomic-linux) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	emake || die
-
-	if use doc; then
-		doxygen doc/zthread.doxygen || die
-		cp doc/documentation.html doc/html/index.html || die
-		cp doc/zthread.css doc/html/zthread.css || die
-		cp doc/bugs.js doc/html/bugs.js || die
-	fi
-}
-
-src_install() {
-	einstall || die
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	use doc && dohtml doc/html/*
-
-	find "${D}" -name '*.la' -delete
-}
--- a/dev-libs/zthread/zthread-2.3.2-r2.ebuild
+++ b/dev-libs/zthread/zthread-2.3.2-r2.ebuild
@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils autotools
-
-MY_P=ZThread-${PV}
-DESCRIPTION="platform-independent multi-threading and synchronization library for C++"
-HOMEPAGE="http://zthread.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zthread/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE="debug doc kernel_linux static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	rm -f include/zthread/{.Barrier.h.swp,Barrier.h.orig} || die
-	epatch "${FILESDIR}"/${P}-no-fpermissive.diff
-	epatch "${FILESDIR}"/${P}-m4-quote.patch
-	epatch "${FILESDIR}"/${P}-automake.patch
-	epatch "${FILESDIR}"/${P}-gcc47.patch
-
-	AT_M4DIR="share" eautoreconf
-}
-
-src_configure() {
-	local myconf
-	# Autoconf does not support --disable-debug properly.
-	use debug && myconf="--enable-debug"
-
-	econf \
-		$(use_enable kernel_linux atomic-linux) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	emake
-
-	if use doc; then
-		doxygen doc/zthread.doxygen || die
-		cp doc/documentation.html doc/html/index.html || die
-		cp doc/zthread.css doc/html/zthread.css || die
-		cp doc/bugs.js doc/html/bugs.js || die
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${ED}"
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	use doc && dohtml doc/html/*
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@ -4,13 +4,10 @@ DIST sbcl-1.0.28-sparc-linux-binary.tar.bz2 8032042 SHA256 a2e848ac11b0f16bb9186
 DIST sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 8217590 SHA256 6971a64c0706894f217da676081874088f50f84daa66d89b653b065f83563f3b SHA512 8118de56e448bce7a72b832e661eb4e2687eed675f88f766f7043c843a432e35121d9e6f9da8d22ac690c54bda0d55ecb07728748ce2cdd57320f49b4b812b86 WHIRLPOOL f91c344a2b99a5a1c2dfe3af0172f548997b9aaf9ad5e865eb76c8311f6114275eda1e7e76af6efe5c1a346d1761f45e374f577313029fa9b83adfdec10c70ad
 DIST sbcl-1.1.6-x86-darwin-binary.tar.bz2 9091955 SHA256 5801c60e2a875d263fccde446308b613c0253a84a61ab63569be62eb086718b3 SHA512 5b9d58ba1a7bcf3aa5011ac5ba1c8dba65e44b2c3f8a31b15db54de6b34ea0f7482c45f1cc4e1323e154ce79fbba030112df3795cb323bca46bac50f15d2a138 WHIRLPOOL 673e84bbf685e07568530ccb2c3822dbfffd6226d3de90bfef13078466ae245f63dd2fc4ac48b4d64ca1453cc831ad6913af21540bd3b35fe51700161ca26086
 DIST sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 10038928 SHA256 057d3a1c033fb53deee994c0135110636a04f92d2f88919679864214f77d0452 SHA512 c271796f854fe884e0d8aa6504bbe2e6c078de1555fc9a823463640cfd8c793dbddcb3f32932788d84a41e2b8a085b95c97c13a15c43fc909dcaad18ce25f215 WHIRLPOOL 2c39d1ac1490693b758b54b473970deaa9078f00bc579745fbbed169e696846fda888f105bc77d610a8cb1c0f995c6e6ad572b9163d55b3701db02f7f68824b8
-DIST sbcl-1.2.7-armhf-linux-binary.tar.bz2 9914851 SHA256 5e75a328882b739befcf5c38e8039b830668a8ca7bafe56a9e13ef23f39eb253 SHA512 2c82bdfe4f070a43964e694f81ccdbb84f8dd3bf77c807343daadff877b518fcd52e05513691543ca076c2b6de8bcf8b2e672b31f5ed3f545bedb02bbf7cd868 WHIRLPOOL 8e0eab53a9bfe10a1ccaa5c950e9fe045aeaa23f9f66ca98badd5a0fce3ad5828c0059904c73584dd4591fb3f9b2eefb5210a19f2de9fd8d699d48b0cee3bbef
 DIST sbcl-1.2.7-powerpc-linux-binary.tar.bz2 9884585 SHA256 d2f86db4f6fe2b6e6bbc6353ce28dead1b142ed36885080b97304db55aae2861 SHA512 7b9fef12d3d6397adec6a0c26d1431a18b8d91b5bf009034eb2501de9fd60dc04dd2e3cd2d9feb9204d4631360aea88ba07a9ad75dad0767b5dcc5e62e84e790 WHIRLPOOL 4b884ab946e8c54775970aa502054f42a92d01257449796c7d1a6bd1ff5835ddae1c94aa5d936a7a5b115183c6cee5251034646559e4435a6663896fa302c4be
 DIST sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 10438955 SHA256 a0a13e83b35dbac36284459747a03c6db20cd089864e16a6380a12a6aa138115 SHA512 9566cebf8fc29ead1f919309e3f98aeb618e97b34c80f53d1f739f1a3f4ef4cbaebd1c67f0b32172a0cdf14dc405eb75d0e916dedf3b8a758cdec2368d25f5c1 WHIRLPOOL 4946b9a4463c92517233298f898510ca57b4127da93d7d42cf28005bbd96b8d1eba7472f73029f45d6c0e75f3de5b893a34f33feee92a60cef8ae4f2b4d4fa0e
 DIST sbcl-1.2.7-x86-linux-binary.tar.bz2 10516485 SHA256 724425fe0d28747c7d31c6655e39fa8c27f9ef4608c482ecc60089bcc85fc31d SHA512 ca09beeafeb40f21eb1a377f04a69d57feb5549fa63aadf2e39aa65f3875418bdab755e22b567b3f2c514fb94534b739a57606288912ffc5cddf370a400e9e5c WHIRLPOOL 41b3f5a9749c74f136b8bb4f519409902045cd9501b5b944e7bcbf9336dd6640388641d26f8c345d79a1028ae64bb04fb74228886f8c2ae0eb085a8586635e17
 DIST sbcl-1.2.7-x86-solaris-binary.tar.bz2 10351529 SHA256 a198df14f45cdf302017116744c8946a8b4143291efe1799553554133c22b46a SHA512 b30d40f0095bb43719ba2e1a619f53fe5f0bccaa08a35481bc5feeb0dd5b540018a9ec9f61799de89991a85750577922cb4e56db4d7dab8f07e18bbc643bdad1 WHIRLPOOL 05ad3606b23e6196d443328f367b7351612d0f4991d71a5a04f1f45b5bb604809d6ed11c8cf62bc639d6f9dd8e5704b52a050603d4745713c5818fcbd36852bf
-DIST sbcl-1.3.0-source.tar.bz2 5722767 SHA256 d60caf6a0a495e41fc9e7f6a797e7c4188cef1f9de84ca263ff654d4d7ae99b3 SHA512 4bcdc3e4d101ec64b6af2db8101e3b18b298c343d7928984604dc17d531b986787ba84ce1276c41066a9a2c06270d2aeb26870ba7b18ecb7daaa6b3a6c7f6450 WHIRLPOOL e635064fad32556ce0017c3cf27bfda02581dc627b0884d3dc0b1bc44c62cd4a0ea6690997b53414ddd7355cc06647f2952ccf3c2d329baa0e137b5fd992ea3b
-DIST sbcl-1.3.0-x86-64-linux-binary.tar.bz2 9830954 SHA256 e6e801f0cc31fd6a14cf20b983c6ef2be5750225fad221bf9621788c0a0a90c5 SHA512 916fdd1627903b7227a6d5962a2534fa2cd9003f832b975c96d0e11c301d73c7c3225cfd4121f10cbcdde87dcac9079b9a48e6737ba9a3d2c18c484bae3c371d WHIRLPOOL a4372dd59df03e0e0e8d2359799e0580b6829e001c219ef28504cc7db8b3a8ad7429ecdcd36bb72ed5196192d9f66b2854c5b6960cd5f97c31afd758a17c6a67
 DIST sbcl-1.3.11-source.tar.bz2 5790557 SHA256 077a2d98f94c62076bcb4dea715a11975b92d85d8de20f5a0d1c36d280397642 SHA512 07cce0b33f1d41bc208827d228ae356b56165bb55fab72c48973a15a63e2e680aafc16db67d36cc4952f71101faaacafd9660276cd67673314f1699d6a91af82 WHIRLPOOL 0e61c415775c4c11d111d6ae830f8be1611fd1674b23c2fc8fead59277af507adc9c4683b066fde9e3c0dfa52023b850f6714f2ec480901718d452e0f25818bf
 DIST sbcl-1.3.11-x86-64-linux-binary.tar.bz2 9248214 SHA256 9ab2c149b7ba43e7f6237c1a23e3037078db46a83913040958fa08dd6011dba5 SHA512 ffb443f9e3ede2f9dbdc1bf28554bd59ef1fd5ad855465ee10f9835221fde20211188e881be854b4760870b122dfc6c5ad5c8cad1bea613ffb3b6a6f67a36056 WHIRLPOOL 0a34701abd81cdea411ac37e276660e29f43279509bef28600e7084e9ffc525883e18c42338492b0ccb5fb21e85c91726f978aa20a87deeb92e813a15b36d9fa
 DIST sbcl-1.3.12-armhf-linux-binary.tar.bz2 9193847 SHA256 f5851efe3626a7acf1ae11ab471072b3730785de5c6ed07717c9cd746f260c5e SHA512 5bdb4e2b584933e9ee9aaa2ba68328f219f072af802782ee5dedf83baa5c679cd5a1ccbf3458678810ccb8679ffd392d4fba108e86d537e10554c1860bfd4de5 WHIRLPOOL 4f1fb37f0592b2d78e0b8c89e0cd499ac2c499809e036fac1b8bdeb8a39bd5b2e2660add88d697397a7fd6013acdd6af9f2bf479a41c19180787b989471deca2
@ -39,3 +36,5 @@ DIST sbcl-1.3.21-x86-64-linux-binary.tar.bz2 10633302 SHA256 c1c3e17e1857fb1c22a
 DIST sbcl-1.3.9-armhf-linux-binary.tar.bz2 9161130 SHA256 da2d296a8ab107a7b2e10831836648d882b01193f60269853932af4f63a06571 SHA512 309e2ac7ef9ac95bf751432cf243af0de022c5b21054df2bf4e99da4ff087218af72b0ab3be69214eba3df1b6bbe707cc28840508e960c5d2ed2af0e86de3fdd WHIRLPOOL d2dde314d2b49e4246823032d953bbfe0858f7c69d0445da356426f9c5fac73036b32c1c048cf7f43615fa02707e8e434d8b085942e79d1e2b20f6fcb7e08919
 DIST sbcl-1.4.0-source.tar.bz2 5907661 SHA256 08d59ca79f78311304664d5093764cda94ff2693d92736d1321fa6074b570769 SHA512 fe22f06cf645b20445e55700cbb3a54d27de58f3cffafb67b0970a0f6962e9914708d0718ffd3dda0a75dfdf8c9f6830dd995ccf7e9c2384ee043eeb27bb3d1b WHIRLPOOL 2b229c0568b69ec9bd4ed74e37df88a9dedc1f4705747332180f730892ebca6943e118d1bbc848289e02168cb9e76e2c5f934087bfbbae5a2ad662c7f982790b
 DIST sbcl-1.4.0-x86-64-linux-binary.tar.bz2 10573661 SHA256 2b8d5256cb7e3057f47c3d81355d46dd96d966928652c011da613c519c532b67 SHA512 7cd8ea2a411b55a85df5113c0bcb63078d67c9c31edf12f3ee87075569436711725c325027b6bbdd6d5a2c79511da12a034278d734c7cc75c96f0a44941ee437 WHIRLPOOL e97ceb6736072d3e48885db92ccec0f153b79532c0ad6371c0cafa62f3d4d2f37984c92bfea12857f1f8ba0bfeb488e6332dac15c413e32f76b69905b13370ad
+DIST sbcl-1.4.1-source.tar.bz2 5935675 SHA256 e8c7c6068241b13941d357a0a1f5a04ba04c7c83a52b00f0fbe296770872aae1 SHA512 d9f77194c096724bb1f212e1f5c2086d781ca4c7180c0ce524f892d259ac4a0adabccce468eb5eca511d3b1e9054fbcac9716e757352d71ddacf7710e681616c WHIRLPOOL 632c7b5ea46449239e21118208ec8e43cbd26404ba809d071f12b8c75ff98944c2a73932cecf42fc336bfef30c185341ceb88ba427a0825a28de1fbf0260627a
+DIST sbcl-1.4.1-x86-64-linux-binary.tar.bz2 10566390 SHA256 77e08c682b12cc9b19a36addd63b65d781b1cd12a92727e673d4a016760255ca SHA512 bbf7f5d5d7d729e54f8c3eb85c270aeae690fe3ccde088825f71c3b8b317d0126b4f52a06db73992f200e7ee9fa14328ee0cb399f79adb8b24217d4b7cea9c06 WHIRLPOOL 16aa37d7580eb792cc169297c575a0512e53d39e065f1060631d2ff21599835c7fcb2a467defa2e8e7e73850f6cbc9f4e128c51beed3152224302430a55a60d3
--- a/dev-lisp/sbcl/sbcl-1.4.1.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.4.1.ebuild
@ -1,17 +1,18 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
+
 inherit multilib eutils flag-o-matic pax-utils

 #same order as http://www.sbcl.org/platform-table.html
 BV_X86=1.2.7
-BV_AMD64=1.3.0
+BV_AMD64=1.4.1
 BV_PPC=1.2.7
 BV_SPARC=1.0.28
 BV_ALPHA=1.0.28
-BV_ARM=1.2.7
-BV_ARM64=1.3.0
+BV_ARM=1.3.12
+BV_ARM64=1.3.16
 BV_PPC_MACOS=1.0.47
 BV_X86_MACOS=1.1.6
 BV_X64_MACOS=1.2.11
@ -28,6 +29,7 @@ SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
 	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
 	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
 	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
+	arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 )
 	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
 	x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 )
 	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
@ -93,34 +95,32 @@ src_unpack() {
 }

 src_prepare() {
-	eapply "${FILESDIR}"/gentoo-fix_install_man.patch
 	# bug #468482
-	eapply "${FILESDIR}"/concurrency-test-1.2.6.patch
+	eapply "${FILESDIR}"/concurrency-test-1.3.15.patch
 	# bugs #486552, #527666, #517004
-	eapply "${FILESDIR}"/bsd-sockets-test-1.2.11.patch
+	eapply "${FILESDIR}"/${PN}-1.4.0-bsd-sockets-test.patch
 	# bugs #560276, #561018
 	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch

 	eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch
-	eapply "${FILESDIR}"/${PN}-1.2.13-verbose-build.patch
-
-	# To make the hardened compiler NOT compile with -fPIE -pie
-	if gcc-specs-pie ; then
-		einfo "Disabling PIE..."
-		eapply "${FILESDIR}"/${PN}-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch
-	fi
+	eapply "${FILESDIR}"/${PN}-1.4.0-verbose-build.patch

 	eapply_user

-	# bug #526194
-	sed -e "s@CFLAGS =.*\$@CFLAGS = ${CFLAGS} -g -Wall -Wsign-compare@" \
-		-e "s@LINKFLAGS =.*\$@LINKFLAGS = ${LDFLAGS} -g@" \
+	# bugs #526194, #620532
+	sed -e "s@CFLAGS +=.*\$@CFLAGS = ${CFLAGS} -Wall -Wsign-compare -Wpointer-arith@" \
+		-e "s@LINKFLAGS += -g\$@LINKFLAGS = ${LDFLAGS}@" \
+		-e "s@LINKFLAGS += -no-pie\$@LINKFLAGS = ${LDFLAGS} -no-pie@" \
+		-e "s@LINKFLAGS += -nopie\$@LINKFLAGS = ${LDFLAGS} -nopie@" \
 		-i src/runtime/GNUmakefile || die

 	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
 		-i make-config.sh || die

+	# Use installed ASDF version
 	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+	# Avoid installation of ASDF info page. See bug #605752
+	sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die

 	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk

@ -159,7 +159,7 @@ src_compile() {
 			"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
 	fi

-	# clear the environment to get rid of non-ASCII strings, see bug 174702
+	# clear the environment to get rid of non-ASCII strings, see bug #174702
 	# set HOME for paludis
 	env - HOME="${T}" PATH="${PATH}" \
 		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
@ -216,8 +216,6 @@ src_install() {
 	find "${ED}" -empty -type d -exec rmdir -v {} +

 	if use doc; then
-		docinto html
-		dodoc -r doc/manual/
 		dodoc -r doc/internals/sbcl-internals

 		doinfo doc/manual/*.info*
@ -229,8 +227,6 @@ src_install() {
 		rm -Rv "${ED}/usr/share/doc/${PF}" || die
 	fi

-	dodoc BUGS CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES README TLA TODO
-
 	# install the SBCL source
 	if use source; then
 		./clean.sh
--- a/dev-perl/MARC-File-XML/MARC-File-XML-1.0.3.ebuild
+++ b/dev-perl/MARC-File-XML/MARC-File-XML-1.0.3.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
-
+MY_PN=MARC-XML
 MODULE_AUTHOR=GMCHARLT
 inherit perl-module

--- a/dev-perl/MARC-File-XML/MARC-File-XML-1.0.5.ebuild
+++ b/dev-perl/MARC-File-XML/MARC-File-XML-1.0.5.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+DIST_AUTHOR=GMCHARLT
+inherit perl-module
+
+DESCRIPTION="Work with MARC data encoded as XML"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/MARC-Charset-0.980.0
+	>=dev-perl/MARC-Record-2.0.0
+	>=dev-perl/XML-LibXML-1.660.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+		dev-perl/Test-Warn
+	)
+"
--- a/dev-perl/MARC-File-XML/Manifest
+++ b/dev-perl/MARC-File-XML/Manifest
@ -0,0 +1,2 @@
+DIST MARC-File-XML-1.0.5.tar.gz 18406 SHA256 54880f2e81455c40f851e7c024ccd1043bb2ea33073facf609484df37e9993f3 SHA512 9a2ea2e3bb19a43cb4870cbc3a647c09ce02df91a91251e4646d7804efc47af45676c65ad4504ef7f16e49e2eae008866d0d72c69f8a684f079b8666ceb58dcc WHIRLPOOL 869c2f78daebfeec3bbdf7131415cc3047812331ce7e48bf957d4a35e6047dfdd969ef0795f64886cbaec51b08c3dfa9dd2a1a5c69b39b85f8481cfe6fade9dd
+DIST MARC-XML-1.0.3.tar.gz 18204 SHA256 0f5f2a99a9850f30812cb06807b43b3e27999d92e4ca64903b2a8b8587df6c5f SHA512 a460388c92ac8c6c285b40d1ec2cfc4d86177c9a35854a8da17ac16349f952af37f57e00fce4091546f8225757addd1ee4c16862334c6d59b712395b284661a9 WHIRLPOOL 62d3a7ce54ddce853c460cd52687739135a71be9ef2ee64776af6912aa5f2611a81a89bdd82b654749ca1c56f91ff7159fbefd1b12a0a10eee57d626581224e2
--- a/dev-perl/MARC-File-XML/metadata.xml
+++ b/dev-perl/MARC-File-XML/metadata.xml
@ -6,8 +6,7 @@
    <name>Gentoo Perl Project</name>
  </maintainer>
  <upstream>
-    <remote-id type="cpan">MARC-XML</remote-id>
-    <remote-id type="cpan-module">MARC::File::SAX</remote-id>
+    <remote-id type="cpan">MARC-File-XML</remote-id>
    <remote-id type="cpan-module">MARC::File::XML</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-perl/MARC-XML/Manifest
+++ b/dev-perl/MARC-XML/Manifest
@ -1 +0,0 @@
-DIST MARC-XML-1.0.3.tar.gz 18204 SHA256 0f5f2a99a9850f30812cb06807b43b3e27999d92e4ca64903b2a8b8587df6c5f SHA512 a460388c92ac8c6c285b40d1ec2cfc4d86177c9a35854a8da17ac16349f952af37f57e00fce4091546f8225757addd1ee4c16862334c6d59b712395b284661a9 WHIRLPOOL 62d3a7ce54ddce853c460cd52687739135a71be9ef2ee64776af6912aa5f2611a81a89bdd82b654749ca1c56f91ff7159fbefd1b12a0a10eee57d626581224e2
--- a/dev-perl/MCE/MCE-1.831.0.ebuild
+++ b/dev-perl/MCE/MCE-1.831.0.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MARIOROY
+DIST_VERSION=1.831
+inherit perl-module
+
+DESCRIPTION="Many-Core Engine providing parallel processing capabilities"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test +sereal"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-File-Path
+	virtual/perl-Getopt-Long
+	virtual/perl-IO
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Socket
+	>=virtual/perl-Storable-2.40.0
+	virtual/perl-Time-HiRes
+	sereal? (
+		>=dev-perl/Sereal-Encoder-3.15.0
+		>=dev-perl/Sereal-Decoder-3.15.0
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
--- a/dev-perl/MCE/Manifest
+++ b/dev-perl/MCE/Manifest
@ -4,3 +4,4 @@ DIST MCE-1.821.tar.gz 175624 SHA256 be05275e783d706aa559ef9b8a22087f6fecd7f21887
 DIST MCE-1.826.tar.gz 177558 SHA256 0bc1aea1646d21c73af7b09b254b3e8d1d5ff7b9b4b1a49e14ff198cd9e0b89f SHA512 183e4ff2192911541425650b40ac72ffdf444a9f8c1172f6cdd6448e1ee0e8e06a74d5a34e48498258c5059b1c71cb469ce3de2f0bf1cbdf915e0133cfa64b35 WHIRLPOOL 509705f0d083e9eb36f52c0ba972b811b4af45bb81e7e9217b6c15fb16a66842a306bddd074aa6d08c3041486b19451e2363348f24192156e3bff5bff9333c4c
 DIST MCE-1.827.tar.gz 178361 SHA256 bbe92c61e38822a9a8c25dbd0bdbd3b1a091aa86b59ac0b391b4269c995e83e8 SHA512 bb87ee355ae07230f627f1c02092129c59885eebaa6c3e99bb502bf298bce878e6aacdd1e03a4290a7312429e86b4066c3b1380b04118c4e52081d939915d7e5 WHIRLPOOL 278b2f22db37fce3947ea438a6129b210f025cad98df5bb5e1ce9fa71e09cf9cacecdc1fed095bc42c248c57cd43482b3feb4db15d2132bedb0b6c56d2be226f
 DIST MCE-1.829.tar.gz 181474 SHA256 cdf2420108b2a3b0b4ed6ddd53f9c5c283c1eaab04a9445d7accd67c4abe3489 SHA512 fb77945529552e96bbb7f2b455442485cd915394b47b342795c177b33ffe102047de9f0b5f7f5281cefd0af2810bc8523220c881033a873d8b79b8bd9bedddf3 WHIRLPOOL f1b2a253c10af6e450367ee09b004cb1b407c8684942844a701670e6c363898b98b94b2e5bafa8218a567d48b3d294aa9c0cdf0ff6e691db42c3da00fa152c86
+DIST MCE-1.831.tar.gz 181710 SHA256 0720bbbf2d76c157eb16dd0de81e70916445e7e4db5aadee1505eb7221d42d3d SHA512 cca01463bed30b2c028318d92269de59f7c48d86c64b7a2bb7e07a9a668217f10ae70d4e6ac05e873d7305b572840833bdce8585dfd3975a56c95b531ce4cc0e WHIRLPOOL e862648ca6f1dd5439931047a3d91e97cd0efb7399c29f3c0f6ae6ab9167a16dec0dc5c43306b1e7f9f786c74969f86b6f7500e21b98f786ddf50ac589ded47a
--- a/dev-perl/MP3-Info/MP3-Info-1.260.0.ebuild
+++ b/dev-perl/MP3-Info/MP3-Info-1.260.0.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=JMERELO
+DIST_VERSION=1.26
+DIST_EXAMPLES=("eg/*")
+inherit perl-module
+
+DESCRIPTION="A Perl module to manipulate/fetch info from MP3 files"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
--- a/dev-perl/MP3-Info/Manifest
+++ b/dev-perl/MP3-Info/Manifest
@ -1 +1,2 @@
 DIST MP3-Info-1.24.tar.gz 126350 SHA256 671af4bf5c9b45d7897aca116e2684b3b68eb8b5c64e1feb3a562023509f25f8 SHA512 5cefb01b369921d49a5db9b5456e29054b993d8ef083dfa3a66b3a10b1a409162f7329f8dcf5ed96966651de5de093f4e5325f545559622d034e39ad33589701 WHIRLPOOL 46deffd2429a30b167857417a0a9185758d4ec83524c0f659468b119cec130d416c70f913b63e2977ce88d756e79b51278e788b621dea87172644b74b9978e27
+DIST MP3-Info-1.26.tar.gz 136554 SHA256 5762340732421f2502a770d6a126e584f2cd963351d2bc257bd278c39bce8be7 SHA512 79f9f9bd9feda075cd8a0db80debdcc03092706834475fc6b6047e00dd282855509d5752fd2b61ae5901c2f74f00f18b0e6c9d733b54a84ea55b6afa0c9e5741 WHIRLPOOL 6e23c2fd9bcfa776bc4de45c0f45a0c12dfcfc635c6f425ffb798dadcf691651710ebadbe81d513fb57daa325c3a85763c2c703b0b0e2cc361bc34f7edbc910a
--- a/dev-perl/Mail-Box-IMAP4/Mail-Box-IMAP4-3.2.0.ebuild
+++ b/dev-perl/Mail-Box-IMAP4/Mail-Box-IMAP4-3.2.0.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MARKOV
+DIST_VERSION=3.002
+inherit perl-module
+
+DESCRIPTION="Mail::Box connector via IMAP4"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/TimeDate
+	dev-perl/Digest-HMAC
+	virtual/perl-Digest-MD5
+	virtual/perl-File-Spec
+	>=dev-perl/Mail-Box-3
+	dev-perl/Mail-IMAPClient
+	>=dev-perl/Mail-Message-3
+	>=dev-perl/Mail-Transport-3
+	virtual/perl-Scalar-List-Utils
+	!!<dev-perl/Mail-Box-3
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
--- a/dev-perl/Mail-Box-IMAP4/Manifest
+++ b/dev-perl/Mail-Box-IMAP4/Manifest
@ -1 +1,2 @@
 DIST Mail-Box-IMAP4-3.001.tar.gz 41829 SHA256 48315c3716c66d86ef6dbd766a77d3f19f7d95bc47799bd0f0bc33ffe3563f05 SHA512 ba9ba1b706d90686755f65ca07d9052461607df02164931b3578c29e639a2a083c8f3354f2ae53d619a8b270ed4ddcbb91ea8669cf7740332243136d49f2bf81 WHIRLPOOL 452ecf26da48e1cbd333b57e53044bfc3f68671fb4bd040eec394ae205d692334b0f5b4856e13ebd4190e2921f1f1e97015936e2ddb37519cbadeef06cc35f13
+DIST Mail-Box-IMAP4-3.002.tar.gz 41874 SHA256 87c9b2e4520506a9d8de3d0a29c1767a554b248bd67e912c9385935c8b129c53 SHA512 0d5ef070271ad67492209d479acfd056fb7c3e4d21e2a0ed5986535e3a59d3a330831771914c35223e4819b78a47ab02f350788fd8617ae293cae3dd7887896f WHIRLPOOL c47a69bc47297d2af19e5e797ca6410b98b53f4b3616e5bfc2cf36caad5a87d56435536d3139dd857b46763104ff8a10b45a48507d463e55e39740ff2fd26fae
--- a/dev-perl/Mail-Box-POP3/Mail-Box-POP3-3.3.0.ebuild
+++ b/dev-perl/Mail-Box-POP3/Mail-Box-POP3-3.3.0.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MARKOV
+DIST_VERSION=3.003
+inherit perl-module
+
+DESCRIPTION="Mail::Box connector via POP3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Digest-MD5
+	virtual/perl-File-Spec
+	virtual/perl-IO
+	>=dev-perl/Mail-Message-3
+	>=dev-perl/Mail-Box-3
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Socket
+	!!<dev-perl/Mail-Box-3
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
+DIST_TEST="do" # parallel tests fail
--- a/dev-perl/Mail-Box-POP3/Manifest
+++ b/dev-perl/Mail-Box-POP3/Manifest
@ -1 +1,2 @@
 DIST Mail-Box-POP3-3.001.tar.gz 30345 SHA256 6381322ec44cf28e2ef693a86fed4cc2d706edd28d073c5d90cb0a5137459cb6 SHA512 b9eda066d9a925192706c504a30e0c43214a696f0c8c06acadaaefa3da73541ae15db5821d50a531ceb2dd09e2ef6d71da50edf0b099ea64cfc5f7cfff58c05e WHIRLPOOL 527d0c465889c49edf201cab3469e231e35f19e057099f44491e1b5c5e0b2aa01dffa5020c7eaa234a4d84d5153525b01048d5d8ccd22f9edf5f8c44b6958003
+DIST Mail-Box-POP3-3.003.tar.gz 30500 SHA256 c6f8f3b6b3fa08e0a629577e79104e187d9a8fb823b6c517e188a3db421b0a4f SHA512 be63f85abbf78e1497eb6d6d3f87e80a3fd6d58fa6469f8732435cc740f72c2ffc6da8f5d98907e2dd4b7d0412c15f94abb994fc9274701ee050f4a3e1f50397 WHIRLPOOL 340a4de5c1725337bd6503c5c5f49cd1c71f94e465dc36c88e5499ee97b7933f3fcce0abb2af1b2eac64da8e434df02e1dff8ad5d020581b0eb05625ec4037cb
--- a/dev-perl/Mail-Box/Mail-Box-3.3.0.ebuild
+++ b/dev-perl/Mail-Box/Mail-Box-3.3.0.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MARKOV
+DIST_VERSION=3.003
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Mail folder manager and MUA backend"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+IUSE="test"
+
+PDEPEND="
+	dev-perl/Mail-Box-IMAP4
+	dev-perl/Mail-Box-POP3
+"
+RDEPEND="
+	virtual/perl-Carp
+	dev-perl/TimeDate
+	>=dev-perl/Devel-GlobalDestruction-0.90.0
+	>=dev-perl/File-Remove-0.200.0
+	>=virtual/perl-File-Spec-0.700.0
+	dev-perl/IO-stringy
+	>=dev-perl/Mail-Message-3
+	>=dev-perl/Mail-Transport-3
+	>=dev-perl/Object-Realize-Later-0.190.0
+	>=virtual/perl-Scalar-List-Utils-1.130.0
+	>=virtual/perl-Test-Simple-0.470.0
+	!!<dev-perl/Mail-Box-3
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+DIST_TEST="do" # parallel tests fail
--- a/dev-perl/Mail-Box/Manifest
+++ b/dev-perl/Mail-Box/Manifest
@ -1,3 +1,4 @@
 DIST Mail-Box-2.118.tar.gz 631156 SHA256 ccb18604a205361e37d84ac47a1ee6a51f6a6ddbb3674481177622b96f3fb1c7 SHA512 50b7d0e5f973e86c3e892fb684ff72bfd8191da1d02cb8d30c17e908586f5324a3c2987c4ea0ca8e913340916d44c5322b696d658895a1ee0a037c42f681fd82 WHIRLPOOL dece66422955d3efce95fb85b9e68dc632041824536c72872e1d950557ae6ebba5f535e0037e5e6d5caba5b3789dd6fc75a7ee76f5d4dfa87535c08f351441a9
 DIST Mail-Box-3.001.tar.gz 340244 SHA256 9e80d28a4b158dde87f7d543cfe2083f9394e4543aa99023e134ec192a3b91e3 SHA512 55bf5c58fee49303126dd863eb1710d6a39ce6bac2d8b6a20bbc3c44099575836a6f58c4085b7788a422c48335e4896581193d2770751d97c724e5cc2ef433c5 WHIRLPOOL 49315e030f8ba5436af1f67296d531cea43b211f9dd3a77e9e39b3bd60211479cd29ee1da7321ac9e4a47b84e3094b5bce3460eb99588834232e64843379f15d
 DIST Mail-Box-3.002.tar.gz 340549 SHA256 4410ac0f1122bdd3ed2d7aeee44929506a695a3793b8afd00d514beba62033ad SHA512 aa78d799f23befd5cfe9ed4d4b238a93f7b6fb648bcb36659c1c78c23d5e13e307f323aade5164061e29f0f19206ae4f49163ea0d532a2a17d02a7dad9f6ce20 WHIRLPOOL 6e012e192abc2c7c4194d12d2a6c3f518eb561558e0167a2d5372eaeabc5b8fad405fcfdd2773dbd0e1d134d858208c61b80e0a7eb60f414661cccc88a113943
+DIST Mail-Box-3.003.tar.gz 340558 SHA256 dddea01f63e8db52c42fcb9069aa6a3616874418e6be7a545077c5c0513d5e9e SHA512 02a3fec4d7ec99490bb6e1223e606db0b6149479ff047ebf7a9b905e0f299256f58ec27b2335c7f9e309d23d2b32a99544dccd5edde41a5910bd64078dfc6629 WHIRLPOOL fd7f98d98075b179c6be2c25f199760eb9cf296f9297b3414df5780e2324453adad9002c21db01d21537160b770eb71ab6ba0ca6af5787f796786dfb65c06f11
--- a/dev-perl/Mail-Builder/Mail-Builder-2.130.0.ebuild
+++ b/dev-perl/Mail-Builder/Mail-Builder-2.130.0.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MAROS
+DIST_VERSION=2.13
+inherit perl-module
+
+DESCRIPTION="Easily create plaintext/html e-mail messages with attachments and inline images"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# HTML::Tree -> HTML-TreeBuilder
+# MIME::Tools -> MIME-tools
+RDEPEND="
+	dev-perl/Class-Load
+	dev-perl/Email-Address
+	dev-perl/Email-Date-Format
+	>=dev-perl/Email-MessageID-1.400.0
+	dev-perl/Email-Valid
+	virtual/perl-Encode
+	>=dev-perl/MIME-tools-5.400.0
+	>=dev-perl/HTML-Tree-3.0.0
+	dev-perl/MIME-Types
+	>=dev-perl/Moose-0.940.0
+	dev-perl/Path-Class
+	dev-perl/Text-Table
+	dev-perl/namespace-autoclean
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
+	test? (
+		dev-perl/Test-Most
+		dev-perl/Test-NoWarnings
+	)
+"
--- a/dev-perl/Mail-Builder/Manifest
+++ b/dev-perl/Mail-Builder/Manifest
@ -1 +1,2 @@
 DIST Mail-Builder-2.09.tar.gz 53491 SHA256 fc81ed202b71cf0579b3184c617bc21742fc11ef310608e25504d58239329743 SHA512 9862803e52c1347a3fec621ad80e74de0c81bb51d39c9323c9aaed65c1d6ab43122541670c9444c8cafcb7604d122fdc897cfd1451dce2bba79cf8dcabb3ed88 WHIRLPOOL df616658cbb61aa6ea0148b99d0dc2b9144fb557fd31fb01ed125983836314de637d21951ac820a030f5b13a40369e0737cc9dc2153def794f0b076b13925754
+DIST Mail-Builder-2.13.tar.gz 54004 SHA256 8b52b0ba30ed19287fb0aa72c0796a3c0f44d78af23a5e938e3089b96bb66938 SHA512 2ebc5690519b9d5fb715aff6feeec55ce5d298a0b117dc4195dfb296dcef3b4b93d46d88d477802329c902cc1cafe932dbe5ac77d570d8f5bc0c32371ecc3b51 WHIRLPOOL 9b5a48bfc923b68738318b54e6b4a3f1ef76cd9b53afa00976467dfbe09d703573bc6218d1b31364b78a6acdefa20abe1562793b5c6c88aa75005c6ab076e938
--- a/dev-perl/Mail-Builder/metadata.xml
+++ b/dev-perl/Mail-Builder/metadata.xml
@ -22,5 +22,6 @@
    <remote-id type="cpan-module">Mail::Builder::List</remote-id>
    <remote-id type="cpan-module">Mail::Builder::Role::File</remote-id>
    <remote-id type="cpan-module">Mail::Builder::TypeConstraints</remote-id>
+    <remote-id type="cpan-module">Mail::Builder::Utils</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-perl/Mail-DKIM/Mail-DKIM-0.440.0.ebuild
+++ b/dev-perl/Mail-DKIM/Mail-DKIM-0.440.0.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MBRADSHAW
+DIST_VERSION=0.44
+DIST_EXAMPLES=("examples/*" "scripts/*")
+inherit perl-module
+
+DESCRIPTION="Signs/verifies Internet mail using DKIM message signatures"
+
+SLOT="0"
+KEYWORDS="~amd64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="test"
+
+RDEPEND=">=dev-perl/Crypt-OpenSSL-RSA-0.24
+	virtual/perl-Digest-SHA
+	virtual/perl-MIME-Base64
+	dev-perl/Net-DNS
+	dev-perl/MailTools
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Net-DNS-Resolver-Mock
+		virtual/perl-Test-Simple
+		dev-perl/YAML-LibYAML
+	)
+"
+mydoc=("doc/*.txt" "HACKING.DKIM")
+
+src_test(){
+	# disable online tests
+	if ! has network ${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}; then
+		einfo "Removing network tests w/o DIST_TEST_OVERRIDE=~network"
+		perl_rm_files t/{policy,public_key,verifier,dev-manifest}.t
+	fi
+	perl-module_src_test
+}
--- a/dev-perl/Mail-DKIM/Manifest
+++ b/dev-perl/Mail-DKIM/Manifest
@ -1,2 +1,3 @@
 DIST Mail-DKIM-0.40.tar.gz 95186 SHA256 3c5ea0c3a2028a5a2c3b64bbcd6bd9de6a5fa5ee4e16046dd8875c4796aaa6f1 SHA512 27f10a96f70e56e69f55e5077fb93f29f66d8e7a21846c8fb518403af915f85ac06f0968e6002fa2dc7090746e14a5a7bd973e46bb1d52e4200c3c120cd2e924 WHIRLPOOL 81b33d77b81d76a38e19fef5f2c9e17518eff42ebee736fef0496fd646242f06ae2f9f273ea803337e243d3c2d258e660b70a8383df7fafe228215e38ab7c780
 DIST Mail-DKIM-0.41.tar.gz 100564 SHA256 67b07a4dcc70cf1e6af0348a64cd2655e231c806507a765b169e9f0b94b5b74a SHA512 f16a818b058b405ee3ffc0962091e7d47268321b35dcd6ca42e1e37ed1ad5b1b3c1e32655f6f0643e046c53f1247a4b9bb9c0202eca7adce4f14d9b38b414f2e WHIRLPOOL cf899982e27fcfdf27a4aa9ce182f0a8242e26f57f0085b26fe51570cc1660bdbcc239c2bf1e24f206b8dbe0e35060be3f0f7f3c9b1e33d76eade31b0a89101f
+DIST Mail-DKIM-0.44.tar.gz 155301 SHA256 acda95af369b15dd67f2cf9b467493231d60aeb97cd5967353450b8490026bbf SHA512 08501de43ce775454e90b18e95a5320fc590c82a14e8828f53510163bc73d7e82aaad35e6d79b7fd888b45aacc56bd422151c3c2b6e1e6db80a7ca62b2a469c3 WHIRLPOOL 6b80e9665833bcca7d81264ce6e3a383099cea50ffa99509c86ce1666f730b87fe4766de1edd27cb8f116611e9de72821cd368e58397accaa481f7a705037cab
--- a/dev-perl/Mail-DKIM/metadata.xml
+++ b/dev-perl/Mail-DKIM/metadata.xml
@ -8,6 +8,10 @@
  <upstream>
    <remote-id type="cpan">Mail-DKIM</remote-id>
    <remote-id type="cpan-module">Mail::DKIM</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::ARC::MessageSignature</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::ARC::Seal</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::ARC::Signer</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::ARC::Verifier</remote-id>
    <remote-id type="cpan-module">Mail::DKIM::Algorithm::Base</remote-id>
    <remote-id type="cpan-module">Mail::DKIM::Algorithm::dk_rsa_sha1</remote-id>
    <remote-id type="cpan-module">Mail::DKIM::Algorithm::rsa_sha1</remote-id>
@ -20,6 +24,7 @@
    <remote-id type="cpan-module">Mail::DKIM::Canonicalization::dk_simple</remote-id>
    <remote-id type="cpan-module">Mail::DKIM::Canonicalization::nowsp</remote-id>
    <remote-id type="cpan-module">Mail::DKIM::Canonicalization::relaxed</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::Canonicalization::seal</remote-id>
    <remote-id type="cpan-module">Mail::DKIM::Canonicalization::simple</remote-id>
    <remote-id type="cpan-module">Mail::DKIM::Common</remote-id>
    <remote-id type="cpan-module">Mail::DKIM::DNS</remote-id>
--- a/dev-perl/Mail-DMARC/Mail-DMARC-1.201.709.110.ebuild
+++ b/dev-perl/Mail-DMARC/Mail-DMARC-1.201.709.110.ebuild
@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MBRADSHAW
+DIST_VERSION=1.20170911
+inherit perl-module
+
+DESCRIPTION="Perl implementation of DMARC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test minimal"
+
+PERL_RM_FILES=(
+	'bin/install_deps.pl'
+)
+PATCHES=(
+	"${FILESDIR}/no-installdeps-script.patch"
+)
+RDEPEND="
+	!minimal? (
+		dev-perl/Net-IMAP-Simple
+
+	)
+	dev-perl/CGI
+	virtual/perl-CPAN
+	virtual/perl-Carp
+	dev-perl/Config-Tiny
+	>=dev-perl/DBD-SQLite-1.310.0
+	>=dev-perl/DBIx-Simple-1.350.0
+	virtual/perl-Data-Dumper
+	dev-perl/Email-MIME
+	dev-perl/Email-Simple
+	virtual/perl-Encode
+	dev-perl/File-ShareDir
+	virtual/perl-Getopt-Long
+	dev-perl/HTTP-Message
+	virtual/perl-HTTP-Tiny
+	virtual/perl-IO
+	virtual/perl-IO-Compress
+	dev-perl/IO-Socket-SSL
+	dev-perl/JSON
+	dev-perl/libwww-perl
+	dev-perl/Mail-DKIM
+	dev-perl/Net-DNS
+	dev-perl/Net-HTTP
+	dev-perl/Net-IDN-Encode
+	dev-perl/Net-IP
+	dev-perl/Net-SMTPS
+	dev-perl/Net-SSLeay
+	>=dev-perl/Net-Server-2
+	virtual/perl-Socket
+	>=dev-perl/Socket6-0.230.0
+	virtual/perl-Sys-Syslog
+	dev-perl/Test-File-ShareDir
+	dev-perl/URI
+	dev-perl/XML-LibXML
+	virtual/perl-parent
+	>=dev-perl/Regexp-Common-2013031301
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.360.100
+	virtual/perl-ExtUtils-MakeMaker
+	>=dev-perl/File-ShareDir-Install-0.60.0
+	test? (
+		dev-perl/Test-Exception
+		dev-perl/Test-Output
+		virtual/perl-Test-Simple
+	)
+"
+src_test() {
+	local my_test_control
+	local badfiles=( t/author-*.t )
+	my_test_control=${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}
+	if ! has network ${my_test_control} ; then
+		einfo "Removing network tests w/o DIST_TEST_OVERRIDE~=network";
+		badfiles+=(				\
+			"t/04.PurePerl.t"	\
+			"t/06.Result.t"		\
+			"t/09.HTTP.t"		\
+			"t/11.Report.Store.t"				\
+			"t/17.Report.Aggregate.Schema.t"	\
+			"t/22.Report.Send.SMTP.t"			\
+		)
+	fi
+	perl_rm_files "${badfiles[@]}"
+	perl-module_src_test
+}
--- a/dev-perl/Mail-DMARC/Manifest
+++ b/dev-perl/Mail-DMARC/Manifest
@ -1 +1,2 @@
 DIST Mail-DMARC-1.20150908.tar.gz 720935 SHA256 16dcce50cc53508570b77789d12fa972ca30fe903f39593bb50f3848f2b20e4f SHA512 25a02b696e0a92ba090d878af0b63cd0a74e36dd77043686b208044ce7ab46abb9f7732089d8e12dc8207265ed2c51800604b9955071d7eb289d151feb507ccd WHIRLPOOL 18cc12a3f50f82e9bf9612c95f371c1f2c473c1dca5034f1e0c4ccfd34a2514199805ed2224e428cd2b460ea29c8ca8244fd4211ef969de2cbe8e9d005a4cb66
+DIST Mail-DMARC-1.20170911.tar.gz 727703 SHA256 285bef1cd6740b3d70e179ee28151b1c20ffd50b0a86c78e90f4d4400d2576f0 SHA512 76495835020408194919d1cc72380c95d0415982ddfe577fdbb7154df737c4a280c6068c355eb5a23998b590885a17a4c97b2f0c7f90ad8e84c93a402a6f9cc3 WHIRLPOOL c5c6f1982a7358af9b948fea4b5ba8425f10fdb0248762f02dd7c99c05bd828ed2452d85604292805e974d85705f24cb155a73c87726e7e8541b5c2211d2602a
--- a/dev-perl/MooseX-ClassAttribute/MooseX-ClassAttribute-0.270.0-r1.ebuild
+++ b/dev-perl/MooseX-ClassAttribute/MooseX-ClassAttribute-0.270.0-r1.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MODULE_AUTHOR=DROLSKY
+MODULE_VERSION=0.27
+inherit perl-module
+
+DESCRIPTION="Declare class attributes Moose-style"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/List-MoreUtils
+	>=dev-perl/Moose-2.0.0
+	>=dev-perl/namespace-autoclean-0.110.0
+	>=dev-perl/namespace-clean-0.200.0"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.310.0
+	test? ( >=virtual/perl-Test-Simple-0.880.0
+		dev-perl/Test-Fatal
+		>=dev-perl/Test-Requires-0.50.0 )"
+
+SRC_TEST=do
+
+src_test() {
+	perl_rm_files t/release-*.t
+	perl-module_src_test
+}
--- a/dev-perl/MooseX-ClassAttribute/MooseX-ClassAttribute-0.270.0.ebuild
+++ b/dev-perl/MooseX-ClassAttribute/MooseX-ClassAttribute-0.270.0.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=DROLSKY
-MODULE_VERSION=0.27
-inherit perl-module
-
-DESCRIPTION="Declare class attributes Moose-style"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-perl/Moose-1.230
-	>=dev-perl/namespace-autoclean-0.11
-	>=dev-perl/namespace-clean-0.200"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.31
-	test? ( >=virtual/perl-Test-Simple-0.88
-		dev-perl/Test-Fatal
-		>=dev-perl/Test-Requires-0.05 )"
-
-SRC_TEST=do
--- a/dev-perl/MooseX-Types-JSON/MooseX-Types-JSON-1.0.0-r1.ebuild
+++ b/dev-perl/MooseX-Types-JSON/MooseX-Types-JSON-1.0.0-r1.ebuild
@ -1,10 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6

 DIST_AUTHOR=MILA
 DIST_VERSION=1.00
+DIST_EXAMPLES=("examples/*")
 inherit perl-module

 DESCRIPTION="JSON datatype for Moose"
@ -14,8 +15,14 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""

 RDEPEND="
+	dev-perl/JSON
 	>=dev-perl/JSON-XS-2.00
 	dev-perl/Moose
 	dev-perl/MooseX-Types
 "
 DEPEND="${RDEPEND}"
+
+src_test() {
+	perl_rm_files t/00-pod.t t/release-*.t
+	perl-module_src_test
+}
--- a/dev-perl/MusicBrainz-DiscID/Manifest
+++ b/dev-perl/MusicBrainz-DiscID/Manifest
@ -1,2 +1,3 @@
 DIST MusicBrainz-DiscID-0.03.tar.gz 5343 SHA256 5002f92fd8f074bccf924752ef171fa11ea2431a634ff60e520a5c3fb080573a SHA512 b3fa392a669a9370369ea7ade275edb30b15c8b15b1ebeefb567d8e183e195b255e7e087025a7ebc17b39f7d7ba9a310dfa17c616426e8d092c129c0c58ddfc8 WHIRLPOOL 75c6df0a793d759b526708ab5f36b657889ec043eeef7423c53cb117d62d8d2b9bceed4ea00daf11ed8d6de61ef341c86224212a291b8db7e6f50e9038790e32
+DIST MusicBrainz-DiscID-0.04.tar.gz 6907 SHA256 32f46e6e8aee10e6e3c32095cfe416647e819bcc593a3ff18aad57e6709898c4 SHA512 ccf93205f3485fa19e22cee079b2615326384513dc773f5d242216b680317d2d35d3a2421e46bc17651d8d7797a4d01bd3c2c0ae603a1d1e550ac2a558163125 WHIRLPOOL d828122e93f7876302284f3ccd4a361f81979126085f81decf60aa8b054b67eedba33785b73bb5c9705e9f2f6233f09a3666583d49f1dacd182d9d238c2818ef
 DIST MusicBrainz-DiscID-0.30.0-patch.tar.bz2 412 SHA256 df9f1027a62f070b5b489d71fee2ab928bdf514aaa818608eb0e563700e60bfa SHA512 79163ba28285676f585af2be0a12a6210a8869c57cad5bba1ec42121f9e1dc351ac2f51b9a702133a71fbaf1d3207e8ea153564f838ffc5d39b60268af7bf726 WHIRLPOOL 72becb03a3c0821f7f45730184aa8aac5ec0607d5c48c93de0f0b01129d5d3d45fe3fa551209002475b737f30ef1106d7e57447eed5b8b14541cd7acb1dec07d
--- a/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.40.0.ebuild
+++ b/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.40.0.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=NJH
+DIST_VERSION=0.04
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Perl interface for the MusicBrainz libdiscid library"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND=">=media-libs/libdiscid-0.2.2"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	virtual/pkgconfig
+	test? (
+		>=virtual/perl-Test-1.0.0
+		virtual/perl-Test-Simple
+	)
+"
+
+src_test() {
+	perl_rm_files t/05pod.t
+	perl-module_src_test
+}
--- a/dev-perl/Net-DNS-Resolver-Mock/Manifest
+++ b/dev-perl/Net-DNS-Resolver-Mock/Manifest
@ -0,0 +1 @@
+DIST Net-DNS-Resolver-Mock-1.20171031.tar.gz 10124 SHA256 fca67707b2f73907ede79100fff30099c8ad2d1db76051acbc7e991985c4e15e SHA512 458d4fe521cd650f91ba95b8a9bedf10e03fb08d9c5fd8dabb3df435e8264f44837a1718ecfe6d3ff68badedfe240286c051981e668675af277260b6401d0a16 WHIRLPOOL 3fa315e9288b49f8b6afce13e6fa4fed807fbd639d3529da3b5abb133e55a85370f440f41ac97f056527c5c4ba1a28127ca033317b5c218cb8d5edaa6368dad2
--- a/dev-perl/Net-DNS-Resolver-Mock/Net-DNS-Resolver-Mock-1.201.710.310.ebuild
+++ b/dev-perl/Net-DNS-Resolver-Mock/Net-DNS-Resolver-Mock-1.201.710.310.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MBRADSHAW
+DIST_VERSION=1.20171031
+inherit perl-module
+
+DESCRIPTION="Mock a DNS Resolver object for testing"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-perl/Net-DNS"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
+src_test() {
+	perl_rm_files t/author-*.t
+	perl-module_src_test
+}
--- a/dev-perl/Net-DNS-Resolver-Mock/metadata.xml
+++ b/dev-perl/Net-DNS-Resolver-Mock/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">Net-DNS-Resolver-Mock</remote-id>
+    <remote-id type="cpan-module">Net::DNS::Resolver::Mock</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/dev-python/cryptography/cryptography-2.1.2-r1.ebuild
+++ b/dev-python/cryptography/cryptography-2.1.2-r1.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x64-solaris"
+IUSE="libressl test"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)]
+										=dev-libs/openssl-1.0.2l-r1:0
+										=dev-libs/openssl-1.1.0f-r1:0 ) ) )
+	libressl? ( dev-libs/libressl )
+	$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
+	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
+	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+	test? (
+		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+
+python_configure_all() {
+	append-cflags $(test-flags-CC -pthread)
+}
+
+python_test() {
+	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+}
--- a/dev-python/rackspace-monitoring/rackspace-monitoring-0.6.5.ebuild
+++ b/dev-python/rackspace-monitoring/rackspace-monitoring-0.6.5.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -14,6 +14,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="test"  # resrticted for bug 636106

 TEST_DEPENDS="dev-python/pep8[${PYTHON_USEDEP}]"
 RDEPEND="
--- a/dev-ruby/aws-sdk-core/Manifest
+++ b/dev-ruby/aws-sdk-core/Manifest
@ -1,4 +1,5 @@
 DIST aws-sdk-ruby-2.10.37.tar.gz 3215615 SHA256 6e1e31114ba6fdbde81bbe573a155073544f9fc7641789a848961bcacf51225e SHA512 987697dfac653035056b96de150e5db209b6db1224fa200913d60a239de0509b48d2a6f32e65b0ccce4195324874fa102b93a4181ffb4e9d4660cd9101fc2500 WHIRLPOOL a8fb464900b2b8c9225e77ac75755ea4a8bee347e9891ff366dd6ea5efff9544370626429300c5d66ae825b6a628d2506b8dd3dc731d1ae675d97723f9a0c9a3
+DIST aws-sdk-ruby-2.10.74.tar.gz 3276717 SHA256 e11bd2a64fd06f686a5737de08c205ab9894f5686ea0ec1f38a8515436aec63c SHA512 844fc20aefd11ce06e64ad80576a9467baad3e02b6e26864fde4e7e99bbfa90985ec93a154c6a4bc55d809beec0e5dd505288e664309bdfb59a68f17f1b4b254 WHIRLPOOL da16cb0e4e667513c61bdaec32c1405f6e368b8970fc197ffd1c61a538280c42916edd83a965303ef23c5479fda7bfd786ad36bf1a2e40e5f4718c39aa6d7091
 DIST aws-sdk-ruby-2.6.50.tar.gz 2794854 SHA256 6157d8ad834020f83fd7db332ff4b0a719bf0a0791ae4e7da5530915c19dbe30 SHA512 3b592e25a135b369c67ddfd8d3c33db3b25faaac3161feeb5aa3feb1fdb6cfb5ca44cadc688dcfc8d456a398d94242f7ebc2922a82547b9b767249f4c9bdc0bc WHIRLPOOL 5640fec6e04f4f7ac8abf56365fd94dc77d13c169a76655fc55393f06c45d11ff2f1a6c5b4f3957e7404b76a7a18dfc033a50aa57df5d878acf2b39cc47e741b
 DIST aws-sdk-ruby-2.8.14.tar.gz 2925334 SHA256 3fd54d79269e0a06ebdbb8ce41c7f47002a450de2ef96cb5add33f45eef3cf3e SHA512 d45e98acb924163dd0ee555ecb45729247f5bd4b788e6c22f5e95c02102945b9b67c5451958eaa2aa2195a773a49e6359405a89242cd1e283971c6065bc3de61 WHIRLPOOL 9f6e705c8fe96a7fb610b86e2f62c039d37ed89bbb07a39fd66db2c828408b69f8acffc6667de718c22ff080780c5481bb37c7e12c65e57a470360a913a67dc5
 DIST aws-sdk-ruby-2.9.44.tar.gz 3084191 SHA256 6eb8f8b992b6cce654b6f40f37bbdd6d061580f9878e44c68ebbcabf2732829d SHA512 b2ef48a821143fed624f348a30774ca9fd65af432a09a1699af84d4a757bb7026439fa07e29c43813e504baa9383285434fe72912265ef9ad50f3c2ec3f26176 WHIRLPOOL c75cbc67ff6cb8cb90468d6d2f0b73f6c5b1f1ee5413c1a812772c85bf2638197f3a67dfa067d78153e02feac1816ccd831712e5c86910d858161089570bbedc
--- a/dev-ruby/aws-sdk-core/aws-sdk-core-2.10.74.ebuild
+++ b/dev-ruby/aws-sdk-core/aws-sdk-core-2.10.74.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="apis ca-bundle.crt endpoints.json"
+
+GITHUB_USER="aws"
+GITHUB_PROJECT="aws-sdk-ruby"
+RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Official SDK for Amazon Web Services"
+HOMEPAGE="https://aws.amazon.com/sdkforruby"
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/aws-sigv4 dev-ruby/jmespath:1"
+
+ruby_add_bdepend "test? ( dev-ruby/webmock )"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid spec that gets confused by our directory names
+	sed -i -e '/requires prefixes from plugin names when loading/,/end/ s:^:#:' \
+		spec/seahorse/client/plugin_list_spec.rb || die
+}
--- a/dev-ruby/aws-sdk-resources/Manifest
+++ b/dev-ruby/aws-sdk-resources/Manifest
@ -1,4 +1,5 @@
 DIST aws-sdk-ruby-2.10.37.tar.gz 3215615 SHA256 6e1e31114ba6fdbde81bbe573a155073544f9fc7641789a848961bcacf51225e SHA512 987697dfac653035056b96de150e5db209b6db1224fa200913d60a239de0509b48d2a6f32e65b0ccce4195324874fa102b93a4181ffb4e9d4660cd9101fc2500 WHIRLPOOL a8fb464900b2b8c9225e77ac75755ea4a8bee347e9891ff366dd6ea5efff9544370626429300c5d66ae825b6a628d2506b8dd3dc731d1ae675d97723f9a0c9a3
+DIST aws-sdk-ruby-2.10.74.tar.gz 3276717 SHA256 e11bd2a64fd06f686a5737de08c205ab9894f5686ea0ec1f38a8515436aec63c SHA512 844fc20aefd11ce06e64ad80576a9467baad3e02b6e26864fde4e7e99bbfa90985ec93a154c6a4bc55d809beec0e5dd505288e664309bdfb59a68f17f1b4b254 WHIRLPOOL da16cb0e4e667513c61bdaec32c1405f6e368b8970fc197ffd1c61a538280c42916edd83a965303ef23c5479fda7bfd786ad36bf1a2e40e5f4718c39aa6d7091
 DIST aws-sdk-ruby-2.6.50.tar.gz 2794854 SHA256 6157d8ad834020f83fd7db332ff4b0a719bf0a0791ae4e7da5530915c19dbe30 SHA512 3b592e25a135b369c67ddfd8d3c33db3b25faaac3161feeb5aa3feb1fdb6cfb5ca44cadc688dcfc8d456a398d94242f7ebc2922a82547b9b767249f4c9bdc0bc WHIRLPOOL 5640fec6e04f4f7ac8abf56365fd94dc77d13c169a76655fc55393f06c45d11ff2f1a6c5b4f3957e7404b76a7a18dfc033a50aa57df5d878acf2b39cc47e741b
 DIST aws-sdk-ruby-2.8.14.tar.gz 2925334 SHA256 3fd54d79269e0a06ebdbb8ce41c7f47002a450de2ef96cb5add33f45eef3cf3e SHA512 d45e98acb924163dd0ee555ecb45729247f5bd4b788e6c22f5e95c02102945b9b67c5451958eaa2aa2195a773a49e6359405a89242cd1e283971c6065bc3de61 WHIRLPOOL 9f6e705c8fe96a7fb610b86e2f62c039d37ed89bbb07a39fd66db2c828408b69f8acffc6667de718c22ff080780c5481bb37c7e12c65e57a470360a913a67dc5
 DIST aws-sdk-ruby-2.9.44.tar.gz 3084191 SHA256 6eb8f8b992b6cce654b6f40f37bbdd6d061580f9878e44c68ebbcabf2732829d SHA512 b2ef48a821143fed624f348a30774ca9fd65af432a09a1699af84d4a757bb7026439fa07e29c43813e504baa9383285434fe72912265ef9ad50f3c2ec3f26176 WHIRLPOOL c75cbc67ff6cb8cb90468d6d2f0b73f6c5b1f1ee5413c1a812772c85bf2638197f3a67dfa067d78153e02feac1816ccd831712e5c86910d858161089570bbedc
--- a/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.10.74.ebuild
+++ b/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.10.74.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="resources.schema.json"
+
+GITHUB_USER="aws"
+GITHUB_PROJECT="aws-sdk-ruby"
+RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Official SDK for Amazon Web Services"
+HOMEPAGE="https://aws.amazon.com/sdkforruby"
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "~dev-ruby/aws-sdk-core-${PV}"
+
+ruby_add_bdepend "dev-ruby/webmock"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+}
--- a/dev-ruby/aws-sdk/Manifest
+++ b/dev-ruby/aws-sdk/Manifest
@ -1,5 +1,6 @@
 DIST aws-sdk-ruby-1.66.0.tar.gz 1774530 SHA256 265e20a99c17d3f476ce6f6e981fd37e8e529dac2a38eba1ef7a25205f8f49b6 SHA512 53b13bab1db26f9eb6ba411a7143377fbdc56548fe881742953f388af60508be30cc2c82a3dce89675be2c799774d30313d19b47875a52d4c9134ce5f4b1914c WHIRLPOOL 265d01034a3e31f8e12dc8962d67fa727e7123de0e5c56c633a84d4b7e91168f6c8ea9f4e4291ef54ef570f4675f2f087610bf11b11ec9efdb1c345c42dcb1ec
 DIST aws-sdk-ruby-2.10.37.tar.gz 3215615 SHA256 6e1e31114ba6fdbde81bbe573a155073544f9fc7641789a848961bcacf51225e SHA512 987697dfac653035056b96de150e5db209b6db1224fa200913d60a239de0509b48d2a6f32e65b0ccce4195324874fa102b93a4181ffb4e9d4660cd9101fc2500 WHIRLPOOL a8fb464900b2b8c9225e77ac75755ea4a8bee347e9891ff366dd6ea5efff9544370626429300c5d66ae825b6a628d2506b8dd3dc731d1ae675d97723f9a0c9a3
+DIST aws-sdk-ruby-2.10.74.tar.gz 3276717 SHA256 e11bd2a64fd06f686a5737de08c205ab9894f5686ea0ec1f38a8515436aec63c SHA512 844fc20aefd11ce06e64ad80576a9467baad3e02b6e26864fde4e7e99bbfa90985ec93a154c6a4bc55d809beec0e5dd505288e664309bdfb59a68f17f1b4b254 WHIRLPOOL da16cb0e4e667513c61bdaec32c1405f6e368b8970fc197ffd1c61a538280c42916edd83a965303ef23c5479fda7bfd786ad36bf1a2e40e5f4718c39aa6d7091
 DIST aws-sdk-ruby-2.6.50.tar.gz 2794854 SHA256 6157d8ad834020f83fd7db332ff4b0a719bf0a0791ae4e7da5530915c19dbe30 SHA512 3b592e25a135b369c67ddfd8d3c33db3b25faaac3161feeb5aa3feb1fdb6cfb5ca44cadc688dcfc8d456a398d94242f7ebc2922a82547b9b767249f4c9bdc0bc WHIRLPOOL 5640fec6e04f4f7ac8abf56365fd94dc77d13c169a76655fc55393f06c45d11ff2f1a6c5b4f3957e7404b76a7a18dfc033a50aa57df5d878acf2b39cc47e741b
 DIST aws-sdk-ruby-2.8.14.tar.gz 2925334 SHA256 3fd54d79269e0a06ebdbb8ce41c7f47002a450de2ef96cb5add33f45eef3cf3e SHA512 d45e98acb924163dd0ee555ecb45729247f5bd4b788e6c22f5e95c02102945b9b67c5451958eaa2aa2195a773a49e6359405a89242cd1e283971c6065bc3de61 WHIRLPOOL 9f6e705c8fe96a7fb610b86e2f62c039d37ed89bbb07a39fd66db2c828408b69f8acffc6667de718c22ff080780c5481bb37c7e12c65e57a470360a913a67dc5
 DIST aws-sdk-ruby-2.9.44.tar.gz 3084191 SHA256 6eb8f8b992b6cce654b6f40f37bbdd6d061580f9878e44c68ebbcabf2732829d SHA512 b2ef48a821143fed624f348a30774ca9fd65af432a09a1699af84d4a757bb7026439fa07e29c43813e504baa9383285434fe72912265ef9ad50f3c2ec3f26176 WHIRLPOOL c75cbc67ff6cb8cb90468d6d2f0b73f6c5b1f1ee5413c1a812772c85bf2638197f3a67dfa067d78153e02feac1816ccd831712e5c86910d858161089570bbedc
--- a/dev-ruby/aws-sdk/aws-sdk-2.10.74.ebuild
+++ b/dev-ruby/aws-sdk/aws-sdk-2.10.74.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST=""
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="../CHANGELOG.md ../MIGRATING.md ../README.md ../UPGRADING.md"
+
+GITHUB_USER="aws"
+GITHUB_PROJECT="${PN}-ruby"
+RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Official SDK for Amazon Web Services"
+HOMEPAGE="https://aws.amazon.com/sdkforruby"
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "virtual/ruby-ssl
+	~dev-ruby/aws-sdk-resources-${PV}"
--- a/dev-tex/pythontex/pythontex-0.16.ebuild
+++ b/dev-tex/pythontex/pythontex-0.16.ebuild
@ -19,9 +19,9 @@ IUSE="highlighting"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

 DEPEND="${PYTHON_DEPS}
-	>=dev-texlive/texlive-latex-2016"
+	>=dev-texlive/texlive-latexextra-2016
+	dev-tex/pgf"
 RDEPEND="${DEPEND}
-	>=dev-texlive/texlive-latex-2016
 	highlighting? ( dev-python/pygments[${PYTHON_USEDEP}] )"

 TEXMF=/usr/share/texmf-site
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@ -1,4 +1,5 @@
 DIST debootstrap_1.0.87.tar.gz 65875 SHA256 e48c931b8c0a4981c580db1a85418177bf62f18320a376aefbc7910e1f1fb3aa SHA512 a36d566292f25093e0367a912f262e95036e355a3f4872a5b957cff53999f4491cc30d7d65a08c31e68f98d75c0a5229b88681895720ff9a610d5fffe4565060 WHIRLPOOL b1fa7835051b69fc21bdbdadad81af3f5e9ba2218c0502c86a93118282e1ca0e901e81b5a6ab691bc6f154265d651ec7bb598d4df89387c04a3c87c5285e777e
 DIST debootstrap_1.0.89.tar.gz 69020 SHA256 3fde1e34eae8744d802ff4f4ba5464b8c8829c0afe9d394c8a536cfdaca23885 SHA512 3f230ce3eff6359353d106c806ce395861fb47fc1416eb0b498af7ce12a45ce7572b18284633d6d4d07b73a4a203e03bc205df3eae0db6f637237d25d0a69b1a WHIRLPOOL 3eb2b66794d0e49e52eb87761bf2dad8980c20d41c032b1ec06742945a0999ac18ff721907721c00a92d0f1597b1560d47e461fe78bd3081af6cb5ec4d3d1cb4
 DIST debootstrap_1.0.91.tar.gz 70171 SHA256 65947fd131217867ce774c4b00d16d6d082da21751b4338cfe9270970fdbe011 SHA512 5d1633c31b6a17aa3da4644a750875fd05bdfd448f90bcd453fc7bdb64df13e6bc4f2e8a6968e0c36302fa0458b9ac321e2ed3dbc68a4f4c071f7c16d950953c WHIRLPOOL 14574aa707e93d2d3718e14ee6f21fec4ff97c568679a26ba4884c53de0384f92b45b23436bb4f676195fa24f348756fcc3076f01cc60677d2c453e93b0b6992
+DIST debootstrap_1.0.92.tar.gz 70042 SHA256 e1c629430273ac746f2047a730b4c2ddcbcf2ff835f4152bd11340577734f719 SHA512 42d6cdeb1efbe95d9215522648d87165326ae1b5a024608abd476a6b3889c8c04420a0f29f5eb9cfd2e57adb4aa57a606519b09e356d0442cd4a4a0f6f45f656 WHIRLPOOL 2783385fea70c633822005fdf8d3e59a604e134e692425673c6fb4bd1fb69246b5743c4e5c12ca9f04fe25619d4f624e99bdd07f344f962531af105bcabd7fde
 DIST devices.tar.gz 47835 SHA256 0d93f93c8b21160069d14e74f8f990a2e0e1e5a90dc828b29e6b3f5aa5829e48 SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432 WHIRLPOOL 222963bb920e1311bc2f481bba04e49f386b60cce6ce0576424896277e0c4fc6a339d4403d587744c32b0bfb1db6391f200fa8d66117e3f21e1c12f35365d732
--- a/dev-util/debootstrap/debootstrap-1.0.92.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.92.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="Debian/Ubuntu bootstrap scripts"
+HOMEPAGE="https://packages.qa.debian.org/d/debootstrap.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
+	mirror://gentoo/devices.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-arch/dpkg
+	net-misc/wget
+	sys-devel/binutils
+"
+
+DOCS=( TODO debian/changelog )
+
+src_unpack() {
+	unpack ${PN}_${PV}.tar.gz
+	cp "${DISTDIR}"/devices.tar.gz "${S}"
+}
+
+src_compile() {
+	return
+}
+
+src_install() {
+	default
+	doman debootstrap.8
+}
+
+pkg_postinst() {
+	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
+		elog "To check Release files against a keyring (--keyring=K), please"
+		elog "install app-crypt/gnupg"
+	fi
+
+	if ! has_version app-crypt/debian-archive-keyring || ! has_version app-crypt/ubuntu-keyring; then
+		elog "To check Release files from Debian or Ubuntu, please install"
+		elog " app-crypt/debian-archive-keyring or"
+		elog " app-crypt/ubuntu-keyring as required"
+	fi
+}
--- a/games-action/bzflag/Manifest
+++ b/games-action/bzflag/Manifest
@ -1,4 +1,5 @@
 DIST bzflag-2.4.10.tar.bz2 13967644 SHA256 0a47454ae4b2fea494581962a554ceb8195084c4d96e97aa572a5fa774699efa SHA512 a120b757d9ea23a189db7f126140d338f6e1c6a34b7f28ca69b2ec15d39c8a5da79aeab622cc6b7227587556bb89904b4a6013b0bb88baa7f01f667d259456a9 WHIRLPOOL e5b35d31aa4fcb974a2720d4ed070f89652c1734de0769cbb461cfb6751f5fc32a48091f25bd91b288717b2a4fbb153a20efdb396580c50c903fc6f9023f81e6
+DIST bzflag-2.4.12.tar.bz2 14042357 SHA256 a8a13a58648798a6f6f969a2911cf21377fe45964f2edf46a327d1370ff1000d SHA512 9b5fa6b7ab7eb13043242defcc86cbed083e98306b2f611932b48d6d833a37bbe2ab05a0a3d1a2c9b861bfbd834fc6e86783ba82d8a841527d0eedb06f3bde9f WHIRLPOOL 9cceae20593b0359af6968876646f09a21f46708efcdab6e8f83258eed09d78d937ba4731aa34436a6324cc7d03cb768704fec627c3c74712b71f1fb8d590d3a
 DIST bzflag-2.4.2.tar.bz2 15971448 SHA256 4f7bc52284cc4b39fc352855e555b2b064c1de6a18f7474e249073070762c811 SHA512 e5645e825f19896ad4dc1e3bf97c9b52ed3838210d97d5532936a9306623283330c9535288af90f86e32c88a1a7996b2c872b9c081558eea48400b86b3a1a6ff WHIRLPOOL 82a5e543a8fdcb80c516394c63901c80c77fc659090f952cb36f65a9fb14c5ca06d6547dc9d347c6abf0ee706c40437f80edf20c424775bf6e202423e025794c
 DIST bzflag-2.4.4.tar.bz2 13922761 SHA256 5842941e53440d2e88c955ddb594964fc5145912f61100832d224c1a017e2ecb SHA512 ee9eefe6a24250f1aa0ac808755f2e3700ea97c559019ca8beefb8d236afd1571314f07a8f19662677526ae364d38617a1a62b356e851c27669cb9acef1a8fd3 WHIRLPOOL c96853e3f1053a9b53c9d6ba27a6f638c2913e87a26d6188151a66f8f78aeeb78fac28e8cefde10d23d65fe02e49b93cd4516993e5b48a6f3f240ec67ab0fc8e
 DIST bzflag-2.4.6.tar.bz2 13919761 SHA256 a44506828d09fe26f06658aae7f579080ecbaef5bd19a938dfed604e0c8afb45 SHA512 b2c82b75a99aa47975d98030104654da6ae3943582a22e18faf157c8929d96ab255a4343e044baa76714b8564c60194b6edbc7b8e28a3352848c471365678205 WHIRLPOOL 069dc60acc93b6159bac330c81a63493e370590ce09b871a17acdfcdf8b9ac6f84c6937ecc29df5d826a475f527f6fdaabf3b26f31ec5ef29824964f43c232de
--- a/games-action/bzflag/bzflag-2.4.12.ebuild
+++ b/games-action/bzflag/bzflag-2.4.12.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="3D tank combat simulator game"
+HOMEPAGE="http://www.bzflag.org/"
+SRC_URI="https://download.bzflag.org/bzflag/source/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated upnp"
+
+DEPEND="
+	net-dns/c-ares
+	>=net-misc/curl-7.15.0
+	sys-libs/ncurses:0
+	sys-libs/zlib
+	!dedicated? (
+		media-libs/libsdl2[joystick,sound,video]
+		virtual/glu
+		virtual/opengl )
+	upnp? ( net-libs/miniupnpc )"
+RDEPEND=${DEPEND}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-configure.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use dedicated ; then
+		ewarn
+		ewarn "You are building a server-only copy of BZFlag"
+		ewarn
+		myconf="--disable-client --without-SDL"
+	fi
+
+	econf \
+		$(use_enable upnp UPnP) \
+		${myconf}
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog DEVINFO PORTING README README.Linux" \
+		default
+
+	if ! use dedicated ; then
+		newicon data/bzflag-48x48.png ${PN}.png
+		make_desktop_entry ${PN} "BZFlag"
+	fi
+
+	prune_libtool_files --modules
+}
--- a/games-action/bzflag/files/bzflag-2.4.12-configure.patch
+++ b/games-action/bzflag/files/bzflag-2.4.12-configure.patch
@ -0,0 +1,37 @@
+diff -ru bzflag-2.4.4.orig/configure.ac bzflag-2.4.4/configure.ac
+--- bzflag-2.4.4.orig/configure.ac	2016-02-14 19:09:51.000000000 -0500
+++ bzflag-2.4.4/configure.ac	2016-05-05 16:35:35.475935345 -0400
+@@ -215,7 +215,7 @@
+ AC_SUBST(AR)
+ AC_SUBST(AR_FLAGS)
+ 
+-AC_PATH_PROG(CCACHE, ccache)
+AC_PATH_PROG(CCACHE, ccachex)
+ if test "$CCACHE" ; then
+     CC="ccache $CC"
+     CXX="ccache $CXX"
+@@ -747,13 +747,13 @@
+ #
+ # the GCC version is known to be at least 4.3 because it has C++0x support
+ # possible future warnings: -Wconversion (1894) -Wfloat-equal (317)
+-FLAGS="-Wall -Wextra -Wcast-qual -Wredundant-decls -Wshadow -Wundef -pedantic"
+FLAGSx="-Wall -Wextra -Wcast-qual -Wredundant-decls -Wshadow -Wundef -pedantic"
+ case $host_os in
+      linux*)
+ 	AC_DEFINE(HALF_RATE_AUDIO, 1, [Half rate Audio])
+ 	CONF_CFLAGS="$CONF_CFLAGS $FLAGS"
+ 	CONF_CXXFLAGS="$CONF_CXXFLAGS $FLAGS"
+-	case $host_vendor in
+	case $host_vendorx in
+ 	     pc)
+ 	       if expr `$CC -dumpversion` \>= "3.4" > /dev/null ; then
+ 		 FLAGS=-mtune
+@@ -836,7 +836,7 @@
+     CXXFLAGS="$user_CXXFLAGS"
+     AC_DEFINE(DEBUG, 1, [Debugging enabled])
+ else
+-    if test "$GCC" = yes ; then
+    if test "$GCC" = yesx ; then
+ 	case "`$CC --version 2>&1`" in
+ 	    *LLVM*)
+ 		# Apple LLVM falsely claims to be GCC
--- a/games-emulation/desmume/Manifest
+++ b/games-emulation/desmume/Manifest
@ -1,4 +1 @@
-DIST desmume-0.9.10.tar.gz 4141586 SHA256 8900a7a1fc849fdd33b014748dd97a6cda4c32548b8d2e06511e6ed8d5ba7445 SHA512 a9151f1d8b08ce64a837ae2447221f5c0003286d4c75b9416d5f151627755aafb09a5120c39b8ee39a04b99d9e8c49ac7dcc0ccd083507aab7e4801269468012 WHIRLPOOL e924adf532db2b10691cb01640f1dbf54045b0dbe6c5daf59c0150a2b254c86cd8d384bc364fdb756168599319a1ef81ce751f09cd5d5e5b79980fb26b9a4e72
 DIST desmume-0.9.11.tar.gz 5359305 SHA256 3ab34ba6cc009566245025c1dd94bf449b6a1b416d24387cb42e183c78e38896 SHA512 160cb6ec0ede04ad1fbddde2b7b04aa41fa464c8338d7eb9d7536196a82d8d716889b40be4fb831a22e3fe8532b947f7f0b41311601b6842be2516dff7cae46c WHIRLPOOL 71736765288f4e01424a56a65b17efa090cceeaa30bdf759b0f05638c01546b712762444122bb4531a6b5ad88e2f39ac6013d06702109a0d1ef29559d1f16cde
-DIST desmume-0.9.8.tar.gz 3677290 SHA256 78363468a2d5efba95de57739a9c81a3757ecd76c2a183ec68336e30d47a5e01 SHA512 b739292f1327ec83b1afcb1c6db45365cf0977fb571256b637a7c6f1c1e57add5b9c0f34820f020c1788c481cbf15755a034e69f14fbf92e3c31dc01594171dd WHIRLPOOL 0bd50d135aad85652dc233c69c94607400820682d60d7bc35b0e1366d7b6fee1fac9f7091074c21940a80826b50bccc8f14ba0e3770687b54b4d30323c8cf84d
-DIST desmume-0.9.9.tar.gz 4107513 SHA256 cd2ad70cdde1236eba5a4ff8cea838f42b7dc470e32ac938263f49f12a55d754 SHA512 ba5a965102559f048cd57718b4c50e6b2bd39eca4a5990e4cdf068bfa752fccb52d71911ea48da769c5ec18bb740f6b09e6c856ccc78b1e1adf23fd701d1fe31 WHIRLPOOL 055594100216e4ffd046119716e9acc018e7631f96f2be4e830495f88462382180c3955841bfcc3ec494227a606bc820820342907e2b1b2b61a8a65f9b1949b4
--- a/games-emulation/desmume/desmume-0.9.10.ebuild
+++ b/games-emulation/desmume/desmume-0.9.10.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit games
-
-DESCRIPTION="Nintendo DS emulator"
-HOMEPAGE="http://desmume.org/"
-SRC_URI="mirror://sourceforge/desmume/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=x11-libs/gtk+-2.8.0:2
-	gnome-base/libglade
-	x11-libs/gtkglext
-	virtual/opengl
-	sys-libs/zlib
-	dev-libs/zziplib
-	media-libs/libsdl[joystick]
-	x11-libs/agg"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/desmume-fix-function-type.patch"
-}
-
-src_configure() {
-	egamesconf --datadir=/usr/share
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README README.LIN
-	prepgamesdirs
-}
--- a/games-emulation/desmume/desmume-0.9.11-r1.ebuild
+++ b/games-emulation/desmume/desmume-0.9.11-r1.ebuild
@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/desmume/${P}.tar.gz"

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

 RDEPEND=">=x11-libs/gtk+-2.8.0:2
--- a/games-emulation/desmume/desmume-0.9.11.ebuild
+++ b/games-emulation/desmume/desmume-0.9.11.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-DESCRIPTION="Nintendo DS emulator"
-HOMEPAGE="http://desmume.org/"
-SRC_URI="mirror://sourceforge/desmume/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.8.0:2
-	gnome-base/libglade
-	x11-libs/gtkglext
-	virtual/opengl
-	sys-libs/zlib
-	dev-libs/zziplib
-	media-libs/libsdl[joystick,opengl,video]
-	x11-libs/agg"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	egamesconf --datadir=/usr/share
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog README README.LIN" \
-		default
-	prepgamesdirs
-}
--- a/games-emulation/desmume/desmume-0.9.8.ebuild
+++ b/games-emulation/desmume/desmume-0.9.8.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit games
-
-DESCRIPTION="Nintendo DS emulator"
-HOMEPAGE="http://desmume.org/"
-SRC_URI="mirror://sourceforge/desmume/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=x11-libs/gtk+-2.8.0:2
-	gnome-base/libglade
-	x11-libs/gtkglext
-	virtual/opengl
-	sys-libs/zlib
-	dev-libs/zziplib
-	media-libs/libsdl[joystick]
-	x11-libs/agg"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	egamesconf --datadir=/usr/share || die "egamesconf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake failed"
-	dodoc AUTHORS ChangeLog README README.LIN
-	prepgamesdirs
-}
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`DIST MARC-XML-1.0.3.tar.gz 18204 SHA256 0f5f2a99a9850f30812cb06807b43b3e27999d92e4ca64903b2a8b8587df6c5f SHA512 a460388c92ac8c6c285b40d1ec2cfc4d86177c9a35854a8da17ac16349f952af37f57e00fce4091546f8225757addd1ee4c16862334c6d59b712395b284661a9 WHIRLPOOL 62d3a7ce54ddce853c460cd52687739135a71be9ef2ee64776af6912aa5f2611a81a89bdd82b654749ca1c56f91ff7159fbefd1b12a0a10eee57d626581224e2`
				`@ -0,0 +1 @@`
				`DIST Net-DNS-Resolver-Mock-1.20171031.tar.gz 10124 SHA256 fca67707b2f73907ede79100fff30099c8ad2d1db76051acbc7e991985c4e15e SHA512 458d4fe521cd650f91ba95b8a9bedf10e03fb08d9c5fd8dabb3df435e8264f44837a1718ecfe6d3ff68badedfe240286c051981e668675af277260b6401d0a16 WHIRLPOOL 3fa315e9288b49f8b6afce13e6fa4fed807fbd639d3529da3b5abb133e55a85370f440f41ac97f056527c5c4ba1a28127ca033317b5c218cb8d5edaa6368dad2`