Sync with portage [Sat Mar 18 17:29:24 MSK 2017].

7 years ago · 10bcb7e154
parent c2c60fc948
commit 10bcb7e154
30082 changed files with 39037 additions and 43482 deletions
--- a/app-antivirus/clamav-unofficial-sigs/Manifest
+++ b/app-antivirus/clamav-unofficial-sigs/Manifest
@ -1,2 +1,2 @@
 DIST clamav-unofficial-sigs-3.7.2.tar.gz 38549 SHA256 96e98e6e4434c5950fa9831c6a43236fed7eabae44beded16171305cf3f9bdb9 SHA512 ee07bf521cca229bc85acb887c8e520149955732797a9d220e24f09cb9e89f9bd189ad77dc781c03c60bdaaec2bfa91a6c96cf7a0b689759cddf3ff231b8b0a4 WHIRLPOOL af4925c8a9bb8c09472131f98026b809da13e122a530c4a48614014b8156a259d37303cb1042da98d0bd8b0f4abef3cd7c05f2d549f87e1b7cd533d4a8d4d188
-DIST clamav-unofficial-sigs-5.4.1.tar.gz 115798 SHA256 a6a455086db1ea102d9f714f8604bde1b3bb063c27e5cadd8ca456bf00673538 SHA512 333cbd6db88e634c60cab7477e091a80106d08f1e2a8ea6f0c7feba5c67a0eef09f10d34764c68eea4789cd373cb50b43a639c96f4a0ddabe44a5a0e12c7e50d WHIRLPOOL f851bd935a47270d5ca37449d6251669270c865b753819a6d8e3e5349ac0186eb349792409d4e173e775885da43cfbb7f1af73ed81367f7980fa69ba6c3bbb09
+DIST clamav-unofficial-sigs-5.6.1.tar.gz 51024 SHA256 5c26410470e1010d0bd167fc8ae75a7035c6c0977f2f0af1da4b004064e43c81 SHA512 a3660abe301e96104393d337ff2b7f73324241bb921d71626e4a6ea4cec39709ce76dbb9432fd048c66441f0acbb1b92fa561397669ffdca98f463d7da8e7402 WHIRLPOOL fac1394ace0ae81ba1b57dab54aef659b8d58716341d5962f07d97fe7487acec3d994d52073b989128adcf2e43991aef277db166048d7bbd328595b2cecdf3ad
--- a/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.1.ebuild
+++ b/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
--- a/app-benchmarks/stress/Manifest
+++ b/app-benchmarks/stress/Manifest
@ -1,3 +1 @@
 DIST stress-1.0.1.tar.gz 203343 SHA256 813a9c78d0a7c27e257ab4523f1b0013e32b0eceabc19154d7d26118e9b73bed SHA512 d7de86cab38a688d2fc55f26a9b3562d58a40ef30bbfa974b6777b6a7d7e1b1f609ef78258af2d1b8aee0bcda432d5abe4f59b9529ea2730e26a054d1683d666 WHIRLPOOL 89349408fbeb654fae162f0e5435264e426b63f7ab05f3199505ded530ab5bb6c426a61440c5ecce34ea07641615a7b38c5d0c35abdb43153b6d9f71c0049c96
 DIST stress-1.0.4-r1.tar.gz 191800 SHA256 057e4fc2a7706411e1014bf172e4f94b63a12f18412378fca8684ca92408825b SHA512 623a7d9585828bed4b7673e19fb0cfdda904552cd56353d74106047b64249299d5f8da892ec135f1781ec3984c7d5835dcc6c0d8e659e06c8a1e4fb2af9fd9c4 WHIRLPOOL f61eb216ec44242c74ae86b3c5390c361c16f4466cfad231d4fbfa93f61578c36dde779db3cf0ba8a0e0751b74fb33a1085372d825d9fd0ebb8120962e9f1cdf
 DIST stress-1.0.4.tar.gz 201495 SHA256 369c997f65e8426ae8b318d4fdc8e6f07a311cfa77cc4b25dace465c582163c0 SHA512 54b3f9edbdaff228f2cfd40a7ce324eea95fc9ab54194d3bac04dc67f72b690e4748c8ff5161bca563d7dd573609092c3631cd4cceb14d813f16f7226ad1ce98 WHIRLPOOL a1ca33b3c3c4ac3e5073a9ea5fa43fe4295bfa2c26627b36366e875dc9c2b1776493d6895ca40008037e2bf2246117067b23cfab568143f1e0e3ec759aa458ea
--- a/app-benchmarks/stress/stress-1.0.1.ebuild
+++ b/app-benchmarks/stress/stress-1.0.1.ebuild
@ -1,44 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 inherit autotools flag-o-matic
 MY_P="${PN}-${PV/_/}"
 S="${WORKDIR}/${MY_P}"
 DESCRIPTION="Imposes stressful loads on different aspects of the system"
 HOMEPAGE="http://people.seas.harvard.edu/~apw/stress"
 SRC_URI="http://weather.ou.edu/~apw/projects/stress/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86"
 IUSE="static"
 DEPEND="sys-apps/help2man"
 RDEPEND=""
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	# Force rebuild of the manpage.
 	rm -f doc/stress.1
 	# Honour Gentoo CFLAGS.
 	sed -i -e "/CFLAGS/s/-Werror//" \
 		   -e "s/CFLAGS/AM_CFLAGS/" \
 		   src/Makefile.am || die "sed cflags failed"
 	eautoreconf
 }
 src_compile() {
 	use static && append-ldflags -static
 	econf
 	emake || die "emake failed"
 }
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc ChangeLog AUTHORS README
 }
--- a/app-benchmarks/stress/stress-1.0.4.ebuild
+++ b/app-benchmarks/stress/stress-1.0.4.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=4
 inherit flag-o-matic
 MY_P=${PN}-${PV/_/}
 DESCRIPTION="Imposes stressful loads on different aspects of the system"
 HOMEPAGE="http://people.seas.harvard.edu/~apw/stress"
 SRC_URI="http://weather.ou.edu/~apw/projects/stress/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="static"
 S=${WORKDIR}/${MY_P}
 src_prepare() {
 	use static && append-ldflags -static
 }
--- a/app-crypt/dieharder/dieharder-3.31.1-r1.ebuild
+++ b/app-crypt/dieharder/dieharder-3.31.1-r1.ebuild
@ -3,7 +3,7 @@
 EAPI=6
-inherit autotools eutils
+inherit eutils
 DESCRIPTION="An advanced suite for testing the randomness of RNG's"
 HOMEPAGE="http://www.phy.duke.edu/~rgb/General/dieharder.php"
@ -37,11 +37,6 @@ pkg_setup() {
 	)
 }
 src_prepare() {
 	default
 	eautoreconf
 }
 src_compile() {
 	emake -j1
 	use doc && emake -C manual
--- a/app-crypt/gnupg/files/gnupg-2.1.19-have_strlwr.patch
+++ b/app-crypt/gnupg/files/gnupg-2.1.19-have_strlwr.patch
@ -0,0 +1,56 @@
 https://lists.gnupg.org/pipermail/gnupg-devel/2017-March/032668.html
 From c22a2a89d3bd3d08b3abb8e4e33df32b480338ec Mon Sep 17 00:00:00 2001
 From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
 Date: Tue, 7 Mar 2017 13:54:49 +0100
 Subject: [PATCH] gpgscm: Use system strlwr if available.
 * tests/gpgscm/scheme.c: Define local strlwr only when HAVE_STRLWR is
 not defined in config.h.
 * tests/gpgscm/scheme-config.h: Remove hack.
 Signed-off-by: Justus Winter <justus@g10code.com>
 ---
 tests/gpgscm/scheme-config.h | 4 ----
 tests/gpgscm/scheme.c        | 6 +++++-
 2 files changed, 5 insertions(+), 5 deletions(-)
 diff --git a/tests/gpgscm/scheme-config.h b/tests/gpgscm/scheme-config.h
 index 2003498..15ca969 100644
 --- a/tests/gpgscm/scheme-config.h
 +++ b/tests/gpgscm/scheme-config.h
@@ -30,7 +30,3 @@
 #define USE_PLIST		0
 #define USE_INTERFACE		1
 #define SHOW_ERROR_LINE		1
 -
 -#if __MINGW32__
 -# define USE_STRLWR 0
 -#endif /* __MINGW32__ */
 diff --git a/tests/gpgscm/scheme.c b/tests/gpgscm/scheme.c
 index b2ff721..af97c27 100644
 --- a/tests/gpgscm/scheme.c
 +++ b/tests/gpgscm/scheme.c
@@ -12,6 +12,10 @@
  *
  */
 +#ifdef HAVE_CONFIG_H
 +# include <config.h>
 +#endif
 +
 #define _SCHEME_SOURCE
 #include "scheme-private.h"
 #ifndef WIN32
@@ -88,7 +92,7 @@ static int stricmp(const char *s1, const char *s2)
 }
 #endif /* __APPLE__ */
 -#if USE_STRLWR
 +#if USE_STRLWR && !defined(HAVE_STRLWR)
 static const char *strlwr(char *s) {
   const char *p=s;
   while(*s) {
 -- 
 2.10.2
--- a/app-crypt/gnupg/gnupg-2.1.19-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.1.19-r1.ebuild
@ -56,6 +56,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.1.16-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
 	"${FILESDIR}"/${P}-solaris-ucred.patch
 	"${FILESDIR}"/${P}-ssh-no-scdaemon.patch
 	"${FILESDIR}"/${P}-have_strlwr.patch
 )
 src_configure() {
--- a/app-crypt/loop-aes-losetup/loop-aes-losetup-2.28.2.ebuild
+++ b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.28.2.ebuild
@ -71,5 +71,6 @@ src_configure() {
 src_install() {
 	emake install DESTDIR="${T}/root"
 	newsbin "${T}/root/sbin/losetup" loop-aes-losetup
 	newman "${T}/root/usr/share/man/man8/losetup.8" loop-aes-losetup.8
 	use static && newsbin "${T}/root/bin/losetup.static" loop-aes-losetup.static
 }
--- a/app-editors/emacs-vcs/emacs-vcs-26.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.0.9999.ebuild
@ -28,13 +28,12 @@ HOMEPAGE="https://www.gnu.org/software/emacs/"
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="26"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib mailutils motif pax_kernel png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"
 RDEPEND="sys-libs/ncurses:0=
 	>=app-eselect/eselect-emacs-1.16
 	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
 	net-libs/liblockfile
 	acl? ( virtual/acl )
 	alsa? ( media-libs/alsa-lib )
 	dbus? ( sys-apps/dbus )
@ -43,6 +42,8 @@ RDEPEND="sys-libs/ncurses:0=
 	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
 	kerberos? ( virtual/krb5 )
 	libxml2? ( >=dev-libs/libxml2-2.2.0 )
 	mailutils? ( net-mail/mailutils[clients] )
 	!mailutils? ( net-libs/liblockfile )
 	selinux? ( sys-libs/libselinux )
 	ssl? ( net-libs/gnutls )
 	systemd? ( sys-apps/systemd )
@ -120,10 +121,7 @@ src_prepare() {
 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
 		|| die "unable to sed ctags.1"
 	bash -c 'autoreconf() { echo nope; }; . $0 "$@"' \
 		./autogen.sh --no-check || die	#605400
 	AT_M4DIR=m4 eautoreconf
 	touch src/stamp-h.in || die
 }
 src_configure() {
@ -233,6 +231,7 @@ src_configure() {
 		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
 		--without-compress-install \
 		--with-file-notification=$(usev inotify || usev gfile || echo no) \
 		--without-pop \
 		$(use_enable acl) \
 		$(use_with dbus) \
 		$(use_with dynamic-loading modules) \
@ -241,6 +240,7 @@ src_configure() {
 		$(use_with hesiod) \
 		$(use_with kerberos) $(use_with kerberos kerberos5) \
 		$(use_with libxml2 xml2) \
 		$(use_with mailutils) \
 		$(use_with selinux) \
 		$(use_with ssl gnutls) \
 		$(use_with systemd libsystemd) \
--- a/app-editors/emacs-vcs/metadata.xml
+++ b/app-editors/emacs-vcs/metadata.xml
@ -39,6 +39,8 @@
    processing</flag>
  <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
    of the internal Lisp implementations</flag>
  <flag name="mailutils">Retrieve e-mail using <pkg>net-mail/mailutils</pkg>
    instead of the internal movemail substitute</flag>
  <flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
  <flag name="source">Install C source files and make them available for
    find-function</flag>
--- a/app-editors/emacs/emacs-25.1.ebuild
+++ b/app-editors/emacs/emacs-25.1.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="25"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"
--- a/app-editors/focuswriter/Manifest
+++ b/app-editors/focuswriter/Manifest
@ -1,4 +1,2 @@
 DIST focuswriter-1.5.5-src.tar.bz2 5249014 SHA256 b6a2085587864b2685516d20870d9375803ccdf3472e66bf457382d028c1da0e SHA512 aed6a2e203dcf349ff7fef6caa8e7ab1dbba80da988933c06d6f4ea1ad49ad4c4546b30aaacf9373d1234cb8934daac36f00d0d7b3512d9c3fc4f1e1b273a766 WHIRLPOOL 29795304e6d6687d16d2774cd4d28d0c45382474391d7ad62fa557a134e7c5d11ba6bf81bb81df2b0fb3727b4bb32f705d8fe73a7129f44c8485cc9d8b19b2e1
 DIST focuswriter-1.6.2-src.tar.bz2 10205432 SHA256 ac77139b4c9b70d26643e5707a9db9003586a6633779dec20a5c1353602b2655 SHA512 fb665e2bb59b9b449c0b68e3e72cc51c14c6c8b779ac347176bdb521922fba233da6754db4772dbcc80d5c610fb180176ade1ec8dd29c9b004223dce73faa58a WHIRLPOOL 3913609be7c934795b1e1a73c2a836c88bbbaf6282db0ac70bd685b52b902e7dd085172e489aec6420b37e6b7be769138051df0bb722adeac1676a66ec5e2b3f
 DIST focuswriter-1.6.3-src.tar.bz2 10211589 SHA256 7de693e8786738c50bde53d4e325334ecf3b8155d7c9b37e64bbd9adedcb9f40 SHA512 015a9153a331bffc1b87bb0d13c6aa1340f46da72084caad8a4a8811f213e5ae17802363570052702c1f1b990ccb3d314f179da0a94898bdc988b7798a3b9b0f WHIRLPOOL a8ed601dc2e53665af3be74cac385ec8afdc7c9029812250964ee660a52b4eafe568c4f5405a7348c64244c7c9ab7da1af3d43f6e923e0c7729e0c0f6fec80bd
 DIST focuswriter-1.6.4-src.tar.bz2 10214364 SHA256 1f019e75b5581d3e7ed96977e92c9a5f6eba8456eccbad1f481adaabae34055c SHA512 0f3e0af0efab3cae7e2c4086c500dcf75b1d48f3d4f2cfa5fa3663443f109e90ab3dac01fcac240fa0d65ffe5f11faec9145083192492c9eefa6c1b48ed22c7a WHIRLPOOL 4728d5768daaa5298632c3a2cd745cbd6aeb32b23d03aa64a021d19ab8d0084e3edf15211a2c2536c4280006fcc497204fe1a391a8c00716984679d4a0ef070c
--- a/app-editors/focuswriter/files/focuswriter-1.5.2-unbundle-qtsingleapplication.patch
+++ b/app-editors/focuswriter/files/focuswriter-1.5.2-unbundle-qtsingleapplication.patch
@ -1,36 +0,0 @@
 --- focuswriter.pro.orig	2014-07-20 17:37:05.000000000 +0400
 +++ focuswriter.pro	2014-07-31 17:56:00.702801120 +0400
@@ -90,13 +90,14 @@
 		src/spelling/dictionary_provider_voikko.cpp
 	lessThan(QT_MAJOR_VERSION, 5) {
 +		CONFIG += qtsingleapplication
 		SOURCES += src/sdl/sound.cpp
 	} else {
 		SOURCES += src/sound.cpp
 	}
 }
 -INCLUDEPATH += src src/fileformats src/qtsingleapplication src/qtzip src/spelling
 +INCLUDEPATH += src src/fileformats src/qtzip src/spelling
 # Specify program sources
 HEADERS += src/action_manager.h \
@@ -155,8 +156,6 @@
 	src/fileformats/rtf_tokenizer.h \
 	src/fileformats/rtf_writer.h \
 	src/fileformats/txt_reader.h \
 -	src/qtsingleapplication/qtsingleapplication.h \
 -	src/qtsingleapplication/qtlocalpeer.h \
 	src/qtzip/qtzipreader.h \
 	src/qtzip/qtzipwriter.h \
 	src/spelling/abstract_dictionary.h \
@@ -219,8 +218,6 @@
 	src/fileformats/rtf_tokenizer.cpp \
 	src/fileformats/rtf_writer.cpp \
 	src/fileformats/txt_reader.cpp \
 -	src/qtsingleapplication/qtsingleapplication.cpp \
 -	src/qtsingleapplication/qtlocalpeer.cpp \
 	src/qtzip/qtzip.cpp \
 	src/spelling/dictionary_dialog.cpp \
 	src/spelling/dictionary_manager.cpp \
--- a/app-editors/focuswriter/focuswriter-1.5.5.ebuild
+++ b/app-editors/focuswriter/focuswriter-1.5.5.ebuild
@ -1,66 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 PLOCALES="ar ca cs da de el en en_GB es_MX es fi fr he hu hy id it ja ko nl pl
 pt_BR pt ro ru sk sr sv tr uk vi zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 inherit fdo-mime gnome2-utils l10n readme.gentoo qt4-r2
 DESCRIPTION="A fullscreen and distraction-free word processor"
 HOMEPAGE="http://gottcode.org/focuswriter/"
 SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="debug"
 RDEPEND="app-text/hunspell
 	dev-qt/qtcore:4
 	dev-qt/qtgui:4
 	dev-qt/qtsingleapplication[qt4(+),X]
 	sys-libs/zlib"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 DOCS=( ChangeLog CREDITS NEWS README )
 DOC_CONTENTS="Focuswriter has optional sound support if media-libs/sdl-mixer is
 installed with wav useflag enabled."
 PATCHES=( "${FILESDIR}/${PN}-1.5.2-unbundle-qtsingleapplication.patch" )
 rm_loc() {
 	sed -e "s|translations/${PN}_${1}.ts||"	-i ${PN}.pro || die 'sed failed'
 	rm translations/${PN}_${1}.{ts,qm} || die "removing ${1} locale failed"
 }
 src_prepare() {
 	l10n_for_each_disabled_locale_do rm_loc
 	qt4-r2_src_prepare
 }
 src_configure() {
 	eqmake4 PREFIX="${EPREFIX}/usr"
 }
 src_install() {
 	readme.gentoo_create_doc
 	qt4-r2_src_install
 }
 pkg_preinst() {
 	gnome2_icon_savelist
 }
 pkg_postinst() {
 	readme.gentoo_pkg_postinst
 	gnome2_icon_cache_update
 	fdo-mime_desktop_database_update
 }
 pkg_postrm() {
 	gnome2_icon_cache_update
 	fdo-mime_desktop_database_update
 }
--- a/app-editors/focuswriter/focuswriter-1.6.2.ebuild
+++ b/app-editors/focuswriter/focuswriter-1.6.2.ebuild
@ -1,58 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit fdo-mime gnome2-utils qmake-utils
 DESCRIPTION="A fullscreen and distraction-free word processor"
 HOMEPAGE="http://gottcode.org/focuswriter/"
 SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
 LICENSE="LGPL-3 GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND="
 	app-text/hunspell:=
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtsingleapplication[qt5,X]
 	dev-qt/qtwidgets:5
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 	dev-qt/qtconcurrent:5
 	virtual/pkgconfig
 "
 DOCS=( ChangeLog CREDITS NEWS README )
 PATCHES=( "${FILESDIR}/${PN}-1.6.0-unbundle-qtsingleapplication.patch" )
 src_configure() {
 	eqmake5 PREFIX="${EPREFIX}/usr"
 }
 src_install() {
 	emake INSTALL_ROOT="${D}" install
 	einstalldocs
 }
 pkg_preinst() {
 	gnome2_icon_savelist
 }
 pkg_postinst() {
 	gnome2_icon_cache_update
 	fdo-mime_desktop_database_update
 }
 pkg_postrm() {
 	gnome2_icon_cache_update
 	fdo-mime_desktop_database_update
 }
--- a/app-emulation/libvirt/libvirt-1.3.5-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-1.3.5-r2.ebuild
@ -375,7 +375,5 @@ pkg_postinst() {
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
 	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
 	DISABLE_AUTOFORMATTING=true
 	readme.gentoo_print_elog
 }
--- a/app-emulation/libvirt/libvirt-2.1.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-2.1.0-r2.ebuild
@ -377,7 +377,5 @@ pkg_postinst() {
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
 	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
 	DISABLE_AUTOFORMATTING=true
 	readme.gentoo_print_elog
 }
--- a/app-emulation/libvirt/libvirt-2.3.0.ebuild
+++ b/app-emulation/libvirt/libvirt-2.3.0.ebuild
@ -378,7 +378,5 @@ pkg_postinst() {
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
 	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
 	DISABLE_AUTOFORMATTING=true
 	readme.gentoo_print_elog
 }
--- a/app-emulation/libvirt/libvirt-2.5.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-2.5.0-r2.ebuild
@ -377,8 +377,6 @@ pkg_postinst() {
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
 	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
 	DISABLE_AUTOFORMATTING=true
 	FORCE_PRINT_ELOG=1 # remove for next version bump
 	readme.gentoo_print_elog
 }
--- a/app-emulation/libvirt/libvirt-3.1.0.ebuild
+++ b/app-emulation/libvirt/libvirt-3.1.0.ebuild
@ -378,8 +378,5 @@ pkg_postinst() {
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
 	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
 	DISABLE_AUTOFORMATTING=true
 	FORCE_PRINT_ELOG=1 # remove for next version bump
 	readme.gentoo_print_elog
 }
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@ -377,8 +377,5 @@ pkg_postinst() {
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
 	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
 	DISABLE_AUTOFORMATTING=true
 	FORCE_PRINT_ELOG=1 # remove for next version bump
 	readme.gentoo_print_elog
 }
--- a/app-misc/mc/mc-4.8.18-r1.ebuild
+++ b/app-misc/mc/mc-4.8.18-r1.ebuild
@ -13,7 +13,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
 REQUIRED_USE="spell? ( edit )"
--- a/app-office/gnumeric/gnumeric-1.12.29.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.29.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI="6"
@ -37,7 +37,7 @@ RDEPEND="
 	x11-libs/cairo:=[svg]
 	introspection? ( >=dev-libs/gobject-introspection-1:= )
-	perl? ( dev-lang/perl )
+	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS}
 		>=dev-python/pygobject-3:3[${PYTHON_USEDEP}] )
 	libgda? ( gnome-extra/libgda:5[gtk] )
--- a/app-office/gnumeric/gnumeric-1.12.31.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.31.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI="6"
@ -37,7 +37,7 @@ RDEPEND="
 	x11-libs/cairo:=[svg]
 	introspection? ( >=dev-libs/gobject-introspection-1:= )
-	perl? ( dev-lang/perl )
+	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS}
 		>=dev-python/pygobject-3:3[${PYTHON_USEDEP}] )
 	libgda? ( gnome-extra/libgda:5[gtk] )
--- a/app-office/gnumeric/gnumeric-1.12.32.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.32.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI="6"
@ -37,7 +37,7 @@ RDEPEND="
 	x11-libs/cairo:=[svg]
 	introspection? ( >=dev-libs/gobject-introspection-1:= )
-	perl? ( dev-lang/perl )
+	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS}
 		>=dev-python/pygobject-3:3[${PYTHON_USEDEP}] )
 	libgda? ( gnome-extra/libgda:5[gtk] )
