Sync with portage [Sun Jun 11 18:18:05 MSK 2017].

7 years ago · ab269b86ef
parent 45d95a1177
commit ab269b86ef
1085 changed files with 4386 additions and 7395 deletions
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@ -1 +1,2 @@
 DIST KeePass-2.35-Source.zip 4840873 SHA256 5faad9381af2f9d808d65ee3d880ff3bca9352c7ce886fea95d54f9169e863df SHA512 9f9bb0875c3261e004f655356e8302858afebb7d41a4e4619affaa5e8e5375ffe4fc2b251db10d1d18ef94e07d60dd9bd8812ecedcd5de4c4fbe641c6a37dede WHIRLPOOL db1d270ac5402021add60739ca4916d9dd81999c53b095d143a34a2886f47c354170e41fee63027be83866c541022c79c3c21111a501cd51bafb972e5fe277e2
+DIST KeePass-2.36-Source.zip 5063221 SHA256 de7e3e9d9bedab13e4d66b0ee941b2ebedaa08d8090f7cd78bd0fc019187d8c8 SHA512 16d51ed6bc437172765f69d1d67862afe7219a0898d13b4609198bbd7b5107620f1be418f5ea6ba23a5e3c7ca12d45ba3f0f3778c516eea6b2b953bc291cfe41 WHIRLPOOL 1d9fbf662757e09c4854010da9f6960fe4bf794eb694b37a9f63d813c1e1d1471257a66f01eac761fed5b06831f659cb81f11eba8858ee4e128cd578a19fcae8
--- a/app-admin/keepass/files/keepass-2.36-xsl-path-detection.patch
+++ b/app-admin/keepass/files/keepass-2.36-xsl-path-detection.patch
@ -0,0 +1,43 @@
+KeePass looks for some resources (XSL files) in the executable directory,
+however under UNIX system this not a good idea, so we look into the
+CommonApplicationData SpecialFolder, which usually maps to "/usr/share/".
+So the final search path should be "/usr/share/KeePass/XSL/".
+
+--- a/KeePass/forms/AboutForm.cs
+++ b/KeePass/Forms/AboutForm.cs
+@@ -31,9 +31,11 @@
+ using KeePass.Resources;
+ using KeePass.UI;
+ using KeePass.Util;
+using KeePass.Native;
+ 
+ using KeePassLib;
+ using KeePassLib.Utility;
+using KeePassLib.Native;
+ 
+ namespace KeePass.Forms
+ {
+@@ -98,8 +100,21 @@
+ 			m_lvComponents.Items.Add(lvi);
+ 
+ 			lvi = new ListViewItem(KPRes.XslStylesheetsKdbx);
+-			string strPath = WinUtil.GetExecutable();
+-			strPath = UrlUtil.GetFileDirectory(strPath, true, false);
+
+			string strPath;
+			if (NativeLib.IsUnix())
+			{
+				strPath = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData);
+				strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);
+				strPath += PwDefs.ShortProductName.ToLower();
+				strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);
+			}
+			else
+			{
+				strPath = WinUtil.GetExecutable();
+				strPath = UrlUtil.GetFileDirectory(strPath, true, false);
+			}
+
+ 			strPath += AppDefs.XslFilesDir;
+ 			strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);
+ 			bool bInstalled = File.Exists(strPath + AppDefs.XslFileHtmlFull);
--- a/app-admin/keepass/keepass-2.36.ebuild
+++ b/app-admin/keepass/keepass-2.36.ebuild
@ -0,0 +1,116 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils xdg-utils
+
+MY_PN="KeePass"
+DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
+HOMEPAGE="http://keepass.info/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aot"
+
+COMMON_DEPEND="dev-lang/mono"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-dotnet/libgdiplus[cairo]
+"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}/${PN}-2.36-xsl-path-detection.patch" )
+
+src_prepare() {
+	# KeePass looks for some XSL files in the same folder as the executable,
+	# we prefer to have it in /usr/share/KeePass. Apply patch using base function.
+	# This XSL file will not be upstreamed since the KeePass creator said that
+	# including this patch would break the Portable USB version of KeePass
+	# (which keeps/looks for xsl files in its own folder)
+	default
+
+	# New Mono Prep Script until keepass 2.36+ comes out.
+	# This script has been upstreamed, still waiting for final confirmation.
+	local newMonoPrepScript="${FILESDIR}/keepass-2.35-new-monoprep-script.sh"
+
+	# Switch into build dir so the mono prepration script works correctly
+	cd Build || die
+	cp -f "${newMonoPrepScript}" PrepMonoDev.sh
+	source PrepMonoDev.sh || die
+	cd ../ || die
+}
+
+src_compile() {
+	# Build with Release target
+	xbuild /target:KeePass /property:Configuration=Release || die
+
+	# Run Ahead Of Time compiler on the binary
+	if use aot; then
+		cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
+		mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
+	fi
+}
+
+src_install() {
+	# Wrapper script to launch mono
+	make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
+
+	# Some XSL files
+	insinto "/usr/share/${PN}/XSL"
+	doins Ext/XSL/*
+
+	insinto "/usr/$(get_libdir)/${PN}/"
+	exeinto "/usr/$(get_libdir)/${PN}/"
+
+	doins Ext/KeePass.exe.config
+
+	# Default configuration, simply says to use user-specific configuration
+	doins Ext/KeePass.config.xml
+
+	# The actual executable
+	doexe Build/KeePass/Release/KeePass.exe
+
+	# Copy the AOT compilation result
+	if use aot; then
+		doexe Build/KeePass/Release/KeePass.exe.so
+	fi
+
+	# Prepare the icons
+	newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
+	newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
+
+	# Create a desktop entry and associate it with the KeePass mime type
+	make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;"
+
+	# MIME descriptor for .kdbx files
+	insinto /usr/share/mime/packages/
+	doins "${FILESDIR}/${PN}.xml"
+
+	# sed, because patching this really sucks
+	sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass"
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	if ! has_version x11-misc/xdotool ; then
+		elog "Optional dependencies:"
+		elog "	x11-misc/xdotool (enables autotype/autofill)"
+	fi
+
+	elog "Some systems may experience issues with copy and paste operations."
+	elog "If you encounter this, please install x11-misc/xsel."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@ -1,6 +1,3 @@
 DIST supervisor-3.1.3.tar.gz 391529 SHA256 e32c546fe8d2a6e079ec4819c49fd24534d4075a58af39118d04367918b3c282 SHA512 40795bfd1aee3eba9e51b6dc1bfcff20c42c0a42ca7ceecc35c428f7840d5d631303b7f0c4eee85375296fd4e9a48f6b405a87caf038f8ffbfe227b5160e7aa5 WHIRLPOOL da8f41907857c46633e93e1806449babd9230994a528c73946276c10387e380763b7b9fb884bb3376537d6eb55428e5873ed8e9a11cd410a3d6c8d7593907552
-DIST supervisor-3.2.1.tar.gz 410461 SHA256 d6b54903aab4214664b6f2c6400f673bee3e21aec7b14d08940ed431a3ead630 SHA512 a4fa8b1729a578c36c989e91a87c0ff4d2e5487b1beb58bd0695729553b5005cf4a282c6a193330c5b352d2467597bae330a28d6e42305c8108593fbf24b1b80 WHIRLPOOL 36f798f87a73e76b8cd79d4c417a64246e77b3114142a82fc322f302deb285f625f6a1bab738cb437116665b6172a1b643fa8c765e57591500c53ed6823b3372
-DIST supervisor-3.2.2.tar.gz 410884 SHA256 67b07b75bdf4529af0ed99f3940bac73d8bcdd8acb1b7cadb7314152e73b8c5f SHA512 2a4beba2bb707ce0ec90a80e212d7edc5e3a74e36675bb483100d97f75e2826538c3bf604faf07fe435e7f4c89608694a22f59293f272ea1e03f8859c0bf9da2 WHIRLPOOL 48795b0e61f9c7a295c0a807db81362d00012a91c3f37f4d2ccfa4f6c171d89219ec24c74e1ea53885353c2ae55c208ba6b6441345e89379c6159145f889a4de
-DIST supervisor-3.2.3.tar.gz 411342 SHA256 3d6f0304c8ce74ab2100dfc4ab0f70050568504216f9508a81b8ed269aec9705 SHA512 53ced6e918aaf4cf780787378cf1559579c66760dc85fe07fe42554d42434ed01dc7f36b4b59bb3f56064523a51fe9f9b509bfc5d83c2306e2dcb523070c989a WHIRLPOOL 03d76d41a3c809305754e13087c183748a4c321b5e0ddf2b19a4869bffc457611946524749a80b33ee965dd52c9b9aa50212e669d87285c3201b736034b51a11
-DIST supervisor-3.3.0.tar.gz 416329 SHA256 3176fb8a78c60164020e252e4a2b50b039cfec1f410b4562a843b66186188652 SHA512 cbb622522dde2bebfa98ae1eb47d747cc8e041b1a67b7708a9f1ddd50e2940af4e39fa859c02f4c431429896eb63d5be88b199921c68846ec774baad13244bb0 WHIRLPOOL 4ad6947c5ea4043785c7bd10d426c6d11ebac97e37622c0381d1f2cf62e41ae40301f48f340c2e2cfe28a24f28a6bac13ce8bc9e656b736e099725257384ad3a
 DIST supervisor-3.3.1.tar.gz 415246 SHA256 fc3af22e5a7af2f6c3be787acf055c1c17777f5607cd4dc935fe633ab97061fd SHA512 e67d4e7b01f6f98a595e7524c5318e780b422a7f8f932f205c6a4d74c3c9e058b265b1732e944e5b467daa6ceffde7d1aae1f1af12c2b7c53728739edb10f740 WHIRLPOOL 744fd11df897ac25839138ce12bf194682b4d0576396b692ef2befecdffb658ed9c2a47aa2248793b082c674cb9a3dc39c0c38127e4a2da74028fb8606500336
+DIST supervisor-3.3.2.tar.gz 417348 SHA256 bbb870f5b59c5c4fd79f711553e343158b2c64688997a23a1bcb2ce643f57771 SHA512 959f045d8da5a263a6990fdc4a93154684c74cca5f49aeb733b86da046a8a3a56981062d16f0ab8177c0e0bb41f137c62e1ae6a52582e76bbe0adb2b8185202c WHIRLPOOL 2cd1bae59d187d9623089a4c9bcc11773a7fd371fc8725b34b28cd5b342391ddf92dd1c3d77f7eed53ab0209fd611fd3ce0e9b15e108b422189620d97cb37658
--- a/app-admin/supervisor/supervisor-3.2.2.ebuild
+++ b/app-admin/supervisor/supervisor-3.2.2.ebuild
@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )	# py2 only
-# xml.etree.ElementTree module required.
-PYTHON_REQ_USE="xml"
-
-inherit distutils-r1
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="A system for controlling process state under UNIX"
-HOMEPAGE="http://supervisord.org/ https://pypi.python.org/pypi/supervisor"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="repoze ZPL BSD HPND GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-# ALL versions of meld3 match to >=meld3-0.6.5
-RDEPEND="dev-python/meld3[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-python_compile_all() {
-	# Somehow the test phase is called and run on invoking a doc build; harmless
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	newinitd "${FILESDIR}/init.d-r1" supervisord
-	newconfd "${FILESDIR}/conf.d" supervisord
-	use doc && local HTML_DOCS=( docs/.build/html/. )
-	distutils-r1_python_install_all
-}
--- a/app-admin/supervisor/supervisor-3.2.3.ebuild
+++ b/app-admin/supervisor/supervisor-3.2.3.ebuild
@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )	# py2 only
-# xml.etree.ElementTree module required.
-PYTHON_REQ_USE="xml"
-
-inherit distutils-r1
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="A system for controlling process state under UNIX"
-HOMEPAGE="http://supervisord.org/ https://pypi.python.org/pypi/supervisor"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="repoze ZPL BSD HPND GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-# ALL versions of meld3 match to >=meld3-0.6.5
-RDEPEND="dev-python/meld3[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-python_compile_all() {
-	# Somehow the test phase is called and run on invoking a doc build; harmless
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	newinitd "${FILESDIR}/init.d-r1" supervisord
-	newconfd "${FILESDIR}/conf.d" supervisord
-	use doc && local HTML_DOCS=( docs/.build/html/. )
-	distutils-r1_python_install_all
-}
--- a/app-admin/supervisor/supervisor-3.3.0.ebuild
+++ b/app-admin/supervisor/supervisor-3.3.0.ebuild
@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )	# py2 only
-# xml.etree.ElementTree module required.
-PYTHON_REQ_USE="xml"
-
-inherit distutils-r1
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="A system for controlling process state under UNIX"
-HOMEPAGE="http://supervisord.org/ https://pypi.python.org/pypi/supervisor"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="repoze ZPL BSD HPND GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-# ALL versions of meld3 match to >=meld3-0.6.5
-RDEPEND="dev-python/meld3[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-python_compile_all() {
-	# Somehow the test phase is called and run on invoking a doc build; harmless
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	newinitd "${FILESDIR}/init.d-r1" supervisord
-	newconfd "${FILESDIR}/conf.d" supervisord
-	use doc && local HTML_DOCS=( docs/.build/html/. )
-	distutils-r1_python_install_all
-}
--- a/app-admin/supervisor/supervisor-3.3.2.ebuild
+++ b/app-admin/supervisor/supervisor-3.3.2.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI="5"
+EAPI=6

 PYTHON_COMPAT=( python2_7 )	# py2 only
 # xml.etree.ElementTree module required.
@ -20,17 +20,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"

-# ALL versions of meld3 match to >=meld3-0.6.5
-RDEPEND="dev-python/meld3[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND="
+	dev-python/meld3[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"

 S="${WORKDIR}/${PN}-${MY_PV}"

 python_compile_all() {
-	# Somehow the test phase is called and run on invoking a doc build; harmless
 	use doc && emake -C docs html
 }

--- a/app-arch/bsdsfv/bsdsfv-1.18-r1.ebuild
+++ b/app-arch/bsdsfv/bsdsfv-1.18-r1.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-inherit eutils toolchain-funcs
-
-DESCRIPTION="all-in-one SFV checksum utility"
-HOMEPAGE="http://bsdsfv.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa m68k ppc s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-64bit.patch
-}
-
-src_compile() {
-	emake STRIP=true CC=$(tc-getCC) || die "emake failed"
-}
-
-src_install() {
-	dobin bsdsfv || die "dobin failed"
-	dodoc README MANUAL || die "dodoc failed"
-}
--- a/app-backup/cdbkup/cdbkup-1.0-r2.ebuild
+++ b/app-backup/cdbkup/cdbkup-1.0-r2.ebuild
@ -23,6 +23,7 @@ RDEPEND="${DEPEND}
 src_prepare() {
 	default
 	sed -i -e "s:doc/cdbkup:doc/${P}:" Makefile.in || die
+	sed -i -e 's/make /$(MAKE) /' Makefile.in || die
 }

 src_configure() {
--- a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r1.ebuild
+++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r1.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A set of tools for DVD+RW/-RW drives"
-HOMEPAGE="http://fy.chalmers.se/~appro/linux/DVD+RW/"
-SRC_URI="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="virtual/cdrtools"
-DEPEND="${RDEPEND}
-	sys-devel/m4"
-
-src_prepare() {
-	# Linux compiler flags only include -O2 and are incremental
-	sed -i '/FLAGS/s:-O2::' Makefile.m4
-
-	epatch "${FILESDIR}"/${PN}-7.0-sysmacros.patch
-	# Fix compilation when DFORTIFY_SOURCE=2
-	# https://bugs.gentoo.org/257360
-	# https://bugzilla.redhat.com/show_bug.cgi?id=426068
-	epatch "${FILESDIR}"/${PN}-7.0-wctomb.patch
-	epatch "${FILESDIR}"/${PN}-7.0-glibc2.6.90.patch
-	# Allow burning small images on dvd-dl media.
-	# Patch snatched from Fedora, obviously correct.
-	epatch "${FILESDIR}"/${PN}-7.0-dvddl.patch
-	# Exit with non-zero status when child process does.
-	# https://bugzilla.redhat.com/show_bug.cgi?id=243036
-	epatch "${FILESDIR}"/${PN}-7.0-wexit.patch
-}
-
-src_compile() {
-	emake SHELL="${EPREFIX}"/bin/bash CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
-}
-
-src_install() {
-	emake SHELL="${EPREFIX}"/bin/bash prefix="${ED}/usr" install || die
-	dohtml index.html
-}
-
-pkg_postinst() {
-	elog "When you run growisofs if you receive:"
-	elog "unable to anonymously mmap 33554432: Resource temporarily unavailable"
-	elog "error message please run 'ulimit -l unlimited'"
-}
--- a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-dvddl.patch
+++ b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-dvddl.patch
@ -1,13 +0,0 @@
--- ./growisofs_mmc.cpp.joe	2006-04-27 20:45:00.788446635 +0200
-+++ ./growisofs_mmc.cpp	2006-04-27 20:46:01.666824300 +0200
-@@ -1412,9 +1412,7 @@
-     blocks += 15, blocks &= ~15;
- 
-     if (blocks <= split)
-	fprintf (stderr,":-( more than 50%% of space will be *wasted*!\n"
-			"    use single layer media for this recording\n"),
-	exit (FATAL_START(EMEDIUMTYPE));
-+	fprintf (stderr,":-? more than 50%% of space will be *wasted*!\n");
- 
-     blocks /= 16;
-     blocks += 1;
--- a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wctomb.patch
+++ b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wctomb.patch
@ -1,11 +0,0 @@
--- transport.hxx~	2008-03-25 21:24:47.000000000 -0400
-+++ transport.hxx	2008-03-25 21:25:36.000000000 -0400
-@@ -116,7 +116,7 @@
- extern "C" char *plusminus_locale()
- { static class __plusminus {
-     private:
-	char str[4];
-+	char str[MB_LEN_MAX];
-     public:
- 	__plusminus()	{   setlocale(LC_CTYPE,ENV_LOCALE);
- 			    int l = wctomb(str,(wchar_t)(unsigned char)'±');
--- a/app-emacs/lyskom-elisp-client/Manifest
+++ b/app-emacs/lyskom-elisp-client/Manifest
@ -1 +1,2 @@
 DIST lyskom-elisp-client-0.48_p20131231.tar.xz 888212 SHA256 d34ebefc299942ae3990f4d309ae17bef847b5e546482bbfe6b5cdd78a0c55b7 SHA512 124dc45194d68588535e134acae9de9b19484b568c43d2eb49d3c4e8ee923e0baf64a634181a3238f34cf59a98a5a1e92e988519d26e8f3c3a0e867f500d53e9 WHIRLPOOL f13addd5561a86f257def968b5a7d73433e1d53bde0452dcc6bbfe41381eb977fa1da398eac05da1c113c8c82c59a4db2c62ba4825fb83db1f548bdb54dc6f04
+DIST lyskom-elisp-client-0.48_p20161231.tar.xz 889464 SHA256 5c8c932dcb7d8068b574dc5812dd71f1ce277c00ce3b891bbec210245ad148b7 SHA512 f412a0b1b9f71be26ac511f66ba5215e757287baa668ce71802802eb13f907137fe27a96614c58abac510104c1d9558cf9b62b3bf8e598c11b4fa3bc33269f81 WHIRLPOOL 0fcf0ebc581a7d0a973905c4ba5c4b3a6f904fdd7a3ffc553fce8fe0edf76d3ab985e83245b11f260d0ece7af03f762cb4e568c9e87d954e8037283d3c42017c
--- a/app-emacs/lyskom-elisp-client/files/lyskom-elisp-client-0.48_p20161231-no-git.patch
+++ b/app-emacs/lyskom-elisp-client/files/lyskom-elisp-client-0.48_p20161231-no-git.patch
@ -0,0 +1,20 @@
+--- lyskom-elisp-client-orig/src/Makefile
+++ lyskom-elisp-client/src/Makefile
+@@ -41,7 +41,7 @@
+ # Also remember to change version number in ../doc/Makefile!
+ LASTRELEASE = 0.48
+ NEXTRELEASE = 0.49
+-CLIENTVERSION = $(shell (git describe --exact-match --tags HEAD 2>/dev/null || git describe --tags --match 'v*' --dirty) | sed -e 's/^v//' -e 's/-/-devbuild-/')
+CLIENTVERSION = unknown
+ 
+ ######################################################################
+ 
+@@ -155,7 +155,7 @@
+ 
+ version.el: version.el.in Makefile $(HEADER1) $(HEADER2) $(LANGUAGE-EL) $(SOURCES)
+ 	rm -f $@
+-	sed "s/@@CLIENTVERSION@@/$(LASTRELEASE) (`date +%Y-%m-%d`; Git `git rev-parse --short HEAD``git diff --quiet HEAD||echo '*'`)/g" <$< >$@
+	sed "s/@@CLIENTVERSION@@/$(LASTRELEASE) (@@DATE@@; Git *)/g" <$< >$@
+ 	chmod 444 $@
+ 
+ version.el-release: version.el.in Makefile $(HEADER1) $(HEADER2) $(LANGUAGE-EL) $(SOURCES)
--- a/app-emacs/lyskom-elisp-client/lyskom-elisp-client-0.48_p20161231.ebuild
+++ b/app-emacs/lyskom-elisp-client/lyskom-elisp-client-0.48_p20161231.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Elisp client for the LysKOM conference system"
+HOMEPAGE="http://www.lysator.liu.se/lyskom/klienter/emacslisp/index.en.html"
+# snapshot of git://git.lysator.liu.se/${PN}/${PN}.git
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="l10n_sv"
+
+S="${WORKDIR}/${PN}"
+ELISP_PATCHES="${P}-no-git.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+	local d=${PV#*_p}
+	sed -i "s/@@DATE@@/${d:0:4}-${d:4:2}-${d:6:2}/" src/Makefile || die
+}
+
+src_compile() {
+	emake -C src EMACS=emacs
+	# Info page is in Swedish only
+	use l10n_sv && emake -C doc elisp-client
+}
+
+src_install() {
+	elisp-install ${PN} src/lyskom.{el,elc}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc src/{ChangeLog*,README,TODO} doc/NEWS*
+	use l10n_sv && doinfo doc/elisp-client
+
+	DOC_CONTENTS="If you prefer an English language environment, add the
+		following line to your ~/.emacs file:
+		\n\t(setq-default kom-default-language 'en)"
+	readme.gentoo_create_doc
+}
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.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

 inherit cannadic eutils multilib
@ -22,7 +22,7 @@ DEPEND=">=sys-apps/sed-4
 		app-text/ghostscript-gpl
 		>=dev-texlive/texlive-langcjk-2010
 		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-genericrecommended
+		|| ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericrecommended )
 		dev-texlive/texlive-latexrecommended
 	)"
 RDEPEND=""
--- a/app-misc/grc/grc-1.11-r1.ebuild
+++ b/app-misc/grc/grc-1.11-r1.ebuild
--- a/app-misc/vcp/vcp-2.2-r2.ebuild
+++ b/app-misc/vcp/vcp-2.2-r2.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://members.iinet.net.au/~lynx/${PN}/${P}.tar.gz"

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

 DEPEND="sys-libs/ncurses:0="
 RDEPEND="${DEPEND}"
--- a/app-office/ledger/ledger-3.1.1.ebuild
+++ b/app-office/ledger/ledger-3.1.1.ebuild
@ -37,10 +37,7 @@ DEPEND="
 	dev-libs/utfcpp
 	doc? (
 		sys-apps/texinfo
-		|| (
-			>=dev-texlive/texlive-plainextra-2013
-			dev-texlive/texlive-texinfo
-		)
+		virtual/texi2dvi
 		dev-texlive/texlive-fontsrecommended
 	)
 "
--- a/app-text/atril/atril-1.12.2-r4.ebuild
+++ b/app-text/atril/atril-1.12.2-r4.ebuild
@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Atril document viewer for MATE"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscript t1lib tiff xps"
+
+REQUIRED_USE="t1lib? ( dvi )
+	!gtk3? ( !epub )" #608604
+
+RDEPEND=">=app-text/poppler-0.16:0=[cairo]
+	app-text/rarian:0
+	dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libxml2-2.5:2
+	>=mate-base/mate-desktop-1.9[gtk3(-)=]
+	sys-libs/zlib:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	>=x11-libs/libSM-1:0
+	x11-libs/libX11:0
+	>=x11-libs/cairo-1.9.10:0
+	x11-libs/pango:0
+	caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] )
+	djvu? ( >=app-text/djvu-3.5.17:0 )
+	dvi? (
+		virtual/tex-base:0
+		t1lib? ( >=media-libs/t1lib-5:5 )
+	)
+	epub? ( dev-libs/mathjax )
+	gnome-keyring? ( >=app-crypt/libsecret-0.5:0 )
+	!gtk3? (
+		>=x11-libs/gtk+-2.24.0:2[introspection?]
+	)
+	gtk3? (
+		>=x11-libs/gtk+-3.0:3[introspection?]
+		epub? ( >=net-libs/webkit-gtk-2.4.3:4 )
+	)
+	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
+	postscript? ( >=app-text/libspectre-0.2:0 )
+	tiff? ( >=media-libs/tiff-3.6:0 )
+	xps? ( >=app-text/libgxps-0.2.0:0 )
+	!!app-text/mate-document-viewer"
+
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1:*
+	virtual/pkgconfig:*
+	sys-devel/gettext:*"
+
+# Tests use dogtail which is not available on Gentoo.
+RESTRICT="test"
+
+src_configure() {
+	# Passing --disable-help would drop offline help, that would be inconsistent
+	# with helps of the most of GNOME apps that doesn't require network for that.
+	mate_src_configure \
+		--disable-tests \
+		--enable-comics \
+		--enable-pdf \
+		--enable-pixbuf \
+		--enable-previewer \
+		--enable-thumbnailer \
+		--with-matedesktop \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable caja) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_enable epub) \
+		$(use_enable introspection) \
+		$(use_enable postscript ps) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps)
+}
--- a/app-text/atril/atril-1.14.2-r1.ebuild
+++ b/app-text/atril/atril-1.14.2-r1.ebuild
@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Atril document viewer for MATE"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscript t1lib tiff xps"
+
+REQUIRED_USE="t1lib? ( dvi )
+	!gtk3? ( !epub )" #608604
+
+COMMON_DEPEND=">=app-text/poppler-0.16:0=[cairo]
+	dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libxml2-2.5:2
+	>=mate-base/mate-desktop-1.9[gtk3(-)=]
+	sys-libs/zlib:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	>=x11-libs/libSM-1:0
+	x11-libs/libX11:0
+	>=x11-libs/cairo-1.9.10:0
+	x11-libs/pango:0
+	caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] )
+	djvu? ( >=app-text/djvu-3.5.17:0 )
+	dvi? (
+		virtual/tex-base:0
+		t1lib? ( >=media-libs/t1lib-5:5 )
+	)
+	epub? ( dev-libs/mathjax )
+	gnome-keyring? ( >=app-crypt/libsecret-0.5:0 )
+	!gtk3? (
+		>=x11-libs/gtk+-2.24.0:2[introspection?]
+	)
+	gtk3? (
+		>=x11-libs/gtk+-3.0:3[introspection?]
+		epub? ( >=net-libs/webkit-gtk-2.4.3:4 )
+	)
+	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
+	postscript? ( >=app-text/libspectre-0.2:0 )
+	tiff? ( >=media-libs/tiff-3.6:0 )
+	xps? ( >=app-text/libgxps-0.2.0:0 )
+	!!app-text/mate-document-viewer"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/rarian:0
+	app-text/yelp-tools:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1:*
+	virtual/pkgconfig:*
+	sys-devel/gettext:*"
+
+# Tests use dogtail which is not available on Gentoo.
+RESTRICT="test"
+
+src_configure() {
+	# Passing --disable-help would drop offline help, that would be inconsistent
+	# with helps of the most of GNOME apps that doesn't require network for that.
+	mate_src_configure \
+		--disable-tests \
+		--enable-comics \
+		--enable-pdf \
+		--enable-pixbuf \
+		--enable-previewer \
+		--enable-thumbnailer \
+		--with-matedesktop \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable caja) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_enable epub) \
+		$(use_enable introspection) \
+		$(use_enable postscript ps) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps)
+}
--- a/app-text/atril/atril-1.16.1-r1.ebuild
+++ b/app-text/atril/atril-1.16.1-r1.ebuild
@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Atril document viewer for MATE"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscript t1lib tiff xps"
+
+REQUIRED_USE="t1lib? ( dvi )
+	!gtk3? ( !epub )" #608604
+
+COMMON_DEPEND=">=app-text/poppler-0.22:0=[cairo]
+	dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	>=x11-libs/libSM-1:0
+	x11-libs/libX11:0
+	>=x11-libs/cairo-1.9.10:0
+	x11-libs/pango:0
+	caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] )
+	djvu? ( >=app-text/djvu-3.5.17:0 )
+	dvi? (
+		virtual/tex-base:0
+		t1lib? ( >=media-libs/t1lib-5:5 )
+	)
+	epub? ( dev-libs/mathjax )
+	gnome-keyring? ( >=app-crypt/libsecret-0.5:0 )
+	!gtk3? (
+		>=x11-libs/gtk+-2.24.0:2[introspection?]
+	)
+	gtk3? (
+		>=x11-libs/gtk+-3.0:3[introspection?]
+		epub? ( >=net-libs/webkit-gtk-2.4.3:4 )
+	)
+	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
+	postscript? ( >=app-text/libspectre-0.2:0 )
+	tiff? ( >=media-libs/tiff-3.6:0 )
+	xps? ( >=app-text/libgxps-0.2.1:0 )
+	!!app-text/mate-document-viewer"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/rarian:0
+	app-text/yelp-tools:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1:*
+	virtual/pkgconfig:*
+	sys-devel/gettext:*"
+
+# Tests use dogtail which is not available on Gentoo.
+RESTRICT="test"
+
+src_configure() {
+	# Passing --disable-help would drop offline help, that would be inconsistent
+	# with helps of the most of GNOME apps that doesn't require network for that.
+	mate_src_configure \
+		--disable-tests \
+		--enable-comics \
+		--enable-pdf \
+		--enable-pixbuf \
+		--enable-previewer \
+		--enable-thumbnailer \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable caja) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_enable epub) \
+		$(use_enable introspection) \
+		$(use_enable postscript ps) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps)
+}
--- a/app-text/podofo/podofo-0.9.6_pre20170508-r1.ebuild
+++ b/app-text/podofo/podofo-0.9.6_pre20170508-r1.ebuild
@ -38,6 +38,10 @@ src_prepare() {
 	# equal to ${PV}.
 	sed -e 's|${PODOFO_VERSION_PATCH}|\0_'${PV##*_}'|' -i CMakeLists.txt || die

+	# bug 620934 - Disable linking with cppunit when possible, since it
+	# triggers errors with some older compilers.
+	use test || sed -e 's:^FIND_PACKAGE(CppUnit):#\0:' -i CMakeLists.txt || die
+
 	# bug 556962
 	sed -i -e 's|Decrypt( pEncryptedBuffer, nOutputLen, pDecryptedBuffer, m_lLen );|Decrypt( pEncryptedBuffer, (pdf_long)nOutputLen, pDecryptedBuffer, (pdf_long\&)m_lLen );|' \
 		test/unit/EncryptTest.cpp || die
--- a/dev-cpp/clucene/clucene-2.3.3.4-r5.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r5.ebuild
@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="${PN}"-core
-MY_P="${MY_PN}"-"${PV}"
-
-inherit base cmake-utils multilib
-
-DESCRIPTION="High-performance, full-featured text search engine based off of lucene in C++"
-HOMEPAGE="http://clucene.sourceforge.net/"
-SRC_URI="mirror://sourceforge/clucene/${MY_P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
-SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-
-IUSE="debug doc static-libs"
-
-DEPEND="
-	doc? ( >=app-doc/doxygen-1.4.2 )
-"
-RDEPEND=""
-
-RESTRICT="test"
-
-DOCS=(AUTHORS ChangeLog README README.PACKAGE REQUESTS)
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-contrib.patch"
-	"${FILESDIR}/${P}-pkgconfig.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-
-	# patch out installing bundled boost headers, we build against system one
-	sed -i \
-		-e '/ADD_SUBDIRECTORY (src\/ext)/d' \
-		CMakeLists.txt || die
-	rm -rf src/ext || die
-}
-
-src_configure() {
-	# Disabled threads: see upstream bug
-	# https://sourceforge.net/tracker/?func=detail&aid=3237301&group_id=80013&atid=558446
-	local mycmakeargs=(
-		-DENABLE_ASCII_MODE=OFF
-		-DENABLE_PACKAGING=OFF
-		-DDISABLE_MULTITHREADING=OFF
-		-DBUILD_CONTRIBS_LIB=ON
-		"-DLIB_DESTINATION=${EPREFIX}/usr/$(get_libdir)"
-		$(cmake-utils_use_enable debug)
-		$(cmake-utils_use_enable doc CLDOCS)
-		$(cmake-utils_use_build static-libs STATIC_LIBRARIES)
-	)
-
-	cmake-utils_src_configure
-}
--- a/dev-cpp/gtest/gtest-1.7.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.7.0.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-# Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-any-r1 autotools-multilib
-
-DESCRIPTION="Google C++ Testing Framework"
-HOMEPAGE="https://github.com/google/googletest"
-SRC_URI="https://googletest.googlecode.com/files/${P}.zip"
-
-LICENSE="BSD"
-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"
-IUSE="examples static-libs"
-
-DEPEND="app-arch/unzip
-	${PYTHON_DEPS}"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}/configure-fix-pthread-linking.patch" #371647
-)
-
-src_prepare() {
-	sed -i -e "s|/tmp|${T}|g" test/gtest-filepath_test.cc || die
-	sed -i -r \
-		-e '/^install-(data|exec)-local:/s|^.*$|&\ndisabled-&|' \
-		Makefile.am || die
-	autotools-multilib_src_prepare
-}
-
-multilib_src_install() {
-	default
-	multilib_is_native_abi && dobin scripts/gtest-config
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins samples/*.{cc,h}
-	fi
-}
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch
+++ b/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch
@ -1,13 +1,13 @@
--- a/plugins/migration/copytable/copytable.cpp.~1~	2017-02-03 19:40:18.000000000 +0100
-+++ b/plugins/migration/copytable/copytable.cpp	2017-05-21 17:23:14.135875375 +0200
+--- a/plugins/migration/copytable/copytable.cpp
+++ b/plugins/migration/copytable/copytable.cpp
@@ -109,8 +109,10 @@
       return "MYSQL_TYPE_STRING";
     case MYSQL_TYPE_GEOMETRY:
       return "MYSQL_TYPE_GEOMETRY";
-+#ifndef MARIADB_BASE_VERSION    
+#if MYSQL_CHECK_VERSION(5, 7, 8) && ! defined MARIADB_BASE_VERSION
     case MYSQL_TYPE_JSON:
       return "MYSQL_TYPE_JSON";
-+#endif     
+#endif
     default:
       return "UNKNOWN";
   }
@ -15,9 +15,9 @@
       case MYSQL_TYPE_STRING:
       case MYSQL_TYPE_VAR_STRING:
       case MYSQL_TYPE_BIT:
-+#ifndef MARIADB_BASE_VERSION        
+#if MYSQL_CHECK_VERSION(5, 7, 8) && ! defined MARIADB_BASE_VERSION
       case MYSQL_TYPE_JSON:
-+#endif        
+#endif
         if (!col->is_long_data)
           bind.buffer_length = (unsigned)col->source_length + 1;
 
@ -27,9 +27,9 @@
               rowbuffer[index].buffer_type == MYSQL_TYPE_STRING ||
 -              rowbuffer[index].buffer_type == MYSQL_TYPE_GEOMETRY || rowbuffer[index].buffer_type == MYSQL_TYPE_JSON) {
 +              rowbuffer[index].buffer_type == MYSQL_TYPE_GEOMETRY
-+#ifndef MARIADB_BASE_VERSION              
+#if MYSQL_CHECK_VERSION(5, 7, 8) && ! defined MARIADB_BASE_VERSION
 +              || rowbuffer[index].buffer_type == MYSQL_TYPE_JSON
-+#endif              
+#endif
 +              ) {
             if (rowbuffer[index].buffer_length)
               free(rowbuffer[index].buffer);
@ -38,9 +38,9 @@
       case MYSQL_TYPE_STRING:
       case MYSQL_TYPE_ENUM:
       case MYSQL_TYPE_SET:
-+#ifndef MARIADB_BASE_VERSION        
+#if MYSQL_CHECK_VERSION(5, 7, 8) && ! defined MARIADB_BASE_VERSION
       case MYSQL_TYPE_JSON:
-+#endif        
+#endif
         _bulk_insert_record.append("'", 1);
         ret_val = _bulk_insert_record.append_escaped((char *)(*_row_buffer)[col_index].buffer,
                                                      *(*_row_buffer)[col_index].length);
--- a/dev-lang/mmix/mmix-20131017.ebuild
+++ b/dev-lang/mmix/mmix-20131017.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI="5"
@ -12,7 +12,7 @@ SRC_URI="http://mmix.cs.hm.edu/src/${P}.tgz"
 RESTRICT="mirror"

 DEPEND="virtual/tex-base
-	doc? ( dev-texlive/texlive-genericrecommended )"
+	doc? ( || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericrecommended ) )"
 RDEPEND=""

 SLOT="0"
--- a/dev-lang/mmix/mmix-20160804.ebuild
+++ b/dev-lang/mmix/mmix-20160804.ebuild
@ -12,7 +12,7 @@ SRC_URI="http://mmix.cs.hm.edu/src/${P}.tgz"
 RESTRICT="mirror"

 DEPEND="virtual/tex-base
-	doc? ( dev-texlive/texlive-genericrecommended )"
+	doc? ( || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericrecommended ) )"
 RDEPEND=""

 SLOT="0"
--- a/dev-libs/libcroco/Manifest
+++ b/dev-libs/libcroco/Manifest
@ -1,2 +1 @@
-DIST libcroco-0.6.11.tar.xz 477312 SHA256 132b528a948586b0dfa05d7e9e059901bca5a3be675b6071a90a90b81ae5a056 SHA512 441b9c6d9b6acd4ff908100573c6f24bcf46a20ec94360bdcf4765e37a7d45dc59e6a0889917f3486503b274d05cd79a63178e74d029209c16b8e3351a1160da WHIRLPOOL e4874167bd8d1336ed2ad6180d7780962da0f84ac09b24652105baea34a46769881f8112900e606312bf1d7c01045d8cfc187c8c327bbd834bba70a982edbcb9
 DIST libcroco-0.6.12.tar.xz 482028 SHA256 ddc4b5546c9fb4280a5017e2707fbd4839034ed1aba5b7d4372212f34f84f860 SHA512 af9a171d5ccded255b57f170576e67155f12fa0f61ab3e379e907975f77afc37e82e22772c6019b2897cffc15b2425faf3ccfda92b1a45b23eda2519debabeb6 WHIRLPOOL b3626257b56b9e104307cd3da01366a5eb929d0afc6669a80f4a94748c434afdc8c3828e008ab786ab28ca72d799a79804e9a296d9428504829521516366e039
--- a/dev-libs/libcroco/libcroco-0.6.11.ebuild
+++ b/dev-libs/libcroco/libcroco-0.6.11.ebuild
@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="Generic Cascading Style Sheet (CSS) parsing and manipulation toolkit"
-HOMEPAGE="https://git.gnome.org/browse/libcroco/"
-
-LICENSE="LGPL-2"
-SLOT="0.6"
-KEYWORDS="ia64"
-IUSE="test"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--disable-static \
-		$([[ ${CHOST} == *-darwin* ]] && echo --disable-Bsymbolic)
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/reference/html docs/reference/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-	einstalldocs
-}
--- a/dev-libs/libpcre2/libpcre2-10.22.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.22.ebuild
@ -18,7 +18,7 @@ fi

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"

--- a/dev-ml/ocaml-cstruct/ocaml-cstruct-3.0.0-r1.ebuild
+++ b/dev-ml/ocaml-cstruct/ocaml-cstruct-3.0.0-r1.ebuild
@ -20,7 +20,7 @@ RDEPEND="
 	ppx? (
 		dev-ml/ppx_tools:=
 		dev-ml/ocaml-migrate-parsetree:=
-		dev-ml/ppx_tools_versioned:=
+		>=dev-ml/ppx_tools_versioned-5.0.1:=
 	)
 	>=dev-lang/ocaml-4.01:=
 	dev-ml/ocplib-endian:=
--- a/dev-perl/Class-Accessor-Lite/Class-Accessor-Lite-0.50.0-r1.ebuild
+++ b/dev-perl/Class-Accessor-Lite/Class-Accessor-Lite-0.50.0-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -14,3 +14,9 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""

 SRC_TEST=do
+
+src_prepare() {
+	sed -i -e 's/use inc::Module::Install;/use lib q[.]; use inc::Module::Install;/' Makefile.PL ||
+		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
+	perl-module_src_prepare
+}
--- a/dev-perl/Class-Accessor-Lite/Class-Accessor-Lite-0.80.0.ebuild
+++ b/dev-perl/Class-Accessor-Lite/Class-Accessor-Lite-0.80.0.ebuild
@ -15,3 +15,9 @@ IUSE=""

 RDEPEND=""
 DEPEND=">=virtual/perl-ExtUtils-MakeMaker-6.360.0"
+
+src_prepare() {
+	sed -i -e 's/use inc::Module::Install;/use lib q[.]; use inc::Module::Install;/' Makefile.PL ||
+		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
+	perl-module_src_prepare
+}
--- a/dev-perl/Convert-PEM/Convert-PEM-0.80.0-r1.ebuild
+++ b/dev-perl/Convert-PEM/Convert-PEM-0.80.0-r1.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
@ -23,3 +23,9 @@ RDEPEND="
 DEPEND="${RDEPEND}"

 SRC_TEST=do
+
+src_prepare() {
+	sed -i -e 's/use inc::Module::Install;/use lib q[.]; use inc::Module::Install;/' Makefile.PL ||
+		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
+	perl-module_src_prepare
+}
--- a/dev-perl/Crypt-DH/Crypt-DH-0.70.0-r1.ebuild
+++ b/dev-perl/Crypt-DH/Crypt-DH-0.70.0-r1.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
@ -20,3 +20,9 @@ RDEPEND="
 	dev-perl/Crypt-Random
 "
 DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -i -e 's/use inc::Module::Install;/use lib q[.]; use inc::Module::Install;/' Makefile.PL ||
+		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
+	perl-module_src_prepare
+}
--- a/dev-perl/Crypt-DSA/Crypt-DSA-1.170.0.ebuild
+++ b/dev-perl/Crypt-DSA/Crypt-DSA-1.170.0.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
@ -23,3 +23,9 @@ DEPEND="test? ( ${RDEPEND}
 		dev-perl/Math-BigInt-GMP )"

 SRC_TEST="do"
+
+src_prepare() {
+	sed -i -e 's/use inc::Module::Install /use lib q[.]; use inc::Module::Install /' Makefile.PL ||
+		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
+	perl-module_src_prepare
+}
--- a/dev-perl/Crypt-RSA/Crypt-RSA-1.990.0-r1.ebuild
+++ b/dev-perl/Crypt-RSA/Crypt-RSA-1.990.0-r1.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
@ -29,3 +29,9 @@ DEPEND="dev-perl/Class-Loader
 RDEPEND="${DEPEND}"

 SRC_TEST="do"
+
+src_prepare() {
+	sed -i -e 's/use inc::Module::Install;/use lib q[.]; use inc::Module::Install;/' Makefile.PL ||
+		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
+	perl-module_src_prepare
+}
--- a/dev-perl/Crypt-Twofish/Crypt-Twofish-2.170.0-r1.ebuild
+++ b/dev-perl/Crypt-Twofish/Crypt-Twofish-2.170.0-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -12,5 +12,5 @@ DESCRIPTION="The Twofish Encryption Algorithm"
 SLOT="0"
 KEYWORDS="amd64 ia64 ~ppc ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
-
+PATCHES=("${FILESDIR}/no-dot-inc.patch")
 SRC_TEST="do"
--- a/dev-perl/Crypt-Twofish/files/no-dot-inc.patch
+++ b/dev-perl/Crypt-Twofish/files/no-dot-inc.patch
@ -0,0 +1,32 @@
+From 0906d6c153b3bedad2a91a19e8441b9633070e10 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentfredric@gmail.com>
+Date: Sun, 11 Jun 2017 15:29:53 +1200
+Subject: [PATCH] Fix tab/tables.pl for Perl 5.26
+
+Removal of "." from @INC means require $PATH no longer ever assumes
+a path relative to ".", and instead must be explicitly stated with a
+leading "./"
+
+Fixes RT#120087
+
+Bug: https://rt.cpan.org/Ticket/Display.html?id=120087
+---
+ tab/tables.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tab/tables.pl b/tab/tables.pl
+index 2aa0c66..7bed411 100644
+--- a/tab/tables.pl
+++ b/tab/tables.pl
+@@ -3,7 +3,7 @@
+ # Copyright 2001 Abhijit Menon-Sen <ams@wiw.org>
+ 
+ use strict;
+-require 'tab/misc.pl';
+require './tab/misc.pl';
+ 
+ my ($qtab, $mtab) = ([], []);
+ 
+-- 
+2.13.1
+
--- a/dev-perl/DBD-mysql/DBD-mysql-4.41.0.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.41.0.ebuild
@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 		virtual/perl-Time-HiRes
 	)
 "
-
+PATCHES=( "${FILESDIR}/${DIST_VERSION}-no-dot-inc.patch" )
 src_configure() {
 	if use test; then
 		myconf="${myconf} --testdb=test \
--- a/dev-perl/DBD-mysql/DBD-mysql-4.42.0.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.42.0.ebuild
@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
 		virtual/perl-Time-HiRes
 	)
 "
-
+PATCHES=( "${FILESDIR}/${DIST_VERSION}-no-dot-inc.patch" )
 src_configure() {
 	if use test; then
 		myconf="${myconf} --testdb=test \
--- a/dev-perl/DBD-mysql/files/4.041-no-dot-inc.patch
+++ b/dev-perl/DBD-mysql/files/4.041-no-dot-inc.patch
@ -0,0 +1,103 @@
+From 497224cad8b6469913c61ee856228bc1d0280980 Mon Sep 17 00:00:00 2001
+From: Pali <pali@cpan.org>
+Date: Mon, 17 Apr 2017 21:38:58 +0200
+Subject: [PATCH] Fix tests on Perl On 5.25.10 or greater with
+ -Ddefault_inc_excludes_dot
+
+Some tests do not include dot in %INC and fails with error:
+Can't locate t/lib.pl in @INC
+
+Fixes: https://rt.cpan.org/Public/Bug/Display.html?id=120709
+---
+ t/40server_prepare_crash.t             | 3 ++-
+ t/rt25389-bin-case.t                   | 3 ++-
+ t/rt50304-column_info_parentheses.t    | 3 ++-
+ t/rt61849-bind-param-buffer-overflow.t | 3 ++-
+ t/rt75353-innodb-lock-timeout.t        | 3 ++-
+ t/rt83494-quotes-comments.t            | 3 ++-
+ 11 files changed, 22 insertions(+), 11 deletions(-)
+
+diff --git a/t/40server_prepare_crash.t b/t/40server_prepare_crash.t
+index e3777b9..d04eb9c 100644
+--- a/t/40server_prepare_crash.t
+++ b/t/40server_prepare_crash.t
+@@ -5,7 +5,8 @@ use Test::More;
+ use DBI;
+ 
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
+use lib 't', '.';
+require "lib.pl";
+ 
+ my $dbh = DbiTestConnect($test_dsn, $test_user, $test_password, { PrintError => 1, RaiseError => 1, AutoCommit => 0, mysql_server_prepare => 1, mysql_server_prepare_disable_fallback => 1 });
+ plan skip_all => "You must have MySQL version 4.1.3 and greater for this test to run" if $dbh->{mysql_clientversion} < 40103 or $dbh->{mysql_serverversion} < 40103;
+diff --git a/t/rt25389-bin-case.t b/t/rt25389-bin-case.t
+index cbda8b7..3aee41b 100644
+--- a/t/rt25389-bin-case.t
+++ b/t/rt25389-bin-case.t
+@@ -4,7 +4,8 @@ use warnings;
+ use DBI;
+ 
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
+use lib 't', '.';
+require "lib.pl";
+ 
+ use Test::More;
+ 
+diff --git a/t/rt50304-column_info_parentheses.t b/t/rt50304-column_info_parentheses.t
+index 76f9eff..6c3aac5 100644
+--- a/t/rt50304-column_info_parentheses.t
+++ b/t/rt50304-column_info_parentheses.t
+@@ -4,7 +4,8 @@ use warnings;
+ use DBI;
+ 
+ use vars qw($test_dsn $test_user $test_password $state);
+-require "t/lib.pl";
+use lib 't', '.';
+require "lib.pl";
+ 
+ use Test::More;
+ 
+diff --git a/t/rt61849-bind-param-buffer-overflow.t b/t/rt61849-bind-param-buffer-overflow.t
+index 82baf2f..a3c75de 100644
+--- a/t/rt61849-bind-param-buffer-overflow.t
+++ b/t/rt61849-bind-param-buffer-overflow.t
+@@ -5,7 +5,8 @@ use Test::More;
+ use DBI;
+ 
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
+use lib 't', '.';
+require "lib.pl";
+ 
+ my $INSECURE_VALUE_FROM_USER = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+ 
+diff --git a/t/rt75353-innodb-lock-timeout.t b/t/rt75353-innodb-lock-timeout.t
+index a1f437d..95694db 100644
+--- a/t/rt75353-innodb-lock-timeout.t
+++ b/t/rt75353-innodb-lock-timeout.t
+@@ -5,7 +5,8 @@ use Test::More;
+ use DBI;
+ 
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
+use lib 't', '.';
+require "lib.pl";
+ 
+ my $dbh1 = DbiTestConnect($test_dsn, $test_user, $test_password, { RaiseError => 1, AutoCommit => 0 });
+ 
+diff --git a/t/rt83494-quotes-comments.t b/t/rt83494-quotes-comments.t
+index c48b0b9..83919f2 100644
+--- a/t/rt83494-quotes-comments.t
+++ b/t/rt83494-quotes-comments.t
+@@ -9,7 +9,8 @@ use DBI;
+ use Test::More;
+ 
+ use vars qw($test_dsn $test_user $test_password $state);
+-require "t/lib.pl";
+use lib 't', '.';
+require "lib.pl";
+ 
+ my $dbh = DbiTestConnect($test_dsn, $test_user, $test_password,
+                       { RaiseError => 1, PrintError => 0, AutoCommit => 0 });
--- a/dev-perl/DBD-mysql/files/4.042-no-dot-inc.patch
+++ b/dev-perl/DBD-mysql/files/4.042-no-dot-inc.patch
@ -0,0 +1,178 @@
+From 497224cad8b6469913c61ee856228bc1d0280980 Mon Sep 17 00:00:00 2001
+From: Pali <pali@cpan.org>
+Date: Mon, 17 Apr 2017 21:38:58 +0200
+Subject: [PATCH] Fix tests on Perl On 5.25.10 or greater with
+ -Ddefault_inc_excludes_dot
+
+Some tests do not include dot in %INC and fails with error:
+Can't locate t/lib.pl in @INC
+
+Fixes: https://rt.cpan.org/Public/Bug/Display.html?id=120709
+---
+ t/40server_prepare_crash.t             | 3 ++-
+ t/55utf8_jp.t                          | 3 ++-
+ t/cve-2017-3302.t                      | 3 ++-
+ t/magic.t                              | 3 ++-
+ t/rt110983-valid-mysqlfd.t             | 3 ++-
+ t/rt118977-zerofill.t                  | 3 ++-
+ t/rt25389-bin-case.t                   | 3 ++-
+ t/rt50304-column_info_parentheses.t    | 3 ++-
+ t/rt61849-bind-param-buffer-overflow.t | 3 ++-
+ t/rt75353-innodb-lock-timeout.t        | 3 ++-
+ t/rt83494-quotes-comments.t            | 3 ++-
+ 11 files changed, 22 insertions(+), 11 deletions(-)
+
+diff --git a/t/40server_prepare_crash.t b/t/40server_prepare_crash.t
+index e3777b9..d04eb9c 100644
+--- a/t/40server_prepare_crash.t
+++ b/t/40server_prepare_crash.t
+@@ -5,7 +5,8 @@ use Test::More;
+ use DBI;
+ 
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
+use lib 't', '.';
+require "lib.pl";
+ 
+ my $dbh = DbiTestConnect($test_dsn, $test_user, $test_password, { PrintError => 1, RaiseError => 1, AutoCommit => 0, mysql_server_prepare => 1, mysql_server_prepare_disable_fallback => 1 });
+ plan skip_all => "You must have MySQL version 4.1.3 and greater for this test to run" if $dbh->{mysql_clientversion} < 40103 or $dbh->{mysql_serverversion} < 40103;
+diff --git a/t/55utf8_jp.t b/t/55utf8_jp.t
+index 638d494..88874c3 100644
+--- a/t/55utf8_jp.t
+++ b/t/55utf8_jp.t
+@@ -6,7 +6,8 @@ use DBI;
+ use Encode;
+ 
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
+use lib 't', '.';
+require "lib.pl";
+ 
+ my $dbh = DbiTestConnect($test_dsn, $test_user, $test_password, { mysql_enable_utf8 => 1, PrintError => 1, RaiseError => 1 });
+ 
+diff --git a/t/cve-2017-3302.t b/t/cve-2017-3302.t
+index b2de927..fbca0e3 100644
+--- a/t/cve-2017-3302.t
+++ b/t/cve-2017-3302.t
+@@ -6,7 +6,8 @@ if ($ENV{SKIP_CRASH_TESTING}) {
+ no warnings 'once';
+ use DBI;
+ use vars qw($test_dsn $test_user $test_password $test_db);
+-require "t/lib.pl";
+use lib 't', '.';
+require "lib.pl";
+ eval {
+   $dbh = DBI->connect($test_dsn, $test_user, $test_password, {RaiseError => 1, mysql_server_prepare => 1});
+ } or do {
+diff --git a/t/magic.t b/t/magic.t
+index 2720655..a7978a4 100644
+--- a/t/magic.t
+++ b/t/magic.t
+@@ -5,7 +5,8 @@ use Test::More;
+ use DBI;
+ 
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
+use lib 't', '.';
+require "lib.pl";
+ 
+ my $tb = Test::More->builder;
+ binmode $tb->failure_output, ":utf8";
+diff --git a/t/rt110983-valid-mysqlfd.t b/t/rt110983-valid-mysqlfd.t
+index ad59762..12dace7 100644
+--- a/t/rt110983-valid-mysqlfd.t
+++ b/t/rt110983-valid-mysqlfd.t
+@@ -5,7 +5,8 @@ use Test::More;
+ use DBI;
+ 
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
+use lib 't', '.';
+require "lib.pl";
+ 
+ my $dbh = DbiTestConnect($test_dsn, $test_user, $test_password, { RaiseError => 1, AutoCommit => 0 });
+ 
+diff --git a/t/rt118977-zerofill.t b/t/rt118977-zerofill.t
+index 1992c4c..328766b 100644
+--- a/t/rt118977-zerofill.t
+++ b/t/rt118977-zerofill.t
+@@ -5,7 +5,8 @@ use Test::More;
+ use DBI;
+ 
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
+use lib 't', '.';
+require "lib.pl";
+ 
+ my $dbh = DbiTestConnect($test_dsn, $test_user, $test_password, { PrintError => 1, RaiseError => 1 });
+ 
+diff --git a/t/rt25389-bin-case.t b/t/rt25389-bin-case.t
+index cbda8b7..3aee41b 100644
+--- a/t/rt25389-bin-case.t
+++ b/t/rt25389-bin-case.t
+@@ -4,7 +4,8 @@ use warnings;
+ use DBI;
+ 
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
+use lib 't', '.';
+require "lib.pl";
+ 
+ use Test::More;
+ 
+diff --git a/t/rt50304-column_info_parentheses.t b/t/rt50304-column_info_parentheses.t
+index 76f9eff..6c3aac5 100644
+--- a/t/rt50304-column_info_parentheses.t
+++ b/t/rt50304-column_info_parentheses.t
+@@ -4,7 +4,8 @@ use warnings;
+ use DBI;
+ 
+ use vars qw($test_dsn $test_user $test_password $state);
+-require "t/lib.pl";
+use lib 't', '.';
+require "lib.pl";
+ 
+ use Test::More;
+ 
+diff --git a/t/rt61849-bind-param-buffer-overflow.t b/t/rt61849-bind-param-buffer-overflow.t
+index 82baf2f..a3c75de 100644
+--- a/t/rt61849-bind-param-buffer-overflow.t
+++ b/t/rt61849-bind-param-buffer-overflow.t
+@@ -5,7 +5,8 @@ use Test::More;
+ use DBI;
+ 
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
+use lib 't', '.';
+require "lib.pl";
+ 
+ my $INSECURE_VALUE_FROM_USER = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+ 
+diff --git a/t/rt75353-innodb-lock-timeout.t b/t/rt75353-innodb-lock-timeout.t
+index a1f437d..95694db 100644
+--- a/t/rt75353-innodb-lock-timeout.t
+++ b/t/rt75353-innodb-lock-timeout.t
+@@ -5,7 +5,8 @@ use Test::More;
+ use DBI;
+ 
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
+use lib 't', '.';
+require "lib.pl";
+ 
+ my $dbh1 = DbiTestConnect($test_dsn, $test_user, $test_password, { RaiseError => 1, AutoCommit => 0 });
+ 
+diff --git a/t/rt83494-quotes-comments.t b/t/rt83494-quotes-comments.t
+index c48b0b9..83919f2 100644
+--- a/t/rt83494-quotes-comments.t
+++ b/t/rt83494-quotes-comments.t
+@@ -9,7 +9,8 @@ use DBI;
+ use Test::More;
+ 
+ use vars qw($test_dsn $test_user $test_password $state);
+-require "t/lib.pl";
+use lib 't', '.';
+require "lib.pl";
+ 
+ my $dbh = DbiTestConnect($test_dsn, $test_user, $test_password,
+                       { RaiseError => 1, PrintError => 0, AutoCommit => 0 });
--- a/dev-perl/Google-Ads-AdWords-Client/Google-Ads-AdWords-Client-4.11.0.ebuild
+++ b/dev-perl/Google-Ads-AdWords-Client/Google-Ads-AdWords-Client-4.11.0.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DIST_AUTHOR=SUNDQUIST
-DIST_EXAMPLES=("examples/*")
-inherit perl-module
-
-DESCRIPTION="Google AdWords API Perl Client Library"
-HOMEPAGE="https://github.com/googleads/googleads-perl-lib"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	dev-perl/Class-Load
-	>=dev-perl/Class-Std-Fast-0.0.5
-	dev-perl/Crypt-OpenSSL-RSA
-	dev-perl/File-HomeDir
-	virtual/perl-File-Spec
-	dev-perl/IO-Socket-SSL
-	dev-perl/JSON-Parse
-	dev-perl/LWP-Protocol-https
-	dev-perl/libwww-perl
-	dev-perl/Log-Log4perl
-	>=dev-perl/SOAP-WSDL-2.00.10
-	virtual/perl-Scalar-List-Utils
-	dev-perl/Template-Toolkit
-	dev-perl/URI
-	dev-perl/XML-Simple
-	dev-perl/XML-XPath
-	examples? (
-		virtual/perl-Digest-SHA
-		virtual/perl-File-Temp
-		dev-perl/HTTP-Server-Simple
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.400.0
-	test? (
-		dev-perl/Config-Properties
-		dev-perl/Data-Uniqid
-		virtual/perl-File-Temp
-		dev-perl/Test-Deep
-		dev-perl/Test-Exception
-		dev-perl/Test-MockObject
-		virtual/perl-Test-Simple
-	)
-"
--- a/dev-perl/Google-Ads-AdWords-Client/Google-Ads-AdWords-Client-4.13.0.ebuild
+++ b/dev-perl/Google-Ads-AdWords-Client/Google-Ads-AdWords-Client-4.13.0.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DIST_AUTHOR=SUNDQUIST
-DIST_EXAMPLES=("examples/*")
-inherit perl-module
-
-DESCRIPTION="Google AdWords API Perl Client Library"
-HOMEPAGE="https://github.com/googleads/googleads-perl-lib"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	dev-perl/Class-Load
-	>=dev-perl/Class-Std-Fast-0.0.5
-	dev-perl/Crypt-OpenSSL-RSA
-	dev-perl/File-HomeDir
-	virtual/perl-File-Spec
-	dev-perl/IO-Socket-SSL
-	dev-perl/JSON-Parse
-	dev-perl/LWP-Protocol-https
-	dev-perl/libwww-perl
-	dev-perl/Log-Log4perl
-	>=dev-perl/SOAP-WSDL-2.00.10
-	virtual/perl-Scalar-List-Utils
-	dev-perl/Template-Toolkit
-	dev-perl/URI
-	dev-perl/XML-Simple
-	dev-perl/XML-XPath
-	examples? (
-		virtual/perl-Digest-SHA
-		virtual/perl-File-Temp
-		dev-perl/HTTP-Server-Simple
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.400.0
-	test? (
-		dev-perl/Config-Properties
-		dev-perl/Data-Uniqid
-		virtual/perl-File-Temp
-		dev-perl/Test-Deep
-		dev-perl/Test-Exception
-		dev-perl/Test-MockObject
-		virtual/perl-Test-Simple
-	)
-"
--- a/dev-perl/Google-Ads-AdWords-Client/Manifest
+++ b/dev-perl/Google-Ads-AdWords-Client/Manifest
@ -1,3 +1 @@
-DIST Google-Ads-AdWords-Client-4.11.0.tar.gz 4863360 SHA256 5117987ac8600e0c70342bfb8ed3ac355b4b79af3d30ee27e39ed438fba992ac SHA512 c4209469889d6359779f8153684e5c93d9db837b27c8de6fb96384def3a0dcd7b4815c5a37f21041f0a052d1273e3a2ea9b76f5f15071e9ee3c96f89e19cda3a WHIRLPOOL ec68c41c2b24d26373aeb776cf28e11804b7afc08f8c61fd6d8f6a1376061922a86fbcb2d74650510e1a81a086d812d0114609550fed5ad128ec1255b757224f
-DIST Google-Ads-AdWords-Client-4.13.0.tar.gz 5567923 SHA256 c5594f5d3836511272df44224e7905ee2e33b74476a4d8d6920d9d3998901e62 SHA512 7559410470c45c0ad2739c4206618eb86d371a3b1333f5e97a52399eacf9d002b28cba4412c0d043e7f064967061903e7b8b179029270cbe43b1d270531f9350 WHIRLPOOL 7aadb6707b092ce45d9a9c3e9c9a0eb3369addbe8c251ce382c29d1455d3f7a0da0f367025e2d1c7ee7d33bec6199c2ced50b4e06f778573ace6dc009e8868d3
 DIST Google-Ads-AdWords-Client-4.14.0.tar.gz 7757731 SHA256 dfe96f306631fa50db95fa4e43e07da1e888e539a697ce7c7af3372f75bfa55d SHA512 e9a90400620a14062b97b14752f5f28df9fe16c84efd09bc6fa9968c4d97672d31bbe9737efc965a7c7321825a52bb1d8e8c4c415f51c6794f7da83bfb71f3c6 WHIRLPOOL 68b6b625fe6f1a6c9e5945ec355225fb95035f1554724448500b527599eb330323dadc3f18f8f162e4c09b0f29b7169623e037bff657005661cbeda6d40b32c0
--- a/dev-perl/Math-Pari/Manifest
+++ b/dev-perl/Math-Pari/Manifest
@ -1,3 +1,4 @@
 DIST Math-Pari-2.01080605.tar.gz 122627 SHA256 eed553dc838973566c23b77cc30c9130802ba502e6a33969e25183bc5831ca46 SHA512 a92ff01afce8d52c5d7c4fec1a5759b5d7b786c8f359348ac8f4e7fc95be9338b990879d4d89598dc5333f79c53a92e54f6756d0e6c9a0e9e72a4dfd15b0b263 WHIRLPOOL 7e8ecc1329750019a65819af07fe3170af511a90fcae17464163bac4654d475048ad423b1f37f06d4e11e5ff1a7b803c9fe4e298ba1b39a46700efb3609385d6
 DIST Math-Pari-2.010808.zip 153838 SHA256 543633b2984a71e8adee2a6130f740cc1e22aefb95ca3e886338aee9e1ae3c06 SHA512 006e77328f0d8e61b89addbb6b8b8a8adb8c8c1591a1d3cdf80f5183a5fb30bb19219cbfc2624d15ffcdb6b0dc5cff4d69e6e27eb7cb6c29796bbab36ecfda88 WHIRLPOOL ad325762b7568548f72ffe30c20544254f3eceed8ca61e6a1938d89612798ac7a9231bc507a458760a55ba96684421530d5e2922479cc1b33359757cd8ada998
+DIST Math-Pari-2.01080900.zip 166396 SHA256 5845d9350fe0cd9d909d71b6d6b88ab67d17da88f4b0df6570938583d6f365fc SHA512 844324472632081e16d8c70e2f3b14a04cc125dc65ac1e4e75b495f7b83393cadc637c6b81d2e6657380b153a6d91eba4a437087481ffbd4c6c58c5da0e4d05b WHIRLPOOL 89fbb7e774cc7e94335f588b1a2045bda257204424fbd16186f8e4bccbf3ce52e0e43ef397b698776d369adfc883d71b4c07f7f72ff4ec0b1c1dafda9a6c6742
 DIST pari-2.3.5.tar.gz 2018097 SHA256 47ddae1af73b4476660d2a89338483949067a97ffb8758c82e8189dfa4c89d88 SHA512 0e49e6310b4c76ef3370786a13aa8cbc5bb0b7dc84ec1665866d623e6284f45db8584eea759e8b5954dc9b5c8a3e866e77a377d18073ed33f11708a7e88a4cca WHIRLPOOL 1d7f3fcfb5c4b44479ea7494536bcb7c971df721a23bca9f7bdee878cc91c5beec5353920d352142534e89bb0158bfd8ad9a431a22c90fc577676e3f8ceb8b9b
--- a/dev-perl/Math-Pari/Math-Pari-2.10.809.0.ebuild
+++ b/dev-perl/Math-Pari/Math-Pari-2.10.809.0.ebuild
@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=ILYAZ
+DIST_SECTION=modules
+DIST_VERSION=2.01080900
+DIST_A_EXT=zip
+inherit perl-module toolchain-funcs
+
+PARI_VER=2.3.5
+
+DESCRIPTION="Perl interface to PARI"
+SRC_URI="${SRC_URI}
+	http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-${PARI_VER}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+# Math::Pari requires that a copy of the pari source in a parallel
+# directory to where you build it. It does not need to compile it, but
+# it does need to be the same version as is installed, hence the hard
+# DEPEND below
+RDEPEND="~sci-mathematics/pari-${PARI_VER}"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+"
+
+S_PARI=${WORKDIR}/pari-${PARI_VER}
+
+PATCHES=(
+	"${FILESDIR}/no-flto.patch"
+	"${FILESDIR}/${P}-no-dot-inc.patch"
+)
+src_prepare() {
+	# On 64-bit hardware, these files are needed in both the 64/ and 32/
+	# directories for the testsuite to pass.
+	cd "${S_PARI}"/src/test/
+	for t in analyz compat ellglobalred elliptic galois graph intnum kernel \
+		linear nfields number objets ploth polyser program qfbsolve rfrac \
+		round4 stark sumiter trans ; do
+		i="in/${t}"
+		o32="32/${t}"
+		o64="64/${t}"
+		[ -f "$i" -a ! -f "$o32" ] && cp -al "$i" "$o32"
+		[ -f "$i" -a ! -f "$o64" ] && cp -al "$i" "$o64"
+	done
+	cd "${S_PARI}"
+	eapply "${FILESDIR}/pari-${PARI_VER}-no-dot-inc.patch"
+	cd "${S}"
+	perl-module_src_prepare
+}
+
+src_configure() {
+	# Unfortunately the assembly routines math-pari has for SPARC do not appear
+	# to be working at current.  Perl cannot test math-pari or anything that
+	# pulls in the math-pari module as DynaLoader cannot load the resulting
+	# .so files math-pari generates.  As such, we have to use the generic
+	# non-machine specific assembly methods here.
+	use sparc && myconf="${myconf} machine=none"
+
+	perl-module_src_configure
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" OTHERLDFLAGS="${LDFLAGS}"
+}
--- a/dev-perl/Math-Pari/files/Math-Pari-2.10.809.0-no-dot-inc.patch
+++ b/dev-perl/Math-Pari/files/Math-Pari-2.10.809.0-no-dot-inc.patch
@ -0,0 +1,31 @@
+From 712cff175abfbf95428ed09a875a15f4047ce105 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentfredric@gmail.com>
+Date: Sun, 11 Jun 2017 13:22:46 +1200
+Subject: [PATCH] Fix "do" to forcibly use a relative path on Perl 5.26
+
+Reliance on "." in @INC was previously how this worked. But that
+becomes broken on Perl 5.26
+
+Resolves RT#120711 ( Well, at least the Math-Pari parts, the pari
+    parts themselves need additional fixing, and that's not viable
+    to really perform in Math::Pari )
+
+Bug: https://rt.cpan.org/Ticket/Display.html?id=120711
+---
+ test_eng/ex.t | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test_eng/ex.t b/test_eng/ex.t
+index a1a2286..0ad57ee 100644
+--- a/test_eng/ex.t
+++ b/test_eng/ex.t
+@@ -10,5 +10,5 @@ $dir1 = "CHANGE_ME";
+ $dir1 = "$dir/../$dir1" unless $dir1 =~ m|^([a-z]:)?[\\/]|i;
+ @ARGV = "$dir1/src/test/$long_bits/$name";
+ @ARGV = "$dir1/src/test/32/$name" unless -r $ARGV[0];
+-do 'test_eng/Testout.pm';
+do './test_eng/Testout.pm';
+ die if $@;
+-- 
+2.13.1
+
--- a/dev-perl/Math-Pari/files/no-flto.patch
+++ b/dev-perl/Math-Pari/files/no-flto.patch
@ -0,0 +1,74 @@
+From c169041dfa888ec3815aa5bacc97bcc0f21dc318 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentfredric@gmail.com>
+Date: Sun, 11 Jun 2017 13:05:59 +1200
+Subject: [PATCH] Disable -flto as it breaks compile.
+
+LTO seems to be bad for static/shared libraries or something.
+
+Turning it off until somebody works out how to make it not cause
+a compile failure, on top of all the crap Pari does.
+---
+ Makefile.PL | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index f3025bd..c32eb6a 100644
+--- a/Makefile.PL
+++ b/Makefile.PL
+@@ -42,18 +42,23 @@ Could not find GP/PARI build directory, please run Makefile.PL
+ with paridir=/directory option.
+ EOD
+ 
+my $optimize = $Config{optimize};
+my $ldflags  = $Config{ldflags};
+
+s/(^|\s)-flto(\s|$)/$1$2/ for $optimize, $ldflags;
+
+ my $gcc_version
+   = defined($Config{gccversion}) ? ", gccversion=$Config{gccversion}" : "";
+ print <<EOP;
+ Setting up Math::Pari with Perl $] on $^O version $Config{osvers};
+    cc=$Config{cc}$gcc_version, cccdlflags='$Config{cccdlflags}',
+    ccflags='$Config{ccflags}',
+-   optimize='$Config{optimize}',
+-   ld=$Config{ld}, ldflags='$Config{ldflags}'.
+   optimize='$optimize',
+   ld=$Config{ld}, ldflags='$ldflags'.
+ EOP
+ 
+ if ($^O eq 'solaris' and $Config{cc} eq 'gcc'
+-    and (    $Config{optimize}   =~ s/(?<!\S)(-xarch=386|-xildoff)(?!\S)//g
+    and (    $optimize   =~ s/(?<!\S)(-xarch=386|-xildoff)(?!\S)//g
+           or $Config{cccdlflags} =~ s/(?<!\S)-KPIC(?!\S)/-fPIC/ )) {
+   # Vendor's Perl has major problems with building extensions; try to fix this
+   # One way is to use perlgcc; but it does not work with 5.8.4
+@@ -61,7 +66,7 @@ if ($^O eq 'solaris' and $Config{cc} eq 'gcc'
+   print <<EOP;
+ 
+ ... Broken config of gcc-on-Solaris detected!  I would try to work around this.
+-... Reset: cccdlflags --> '$Config{cccdlflags}',   optimize -> '$Config{optimize}'.
+... Reset: cccdlflags --> '$Config{cccdlflags}',   optimize -> '$optimize'.
+ 
+ EOP
+ }
+@@ -181,7 +186,7 @@ $define .= ' -DLONG_SHORTER_THAN_IV' if $perl_int_size > $longsize;
+ 
+ $define .= ' -Derr=pari_err'; # On linux it can get a wrong dynamic loading
+ $define .= ' -DHAVE_LADD' if $opts{have_ladd};
+-$define .= ' -DGCC_INLINE' if $Config{gccversion} and not $Config{optimize} =~ /-g\b/;
+$define .= ' -DGCC_INLINE' if $Config{gccversion} and not $optimize =~ /-g\b/;
+ $define .= ' -DHAVE_PARIPRIV' if -f "$paridir/src/headers/paripriv.h";
+ #$define .= ' -DNO_GRAPHICS_PARI' unless -f "$paridir/src/graph/plotgnuplot.c";
+ 
+@@ -200,6 +205,8 @@ my $extra_inc = extra_includes($paridir);
+ &WriteMakefile(
+ 	       LIBS	     =>  $libs,
+ 	       INC	     => $extra_inc . ' -I $(PARI_DIR)/src/headers -I $(PARI_DIR)/src -I ./libPARI',
+         OPTIMIZE  => $optimize,
+         LDFLAGS   => $ldflags,
+ 	       NAME	     => 'Math::Pari',
+ 	       ($common::parilib ? () :
+ 		 (MYEXTLIB   =>  'libPARI/libPARI$(LIB_EXT)')),
+-- 
+2.13.1
+
--- a/dev-perl/Math-Pari/files/pari-2.3.5-no-dot-inc.patch
+++ b/dev-perl/Math-Pari/files/pari-2.3.5-no-dot-inc.patch
@ -0,0 +1,61 @@
+From 4f1e00df5ea1e51042146f6277bb1af02f249cc3 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentfredric@gmail.com>
+Date: Sun, 11 Jun 2017 10:31:03 +1200
+Subject: [PATCH] Fix for 5.26 removal of '.' in @INC
+
+Previous scripts assumed CWD was in @INC and that "PARI::822" was in
+wherever CWD was.
+
+This fixes both of those, and the latter, because its not obvious
+from the build system where one should assume CWD to be.
+
+Instead, the absolute path of the directory of these scripts is
+inserted into @INC
+---
+ src/desc/gen_member | 4 ++++
+ src/desc/gen_proto  | 4 ++++
+ src/desc/merge_822  | 4 ++++
+ 3 files changed, 12 insertions(+)
+
+diff --git a/src/desc/gen_member b/src/desc/gen_member
+index 2f3cf52..66dea2b 100755
+--- a/src/desc/gen_member
+++ b/src/desc/gen_member
+@@ -1,4 +1,8 @@
+ #!/usr/bin/perl -w
+use File::Spec;
+use File::Basename qw( dirname );
+use lib dirname(File::Spec->rel2abs(__FILE__));
+
+ use PARI::822;
+ 
+ $class='member_functions';
+diff --git a/src/desc/gen_proto b/src/desc/gen_proto
+index 1b507fa..2fb4d3f 100755
+--- a/src/desc/gen_proto
+++ b/src/desc/gen_proto
+@@ -1,4 +1,8 @@
+ #!/usr/bin/perl -w
+use File::Spec;
+use File::Basename qw( dirname );
+use lib dirname(File::Spec->rel2abs(__FILE__));
+
+ use PARI::822;
+ 
+ $class=$ARGV[0];
+diff --git a/src/desc/merge_822 b/src/desc/merge_822
+index a02d612..9ca8252 100755
+--- a/src/desc/merge_822
+++ b/src/desc/merge_822
+@@ -1,4 +1,8 @@
+ #!/usr/bin/perl -w
+use File::Spec;
+use File::Basename qw( dirname );
+use lib dirname(File::Spec->rel2abs(__FILE__));
+
+ use PARI::822;
+ 
+ PARI::822::read(\%funcs,$_,1)
+-- 
+2.13.1
+
--- a/dev-perl/Module-Signature/Module-Signature-0.790.0.ebuild
+++ b/dev-perl/Module-Signature/Module-Signature-0.790.0.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
@ -49,6 +49,12 @@ DEPEND="${RDEPEND}

 SRC_TEST="do parallel"

+src_prepare() {
+	sed -i -e 's/use inc::Module::Install /use lib q[.]; use inc::Module::Install /' Makefile.PL ||
+		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
+	perl-module_src_prepare
+}
+
 src_test() {
 	export TEST_SIGNATURE="1"
 	perl-module_src_test
--- a/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-1.330.0-r1.ebuild
+++ b/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-1.330.0-r1.ebuild
@ -17,5 +17,5 @@ IUSE=""
 RDEPEND="virtual/perl-File-Spec"
 DEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker"
-
+PATCHES=("${FILESDIR}/no-dot-inc.patch")
 SRC_TEST="do"
--- a/dev-perl/Unicode-EastAsianWidth/files/no-dot-inc.patch
+++ b/dev-perl/Unicode-EastAsianWidth/files/no-dot-inc.patch
@ -0,0 +1,25 @@
+From 9cb5f1551566addf37a47e935164519842bab0d8 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentfredric@gmail.com>
+Date: Sun, 11 Jun 2017 16:10:47 +1200
+Subject: [PATCH] Fix for Perl 5.26 w/o '.' in @INC
+
+---
+ Makefile.PL | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index 6745b7c..2db030d 100644
+--- a/Makefile.PL
+++ b/Makefile.PL
+@@ -1,6 +1,7 @@
+ #!/usr/bin/perl
+ use strict;
+-use inc::Module::Package 'Au:dry 1';
+use lib './inc';
+use Module::Package 'Au:dry 1';
+ 
+ my $DefaultVersion  = 'v5.0.0';
+ my $DefaultDate     = '2006-02-15';
+-- 
+2.13.1
+
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@ -1,2 +1 @@
-DIST PyQt-x11-gpl-4.11.4.tar.gz 11317088 SHA256 fc1fe77495432ba3b0d74ff5cb164d375a97f5dddb728256330f615a7cdcf407 SHA512 58d0c5e30b0480c1b6ce1a3cc3ef0a1841bb15631830fb937d1f17f5d3d8cbe66a5e2adcfb2c3990fae38db66dd430668bd25413e254e72064a38c48f689f170 WHIRLPOOL cf635d6399bd04def2648eee65e038d720f06dddfac70f3df6f87deb7483e023ee1a4aa07285a5075adc19dc91bca4500b82f65b342e07a8845023cf98bb6233
 DIST PyQt4_gpl_x11-4.12.tar.gz 11325395 SHA256 3c1d4b55314adb3e1132de8fc2a92eed216d37e58aceed41294dbca210ca88db SHA512 bc5ee53e6ab8d32e240bbbd85aec9ce18a398848c0ee73d874763156256f7942a4a452a26f34fe035fdbeba5fb1df060910688f8a1bc7f7f183543d3dd0fd731 WHIRLPOOL 001df301c9620873794c33f5294ae30ec9d4a32359d26a8607377fe2468dd33a313ef09e96d2491056cdc066edc5d80b4e80afa19976dfb2a7d291cd829e2791
--- a/dev-python/PyQt4/PyQt4-4.11.4-r1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.11.4-r1.ebuild
@ -1,190 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit eutils multibuild python-r1 qmake-utils toolchain-funcs
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
-
-MY_P=PyQt-x11-gpl-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
-else
-	SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE="X compat dbus debug declarative designer doc examples help kde multimedia
-	opengl phonon script scripttools sql svg testlib webkit xmlpatterns"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	sql? ( X )
-	testlib? ( X )
-"
-
-# Minimal supported version of Qt.
-QT_PV="4.8.5:4"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/sip-4.16.6:=[${PYTHON_USEDEP}]
-	>=dev-qt/qtcore-${QT_PV}
-	X? ( >=dev-qt/qtgui-${QT_PV} )
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=dev-qt/qtdbus-${QT_PV}
-	)
-	declarative? ( >=dev-qt/qtdeclarative-${QT_PV} )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	help? ( >=dev-qt/qthelp-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
-	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-	phonon? (
-		kde? ( >=media-libs/phonon-4.7[qt4] )
-		!kde? ( || ( >=dev-qt/qtphonon-${QT_PV} >=media-libs/phonon-4.7[qt4] ) )
-	)
-	script? ( >=dev-qt/qtscript-${QT_PV} )
-	scripttools? ( >=dev-qt/qtgui-${QT_PV} )
-	sql? ( >=dev-qt/qtsql-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	testlib? ( >=dev-qt/qttest-${QT_PV} )
-	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# Support qreal on arm architecture (bug 322349).
-	use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
-
-	# Allow building against KDE's phonon (bug 525354).
-	epatch "${FILESDIR}/${PN}-4.11.2-phonon.patch"
-}
-
-pyqt_run() {
-	echo "$@"
-	"${PYTHON}" "$@"
-}
-
-pyqt_use_enable() {
-	use "$1" || return
-
-	echo --enable=${2:-Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}}
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			$(usex debug '--debug --trace' '')
-			--verbose
-			--confirm-license
-			--qmake="$(qt4_get_bindir)"/qmake
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="$(python_get_sitedir)"
-			--qsci-api
-			--enable=QtCore
-			--enable=QtNetwork
-			--enable=QtXml
-			$(pyqt_use_enable X QtGui)
-			$(pyqt_use_enable dbus QtDBus)
-			$(pyqt_use_enable declarative)
-			$(pyqt_use_enable designer)
-			$(usex designer '' --no-designer-plugin)
-			$(pyqt_use_enable help)
-			$(pyqt_use_enable multimedia)
-			$(pyqt_use_enable opengl QtOpenGL)
-			$(pyqt_use_enable phonon phonon)
-			$(pyqt_use_enable script)
-			$(pyqt_use_enable scripttools QtScriptTools)
-			$(pyqt_use_enable sql)
-			$(pyqt_use_enable svg)
-			$(pyqt_use_enable testlib QtTest)
-			$(pyqt_use_enable webkit QtWebKit)
-			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
-		)
-
-		if use compat; then
-			local compat_build_dir=${BUILD_DIR%/}-compat
-			cp -Rp "${S}" "${compat_build_dir}" || die
-			pushd "${compat_build_dir}" >/dev/null || die
-
-			local mycompatconf=(
-				"${myconf[@]}"
-				AR="$(tc-getAR) cqs"
-				CC="$(tc-getCC)"
-				CFLAGS="${CFLAGS}"
-				CFLAGS_RELEASE=
-				CXX="$(tc-getCXX)"
-				CXXFLAGS="${CXXFLAGS}"
-				CXXFLAGS_RELEASE=
-				LINK="$(tc-getCXX)"
-				LINK_SHLIB="$(tc-getCXX)"
-				LFLAGS="${LDFLAGS}"
-				LFLAGS_RELEASE=
-				RANLIB=
-				STRIP=
-			)
-			pyqt_run configure.py "${mycompatconf[@]}" || die
-
-			popd >/dev/null || die
-		fi
-
-		myconf+=(
-			$(usex dbus '' --no-python-dbus)
-		)
-		pyqt_run "${S}"/configure-ng.py "${myconf[@]}" || die
-
-		eqmake4 -recursive ${PN}.pro
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		local tmp_root=${D%/}/tmp
-		emake INSTALL_ROOT="${tmp_root}" install
-
-		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
-		if python_is_python3; then
-			rm -r "${uic_dir}"/port_v2 || die
-		else
-			rm -r "${uic_dir}"/port_v3 || die
-		fi
-
-		python_doexe "${tmp_root}${EPREFIX}"/usr/bin/pyuic4
-		rm "${tmp_root}${EPREFIX}"/usr/bin/pyuic4 || die
-
-		multibuild_merge_root "${tmp_root}" "${D}"
-
-		if use compat; then
-			local compat_build_dir=${BUILD_DIR%/}-compat
-			python_moduleinto ${PN}
-			python_domodule "${compat_build_dir}"/pyqtconfig.py
-		fi
-
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	dodoc ChangeLog NEWS THANKS
-	use doc && dodoc -r doc/html
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@ -1,3 +1,2 @@
 DIST PyQt5_gpl-5.7.1.tar.gz 3733746 SHA256 be849f212a074049b9ebc10b6c07dddefb86e6d30e8df8a5c715cbb2cf7fad14 SHA512 7498713f73807522e58ae38ff58548cf80c2f2c418d6c55e20ce613cdc997e4ee7139076f1f152c7c3edb970bde14febc3496009f934e31ff71f01a1605f558f WHIRLPOOL 9322ccaaebf78a9e177703bae26f002cdfe9ad3ba45a9c7b9ccdd3b73cca96550e479b243b302d59eefdc1520a6e5b5f18ac5fabc1f8eff36f7f76d71b7dea11
-DIST PyQt5_gpl-5.8.1.tar.gz 3743583 SHA256 1e8f24b261f34fa5bad19b5a637aadba2fa9a62e440749117b229253e8992a2e SHA512 56607263f6782409a2088b986954e973fdeea681fe3d6e3708b4946477da1431c33814454ad14e758de7c46b1dac660f3204aae2e1087249d13be6d80ddd6458 WHIRLPOOL 6dabce675058d36b051b10af4a22d3279e523c89f56372755d309d1045e7377e497f9ad360d2023c9d165182be35147188476e40df2291725cd8972df8b33785
 DIST PyQt5_gpl-5.8.2.tar.gz 3744907 SHA256 ebd70515b30bbd6098fee29e6271a6696b1183c5530ee30e6ba9aaab195536e8 SHA512 8b765b9ae6210b7312a2dc6ed94d2664ae569625fe8a27443bae4230d9d9c00e0cf3b4be6904c66ebceff5cd5bbd19a5a9794a0b3222c8098a55f0b94fc8d89b WHIRLPOOL a2cf7d65f73b0cba7d37339e22b4bb8d3a4a924dbbd4d093943e299cf4d96dfd66e81ecfc4a5bf570f37f33eaad458849d7ef93ea22b115eece88866067f2e22
--- a/dev-python/PyQt5/PyQt5-5.8.1.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.8.1.ebuild
@ -1,196 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit multibuild python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
-
-MY_P=${PN}_gpl-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
-else
-	SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-
-# TODO: QtNfc
-IUSE="bluetooth dbus debug declarative designer doc examples gles2 gui help location
-	multimedia network opengl positioning printsupport sensors serialport sql svg
-	testlib webchannel webengine webkit websockets widgets x11extras xmlpatterns"
-
-# The requirements below were extracted from configure.py
-# and from the output of 'grep -r "%Import " "${S}"/sip'
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	bluetooth? ( gui )
-	declarative? ( gui network )
-	designer? ( widgets )
-	help? ( gui widgets )
-	location? ( positioning )
-	multimedia? ( gui network )
-	opengl? ( gui widgets )
-	positioning? ( gui )
-	printsupport? ( gui widgets )
-	sensors? ( gui )
-	serialport? ( gui )
-	sql? ( widgets )
-	svg? ( gui widgets )
-	testlib? ( gui widgets )
-	webchannel? ( network )
-	webengine? ( network widgets? ( webchannel ) )
-	webkit? ( gui network printsupport widgets )
-	websockets? ( network )
-	widgets? ( gui )
-	xmlpatterns? ( network )
-"
-
-# Minimal supported version of Qt.
-QT_PV="5.6.0:5"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/sip-4.19.1:=[${PYTHON_USEDEP}]
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
-	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=dev-qt/qtdbus-${QT_PV}
-	)
-	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2=] )
-	help? ( >=dev-qt/qthelp-${QT_PV} )
-	location? ( >=dev-qt/qtlocation-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
-	network? ( >=dev-qt/qtnetwork-${QT_PV} )
-	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
-	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
-	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
-	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
-	sql? ( >=dev-qt/qtsql-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	testlib? ( >=dev-qt/qttest-${QT_PV} )
-	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
-	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] )
-	webkit? ( >=dev-qt/qtwebkit-${QT_PV}[printsupport] )
-	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
-	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
-	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( "${S}"/{ChangeLog,NEWS} )
-
-pyqt_use_enable() {
-	use "$1" || return
-
-	if [[ $# -eq 1 ]]; then
-		echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
-	else
-		shift
-		echo ${@/#/--enable=}
-	fi
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			$(usex debug '--debug --qml-debug --trace' '')
-			--verbose
-			--confirm-license
-			--qmake="$(qt5_get_bindir)"/qmake
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="$(python_get_sitedir)"
-			--sip-incdir="$(python_get_includedir)"
-			--qsci-api
-			--enable=QtCore
-			--enable=QtXml
-			$(pyqt_use_enable bluetooth)
-			$(pyqt_use_enable dbus QtDBus)
-			$(usex dbus '' --no-python-dbus)
-			$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
-			$(usex declarative '' --no-qml-plugin)
-			$(pyqt_use_enable designer)
-			$(usex designer '' --no-designer-plugin)
-			$(pyqt_use_enable gui)
-			$(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
-			$(pyqt_use_enable help)
-			$(pyqt_use_enable location)
-			$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
-			$(pyqt_use_enable network)
-			$(pyqt_use_enable opengl QtOpenGL)
-			$(pyqt_use_enable positioning)
-			$(pyqt_use_enable printsupport QtPrintSupport)
-			$(pyqt_use_enable sensors)
-			$(pyqt_use_enable serialport QtSerialPort)
-			$(pyqt_use_enable sql)
-			$(pyqt_use_enable svg)
-			$(pyqt_use_enable testlib QtTest)
-			$(pyqt_use_enable webchannel QtWebChannel)
-			$(pyqt_use_enable webengine QtWebEngineCore $(usex widgets QtWebEngineWidgets ''))
-			$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
-			$(pyqt_use_enable websockets QtWebSockets)
-			$(pyqt_use_enable widgets)
-			$(pyqt_use_enable x11extras QtX11Extras)
-			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		eqmake5 -recursive ${PN}.pro
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		local tmp_root=${D%/}/tmp
-		emake INSTALL_ROOT="${tmp_root}" install
-
-		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
-		local exe
-		for exe in pylupdate5 pyrcc5 pyuic5; do
-			python_doexe "${bin_dir}/${exe}"
-			rm "${bin_dir}/${exe}" || die
-		done
-
-		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
-		if python_is_python3; then
-			rm -r "${uic_dir}"/port_v2 || die
-		else
-			rm -r "${uic_dir}"/port_v3 || die
-		fi
-
-		multibuild_merge_root "${tmp_root}" "${D}"
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-	use doc && dodoc -r doc/html
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
--- a/dev-python/cryptography/cryptography-1.9.ebuild
+++ b/dev-python/cryptography/cryptography-1.9.ebuild
@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~x86"
 IUSE="libressl test"

 RDEPEND="
-	!libressl? ( >=dev-libs/openssl-1.0.2:0= )
+	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
 	libressl? ( dev-libs/libressl )
 	$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
 	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy{,3})
--- a/dev-python/gst-python/gst-python-1.10.3.ebuild
+++ b/dev-python/gst-python/gst-python-1.10.3.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"

 LICENSE="LGPL-2"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

--- a/dev-python/guessit/Manifest
+++ b/dev-python/guessit/Manifest
@ -1,3 +1,3 @@
-DIST guessit-2.1.1.tar.gz 86447 SHA256 cdb51ced109e05318f35dc5ee1c50182a85edd800e86de77ec96eb68a0a99391 SHA512 61ace43bacf4bf2289bd1f0cd5105080b8302d92be8bda77942355594e07db14b594c73e4bf42bd14840f9f9723d602a38cd443cc3e1fabdca335d364fa97e2f WHIRLPOOL 885ee697f4929523527747d3ce5c0b548c6bcfe34c0e590bb1b8e5e4530ae4be6c0264a62dad83c5e2356a9063a9930ea3216f44b6df1b73000fd41c45b0e905
 DIST guessit-2.1.2.tar.gz 100478 SHA256 9f7e12b7f2215548284631a20aae6fc009c8af2bb8cc5d5e5e339cb15361dd95 SHA512 394098cb61cdd1d140e47a969dd86422d6856d2cda42dc7072ab9e482a0001d62f6ffe91d74a7bad04f274197e36e731ce203fe92930558969a94889d47c8e14 WHIRLPOOL dd26470424be58231a5787da45ca9122596800fbb968366699bc799cc29d65562cded7d40f8c6abbb6e48466300521d07560c92f44868b8a4229a68b5795468f
 DIST guessit-2.1.3.tar.gz 102452 SHA256 b2eebbb61e4d2b3764ce4462e0b27da0dccbb25b78e13493a2f913a402e1d0fb SHA512 e10d784709b0f66e344988021274077ae7e849c75b35701ded414f80de00d5314a149a99679b4e41e52c1bc91f6b8f481e82418126be0fba43541a05ecdfe95c WHIRLPOOL 573c1efef786758555e602b1cb17891570c53d491f170371037630ba5251954f2903c273d2d508f146a3e6c526320456bcafc86393f91ed15e095e01360dc82c
+DIST guessit-2.1.4.tar.gz 102907 SHA256 90e6f9fb49246ad27f34f8b9984357e22562ccc3059241cbc08b4fac1d401c56 SHA512 c6465c32a68d40698b75addb343d765e47b867dd7f9b8c912f70532a9e9ca54d0e40f70a393880347eea64535a65df5f79d83ea99dc996cd126ba91ca130a879 WHIRLPOOL 5266dc2367f6642494dc4d9530cf3d210576e0a94940db68f46cc058ec257bdb2be81ea5287fc376d2935c80053474bcb5d0e0727431f3565009e54caada1a7d
--- a/dev-python/guessit/guessit-2.1.2-r1.ebuild
+++ b/dev-python/guessit/guessit-2.1.2-r1.ebuild
@ -18,8 +18,9 @@ IUSE="test"

 RDEPEND="
 	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
-	>=dev-python/rebulk-0.8.2[${PYTHON_USEDEP}]
+	=dev-python/rebulk-0.8.2[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
@ -28,7 +29,6 @@ DEPEND="${RDEPEND}
 		>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
 		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
 		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
 	)
 "

--- a/dev-python/guessit/guessit-2.1.3-r1.ebuild
+++ b/dev-python/guessit/guessit-2.1.3-r1.ebuild
@ -18,8 +18,9 @@ IUSE="test"

 RDEPEND="
 	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
-	>=dev-python/rebulk-0.8.2[${PYTHON_USEDEP}]
+	=dev-python/rebulk-0.8.2[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
@ -28,7 +29,6 @@ DEPEND="${RDEPEND}
 		>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
 		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
 		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
 	)
 "

--- a/dev-python/guessit/guessit-2.1.4.ebuild
+++ b/dev-python/guessit/guessit-2.1.4.ebuild
@ -13,13 +13,14 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"

 RDEPEND="
 	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
-	>=dev-python/rebulk-0.8.2[${PYTHON_USEDEP}]
+	>=dev-python/rebulk-0.9.0[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
@ -28,7 +29,6 @@ DEPEND="${RDEPEND}
 		>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
 		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
 		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
 	)
 "

--- a/dev-python/guessit/guessit-9999.ebuild
+++ b/dev-python/guessit/guessit-9999.ebuild
@ -19,8 +19,9 @@ IUSE="test"

 RDEPEND="
 	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
-	>=dev-python/rebulk-0.8.2[${PYTHON_USEDEP}]
+	>=dev-python/rebulk-0.9.0[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
@ -29,7 +30,6 @@ DEPEND="${RDEPEND}
 		>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
 		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
 		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
 	)
 "

--- a/dev-python/python-ctags/Manifest
+++ b/dev-python/python-ctags/Manifest
@ -1,2 +1,2 @@
-DIST python-ctags-1.0.6.tar.gz 24275 SHA256 16a3fe367360167dc62fd2dc4a262659c6c1a7454aac95eb491edc44345ed565 SHA512 d26663fbb216843b6a3417bc28e89a1cb8666d7ed6aab3d05e87ac2be1edac111b7a3f3d487b42d33d25f4ed984c76933991c40a4c946ac7710b4a55c781563b WHIRLPOOL e369048183735302b81e2d33ffd183e2e8cfed7019741dfecacad7392de01295188c760f71a6125fa28e5f6370da8d11b0756de801e2484af6d7c6a4590731ce
 DIST python-ctags3-1.2.3.tar.gz 45646 SHA256 57a0ef06bc4678267aa991086d7643ecb268986ab94a2b643d328f7bbb9a1ad8 SHA512 3bbe730e75a5ae36208113c6e2c43894942002ee37ed700990416fe54d5644b2d2be795935d1392191aae11797ec613ca143343a287596a0a327027c2f170525 WHIRLPOOL 1e4aa102b84f1e8bcbf1a3da89b709fc63497a7840e8c8ca99077c4dcc4a53e36e26248021a93b31a3a270c1935bf0ac672d8cc498db45ed82a577b0a8e8d9eb
+DIST python-ctags3-1.2.4.tar.gz 47774 SHA256 62e1d48a8cd88756767f3f5e3f1b1a81bc84deeb736f0c9480a5b5d066f63c3e SHA512 db6be08164da71b17de1a7fa46aaa60a5b83784f18ca4e2314e3b9954abe8996d5e07ed98aa024f70899fe87cf53d37671c9f42e567766b4a8af0f728df2bcfb WHIRLPOOL b2f36d31fb17112af50d153a75c816e78046edb4dc28da520f143aa081317c515e3043ca6d85c3d57dd44cab2392c6c79567e86a5ee6f7ac9050bccb15eb7661
--- a/dev-python/python-ctags/python-ctags-1.0.6.ebuild
+++ b/dev-python/python-ctags/python-ctags-1.0.6.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Exuberant Ctags indexing python bindings"
-HOMEPAGE="https://github.com/hddmet/python-ctags/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-util/ctags"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/python-ctags/python-ctags-1.2.4.ebuild
+++ b/dev-python/python-ctags/python-ctags-1.2.4.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PN="${PN}3"
+DESCRIPTION="Exuberant Ctags indexing python bindings"
+HOMEPAGE="https://github.com/jonashaag/python-ctags3"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-util/ctags"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_test() {
+	esetup.py test
+}
--- a/dev-python/rebulk/Manifest
+++ b/dev-python/rebulk/Manifest
@ -1 +1,2 @@
 DIST rebulk-0.8.2.tar.gz 257147 SHA256 8c09901bda7b79a21d46faf489d67d017aa54d38bdabdb53f824068a6640401a SHA512 7abbeb1974102db4846759de6c797b9fb0b81a6ffe573d8a7590342da8ed5b4c006258407540be8563d51fb36ac2a148132e879586a200a923cfe93dcc715bee WHIRLPOOL e50c3ca72801a11f9d926ea42572c910fba1660cdf6827bd2a00755beb808711dd2718a433c983bf20792bd7a05faf3820eb3477dbb639fe170dae68779a28c9
+DIST rebulk-0.9.0.tar.gz 257342 SHA256 e0c69bdddccbba3ef881948ea96f1d62eda91201c306ea568a676507a30985eb SHA512 25a22b3a5f5519f6f8c10abf6a477f212c0500264cfdcc5a9be09d3818462a051b1a7cd78f94991c44ac6bcdc7435b9909e65de48d1bd8138989e0da98d10262 WHIRLPOOL 7b5e280c2598be73a6da96eda2c192698c94f3e8e8a57738f0527b119aa995e7ffb55bb0bfd1b81462b2e8043195e8cd84240df7b4d992374af0f5db674496cd
--- a/dev-python/rebulk/rebulk-0.9.0.ebuild
+++ b/dev-python/rebulk/rebulk-0.9.0.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library that performs advanced searches in strings"
+HOMEPAGE="https://github.com/Toilal/rebulk https://pypi.python.org/pypi/rebulk"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Remove base64-encoded zip archive with pytest.
+	rm runtests.py || die
+
+	# Disable unconditional dependency on dev-python/pytest-runner.
+	sed -i -e "s|'pytest-runner'||g" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@ -1,3 +1,2 @@
-DIST sip-4.18.tar.gz 991980 SHA256 f1dc5c81c07a9ad97edcd4a0af964a41e420024ba7ca165afd2b351efd249cb6 SHA512 365fb51b8c833ebc923b87a961fac83976b653ebcec8fe7ad1543ee5a406471eb9309c8efbee6662c7b622f36771cd3ac31ede10208f23d2531a45af906d383d WHIRLPOOL 3cf3516483e62ed26fca1de6bc90e58a2bd04d3d66214b0f62eb4338c2b7a8a595d46952ef86cd7fa61e50b160a06b484a7d4f5997be2f2a7714b1edabaef2a4
 DIST sip-4.19.1.tar.gz 1000644 SHA256 501852b8325349031b769d1c03d6eab04f7b9b97f790ec79f3d3d04bf065d83e SHA512 fd98002117e9526f7f981b46362c41171e703a0e18e57112fcabf33d71fa13a4a091fdcb05c879ea721da59fa8c03087b8dc983fb2f832f764e5ad950c9bbecf WHIRLPOOL 87deee5786ca5009ca139bf6993e82231b1dd5be9bf7ee1d94eb5c8aabf5bda980f6b0fa4571e838275ac7cd8615757a58d0b9d7e776705834db35a1dc92125d
 DIST sip-4.19.2.tar.gz 1000746 SHA256 432b4aad25254e6997913e33b1ca3cf5fd21d5729a50a3ce2edccbea82c80533 SHA512 6f14f387a899130cf15820d2b58d937d134a2eefd53c65a82af060e88a6ca039442b21f822880c4a3742d6f26328853a552239873c55d7b22de62a6cc5037b3e WHIRLPOOL e6a59dfde801b38c5ab2524e8142cf5f87edcd8171512241f88096bdfc43734cc0346d2d6a607ea2a14a41b7f05c820af30aa0b125a3f06be263d65b99c7b239
--- a/dev-python/sip/sip-4.18.ebuild
+++ b/dev-python/sip/sip-4.18.ebuild
@ -1,90 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="Python extension module generator for C and C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
-SLOT="0/11"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
-
-src_prepare() {
-	# Sub-slot sanity check
-	local sub_slot=${SLOT#*/}
-	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h.in)
-	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	# Fix out-of-source installation of sip.pyi (reported upstream)
-	sed -i -e '/installs.*sip\.pyi/ s/build_dir/src_dir/' configure.py || die
-
-	default
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="$(python_get_sitedir)"
-			--incdir="$(python_get_includedir)"
-			$(usex debug --debug '')
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake DESTDIR="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-	use doc && dodoc -r doc/html
-}
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@ -1,2 +1,2 @@
-DIST tempora-1.4.tar.gz 7173 SHA256 ea5b4f8774408f2c7fe018fd04dae61d4910f032c8124b0b851f962884b65b7b SHA512 8ba86ec90ec3ade059ad683ff26586b4d32ded7aaa5031ef90c735393d183902015d63607f382fd950ef7d4bd8b4f9256aff6b70d20f57f6bbbc947a1dece365 WHIRLPOOL 2c185af421483bdb17736b3023c3c32014803f167ce5fa85b0634210b3c20143ee0f89e338dca33ba0976264b6f0d27d6dad92874a6f6ed1d97cb68672afed6c
 DIST tempora-1.6.1.tar.gz 11423 SHA256 1c15b3ec37933192470e7e7f0dcd5fbb372a85f13c86ddb4c306f280a7fc1453 SHA512 9baf9162e304e59ae0a427a7a27d1fc66b0d4b98e016490317832ba2e7acec520ef2baeebeb26f7984ba7ace82413d15b96baef7dbdfcfdc94e29e7179769a01 WHIRLPOOL 25be89baeb5976157bfe259c97339461b18528e357d1476a3d614b9526325785942baa940e9d29b4df3b9ba46bd9a03a56e23314285da70ed2743e20f68561e4