--- a/app-portage/tatt/Manifest
+++ b/app-portage/tatt/Manifest
@ -1 +1,2 @@
 DIST tatt-0.3.tar.gz 22527 SHA256 bad1f0f33889aaa5887bab8c80bcbdaa620c379de5ff381ab983ae23d24ac9ed SHA512 822ec8904e452afd2373ca7ff01a05b8020b261acfc02864523a22e91d83dea51a1d2a8c79ec75db38e6de00cb3c06b3799dee261f376ec91d261a9f468aaa19 WHIRLPOOL f9be83b45c3d79e004600fa3e1ecd2d1ab6e6720035f13ab5f0b4a46555c280663e6371fb9ed88ab0de6bbfb4a853a0f07963dbc25f668a3cd8482c369343b90
 DIST tatt-0.4.tar.gz 23397 SHA256 53ed63685187acc55241698dac26a7cadbdf846dfc72709a9d67db65572dc2ef SHA512 57df8cdda9b6711da36e3635182fcfb64a376d7c3a76a29ea0252fc17597defe921d90bf9989f4fc199ab9848fae6fc4f53623140825f79368e90723a5562dd6 WHIRLPOOL a152e6cdee833d892eb0ff1b6c24d107b99ac4b7c92510d230fdbb6e1375825c1294a7008e1e09c496115f6116f3de48a4500dcc3a257998c8ee5bb0a29c08b0
--- a/app-portage/tatt/tatt-0.4.ebuild
+++ b/app-portage/tatt/tatt-0.4.ebuild
@ -0,0 +1,38 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 PYTHON_COMPAT=( python2_7 python3_4 )
 inherit distutils-r1
 DESCRIPTION="arch testing tool"
 HOMEPAGE="https://github.com/kensington/tatt"
 SRC_URI="https://github.com/kensington/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+templates"
 RDEPEND="
 	app-portage/eix
 	app-portage/gentoolkit
 	dev-python/configobj[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	www-client/pybugz
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
 python_install_all() {
 	distutils-r1_python_install_all
 	if use templates; then
 		insinto "/usr/share/${PN}"
 		doins -r templates
 	fi
 	doman tatt.1
 	doman tatt.5
 }
--- a/app-portage/tatt/tatt-9999.ebuild
+++ b/app-portage/tatt/tatt-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
@ -20,11 +20,13 @@ IUSE="+templates"
 RDEPEND="
 	app-portage/eix
 	app-portage/gentoolkit
 	www-client/pybugz
 	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
+	dev-python/requests[${PYTHON_USEDEP}]
 	www-client/pybugz
 "
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	dev-python/setuptools[${PYTHON_USEDEP}]
 "
 python_install_all() {
 	distutils-r1_python_install_all
--- a/app-text/asciidoc/asciidoc-8.6.9-r5.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.9-r5.ebuild
@ -3,7 +3,7 @@
 EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 pypy )
 inherit python-single-r1 readme.gentoo-r1
--- a/dev-dotnet/webkit-sharp/Manifest
+++ b/dev-dotnet/webkit-sharp/Manifest
@ -1 +0,0 @@
 DIST webkit-sharp-0.3.tar.bz2 88972 SHA256 6633630b6e4834b0f93726570d1c97e884470e3c400ae929cca2f1376b7b959a SHA512 3a70b41a16024d0682328bcd59d7f99f51a0c191d63a96a4c3bd66ea3e8fb7dea1e85b4934ed3d98c5ae15b69b7745c273f78ad94610653e9f669ffaddc20231 WHIRLPOOL 71dc5d23171603b011322e6aa07dd3b77585ee1311c74ca2cc376f4e06f880a51f7fad60a4cacf20ef2905e1afbc21af7a65991c78e0d8dc715abb78fa64b7d5
--- a/dev-dotnet/webkit-sharp/files/webkit-sharp-0.3-webkit14.patch
+++ b/dev-dotnet/webkit-sharp/files/webkit-sharp-0.3-webkit14.patch
@ -1,9 +0,0 @@
 diff --git a/sources/webkit-sharp.dll.config.in b/sources/webkit-sharp.dll.config.in
 index 75788f8..4220311 100644
 --- a/sources/webkit-sharp.dll.config.in
 +++ b/sources/webkit-sharp.dll.config.in
@@ -1,3 +1,3 @@
 <configuration>
 -  <dllmap dll="webkit-1.0" target="webkit-1.0@LIB_PREFIX@.2@LIB_SUFFIX@"/>
 +  <dllmap dll="webkit-1.0" target="libwebkitgtk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 </configuration>
--- a/dev-dotnet/webkit-sharp/metadata.xml
+++ b/dev-dotnet/webkit-sharp/metadata.xml
@ -1,8 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>dotnet@gentoo.org</email>
 	<name>Gentoo Dotnet Project</name>
 </maintainer>
 </pkgmetadata>
--- a/dev-dotnet/webkit-sharp/webkit-sharp-0.3-r1.ebuild
+++ b/dev-dotnet/webkit-sharp/webkit-sharp-0.3-r1.ebuild
@ -1,32 +0,0 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI="4"
 inherit mono multilib eutils
 DESCRIPTION="WebKit-gtk bindings for Mono"
 HOMEPAGE="http://www.mono-project.com/"
 SRC_URI="http://mono.ximian.com/monobuild/preview/sources/webkit-sharp/${P}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 DEPEND=">=dev-lang/mono-2
 	>=net-libs/webkit-gtk-1.4:2
 	dev-dotnet/gtk-sharp:2"
 RDEPEND="${DEPEND}"
 MAKEOPTS="${MAKEOPTS} -j1"
 src_prepare() {
 	epatch "${FILESDIR}/${P}-webkit14.patch"
 }
 src_install() {
 	default
 	mono_multilib_comply
 }
--- a/dev-java/jal/Manifest
+++ b/dev-java/jal/Manifest
@ -1,2 +1 @@
 DIST jal-20031117-src.tar.gz 48793 SHA256 2f1bfd0c9b56a362da8fa5b61af3fd0722bb80e5b89fb12291b5a40e9f21db75 SHA512 0cb6cbd5e80d38dfbf57417b756dbc3bdddb2a28c4cbec292799ee71ac86cff3121f1e09e86f976f6562dafac54835bdd58780e4f1ffe733897b6d6ef053f95e WHIRLPOOL 54e9b1a005e2b10f62bcfd43bf1cf512fc0d0479ad113cfc57e3188f90b23184e1d6340ca56736faf7f309fc88196498652d459c75cbca7e2f76889ed3ac1568
 DIST jal-20031117.tar.gz 48793 SHA256 2f1bfd0c9b56a362da8fa5b61af3fd0722bb80e5b89fb12291b5a40e9f21db75 SHA512 0cb6cbd5e80d38dfbf57417b756dbc3bdddb2a28c4cbec292799ee71ac86cff3121f1e09e86f976f6562dafac54835bdd58780e4f1ffe733897b6d6ef053f95e WHIRLPOOL 54e9b1a005e2b10f62bcfd43bf1cf512fc0d0479ad113cfc57e3188f90b23184e1d6340ca56736faf7f309fc88196498652d459c75cbca7e2f76889ed3ac1568
--- a/dev-java/jal/files/buildxml.patch
+++ b/dev-java/jal/files/buildxml.patch
@ -1,18 +0,0 @@
 diff -uprN jal-20031117.orig/build.xml jal-20031117/build.xml
 --- jal-20031117.orig/build.xml	2004-11-22 17:00:41.200663880 +0100
 +++ jal-20031117/build.xml	2004-11-22 20:00:39.322099904 +0100
@@ -16,11 +16,13 @@
 	debug="on"
 	optimize="on"
         destdir="${build}"
 +	source="1.4"
 +	target="1.4"
     />
   </target>
   <target name="jar" depends="compile">
 -    <jar jarfile="jal-${version}.jar" 
 +    <jar jarfile="jal.jar" 
          basedir="${build}"
 		 />
   </target>
--- a/dev-java/jal/jal-20031117-r3.ebuild
+++ b/dev-java/jal/jal-20031117-r3.ebuild
@ -1,45 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="Partial port of the C++ Standard Template Library"
 SRC_URI="http://vigna.dsi.unimi.it/jal/${P}-src.tar.gz"
 HOMEPAGE="http://vigna.dsi.unimi.it/jal/"
 LICENSE="HPND"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc source"
 RDEPEND=">=virtual/jre-1.4"
 DEPEND=">=virtual/jdk-1.4
 	dev-java/ant-core
 	source? ( app-arch/zip )"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/buildxml.patch
 	# we have to generate the sources first
 	./instantiate -n byte bytes
 	./instantiate -n short shorts
 	./instantiate -n char chars
 	./instantiate -n int ints
 	./instantiate -n long longs
 	./instantiate -n float floats
 	./instantiate -n double doubles
 	./instantiate Object objects
 	./instantiate String strings
 	mkdir -p src/jal
 	mv bytes shorts chars ints longs floats doubles objects strings src/jal
 }
 src_install() {
 	java-pkg_dojar ${PN}.jar
 	use doc && java-pkg_dojavadoc docs
 	use source && java-pkg_dosrc "${S}"/src/jal
 }
--- a/dev-java/jal/jal-20031117-r5.ebuild
+++ b/dev-java/jal/jal-20031117-r5.ebuild
@ -1,20 +1,19 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
 JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Partial port of the C++ Standard Template Library"
-HOMEPAGE="http://vigna.dsi.unimi.it/jal/"
+HOMEPAGE="http://vigna.dsi.unimi.it/jal"
 SRC_URI="http://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 CDEPEND="dev-java/ant-core:0"
@ -24,8 +23,7 @@ RDEPEND="
 DEPEND="
 	${CDEPEND}
-	>=virtual/jdk-1.6
+	>=virtual/jdk-1.6"
 	source? ( app-arch/zip )"
 S="${WORKDIR}/${P}"
@ -33,7 +31,9 @@ JAVA_GENTOO_CLASSPATH="ant-core"
 JAVA_SRC_DIR="src/jal"