+DIST tempora-1.7.tar.gz 11645 SHA256 a264672b7f39198eb90b531490ade4e873f6e13839253636c3bd6a5549be1984 SHA512 2420e32a9b8c990609d8f09225004e0b1c445cad1fe3c3c74625cb8317b552469acf2d3b28aa56633a87260a93c77d73b02178cb662016c514bc740aa01399e5 WHIRLPOOL ecb7df3e1af35a60f7c060203cad463f610468752b0d9a0f27992a0a75fae8c05c57875dfed797d3db94cd7d937a2d3d2291f0607ff0adb619012353bcabb941
--- a/dev-python/tempora/metadata.xml
+++ b/dev-python/tempora/metadata.xml
@ -14,6 +14,5 @@
 		<remote-id type="github">jaraco/tempora</remote-id>
 		<bugs-to>https://github.com/jaraco/tempora/issues</bugs-to>
 		<changelog>https://github.com/jaraco/tempora/blob/master/CHANGES.rst</changelog>
-		<remote-id type="bitbucket">jaraco/tempora</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-python/tempora/tempora-1.4.ebuild
+++ b/dev-python/tempora/tempora-1.4.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Objects and routines pertaining to date and time"
-HOMEPAGE="https://bitbucket.org/jaraco/tempora"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-# The binary calc-prorate used to be part of jaraco.util
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	!!<=dev-python/jaraco-utils-10.0.2
-	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	py.test || die "tests failed with ${EPYTHON}"
-}
--- a/dev-python/tempora/tempora-1.7.ebuild
+++ b/dev-python/tempora/tempora-1.7.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Objects and routines pertaining to date and time"
+HOMEPAGE="https://github.com/jaraco/tempora"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+# The calc-prorate binary used to be part of jaraco.utils
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	!<=dev-python/jaraco-utils-10.0.2
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
--- a/dev-qt/qt3d/metadata.xml
+++ b/dev-qt/qt3d/metadata.xml
@ -5,6 +5,10 @@
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
 	</maintainer>
+	<use>
+		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
+		<flag name="qml">Build QML/QtQuick bindings</flag>
+	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>http://doc.qt.io/</doc>
--- a/dev-qt/qt3d/qt3d-5.7.1-r1.ebuild
+++ b/dev-qt/qt3d/qt3d-5.7.1-r1.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
@ -10,12 +10,23 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~x86"
 fi

-# TODO: egl, qml, tools
-IUSE=""
+# TODO: egl, tools
+IUSE="gles2 qml"

 DEPEND="
+	~dev-qt/qtconcurrent-${PV}
 	~dev-qt/qtcore-${PV}
 	~dev-qt/qtgui-${PV}
 	~dev-qt/qtnetwork-${PV}
+	sys-libs/zlib
+	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
 "
 RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt5-build_src_prepare
+
+	if ! use qml; then
+		sed -i -e "/quick3d/s/^/#/" src/src.pro || die
+	fi
+}
--- a/dev-ruby/domain_name/domain_name-0.5.20170404.ebuild
+++ b/dev-ruby/domain_name/domain_name-0.5.20170404.ebuild
@ -3,7 +3,7 @@

 EAPI=5

-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"

 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_TASK_DOC=""
--- a/dev-ruby/faraday_middleware/Manifest
+++ b/dev-ruby/faraday_middleware/Manifest
@ -1,3 +1,4 @@
 DIST faraday_middleware-0.10.0.tar.gz 22646 SHA256 210e69fc76e2f5c2b76771452e1b859129869961749262e16bee7b50ff98ddc3 SHA512 f516f040a7be7b14635e8685d6d63647fd49ef595f31c655b6cd8e6b9443a80e1d4c68a516cd4088c129a73e411748d15d97b24cbcf321fd15953292ca3c7964 WHIRLPOOL 5c1b3d64358a71b35bd7b721ffff1e76da248e59b3eff6404ef0d46c8c149d1c5045422b05a10bef5205d2bf65c19edff6ad7f96c7ff863ee4a3bd05def2035b