-java_prepare() {
+src_prepare() {
 	default
 	# Generate sources.
 	./instantiate -n byte bytes || die
 	./instantiate -n short shorts || die
--- a/dev-java/jclasslib/Manifest
+++ b/dev-java/jclasslib/Manifest
@ -1 +1,2 @@
 DIST jclasslib-3.1.tar.gz 4630493 SHA256 60186b7b613b31eb6260be00c56d28e5cd68ee964b9dc704fd0735db83bfa648 SHA512 5c44043eb30ab32110097ef6b52f459bf4d512db71efc79aae99fdb6b9db740a7be1e6a59f6e3a233a3b303933ed90fe482c6b9c81d76de93af6c9724aad41dc WHIRLPOOL 1a13025507463a148378152d13d2348ecbf08bde13c0bbe9aae4492111e9e90036020561bd8287fdd818fe4522682a61d0791b4c601c79c06b46a1c90a1fa400
 DIST jclasslib_unix_3_0.tar.gz 1774938 SHA256 eec6d971b913802904e1f76758ff9b739680489bdaced18543a359308390405c SHA512 0bd46f5a1c837f888d9b570f49085bb04d71e401d89b74880bd4af765cf27493b56e17ff065b155672bf6de6edb14006c619b3afe8bc6c488dc16e2fc97131ab WHIRLPOOL c15bf9a2457b72c517c83109b8cf1c88a4d0343d3f7a82de40e20f63d518ece9f53255181e9e5cf04cae640a663bb10e7c33049bfbbd8c05a792407ae1a2db9b
--- a/dev-java/jclasslib/jclasslib-3.1.ebuild
+++ b/dev-java/jclasslib/jclasslib-3.1.ebuild
@ -0,0 +1,34 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-ant-2
 DESCRIPTION="Java bytecode viewer"
 HOMEPAGE="https://github.com/ingokegel/jclasslib"
 SRC_URI="https://github.com/ingokegel/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 DEPEND=">=virtual/jdk-1.6"
 RDEPEND=">=virtual/jre-1.6"
 src_install() {
 	java-pkg_dojar "build/${PN}.jar"
 	java-pkg_dolauncher "${PN}" \
 		--main org.gjt.jclasslib.browser.BrowserApplication
 	use doc && java-pkg_dohtml -r doc/*
 	use source && java-pkg_dosrc src/*
 }
 pkg_postinst() {
 	elog "jclasslib uses Firefox by default."
 	elog "Set the BROWSER environment at your discretion."
 }
--- a/dev-java/jibx/jibx-1.2.6.ebuild
+++ b/dev-java/jibx/jibx-1.2.6.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
@ -17,8 +17,7 @@ SRC_URI="
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
 CDEPEND="
 	dev-java/bcel:0
@ -35,8 +34,7 @@ RDEPEND="
 DEPEND="
 	${CDEPEND}
-	>=virtual/jdk-1.6
+	>=virtual/jdk-1.6"
 	source? ( app-arch/zip )"
 JAVA_GENTOO_CLASSPATH="
 	joda-time
--- a/dev-java/jmi-interface/jmi-interface-1.0-r3.ebuild
+++ b/dev-java/jmi-interface/jmi-interface-1.0-r3.ebuild
@ -1,53 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 inherit java-pkg-2 java-ant-2
 DESCRIPTION="Java Metadata Interface Sample Class Interface"
 HOMEPAGE="http://java.sun.com/products/jmi/"
 JMI_ZIP="jmi-${PV/./_}-fr-interfaces.zip"
 MOF_XML="mof-${PV}.xml.bz2"
 SRC_URI="mirror://gentoo/${JMI_ZIP}
 		 mirror://gentoo/${MOF_XML}"
 LICENSE="sun-bcla-jmi"
 SLOT="0"
 KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE="doc source"
 DEPEND=">=virtual/jdk-1.4
 	app-arch/unzip
 	dev-java/ant-core
 	source? ( app-arch/zip )"
 RDEPEND=">=virtual/jre-1.4"
 S="${WORKDIR}"
 src_unpack() {
 	mkdir "${S}/src" && cd "${S}/src"
 	unpack ${JMI_ZIP}
 	cd "${S}"
 	# rename enum keywords because javadoc hates them
 	# even with -source 1.4, bummer
 	epatch "${FILESDIR}/${P}-enum.patch"
 	cp "${FILESDIR}/${P}-build.xml" build.xml
 	#adding mof.xml required by Netbeans #98603
 	mkdir -p "${S}/build/javax/jmi/model/resources"
 	cd "${S}/build/javax/jmi/model/resources"
 	unpack ${MOF_XML}
 	# bug #162328
 	cp mof-1.0.xml mof.xml
 }
 src_compile() {
 	eant jar $(use_doc)
 }
 src_install() {
 	java-pkg_dojar dist/*.jar
 	use doc && java-pkg_dojavadoc doc
 	use source && java-pkg_dosrc src/javax
 }
--- a/dev-java/jmi-interface/jmi-interface-1.0-r4.ebuild
+++ b/dev-java/jmi-interface/jmi-interface-1.0-r4.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
@ -17,7 +17,7 @@ SRC_URI="mirror://gentoo/${JMI_ZIP}
 LICENSE="sun-bcla-jmi"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 RDEPEND="
 	>=virtual/jre-1.6"
--- a/dev-java/jmi-interface/jmi-interface-1.0-r5.ebuild
+++ b/dev-java/jmi-interface/jmi-interface-1.0-r5.ebuild
@ -0,0 +1,51 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 JMI_ZIP="jmi-${PV/./_}-fr-interfaces.zip"
 MOF_XML="mof-${PV}.xml.bz2"
 DESCRIPTION="Java Metadata Interface Sample Class Interface"
 HOMEPAGE="http://java.sun.com/products/jmi/"
 SRC_URI="mirror://gentoo/${JMI_ZIP}
 		 mirror://gentoo/${MOF_XML}"
 LICENSE="sun-bcla-jmi"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6"
 JAVA_SRC_DIR="src"
 src_unpack() {
 	mkdir "${S}/src" || die
 	cd "${S}/src" || die
 	unpack "${JMI_ZIP}"
 	# adding mof.xml required by Netbeans
 	# #98603 and #162328
 	cd "${S}/src/javax/jmi/model" || die
 	unpack ${MOF_XML}
 	cp mof-1.0.xml mof.xml || die
 }
 src_prepare() {
 	default
 	# rename enum keywords because javadoc hates them
 	# even with -source 1.4, bummer
 	epatch "${FILESDIR}/${P}-enum.patch"
 }
 src_compile() {
 	java-pkg-simple_src_compile
 	java-pkg_addres "${PN}.jar" src -name "*.xml"
 }
--- a/dev-java/jsr173/files/build-1.0-r1.xml
+++ b/dev-java/jsr173/files/build-1.0-r1.xml
@ -1,61 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!---
   @author: Saleem Abdulrasool <compnerd@gentoo.org>
   @date: 5/9/2005
   @revision: 1.0_alpha
   @notes: Call using the following: ant -f build.xml -Dproject.name=${project name} -Dpackage.name=${package name}
 -->
 <project name="Gentoo_Builder" default="jar" basedir=".">
   <property name="src" value="src"/>
   <property name="build" value="build"/>
   <property name="dist" value="dist"/>
   <property name="dist.docs" value="${dist}/doc/api"/>
   <property name="libdir" value="lib"/>
   <property name="pkg" value="${package.name}"/>
   <property name="jar" value="${project.name}.jar"/>
    <path id="lib.classpath">
 		<fileset dir="${libdir}">
 			<include name="**/*.jar"/>
 		</fileset>
 	</path>
   <!-- Override any defined properties -->
   <property file="build.properties"/>
   <target name="init">
      <tstamp/>
      <mkdir dir="${build}"/>
      <mkdir dir="${dist}"/>
      <mkdir dir="${dist}/doc"/>
   </target>
   <target name="compile" depends="init">
 	   <javac srcdir="${src}" destdir="${build}" classpathref="lib.classpath"/>
   </target>
   <target name="manifest" depends="init">
      <manifest file="${build}/MANIFEST.MF" mode="update">
         <attribute name="Built-By" value="Gentoo Portage"/>
      </manifest>
   </target>
   <target name="jar" depends="compile,manifest">
      <jar jarfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF">
         <fileset dir="${build}"/>
      </jar>
   </target>
   <target name="javadoc" depends="compile">
 	   <javadoc sourcepath="${src}" destdir="${dist.docs}" packagenames="*" classpathref="lib.classpath"/>
   </target>
   <target name="clean">
      <delete dir="${build}"/>
      <delete dir="${dist}"/>
   </target>
 </project>
--- a/dev-java/jsr173/files/jsr173-1.0-build.xml
+++ b/dev-java/jsr173/files/jsr173-1.0-build.xml
@ -1,61 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!---
   @author: Saleem Abdulrasool <compnerd@gentoo.org>
   @date: 5/9/2005
   @revision: 1.0_alpha
   @notes: Call using the following: ant -f build.xml -Dproject.name=${project name} -Dpackage.name=${package name}
 -->
 <project name="Gentoo_Builder" default="jar" basedir=".">
   <property name="src" value="src"/>
   <property name="build" value="build"/>
   <property name="dist" value="dist"/>
   <property name="dist.docs" value="${dist}/doc/api"/>
   <property name="libdir" value="lib"/>
   <property name="pkg" value="${package.name}"/>
   <property name="jar" value="${project.name}.jar"/>
    <path id="lib.classpath">
 		<fileset dir="${libdir}">
 			<include name="**/*.jar"/>
 		</fileset>
 	</path>
   <!-- Override any defined properties -->
   <property file="build.properties"/>
   <target name="init">
      <tstamp/>
      <mkdir dir="${build}"/>
      <mkdir dir="${dist}"/>
      <mkdir dir="${dist}/doc"/>
   </target>
   <target name="compile" depends="init">
 	   <javac srcdir="${src}" destdir="${build}" classpathref="lib.classpath"/>
   </target>
   <target name="manifest" depends="init">
      <manifest file="${build}/MANIFEST.MF" mode="update">
         <attribute name="Built-By" value="Gentoo Portage"/>
      </manifest>
   </target>
   <target name="jar" depends="compile,manifest">
      <jar jarfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF">
         <fileset dir="${build}"/>
      </jar>
   </target>
   <target name="javadoc" depends="compile">
 	   <javadoc sourcepath="${src}" destdir="${dist.docs}" packagenames="*" classpathref="lib.classpath"/>
   </target>
   <target name="clean">
      <delete dir="${build}"/>
      <delete dir="${dist}"/>
   </target>
 </project>
--- a/dev-java/jsr173/jsr173-1.0-r1.ebuild
+++ b/dev-java/jsr173/jsr173-1.0-r1.ebuild
@ -1,47 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-ant-2
 DESCRIPTION="The Streaming API for XML (StAX) is a Java API for parsing and writing XML easily and efficiently"
 HOMEPAGE="http://dev2dev.bea.com/xml/stax.html"
 SRC_URI="http://ftpna2.bea.com/pub/downloads/${PN}.jar"
 LICENSE="bea.ri.jsr173"
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 RDEPEND=">=virtual/jre-1.3
 	dev-java/jaxme"
 DEPEND=">=virtual/jdk-1.3
 	${RDEPEND}"
 S=${WORKDIR}
 src_unpack() {
 	cd "${S}"
 	jar xvf ${DISTDIR}/${A} || die "failed to unpack"
 	cp "${FILESDIR}/build-${PVR}.xml" build.xml
 	jar xvf ${P//-/_}_src.jar || die "failed to unpack"
 	rm -v *.jar || die
 	cd lib
 	rm -v *.jar || die
 	java-pkg_jarfrom jaxme
 }
 src_compile() {
 	local antflags="-Dproject.name=${PN} jar"
 	eant ${antflags} $(use_doc) || die "Compilation failed"
 }
 src_install() {
 	java-pkg_dojar dist/${PN}.jar
 	use doc && java-pkg_dojavadoc dist/doc/api
 	use source && java-pkg_dosrc src/*
 }
--- a/dev-java/jsr173/jsr173-1.0-r2.ebuild
+++ b/dev-java/jsr173/jsr173-1.0-r2.ebuild
@ -1,57 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-ant-2
 DESCRIPTION="Library for parsing and writing XML"
 HOMEPAGE="http://dev2dev.bea.com/xml/stax.html"
 SRC_URI="http://ftpna2.bea.com/pub/downloads/${PN}.jar"
 LICENSE="bea.ri.jsr173"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 CDEPEND="dev-java/jaxme:0"
 RDEPEND="
 	${CDEPEND}
 	>=virtual/jre-1.6"
 DEPEND="
 	${CDEPEND}
 	>=virtual/jdk-1.6"
 S="${WORKDIR}"
 src_unpack() {
 	cd "${S}" || die
 	jar xvf "${DISTDIR}/${A}" || die "failed to unpack"
 	jar xvf ${P//-/_}_src.jar || die "failed to unpack"
 }
 src_prepare() {
 	default
 	cd "${S}" || die
 	java-pkg_clean
 	cp "${FILESDIR}/${P}-build.xml" build.xml || die
 	java-pkg_jarfrom jaxme
 }
 src_compile() {
 	local antflags="-Dproject.name=${PN} jar"
 	eant ${antflags} "$(use_doc)"
 }
 src_install() {
 	java-pkg_dojar "dist/${PN}.jar"
 	use doc && java-pkg_dojavadoc dist/doc/api
 	use source && java-pkg_dosrc src/*
 }
--- a/dev-java/jsr173/jsr173-1.0-r3.ebuild
+++ b/dev-java/jsr173/jsr173-1.0-r3.ebuild
@ -12,8 +12,7 @@ SRC_URI="http://ftpna2.bea.com/pub/downloads/${PN}.jar"
 LICENSE="bea.ri.jsr173"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 CDEPEND="dev-java/jaxme:0"
--- a/dev-java/jta/Manifest
+++ b/dev-java/jta/Manifest
@ -1,2 +1 @@
 DIST jta-1_0_1B-classes.zip 8812 SHA256 5bc89d0a1caecd25e9323144624fd26df4326c84da8658f08f5cc588ee25cca9 SHA512 933530dea0a87ef1229cfada6e7f36d9300c86ae09e9ac13999ebeaa138c6f9ff12b8aa3a762ebafa0218853f0e5897b742807accd8a3b621ec7e1c9052f93bd WHIRLPOOL fcaab3f26cd313db02e80181f431d48f03db4493e41e0f9f7ebd8fc536257377a456a503c58b2ed6dd734911ccf04cedb38695db6b518e94189fe7377bb61fae
 DIST jta-1_1-classes.zip 13236 SHA256 6202127f8e3fe63ebbaa8c3ddf455bae862d5563b4c210ea29484df52ce505da SHA512 fb8b76223ccdec0ef97b00d7248d74b6316dd67c570667f3a644d03b05cd28af061a191cf71b6624fd4a4195f7bc107281eb847fc4c0ee4606c85c414da79a14 WHIRLPOOL c6b97d35eb09cd027596594ce009c251cc61014ceacd7d49748eb157ddbec6700eb29d07a4f9fd0d6273652cd83e067fc7f2a4d99e584ad13c7f13c2f8a07271
--- a/dev-java/jta/jta-1.0.1-r1.ebuild
+++ b/dev-java/jta/jta-1.0.1-r1.ebuild
@ -1,44 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 inherit java-pkg-2
 At="jta-1_0_1B-classes.zip"
 DESCRIPTION="The Java Transaction API"
 HOMEPAGE="http://www.oracle.com/technetwork/java/javaee/tech/jta-138684.html"
 SRC_URI="${At}"
 LICENSE="sun-bcla-jta"
 SLOT=0
 KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 DEPEND=">=app-arch/unzip-5.50-r1
 	>=virtual/jdk-1.3"
 RDEPEND=">=virtual/jre-1.3"
 RESTRICT="fetch"
 S=${WORKDIR}
 pkg_nofetch() {
 	einfo
 	einfo " Due to license restrictions, we cannot fetch the"
 	einfo " distributables automagically."
 	einfo
 	einfo " 1. Visit ${HOMEPAGE}"
 	einfo " 2. Select 'Java Transaction API Specification 1.0.1B Class Files 1.0.1B'"
 	einfo " 3. Download ${At}"
 	einfo " 4. Move file to ${DISTDIR}"
 	einfo " 5. Restart the emerge process"
 	einfo
 }
 src_unpack() {
 	unzip -qq "${DISTDIR}"/${At} || die "failed too unpack"
 }
 src_compile() {
 	jar cvf jta.jar javax/ || die "failed to create jar"
 }
 src_install() {
 	java-pkg_dojar jta.jar
 }
--- a/dev-java/jta/jta-1.1.ebuild
+++ b/dev-java/jta/jta-1.1.ebuild
@ -1,23 +1,25 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 JTA_ZIP="jta-1_1-classes.zip"
 inherit java-pkg-2
 JTA_ZIP="jta-1_1-classes.zip"
 DESCRIPTION="The Java Transaction API"
 HOMEPAGE="http://www.oracle.com/technetwork/java/javaee/jta/index.html"
 SRC_URI="${JTA_ZIP}"
 LICENSE="sun-bcla-jta"
 SLOT=0
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
+
-DEPEND=">=app-arch/unzip-5.50-r1
+DEPEND=" >=virtual/jdk-1.5"
 >=virtual/jdk-1.5"
 RDEPEND=">=virtual/jre-1.5"
 RESTRICT="fetch"
-S=${WORKDIR}
+S="${WORKDIR}"
 pkg_nofetch() {
 	einfo
--- a/dev-java/kunststoff/files/build.xml
+++ b/dev-java/kunststoff/files/build.xml
@ -1,56 +0,0 @@
 <?xml version="1.0"?>
 <project name="kunststoff" default="jar">
 	<!-- some properties -->
 	<property name="src.dir" value="src" />
 	<property name="build.dir" value="build" />
 	<property name="docs.dir" value="docs" />
 	<property name="dist.dir" value="dist" />
 	<property name="jarfile" value="${dist.dir}/kunststoff.jar" />
 	<property name="target.jdk" value="1.4" />
 	<!-- init -->
 	<target name="init">
 		<mkdir dir="${dist.dir}" />
 		<mkdir dir="${build.dir}" />
 		<mkdir dir="${docs.dir}" />
 	</target>	
 	<!-- compile everything -->
 	<target name="compile" depends="init">
 		<mkdir dir="${build.dir}" />
 		<javac srcdir="${src.dir}" 
 			destdir="${build.dir}"
 			source="${target.jdk}"
 			target="${target.jdk}" />
 		<copy todir="${build.dir}">
 			<fileset dir="${src.dir}">
 				<exclude name="**/*.java" />
 			</fileset>
 		</copy>
 	</target>
 	<!-- build the jar file -->
 	<target name="jar" depends="compile">
 		<jar jarfile="${jarfile}" basedir="${build.dir}" />
 	</target>
 	<!-- generate javadocs -->
 	<target name="docs" depends="init">
 		<javadoc sourcepath="${src.dir}"
 			packagenames="com.*"
           		destdir="${docs.dir}"
           		author="true"
           		version="true"
           		use="true"
           		windowtitle="${ant.project.name} API" />
 	</target>
 	<!-- clean up -->
 	<target name="clean">
 		<delete dir="${build.dir}" />
 		<delete dir="${docs.dir}" />
 		<delete dir="${dist.dir}" />
 	</target>
 </project>
--- a/dev-java/kunststoff/kunststoff-2.0.2-r1.ebuild
+++ b/dev-java/kunststoff/kunststoff-2.0.2-r1.ebuild
@ -1,35 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 inherit java-pkg-2 java-ant-2
 DESCRIPTION="Kunststoff Look&Feel"
 SRC_URI="http://www.incors.org/archive/${P//./_}.zip"
 HOMEPAGE="http://www.incors.org/archive"
 LICENSE="LGPL-2.1"
 SLOT="2.0"
 KEYWORDS="amd64 ppc64 x86"
 IUSE="doc source"
 DEPEND=">=virtual/jdk-1.4
 	>=dev-java/ant-core-1.4
 	>=app-arch/unzip-5.50-r1"
 RDEPEND=">=virtual/jre-1.4"
 S=${WORKDIR}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	rm -f *.jar
 	cp "${FILESDIR}"/build.xml .
 }
 EANT_DOC_TARGET="docs"
 src_install() {
 	java-pkg_dojar dist/kunststoff.jar
 	use doc && java-pkg_dojavadoc docs
 	use source && java-pkg_dosrc src/com
 }
--- a/dev-java/kunststoff/kunststoff-2.0.2-r2.ebuild
+++ b/dev-java/kunststoff/kunststoff-2.0.2-r2.ebuild
@ -0,0 +1,19 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Kunststoff look'n'feel Java library"
 HOMEPAGE="http://www.incors.org/archive"
 SRC_URI="http://www.incors.org/archive/${P//./_}.zip"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 DEPEND=">=virtual/jdk-1.6"
 RDEPEND=">=virtual/jre-1.6"
--- a/dev-java/sax/Manifest
+++ b/dev-java/sax/Manifest
@ -1,2 +1 @@
 DIST sax-2.2.1.zip 372488 SHA256 f9221ba55b3b753cf900ef64dc588a1d6b2716f63440b0f1ab55fe9deb418272 SHA512 af05c14994894f0b6cd860c1d632a1148f43cef824081357c9e4b256e66e0f36ac3cba1838f03322182339f2642b4bf68f707407fba8ee6c2f95d5b8d1267648 WHIRLPOOL 5822d3aba16ccb8bde702f3817090d931c01b6bbb83fc4abf521d3a369599bc4a88707e37db6ef9abb074ddd0119b4b845d7d8c12e6eacd93f382f0acc01d9f2
 DIST sax2r3.zip 372488 SHA256 f9221ba55b3b753cf900ef64dc588a1d6b2716f63440b0f1ab55fe9deb418272 SHA512 af05c14994894f0b6cd860c1d632a1148f43cef824081357c9e4b256e66e0f36ac3cba1838f03322182339f2642b4bf68f707407fba8ee6c2f95d5b8d1267648 WHIRLPOOL 5822d3aba16ccb8bde702f3817090d931c01b6bbb83fc4abf521d3a369599bc4a88707e37db6ef9abb074ddd0119b4b845d7d8c12e6eacd93f382f0acc01d9f2
--- a/dev-java/sax/sax-2.2.1-r2.ebuild
+++ b/dev-java/sax/sax-2.2.1-r2.ebuild
@ -1,37 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-ant-2
 DESCRIPTION="Simple API for XML, originally a Java-only API. It was the first widely adopted API for XML in Java"
 HOMEPAGE="http://sax.sourceforge.net/"
 SRC_URI="mirror://sourceforge/sax/sax2r3.zip"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 DEPEND=">=virtual/jdk-1.4
 		app-arch/unzip"
 RDEPEND=">=virtual/jre-1.4"
 S="${WORKDIR}/sax2r3"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	rm -rf classes *.jar
 }
 src_install() {
 	java-pkg_newjar sax2.jar
 	dodoc ChangeLog CHANGES README || die
 	use doc && java-pkg_dojavadoc docs/javadoc
 	use source && java-pkg_dosrc "${S}"/src/*
 }
--- a/dev-java/sax/sax-2.2.1-r3.ebuild
+++ b/dev-java/sax/sax-2.2.1-r3.ebuild
@ -10,20 +10,15 @@ MY_PN="sax2r3"
 inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="SAX: Simple API for XML in Java"
-HOMEPAGE="http://sax.sourceforge.net/"
+HOMEPAGE="http://sax.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip -> ${P}.zip"
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
-RDEPEND="
+RDEPEND=">=virtual/jre-1.6"
-	>=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
 DEPEND="
 	>=virtual/jdk-1.6
 	source? ( app-arch/zip )"
 S="${WORKDIR}/sax2r3"
--- a/dev-java/sax/sax-2.2.1-r4.ebuild
+++ b/dev-java/sax/sax-2.2.1-r4.ebuild
@ -0,0 +1,37 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 JAVA_PKG_IUSE="doc source"
 MY_PN="sax2r3"
 inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="SAX: Simple API for XML in Java"
 HOMEPAGE="http://sax.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip -> ${P}.zip"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 RDEPEND="
 	>=virtual/jre-1.6"
 DEPEND="
 	>=virtual/jdk-1.6
 	source? ( app-arch/zip )"
 S="${WORKDIR}/sax2r3"
 src_prepare() {
 	default
 	java-pkg_clean
 }
 src_install() {
 	java-pkg-simple_src_install
 	dodoc ChangeLog CHANGES README
 }
--- a/dev-java/saxpath/Manifest
+++ b/dev-java/saxpath/Manifest
@ -1 +1 @@
-DIST saxpath-1.0.tar.gz 2166023 SHA256 90c07abb3e3f09c398c02d84b44b651aa59d724aa6fabf45aa44a2365a6725c1 SHA512 aafd5e3d6d135f0916ebe3e4804bbbeb9c255b23210a46474716485ce2da0ee81fad4313a38951865104d2eaf1fadb81efd00677431b0294b1d01b7a729cee9e WHIRLPOOL 18b2150261a2a1bcbb34ecf07b38c9276d5610be1f1dd16b3de7c8c5de9c712dee44a896d5c9cfcb5dc9152342b5a7c2b11f70243ef74c2531ba3aaf6706a35b
+DIST saxpath-1.0.jar 36257 SHA256 2177b43d45b3ddbebb5f9a94f6558b12119409e12f515f7184c6870929d6fa50 SHA512 53e7781ea3efc1e16a839c9137fe7ab683e7a9e40283f0f5aa7afc1de75c4dc366a91a93ae5f256fc24e78fd3a4dcdcde6631bfa0d926b7dd0ddacd5c240ca96 WHIRLPOOL f43b84bf3d0e3adb8d936c80b981232b720b22808828bd3bf3b4eb68dcbc02cee98f791cc137955bffa4fe04a01d55566a31edbc8a2dd60786a2f883ddbaafc2
--- a/dev-java/saxpath/files/MANIFEST.MF
+++ b/dev-java/saxpath/files/MANIFEST.MF
@ -1,9 +0,0 @@
 Manifest-Version: 1.0
 Extension-Name: org.saxpath
 Specification-Title: saxpth
 Specification-Version: 1.0 FCS
 Specification-Vendor: werken digital.
 Created-By: Ant 1.4.1
 Implementation-Vendor:  werken digital.
 Implementation-Version: 1.0
 Implementation-Title: saxpath
--- a/dev-java/saxpath/saxpath-1.0-r2.ebuild
+++ b/dev-java/saxpath/saxpath-1.0-r2.ebuild
@ -1,57 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 JAVA_PKG_IUSE="doc source test"
 inherit java-pkg-2 java-ant-2
 DESCRIPTION="A Simple API for XPath"
 HOMEPAGE="http://saxpath.sourceforge.net/"
 SRC_URI="mirror://sourceforge/saxpath/${P}.tar.gz"
 LICENSE="JDOM"
 SLOT="0"
 KEYWORDS="amd64 ~arm ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 RDEPEND=">=virtual/jre-1.4"
 # doc needs ant-trax
 # test needs ant-junit
 DEPEND=">=virtual/jdk-1.4
 	doc? ( dev-java/ant-trax )
 	test? ( dev-java/ant-junit )"
 S=${WORKDIR}/${P}-FCS
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	rm -v *.jar lib/*.jar || die
 	mkdir src/conf
 	cp "${FILESDIR}/MANIFEST.MF" src/conf
 	use test && java-ant_rewrite-classpath
 	use doc && ANT_TASKS="ant-trax"
 }
 EANT_BUILD_TARGET="package"
 EANT_DOC_TARGET="doc javadoc"
 src_test() {
 	ANT_TASKS="ant-junit" eant -Dgentoo.classpath="$(java-pkg_getjar --build-only junit junit.jar)" \
 		test
 }
 src_install() {
 	java-pkg_dojar build/saxpath.jar
 	if use doc; then
 		# installs things other than javadoc too
 		mv build/doc/javadoc build/doc/apidocs || die
 		java-pkg_dohtml -r build/doc/*
 		dosym /usr/share/doc/${PF}/html/{apidocs,api} || die
 	fi
 	use source && java-pkg_dosrc src/java/main/*
 }
--- a/dev-java/saxpath/saxpath-1.0-r3.ebuild
+++ b/dev-java/saxpath/saxpath-1.0-r3.ebuild
@ -0,0 +1,19 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Java XPath API"
 HOMEPAGE="https://saxpath.sourceforge.net"
 SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}-FCS/${P}-FCS-sources.jar -> ${P}.jar"
 LICENSE="JDOM"
 SLOT="0"
 KEYWORDS="amd64 ~arm ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6"
--- a/dev-java/xmldb/files/xmldb-20011111-enum.patch
+++ b/dev-java/xmldb/files/xmldb-20011111-enum.patch
@ -0,0 +1,15 @@
 --- a/org/xmldb/api/sdk/modules/SetContentHandler.java	2017-03-17 21:49:05.540172602 +0000
 +++ b/org/xmldb/api/sdk/modules/SetContentHandler.java	2017-03-17 21:49:22.860172942 +0000
@@ -168,9 +168,9 @@
          }
       }
 -      Enumeration enum = namespaces.keys();
 -      while ( enum.hasMoreElements() ) {
 -         String key = (String) enum.nextElement();
 +      Enumeration myEnum = namespaces.keys();
 +      while ( myEnum.hasMoreElements() ) {
 +         String key = (String) myEnum.nextElement();
          newContent.append(" xmlns");
          if (key.length() > 0) {
             newContent.append(":");
--- a/dev-java/xmldb/files/xmldb-20011111-unreachable.patch
+++ b/dev-java/xmldb/files/xmldb-20011111-unreachable.patch
@ -1,6 +1,5 @@
-diff -ru xmldb/org/xmldb/api/reference/modules/XPathQueryServiceImpl.java xmldb-patched/org/xmldb/api/reference/modules/XPathQueryServiceImpl.java
+--- a/org/xmldb/api/reference/modules/XPathQueryServiceImpl.java	2002-01-30 04:46:43.000000000 -0500
--- xmldb/org/xmldb/api/reference/modules/XPathQueryServiceImpl.java	2002-01-30 04:46:43.000000000 -0500
+++ b/org/xmldb/api/reference/modules/XPathQueryServiceImpl.java	2005-06-26 21:37:59.000000000 -0400
 +++ xmldb/org/xmldb/api/reference/modules/XPathQueryServiceImpl.java	2005-06-26 21:37:59.000000000 -0400
@@ -133,7 +133,7 @@
          }
       }
--- a/dev-java/xmldb/xmldb-20011111-r2.ebuild
+++ b/dev-java/xmldb/xmldb-20011111-r2.ebuild
@ -0,0 +1,51 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 MY_PN="${PN}-api"
 MY_PV="11112001"
 MY_P="${MY_PN}-${MY_PV}"
 DESCRIPTION="XML:DB Java library"
 HOMEPAGE="https://sourceforge.net/projects/xmldb-org/"
 SRC_URI="mirror://sourceforge/xmldb-org/${MY_P}.tar.gz"
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 CDEPEND="
 	dev-java/xalan:0
 	dev-java/xerces:2"
 DEPEND="
 	${CDEPEND}
 	>=virtual/jdk-1.6"
 RDEPEND="
 	${CDEPEND}
 	>=virtual/jre-1.6"
 S="${WORKDIR}/${PN}"
 JAVA_GENTOO_CLASSPATH="
 	xalan
 	xerces-2
 "
 PATCHES=(
 	"${FILESDIR}/${P}-enum.patch"
 	"${FILESDIR}/${P}-unreachable.patch"
 )
 src_prepare() {
 	default
 	java-pkg_clean
 	# Must hard-depend on dev-java/junit otherwise.
 	rm -rv org/xmldb/api/tests || die
 }
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@ -1,17 +1,6 @@
 DIST rustc-1.10.0-i686-unknown-linux-gnu.tar.gz 47134530 SHA256 019ee36468b92846691f96b56d980a4099f12cf1c5f74534a9d37e13122eb869 SHA512 0af9edc08d34189d99247169787133c78935cfae46489d4c42732d96a67878c221c9f2ad44a8ccf82781aecc4988e019fbb2825950eb08295d9c68a1d3c4a368 WHIRLPOOL aa8f36a3eeea4dbf24a6cbdc6ae402417b609279a445ffcaffc554c8c58559cd7390063d89accbab0acc874598c865ced420397e5002c9a5b4c15b462317f3f1
 DIST rustc-1.10.0-x86_64-unknown-linux-gnu.tar.gz 46533773 SHA256 4301f9a09f2b88ac1238d886dfa14d864be7401f4d8a31277303eebe0c7a56c3 SHA512 3b6c61c8c970c5244984df0c7d646d84984c8c1aaf804eda18820154cf09c5fea7fa77ac4cf779656ef4472029fe221b788a277a764de985bf5a0dc95a72f8c9 WHIRLPOOL f6f7ccc2ff9dd707d29f33a7252a41ec103914e016cfc383f1c7f37e6823fb32354ba599c7dd5f24f09ecd1436b40b16b6a23be44950fb2738b5cfa20d3dfcb9
 DIST rustc-1.11.0-i686-unknown-linux-gnu.tar.gz 45977053 SHA256 16273afc0540b4353e54faab6b73e16310ae724f3dc941938bf09129b08bed03 SHA512 d8bdee97e3ea4bf768571db94be66a5988cb2a87d99f54362210dce9d36952748c253bccf1db9c58935e7a7d2e2465daba051778200f798497bd77ba0f4f4712 WHIRLPOOL 8d7cf1396b7f4f058af63f23eee8a804b346e21816a130de6af4d7f3aecebe82ed3e3877d0faf2eedbfe309ac97e07252e392bb0ff28aa29c6d861f25332ffa8
 DIST rustc-1.11.0-src.tar.gz 26126471 SHA256 3685034a78e70637bdfa3117619f759f2481002fd9abbc78cc0f737c9974de6a SHA512 6ad050a02e3a3b48f205f5d5ed9393fd2a1a2237e5c78b3e51af8162f410b93a831ebe5980ce78c4d38c5a692395c7fec8442956497a5d21e9f7157404c6b5aa WHIRLPOOL f57ea2f42c97256427964f3a553207a2b587b1e4f1c2636c66d9c47f92a9de508a64ba8288ab3a80444d9dba1c59d545be876448a1f80f283c69a4cc3356da25
 DIST rustc-1.11.0-x86_64-unknown-linux-gnu.tar.gz 45436770 SHA256 e9d27a72900da33c1bbd0e59dd42fd6414c6bcdfa33593fb7c7360068406394a SHA512 a7565f00761cd4b2bd1e873bc9a75f52f3ba12379b4e1055e8aaf7c1818fb6357a4270630365fc8d7fb73816aa6f5520e6ac6e667105a4e0459d3755852d8d51 WHIRLPOOL fc708585b5ab6e1c62052b77ab08ebd560f8f1861a004653fb3636feb0f4fd33d01e1c793dc428d7172d2005050809f24321820c4d48503eea59a686e172f2d6
 DIST rustc-1.12.0-src.tar.gz 27501444 SHA256 ac5907d6fa96c19bd5901d8d99383fb8755127571ead3d4070cce9c1fb5f337a SHA512 0bd98c3a8c37420877e8e71b80e376d3b34c35a7bea9a986b7f332ab1885d76d456dbcbae6bf52e1155231bbf93284699ddc0d5297cc19b74d97bdfd8b804adc WHIRLPOOL 17cb131bd60bc8bb8abf882006367b992fb563c2a7df9bc19821dfa93cb5d01c83c7c057fabb13534492a686e331ad913c5dc08d186ef1c68c9161f81f2680a4
 DIST rustc-1.12.1-i686-unknown-linux-gnu.tar.gz 49384200 SHA256 6c1f62db6f9c317aa656774b5193ce3d0783de4c73f2424d98ff4c9f1f962d25 SHA512 e6ae7c6a8070322dc32e19f119df5ed6c66f2024c6f22e4ed9fdc6cd057942d859078b371087da654bf04e4c92fb6bf130130bd3e6c593801a96aee8ed2d5638 WHIRLPOOL d4c1d677db805fa1c771a4135378fbba48079981948885d8d61efb0072b2f87d1b9dbd24aa76febab3c3da68b80512acf6b2470eb0d97331c6cc2fbb04d402d7
 DIST rustc-1.12.1-src.tar.gz 27511443 SHA256 97913ae4cb255618aaacd1a534b11f343634b040b32656250d09d8d9ec02d3dc SHA512 1923e9efb9f7ca4d691a8d368fd327c80892a019a85716876e21b794584422a2050362388511c7e0763975c6ffad20cc06ce6f86b3ea5fe36f64dbd59aabc821 WHIRLPOOL 74a9d2b9f4e3be96ef30a037cb1eec6fa70f7bf266f6aff8324bf8314457177edf1a8bef839843c72a1a06910e024f7a80f9c84f6151edcbc5f2548ffbd7dcaa
 DIST rustc-1.12.1-x86_64-unknown-linux-gnu.tar.gz 47642897 SHA256 a753e3b6cfa8417978e4bfc0d3282f22be4abc5e106af39f4cb54dc775f64546 SHA512 4b0d769b453885b5129d7707cc36c5265a32e78482958c501a91d82d52bc0b0d594ab4f64ce3453c5e83976340e018611abdd66b587330499b93c4405f93545f WHIRLPOOL 7b3f19141796e8ff8c6a26d695f8270ec6a89b249b7e3b1673c943a787ac949e98484468962c22e23d00151cfdb2489c988c69ee29cd0bea58bb025a5cdea275
 DIST rustc-1.13.0-i686-unknown-linux-gnu.tar.gz 36766826 SHA256 e4b04e396533296b0b9fddecb25cf5cd0667dc764a2e6db9cb081cc62ca19602 SHA512 d9a85e114c174a8fb2ae3e55ed17fa882323875512bab380ac3d0f5b251702dd6d4aa90119fcc4b22cbfef1a221e2fcbedd4e33eb1ab31289a18562ab73da159 WHIRLPOOL ccd3e08a5770529d37a5842e011a0b88e2507b416e1e93ac3e4b7dcf54fb03630f46298a2e739686908660231f35330eeb2cc4f7aef1608c72cd6622ac9ad69c
 DIST rustc-1.13.0-src.tar.gz 27483805 SHA256 ecb84775ca977a5efec14d0cad19621a155bfcbbf46e8050d18721bb1e3e5084 SHA512 6d2983c28834165139b06b9f1bdc909c35814b32500072f5265a53360f7ca54f3a34a1e463a1c0ce58ffd0d3d7c3cb5b1b4ddcb24a374e2279fbbdc30b03d992 WHIRLPOOL 51f9563fcc2cb352cf0f814002da5d35bf83e22c448b965a4eb041de636671ddb982e766582c2577c6c17eec45014c05d89b1c11cd7b7180a18c44939cced435
 DIST rustc-1.13.0-x86_64-unknown-linux-gnu.tar.gz 34881955 SHA256 0b092ba6750be89aad32b231ad9c625a11b040fae3cad5aa3ef32aaf213332d4 SHA512 c7d3177ed25ba80cdaaafa7c3d238bd24e548e2f0f6e00d1ef1dbaf7afa4809def6bd893cc4a607c0e1973fc68e82dc9342fc6a84f77bd8e47d1c547bd0adcfb WHIRLPOOL f292b3bdb25b85533dc7adc41957344f747bdf99f2d9d90f70b8a00f3c052abe79ab97c313d803f98a709b85c76685ad90693c715d893efb9a272dbe6f628df9
 DIST rustc-1.14.0-i686-unknown-linux-gnu.tar.gz 51391277 SHA256 52b7df5025c302d82f0572fbdc74309334bad36e796c4a2fdf934abe2e5e23ac SHA512 4a951439d8c001b8ff2f6aa2f505e23130209494026fdacea019aef05bebb2f0d3404df047ccedbe9f4140cb5163404db22a5b0977752c495fc45f739d1252fb WHIRLPOOL 881f1a042568d55a3826f629ddd04642dbbfa3a7f423bb3c1d4e1d4e73fa31fe34c708b718b5d44cdd34cc71f99243de98f1478d880ff5804375bbc33ff4766e
 DIST rustc-1.14.0-src.tar.gz 27572650 SHA256 c790edd2e915bd01bea46122af2942108479a2fda9a6f76d1094add520ac3b6b SHA512 3d7ea4ed29ade247a40e586b1966752af508f2d93fb6695027189f4fe012af910dc2ad554acf3a661134a4371c9699fc0e04fae1dcf8f2f49691797b5c9ed356 WHIRLPOOL 9486f51ef29b22cc7f0af1ae4bf9b080497aa8506958f0098441274907e723f24f172c9d675118d23d5f7a5f80b54bcdf4a039c381fc797b45d111178f7540c1
 DIST rustc-1.14.0-x86_64-unknown-linux-gnu.tar.gz 49370951 SHA256 0eeec4211aa872f24c220200a0c2b095bbfc9c0f737c1c5df2555967c8f36787 SHA512 da33a8c509d3a554bed3173f8cdd6fc3639646e5b12eae80654d83290160227238c6f9ff9c0247d63a90f48eeafc8dc31a4a02575ba43fa6d5f75ae58a347c32 WHIRLPOOL a5aa3eb98b0b6b080057a4c5ffb00996904d3a6bb660297a984205f85e9fd6932f9e9c6c4d4fe60a8ca16a216304ab6e504a45b75b876408a8f3450f29872332
-DIST rustc-1.15.0-src.tar.gz 27560549 SHA256 f655e4fac9c2abb93eb579e29c408e46052c0e74b7655cd222c63c6743457673 SHA512 d77ad7838ec8788f64da61ffab6d6a5415c76e825a7563ce0e94fa2c7081277499e80004562b81fc07dda53d35a0c6f48d80dfd4442fa839b20c2ad863bffe8c WHIRLPOOL a3ee07dd7dd0c959a3f6ff27c4099125b7fc1a03f651463396730c092316ae88f61cd454f4020a5cb7e1727a2ac20e6b02056c9225d0f7f3a4ed1a4ef29832af
+DIST rustc-1.15.1-i686-unknown-linux-gnu.tar.gz 39314075 SHA256 a833304f99071600c72ecd868c1c7bd5ce49d1102332637a8eb7adb942f349ab SHA512 138a4a893a70860650da1636f734977c215e32b1f9b15b957bfc31575d2662ea6c2c65a130bd13647ec1f2366fe0deb26a94ea09aaec7cbda8e466fa295a0c42 WHIRLPOOL 175e1c7ae1352b955c4e9fc3ea2175e91fe9037e356898fc7dc61ce55f5932db6cf4efac834cecc95b6c90c411b57f0ddb398e9b1f3af843a77f1fd84d52c36b
 DIST rustc-1.15.1-src.tar.gz 28100203 SHA256 2e7daad418a830b45b977cd7ecf181b65f30f73df63ff36e124ea5fe5d1af327 SHA512 10d533b17cf7f92b9dff14b399b5dd0ac8b68284eea072c85ede78a4e4c2c4fce8c781777124c64798057aceb6444535e02e067fd67ba3633c3e828fb4d2d339 WHIRLPOOL 8b80298cd0a8c3ae0f7ad11052e2dd0bd48b589a95e4bbda4db32ac62d52f9252fe783d46b00484550099b99c3871bd577f8ef54ed45c20b477f9742220497fa
 DIST rustc-1.15.1-x86_64-unknown-linux-gnu.tar.gz 37650863 SHA256 33ff44672b731fc71145974ce84194a1a9bafe6da3a74fd1e7543f12467f8894 SHA512 97f2fd905b1c2c9ee1fb9a9604a931154aa928692e6334af5a60f1853e49246b13af26afb6342f085cf77e624f23e90c409f05b81983408cf0538ba1401ef7cb WHIRLPOOL 92d4659712a3c8c5908f2abff4f582233a2b5aea2256213376f4830aaddb8470257e49d9f65503e7d82845648a898fd980afb070c39c37feaf8d489fdd9e238e
 DIST rustc-1.16.0-src.tar.gz 28470372 SHA256 f966b31eb1cd9bd2df817c391a338eeb5b9253ae0a19bf8a11960c560f96e8b4 SHA512 096b1b7406be9bc61161bb7cdd2061f2bc2174c161a31f4ed6ceecf7fc379f315fc2f7cb9f6c134ea4f8519c27bf6e5a3f712cf1e56d5785831d8c8374eb0ba5 WHIRLPOOL a59a19b63d64fd98d4f488e465c7a89ca034eaddb3ef6272fe3ab6c3e411afb7ca3b34926201815ce208a5de78dc9e9018caa1d05b71d1cbc80912d46eb8b074
--- a/dev-lang/rust/rust-1.11.0.ebuild
+++ b/dev-lang/rust/rust-1.11.0.ebuild
@ -1,150 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
 inherit python-any-r1 versionator toolchain-funcs
 if [[ ${PV} = *beta* ]]; then
 	betaver=${PV//*beta}
 	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
 	MY_P="rustc-beta"
 	SLOT="beta/${PV}"
 	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.gz"
 	KEYWORDS=""
 else
 	ABI_VER="$(get_version_component_range 1-2)"
 	SLOT="stable/${ABI_VER}"
 	MY_P="rustc-${PV}"
 	SRC="${MY_P}-src.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
 RUST_STAGE0_amd64="rustc-${STAGE0_VERSION}-x86_64-unknown-linux-gnu"
 RUST_STAGE0_x86="rustc-${STAGE0_VERSION}-i686-unknown-linux-gnu"
 DESCRIPTION="Systems programming language from Mozilla"
 HOMEPAGE="http://www.rust-lang.org/"
 SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.gz
 	amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.gz )
 	x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.gz )
 "
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 IUSE="clang debug doc libcxx +system-llvm"
 REQUIRED_USE="libcxx? ( clang )"
 RDEPEND="libcxx? ( sys-libs/libcxx )
 	system-llvm? ( >=sys-devel/llvm-3.8.1-r2:0=[multitarget]
 		<sys-devel/llvm-3.9.0:0=[multitarget] )
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	>=dev-lang/perl-5.0
 	clang? ( sys-devel/clang )
 "
 PDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425"
 S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	find mk -name '*.mk' -exec \
 		 sed -i -e "s/-Werror / /g" {} \; || die
 	default
 }
 src_configure() {
 	export CFG_DISABLE_LDCONFIG="notempty"
 	local stagename="RUST_STAGE0_${ARCH}"
 	local stage0="${!stagename}"
 	"${ECONF_SOURCE:-.}"/configure \
 		--prefix="${EPREFIX}/usr" \
 		--libdir="${EPREFIX}/usr/$(get_libdir)/${P}" \
 		--mandir="${EPREFIX}/usr/share/${P}/man" \
 		--release-channel=${SLOT%%/*} \
 		--disable-manage-submodules \
 		--default-linker=$(tc-getBUILD_CC) \
 		--default-ar=$(tc-getBUILD_AR) \
 		--python=${EPYTHON} \
 		--disable-rpath \
 		--enable-local-rust \
 		--local-rust-root="${WORKDIR}/${stage0}/rustc" \
 		$(use_enable clang) \
 		$(use_enable debug) \
 		$(use_enable debug llvm-assertions) \
 		$(use_enable !debug optimize) \
 		$(use_enable !debug optimize-cxx) \
 		$(use_enable !debug optimize-llvm) \
 		$(use_enable !debug optimize-tests) \
 		$(use_enable doc docs) \
 		$(use_enable libcxx libcpp) \
 		$(usex system-llvm "--llvm-root=${EPREFIX}/usr" " ") \
 		|| die
 }
 src_compile() {
 	emake VERBOSE=1
 }
 src_install() {
 	unset SUDO_USER
 	default
 	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
 	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
 	mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
 	dodoc COPYRIGHT
 	dodir "/usr/share/doc/rust-${PV}/"
 	mv "${D}/usr/share/doc/rust"/* "${D}/usr/share/doc/rust-${PV}/" || die
 	rmdir "${D}/usr/share/doc/rust/" || die
 	cat <<-EOF > "${T}"/50${P}
 	LDPATH="/usr/$(get_libdir)/${P}"
 	MANPATH="/usr/share/${P}/man"
 	EOF
 	doenvd "${T}"/50${P}
 	cat <<-EOF > "${T}/provider-${P}"
 	/usr/bin/rustdoc
 	/usr/bin/rust-gdb
 	EOF
 	dodir /etc/env.d/rust
 	insinto /etc/env.d/rust
 	doins "${T}/provider-${P}"
 }
 pkg_postinst() {
 	eselect rust update --if-unset
 	elog "Rust installs a helper script for calling GDB now,"
 	elog "for your convenience it is installed under /usr/bin/rust-gdb-${PV}."
 	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
 		elog "install app-emacs/rust-mode to get emacs support for rust."
 	fi
 	if has_version app-editors/gvim || has_version app-editors/vim; then
 		elog "install app-vim/rust-vim to get vim support for rust."
 	fi
 	if has_version 'app-shells/zsh'; then
 		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
 	fi
 }
 pkg_postrm() {
 	eselect rust unset --if-invalid
 }
--- a/dev-lang/rust/rust-1.12.0.ebuild
+++ b/dev-lang/rust/rust-1.12.0.ebuild
@ -1,150 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
 inherit python-any-r1 versionator toolchain-funcs
 if [[ ${PV} = *beta* ]]; then
 	betaver=${PV//*beta}
 	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
 	MY_P="rustc-beta"
 	SLOT="beta/${PV}"
 	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.gz"
 	KEYWORDS=""
 else
 	ABI_VER="$(get_version_component_range 1-2)"
 	SLOT="stable/${ABI_VER}"
 	MY_P="rustc-${PV}"
 	SRC="${MY_P}-src.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
 RUST_STAGE0_amd64="rustc-${STAGE0_VERSION}-x86_64-unknown-linux-gnu"
 RUST_STAGE0_x86="rustc-${STAGE0_VERSION}-i686-unknown-linux-gnu"
 DESCRIPTION="Systems programming language from Mozilla"
 HOMEPAGE="http://www.rust-lang.org/"
 SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.gz
 	amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.gz )
 	x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.gz )
 "
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 IUSE="clang debug doc libcxx +system-llvm"
 REQUIRED_USE="libcxx? ( clang )"
 RDEPEND="libcxx? ( sys-libs/libcxx )
 	system-llvm? ( >=sys-devel/llvm-3.8.1-r2:0=[multitarget]
 		<sys-devel/llvm-3.9.0:0=[multitarget] )
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	>=dev-lang/perl-5.0
 	clang? ( sys-devel/clang )
 "
 PDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425"
 S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	find mk -name '*.mk' -exec \
 		 sed -i -e "s/-Werror / /g" {} \; || die
 	default
 }
 src_configure() {
 	export CFG_DISABLE_LDCONFIG="notempty"
 	local stagename="RUST_STAGE0_${ARCH}"
 	local stage0="${!stagename}"
 	"${ECONF_SOURCE:-.}"/configure \
 		--prefix="${EPREFIX}/usr" \
 		--libdir="${EPREFIX}/usr/$(get_libdir)/${P}" \
 		--mandir="${EPREFIX}/usr/share/${P}/man" \
 		--release-channel=${SLOT%%/*} \
 		--disable-manage-submodules \
 		--default-linker=$(tc-getBUILD_CC) \
 		--default-ar=$(tc-getBUILD_AR) \
 		--python=${EPYTHON} \
 		--disable-rpath \
 		--enable-local-rust \
 		--local-rust-root="${WORKDIR}/${stage0}/rustc" \
 		$(use_enable clang) \
 		$(use_enable debug) \
 		$(use_enable debug llvm-assertions) \
 		$(use_enable !debug optimize) \
 		$(use_enable !debug optimize-cxx) \
 		$(use_enable !debug optimize-llvm) \
 		$(use_enable !debug optimize-tests) \
 		$(use_enable doc docs) \
 		$(use_enable libcxx libcpp) \
 		$(usex system-llvm "--llvm-root=${EPREFIX}/usr" " ") \
 		|| die
 }
 src_compile() {
 	emake VERBOSE=1
 }
 src_install() {
 	unset SUDO_USER
 	default
 	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
 	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
 	mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
 	dodoc COPYRIGHT
 	dodir "/usr/share/doc/rust-${PV}/"
 	mv "${D}/usr/share/doc/rust"/* "${D}/usr/share/doc/rust-${PV}/" || die
 	rmdir "${D}/usr/share/doc/rust/" || die
 	cat <<-EOF > "${T}"/50${P}
 	LDPATH="/usr/$(get_libdir)/${P}"
 	MANPATH="/usr/share/${P}/man"
 	EOF
 	doenvd "${T}"/50${P}
 	cat <<-EOF > "${T}/provider-${P}"
 	/usr/bin/rustdoc
 	/usr/bin/rust-gdb
 	EOF
 	dodir /etc/env.d/rust
 	insinto /etc/env.d/rust
 	doins "${T}/provider-${P}"
 }
 pkg_postinst() {
 	eselect rust update --if-unset
 	elog "Rust installs a helper script for calling GDB now,"
 	elog "for your convenience it is installed under /usr/bin/rust-gdb-${PV}."
 	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
 		elog "install app-emacs/rust-mode to get emacs support for rust."
 	fi
 	if has_version app-editors/gvim || has_version app-editors/vim; then
 		elog "install app-vim/rust-vim to get vim support for rust."
 	fi
 	if has_version 'app-shells/zsh'; then
 		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
 	fi
 }
 pkg_postrm() {
 	eselect rust unset --if-invalid
 }
--- a/dev-lang/rust/rust-1.12.1.ebuild
+++ b/dev-lang/rust/rust-1.12.1.ebuild
@ -1,152 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
 inherit python-any-r1 versionator toolchain-funcs
 if [[ ${PV} = *beta* ]]; then
 	betaver=${PV//*beta}
 	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
 	MY_P="rustc-beta"
 	SLOT="beta/${PV}"
 	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.gz"
 	KEYWORDS=""
 else
 	ABI_VER="$(get_version_component_range 1-2)"
 	SLOT="stable/${ABI_VER}"
 	MY_P="rustc-${PV}"
 	SRC="${MY_P}-src.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 CARGO_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
 STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
 RUST_STAGE0_amd64="rustc-${STAGE0_VERSION}-x86_64-unknown-linux-gnu"
 RUST_STAGE0_x86="rustc-${STAGE0_VERSION}-i686-unknown-linux-gnu"
 DESCRIPTION="Systems programming language from Mozilla"
 HOMEPAGE="http://www.rust-lang.org/"
 SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.gz
 	amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.gz )
 	x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.gz )
 "
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 IUSE="clang debug doc libcxx +system-llvm"
 REQUIRED_USE="libcxx? ( clang )"
 RDEPEND="libcxx? ( sys-libs/libcxx )
 	system-llvm? ( >=sys-devel/llvm-3.8.1-r2:0
 		<sys-devel/llvm-3.10.0:0 )
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	>=dev-lang/perl-5.0
 	clang? ( sys-devel/clang )
 "
 PDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
 	>=dev-util/cargo-${CARGO_VERSION}"
 S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	find mk -name '*.mk' -exec \
 		 sed -i -e "s/-Werror / /g" {} \; || die
 	default
 }
 src_configure() {
 	export CFG_DISABLE_LDCONFIG="notempty"
 	local stagename="RUST_STAGE0_${ARCH}"
 	local stage0="${!stagename}"
 	"${ECONF_SOURCE:-.}"/configure \
 		--prefix="${EPREFIX}/usr" \
 		--libdir="${EPREFIX}/usr/$(get_libdir)/${P}" \
 		--mandir="${EPREFIX}/usr/share/${P}/man" \
 		--release-channel=${SLOT%%/*} \
 		--disable-manage-submodules \
 		--default-linker=$(tc-getBUILD_CC) \
 		--default-ar=$(tc-getBUILD_AR) \
 		--python=${EPYTHON} \
 		--disable-rpath \
 		--enable-local-rust \
 		--local-rust-root="${WORKDIR}/${stage0}/rustc" \
 		$(use_enable clang) \
 		$(use_enable debug) \
 		$(use_enable debug llvm-assertions) \
 		$(use_enable !debug optimize) \
 		$(use_enable !debug optimize-cxx) \
 		$(use_enable !debug optimize-llvm) \
 		$(use_enable !debug optimize-tests) \
 		$(use_enable doc docs) \
 		$(use_enable libcxx libcpp) \
 		$(usex system-llvm "--llvm-root=${EPREFIX}/usr" " ") \
 		|| die
 }
 src_compile() {
 	emake VERBOSE=1
 }
 src_install() {
 	unset SUDO_USER
 	default
 	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
 	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
 	mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
 	dodoc COPYRIGHT
 	dodir "/usr/share/doc/rust-${PV}/"
 	mv "${D}/usr/share/doc/rust"/* "${D}/usr/share/doc/rust-${PV}/" || die
 	rmdir "${D}/usr/share/doc/rust/" || die
 	cat <<-EOF > "${T}"/50${P}
 	LDPATH="/usr/$(get_libdir)/${P}"
 	MANPATH="/usr/share/${P}/man"
 	EOF
 	doenvd "${T}"/50${P}
 	cat <<-EOF > "${T}/provider-${P}"
 	/usr/bin/rustdoc
 	/usr/bin/rust-gdb
 	EOF
 	dodir /etc/env.d/rust
 	insinto /etc/env.d/rust
 	doins "${T}/provider-${P}"
 }
 pkg_postinst() {
 	eselect rust update --if-unset
 	elog "Rust installs a helper script for calling GDB now,"
 	elog "for your convenience it is installed under /usr/bin/rust-gdb-${PV}."
 	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
 		elog "install app-emacs/rust-mode to get emacs support for rust."
 	fi
 	if has_version app-editors/gvim || has_version app-editors/vim; then
 		elog "install app-vim/rust-vim to get vim support for rust."
 	fi
 	if has_version 'app-shells/zsh'; then
 		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
 	fi
 }
 pkg_postrm() {
 	eselect rust unset --if-invalid
 }
--- a/dev-lang/rust/rust-1.14.0.ebuild
+++ b/dev-lang/rust/rust-1.14.0.ebuild
@ -1,152 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
 inherit python-any-r1 versionator toolchain-funcs
 if [[ ${PV} = *beta* ]]; then
 	betaver=${PV//*beta}
 	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
 	MY_P="rustc-beta"
 	SLOT="beta/${PV}"
 	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.gz"
 	KEYWORDS=""
 else
 	ABI_VER="$(get_version_component_range 1-2)"
 	SLOT="stable/${ABI_VER}"
 	MY_P="rustc-${PV}"
 	SRC="${MY_P}-src.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 CARGO_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
 STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
 RUST_STAGE0_amd64="rustc-${STAGE0_VERSION}-x86_64-unknown-linux-gnu"
 RUST_STAGE0_x86="rustc-${STAGE0_VERSION}-i686-unknown-linux-gnu"
 DESCRIPTION="Systems programming language from Mozilla"
 HOMEPAGE="http://www.rust-lang.org/"
 SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.gz
 	amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.gz )
 	x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.gz )
 "
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 IUSE="clang debug doc libcxx +system-llvm"
 REQUIRED_USE="libcxx? ( clang )"
 RDEPEND="libcxx? ( sys-libs/libcxx )
 	system-llvm? ( >=sys-devel/llvm-3.8.1-r2:0
 		<sys-devel/llvm-3.10.0:0 )
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	>=dev-lang/perl-5.0
 	clang? ( sys-devel/clang )
 "
 PDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
 	>=dev-util/cargo-${CARGO_VERSION}"
 S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	find mk -name '*.mk' -exec \
 		 sed -i -e "s/-Werror / /g" {} \; || die
 	default
 }
 src_configure() {
 	export CFG_DISABLE_LDCONFIG="notempty"
 	local stagename="RUST_STAGE0_${ARCH}"
 	local stage0="${!stagename}"
 	"${ECONF_SOURCE:-.}"/configure \
 		--prefix="${EPREFIX}/usr" \
 		--libdir="${EPREFIX}/usr/$(get_libdir)/${P}" \
 		--mandir="${EPREFIX}/usr/share/${P}/man" \
 		--release-channel=${SLOT%%/*} \
 		--disable-manage-submodules \
 		--default-linker=$(tc-getBUILD_CC) \
 		--default-ar=$(tc-getBUILD_AR) \
 		--python=${EPYTHON} \
 		--disable-rpath \
 		--enable-local-rust \
 		--local-rust-root="${WORKDIR}/${stage0}/rustc" \
 		$(use_enable clang) \
 		$(use_enable debug) \
 		$(use_enable debug llvm-assertions) \
 		$(use_enable !debug optimize) \
 		$(use_enable !debug optimize-cxx) \
 		$(use_enable !debug optimize-llvm) \
 		$(use_enable !debug optimize-tests) \
 		$(use_enable doc docs) \
 		$(use_enable libcxx libcpp) \
 		$(usex system-llvm "--llvm-root=${EPREFIX}/usr" " ") \
 		|| die
 }
 src_compile() {
 	emake VERBOSE=1
 }
 src_install() {
 	unset SUDO_USER
 	default
 	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
 	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
 	mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
 	dodoc COPYRIGHT
 	dodir "/usr/share/doc/rust-${PV}/"
 	mv "${D}/usr/share/doc/rust"/* "${D}/usr/share/doc/rust-${PV}/" || die
 	rmdir "${D}/usr/share/doc/rust/" || die
 	cat <<-EOF > "${T}"/50${P}
 	LDPATH="/usr/$(get_libdir)/${P}"
 	MANPATH="/usr/share/${P}/man"
 	EOF
 	doenvd "${T}"/50${P}
 	cat <<-EOF > "${T}/provider-${P}"
 	/usr/bin/rustdoc
 	/usr/bin/rust-gdb
 	EOF
 	dodir /etc/env.d/rust
 	insinto /etc/env.d/rust
 	doins "${T}/provider-${P}"
 }
 pkg_postinst() {
 	eselect rust update --if-unset
 	elog "Rust installs a helper script for calling GDB now,"
 	elog "for your convenience it is installed under /usr/bin/rust-gdb-${PV}."
 	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
 		elog "install app-emacs/rust-mode to get emacs support for rust."
 	fi
 	if has_version app-editors/gvim || has_version app-editors/vim; then
 		elog "install app-vim/rust-vim to get vim support for rust."
 	fi
 	if has_version 'app-shells/zsh'; then
 		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
 	fi
 }
 pkg_postrm() {
 	eselect rust unset --if-invalid
 }
--- a/dev-lang/rust/rust-1.15.0.ebuild
+++ b/dev-lang/rust/rust-1.15.0.ebuild
@ -1,153 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
 inherit python-any-r1 versionator toolchain-funcs
 if [[ ${PV} = *beta* ]]; then
 	betaver=${PV//*beta}
 	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
 	MY_P="rustc-beta"
 	SLOT="beta/${PV}"
 	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.gz"
 	KEYWORDS=""
 else
 	ABI_VER="$(get_version_component_range 1-2)"
 	SLOT="stable/${ABI_VER}"
 	MY_P="rustc-${PV}"
 	SRC="${MY_P}-src.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 CARGO_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
 STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
 RUST_STAGE0_amd64="rustc-${STAGE0_VERSION}-x86_64-unknown-linux-gnu"
 RUST_STAGE0_x86="rustc-${STAGE0_VERSION}-i686-unknown-linux-gnu"
 DESCRIPTION="Systems programming language from Mozilla"
 HOMEPAGE="http://www.rust-lang.org/"
 SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.gz
 	amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.gz )
 	x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.gz )
 "
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 IUSE="clang debug doc libcxx +system-llvm"
 REQUIRED_USE="libcxx? ( clang )"
 RDEPEND="libcxx? ( sys-libs/libcxx )
 	system-llvm? ( >=sys-devel/llvm-3.8.1-r2:0
 		<sys-devel/llvm-3.10.0:0 )
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	>=dev-lang/perl-5.0
 	clang? ( sys-devel/clang )
 "
 PDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
 	>=dev-util/cargo-${CARGO_VERSION}"
 S="${WORKDIR}/${MY_P}-src"
 src_prepare() {
 	find mk -name '*.mk' -exec \
 		 sed -i -e "s/-Werror / /g" {} \; || die
 	default
 }
 src_configure() {
 	export CFG_DISABLE_LDCONFIG="notempty"
 	local stagename="RUST_STAGE0_${ARCH}"
 	local stage0="${!stagename}"
 	"${ECONF_SOURCE:-.}"/configure \
 		--prefix="${EPREFIX}/usr" \
 		--libdir="${EPREFIX}/usr/$(get_libdir)/${P}" \
 		--mandir="${EPREFIX}/usr/share/${P}/man" \
 		--release-channel=${SLOT%%/*} \
 		--disable-manage-submodules \
 		--disable-rustbuild \
 		--default-linker=$(tc-getBUILD_CC) \
 		--default-ar=$(tc-getBUILD_AR) \
 		--python=${EPYTHON} \
 		--disable-rpath \
 		--enable-local-rust \
 		--local-rust-root="${WORKDIR}/${stage0}/rustc" \
 		$(use_enable clang) \
 		$(use_enable debug) \
 		$(use_enable debug llvm-assertions) \
 		$(use_enable !debug optimize) \
 		$(use_enable !debug optimize-cxx) \
 		$(use_enable !debug optimize-llvm) \
 		$(use_enable !debug optimize-tests) \
 		$(use_enable doc docs) \
 		$(use_enable libcxx libcpp) \
 		$(usex system-llvm "--llvm-root=${EPREFIX}/usr" " ") \
 		|| die
 }
 src_compile() {
 	emake VERBOSE=1
 }
 src_install() {
 	unset SUDO_USER
 	default
 	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
 	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
 	mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
 	dodoc COPYRIGHT
 	dodir "/usr/share/doc/rust-${PV}/"
 	mv "${D}/usr/share/doc/rust"/* "${D}/usr/share/doc/rust-${PV}/" || die
 	rmdir "${D}/usr/share/doc/rust/" || die
 	cat <<-EOF > "${T}"/50${P}
 	LDPATH="/usr/$(get_libdir)/${P}"
 	MANPATH="/usr/share/${P}/man"
 	EOF
 	doenvd "${T}"/50${P}
 	cat <<-EOF > "${T}/provider-${P}"
 	/usr/bin/rustdoc
 	/usr/bin/rust-gdb
 	EOF
 	dodir /etc/env.d/rust
 	insinto /etc/env.d/rust
 	doins "${T}/provider-${P}"
 }
 pkg_postinst() {
 	eselect rust update --if-unset
 	elog "Rust installs a helper script for calling GDB now,"
 	elog "for your convenience it is installed under /usr/bin/rust-gdb-${PV}."
 	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
 		elog "install app-emacs/rust-mode to get emacs support for rust."
 	fi
 	if has_version app-editors/gvim || has_version app-editors/vim; then
 		elog "install app-vim/rust-vim to get vim support for rust."
 	fi
 	if has_version 'app-shells/zsh'; then
 		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
 	fi
 }
 pkg_postrm() {
 	eselect rust unset --if-invalid
 }
--- a/dev-lang/rust/rust-1.16.0.ebuild
+++ b/dev-lang/rust/rust-1.16.0.ebuild
@ -37,13 +37,10 @@ SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.gz
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-IUSE="clang debug doc libcxx +system-llvm"
+IUSE="clang debug doc libcxx"
 REQUIRED_USE="libcxx? ( clang )"
-RDEPEND="libcxx? ( sys-libs/libcxx )
+RDEPEND="libcxx? ( sys-libs/libcxx )"
 	system-llvm? ( >=sys-devel/llvm-3.8.1-r2:0
 		<sys-devel/llvm-3.10.0:0 )
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
@ -54,7 +51,7 @@ DEPEND="${RDEPEND}
 PDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
 	>=dev-util/cargo-${CARGO_VERSION}"
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/${MY_P}-src"
 src_prepare() {
 	find mk -name '*.mk' -exec \
@ -75,6 +72,7 @@ src_configure() {
 		--mandir="${EPREFIX}/usr/share/${P}/man" \
 		--release-channel=${SLOT%%/*} \
 		--disable-manage-submodules \
 		--disable-rustbuild \
 		--default-linker=$(tc-getBUILD_CC) \
 		--default-ar=$(tc-getBUILD_AR) \
 		--python=${EPYTHON} \
--- a/dev-libs/engine_pkcs11/Manifest
+++ b/dev-libs/engine_pkcs11/Manifest
@ -1,2 +0,0 @@
 DIST engine_pkcs11-0.1.8.tar.gz 320799 SHA256 de7d7e41e7c42deef40c53e10ccc3f88d2c036d6656ecee7e82e8be07b06a2e5 SHA512 00fa7cf1e44544267248b17669f69a3d91b8e3008da8a8d70004d8ed87543eb75b06c4a9f028f9aee157f54110acadf40d2c6ff3835eae4cf0c29ac819557dc2 WHIRLPOOL c2121466980c9fb425e1f6ca53dde2b055fa833c3f42494dc2fc6f7a0468aa84d14cacc1ff2bd8319f54eb336ae79b3b442f33406ff275074162e1b274beff7a
 DIST engine_pkcs11-0.2.2.tar.gz 347122 SHA256 eeec81e63741f5ad1ee28f9d1e405512446674618b5422ac7a75f16e6f438d50 SHA512 877eab21e9e31853e504e4a222e18f13a8020de724338a8af4adfc840ec55c610b35dbe455b4b59a170ff9b829610ec9bc404b10d873d17b0246c59b178ebe44 WHIRLPOOL d0f8d8572544893f4c7d93fea5016bfd3be66e7fcf030a9889b806efe6b156a2075dbbab3c462576908812bcd718562aac609049012c6eee74e11315d97670ca
--- a/dev-libs/engine_pkcs11/engine_pkcs11-0.1.8-r1.ebuild
+++ b/dev-libs/engine_pkcs11/engine_pkcs11-0.1.8-r1.ebuild
@ -1,28 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 DESCRIPTION="engine_pkcs11 is an implementation of an engine for OpenSSL"
 HOMEPAGE="http://www.opensc-project.org/engine_pkcs11"
 SRC_URI="http://www.opensc-project.org/files/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="libressl"
 RDEPEND=">=dev-libs/libp11-0.2.5
 	!libressl? ( >=dev-libs/openssl-0.9.7d:0 )
 	libressl? ( dev-libs/libressl )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 src_configure() {
 	econf \
 		--docdir="/usr/share/doc/${PF}" \
 		--htmldir="/usr/share/doc/${PF}/html" \
 		--disable-static --enable-shared \
 		--enable-doc
 }
--- a/dev-libs/engine_pkcs11/engine_pkcs11-0.1.8.ebuild
+++ b/dev-libs/engine_pkcs11/engine_pkcs11-0.1.8.ebuild
@ -1,46 +0,0 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI="2"
 if [[ "${PV}" = "9999" ]]; then
 	inherit autotools subversion
 	ESVN_REPO_URI="http://www.opensc-project.org/svn/${PN}/trunk"
 else
 	SRC_URI="http://www.opensc-project.org/files/${PN}/${P}.tar.gz"
 fi
 DESCRIPTION="engine_pkcs11 is an implementation of an engine for OpenSSL"
 HOMEPAGE="http://www.opensc-project.org/engine_pkcs11"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 RDEPEND=">=dev-libs/libp11-0.2.5
 	>=dev-libs/openssl-0.9.7d:0"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 if [[ "${PV}" = "9999" ]]; then
 	DEPEND="${DEPEND}
 		app-text/docbook-xsl-stylesheets
 		dev-libs/libxslt"
 	src_prepare() {
 		eautoreconf
 	}
 fi
 src_configure() {
 	econf \
 		--docdir="/usr/share/doc/${PF}" \
 		--htmldir="/usr/share/doc/${PF}/html" \
 		--disable-static --enable-shared \
 		--enable-doc
 }
 src_install() {
 	emake install DESTDIR="${D}" || die "emake install failed"
 }
--- a/dev-libs/engine_pkcs11/engine_pkcs11-0.2.2.ebuild
+++ b/dev-libs/engine_pkcs11/engine_pkcs11-0.2.2.ebuild
@ -1,27 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit eutils
 DESCRIPTION="engine_pkcs11 is an implementation of an engine for OpenSSL"
 HOMEPAGE="https://github.com/opensc/engine_pkcs11/wiki"
 SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="libressl"
 RDEPEND=">=dev-libs/libp11-0.3.1
 	!libressl? ( >=dev-libs/openssl-0.9.7d:0 )
 	libressl? ( dev-libs/libressl )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 src_install() {
 	default
 	prune_libtool_files --all
 }
--- a/dev-libs/engine_pkcs11/metadata.xml
+++ b/dev-libs/engine_pkcs11/metadata.xml
@ -1,11 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>crypto@gentoo.org</email>
 		<name>Crypto</name>
 	</maintainer>
 	<longdescription>
 		engine_pkcs11 is an implementation of an engine for OpenSSL.
 	</longdescription>
 </pkgmetadata>
--- a/dev-libs/libp11/libp11-0.4.4.ebuild
+++ b/dev-libs/libp11/libp11-0.4.4.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="libressl bindist doc static-libs"
 RDEPEND="
--- a/dev-libs/tre/files/0.8.0-python.patch
+++ b/dev-libs/tre/files/0.8.0-python.patch
@ -1,39 +0,0 @@
 diff --git a/python/setup.py b/python/setup.py
 index b420a4c..b1bca6b 100644
 --- a/python/setup.py
 +++ b/python/setup.py
@@ -10,7 +10,8 @@ import shutil
 version = "0.8.0"
 data_files = []
 -include_dirs = ["../lib"]
 +include_dirs = ["lib"]
 +library_dirs = ["lib/.libs"]
 libraries = ["tre"]
 if sys.platform == "win32":
@@ -28,9 +29,10 @@ setup(name = "tre",
       url = "http://laurikari.net/tre/",
       data_files = data_files,
       ext_modules = [Extension("tre",
 -                               sources = ["tre-python.c"],
 +                               sources = ["python/tre-python.c"],
                                define_macros = [("HAVE_CONFIG_H", None)],
                                include_dirs = include_dirs,
 +			       library_dirs = library_dirs,
                                libraries = libraries
                                ),
                      ],
 diff --git a/python/tre-python.c b/python/tre-python.c
 index bbb24ed..2e35e3a 100644
 --- a/python/tre-python.c
 +++ b/python/tre-python.c
@@ -13,7 +13,7 @@
 #include "Python.h"
 #include "structmember.h"
 -#include <tre/tre.h>
 +#include <tre.h>
 #define	TRE_MODULE	"tre"
--- a/dev-libs/tre/tre-0.8.0-r1.ebuild
+++ b/dev-libs/tre/tre-0.8.0-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://laurikari.net/tre/${P}.tar.bz2"
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="nls static-libs"
 RDEPEND="
--- a/dev-libs/tre/tre-0.8.0.ebuild
+++ b/dev-libs/tre/tre-0.8.0.ebuild
@ -1,89 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=3
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython"
 inherit distutils eutils
 DESCRIPTION="Lightweight, robust, and efficient POSIX compliant regexp matching library"
 HOMEPAGE="http://laurikari.net/tre/ https://github.com/laurikari/tre/"
 SRC_URI="http://laurikari.net/tre/${P}.tar.bz2"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="nls python static-libs"
 RDEPEND="
 	!app-misc/glimpse
 	!app-text/agrep"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 DISTUTILS_SETUP_FILES=("python/setup.py")
 pkg_setup() {
 	use python && python_pkg_setup
 }
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PV}-python.patch \
 		"${FILESDIR}"/${PV}-pkgcfg.patch
 }
 src_configure() {
 	econf \
 		--disable-dependency-tracking \
 		--enable-agrep \
 		--enable-system-abi \
 		$(use_enable nls) \
 		$(use_enable static-libs static)
 }
 src_compile() {
 	emake || die
 	use python && distutils_src_compile
 }
 src_test() {
 	if $(locale -a | grep -iq en_US.iso88591); then
 	emake -j1 \
 		check || die
 	else
 		ewarn "If you like to run the test,"
 		ewarn "please make sure en_US.ISO-8859-1 is installed."
 		die "en_US.ISO-8859-1 locale is missing"
 	fi
 }
 src_install() {
 	emake DESTDIR="${D}" install || die
 	local exe_ext=
 	[[ ${CHOST} = *mingw32* ]] && exe_ext=.exe
 	mv "${ED}"/usr/bin/agrep{,-tre}${exe_ext} || die
 	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die
 	dohtml doc/*.{css,html} || die
 	use python && distutils_src_install
 }
 pkg_postinst() {
 	echo
 	ewarn "app-misc/glimpse, app-text/agrep and this package all provide agrep."
 	ewarn "If this causes any unforeseen incompatibilities please file a bug"
 	ewarn "on https://bugs.gentoo.org."
 	echo
 	use python && distutils_pkg_postinst
 }
 pkg_postrm() {
 	use python && distutils_pkg_postrm
 }
--- a/dev-perl/CGI-Compile/CGI-Compile-0.220.0.ebuild
+++ b/dev-perl/CGI-Compile/CGI-Compile-0.220.0.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=MIYAGAWA
 DIST_VERSION=0.22
 inherit perl-module
 DESCRIPTION="Compile .cgi scripts to a code reference like ModPerl::Registry"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RDEPEND="
 	dev-perl/File-pushd
 "
 DEPEND="${RDEPEND}
 	>=dev-perl/Module-Build-Tiny-0.34.0
 	test? (
 		dev-perl/Test-NoWarnings
 		dev-perl/Test-Requires
 		virtual/perl-Test-Simple
 	)
 "
--- a/dev-perl/CGI-Compile/Manifest
+++ b/dev-perl/CGI-Compile/Manifest
@ -1 +1,2 @@
 DIST CGI-Compile-0.21.tar.gz 20910 SHA256 ed2c12e12ad3bde9d0a73344851692982c0c05d0650fa0c03df66f63c0977838 SHA512 0b26fbe4a38645df3aeae03647292125210147321ed9552bbd871824915fabaafdac8601667bddfb73038b7f096d19e1ba7a00acaa5dc28865c1f97247ad5e64 WHIRLPOOL 74b51dd793eee9a584519dfc9eadb6434445f371d6458f06a0fe811383cd593c5a055aa02c1cf261e729b6ce913dfea961b1ff8793cd325536056e25ad13cdcd
 DIST CGI-Compile-0.22.tar.gz 21160 SHA256 f5094e9c6b793e3168cb621f1f661f8e1abb4f141761e0b79a0859bd5e5bccaf SHA512 58be714bd25975fbb66e4c83c197fa3c17219327859d965011706fda96d5c2f208831e52368c0b4b8ef6b0f462b9c8ea216d94d7ef30e904e21b818b134cc5b7 WHIRLPOOL 6b799318c95f50bda37c78b7579d0b2d699ae1f7a9b965db04bde56c7bf15d6dbcb2d924bf1772ff66595399643a1428225e8670295229174c204b8efe909202
--- a/dev-perl/Devel-Symdump/Devel-Symdump-2.180.0.ebuild
+++ b/dev-perl/Devel-Symdump/Devel-Symdump-2.180.0.ebuild
@ -0,0 +1,27 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 DIST_AUTHOR=ANDK
 DIST_VERSION=2.18
 inherit versionator perl-module
 DESCRIPTION="Dump symbol names or the symbol table"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 RDEPEND=""
 DEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? (
 		virtual/perl-IO-Compress
 		virtual/perl-Test-Simple
 	)
 "
 src_test() {
 	perl_rm_files t/pod*.t
 	perl-module_src_test
 }
--- a/dev-perl/Devel-Symdump/Manifest
+++ b/dev-perl/Devel-Symdump/Manifest
@ -1,2 +1,3 @@
 DIST Devel-Symdump-2.15.tar.gz 18112 SHA256 76c2a90d31318204ecf1977f0217ce57b142e6681fe2b99fb8789efc5dd86f41 SHA512 eba7178da3b8c9b8b2f4c61e572e4aef2e181a9b0be7a58f0790534511ccef51b7def381bcf7c37cd4a127de1cf57f1536284b3cb65f8a99920460a172f2e446 WHIRLPOOL d3af70e4e49cb496a25eb1d359ca03a5a62e7dfbbe83116b464ace56af38cbc05405089fe715e27f0f30451b758682ba30e70db9e9df8901feb4723413e843e2
 DIST Devel-Symdump-2.17.tar.gz 18410 SHA256 2c50fc7935e6e6200b74fbb9149c8078ee8f92788d2a9c5ab25c9ebace946e62 SHA512 f210b0008378772abd56e953152f0a9dcef6f84009c292e46d738a461d3ecadaf536493835c4f13b51a0db2381127f043fe0e893b97f9cf3eed68eeb4af9dae8 WHIRLPOOL e38d8c35613f9904bae07a5f97b13b6628efdf58ccf98dc8de91ea2716b916db97de6fd78ccebe3abe110c0acae8bb78df2fae0e002991ccd9319a8aa4f33c6d
 DIST Devel-Symdump-2.18.tar.gz 18439 SHA256 826f81a107f5592a2516766ed43beb47e10cc83edc9ea48090b02a36040776c0 SHA512 4e8e1ee723e3e02d2f0c100dace40d7722f6366402cff24fb50c8616a863628bc2faa02210754132afa7cbebbd90c75ea6f173e15bbcfaa5158dfcfdfd03da73 WHIRLPOOL b5cd21630ce77e6f9635e334fb8e81b89559112ff5237b3c732054058dc8efddab7d113d410a2018ccee1d0b9aecaad6ed9048cbf9b28dc1b319bde567556fa8
--- a/dev-perl/Mail-Box-IMAP4/Mail-Box-IMAP4-3.1.0.ebuild
+++ b/dev-perl/Mail-Box-IMAP4/Mail-Box-IMAP4-3.1.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.001
 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
@ -0,0 +1 @@
 DIST Mail-Box-IMAP4-3.001.tar.gz 41829 SHA256 48315c3716c66d86ef6dbd766a77d3f19f7d95bc47799bd0f0bc33ffe3563f05 SHA512 ba9ba1b706d90686755f65ca07d9052461607df02164931b3578c29e639a2a083c8f3354f2ae53d619a8b270ed4ddcbb91ea8669cf7740332243136d49f2bf81 WHIRLPOOL 452ecf26da48e1cbd333b57e53044bfc3f68671fb4bd040eec394ae205d692334b0f5b4856e13ebd4190e2921f1f1e97015936e2ddb37519cbadeef06cc35f13
--- a/dev-perl/Mail-Box-IMAP4/metadata.xml
+++ b/dev-perl/Mail-Box-IMAP4/metadata.xml
@ -0,0 +1,20 @@
 <?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">Mail-Box-IMAP4</remote-id>
    <remote-id type="cpan-module">Mail::Box::IMAP4</remote-id>
    <remote-id type="cpan-module">Mail::Box::IMAP4::Head</remote-id>
    <remote-id type="cpan-module">Mail::Box::IMAP4::Message</remote-id>
    <remote-id type="cpan-module">Mail::Server::IMAP4</remote-id>
    <remote-id type="cpan-module">Mail::Server::IMAP4::Fetch</remote-id>
    <remote-id type="cpan-module">Mail::Server::IMAP4::List</remote-id>
    <remote-id type="cpan-module">Mail::Server::IMAP4::Search</remote-id>
    <remote-id type="cpan-module">Mail::Server::IMAP4::User</remote-id>
    <remote-id type="cpan-module">Mail::Transport::IMAP4</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-perl/Mail-Box-POP3/Mail-Box-POP3-3.1.0.ebuild
+++ b/dev-perl/Mail-Box-POP3/Mail-Box-POP3-3.1.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.001
 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
@ -0,0 +1 @@
 DIST Mail-Box-POP3-3.001.tar.gz 30345 SHA256 6381322ec44cf28e2ef693a86fed4cc2d706edd28d073c5d90cb0a5137459cb6 SHA512 b9eda066d9a925192706c504a30e0c43214a696f0c8c06acadaaefa3da73541ae15db5821d50a531ceb2dd09e2ef6d71da50edf0b099ea64cfc5f7cfff58c05e WHIRLPOOL 527d0c465889c49edf201cab3469e231e35f19e057099f44491e1b5c5e0b2aa01dffa5020c7eaa234a4d84d5153525b01048d5d8ccd22f9edf5f8c44b6958003
--- a/dev-perl/Mail-Box-POP3/metadata.xml
+++ b/dev-perl/Mail-Box-POP3/metadata.xml
@ -0,0 +1,16 @@
 <?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">Mail-Box-POP3</remote-id>
    <remote-id type="cpan-module">Mail::Box::POP3</remote-id>
    <remote-id type="cpan-module">Mail::Box::POP3::Message</remote-id>
    <remote-id type="cpan-module">Mail::Box::POP3::Test</remote-id>
    <remote-id type="cpan-module">Mail::Box::POP3s</remote-id>
    <remote-id type="cpan-module">Mail::Transport::POP3</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-perl/Mail-Box/Mail-Box-3.1.0.ebuild
+++ b/dev-perl/Mail-Box/Mail-Box-3.1.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.001
 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 +1,2 @@
 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
--- a/dev-perl/Mail-Box/metadata.xml
+++ b/dev-perl/Mail-Box/metadata.xml
@ -9,16 +9,10 @@
 		<remote-id type="cpan">Mail-Box</remote-id>
 		<remote-id type="cpan-module">Mail::Box</remote-id>
 		<remote-id type="cpan-module">Mail::Box::Collection</remote-id>
 		<remote-id type="cpan-module">Mail::Box::Dbx</remote-id>
 		<remote-id type="cpan-module">Mail::Box::Dbx::Message</remote-id>
 		<remote-id type="cpan-module">Mail::Box::Dir</remote-id>
 		<remote-id type="cpan-module">Mail::Box::Dir::Message</remote-id>
 		<remote-id type="cpan-module">Mail::Box::FastScalar</remote-id>
 		<remote-id type="cpan-module">Mail::Box::File</remote-id>
 		<remote-id type="cpan-module">Mail::Box::File::Message</remote-id>
 		<remote-id type="cpan-module">Mail::Box::IMAP4</remote-id>
 		<remote-id type="cpan-module">Mail::Box::IMAP4::Head</remote-id>
 		<remote-id type="cpan-module">Mail::Box::IMAP4::Message</remote-id>
 		<remote-id type="cpan-module">Mail::Box::Identity</remote-id>
 		<remote-id type="cpan-module">Mail::Box::Locker</remote-id>
 		<remote-id type="cpan-module">Mail::Box::Locker::DotLock</remote-id>
@ -42,108 +36,20 @@
 		<remote-id type="cpan-module">Mail::Box::Message::Destructed</remote-id>
 		<remote-id type="cpan-module">Mail::Box::Net</remote-id>
 		<remote-id type="cpan-module">Mail::Box::Net::Message</remote-id>
 		<remote-id type="cpan-module">Mail::Box::POP3</remote-id>
 		<remote-id type="cpan-module">Mail::Box::POP3::Message</remote-id>
 		<remote-id type="cpan-module">Mail::Box::POP3s</remote-id>
 		<remote-id type="cpan-module">Mail::Box::Parser</remote-id>
 		<remote-id type="cpan-module">Mail::Box::Parser::Perl</remote-id>
 		<remote-id type="cpan-module">Mail::Box::Search</remote-id>
 		<remote-id type="cpan-module">Mail::Box::Search::Grep</remote-id>
 		<remote-id type="cpan-module">Mail::Box::Search::SpamAssassin</remote-id>
 		<remote-id type="cpan-module">Mail::Box::Test</remote-id>
 		<remote-id type="cpan-module">Mail::Box::Thread::Manager</remote-id>
 		<remote-id type="cpan-module">Mail::Box::Thread::Node</remote-id>
 		<remote-id type="cpan-module">Mail::Box::Tie</remote-id>
 		<remote-id type="cpan-module">Mail::Box::Tie::ARRAY</remote-id>
 		<remote-id type="cpan-module">Mail::Box::Tie::HASH</remote-id>
 		<remote-id type="cpan-module">Mail::Message</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Body</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Body::Delayed</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Body::File</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Body::Lines</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Body::Multipart</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Body::Nested</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Body::String</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Convert</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Convert::EmailSimple</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Convert::Html</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Convert::HtmlFormatPS</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Convert::HtmlFormatText</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Convert::MailInternet</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Convert::MimeEntity</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Convert::TextAutoformat</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Dummy</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Field</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Field::AddrGroup</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Field::Address</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Field::Addresses</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Field::Attribute</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Field::Date</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Field::Fast</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Field::Flex</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Field::Full</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Field::Structured</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Field::URIs</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Field::Unstructured</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Head</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Head::Complete</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Head::Delayed</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Head::FieldGroup</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Head::ListGroup</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Head::Partial</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Head::ResentGroup</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Head::SpamGroup</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Head::Subset</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Part</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Replace::MailHeader</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Replace::MailInternet</remote-id>
 		<remote-id type="cpan-module">Mail::Message::TransferEnc</remote-id>
 		<remote-id type="cpan-module">Mail::Message::TransferEnc::Base64</remote-id>
 		<remote-id type="cpan-module">Mail::Message::TransferEnc::Binary</remote-id>
 		<remote-id type="cpan-module">Mail::Message::TransferEnc::EightBit</remote-id>
 		<remote-id type="cpan-module">Mail::Message::TransferEnc::QuotedPrint</remote-id>
 		<remote-id type="cpan-module">Mail::Message::TransferEnc::SevenBit</remote-id>
 		<remote-id type="cpan-module">Mail::Message::Wrapper::SpamAssassin</remote-id>
 		<remote-id type="cpan-module">Mail::Reporter</remote-id>
 		<remote-id type="cpan-module">Mail::Server</remote-id>
 		<remote-id type="cpan-module">Mail::Server::IMAP4</remote-id>
 		<remote-id type="cpan-module">Mail::Server::IMAP4::Fetch</remote-id>
 		<remote-id type="cpan-module">Mail::Server::IMAP4::List</remote-id>
 		<remote-id type="cpan-module">Mail::Server::IMAP4::Search</remote-id>
 		<remote-id type="cpan-module">Mail::Transport</remote-id>
 		<remote-id type="cpan-module">Mail::Transport::Exim</remote-id>
 		<remote-id type="cpan-module">Mail::Transport::IMAP4</remote-id>
 		<remote-id type="cpan-module">Mail::Transport::Mailx</remote-id>
 		<remote-id type="cpan-module">Mail::Transport::POP3</remote-id>
 		<remote-id type="cpan-module">Mail::Transport::Qmail</remote-id>
 		<remote-id type="cpan-module">Mail::Transport::Receive</remote-id>
 		<remote-id type="cpan-module">Mail::Transport::SMTP</remote-id>
 		<remote-id type="cpan-module">Mail::Transport::Send</remote-id>
 		<remote-id type="cpan-module">Mail::Transport::Sendmail</remote-id>
 		<remote-id type="cpan-module">MailBox::Test::01platform::Definition</remote-id>
 		<remote-id type="cpan-module">MailBox::Test::02dist::Definition</remote-id>
 		<remote-id type="cpan-module">MailBox::Test::10reporter::Definition</remote-id>
 		<remote-id type="cpan-module">MailBox::Test::11field::Definition</remote-id>
 		<remote-id type="cpan-module">MailBox::Test::12head::Definition</remote-id>
 		<remote-id type="cpan-module">MailBox::Test::13body::Definition</remote-id>
 		<remote-id type="cpan-module">MailBox::Test::14fieldu::Definition</remote-id>
 		<remote-id type="cpan-module">MailBox::Test::20pparser::Definition</remote-id>
 		<remote-id type="cpan-module">MailBox::Test::30encode::Definition</remote-id>
 		<remote-id type="cpan-module">MailBox::Test::31fgroups::Definition</remote-id>
 		<remote-id type="cpan-module">MailBox::Test::40mbox::Definition</remote-id>
 		<remote-id type="cpan-module">MailBox::Test::41mh::Definition</remote-id>
 		<remote-id type="cpan-module">MailBox::Test::42maildir::Definition</remote-id>
 		<remote-id type="cpan-module">MailBox::Test::43pop3::Definition</remote-id>
 		<remote-id type="cpan-module">MailBox::Test::44imap::Definition</remote-id>
 		<remote-id type="cpan-module">MailBox::Test::45dbx::Definition</remote-id>
 		<remote-id type="cpan-module">MailBox::Test::50message::Definition</remote-id>
 		<remote-id type="cpan-module">MailBox::Test::51folder::Definition</remote-id>
 		<remote-id type="cpan-module">MailBox::Test::52manager::Definition</remote-id>
 		<remote-id type="cpan-module">MailBox::Test::53threads::Definition</remote-id>
 		<remote-id type="cpan-module">MailBox::Test::54search::Definition</remote-id>
 		<remote-id type="cpan-module">MailBox::Test::55locking::Definition</remote-id>
 		<remote-id type="cpan-module">MailBox::Test::60imap::Definition</remote-id>
 		<remote-id type="cpan-module">MailBox::Test::80msgconv::Definition</remote-id>
 		<remote-id type="cpan-module">MailBox::Test::81bodyconv::Definition</remote-id>
 		<remote-id type="cpan-module">Tools</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.390.0.ebuild
+++ b/dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.390.0.ebuild
@ -0,0 +1,48 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 DIST_AUTHOR=PLOBBES
 DIST_VERSION=3.39
 DIST_EXAMPLES=("examples/*")
 inherit perl-module
 DESCRIPTION="IMAP client module for Perl"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="test ntlm md5 ssl zlib"
 PATCHES=(
 	"${FILESDIR}/${DIST_VERSION}-makefilepl.patch"
 )
 PERL_RM_FILES=(
 	"t/quota.t" # Requires imap server config in test.txt
 	"t/basic.t"
 	"t/pod.t"   # Bad author test
 )
 # IO::File, IO::Select, IO::Socket, IO::Socket::INET -> perl-IO
 # Digest::HMAC_MD5 -> Digest-HMAC
 RDEPEND="
 	virtual/perl-Carp
 	virtual/perl-File-Temp
 	>=virtual/perl-IO-1.260.0
 	virtual/perl-Scalar-List-Utils
 	virtual/perl-MIME-Base64
 	>=dev-perl/Parse-RecDescent-1.967.9
 	ntlm? ( dev-perl/Authen-NTLM )
 	md5? (
 		dev-perl/Authen-SASL
 		dev-perl/Digest-HMAC
 		virtual/perl-Digest-MD5
 	)
 	ssl? ( dev-perl/IO-Socket-SSL )
 	zlib? ( virtual/perl-IO-Compress )
 "
 DEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? (
 		virtual/perl-Test-Simple
 	)
 "
--- a/dev-perl/Mail-IMAPClient/Manifest
+++ b/dev-perl/Mail-IMAPClient/Manifest
@ -1,2 +1,3 @@
 DIST Mail-IMAPClient-3.37.tar.gz 188964 SHA256 481df10e0426938dcf6ae641e8e15098ddaeb44ca247772a27b87278f78ba9f3 SHA512 e6baeb880610d55991342fc50acd5bb666a4d94856f4d158172eb5e430aa62296847cb4cec4706398dfbaf7af657ca0024ef92bbb455addd0cd648c47d847fef WHIRLPOOL 7801f9032ad445a0c8994523f5c7bc6455a69b52b16690a00d352575436cc487324f7e1671a808ae84f36af363b521fd752818151dd67c5852da42653398e9db
 DIST Mail-IMAPClient-3.38.tar.gz 190487 SHA256 d0f346d111dba93548ceac1192a993210ffcd5f81f83638ee277607bfacc1a4d SHA512 aa2d4ae43ac221db5b99d20884d34ce41fabdc593cee48e7daf7d7048dd351026231f9a4193044f42eb17c8d303b5af0b924bea17fed27c4d0934ca2935b73f3 WHIRLPOOL 29116d21168eb03db194ba80ede6a50074798cebdd07e8a1f35ecb0e45911af0fd71378662039da325c0a56aa915a7a209254efb3816e50453fc637c151e93e3
 DIST Mail-IMAPClient-3.39.tar.gz 190965 SHA256 b541fdb47d5bca93048bcee69f42ad2cc96af635557ba6a9db1d8f049a434ea3 SHA512 156e5f6682d55f2c112ae5065448f0c502d3e748c4405768152ccccd7d944cf949f7c3fd42f30f40c86337457dea5c037959bf29739e4c413e4b45af2b74c222 WHIRLPOOL 434088beb4482afa5b05ed2f64cc65abc5ae8b1f19e29657a10b04ed82c6294294a34665f6ae5426682f3c946514a2ae507082ce128f0f204a5d8509151aeb08
--- a/dev-perl/Mail-IMAPClient/files/3.39-makefilepl.patch
+++ b/dev-perl/Mail-IMAPClient/files/3.39-makefilepl.patch
@ -0,0 +1,89 @@
 diff -Naur Mail-IMAPClient-3.38/Makefile.PL Mail-IMAPClient-3.38/Makefile.PL
 --- Mail-IMAPClient-3.38/Makefile.PL
 +++ Mail-IMAPClient-3.38/Makefile.PL
@@ -4,39 +4,6 @@
 use 5.008_001;
 -my @missing;
 -my %optional = (
 -    "Authen::NTLM"     => { for => "Authmechanism 'NTLM'" },
 -    "Authen::SASL"     => { for => "Authmechanism 'DIGEST-MD5'" },
 -    "Compress::Zlib"   => { for => "COMPRESS DEFLATE support" },
 -    "Digest::HMAC_MD5" => { for => "Authmechanism 'CRAM-MD5'" },
 -    "Digest::MD5"      => { for => "Authmechanism 'DIGEST-MD5'" },
 -    "IO::Socket::SSL"  => { for => "SSL enabled connections (Ssl => 1)" },
 -    "Test::Pod"        => { for => "Pod tests", ver => "1.00" },
 -);
 -
 -foreach my $mod ( sort keys %optional ) {
 -    my $for = $optional{$mod}->{"for"} || "";
 -    my $ver = $optional{$mod}->{"ver"} || "";
 -    eval "use $mod $ver ();";
 -    push @missing, $mod . ( $for ? " for $for" : "" ) if $@;
 -}
 -
 -# similar message to one used in DBI:
 -if (@missing) {
 -    print( "The following optional modules were not found:",
 -        map( "\n\t" . $_, @missing ), "\n" );
 -
 -    print <<'MSG';
 -Optional modules are available from any CPAN mirror, reference:
 -  http://search.cpan.org/
 -  http://www.perl.com/CPAN/modules/by-module
 -  http://www.perl.org/CPAN/modules/by-module
 -
 -MSG
 -    sleep 3;
 -}
 -
 # HACK: die on broken Parse::RecDescent 1.966002 through 1.967009
 # - rt.cpan.org#74593: Recent changes break Module::ExtractUse and ...
 # - rt.cpan.org#74733: Fails with Parse::RecDescent >= 1.966_002
@@ -94,45 +61,4 @@
     clean => { FILES => 'test.txt' },
 );
 -set_test_data();
 -
 exit 0;
 -
 -###
 -### HELPERS
 -###
 -
 -sub set_test_data {
 -    unless ( -f "lib/Mail/IMAPClient.pm" ) {
 -        warn("ERROR: not in installation directory\n");
 -        return;
 -    }
 -
 -    if ( -s "./test.txt" ) {
 -        print("The file test.txt will be used for extended tests.\n");
 -        return;
 -    }
 -
 -    print <<EOF;
 -
 -(OPTIONAL) For extended tests during 'make test', create a file
 -'test.txt' in the top level directory of this distribution (the same
 -directory as the Makefile.PL, etc.).  This file must contain an IMAP
 -server name or IP (server=...), a user account (user=...), and a
 -password (passed=...).  A port (port=....) and an authentication
 -mechanism to be used (authmechanism=...) can also be specified.
 -
 -Example:
 -
 ---- BEGIN: test.txt ---
 -server=localhost
 -user=mytestuser
 -passed=mypassword
 -port=143
 ---- END: test.txt ---
 -
 -NOTE: When testing is completed, be sure to remove test.txt (either by
 -hand or by 'make clean').
 -
 -EOF
 -}
--- a/dev-perl/Mail-Message/Mail-Message-3.0.0.ebuild
+++ b/dev-perl/Mail-Message/Mail-Message-3.0.0.ebuild
@ -0,0 +1,33 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 DIST_AUTHOR=MARKOV
 DIST_VERSION=3.000
 inherit perl-module
 DESCRIPTION="General Message Object for MIME Messsage Handling"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~x86"
 IUSE="test"
 RDEPEND="
 	dev-perl/TimeDate
 	>=virtual/perl-Encode-2.260.0
 	>=virtual/perl-File-Spec-0.700.0
 	dev-perl/IO-stringy
 	virtual/perl-MIME-Base64
 	>=dev-perl/MIME-Types-1.4.0
 	>=dev-perl/MailTools-2.170.0
 	>=virtual/perl-Scalar-List-Utils-1.130.0
 	>=dev-perl/URI-1.230.0
 	>=dev-perl/User-Identity-0.940.0
 	!!<dev-perl/Mail-Box-3
 "
 DEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? (
 		>=virtual/perl-Test-Simple-0.470.0
 	)
 "
--- a/dev-perl/Mail-Message/Manifest
+++ b/dev-perl/Mail-Message/Manifest
@ -0,0 +1 @@
 DIST Mail-Message-3.000.tar.gz 250208 SHA256 3a70553d4898e783c0ae8645d6bb3c8fa1ed66f997627685a72119b02dd0be1d SHA512 90427e203006d71f2ee4fbb247f7fd2078ba5d4180a2a17f87596cc79909abd6960d3756b862a67d0a53e2f00f185f0b0f90a7ee503e6df7dda41bdc1abae80f WHIRLPOOL 101c2c9ef85613281f7b5d5d72f56d4f0125ad45c3df52569a036b7e8bd4745d4bc981c04d873af4e83e013ce71faacd380f415ca7552c7dd5831634a9029f7e
--- a/Show More
+++ b/Show More
`@ -1,2 +1,2 @@`
	`DIST clamav-unofficial-sigs-3.7.2.tar.gz 38549 SHA256 96e98e6e4434c5950fa9831c6a43236fed7eabae44beded16171305cf3f9bdb9 SHA512 ee07bf521cca229bc85acb887c8e520149955732797a9d220e24f09cb9e89f9bd189ad77dc781c03c60bdaaec2bfa91a6c96cf7a0b689759cddf3ff231b8b0a4 WHIRLPOOL af4925c8a9bb8c09472131f98026b809da13e122a530c4a48614014b8156a259d37303cb1042da98d0bd8b0f4abef3cd7c05f2d549f87e1b7cd533d4a8d4d188`	`DIST clamav-unofficial-sigs-3.7.2.tar.gz 38549 SHA256 96e98e6e4434c5950fa9831c6a43236fed7eabae44beded16171305cf3f9bdb9 SHA512 ee07bf521cca229bc85acb887c8e520149955732797a9d220e24f09cb9e89f9bd189ad77dc781c03c60bdaaec2bfa91a6c96cf7a0b689759cddf3ff231b8b0a4 WHIRLPOOL af4925c8a9bb8c09472131f98026b809da13e122a530c4a48614014b8156a259d37303cb1042da98d0bd8b0f4abef3cd7c05f2d549f87e1b7cd533d4a8d4d188`
	`DIST clamav-unofficial-sigs-5.4.1.tar.gz 115798 SHA256 a6a455086db1ea102d9f714f8604bde1b3bb063c27e5cadd8ca456bf00673538 SHA512 333cbd6db88e634c60cab7477e091a80106d08f1e2a8ea6f0c7feba5c67a0eef09f10d34764c68eea4789cd373cb50b43a639c96f4a0ddabe44a5a0e12c7e50d WHIRLPOOL f851bd935a47270d5ca37449d6251669270c865b753819a6d8e3e5349ac0186eb349792409d4e173e775885da43cfbb7f1af73ed81367f7980fa69ba6c3bbb09`	`DIST clamav-unofficial-sigs-5.6.1.tar.gz 51024 SHA256 5c26410470e1010d0bd167fc8ae75a7035c6c0977f2f0af1da4b004064e43c81 SHA512 a3660abe301e96104393d337ff2b7f73324241bb921d71626e4a6ea4cec39709ce76dbb9432fd048c66441f0acbb1b92fa561397669ffdca98f463d7da8e7402 WHIRLPOOL fac1394ace0ae81ba1b57dab54aef659b8d58716341d5962f07d97fe7487acec3d994d52073b989128adcf2e43991aef277db166048d7bbd328595b2cecdf3ad`
`@ -1 +1,2 @@`
	`DIST tatt-0.3.tar.gz 22527 SHA256 bad1f0f33889aaa5887bab8c80bcbdaa620c379de5ff381ab983ae23d24ac9ed SHA512 822ec8904e452afd2373ca7ff01a05b8020b261acfc02864523a22e91d83dea51a1d2a8c79ec75db38e6de00cb3c06b3799dee261f376ec91d261a9f468aaa19 WHIRLPOOL f9be83b45c3d79e004600fa3e1ecd2d1ab6e6720035f13ab5f0b4a46555c280663e6371fb9ed88ab0de6bbfb4a853a0f07963dbc25f668a3cd8482c369343b90`	`DIST tatt-0.3.tar.gz 22527 SHA256 bad1f0f33889aaa5887bab8c80bcbdaa620c379de5ff381ab983ae23d24ac9ed SHA512 822ec8904e452afd2373ca7ff01a05b8020b261acfc02864523a22e91d83dea51a1d2a8c79ec75db38e6de00cb3c06b3799dee261f376ec91d261a9f468aaa19 WHIRLPOOL f9be83b45c3d79e004600fa3e1ecd2d1ab6e6720035f13ab5f0b4a46555c280663e6371fb9ed88ab0de6bbfb4a853a0f07963dbc25f668a3cd8482c369343b90`
		`DIST tatt-0.4.tar.gz 23397 SHA256 53ed63685187acc55241698dac26a7cadbdf846dfc72709a9d67db65572dc2ef SHA512 57df8cdda9b6711da36e3635182fcfb64a376d7c3a76a29ea0252fc17597defe921d90bf9989f4fc199ab9848fae6fc4f53623140825f79368e90723a5562dd6 WHIRLPOOL a152e6cdee833d892eb0ff1b6c24d107b99ac4b7c92510d230fdbb6e1375825c1294a7008e1e09c496115f6116f3de48a4500dcc3a257998c8ee5bb0a29c08b0`
		`@ -1 +0,0 @@`
			`DIST webkit-sharp-0.3.tar.bz2 88972 SHA256 6633630b6e4834b0f93726570d1c97e884470e3c400ae929cca2f1376b7b959a SHA512 3a70b41a16024d0682328bcd59d7f99f51a0c191d63a96a4c3bd66ea3e8fb7dea1e85b4934ed3d98c5ae15b69b7745c273f78ad94610653e9f669ffaddc20231 WHIRLPOOL 71dc5d23171603b011322e6aa07dd3b77585ee1311c74ca2cc376f4e06f880a51f7fad60a4cacf20ef2905e1afbc21af7a65991c78e0d8dc715abb78fa64b7d5`
`@ -1,2 +1 @@`
	`DIST jal-20031117-src.tar.gz 48793 SHA256 2f1bfd0c9b56a362da8fa5b61af3fd0722bb80e5b89fb12291b5a40e9f21db75 SHA512 0cb6cbd5e80d38dfbf57417b756dbc3bdddb2a28c4cbec292799ee71ac86cff3121f1e09e86f976f6562dafac54835bdd58780e4f1ffe733897b6d6ef053f95e WHIRLPOOL 54e9b1a005e2b10f62bcfd43bf1cf512fc0d0479ad113cfc57e3188f90b23184e1d6340ca56736faf7f309fc88196498652d459c75cbca7e2f76889ed3ac1568`
	`DIST jal-20031117.tar.gz 48793 SHA256 2f1bfd0c9b56a362da8fa5b61af3fd0722bb80e5b89fb12291b5a40e9f21db75 SHA512 0cb6cbd5e80d38dfbf57417b756dbc3bdddb2a28c4cbec292799ee71ac86cff3121f1e09e86f976f6562dafac54835bdd58780e4f1ffe733897b6d6ef053f95e WHIRLPOOL 54e9b1a005e2b10f62bcfd43bf1cf512fc0d0479ad113cfc57e3188f90b23184e1d6340ca56736faf7f309fc88196498652d459c75cbca7e2f76889ed3ac1568`	`DIST jal-20031117.tar.gz 48793 SHA256 2f1bfd0c9b56a362da8fa5b61af3fd0722bb80e5b89fb12291b5a40e9f21db75 SHA512 0cb6cbd5e80d38dfbf57417b756dbc3bdddb2a28c4cbec292799ee71ac86cff3121f1e09e86f976f6562dafac54835bdd58780e4f1ffe733897b6d6ef053f95e WHIRLPOOL 54e9b1a005e2b10f62bcfd43bf1cf512fc0d0479ad113cfc57e3188f90b23184e1d6340ca56736faf7f309fc88196498652d459c75cbca7e2f76889ed3ac1568`
`@ -1 +1,2 @@`
		`DIST jclasslib-3.1.tar.gz 4630493 SHA256 60186b7b613b31eb6260be00c56d28e5cd68ee964b9dc704fd0735db83bfa648 SHA512 5c44043eb30ab32110097ef6b52f459bf4d512db71efc79aae99fdb6b9db740a7be1e6a59f6e3a233a3b303933ed90fe482c6b9c81d76de93af6c9724aad41dc WHIRLPOOL 1a13025507463a148378152d13d2348ecbf08bde13c0bbe9aae4492111e9e90036020561bd8287fdd818fe4522682a61d0791b4c601c79c06b46a1c90a1fa400`
	`DIST jclasslib_unix_3_0.tar.gz 1774938 SHA256 eec6d971b913802904e1f76758ff9b739680489bdaced18543a359308390405c SHA512 0bd46f5a1c837f888d9b570f49085bb04d71e401d89b74880bd4af765cf27493b56e17ff065b155672bf6de6edb14006c619b3afe8bc6c488dc16e2fc97131ab WHIRLPOOL c15bf9a2457b72c517c83109b8cf1c88a4d0343d3f7a82de40e20f63d518ece9f53255181e9e5cf04cae640a663bb10e7c33049bfbbd8c05a792407ae1a2db9b`	`DIST jclasslib_unix_3_0.tar.gz 1774938 SHA256 eec6d971b913802904e1f76758ff9b739680489bdaced18543a359308390405c SHA512 0bd46f5a1c837f888d9b570f49085bb04d71e401d89b74880bd4af765cf27493b56e17ff065b155672bf6de6edb14006c619b3afe8bc6c488dc16e2fc97131ab WHIRLPOOL c15bf9a2457b72c517c83109b8cf1c88a4d0343d3f7a82de40e20f63d518ece9f53255181e9e5cf04cae640a663bb10e7c33049bfbbd8c05a792407ae1a2db9b`
`@ -1,2 +1 @@`
	`DIST jta-1_0_1B-classes.zip 8812 SHA256 5bc89d0a1caecd25e9323144624fd26df4326c84da8658f08f5cc588ee25cca9 SHA512 933530dea0a87ef1229cfada6e7f36d9300c86ae09e9ac13999ebeaa138c6f9ff12b8aa3a762ebafa0218853f0e5897b742807accd8a3b621ec7e1c9052f93bd WHIRLPOOL fcaab3f26cd313db02e80181f431d48f03db4493e41e0f9f7ebd8fc536257377a456a503c58b2ed6dd734911ccf04cedb38695db6b518e94189fe7377bb61fae`
	`DIST jta-1_1-classes.zip 13236 SHA256 6202127f8e3fe63ebbaa8c3ddf455bae862d5563b4c210ea29484df52ce505da SHA512 fb8b76223ccdec0ef97b00d7248d74b6316dd67c570667f3a644d03b05cd28af061a191cf71b6624fd4a4195f7bc107281eb847fc4c0ee4606c85c414da79a14 WHIRLPOOL c6b97d35eb09cd027596594ce009c251cc61014ceacd7d49748eb157ddbec6700eb29d07a4f9fd0d6273652cd83e067fc7f2a4d99e584ad13c7f13c2f8a07271`	`DIST jta-1_1-classes.zip 13236 SHA256 6202127f8e3fe63ebbaa8c3ddf455bae862d5563b4c210ea29484df52ce505da SHA512 fb8b76223ccdec0ef97b00d7248d74b6316dd67c570667f3a644d03b05cd28af061a191cf71b6624fd4a4195f7bc107281eb847fc4c0ee4606c85c414da79a14 WHIRLPOOL c6b97d35eb09cd027596594ce009c251cc61014ceacd7d49748eb157ddbec6700eb29d07a4f9fd0d6273652cd83e067fc7f2a4d99e584ad13c7f13c2f8a07271`
`@ -1,2 +1 @@`
	`DIST sax-2.2.1.zip 372488 SHA256 f9221ba55b3b753cf900ef64dc588a1d6b2716f63440b0f1ab55fe9deb418272 SHA512 af05c14994894f0b6cd860c1d632a1148f43cef824081357c9e4b256e66e0f36ac3cba1838f03322182339f2642b4bf68f707407fba8ee6c2f95d5b8d1267648 WHIRLPOOL 5822d3aba16ccb8bde702f3817090d931c01b6bbb83fc4abf521d3a369599bc4a88707e37db6ef9abb074ddd0119b4b845d7d8c12e6eacd93f382f0acc01d9f2`	`DIST sax-2.2.1.zip 372488 SHA256 f9221ba55b3b753cf900ef64dc588a1d6b2716f63440b0f1ab55fe9deb418272 SHA512 af05c14994894f0b6cd860c1d632a1148f43cef824081357c9e4b256e66e0f36ac3cba1838f03322182339f2642b4bf68f707407fba8ee6c2f95d5b8d1267648 WHIRLPOOL 5822d3aba16ccb8bde702f3817090d931c01b6bbb83fc4abf521d3a369599bc4a88707e37db6ef9abb074ddd0119b4b845d7d8c12e6eacd93f382f0acc01d9f2`
	`DIST sax2r3.zip 372488 SHA256 f9221ba55b3b753cf900ef64dc588a1d6b2716f63440b0f1ab55fe9deb418272 SHA512 af05c14994894f0b6cd860c1d632a1148f43cef824081357c9e4b256e66e0f36ac3cba1838f03322182339f2642b4bf68f707407fba8ee6c2f95d5b8d1267648 WHIRLPOOL 5822d3aba16ccb8bde702f3817090d931c01b6bbb83fc4abf521d3a369599bc4a88707e37db6ef9abb074ddd0119b4b845d7d8c12e6eacd93f382f0acc01d9f2`
`@ -1 +1 @@`
	`DIST saxpath-1.0.tar.gz 2166023 SHA256 90c07abb3e3f09c398c02d84b44b651aa59d724aa6fabf45aa44a2365a6725c1 SHA512 aafd5e3d6d135f0916ebe3e4804bbbeb9c255b23210a46474716485ce2da0ee81fad4313a38951865104d2eaf1fadb81efd00677431b0294b1d01b7a729cee9e WHIRLPOOL 18b2150261a2a1bcbb34ecf07b38c9276d5610be1f1dd16b3de7c8c5de9c712dee44a896d5c9cfcb5dc9152342b5a7c2b11f70243ef74c2531ba3aaf6706a35b`	`DIST saxpath-1.0.jar 36257 SHA256 2177b43d45b3ddbebb5f9a94f6558b12119409e12f515f7184c6870929d6fa50 SHA512 53e7781ea3efc1e16a839c9137fe7ab683e7a9e40283f0f5aa7afc1de75c4dc366a91a93ae5f256fc24e78fd3a4dcdcde6631bfa0d926b7dd0ddacd5c240ca96 WHIRLPOOL f43b84bf3d0e3adb8d936c80b981232b720b22808828bd3bf3b4eb68dcbc02cee98f791cc137955bffa4fe04a01d55566a31edbc8a2dd60786a2f883ddbaafc2`
		`@ -1,2 +0,0 @@`
			`DIST engine_pkcs11-0.1.8.tar.gz 320799 SHA256 de7d7e41e7c42deef40c53e10ccc3f88d2c036d6656ecee7e82e8be07b06a2e5 SHA512 00fa7cf1e44544267248b17669f69a3d91b8e3008da8a8d70004d8ed87543eb75b06c4a9f028f9aee157f54110acadf40d2c6ff3835eae4cf0c29ac819557dc2 WHIRLPOOL c2121466980c9fb425e1f6ca53dde2b055fa833c3f42494dc2fc6f7a0468aa84d14cacc1ff2bd8319f54eb336ae79b3b442f33406ff275074162e1b274beff7a`
			`DIST engine_pkcs11-0.2.2.tar.gz 347122 SHA256 eeec81e63741f5ad1ee28f9d1e405512446674618b5422ac7a75f16e6f438d50 SHA512 877eab21e9e31853e504e4a222e18f13a8020de724338a8af4adfc840ec55c610b35dbe455b4b59a170ff9b829610ec9bc404b10d873d17b0246c59b178ebe44 WHIRLPOOL d0f8d8572544893f4c7d93fea5016bfd3be66e7fcf030a9889b806efe6b156a2075dbbab3c462576908812bcd718562aac609049012c6eee74e11315d97670ca`
`@ -1 +1,2 @@`
	`DIST CGI-Compile-0.21.tar.gz 20910 SHA256 ed2c12e12ad3bde9d0a73344851692982c0c05d0650fa0c03df66f63c0977838 SHA512 0b26fbe4a38645df3aeae03647292125210147321ed9552bbd871824915fabaafdac8601667bddfb73038b7f096d19e1ba7a00acaa5dc28865c1f97247ad5e64 WHIRLPOOL 74b51dd793eee9a584519dfc9eadb6434445f371d6458f06a0fe811383cd593c5a055aa02c1cf261e729b6ce913dfea961b1ff8793cd325536056e25ad13cdcd`	`DIST CGI-Compile-0.21.tar.gz 20910 SHA256 ed2c12e12ad3bde9d0a73344851692982c0c05d0650fa0c03df66f63c0977838 SHA512 0b26fbe4a38645df3aeae03647292125210147321ed9552bbd871824915fabaafdac8601667bddfb73038b7f096d19e1ba7a00acaa5dc28865c1f97247ad5e64 WHIRLPOOL 74b51dd793eee9a584519dfc9eadb6434445f371d6458f06a0fe811383cd593c5a055aa02c1cf261e729b6ce913dfea961b1ff8793cd325536056e25ad13cdcd`
		`DIST CGI-Compile-0.22.tar.gz 21160 SHA256 f5094e9c6b793e3168cb621f1f661f8e1abb4f141761e0b79a0859bd5e5bccaf SHA512 58be714bd25975fbb66e4c83c197fa3c17219327859d965011706fda96d5c2f208831e52368c0b4b8ef6b0f462b9c8ea216d94d7ef30e904e21b818b134cc5b7 WHIRLPOOL 6b799318c95f50bda37c78b7579d0b2d699ae1f7a9b965db04bde56c7bf15d6dbcb2d924bf1772ff66595399643a1428225e8670295229174c204b8efe909202`