+DIST faraday_middleware-0.11.0.1.tar.gz 24349 SHA256 5c823e30a0d4ba4cc83103752947c1380344974cf4dffa9de08055edc6bacf91 SHA512 0bda75432ffa406485e60e9f71dc850a13dc1dd89a8262c9a4101d982fec44b63c72452458d29c49b529ca3483b577ea760400b465bf4b30ae1623a42cb96051 WHIRLPOOL 0034d1054809d47f10a18227d0ab444e36ac0b7b5af95d9f84ce3f748e82a43750819ee7be61b0964d0effd6f2383b2c409838701ee8e42a9fd05a0392a104c8
 DIST faraday_middleware-0.11.0.tar.gz 24345 SHA256 254413e5e63b8b5879a75090fd796181fb54fba7536a56e4bcc2bc2e0fe4c645 SHA512 555407c2daa220fe050a33a6572626bdd47b800f75a87cc0b4da7a311aa3a89c24873434fdb8c14ae92e34c253179697471c25a42d18034b8a1e1e8c332f0e13 WHIRLPOOL 00ce78b1b6f9b7ff093da0e13f7f7619a53e627191ef977f2894e7dc3827bb8321def94184d588b0124369a55f5a50edabc08481d746ee35631e96a0947568da
 DIST faraday_middleware-0.9.2.tar.gz 21926 SHA256 014cfce128eb50a696168eb012e830c349c52c9e6ae25a5bbaea30f2c59de17d SHA512 74d0a63eac16f119ca2c2c6da16fe3b7a1c9e6949044ec312ed5828544bb83e3bdfd65a1991cfb1fdeb29543f1ee978781bed76299361683b69ed362feb4f18d WHIRLPOOL 3c4ebb2c690fb9624d7f908cc2b31e87264b7746d48873494e23de642067b2149e5fd115e27d00c332d652ad7f2321396a52ee8d09242169c952863859c43bad
--- a/dev-ruby/faraday_middleware/faraday_middleware-0.11.0.1.ebuild
+++ b/dev-ruby/faraday_middleware/faraday_middleware-0.11.0.1.ebuild
@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="Various middleware for Faraday"
+HOMEPAGE="https://github.com/lostisland/faraday_middleware"
+SRC_URI="https://github.com/lostisland/faraday_middleware/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+parsexml +oauth +mashify +rashify"
+
+ruby_add_rdepend "
+	>=dev-ruby/faraday-0.7.4 <dev-ruby/faraday-1
+	parsexml? ( >=dev-ruby/multi_xml-0.5.3 )
+	oauth? ( >=dev-ruby/simple_oauth-0.1 )
+	mashify? ( >=dev-ruby/hashie-1.2:* )
+	rashify? ( >=dev-ruby/rash-0.3 )"
+
+# Bundler must be used because the optional dependencies have different
+# version requirements that must be resolved.
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/addressable
+	dev-ruby/rake
+	dev-ruby/webmock:0
+	dev-ruby/json:0
+	>=dev-ruby/multi_xml-0.5.3
+	>=dev-ruby/rack-cache-1.1
+	>=dev-ruby/simple_oauth-0.1
+	>=dev-ruby/hashie-1.2
+	>=dev-ruby/rash-0.3 )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(cane\|parallel\|simplecov\)/ s:^:#:' \
+		-e '/rspec/ s/>=/~>/' \
+		-e "/addressable/ s/, '< 2.4'//" \
+		-e "/rake/ s/, '< 11'//" \
+		-e "/rack-cache/ s/, '< 1.3'//" \
+		-e "/simple_oauth/ s/, '< 0.3'//" Gemfile || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rspec-3 spec || die
+}
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@ -1,7 +1,5 @@
 DIST json-1.8.2.gem 152064 SHA256 256f73d107635f54e3dd84daba65da7b08f9d6a6e6aeb046db6a46b98bd8fb7f SHA512 5c94ec2c5378f7f54cd87a2e265b058e80031d2dd29daf14639c80ba0ac285a527ab7961f5a2cd1e483f455fd8f8c88575950822b7b2d431aa7b2b9c8be819c1 WHIRLPOOL dc17e0c011523434ed29e428a2658ebe58d08df8252e7ee8990882b6d17c19354b3e4ba6985a2a45e4b94932ad265698197ba64ef891f38d3be154da4edde8cb
 DIST json-1.8.3.gem 152064 SHA256 8ca2091e26678fb989d66cdb9f0104f1307bc584b429c2fd783d51e4b3f14bdb SHA512 313f6016aca5eba4d4a14a72b60b3e9c5e863a6681eb9e499cacedb63969694be563990af0a44dae52963f07b6e6c7aa7e0876ab1348b214f53d925bdc5e83ea WHIRLPOOL 8c6dc26a578aedcd4bbc1e6ea95f2a72debe6bdaca5a4c2a4e70b81d9947048c6648b62d5546fa572084d37ba99ce199a177b87838be5cc3f11d8d0fa0f62a63
-DIST json-2.0.1.gem 138240 SHA256 cbea6bfe7bf5162c0fb71f6b0ab2c3108ef05bd0ea7b2f98b1ed6d5a8e75bfee SHA512 957ae157eb4a8c916cc931d397d65c29c7e2036eb407809861a448ba907252bb6ceb9b975c912328aeec846c9318d16eb13f5a4daaa817111fb25d2133c8e065 WHIRLPOOL c2de4df8be59413fe8068d68a3ca00e195ac61c5b100f7c57334e0eefbdb1083fd2f342c41465abbf1bb68e5bf2a6da6b1831d7254363b6c2d283c89130a1227
-DIST json-2.0.2.gem 138752 SHA256 400f60ac8282da80764c5d6fbb04c096390a85950bb488652abc1eb993b411d2 SHA512 88f5d5ad2277e29545dc88850637f5b4eb5919dd1bd5dfeefa79013c0a62ba97f7907e301509fef3d6b503c8a3b6e998f22c3abdcfeda633dbe3edd7d1389279 WHIRLPOOL 9e66182514cf44dc026f8e246bb1121f396f03c264e1e7be4ea16f4fe17367acf8986361687a9b8d4821e5587b4a28cf8c5fc6ad13a1f1c0f3d8f8dc4dae8659
-DIST json-2.0.3.gem 138752 SHA256 14e75b0de38ca662ef6a8f86ffb30fdf3516ba5cdae60c04369c181a4909fc32 SHA512 9041ebe6abc52db3ae5bc8b309148965e8e04931999685333a59ea85cf3d47c323554e58a10f2ee4e80a1815540d2a93fb49c981e76d4806a9d43842303778c8 WHIRLPOOL 008d7144e753ef38c78750613e7843839bf99306a86a09444ee4bdefa8d81a2d024e208c5998fce3f50deefa45cbb143b4a8c2b6f280b90353063d6eb389369c
+DIST json-1.8.6.gem 144384 SHA256 65af27ca985f70eb0d083aab0f75712c771871222af021ce533bad77bd3bb262 SHA512 8f393da080293965389df4a606e0604c500b4b267897b3c1b9007b7700dde8156f6598c25790e84fa20a7e03c7ae359a0b267c7b84e52dfe2a1ac83cf652ad9b WHIRLPOOL 0d55a8086f54eafa8e2d9e49e71436750b63c4bb7164fe06e5fa298f112f5612c428e3d4377e1ca824577d01eb21a6862b42236a147c85e9faa8a3f623184bf8
 DIST json-2.0.4.gem 138752 SHA256 ee1361f37fbd9f06d0de3976cd4320a84119aa41fa7f321eb67244404add3114 SHA512 24105aa06c205b6fe1cd835822d71b81299fdc47a45f48dd8f513f68f7fd12cdb51df476bcaef640916737d22be3156848ee4c9922c4a61aed5ca2d4d0d21c86 WHIRLPOOL 179f95dbfe21fbb8c3a8f97281b93892c167c7e3325d6ff182c0d0e4cc9e3a17bcea118311001756937c1e0e4be09ed7f117ffc824c24df18fc5cc5a31db93ce
 DIST json-2.1.0.gem 140800 SHA256 b76fd09b881088c6c64a12721a1528f2f747a1c2ee52fab4c1f60db8af946607 SHA512 bffbe462e952bca321d4325ecb9c5e9f61e51cad13758581ecfaa6a038bac4e30dc7db50bd897086a5592f6fc437d0e0909f91e279aaf4dd71cf127100c3550b WHIRLPOOL 94140475051d90e9b207c6d0224483b5ee0c371a27b7a4aafc612bc2e828cffb350afd4001ba20a3b5ddb124561da960cdb0d757bfbfbba031942d6bbb9cc641
--- a/dev-ruby/json/json-1.8.6.ebuild
+++ b/dev-ruby/json/json-1.8.6.ebuild
@ -1,12 +1,11 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=6
 USE_RUBY="ruby21 ruby22 ruby23 ruby24"

 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES TODO README.md README-json-jruby.markdown"

 RUBY_FAKEGEM_GEMSPEC="json.gemspec"

@ -14,10 +13,10 @@ inherit multilib ruby-fakegem

 DESCRIPTION="A JSON implementation as a Ruby extension"
 HOMEPAGE="https://github.com/flori/json"
-LICENSE="Ruby"
+LICENSE="|| ( Ruby GPL-2 )"

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

 RDEPEND="${RDEPEND}"
@ -32,7 +31,7 @@ all_ruby_prepare() {
 	# And use rdoc instead of sdoc which we don't have packaged
 	# And don't call git to list files. We're using the pregenerated spec anyway.
 	sed -i \
-		-e '/task :test/ s|:compile,||' \
+		-e 's| => :compile||' \
 		-e 's| => :clean||' \
 		-e 's|sdoc|rdoc|' \
 		-e 's|`git ls-files`|""|' \
@ -41,33 +40,29 @@ all_ruby_prepare() {
 	# Remove hardcoded and broken -O setting.
 	sed -i -e '/^  \(if\|unless\)/,/^  end/ s:^:#:' \
 		-e '/^unless/,/^end/ s:^:#:' ext/json/ext/*/extconf.rb || die
-
-	# Avoid setting gem since it will not be available yet when installing
-	sed -i -e '/gem/ s:^:#:' tests/test_helper.rb || die
-}
-
-each_ruby_configure() {
-	for ext in parser generator ; do
-		${RUBY} -Cext/json/ext/${ext} extconf.rb || die
-	done
 }

 each_ruby_compile() {
-	for ext in parser generator ; do
-		emake V=1 -Cext/json/ext/${ext}
-		cp ext/json/ext/${ext}/${ext}$(get_modname) ext/json/ext/ || die
-	done
+	# Since 1.5.0 a Java extension is provided but it does not compile.
+	if [[ $(basename ${RUBY}) != "jruby" ]]; then
+		${RUBY} -S rake compile || die "extension compile failed"
+	fi
 }

 each_ruby_test() {
-	for t in pure ext ; do
-		JSON=${T} ${RUBY} -S rake do_test_${t} || die
-	done
+	JSON=pure \
+	${RUBY} -Iext:lib -S testrb-2 tests/test_*.rb || die "pure ruby tests failed"
+
+	if [[ $(basename ${RUBY}) != "jruby" ]]; then
+		JSON=ext \
+		${RUBY} -Iext:lib -S testrb-2 tests/test_*.rb || die "ext ruby tests failed"
+	fi
 }

 each_ruby_install() {
 	each_fakegem_install
-
-	ruby_fakegem_newins ext/json/ext/generator$(get_modname) lib/json/ext/generator$(get_modname)
-	ruby_fakegem_newins ext/json/ext/parser$(get_modname) lib/json/ext/parser$(get_modname)
+	if [[ $(basename ${RUBY}) != "jruby" ]]; then
+		ruby_fakegem_newins ext/json/ext/generator$(get_modname) lib/json/ext/generator$(get_modname)
+		ruby_fakegem_newins ext/json/ext/parser$(get_modname) lib/json/ext/parser$(get_modname)
+	fi
 }
--- a/dev-ruby/json/json-2.0.1.ebuild
+++ b/dev-ruby/json/json-2.0.1.ebuild
@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_GEMSPEC="json.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A JSON implementation as a Ruby extension"
-HOMEPAGE="https://github.com/flori/json"
-LICENSE="Ruby"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="2"
-IUSE=""
-
-RDEPEND="${RDEPEND}"
-DEPEND="${DEPEND}
-	dev-util/ragel"
-
-ruby_add_bdepend "dev-ruby/rake
-	doc? ( dev-ruby/rdoc )"
-
-all_ruby_prepare() {
-	# Avoid building the extension twice!
-	# And use rdoc instead of sdoc which we don't have packaged
-	# And don't call git to list files. We're using the pregenerated spec anyway.
-	sed -i \
-		-e '/task :test/ s|:compile,||' \
-		-e 's| => :clean||' \
-		-e 's|sdoc|rdoc|' \
-		-e 's|`git ls-files`|""|' \
-		Rakefile || die "rakefile fix failed"
-
-	# Remove hardcoded and broken -O setting.
-	sed -i -e '/^  \(if\|unless\)/,/^  end/ s:^:#:' \
-		-e '/^unless/,/^end/ s:^:#:' ext/json/ext/*/extconf.rb || die
-
-	# Avoid setting gem since it will not be available yet when installing
-	sed -i -e '/gem/ s:^:#:' tests/test_helper.rb || die
-}
-
-each_ruby_configure() {
-	for ext in parser generator ; do
-		${RUBY} -Cext/json/ext/${ext} extconf.rb || die
-	done
-}
-
-each_ruby_compile() {
-	for ext in parser generator ; do
-		emake V=1 -Cext/json/ext/${ext}
-		cp ext/json/ext/${ext}/${ext}$(get_modname) ext/json/ext/ || die
-	done
-}
-
-each_ruby_test() {
-	for t in pure ext ; do
-		JSON=${T} ${RUBY} -S rake do_test_${t} || die
-	done
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	ruby_fakegem_newins ext/json/ext/generator$(get_modname) lib/json/ext/generator$(get_modname)
-	ruby_fakegem_newins ext/json/ext/parser$(get_modname) lib/json/ext/parser$(get_modname)
-}
--- a/dev-ruby/json/json-2.0.2.ebuild
+++ b/dev-ruby/json/json-2.0.2.ebuild
@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_GEMSPEC="json.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A JSON implementation as a Ruby extension"
-HOMEPAGE="https://github.com/flori/json"
-LICENSE="Ruby"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="2"
-IUSE=""
-
-RDEPEND="${RDEPEND}"
-DEPEND="${DEPEND}
-	dev-util/ragel"
-
-ruby_add_bdepend "dev-ruby/rake
-	doc? ( dev-ruby/rdoc )"
-
-all_ruby_prepare() {
-	# Avoid building the extension twice!
-	# And use rdoc instead of sdoc which we don't have packaged
-	# And don't call git to list files. We're using the pregenerated spec anyway.
-	sed -i \
-		-e '/task :test/ s|:compile,||' \
-		-e 's| => :clean||' \
-		-e 's|sdoc|rdoc|' \
-		-e 's|`git ls-files`|""|' \
-		Rakefile || die "rakefile fix failed"
-
-	# Remove hardcoded and broken -O setting.
-	sed -i -e '/^  \(if\|unless\)/,/^  end/ s:^:#:' \
-		-e '/^unless/,/^end/ s:^:#:' ext/json/ext/*/extconf.rb || die
-
-	# Avoid setting gem since it will not be available yet when installing
-	sed -i -e '/gem/ s:^:#:' tests/test_helper.rb || die
-}
-
-each_ruby_configure() {
-	for ext in parser generator ; do
-		${RUBY} -Cext/json/ext/${ext} extconf.rb || die
-	done
-}
-
-each_ruby_compile() {
-	for ext in parser generator ; do
-		emake V=1 -Cext/json/ext/${ext}
-		cp ext/json/ext/${ext}/${ext}$(get_modname) ext/json/ext/ || die
-	done
-}
-
-each_ruby_test() {
-	for t in pure ext ; do
-		JSON=${T} ${RUBY} -S rake do_test_${t} || die
-	done
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	ruby_fakegem_newins ext/json/ext/generator$(get_modname) lib/json/ext/generator$(get_modname)
-	ruby_fakegem_newins ext/json/ext/parser$(get_modname) lib/json/ext/parser$(get_modname)
-}
--- a/dev-ruby/multipart-post/multipart-post-2.0.0-r1.ebuild
+++ b/dev-ruby/multipart-post/multipart-post-2.0.0-r1.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5

-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"

 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
--- a/dev-ruby/rash/rash-0.4.0-r2.ebuild
+++ b/dev-ruby/rash/rash-0.4.0-r2.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"

 RUBY_FAKEGEM_RECIPE_TEST="rspec"

--- a/dev-ruby/simple_oauth/simple_oauth-0.3.1.ebuild
+++ b/dev-ruby/simple_oauth/simple_oauth-0.3.1.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5

-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"

 RUBY_FAKEGEM_RECIPE_TEST="rspec"

--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@ -1,3 +1 @@
-DIST valgrind-3.10.1.tar.bz2 10967905 SHA256 fa253dc26ddb661b6269df58144eff607ea3f76a9bcfe574b0c7726e1dfcb997 SHA512 8f3d27637c13b06381b3dd44088244e0cf2f7008f40e46f34322f2a5bfa6373d29ce68ff49f19c48f1a5f139d8be5838b9606206e0ce2599c5f74c0db8ce2642 WHIRLPOOL 3d55f35b02195d9859d9192726ea708277f1d3339005d959baa224822c5b71f5347cdd28c7fd8153c10d1e3282855e853caf9c7192751bebdbbc3444c33d885a
-DIST valgrind-3.11.0.tar.bz2 11910809 SHA256 6c396271a8c1ddd5a6fb9abe714ea1e8a86fce85b30ab26b4266aeb4c2413b42 SHA512 a25f97fa80aef4ad1e86b303886cd7a97aac248820a4c24e3d3dc26567dd7d2d86db237866468fd43885a9fb8534cb0a8e301a3c752fffbc231a2842272999da WHIRLPOOL a881df25e64789954d9bcb44617fd92d832ae9953689c01f8f79d737379c523a6f3a8125283518a6f256770a5c4f204b7b859794cf714abb0a742a69b272ef0e
 DIST valgrind-3.12.0.tar.bz2 12788556 SHA256 67ca4395b2527247780f36148b084f5743a68ab0c850cb43e4a5b4b012cf76a1 SHA512 2c083f7c2e74dc58600397726d9d3af7a2cea40fe3d8733149886d1d77867e6c09996e5be1c58dd932f3662acf7363e04eeadbc0f9c8f0dac089e605024229be WHIRLPOOL 136dd4f358bd18165a5801083cc73fc269a84bf491880af9842e789feea62181e16ca4c099db06fb4ffacf0cb0189b1b29d64790cc4202442f6f6b71ce4c6eea
--- a/dev-util/valgrind/valgrind-3.10.1.ebuild
+++ b/dev-util/valgrind/valgrind-3.10.1.ebuild
@ -1,117 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
-
-DESCRIPTION="An open-source memory debugger for GNU/Linux"
-HOMEPAGE="http://www.valgrind.org"
-SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="mpi"
-
-DEPEND="mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Correct hard coded doc location
-	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
-
-	# Don't force multiarch stuff on OSX, bug #306467
-	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
-
-	# Respect CFLAGS, LDFLAGS
-	epatch "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
-
-	# Changing Makefile.all.am to disable SSP
-	epatch "${FILESDIR}"/${PN}-3.7.0-fno-stack-protector.patch
-
-	# Yet more local labels, this time for ppc32 & ppc64
-	epatch "${FILESDIR}"/${PN}-3.6.0-local-labels.patch
-
-	# Don't build in empty assembly files for other platforms or we'll get a QA
-	# warning about executable stacks.
-	epatch "${FILESDIR}"/${PN}-3.10.1-non-exec-stack.patch
-
-	# glibc 2.19 fix
-	epatch "${FILESDIR}"/${PN}-3.9.0-glibc-2.19.patch
-
-	# valgrind works fine on linux-4, bug #543648
-	epatch "${FILESDIR}"/${PN}-3.10.1-linux-4.patch
-
-	# glibc 2.21 fix.  Bug #554808.
-	epatch "${FILESDIR}"/${PN}-3.10.1-glibc-2.21.patch
-
-	# glibc 2.22 fix.  Bug #580092
-	epatch "${FILESDIR}"/${PN}-3.10.1-glibc-2.22.patch
-
-	# Allow users to test their own patches
-	epatch_user
-
-	# Regenerate autotools files
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# Respect ar, bug #468114
-	tc-export AR
-
-	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
-	#                       while compiling insn_sse.c in none/tests/x86
-	# -fpie                 valgrind seemingly hangs when built with pie on
-	#                       amd64 (bug #102157)
-	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
-	#                       because valgrind doesn't link to glibc (bug #114347)
-	# -m64 -mx32			for multilib-portage, bug #398825
-	# -ggdb3                segmentation fault on startup
-	filter-flags -fomit-frame-pointer
-	filter-flags -fpie
-	filter-flags -fstack-protector
-	filter-flags -m64 -mx32
-	replace-flags -ggdb3 -ggdb2
-
-	if use amd64 || use ppc64; then
-		! has_multilib_profile && myconf="${myconf} --enable-only64bit"
-	fi
-
-	# Force bitness on darwin, bug #306467
-	use x86-macos && myconf="${myconf} --enable-only32bit"
-	use x64-macos && myconf="${myconf} --enable-only64bit"
-
-	# Don't use mpicc unless the user asked for it (bug #258832)
-	if ! use mpi; then
-		myconf="${myconf} --without-mpicc"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS FAQ.txt NEWS README*
-
-	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_names on shared libraries, can't turn them into bundles,
-		# as dyld won't load them any more then, bug #306467
-		local l
-		for l in "${ED}"/usr/lib/valgrind/*.so ; do
-			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Valgrind will not work if glibc does not have debug symbols."
-	elog "To fix this you can add splitdebug to FEATURES in make.conf"
-	elog "and remerge glibc.  See:"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
-}
--- a/dev-util/valgrind/valgrind-3.11.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.11.0.ebuild
@ -1,102 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
-
-DESCRIPTION="An open-source memory debugger for GNU/Linux"
-HOMEPAGE="http://www.valgrind.org"
-SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="mpi"
-
-DEPEND="mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Correct hard coded doc location
-	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
-
-	# Don't force multiarch stuff on OSX, bug #306467
-	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
-
-	# Respect CFLAGS, LDFLAGS
-	epatch "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
-
-	# Changing Makefile.all.am to disable SSP
-	epatch "${FILESDIR}"/${PN}-3.7.0-fno-stack-protector.patch
-
-	# Yet more local labels, this time for ppc32 & ppc64
-	epatch "${FILESDIR}"/${PN}-3.6.0-local-labels.patch
-
-	# Don't build in empty assembly files for other platforms or we'll get a QA
-	# warning about executable stacks.
-	epatch "${FILESDIR}"/${PN}-3.11.0-non-exec-stack.patch
-
-	# Allow users to test their own patches
-	epatch_user
-
-	# Regenerate autotools files
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# Respect ar, bug #468114
-	tc-export AR
-
-	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
-	#                       while compiling insn_sse.c in none/tests/x86
-	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
-	#                       because valgrind doesn't link to glibc (bug #114347)
-	# -m64 -mx32			for multilib-portage, bug #398825
-	# -ggdb3                segmentation fault on startup
-	filter-flags -fomit-frame-pointer
-	filter-flags -fstack-protector
-	filter-flags -m64 -mx32
-	replace-flags -ggdb3 -ggdb2
-
-	if use amd64 || use ppc64; then
-		! has_multilib_profile && myconf="${myconf} --enable-only64bit"
-	fi
-
-	# Force bitness on darwin, bug #306467
-	use x86-macos && myconf="${myconf} --enable-only32bit"
-	use x64-macos && myconf="${myconf} --enable-only64bit"
-
-	# Don't use mpicc unless the user asked for it (bug #258832)
-	if ! use mpi; then
-		myconf="${myconf} --without-mpicc"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS FAQ.txt NEWS README*
-
-	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_names on shared libraries, can't turn them into bundles,
-		# as dyld won't load them any more then, bug #306467
-		local l
-		for l in "${ED}"/usr/lib/valgrind/*.so ; do
-			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Valgrind will not work if glibc does not have debug symbols."
-	elog "To fix this you can add splitdebug to FEATURES in make.conf"
-	elog "and remerge glibc.  See:"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
-}
--- a/dev-util/valgrind/valgrind-3.12.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.12.0.ebuild
@ -10,7 +10,7 @@ SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="-* amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="mpi"

 DEPEND="mpi? ( virtual/mpi )"
--- a/dev-vcs/hg-git/hg-git-0.8.5.ebuild
+++ b/dev-vcs/hg-git/hg-git-0.8.5.ebuild
@ -16,7 +16,8 @@ KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-maco
 IUSE=""

 RDEPEND="
-	>=dev-vcs/mercurial-1.9.3[${PYTHON_USEDEP}]
+	>=dev-vcs/mercurial-2.8.2[${PYTHON_USEDEP}]
+	<=dev-vcs/mercurial-4.1.3[${PYTHON_USEDEP}]
 	>=dev-python/dulwich-0.9.7[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
--- a/dev-vcs/hg-git/hg-git-0.8.6.ebuild
+++ b/dev-vcs/hg-git/hg-git-0.8.6.ebuild
@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-ma
 IUSE=""

 RDEPEND="
-	>=dev-vcs/mercurial-1.9.3[${PYTHON_USEDEP}]
+	>=dev-vcs/mercurial-2.8.2[${PYTHON_USEDEP}]
 	>=dev-python/dulwich-0.9.7[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@ -710,10 +710,10 @@ kde5_src_install() {

 	cmake-utils_src_install

-	# We don't want ${PREFIX}/share/doc/HTML to be compressed,
+	# We don't want /usr/share/doc/HTML to be compressed,
 	# because then khelpcenter can't find the docs
-	if [[ -d ${ED}/${PREFIX}/share/doc/HTML ]]; then
-		docompress -x ${PREFIX}/share/doc/HTML
+	if [[ -d ${ED%/}/usr/share/doc/HTML ]]; then
+		docompress -x /usr/share/doc/HTML
 	fi
 }

--- a/games-rpg/runescape-launcher/Manifest
+++ b/games-rpg/runescape-launcher/Manifest
@ -1 +1 @@
-DIST runescape-launcher_2.2.4_amd64.deb 3015162 SHA256 3aa5cb2189c8ee0f2c95da1229b3fc30cacb1209ff794afc77ddb218684386df SHA512 981dbee9ce795f6a1d5bc0fb235b7f0325378e8d1d5a91b2fbe80d08954fb9818d8f5ddd8545dfb2d1246b21bedfac041d73e84cda1c38e4a3cfa076e128f408 WHIRLPOOL b7a10f33557030bbdeae159c5302d3302dde829f29d6a362a3b2306e158cba9ff7617546ed3999ae8d226546810b299eff2ccc2dc938959ab8cd4e7d4fe25515
+DIST runescape-launcher_2.2.4_amd64.deb 3018396 SHA256 500f6ee09510a56afcd5526bda0596eb42e7ad0edb032a8a2791310bc79987c0 SHA512 3c9c0e9a313541352cb54604748735053a8d6a4de46bbb9f04344cff3916d0d87532e59c25f51b7d64cb0c6afa98a1afc63586cae6464d3288c10ca076adf388 WHIRLPOOL 7955f710617fd0da6273478d6fe211a5b10c5ec1fdf212841d089f042442e5c172f3a2f47b5f0038cf3e6af4e626088be542af704dd7f4b152c180d8bb3a2501
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@ -1,3 +1,2 @@
 DIST graphite2-1.3.10.tgz 3889647 SHA256 90fde3b2f9ea95d68ffb19278d07d9b8a7efa5ba0e413bebcea802ce05cda1ae SHA512 d6d578feaa2d9304dc9bcd3926958070b8c23b27437a9fcb801e08e62f33a5549b7a6aa9636c7f8eb80a2a2c6d5cac97d58050fb30fd102b9fd0f8c558f4252b WHIRLPOOL 8a10ae32a7f02ad9e64982ece9b4b5169355f52160f8b9f00d1a892f785bbe14c2fdde24f5e84f6b8cbd7012edaf91b639beeeba400a3f6432b2436278a5df06
 DIST graphite2-1.3.8.tgz 3885841 SHA256 9f3f25b3a8495ce0782e77f69075c0dd9b7c054847b9bf9ff130bec38f4c8cc2 SHA512 df8a3a7b67b356092fe8d4f62b7cd6d45ee7fe2b614699b0f8b29dc2441e00675021fdaec24cef4629c5294b33d6b269d596bc869fae8257f8f2e935c9db3639 WHIRLPOOL 88420608db053bd4d66b852a54eeb19359910c786ef1785e303e68f0d0d5b840b4a5cdcb7e17ae6c2064563d02b03a7be43ae203184218a8ac4d9dd40c17c56f
-DIST graphite2-1.3.9.tgz 3889102 SHA256 ec0185b663059553fd46e8c4a4f0dede60a02f13a7a1fefc2ce70332ea814567 SHA512 6585a2b69b8226d6e9ba9ef67d94497b24f09b7ca64357c5455c276cf6f0dd3eb7fc05f5fbc79d0bb5e62ecd44e9e19bc4f4c20f7a1d9d6eeb2f89f67af5f1ac WHIRLPOOL b0ca8ca8b79319cf8806c4e0ee4bf61b240c6537c66cd57d191d74e2001b2eeb91ab19db3bf28aaddb9ab916e3f073fefd51bba3cb96f6b2ebde5a28c0bf3ea1
--- a/media-gfx/graphite2/graphite2-1.3.8.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.8.ebuild
@ -1,118 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-GENTOO_DEPEND_ON_PERL="no"
-inherit eutils perl-module python-any-r1 cmake-multilib
-
-DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems"
-HOMEPAGE="http://graphite.sil.org/"
-SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="perl test"
-
-RDEPEND="
-	perl? ( dev-lang/perl:= )
-"
-DEPEND="${RDEPEND}
-	perl? (
-		dev-perl/Module-Build
-		dev-perl/Locale-Maketext-Lexicon
-		)
-	test? (
-		dev-libs/glib:2
-		media-libs/fontconfig
-		$(python_gen_any_dep '
-			dev-python/fonttools[${PYTHON_USEDEP}]
-		')
-		${PYTHON_DEPS}
-		perl? ( virtual/perl-Test-Simple )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.5-includes-libs-perl.patch"
-)
-
-pkg_setup() {
-	use perl && perl_set_version
-	use test && python-any-r1_pkg_setup
-}
-
-python_check_deps() {
-	has_version "dev-python/fonttools[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# make tests optional
-	if ! use test; then
-		sed -i \
-			-e '/tests/d' \
-			CMakeLists.txt || die
-	fi
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"-DVM_MACHINE_TYPE=direct"
-		# https://sourceforge.net/p/silgraphite/bugs/49/
-		$([[ ${CHOST} == powerpc*-apple* ]] && \
-			echo "-DGRAPHITE2_NSEGCACHE:BOOL=ON")
-	)
-
-	cmake-utils_src_configure
-
-	# fix perl linking
-	if multilib_is_native_abi && use perl; then
-		# we rely on the fact that cmake-utils_src_configure sets BUILD_DIR
-		sed -i \
-			-e "s:@BUILD_DIR@:\"${BUILD_DIR}/src\":" \
-			"${S}"/contrib/perl/Build.PL || die
-	fi
-}
-
-src_compile() {
-	cmake-multilib_src_compile
-	if use perl; then
-		cd contrib/perl || die
-		perl-module_src_configure
-		perl-module_src_compile
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		cmake-utils_src_test
-	else
-		einfo Cannot test since python is not multilib.
-	fi
-}
-
-src_test() {
-	cmake-multilib_src_test
-	if use perl; then
-		cd contrib/perl || die
-		# SRC_TEST=do
-		# Perl tests fail due to missing POD coverage...
-		perl-module_src_test
-	fi
-}
-
-src_install() {
-	cmake-multilib_src_install
-	if use perl; then
-		cd contrib/perl || die
-		perl-module_src_install
-		perl_delete_localpod
-	fi
-
-	prune_libtool_files --all
-}
--- a/Show More
+++ b/Show More