Merge updates from master

author: Repository QA checks <repo-qa-checks@gentoo.org> 2018-05-27 11:43:59 +0000
committer: Repository QA checks <repo-qa-checks@gentoo.org> 2018-05-27 11:43:59 +0000
commit: 3bba99e51f0975671bb33c87d6694c25a59193fb (patch)
tree: fb1b83fce30bd53939d208d5aa7995fc26d7ed8c
parent: Merge updates from master (diff)
parent: sys-fs/udev: arm stable wrt bug #655712 (diff)
download: gentoo-3bba99e51f0975671bb33c87d6694c25a59193fb.tar.gz
gentoo-3bba99e51f0975671bb33c87d6694c25a59193fb.tar.bz2
gentoo-3bba99e51f0975671bb33c87d6694c25a59193fb.zip
92 files changed, 958 insertions, 1126 deletions
diff --git a/app-admin/systemrescuecd-x86/metadata.xml b/app-admin/systemrescuecd-x86/metadata.xml
index 5297bd0ea616..823bc77a91fb 100644
--- a/app-admin/systemrescuecd-x86/metadata.xml
+++ b/app-admin/systemrescuecd-x86/metadata.xml
@@ -5,6 +5,7 @@
     <email>mgorny@gentoo.org</email>
     <name>Michał Górny</name>
   </maintainer>
+  <stabilize-allarches/>
   <use>
     <flag name="isohybrid">
       Pass downloaded images through isohybrid in order to make it
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.2.ebuild
index 7bfc35a7dd27..1ceb856d826f 100644
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.2.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
 
 LICENSE="GPL-2"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+isohybrid"
 
 DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
diff --git a/app-arch/lzop/Manifest b/app-arch/lzop/Manifest
index 082ee581c480..f21b8f488a02 100644
--- a/app-arch/lzop/Manifest
+++ b/app-arch/lzop/Manifest
@@ -1,2 +1 @@
-DIST lzop-1.03.tar.gz 370775 BLAKE2B c3932c18e13dee788ad405e8241e2366497fae66a7966131baf1880c10974839df12456f6986d975929f7e6005a5dce9887a8af0a2415ec7700ce5b68cf1e100 SHA512 a7a46793e060690f7da3e9dcae8e19f9c3633b84bc6e4a9a7fbf7791361fc7795e00f1d820978b20df8731c165b37244f11203a2936640688e4ade0cc2f5f3d7
 DIST lzop-1.04.tar.gz 393483 BLAKE2B ebeceac9492ce45e6976cd5cde262d9755286e1649802e3e16bfae0abdd74714bf86b076816aa309542cadef5bb65971342208763e1b2761fce2332dc9daa38c SHA512 5829b4495ffefab549aa697a05c536ce593c572c9eee6004460583a0090abcd317c6074c4f981dfee6be61ac8d127f02dd37053b6cb782af64db41586a8bbb6e
diff --git a/app-arch/lzop/lzop-1.03.ebuild b/app-arch/lzop/lzop-1.03.ebuild
deleted file mode 100644
index ad00dfc6053c..000000000000
--- a/app-arch/lzop/lzop-1.03.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Utility for fast (even real-time) compression/decompression"
-HOMEPAGE="http://www.lzop.org/"
-SRC_URI="http://www.lzop.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/lzo-2"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-x32.patch #575450
-	"${FILESDIR}"/${P}-gcc6.patch #594472
-)
-
-HTML_DOCS=( doc/lzop.html )
-
-src_test() {
-	einfo "compressing config.status to test"
-	src/lzop config.status || die 'compression failed'
-	ls -la config.status{,.lzo}
-	src/lzop -t config.status.lzo || die 'lzo test failed'
-	src/lzop -dc config.status.lzo | diff config.status - || die 'decompression generated differences from original'
-}
-
-src_install() {
-	default
-	dodoc doc/lzop.{txt,ps}
-}
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index 8f0b00eb8655..60e8583cc5d2 100644
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@@ -1,2 +1 @@
-DIST snappy-1.1.3.tar.gz 1509026 BLAKE2B d8dbb6e92d1788f7b13e6e36aa0297cfcb28d664fb625d0798831ccd00de818675c224821359cc66f38f274da248725737510a85b01a36efe07aa4c9a8bcfda4 SHA512 4c4f47c657a072989179be9df0e5e98d14f4a67c27ec7ae0e5a15d14289a75d4e266bc6c5c89723f3e9860408ffcc7138a815f8ad9299407c4a1946fc00ab5bf
 DIST snappy-1.1.7.tar.gz 1090550 BLAKE2B e389c96e093de5db92b896a7fa17a90d3ad0be07972e279321f24875f0f0c8c704ff478f4902a6356d458f93c249e3e06424d5a4efc9753a23ab12b7ee83a088 SHA512 32046f532606ba545a4e4825c0c66a19be449f2ca2ff760a6fa170a3603731479a7deadb683546e5f8b5033414c50f4a9a29f6d23b7a41f047e566e69eca7caf
diff --git a/app-arch/snappy/snappy-1.1.3-r1.ebuild b/app-arch/snappy/snappy-1.1.3-r1.ebuild
deleted file mode 100644
index 56a519b607b3..000000000000
--- a/app-arch/snappy/snappy-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib-minimal
-
-DESCRIPTION="A high-speed compression/decompression library by Google"
-HOMEPAGE="https://github.com/google/snappy"
-SRC_URI="https://github.com/google/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-src_prepare() {
-	# Avoid automagic lzo and gzip by not checking for it
-	sed -i '/^CHECK_EXT_COMPRESSION_LIB/d' configure.ac || die
-
-	# don't install unwanted files
-	sed -i 's/COPYING INSTALL//' Makefile.am || die
-
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--without-gflags
-		--disable-gtest
-		$(use_enable static-libs static)
-	)
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_install_all() {
-	find "${ED%/}"/usr/lib* -name '*.la' -delete || die
-}
diff --git a/app-emulation/armv8-fast-model/Manifest b/app-emulation/armv8-fast-model/Manifest
deleted file mode 100644
index bf823aae7bd6..000000000000
--- a/app-emulation/armv8-fast-model/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FM000-KT-00035-r0p8-52rel06.tgz 9429294 SHA256 a011c7549029fe5c475f2d495b225b93317a44eb3da0f19f2825ad831c64d899 SHA512 349470432e8dba9e52eba88b577b22fdd9e3ce865288a3dc1540c58e1e10b4f2c14f084f7a4928993e4d1d3bc7cfbbf235f2575394254f09a8d845b7b2993f12 WHIRLPOOL e95ed1315f264ed82f2debd903ad69a6437798d88727e275285d1d06c5da1a5841b9955e93b6dbdc446ad652ef383a37cfe0f43a3888f23ec428a67a765e6ac7
diff --git a/app-emulation/armv8-fast-model/armv8-fast-model-0.8.5206.ebuild b/app-emulation/armv8-fast-model/armv8-fast-model-0.8.5206.ebuild
deleted file mode 100644
index 7d236f0f89cb..000000000000
--- a/app-emulation/armv8-fast-model/armv8-fast-model-0.8.5206.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib
-
-MY_P="FM000-KT-00035-r${PV:0:1}p${PV:2:1}-${PV:0-4:2}rel${PV:0-2}"
-DESCRIPTION="emulator for a basic ARMv8 platform environment (for running bare metal & Linux)"
-HOMEPAGE="https://silver.arm.com/browse/FM00A"
-SRC_URI="https://silver.arm.com/download/Development_Tools/ESL:_Fast_Models/Fast_Models/${MY_P}/${MY_P}.tgz"
-
-LICENSE="ARM-FAST-MODEL"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="examples"
-RESTRICT="fetch strip"
-
-RDEPEND="sys-libs/glibc
-	sys-devel/gcc"
-
-S="${WORKDIR}/Foundation_v8pkg"
-
-QA_PREBUILT="
-	opt/${PN}/bin/Foundation_v8
-	opt/${PN}/*/lib*.so*
-"
-
-pkg_nofetch() {
-	einfo "Please visit this URL to download the package:"
-	einfo " ${SRC_URI}"
-	einfo "Then stick it into ${DISTDIR}"
-}
-
-src_install() {
-	into /opt/${PN}
-	pushd models/Linux64_GCC-4.1 >/dev/null
-	dobin Foundation_v8
-	dolib.so lib*.so*
-	popd >/dev/null
-
-	dodir /opt/bin
-	make_wrapper Foundation_v8 /opt/${PN}/bin/Foundation_v8 '' /opt/${PN}/$(get_libdir) /opt/bin
-
-	dodoc doc/*.{pdf,txt}
-	use examples && dodoc -r examples
-}
diff --git a/app-emulation/armv8-fast-model/metadata.xml b/app-emulation/armv8-fast-model/metadata.xml
deleted file mode 100644
index 3101c4efc863..000000000000
--- a/app-emulation/armv8-fast-model/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>arm@gentoo.org</email>
-	<name>Gentoo Linux ARM Development</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-i18n/poedit/Manifest b/app-i18n/poedit/Manifest
index 32d3d47c50b7..90c4b3e1128a 100644
--- a/app-i18n/poedit/Manifest
+++ b/app-i18n/poedit/Manifest
@@ -1,2 +1,2 @@
-DIST poedit-1.8.5.tar.gz 2404829 BLAKE2B f39a7e2e14dab9c0ed0b761a3feb271c8eb0e3b1fdc09c77c6a3dfaaa499e3419881e0959f5a53b07754810adc1518efd4c56a1bb4fd490c1e2a405a7d44ef1c SHA512 87eae2bcedc07eefb097edf263db10b3947956cfa504eddb259e3c3cfed6215ad0da4517fe5132b61041c39a7fbabd298ca42582570295bacbbd62d5ffc6f6a7
 DIST poedit-2.0.6.tar.gz 2511777 BLAKE2B f28e8940310e80ee15fc70f10492e061097f88b62938f8a85194170fd107100c739dbfd1c1cf12516e6fe3d2a9b282986a4368615cf8fcb2ac889075fe64cc6b SHA512 e7beceeb4cd9e4e0269666d634e48622f175a7788219288ba6349a5b15f8360a929018480372e3eecb664d7d2e3093d6788640651696323d6dda0f0780aa5cd2
+DIST poedit-2.0.7.tar.gz 2558220 BLAKE2B e4a958e516a5c4b56331b6f9f37d9fa627072a4a161f17b9e809df86af7ab86130c704b9f41d081a86dbc2dc3b24acf62615e843b73f78874c42730bd46f9b55 SHA512 7b8b41b5f55252b1845c452edbdad56dc841c507c4fb7a24267bd2af8490610f5f3eb72f31ed4d062fdaef939ef4ecd9c30ddc85a5dad3a792ac5857567dac71
diff --git a/app-i18n/poedit/poedit-1.8.5.ebuild b/app-i18n/poedit/poedit-1.8.5.ebuild
deleted file mode 100644
index 7cce16eeb1cc..000000000000
--- a/app-i18n/poedit/poedit-1.8.5.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-WX_GTK_VER=3.0
-
-PLOCALES="af am an ar ast az be@latin be bg bn br bs ca ca@valencia ckb co cs da de el en_GB eo es et eu fa fi fr fur fy_NL ga gl he hi hr hu hy id is it ja kab ka kk ko ku ky lt lv mk mn mr ms nb ne nl nn oc pa pl pt_BR pt_PT ro ru sk sl sq sr sv ta tg th tr tt ug uk ur uz vi wa zh_CN zh_TW"
-
-inherit eutils flag-o-matic gnome2-utils l10n wxwidgets xdg-utils
-
-DESCRIPTION="GUI editor for gettext translations files"
-HOMEPAGE="https://poedit.net"
-SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
-IUSE=""
-
-# db/expat req for legacytm (backwards support for pre 1.6)
-# we currently have 1.5.5 in stable so this is enabled
-RDEPEND="
-	app-text/gtkspell:2
-	dev-cpp/lucene++
-	dev-libs/boost:=[nls]
-	dev-libs/expat
-	dev-libs/icu:=
-	||	(
-		=sys-libs/db-5*:*[cxx]
-		=sys-libs/db-4*:*[cxx]
-		)
-	<sys-libs/db-6:=[cxx]
-	x11-libs/gtk+:2
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	my_rm_loc() {
-		sed -i -e "/^POEDIT_LINGUAS = /s: ${1}::" locales/Makefile.in || die
-		rm "locales/${1}.mo" || die
-	}
-	l10n_find_plocales_changes 'locales' '' '.mo'
-	l10n_for_each_disabled_locale_do my_rm_loc
-
-	append-flags -Wno-deprecated-declarations
-}
-
-src_configure() {
-	econf --without-cpprest --without-cld2
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS README
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/poedit/poedit-2.0.7.ebuild b/app-i18n/poedit/poedit-2.0.7.ebuild
new file mode 100644
index 000000000000..b5857296a23e
--- /dev/null
+++ b/app-i18n/poedit/poedit-2.0.7.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER=3.0-gtk3
+
+PLOCALES="an ar az be be@latin bg bs ca ckb co cs da de el en_GB es et eu fa fi fr ga gl he hr hu hy id is it ja ka kab kk ko lt lv ms nb nl oc pa pl pt_BR pt_PT ro ru sk sl sq sr sv tg th tr uk uz vi zh_CN zh_TW"
+
+inherit gnome2-utils l10n wxwidgets xdg
+
+DESCRIPTION="GUI gettext translations editor"
+HOMEPAGE="https://poedit.net"
+SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	app-text/gtkspell:3
+	x11-libs/gtk+:3
+	>=dev-cpp/lucene++-3.0.5
+	dev-libs/boost:=[nls]
+	dev-libs/icu:=
+	>=x11-libs/wxGTK-3.0.3:${WX_GTK_VER}[X]
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	my_rm_loc() {
+		sed -i -e "/^POEDIT_LINGUAS = /s: ${1}::" locales/Makefile.in || die
+		rm "locales/${1}.mo" || die
+	}
+	l10n_find_plocales_changes 'locales' '' '.mo'
+	l10n_for_each_disabled_locale_do my_rm_loc
+
+	setup-wxwidgets
+	xdg_src_prepare
+}
+
+src_configure() {
+	econf --without-cpprest --without-cld2
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch
new file mode 100644
index 000000000000..5973b6ae67cb
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch
@@ -0,0 +1,13 @@
+diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
+index 457aedce0acb..4f02cf2b4040 100644
+--- a/sw/qa/extras/rtfimport/rtfimport.cxx
++++ b/sw/qa/extras/rtfimport/rtfimport.cxx
+@@ -1352,7 +1352,7 @@ DECLARE_RTFIMPORT_TEST(testImportHeaderFooter, "tdf108055.rtf")
+ DECLARE_RTFIMPORT_TEST(testTdf108947, "tdf108947.rtf")
+ {
+     //Check page count
+-    CPPUNIT_ASSERT_EQUAL(2, getPages());
++    CPPUNIT_ASSERT_EQUAL(1, getPages());
+ 
+     //Check if Headers/Footers contain what they should in this document
+     uno::Reference<text::XText> xHeaderTextRight = getProperty<uno::Reference<text::XText>>(
+\ No newline at end of file
diff --git a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
index f2f3c1674e61..b95fd784f386 100644
--- a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
@@ -249,6 +249,7 @@ PATCHES=(
 
 	# TODO: upstream
 	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+	"${FILESDIR}/${PN}-6.0.3.2-testTdf108947.patch" #bug 656600
 
 	# gtk3-kde5 vcl plugin backported from master
 	"${WORKDIR}"/${PATCHSET/.tar.xz/}
diff --git a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
index c29d9ffa33db..f50cbbd0996a 100644
--- a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
@@ -248,6 +248,7 @@ PATCHES=(
 
 	# TODO: upstream
 	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+	"${FILESDIR}/${PN}-6.0.3.2-testTdf108947.patch" #bug 656600
 
 	# gtk3-kde5 vcl plugin backported from master
 	"${WORKDIR}"/${PATCHSET/.tar.xz/}
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index c29d9ffa33db..f50cbbd0996a 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -248,6 +248,7 @@ PATCHES=(
 
 	# TODO: upstream
 	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+	"${FILESDIR}/${PN}-6.0.3.2-testTdf108947.patch" #bug 656600
 
 	# gtk3-kde5 vcl plugin backported from master
 	"${WORKDIR}"/${PATCHSET/.tar.xz/}
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 45222450d1f2..558cf0dce7df 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -340,7 +340,7 @@ src_prepare() {
 
 	if use branding; then
 		# hack...
-		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/galaxy/brand/intro.png" || die
+		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
 	fi
 
 	# Don't list pdfimport support in desktop when built with none, bug # 605464
diff --git a/app-portage/diffmask/diffmask-0.3.3-r3.ebuild b/app-portage/diffmask/diffmask-0.3.3-r3.ebuild
deleted file mode 100644
index 7baf9d9b47ce..000000000000
--- a/app-portage/diffmask/diffmask-0.3.3-r3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A utility to maintain package.unmask entries up-to-date with masks"
-HOMEPAGE="https://github.com/mgorny/diffmask/"
-SRC_URI="https://github.com/mgorny/diffmask/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	|| (
-		sys-apps/portage[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-	)"
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index b764cdeecb4a..f2d4d3233d46 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,3 +1,2 @@
-DIST gemato-12.1.tar.gz 66807 BLAKE2B 7a6155f337d382bdea7fb4f0bbcb0982e8d4237502dfa7fd8006754bc15e2bfe1f58f133f8cc24ee39eaf947e0770f9ff0672769daa0f03d790ef88958877417 SHA512 7d6287b335121d38859e43ce0818ebb86c51105ed836594f0540fda5ff683a6e58ce09b7dad9cea0667e6379cca6902225b095a3d0922a12cd8c62a36b11386c
 DIST gemato-12.2.tar.gz 66897 BLAKE2B 85ca439620afdb2045e571ed7a11f3eb8ce85e41c0984ad51af3b9d22c0926138eda0c7b02e1d70e200eb8c93cf4003e61f901e0fd5fd28861217b02a1e3ab64 SHA512 10ba7da5de3b90722b0bdcf9d3766a7c83c68d29d23e49744a31b0c8ad80eaa4917dff2fbd9f12ef2fa4fde03244e79f6fe5e9c108db7fb64fd6ea68fa0eb81c
 DIST gemato-13.0.tar.gz 66899 BLAKE2B e75a16d6a26f010801df072154897a485e9aee6434cf60962d59d11fda70b790284a734d9137ccc7910b0a95278d922640aece45e42ca497d1118e01992c2a15 SHA512 0ca17f1df8606e09a88411d75d144094bd13e440b04721175c8d9a3ea92fc616b34de0c80c817898ee94a1d82e37e4de50319634a351a52bccaec9653ad2f166
diff --git a/app-portage/gemato/gemato-12.1.ebuild b/app-portage/gemato/gemato-12.1.ebuild
deleted file mode 100644
index 41600021c7a3..000000000000
--- a/app-portage/gemato/gemato-12.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# pyblake2 & pysha3 are broken with pypy3
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
-PYTHON_REQ_USE='threads(+)'
-inherit distutils-r1
-
-DESCRIPTION="Stand-alone Manifest generation & verification tool"
-HOMEPAGE="https://github.com/mgorny/gemato"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd"
-IUSE="+blake2 bzip2 +gpg lzma sha3 test"
-
-MODULE_RDEPEND="
-	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
-	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
-	gpg? ( app-crypt/gnupg )
-	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
-	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )"
-
-RDEPEND="${MODULE_RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${MODULE_RDEPEND} )"
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-portage/gentoopm/gentoopm-0.3.0.ebuild b/app-portage/gentoopm/gentoopm-0.3.0.ebuild
index 305f093bd468..1adbbdf76b0f 100644
--- a/app-portage/gentoopm/gentoopm-0.3.0.ebuild
+++ b/app-portage/gentoopm/gentoopm-0.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/gentoopm/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 arm ~mips x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/app-portage/gentoopm/metadata.xml b/app-portage/gentoopm/metadata.xml
index 1ddb67ad7e6c..96a81859dd9c 100644
--- a/app-portage/gentoopm/metadata.xml
+++ b/app-portage/gentoopm/metadata.xml
@@ -5,6 +5,7 @@
     <email>mgorny@gentoo.org</email>
     <name>Michał Górny</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <maintainer status="active">
       <email>mgorny@gentoo.org</email>
diff --git a/app-shells/mpv-bash-completion/mpv-bash-completion-3.3.16.ebuild b/app-shells/mpv-bash-completion/mpv-bash-completion-3.3.16.ebuild
index f5f6bc361f17..bb3736da0fec 100644
--- a/app-shells/mpv-bash-completion/mpv-bash-completion-3.3.16.ebuild
+++ b/app-shells/mpv-bash-completion/mpv-bash-completion-3.3.16.ebuild
@@ -30,6 +30,10 @@ src_prepare() {
 }
 
 src_compile() {
+	# Prevent access violations from completion generation.
+	# See Gentoo bug 656086.
+	addpredict /dev/dri
+
 	$(usex luajit 'luajit' 'lua') gen.lua > mpv || die
 }
 
diff --git a/app-shells/posh/Manifest b/app-shells/posh/Manifest
index e98766d65025..d5057c0685d7 100644
--- a/app-shells/posh/Manifest
+++ b/app-shells/posh/Manifest
@@ -1,2 +1 @@
-DIST posh_0.12.6.tar.xz 268872 BLAKE2B 8fef9e682344ca40b83c68ea639d1d684a6d743c97e07e3279b6d11928b0b28e2c8014f1d11e36a3374851c4ad41f078ff7e630954740c460318a70b8ed42677 SHA512 2b862264dd13c840facb158f1e2731dd1f11c7a567308feb6bd80fd5a7ea4d8e383cc13a0819f90da5fdad70d0adcc81e5adf2bd69a7a171e2e874f82509123c
 DIST posh_0.13.1.tar.xz 267436 BLAKE2B f534f64595eda7649a146555238309aba00ec79d53206b17c91ba9ed44ab47794541952af670c5040133d164167e8f2bc844fc4b3b646035e0d08e8495d7aedf SHA512 957fc2924ab8f634007db2e15ecdbb8a1c60ffb4917c127c1583c05e222f598a564906cc40c869c95d79995ea85af24010780e7d36d44a5907a691aa9044f23a
diff --git a/app-shells/posh/posh-0.12.6.ebuild b/app-shells/posh/posh-0.12.6.ebuild
deleted file mode 100644
index e887cb0b3f9e..000000000000
--- a/app-shells/posh/posh-0.12.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Reimplementation of Bourne shell based on pdksh"
-HOMEPAGE="https://packages.debian.org/posh"
-SRC_URI="mirror://debian/pool/main/p/posh/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="app-arch/xz-utils"
-
-S=${WORKDIR}/posh
-
-src_configure() {
-	local myconf=(
-		--exec-prefix="${EPREFIX:-/}"
-	)
-	econf "${myconf[@]}"
-}
diff --git a/dev-db/redis/redis-3.2.8-r5.ebuild b/dev-db/redis/redis-3.2.8-r5.ebuild
index b59739ff808c..6a28e4c4b95d 100644
--- a/dev-db/redis/redis-3.2.8-r5.ebuild
+++ b/dev-db/redis/redis-3.2.8-r5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://redis.io/"
 SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+jemalloc tcmalloc luajit test"
 SLOT="0"
 
diff --git a/dev-db/redis/redis-4.0.2-r1.ebuild b/dev-db/redis/redis-4.0.2-r1.ebuild
index 133718b4c145..dd90a7deb368 100644
--- a/dev-db/redis/redis-4.0.2-r1.ebuild
+++ b/dev-db/redis/redis-4.0.2-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://redis.io/"
 SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+jemalloc tcmalloc luajit test"
 SLOT="0"
 
diff --git a/dev-lang/lazarus/Manifest b/dev-lang/lazarus/Manifest
index a377571f7675..9f88fd302ef3 100644
--- a/dev-lang/lazarus/Manifest
+++ b/dev-lang/lazarus/Manifest
@@ -3,3 +3,4 @@ DIST lazarus-1.6.2-0.tar.gz 55949169 BLAKE2B e8d4c4f786bffea4eec9ed326ba00acca93
 DIST lazarus-1.6.4-0.tar.gz 57180961 BLAKE2B 930beda6ad04999e749fe4b76a64ab00b0138c18b0f3aea0cbac089ecb3f419aa4165d06757d6ee2d3c6e43401f2be5e154947d07f892a6bc5f4bb8831bad62d SHA512 d7d498483ef9e1eebd0d8ca2325d1984cb1297837ebe2f9547e67f26fc049c2168e2feeac739b8403c08a8251040e9161c962d25951545384ffbdbb076fda2aa
 DIST lazarus-1.8.0.tar.gz 62114372 BLAKE2B 8593e384ef5e311f3a777422a255e292d2d4c240baac0cb12778bb23e59d76301d75c9133585fd45af3ad0290b242ed5640a6dd9b27e1197d325e2ae5845495f SHA512 dd5e02e9c0a057cf9a6b2c15605969cf4cb743aa78fc81bfdc7c566434127893cf32bab5bd1729f79b51c611bf9ae015bea8d774e0544ead42a064f1224ffd7b
 DIST lazarus-1.8.2.tar.gz 62935678 BLAKE2B f993e9630ab932a7a7f7bcf488d179d33a6dfef6c1de749d01c12f91f894bccd05a784ec2e2b89a9565421a192abce6c1675df2676bfff2fd8307d2ab4828db5 SHA512 3dddbf3bfacb0b04c427086c911a4ff67be0d5b291d23c1efce2d813e2cbd2e26b54b2851b5ad223f8df8c2652c002bc684a54c936a0a77c85ccdce08651531b
+DIST lazarus-1.8.4.tar.gz 63130653 BLAKE2B f9b2ba9971f1a9a9c3b8d2004bd3516c12db5384bb6243ef275c2fc0d458634fba0c1c23e7ecd5c160c1204d6cc2b4ebc340ce8bb5cfdd9c531f8c36ae59d1e2 SHA512 82cdc3c32dddf8e67c0bed9292a9a924227bab50f22ca479f5e98ecccbf60dd66c7f886ecb8e2979d9d8fccc3d25462ee8c55fcab085aa4194b4704660e0b95d
diff --git a/dev-lang/lazarus/lazarus-1.8.4.ebuild b/dev-lang/lazarus/lazarus-1.8.4.ebuild
new file mode 100644
index 000000000000..5a5cd58c19aa
--- /dev/null
+++ b/dev-lang/lazarus/lazarus-1.8.4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop
+
+FPCVER="3.0.4"
+
+DESCRIPTION="Lazarus IDE is a feature rich visual programming environment emulating Delphi"
+HOMEPAGE="https://www.lazarus-ide.org/"
+SRC_URI="https://sourceforge.net/projects/${PN}/files/Lazarus%20Zip%20_%20GZip/Lazarus%20${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
+SLOT="0" # Note: Slotting Lazarus needs slotting fpc, see DEPEND.
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal"
+
+DEPEND=">=dev-lang/fpc-${FPCVER}[source]
+	net-misc/rsync
+	x11-libs/gtk+:2
+	>=sys-devel/binutils-2.19.1-r1:="
+RDEPEND="${DEPEND}
+	!=gnome-base/librsvg-2.16.1"
+
+RESTRICT="strip" #269221
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.9.26-fpcsrc.patch )
+
+src_prepare() {
+	default
+	# Use default configuration (minus stripping) unless specifically requested otherwise
+	if ! test ${PPC_CONFIG_PATH+set} ; then
+		local FPCVER=$(fpc -iV)
+		export PPC_CONFIG_PATH="${WORKDIR}"
+		sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg |
+			sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
+	fi
+}
+
+src_compile() {
+	LCL_PLATFORM=gtk2 emake \
+		$(usex minimal "" "bigide") \
+		-j1
+}
+
+src_install() {
+	diropts -m0755
+	dodir /usr/share
+	# Using rsync to avoid unnecessary copies and cleaning...
+	# Note: *.o and *.ppu are needed
+	rsync -a \
+		--exclude="CVS"     --exclude=".cvsignore" \
+		--exclude="*.ppw"   --exclude="*.ppl" \
+		--exclude="*.ow"    --exclude="*.a"\
+		--exclude="*.rst"   --exclude=".#*" \
+		--exclude="*.~*"    --exclude="*.bak" \
+		--exclude="*.orig"  --exclude="*.rej" \
+		--exclude=".xvpics" --exclude="*.compiled" \
+		--exclude="killme*" --exclude=".gdb_hist*" \
+		--exclude="debian"  --exclude="COPYING*" \
+		--exclude="*.app" \
+		"${S}" "${ED%/}"/usr/share \
+		|| die "Unable to copy files!"
+
+	dosym ../share/lazarus/startlazarus /usr/bin/startlazarus
+	dosym ../share/lazarus/startlazarus /usr/bin/lazarus
+	dosym ../share/lazarus/lazbuild /usr/bin/lazbuild
+	use minimal || dosym ../share/lazarus/components/chmhelp/lhelp/lhelp /usr/bin/lhelp
+	dosym ../lazarus/images/ide_icon48x48.png /usr/share/pixmaps/lazarus.png
+
+	make_desktop_entry startlazarus "Lazarus IDE" "lazarus" || die "Failed making desktop entry!"
+}
diff --git a/dev-lang/python-exec/Manifest b/dev-lang/python-exec/Manifest
index e8877dd4a63c..718cdfe08391 100644
--- a/dev-lang/python-exec/Manifest
+++ b/dev-lang/python-exec/Manifest
@@ -1,2 +1,2 @@
-DIST python-exec-2.4.4.tar.bz2 86945 BLAKE2B 3ee2be57711c45e5821ba4cc54e76e4341056221a34277ced8ab5ebffc4d6af63fbe515f73bd84a1a7a82047a008b72fd2935e61b09b0b852624329b3be22e37 SHA512 26b76960430dc3b2b79aab5e8a72498144d4e78bed5291fe9361afe081f0e8d70049a74ec29384cb0fc199f76c23499324d2eddcaea521ef33d88e61b1b674f9
 DIST python-exec-2.4.5.tar.bz2 87137 BLAKE2B 2434bee0bcc64a78a83254d6b6f733ef0748d8209ff70654fc57ac50563d4f32be64705a3c56eefef4e173a238b272d00bef4929982a729a097b82a3a2b0b5b1 SHA512 8c1a520c565afa775cad0e8b88248b688814664e588f683fc2b2c039ee0494b168ebd3cd1042b8b7fe2583f287cf55b22ea0585bfb43efe2f8450d809cde0b21
+DIST python-exec-2.4.6.tar.bz2 87634 BLAKE2B 7b6de8ad0e0603fafd3284e6e3c5247ad83f145ab4db6728914318ae8e6f5aaa3c0247f4e01238fca11519ef72fb1b11436aea7e2b8c988b8717b3f6a2a43c37 SHA512 e05eaf01b83de196a10933636ab6b1a5489a421592df49b8b58eabd0e732de970f902744cd3a06b5ab530a6d69fe6dfa8f270fbb09b9fe3df4ae04d516828050
diff --git a/dev-lang/python-exec/python-exec-2.4.4.ebuild b/dev-lang/python-exec/python-exec-2.4.6.ebuild
index 96c08a46bfb0..9ed5ee58b776 100644
--- a/dev-lang/python-exec/python-exec-2.4.4.ebuild
+++ b/dev-lang/python-exec/python-exec-2.4.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 # Kids, don't do this at home!
 inherit python-utils-r1
@@ -13,11 +13,11 @@ inherit python-r1
 
 DESCRIPTION="Python script wrapper"
 HOMEPAGE="https://github.com/mgorny/python-exec/"
-SRC_URI="https://github.com/mgorny/${PN}/releases/download/${P}/${P}.tar.bz2"
+SRC_URI="https://github.com/mgorny/python-exec/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-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 ~x64-cygwin ~amd64-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=""
 
 # eselect-python because of /usr/bin/python* collisions and new config
@@ -37,6 +37,7 @@ src_configure() {
 	done
 
 	local myconf=(
+		--with-fallback-path="${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin"
 		--with-python-impls="${pyimpls[*]}"
 	)
 
diff --git a/dev-lang/python-exec/python-exec-9999.ebuild b/dev-lang/python-exec/python-exec-9999.ebuild
index 98708bc4bed2..6fc81aeeefa9 100644
--- a/dev-lang/python-exec/python-exec-9999.ebuild
+++ b/dev-lang/python-exec/python-exec-9999.ebuild
@@ -1,13 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-#if LIVE
-EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
-
-inherit autotools git-r3
-#endif
+EAPI=6
 
 # Kids, don't do this at home!
 inherit python-utils-r1
@@ -15,15 +9,16 @@ PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
 
 # Inherited purely to have PYTHON_TARGET flags which will satisfy USE
 # dependencies and trigger necessary rebuilds.
-inherit python-r1
+inherit autotools git-r3 python-r1
 
 DESCRIPTION="Python script wrapper"
 HOMEPAGE="https://github.com/mgorny/python-exec/"
-SRC_URI="https://github.com/mgorny/${PN}/releases/download/${P}/${P}.tar.bz2"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/mgorny/python-exec.git"
 
 LICENSE="BSD-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-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=""
 IUSE=""
 
 # eselect-python because of /usr/bin/python* collisions and new config
@@ -35,14 +30,10 @@ RDEPEND="
 	!<dev-lang/python-3.4.3-r4:3.4
 	!<dev-lang/python-3.5.0-r3:3.5"
 
-#if LIVE
-KEYWORDS=
-SRC_URI=
-
 src_prepare() {
+	default
 	eautoreconf
 }
-#endif
 
 src_configure() {
 	local pyimpls=() i EPYTHON
diff --git a/dev-lang/ruby/ruby-2.2.10.ebuild b/dev-lang/ruby/ruby-2.2.10.ebuild
index fb55e5de4314..ccac481cf537 100644
--- a/dev-lang/ruby/ruby-2.2.10.ebuild
+++ b/dev-lang/ruby/ruby-2.2.10.ebuild
@@ -30,7 +30,7 @@ SRC_URI="mirror://ruby/2.2/${MY_P}.tar.xz
 		 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-2.3.7.ebuild b/dev-lang/ruby/ruby-2.3.7.ebuild
index 7d052a4ca34f..7dc95bcac035 100644
--- a/dev-lang/ruby/ruby-2.3.7.ebuild
+++ b/dev-lang/ruby/ruby-2.3.7.ebuild
@@ -30,7 +30,7 @@ SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz
 		 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
 
 RDEPEND="
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 2af18dd83a02..633c98ce4f24 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,2 +1 @@
-DIST jsoncpp-1.8.1.tar.gz 210629 BLAKE2B 5f9a7f51b463784c5a74a78b7189800a37797f233b1d5a66d34edc0689c77a2b96b230c0ed4dfc749401087c551dd5659a6d152e09342ca92250ce9ea91a293e SHA512 4203826fca4c366b51d28ffc928399c914ffaba8be1cada64ff118b5742e6b469d3fc3e59344587d851447857b479794c5697d4fd11a9a55b32a3a7a801b745b
 DIST jsoncpp-1.8.4.tar.gz 200226 BLAKE2B bbfa8cf7b6cfa6af34762b54de2da0e919849c65b1093b29f7a7ac437524d8b3cf07b42926b250489e9a289105df971fad798f3e73f908fac3e2f52a4e5467b3 SHA512 f70361a3263dd8b9441374a9a409462be1426c0d6587c865171a80448ab73b3f69de2b4d70d2f0c541764e1e6cccc727dd53178347901f625ec6fb54fb94f4f1
diff --git a/dev-libs/jsoncpp/jsoncpp-1.8.1.ebuild b/dev-libs/jsoncpp/jsoncpp-1.8.1.ebuild
deleted file mode 100644
index 603c2d1926bf..000000000000
--- a/dev-libs/jsoncpp/jsoncpp-1.8.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-any-r1
-
-DESCRIPTION="C++ JSON reader and writer"
-HOMEPAGE="https://github.com/open-source-parsers/jsoncpp"
-SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( public-domain MIT )"
-SLOT="0/11"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="doc test"
-
-DEPEND="
-	doc? (
-		app-doc/doxygen
-		${PYTHON_DEPS}
-	)
-	test? (
-		${PYTHON_DEPS}
-	)"
-RDEPEND=""
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	if use doc || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DJSONCPP_WITH_TESTS=$(usex test)
-		-DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF
-		-DJSONCPP_WITH_CMAKE_PACKAGE=ON
-
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS=OFF
-
-		# Follow Debian, Ubuntu, Arch convention for headers location
-		# bug #452234
-		-DCMAKE_INSTALL_INCLUDEDIR=include/jsoncpp
-
-		# Disable implicit ccache use
-		-DCCACHE_FOUND=OFF
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		"${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die
-		HTML_DOCS=( dist/doxygen/jsoncpp*/. )
-	fi
-}
-
-src_test() {
-	cmake-utils_src_make jsoncpp_check
-}
diff --git a/dev-libs/judy/Manifest b/dev-libs/judy/Manifest
index 064dc2ccdad0..4d9d437dedd1 100644
--- a/dev-libs/judy/Manifest
+++ b/dev-libs/judy/Manifest
@@ -1,2 +1 @@
-DIST Judy-1.0.4.tar.gz 1142724 BLAKE2B 9357a6d37a9f8a15c4e06c304e5496ae271717243d79b7a1287cd6fcea5e130dcac2b1e191fff1530fb141a1d967be404a106afa3ac5005a6c71eb61491b807b SHA512 3a2fcd14a4367910ced5d1da8b46551e2847e02c1faa19c3ecd0ee542bb89c683c8998feb79abee4999a753d26ed5e7bfd9a7e2ed343a7667c7ff0d624ee384f
 DIST Judy-1.0.5.tar.gz 1147847 BLAKE2B f5f31af2b7d1db5524ff035e9f9b733a4c5c23de76cd4c55bcdc59f7474ee02d7c7ec9341f087736ff6e39a139d20d9ab8298397aaf17f7d48a851037b8677c5 SHA512 1a0d59b092c80d95270a3089cd25ee0ddad1d591101b03784e2e46dfc73bce445a7fb495b449043544a366c09b35b833556053bf3bf65dd00abbd786d26c6980
diff --git a/dev-libs/judy/files/judy-1.0.4-parallel-make.patch b/dev-libs/judy/files/judy-1.0.4-parallel-make.patch
deleted file mode 100644
index 6e3fcbe6b677..000000000000
--- a/dev-libs/judy/files/judy-1.0.4-parallel-make.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-https://sourceforge.net/tracker/index.php?func=detail&aid=2219175&group_id=55753&atid=478140
-
-=== modified file 'doc/Makefile.am'
---- doc/Makefile.am	2008-11-03 15:14:54 +0000
-+++ doc/Makefile.am	2008-11-03 15:16:21 +0000
-@@ -94,114 +94,93 @@
- 	    man/man3/JudyHSFreeArray
- 
- 
-+dep_on_Judy = J1T J1S J1U J1F J1N J1L J1P J1FE J1NE J1LE J1PE J1C J1BC J1FA J1MU
-+
-+$(patsubst %,man/man3/%,$(dep_on_Judy)): man/man3/Judy
- 
- man/man3/Judy: 
- 	../tool/jhton ext/Judy_3.htm | grep -v '^[   ]*$$' | sed -e 's/\.C//' >  man/man3/Judy
-+	cd man/man3 && \
-+	for man in $(dep_on_Judy); do \
-+		ln -s Judy $$man; \
-+	done
- 
- man/man3/Judy1:
- 	../tool/jhton ext/Judy1_3.htm | grep -v '^[   ]*$$' | sed -e 's/\.C//' > man/man3/Judy1
--	cd man/man3; ln -s Judy J1T
--	cd man/man3; ln -s Judy J1S
--	cd man/man3; ln -s Judy J1U
--	cd man/man3; ln -s Judy J1F
--	cd man/man3; ln -s Judy J1N
--	cd man/man3; ln -s Judy J1L
--	cd man/man3; ln -s Judy J1P
--	cd man/man3; ln -s Judy J1FE
--	cd man/man3; ln -s Judy J1NE
--	cd man/man3; ln -s Judy J1LE
--	cd man/man3; ln -s Judy J1PE
--	cd man/man3; ln -s Judy J1C
--	cd man/man3; ln -s Judy J1BC
--	cd man/man3; ln -s Judy J1FA
--	cd man/man3; ln -s Judy J1MU
-+
-+dep_on_Judy1_funcs = Judy1Test Judy1Set Judy1Unset Judy1First Judy1Next Judy1Last Judy1Prev Judy1FirstEmpty Judy1NextEmpty Judy1LastEmpty Judy1PrevEmpty Judy1Count Judy1ByCount Judy1FreeArray Judy1MemUsed
-+
-+$(patsubst %,man/man3/%,$(dep_on_Judy1_funcs)): man/man3/Judy1_funcs
- 
- man/man3/Judy1_funcs:
- 	../tool/jhton ext/Judy1_funcs_3.htm | grep -v '^[   ]*$$' | sed -e 's/\.C//' > man/man3/Judy1_funcs
--	cd man/man3; ln -s Judy1_funcs Judy1Test 
--	cd man/man3; ln -s Judy1_funcs Judy1Set 
--	cd man/man3; ln -s Judy1_funcs Judy1Unset 
--	cd man/man3; ln -s Judy1_funcs Judy1First 
--	cd man/man3; ln -s Judy1_funcs Judy1Next
--	cd man/man3; ln -s Judy1_funcs Judy1Last
--	cd man/man3; ln -s Judy1_funcs Judy1Prev
--	cd man/man3; ln -s Judy1_funcs Judy1FirstEmpty
--	cd man/man3; ln -s Judy1_funcs Judy1NextEmpty
--	cd man/man3; ln -s Judy1_funcs Judy1LastEmpty
--	cd man/man3; ln -s Judy1_funcs Judy1PrevEmpty
--	cd man/man3; ln -s Judy1_funcs Judy1Count
--	cd man/man3; ln -s Judy1_funcs Judy1ByCount
--	cd man/man3; ln -s Judy1_funcs Judy1FreeArray
--	cd man/man3; ln -s Judy1_funcs Judy1MemUsed
-+	cd man/man3 && \
-+	for man in $(dep_on_Judy1_funcs); do \
-+		ln -s Judy1_funcs $$man; \
-+	done
-+
-+dep_on_JudyL= JLG JLI JLD JLF JLN JLL JLP JLFE JLNE JLLE JLPE JLC JLBC JLFA JLMU
-+
-+$(patsubst %,man/man3/%,$(dep_on_JudyL)): man/man3/JudyL
- 
- man/man3/JudyL:
- 	../tool/jhton ext/JudyL_3.htm | grep -v '^[   ]*$$' | sed -e 's/\.C//' > man/man3/JudyL
--	cd man/man3; ln -s JudyL JLG
--	cd man/man3; ln -s JudyL JLI
--	cd man/man3; ln -s JudyL JLD
--	cd man/man3; ln -s JudyL JLF
--	cd man/man3; ln -s JudyL JLN
--	cd man/man3; ln -s JudyL JLL
--	cd man/man3; ln -s JudyL JLP
--	cd man/man3; ln -s JudyL JLFE
--	cd man/man3; ln -s JudyL JLNE
--	cd man/man3; ln -s JudyL JLLE
--	cd man/man3; ln -s JudyL JLPE
--	cd man/man3; ln -s JudyL JLC
--	cd man/man3; ln -s JudyL JLBC
--	cd man/man3; ln -s JudyL JLFA
--	cd man/man3; ln -s JudyL JLMU
-+	cd man/man3 && \
-+	for man in $(dep_on_JudyL); do \
-+		ln -s JudyL $$man; \
-+	done
-+
-+dep_on_JudyL_funcs = JudyLGet JudyLIns JudyLDel JudyLFirst JudyLNext JudyLLast JudyLPrev JudyLFirstEmpty JudyLNextEmpty JudyLLastEmpty JudyLPrevEmpty JudyLCount JudyLByCount JudyLFreeArray JudyLMemUsed
-+
-+$(patsubst %,man/man3/%,$(dep_on_JudyL_funcs)): man/man3/JudyL_funcs
- 
- man/man3/JudyL_funcs:
- 	../tool/jhton ext/JudyL_funcs_3.htm | grep -v '^[   ]*$$' | sed -e 's/\.C//' > man/man3/JudyL_funcs
--	cd man/man3; ln -s JudyL_funcs JudyLGet
--	cd man/man3; ln -s JudyL_funcs JudyLIns
--	cd man/man3; ln -s JudyL_funcs JudyLDel
--	cd man/man3; ln -s JudyL_funcs JudyLFirst
--	cd man/man3; ln -s JudyL_funcs JudyLNext
--	cd man/man3; ln -s JudyL_funcs JudyLLast
--	cd man/man3; ln -s JudyL_funcs JudyLPrev
--	cd man/man3; ln -s JudyL_funcs JudyLFirstEmpty
--	cd man/man3; ln -s JudyL_funcs JudyLNextEmpty
--	cd man/man3; ln -s JudyL_funcs JudyLLastEmpty
--	cd man/man3; ln -s JudyL_funcs JudyLPrevEmpty
--	cd man/man3; ln -s JudyL_funcs JudyLCount
--	cd man/man3; ln -s JudyL_funcs JudyLByCount
--	cd man/man3; ln -s JudyL_funcs JudyLFreeArray
--	cd man/man3; ln -s JudyL_funcs JudyLMemUsed
-+	cd man/man3 && \
-+	for man in $(dep_on_JudyL_funcs); do \
-+		ln -s JudyL_funcs $$man; \
-+	done
-+
-+dep_on_JudySL = JSLG JSLI JSLD JSLF JSLN JSLL JSLP JSLFA
-+
-+$(patsubst %,man/man3/%,$(dep_on_JudySL)): man/man3/JudySL
- 
- man/man3/JudySL:
- 	../tool/jhton ext/JudySL_3.htm | grep -v '^[   ]*$$' | sed -e 's/\.C//' > man/man3/JudySL
--	cd man/man3; ln -s JudySL JSLG
--	cd man/man3; ln -s JudySL JSLI
--	cd man/man3; ln -s JudySL JSLD
--	cd man/man3; ln -s JudySL JSLF
--	cd man/man3; ln -s JudySL JSLN
--	cd man/man3; ln -s JudySL JSLL
--	cd man/man3; ln -s JudySL JSLP
--	cd man/man3; ln -s JudySL JSLFA
-+	cd man/man3 && \
-+	for man in $(dep_on_JudySL); do \
-+		ln -s JudySL $$man; \
-+	done
-+
-+dep_on_JudySL_funcs = JudySLGet JudySLIns JudySLDel JudySLFirst JudySLNext JudySLLast JudySLPrev JudySLFreeArray
-+
-+$(patsubst %,man/man3/%,$(dep_on_JudySL_funcs)): man/man3/JudySL_funcs
- 
- man/man3/JudySL_funcs:
- 	../tool/jhton ext/JudySL_funcs_3.htm | grep -v '^[   ]*$$' | sed -e 's/\.C//' > man/man3/JudySL_funcs
--	cd man/man3; ln -s JudySL_funcs JudySLGet
--	cd man/man3; ln -s JudySL_funcs JudySLIns
--	cd man/man3; ln -s JudySL_funcs JudySLDel
--	cd man/man3; ln -s JudySL_funcs JudySLFirst
--	cd man/man3; ln -s JudySL_funcs JudySLNext
--	cd man/man3; ln -s JudySL_funcs JudySLLast
--	cd man/man3; ln -s JudySL_funcs JudySLPrev
--	cd man/man3; ln -s JudySL_funcs JudySLFreeArray
-+	cd man/man3 && \
-+	for man in $(dep_on_JudySL_funcs); do \
-+		ln -s JudySL_funcs $$man; \
-+	done
-+
-+dep_on_JudyHS = JHSG JHSI JHSD JHSFA
-+
-+$(patsubst %,man/man3/%,$(dep_on_JudyHS)): man/man3/JudyHS
- 
- man/man3/JudyHS:
- 	../tool/jhton ext/JudyHS_3.htm | grep -v '^[   ]*$$' | sed -e 's/\.C//' > man/man3/JudyHS
--	cd man/man3; ln -s JudyHS JHSG 
--	cd man/man3; ln -s JudyHS JHSI
--	cd man/man3; ln -s JudyHS JHSD
--	cd man/man3; ln -s JudyHS JHSFA
-+	cd man/man3 && \
-+	for man in $(dep_on_JudyHS); do \
-+		ln -s JudyHS $$man; \
-+	done
-+
-+dep_on_JudyHS_funcs = JudyHSGet JudyHSIns JudyHSDel JudyHSFreeArray
-+
-+$(patsubst %,man/man3/%,$(dep_on_JudyHS_funcs)): man/man3/JudyHS_funcs
- 
- man/man3/JudyHS_funcs:
- 	../tool/jhton ext/JudyHS_funcs_3.htm | grep -v '^[   ]*$$' | sed -e 's/\.C//' > man/man3/JudyHS_funcs
--	cd man/man3; ln -s JudyHS_funcs JudyHSGet
--	cd man/man3; ln -s JudyHS_funcs JudyHSIns
--	cd man/man3; ln -s JudyHS_funcs JudyHSDel
--	cd man/man3; ln -s JudyHS_funcs JudyHSFreeArray
-+	cd man/man3 && \
-+	for man in $(dep_on_JudyHS_funcs); do \
-+		ln -s JudyHS_funcs $$man; \
-+	done
-
diff --git a/dev-libs/judy/judy-1.0.4.ebuild b/dev-libs/judy/judy-1.0.4.ebuild
deleted file mode 100644
index e6ba14477530..000000000000
--- a/dev-libs/judy/judy-1.0.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils autotools
-
-MY_P=Judy-${PV}
-
-DESCRIPTION="A C library that implements a dynamic array"
-HOMEPAGE="http://judy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/judy/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-parallel-make.patch"
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/dev-libs/judy/judy-1.0.5-r2.ebuild b/dev-libs/judy/judy-1.0.5-r2.ebuild
index 851f7e215ef4..e811fb653b65 100644
--- a/dev-libs/judy/judy-1.0.5-r2.ebuild
+++ b/dev-libs/judy/judy-1.0.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/judy/Judy-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="static-libs"
 DOCS=( AUTHORS ChangeLog README )
 
diff --git a/dev-libs/judy/judy-1.0.5.ebuild b/dev-libs/judy/judy-1.0.5.ebuild
deleted file mode 100644
index ed9582a2a898..000000000000
--- a/dev-libs/judy/judy-1.0.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils autotools
-
-DESCRIPTION="A C library that implements a dynamic array"
-HOMEPAGE="http://judy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/judy/Judy-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-parallel-make.patch"
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/dev-libs/libusb/libusb-1.0.19-r1.ebuild b/dev-libs/libusb/libusb-1.0.19-r1.ebuild
index fbff28cd33df..4f564fca09e6 100644
--- a/dev-libs/libusb/libusb-1.0.19-r1.ebuild
+++ b/dev-libs/libusb/libusb-1.0.19-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples static-libs test udev"
 
 RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )"
diff --git a/dev-libs/lzo/Manifest b/dev-libs/lzo/Manifest
index ae9d6c371272..1272fd3c558b 100644
--- a/dev-libs/lzo/Manifest
+++ b/dev-libs/lzo/Manifest
@@ -1,2 +1 @@
-DIST lzo-2.09.tar.gz 594855 BLAKE2B e2a3f3582ce8290f4c66e80e5703af7074a4f097f8b8dd953d8ebcfeea42bad13bbc724c268ef09f5344ff9857ed60cb5092085b225a1b33f0d1252369516cd4 SHA512 7c64e5e7d2050d75ac8c59d613f6f7230b74746b1d207666755b07450053c8b73980f12f8a1ec59d2af0bada02beec126aaacb675b8088b5fe65e97ff7e6bfc7
 DIST lzo-2.10.tar.gz 600622 BLAKE2B 124b6645a2cb7f01f153c9fa6e1976378bdfb224841a7b45ab19c584c6ef704c20719ae87640b8d83f3f9269a57d9cc2e870a914124dac03a2ef1336e9feb9c9 SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4
diff --git a/dev-libs/lzo/lzo-2.09.ebuild b/dev-libs/lzo/lzo-2.09.ebuild
deleted file mode 100644
index 2d7312f7d5d7..000000000000
--- a/dev-libs/lzo/lzo-2.09.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib-minimal toolchain-funcs
-
-DESCRIPTION="An extremely fast compression and decompression library"
-HOMEPAGE="http://www.oberhumer.com/opensource/lzo/"
-SRC_URI="http://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples static-libs"
-
-RDEPEND=""
-
-DOCS="BUGS ChangeLog README THANKS doc/*"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	gen_usr_ldscript -a lzo2
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	rm -f "${ED}"/usr/share/doc/${PF}/COPYING
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h}
-	fi
-
-	prune_libtool_files
-}
diff --git a/dev-python/click-threading/Manifest b/dev-python/click-threading/Manifest
index d9636b9ef722..a2ba70be84f0 100644
--- a/dev-python/click-threading/Manifest
+++ b/dev-python/click-threading/Manifest
@@ -1,2 +1,2 @@
-DIST click-threading-0.1.2.tar.gz 3232 BLAKE2B b50ffc6291ddd7ef02f9fbf7177cc96730ceb482372ff1731968268cfdde115336b3ccd4f82a0595439261d381dae82a51d15673506bb08742d13d84f7e2028d SHA512 4612c5314800a76e65468fb80c9495e14605bbda8b5e25e8d78e8baaa9392e424d673d942bd7d0f3955e0241ddc4b87aa348dcb7f3b9516ba94fb8352c0400b6
 DIST click-threading-0.3.0-gh.tar.gz 3759 BLAKE2B 2d91085004c2cd6dd6af2ad4b61284c93ad83b458fb68df0908fdab0de1d87bfd994d3c68cd58e671219b38af55282ee5a17b45a12a4e76e7c40768869ce7968 SHA512 ca535a54f5d88c70c3f8f05f2d423e1b9b0f0b3793a1c04cdc90b61d4fa99f6906a327143dacb2b946ba8c1a9977d9c96ce9caeac9638521641d574316a0bad6
+DIST click-threading-0.4.4-gh.tar.gz 9815 BLAKE2B 57f4cd386c0d1a0ee999ea7ccb91319e8bc2d177e9f52b9979b4a93d68a1c3502f8aa05f163a991a8f78c90692c65d026295a710004035f2c48868453bf2f2a5 SHA512 4a7af23be600cab43dcda267d9d9d3ed0cc885f9829f2412844ac9cd3f0f41d1bea3f157f9e37cc3333c4b0a3d65ab4525edcaeec767850efab5cc037e95e532
diff --git a/dev-python/click-threading/click-threading-0.1.2.ebuild b/dev-python/click-threading/click-threading-0.1.2.ebuild
deleted file mode 100644
index 7d9b9a05b966..000000000000
--- a/dev-python/click-threading/click-threading-0.1.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Multithreaded Click apps made easy."
-HOMEPAGE="https://github.com/click-contrib/click-threading https://pypi.org/project/click-threading/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-python/click-5.0"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.rst )
diff --git a/dev-python/click-threading/click-threading-0.4.4.ebuild b/dev-python/click-threading/click-threading-0.4.4.ebuild
new file mode 100644
index 000000000000..fb7547f4fe27
--- /dev/null
+++ b/dev-python/click-threading/click-threading-0.4.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 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="Multithreaded Click apps made easy."
+HOMEPAGE="https://github.com/click-contrib/click-threading https://pypi.org/project/click-threading/"
+SRC_URI="https://github.com/click-contrib/${PN}/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/click-5.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+DOCS=( README.rst )
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pickleshare/pickleshare-0.7.3.ebuild b/dev-python/pickleshare/pickleshare-0.7.3.ebuild
index 574dc72ceb90..71f132a2150d 100644
--- a/dev-python/pickleshare/pickleshare-0.7.3.ebuild
+++ b/dev-python/pickleshare/pickleshare-0.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pyblake2/Manifest b/dev-python/pyblake2/Manifest
index a8dbaeaf98e3..4eff49b4b102 100644
--- a/dev-python/pyblake2/Manifest
+++ b/dev-python/pyblake2/Manifest
@@ -1,3 +1,2 @@
 DIST pyblake2-1.1.0.tar.gz 125855 BLAKE2B 46af4c24882040bbdd221f90e06652918798e4555c0a7307a596ca4c9ed3147f00297269a44d174782c2b0402eac03ecf5387b1c5a16efb57d036730b58b2630 SHA512 e13c7e4f3a35155cbf531e337895349ec01f0ac36908a4e746cecec063601adfc8a73a7961a9c310d01d3231f44f08d2cc92e891e9cb87659bc7170b9fee6102
-DIST pyblake2-1.1.1.tar.gz 126441 BLAKE2B cb1f1872e1d6122419e7732114da28162af5e483db56e073d3cc4019f073813af747d56ca4f4a992cf6586d12662f3b1d4b68d04eaea91b4f90de58a9c1f4799 SHA512 a876255d0072226c4a2936a9e88297dc8c39195f423fea6624e6ffd610ffc58d07e939db942d0198d6e5a1f1afc892103c507f226787529d341ae40e9926bcac
 DIST pyblake2-1.1.2.tar.gz 126693 BLAKE2B 01690ec32a07b7ea59d7d040523ce8cb523f18927044f2d38c0a143a344fde661498e1a4b35a0f161be7b761a324677f80e88c4a0045dc324f0d588997e884f2 SHA512 26297d788208a80c8102602135332d5ee1424711d9c693828af232b5546301c5d144680367a954d8d9765998a23b82046b157b0072fdc63305ff0088feb16e55
diff --git a/dev-python/pyblake2/pyblake2-1.1.1.ebuild b/dev-python/pyblake2/pyblake2-1.1.1.ebuild
deleted file mode 100644
index 16fc87b33886..000000000000
--- a/dev-python/pyblake2/pyblake2-1.1.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 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} pypy{,3} )
-inherit distutils-r1
-
-DESCRIPTION="BLAKE2 hash function extension module"
-HOMEPAGE="https://github.com/dchest/pyblake2 https://pypi.org/project/pyblake2/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-# pyblake2 itself allows more licenses but blake2 allows the following three
-LICENSE="|| ( CC0-1.0 openssl Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${EPYTHON}" test/test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-ros/hector_geotiff/hector_geotiff-0.3.5-r1.ebuild b/dev-ros/hector_geotiff/hector_geotiff-0.3.5-r1.ebuild
deleted file mode 100644
index 44e33566e42d..000000000000
--- a/dev-ros/hector_geotiff/hector_geotiff-0.3.5-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Node to save occupancy grid map, robot trajectory and object of interest data to GeoTiff images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/hector_map_tools
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3"
diff --git a/dev-ruby/deep_merge/deep_merge-1.2.1.ebuild b/dev-ruby/deep_merge/deep_merge-1.2.1.ebuild
index 3617b51faab6..8e95f7c88fcc 100644
--- a/dev-ruby/deep_merge/deep_merge-1.2.1.ebuild
+++ b/dev-ruby/deep_merge/deep_merge-1.2.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://trac.misuse.org/science/wiki/DeepMerge"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86"
 IUSE=""
 
 each_ruby_test() {
diff --git a/dev-ruby/elasticsearch-api/Manifest b/dev-ruby/elasticsearch-api/Manifest
index 26ea183467fc..4f6175e4090d 100644
--- a/dev-ruby/elasticsearch-api/Manifest
+++ b/dev-ruby/elasticsearch-api/Manifest
@@ -1 +1,2 @@
 DIST elasticsearch-ruby-5.0.4.tar.gz 213565 BLAKE2B 479e79964e5e5fd6ab2774e95957100eaa157a64c5e7aa069f7aeefc771f9e749ba35f866ef33dfc4e7839e11f67dd7792a742f0c8dbf8d893ed25b098e78367 SHA512 aaa4b1a41de62128cc3cc3fe174fd7f95e6153f25f1640dbd0cde5858e77924e85bd78e2869968c498b3f2f007215504aaee322df954ae44b0a64dacc396d217
+DIST elasticsearch-ruby-5.0.5.tar.gz 216692 BLAKE2B 4328b40932d6d0bd3608da517b976136ec2b09a760f1b6e377a680d23515fe6a9c605db84725d0598db3da6eb25dd43b5042c20cc6cc7cac33be9d947c9dbf32 SHA512 dd82ec7794753283d2c08d19d60bcc66655c9b8f2a6620f720f84121c57c9b6dc02de67c4a445a998316523f045e13b744b931bf815b64814ea280cef2cb0806
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-5.0.5.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-5.0.5.ebuild
new file mode 100644
index 000000000000..2ad92c6dd834
--- /dev/null
+++ b/dev-ruby/elasticsearch-api/elasticsearch-api-5.0.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_TASK_DOC=doc
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-api module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/elasticsearch-transport
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+	)
+"
+
+# Tests need additional modules (at least 'turn') packaged. Then someone
+# should look into running them and so on.
+RESTRICT="test"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+}
diff --git a/dev-ruby/elasticsearch-transport/Manifest b/dev-ruby/elasticsearch-transport/Manifest
index 26ea183467fc..4f6175e4090d 100644
--- a/dev-ruby/elasticsearch-transport/Manifest
+++ b/dev-ruby/elasticsearch-transport/Manifest
@@ -1 +1,2 @@
 DIST elasticsearch-ruby-5.0.4.tar.gz 213565 BLAKE2B 479e79964e5e5fd6ab2774e95957100eaa157a64c5e7aa069f7aeefc771f9e749ba35f866ef33dfc4e7839e11f67dd7792a742f0c8dbf8d893ed25b098e78367 SHA512 aaa4b1a41de62128cc3cc3fe174fd7f95e6153f25f1640dbd0cde5858e77924e85bd78e2869968c498b3f2f007215504aaee322df954ae44b0a64dacc396d217
+DIST elasticsearch-ruby-5.0.5.tar.gz 216692 BLAKE2B 4328b40932d6d0bd3608da517b976136ec2b09a760f1b6e377a680d23515fe6a9c605db84725d0598db3da6eb25dd43b5042c20cc6cc7cac33be9d947c9dbf32 SHA512 dd82ec7794753283d2c08d19d60bcc66655c9b8f2a6620f720f84121c57c9b6dc02de67c4a445a998316523f045e13b744b931bf815b64814ea280cef2cb0806
diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-5.0.5.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-5.0.5.ebuild
new file mode 100644
index 000000000000..e27df7cddebb
--- /dev/null
+++ b/dev-ruby/elasticsearch-transport/elasticsearch-transport-5.0.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_DOC=rdoc
+
+RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-transport module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/faraday
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+		dev-ruby/curb
+		dev-ruby/patron
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	# Tweak test setup to only run unit tests since we don't have a live cluster
+	sed -i -e "s/RUBY_VERSION > '1.9'/false/" \
+		-e '/module Elasticsearch/,$ s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/elasticsearch/Manifest b/dev-ruby/elasticsearch/Manifest
index 26ea183467fc..4f6175e4090d 100644
--- a/dev-ruby/elasticsearch/Manifest
+++ b/dev-ruby/elasticsearch/Manifest
@@ -1 +1,2 @@
 DIST elasticsearch-ruby-5.0.4.tar.gz 213565 BLAKE2B 479e79964e5e5fd6ab2774e95957100eaa157a64c5e7aa069f7aeefc771f9e749ba35f866ef33dfc4e7839e11f67dd7792a742f0c8dbf8d893ed25b098e78367 SHA512 aaa4b1a41de62128cc3cc3fe174fd7f95e6153f25f1640dbd0cde5858e77924e85bd78e2869968c498b3f2f007215504aaee322df954ae44b0a64dacc396d217
+DIST elasticsearch-ruby-5.0.5.tar.gz 216692 BLAKE2B 4328b40932d6d0bd3608da517b976136ec2b09a760f1b6e377a680d23515fe6a9c605db84725d0598db3da6eb25dd43b5042c20cc6cc7cac33be9d947c9dbf32 SHA512 dd82ec7794753283d2c08d19d60bcc66655c9b8f2a6620f720f84121c57c9b6dc02de67c4a445a998316523f045e13b744b931bf815b64814ea280cef2cb0806
diff --git a/dev-ruby/elasticsearch/elasticsearch-5.0.5.ebuild b/dev-ruby/elasticsearch/elasticsearch-5.0.5.ebuild
new file mode 100644
index 000000000000..77d7d2221eee
--- /dev/null
+++ b/dev-ruby/elasticsearch/elasticsearch-5.0.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_TASK_DOC=doc
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/elasticsearch-api
+	dev-ruby/elasticsearch-transport
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/elasticsearch-transport
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+	)
+"
+
+# Tests need additional modules (at least 'turn') packaged. Then someone
+# should look into running them and so on.
+RESTRICT="test"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+}
diff --git a/dev-ruby/hiera/hiera-3.4.3.ebuild b/dev-ruby/hiera/hiera-3.4.3.ebuild
index b105b1649d8e..9792f761cf2c 100644
--- a/dev-ruby/hiera/hiera-3.4.3.ebuild
+++ b/dev-ruby/hiera/hiera-3.4.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://docs.puppet.com/hiera/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86"
 
 ruby_add_bdepend "test? ( dev-ruby/mocha )"
 
diff --git a/dev-ruby/simplecov/simplecov-0.16.1.ebuild b/dev-ruby/simplecov/simplecov-0.16.1.ebuild
index c52ad77e32f3..1f07bb975283 100644
--- a/dev-ruby/simplecov/simplecov-0.16.1.ebuild
+++ b/dev-ruby/simplecov/simplecov-0.16.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
@@ -21,7 +21,7 @@ KEYWORDS="~amd64"
 SLOT="0.8"
 IUSE="doc"
 
-ruby_add_rdepend ">=dev-ruby/json-1.8:0 <dev-ruby/json-3:0
+ruby_add_rdepend "|| ( dev-ruby/json:2 >=dev-ruby/json-1.8:0 )
 	dev-ruby/simplecov-html:0.10
 	>=dev-ruby/docile-1.1:0"
 
diff --git a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild
index 062e89a96985..9310497d34a5 100644
--- a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild
+++ b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://registrationcenter.intel.com/irc_nas/4181/intel_sdk_for_ocl_appl
 
 LICENSE="Intel-SDP"
 SLOT="0"
-IUSE="android +system-tbb system-clang +system-boost +system-qt"
+IUSE="android +system-tbb system-clang +system-boost"
 KEYWORDS="-* ~amd64"
 RESTRICT="mirror"
 
@@ -20,11 +20,7 @@ RDEPEND="app-eselect/eselect-opencl
 	system-tbb? ( >=dev-cpp/tbb-4.2.20131118 )
 	system-clang? ( =sys-devel/clang-3.4* )
 	system-boost? ( >=dev-libs/boost-1.52.0:= )
-	system-qt? (
-		>=dev-qt/qtgui-4.8.5:4
-		>=dev-qt/qtcore-4.8.5:4
-		)
-	"
+"
 DEPEND=""
 
 S=${WORKDIR}/intel_sdk_for_ocl_applications_2014_ubuntu_${PV}_x64/
@@ -56,9 +52,6 @@ src_prepare() {
 	if use system-clang; then
 		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libclang*
 	fi
-	if use system-qt; then
-		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libQt*
-	fi
 	if use system-tbb; then
 		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libtbb*
 	fi
diff --git a/dev-util/intel-ocl-sdk/metadata.xml b/dev-util/intel-ocl-sdk/metadata.xml
index 1c21e7de1dc7..2b3e89f60bca 100644
--- a/dev-util/intel-ocl-sdk/metadata.xml
+++ b/dev-util/intel-ocl-sdk/metadata.xml
@@ -10,7 +10,6 @@
 		<flag name="tools">Install Intel Offline Compiler</flag>
 		<flag name="system-boost">Use system boost (dev-libs/boost) instead of bundled one</flag>
 		<flag name="system-clang">Use system clang (sys-devel/clang) instead of bundled one</flag>
-		<flag name="system-qt">Use system Qt (sys-devel-qtcore, sys-devel/qtgui) instead of bundled one</flag>
-		<flag name="system-tbb">Use sytem Thread Building Blocks (dev-cpp/tbb) instead of bundled one</flag>
+		<flag name="system-tbb">Use system Thread Building Blocks (dev-cpp/tbb) instead of bundled one</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-util/qstlink2/Manifest b/dev-util/qstlink2/Manifest
index f3c31401da7e..c9dae5ef73af 100644
--- a/dev-util/qstlink2/Manifest
+++ b/dev-util/qstlink2/Manifest
@@ -1,3 +1,2 @@
-DIST qstlink2-1.0.3.tar.gz 661197 BLAKE2B 222b1c4b467ce0b745752ce76cc7978ce6af42074940552d9611b30f6a3cb80fcc1c343fcfea12a6c224c277e50446a22faf37938cfcbe56a1a6c681f9cfc760 SHA512 bd6d083623296cfcbc407e8c9c920de24efc91f508fb8bfe64d538ff776ed927cb89efba5c265c393b877cee995ed022b6ac51e081423b787cbcbb176215231b
 DIST qstlink2-1.2.3.tar.gz 681169 BLAKE2B e1ebf6a30de3724eedcc5fa00f8a9a79e6fd038b6276dfc424a7d78f8b55b99173037c47fbdba85bbb69a7530682bd3616e185a1bb9882c686b8c3ee34105a7c SHA512 13c06a53f44acc99e620c89052fc2f128076e3aec1cac76ddcee76a49ed473d5ef816d77fc5be23d125bbb16306c176f54c2d611c88d2b9c6e7954752a96c7e8
 DIST qtusb-0.2.1.tar.gz 47928 BLAKE2B 5215e726c111d1835033848ee9d5e3d85c4a1d47be20d04423f5c1582251f75b0cf0272028d307a7a37df1f4533f04189f9660f62a0c5461c9ac803ee8d33aac SHA512 76e6df81d9bbd5725a113932506bd6541d0bb32301ead03d92faf1f0fa4dc68749e2728d8bf3fe8efefd00a3774b46f0c8f81be8028a2c5ceb6bc1b6d36da38d
diff --git a/dev-util/qstlink2/qstlink2-1.0.3.ebuild b/dev-util/qstlink2/qstlink2-1.0.3.ebuild
deleted file mode 100644
index addd107df2ff..000000000000
--- a/dev-util/qstlink2/qstlink2-1.0.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-r2
-
-DESCRIPTION="GUI and CLI ST-Link V2(Debugger/Programmer) client"
-HOMEPAGE="https://github.com/fpoussin/qstlink2"
-SRC_URI="https://github.com/mobyfab/QStlink2/archive/v1.0.3.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="virtual/libusb:0
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/QStlink2-${PV}"
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index 4aefe6547344..2811467779d3 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,2 +1 @@
-DIST sysdig-0.20.0.tar.gz 750798 BLAKE2B 9e5c57abf81531f6643c661e539b06b33bda352eb3072e1ed686da3dc68550d90c94a4273554c2dd4752c73357f0bfe52bcbd10ad8551d8a2876552acf31292a SHA512 2549c8e2d0db0abd95e31272837fe5072c4c26926b2d17348bd8d73177bc024bab0a8503aa427f9134d8ca0a0bbc05fe97495933c3b8236db5fcb74df7c1efb2
 DIST sysdig-0.21.0.tar.gz 756010 BLAKE2B 0dfcc3e7f5c830e8b250e4edd9d470764ea6be25804fefbc59b020f208edc313a51b3fb783e538d2acb520c56ad7c8555f224fb90999c87b89125394a90d54a1 SHA512 73c516c9fccb504d4ccd37384aee37ece542d29f82d696acf7c90df18b3a1538faf8d2b29065eae1f3dca7c04c6c2dbe93ed9369bc1340216482c4af2f61d23a
diff --git a/dev-util/sysdig/sysdig-0.20.0.ebuild b/dev-util/sysdig/sysdig-0.20.0.ebuild
deleted file mode 100644
index e366e6626308..000000000000
--- a/dev-util/sysdig/sysdig-0.20.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-MODULES_OPTIONAL_USE=modules
-inherit linux-mod bash-completion-r1 cmake-utils
-
-DESCRIPTION="A system exploration and troubleshooting tool"
-HOMEPAGE="https://www.sysdig.org/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +modules"
-
-RDEPEND="
-	app-misc/jq:0=
-	dev-lang/luajit:2=
-	>=dev-libs/jsoncpp-0.6_pre:0=
-	dev-libs/libb64:0=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:0=
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	net-misc/curl:0="
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/os-headers"
-
-# needed for the kernel module
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-pkg_pretend() {
-	linux-mod_pkg_setup
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-ggdb::' CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# we will use linux-mod for that
-		-DBUILD_DRIVER=OFF
-		# libscap examples are not installed or really useful
-		-DBUILD_LIBSCAP_EXAMPLES=OFF
-
-		# unbundle the deps
-		-DUSE_BUNDLED_DEPS=OFF
-	)
-
-	cmake-utils_src_configure
-
-	# setup linux-mod ugliness
-	MODULE_NAMES="sysdig-probe(extra:${S}/driver:)"
-	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
-	BUILD_TARGETS="all"
-
-	if use modules; then
-		cmake-utils_src_make configure_driver
-
-		cp "${BUILD_DIR}"/driver/Makefile.dkms driver/Makefile || die
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	linux-mod_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	linux-mod_src_install
-
-	# remove sources
-	rm -r "${ED%/}"/usr/src || die
-
-	# move bashcomp to the proper location
-	dobashcomp "${ED%/}"/usr/etc/bash_completion.d/sysdig || die
-	rm -r "${ED%/}"/usr/etc || die
-}
diff --git a/media-libs/mesa/mesa-18.1.0-r1.ebuild b/media-libs/mesa/mesa-18.1.0-r1.ebuild
new file mode 100644
index 000000000000..70702be097dc
--- /dev/null
+++ b/media-libs/mesa/mesa-18.1.0-r1.ebuild
@@ -0,0 +1,531 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git"
+
+if [[ ${PV} = 9999 ]]; then
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ $PV == 9999 ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="!bindist? ( bindist )"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
+	+llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
+	vdpau vulkan wayland xvmc xa"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 gallium )
+	llvm?   ( gallium )
+	opencl? ( gallium llvm )
+	openmax? ( gallium )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vaapi? ( gallium )
+	vdpau? ( gallium )
+	vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	wayland? ( egl gbm )
+	xa?  ( gallium )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_imx?    ( gallium video_cards_vivante )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.91"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=app-eselect/eselect-opengl-1.3.0
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	llvm? (
+		video_cards_radeonsi? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_r600? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_radeon? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	opencl? (
+				app-eselect/eselect-opencl
+				dev-libs/libclc
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+	openmax? (
+		>=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}]
+		x11-misc/xdg-utils
+	)
+	vaapi? (
+		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+	)
+	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 7.
+# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:7[${MULTILIB_USEDEP}]
+		sys-devel/llvm:6[${MULTILIB_USEDEP}]
+		sys-devel/llvm:5[${MULTILIB_USEDEP}]
+		sys-devel/llvm:4[${MULTILIB_USEDEP}]
+		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
+	)
+	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/gettext
+	virtual/pkgconfig
+	valgrind? ( dev-util/valgrind )
+	x11-base/xorg-proto
+	vulkan? (
+		$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+	)
+"
+[[ ${PV} == 9999 ]] && DEPEND+="
+	sys-devel/bison
+	sys-devel/flex
+	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.1.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm[${flags}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply_user
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf
+
+	if use classic; then
+		# Configurable DRI drivers
+		driver_enable swrast
+
+		# Intel code
+		driver_enable video_cards_i915 i915
+		driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		driver_enable video_cards_r100 radeon
+		driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+				! use video_cards_r200; then
+			driver_enable video_cards_radeon radeon r200
+		fi
+	fi
+
+	if use egl; then
+		myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
+	fi
+
+	if use gallium; then
+		myconf+="
+			$(use_enable d3d9 nine)
+			$(use_enable llvm)
+			$(use_enable openmax omx-bellagio)
+			$(use_enable vaapi va)
+			$(use_enable vdpau)
+			$(use_enable xa)
+			$(use_enable xvmc)
+		"
+		use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
+
+		gallium_enable swrast
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable video_cards_i915 i915
+		gallium_enable video_cards_imx imx
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			gallium_enable video_cards_intel i915
+		fi
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+				! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		# opencl stuff
+		if use opencl; then
+			myconf+="
+				$(use_enable opencl)
+				--with-clang-libdir="${EPREFIX}/usr/lib"
+				"
+		fi
+
+		gallium_enable video_cards_virgl virgl
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_radeonsi radeon
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		myconf+=" --disable-asm"
+	fi
+
+	if use gallium; then
+		myconf+=" $(use_enable osmesa gallium-osmesa)"
+	else
+		myconf+=" $(use_enable osmesa)"
+	fi
+
+	# build fails with BSD indent, bug #428112
+	use userland_GNU || export INDENT=cat
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-dri \
+		--enable-glx \
+		--enable-shared-glapi \
+		$(use_enable !bindist texture-float) \
+		$(use_enable d3d9 nine) \
+		$(use_enable debug) \
+		$(use_enable dri3) \
+		$(use_enable egl) \
+		$(use_enable gbm) \
+		$(use_enable gles1) \
+		$(use_enable gles2) \
+		$(use_enable nptl glx-tls) \
+		$(use_enable unwind libunwind) \
+		--enable-valgrind=$(usex valgrind auto no) \
+		--enable-llvm-shared-libs \
+		--disable-opencl-icd \
+		--with-dri-drivers=${DRI_DRIVERS} \
+		--with-gallium-drivers=${GALLIUM_DRIVERS} \
+		--with-vulkan-drivers=${VULKAN_DRIVERS} \
+		PYTHON2="${PYTHON}" \
+		${myconf}
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+
+	if use opencl; then
+		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
+		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
+		dodir ${cl_dir}/{lib,include}
+		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
+			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
+			"${ED}"${cl_dir}
+		fi
+		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
+			mv -f "${ED}"/usr/include/CL \
+			"${ED}"${cl_dir}/include
+		fi
+		eend $?
+	fi
+
+	if use openmax; then
+		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
+		doenvd "${T}"/99mesaxdgomx
+		keepdir /usr/share/mesa/xdg
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete
+	einstalldocs
+
+	if use !bindist; then
+		dodoc docs/patents.txt
+	fi
+}
+
+multilib_src_test() {
+	if use llvm; then
+		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
+		pushd src/gallium/drivers/llvmpipe >/dev/null || die
+		emake ${llvm_tests}
+		pax-mark m ${llvm_tests}
+		popd >/dev/null || die
+	fi
+	emake check
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+
+	# Switch to mesa opencl
+	if use opencl; then
+		eselect opencl set --use-old ${PN}
+	fi
+
+	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
+	if use openmax; then
+		ebegin "Registering OpenMAX drivers"
+		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
+			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
+			omxregister-bellagio
+		eend $?
+	fi
+
+	# warn about patent encumbered texture-float
+	if use !bindist; then
+		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
+		elog "enabled. Please see /usr/share/doc/${P}/patents.txt.bz2 for an"
+		elog "explanation."
+	fi
+}
+
+pkg_prerm() {
+	if use openmax; then
+		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
+	fi
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+# TODO: avoid code duplication for a more elegant implementation
+driver_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			DRI_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					DRI_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
+
+gallium_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			GALLIUM_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					GALLIUM_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
+
+vulkan_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			VULKAN_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					VULKAN_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index cf00b47b8bc8..70702be097dc 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -77,8 +77,7 @@ REQUIRED_USE="
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.91"
 RDEPEND="
-	classic? ( app-eselect/eselect-mesa )
-	gallium? ( app-eselect/eselect-mesa )
+	!app-eselect/eselect-mesa
 	>=app-eselect/eselect-opengl-1.3.0
 	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
@@ -402,37 +401,6 @@ multilib_src_configure() {
 multilib_src_install() {
 	emake install DESTDIR="${D}"
 
-	if use classic || use gallium; then
-			ebegin "Moving DRI/Gallium drivers for dynamic switching"
-			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
-			keepdir /usr/$(get_libdir)/dri
-			dodir /usr/$(get_libdir)/mesa
-			for x in ${gallium_drivers[@]}; do
-				if [ -f "$(get_libdir)/gallium/${x}" ]; then
-					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			if use classic; then
-				emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
-			fi
-			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-				if [ -f ${x} -o -L ${x} ]; then
-					mv -f "${x}" "${x/dri/mesa}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
-			ln -s ../mesa/*.so . || die "Creating symlink failed"
-			# remove symlinks to drivers known to eselect
-			for x in ${gallium_drivers[@]}; do
-				if [ -f ${x} -o -L ${x} ]; then
-					rm "${x}" || die "Failed to remove ${x}"
-				fi
-			done
-			popd
-		eend $?
-	fi
 	if use opencl; then
 		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
 		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
@@ -462,10 +430,6 @@ multilib_src_install_all() {
 	if use !bindist; then
 		dodoc docs/patents.txt
 	fi
-
-	# Install config file for eselect mesa
-	insinto /usr/share/mesa
-	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
 }
 
 multilib_src_test() {
@@ -484,11 +448,6 @@ pkg_postinst() {
 	echo
 	eselect opengl set --use-old ${OPENGL_DIR}
 
-	# Select classic/gallium drivers
-	if use classic || use gallium; then
-		eselect mesa set --auto
-	fi
-
 	# Switch to mesa opencl
 	if use opencl; then
 		eselect opencl set --use-old ${PN}
diff --git a/media-video/mpv/mpv-0.27.2.ebuild b/media-video/mpv/mpv-0.27.2.ebuild
index 1e790a980c0d..6f6911235219 100644
--- a/media-video/mpv/mpv-0.27.2.ebuild
+++ b/media-video/mpv/mpv-0.27.2.ebuild
@@ -165,6 +165,10 @@ src_configure() {
 		append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib"
 	fi
 
+	# Prevent access violations from zsh completion generation.
+	# See Gentoo bug 656086.
+	use zsh-completion && addpredict /dev/dri
+
 	local mywafargs=(
 		--confdir="${EPREFIX}/etc/${PN}"
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
diff --git a/media-video/mpv/mpv-0.28.2.ebuild b/media-video/mpv/mpv-0.28.2.ebuild
index b88afffbfb6c..32fac3efe428 100644
--- a/media-video/mpv/mpv-0.28.2.ebuild
+++ b/media-video/mpv/mpv-0.28.2.ebuild
@@ -152,6 +152,10 @@ src_configure() {
 		append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib"
 	fi
 
+	# Prevent access violations from zsh completion generation.
+	# See Gentoo bug 656086.
+	use zsh-completion && addpredict /dev/dri
+
 	local mywafargs=(
 		--confdir="${EPREFIX}/etc/${PN}"
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 0a8bcea9f758..8601e37b4bdf 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -98,7 +98,7 @@ COMMON_DEPEND="
 	vdpau? ( x11-libs/libvdpau )
 	wayland? (
 		>=dev-libs/wayland-1.6.0
-		>=dev-libs/wayland-protocols-1.12
+		>=dev-libs/wayland-protocols-1.14
 		>=x11-libs/libxkbcommon-0.3.0
 	)
 	X? (
@@ -151,6 +151,10 @@ src_configure() {
 		append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib"
 	fi
 
+	# Prevent access violations from zsh completion generation.
+	# See Gentoo bug 656086.
+	use zsh-completion && addpredict /dev/dri
+
 	local mywafargs=(
 		--confdir="${EPREFIX}/etc/${PN}"
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
diff --git a/net-dns/avahi/avahi-0.6.32.ebuild b/net-dns/avahi/avahi-0.6.32.ebuild
index 6e42b980484e..218142b2a49d 100644
--- a/net-dns/avahi/avahi-0.6.32.ebuild
+++ b/net-dns/avahi/avahi-0.6.32.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${P}"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="hppa"
-IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils"
+IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python selinux test utils"
 
 REQUIRED_USE="
 	utils? ( || ( gtk gtk3 ) )
@@ -34,7 +34,6 @@ COMMON_DEPEND="
 	dev-libs/expat
 	dev-libs/glib:2[${MULTILIB_USEDEP}]
 	gdbm? ( sys-libs/gdbm[${MULTILIB_USEDEP}] )
-	qt4? ( dev-qt/qtcore:4[${MULTILIB_USEDEP}] )
 	gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
 	gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
 	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
@@ -177,7 +176,7 @@ multilib_src_configure() {
 		$(multilib_native_use_enable introspection) \
 		$(multilib_native_use_enable utils gtk-utils) \
 		--disable-qt3 \
-		$(use_enable qt4) \
+		--disable-qt4 \
 		$(use_enable gdbm) \
 		$(systemd_with_unitdir) \
 		"${myconf[@]}"
diff --git a/net-misc/mosh/mosh-1.3.2.ebuild b/net-misc/mosh/mosh-1.3.2.ebuild
index 09040483e95f..d4f0d6efcf8b 100644
--- a/net-misc/mosh/mosh-1.3.2.ebuild
+++ b/net-misc/mosh/mosh-1.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mosh.org/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ppc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
 IUSE="+client examples +mosh-hardening +server ufw +utempter"
 
 REQUIRED_USE="
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index 701fa0507204..93ab8b7d0b6f 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -138,8 +138,6 @@ darcs
 mercurial
 kerberos
 gpg
-gnome
-doc
 emacs
 gphoto2
 afs
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index f0970c9541df..e5ac6cac2a77 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -218,10 +218,6 @@ sys-power/pm-utils video_cards_intel video_cards_radeon
 # X use flag only for amd64/x86, bug 285951.
 media-gfx/iscan X
 
-# Serkan Kaba <serkan@gentoo.org> (20 Jul 2008)
-# Java is not supported in most of the arches enchant is keyworded
-app-text/enchant zemberek
-
 # Raúl Porcel <armin76@gentoo.org> (09 Nov 2008)
 # CPU opts: This needs amd64, x86 and ppc on some of them
 # dvdnav: hard masked dependency
diff --git a/profiles/package.mask b/profiles/package.mask
index 44703ff3e6bc..04522e54cf68 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,13 @@
 
 #--- END OF EXAMPLES ---
 
+# Kent Fredric <kentnl@gentoo.org> (27 May 2018)
+# Subject to Man-in-the-middle security bypass vulnerability.
+# Retained in tree only for users who need older versions
+# for compatibility reasons.
+# Bug: #623942
+<dev-perl/DBD-mysql-4.44.0
+
 # Akinori Hattori <hattya@gentoo.org> (27 May 2018)
 # Dead upstream, for old versions of iBus
 # Masked for removal in 30 days.
diff --git a/sci-mathematics/4ti2/4ti2-1.6.7.ebuild b/sci-mathematics/4ti2/4ti2-1.6.7.ebuild
index c06748c20172..073a1868de77 100644
--- a/sci-mathematics/4ti2/4ti2-1.6.7.ebuild
+++ b/sci-mathematics/4ti2/4ti2-1.6.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Software package for algebraic, geometric and combinatorial problems"
 HOMEPAGE="http://www.4ti2.de/"
@@ -14,10 +14,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
-DEPEND="
-	sci-mathematics/glpk:0[gmp]
-	dev-libs/gmp[cxx]"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	sci-mathematics/glpk:=[gmp]
+	dev-libs/gmp:0=[cxx]"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.2-gold.patch
@@ -25,8 +25,7 @@ PATCHES=(
 
 src_prepare() {
 	default
-	sed -e "s:^CXX.*$:CXX=$(tc-getCXX):g" \
-		-i m4/glpk-check.m4 || die
+	sed -e "/^CXX/d" -i m4/glpk-check.m4 || die
 	# The swig subdir is not used, so we can skip running autotools in it. #518000
 	AT_NO_RECURSIVE=1 eautoreconf
 }
@@ -39,5 +38,8 @@ src_configure() {
 
 src_install() {
 	default
-	use static-libs || prune_libtool_files --all
+
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -delete || die
+	fi
 }
diff --git a/sci-mathematics/lpsolve/lpsolve-5.5.2.0.ebuild b/sci-mathematics/lpsolve/lpsolve-5.5.2.0.ebuild
index dd828ca40d5a..5de810343b29 100644
--- a/sci-mathematics/lpsolve/lpsolve-5.5.2.0.ebuild
+++ b/sci-mathematics/lpsolve/lpsolve-5.5.2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
 DESCRIPTION="Mixed Integer Linear Programming (MILP) solver"
 HOMEPAGE="https://sourceforge.net/projects/lpsolve/"
@@ -17,12 +17,14 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	econf \
-		$(use_enable static-libs static) \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		$(use_enable static-libs static)
 }
 
 src_install() {
 	default
+
 	# required because it does not provide .pc file
-	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -delete || die
+	fi
 }
diff --git a/sys-devel/boost-m4/Manifest b/sys-devel/boost-m4/Manifest
index a24fce7d9ca3..2c9cc88c4c1b 100644
--- a/sys-devel/boost-m4/Manifest
+++ b/sys-devel/boost-m4/Manifest
@@ -1,2 +1 @@
-DIST boost-m4-0.4.tar.gz 38871 BLAKE2B 95475d8109f13b420ee5ac95588e5756b17e923ef436be64a8814858aa167889eb52b095f4672cdc15b55b0f6f40fc4e687b95aeb8a84ff6c57cbbbfb9d20846 SHA512 f0ee9edbf20043679339bcb46a912d460a787635106559780d6a9a08dd685051a58667a0a1e26364709de10dde49f4b2fd348dbd6199a9da3099d75e665c1e95
 DIST boost-m4-0.4_p20160328.tar.gz 41253 BLAKE2B 47ad17f652560dce4e276b295e55e7daa8752f1c932a6c0d1bad9e4bc2ff72eb0adfaf8abc4e7c57f179f08857de255935fc530f0a4d8a26d3f6a2a0711417ac SHA512 4aecd311b21ced4a3d62fc706a9fa731c375ea490482f78756892243b5af6909cd8841c249632b37820be7f1bde41c290e842edd933d0c727e1dca76d30eb506
diff --git a/sys-devel/boost-m4/boost-m4-0.4-r1.ebuild b/sys-devel/boost-m4/boost-m4-0.4-r1.ebuild
deleted file mode 100644
index b230d2ec9dc5..000000000000
--- a/sys-devel/boost-m4/boost-m4-0.4-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils vcs-snapshot
-
-DESCRIPTION="Another set of autoconf macros for compiling against boost"
-HOMEPAGE="https://github.com/tsuna/boost.m4"
-SRC_URI="${HOMEPAGE}/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc5.patch
-}
-
-# boost.m4 has a buildsystem, but the distributer didn't use make dist
-# so we'd have to eautoreconf to use it. Also, its ./configure script
-# DEPENDs on boost. For installing one file, bootstrapping the
-# buildsystem isn't worth it.
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins build-aux/boost.m4
-
-	dodoc AUTHORS NEWS README THANKS
-}
diff --git a/sys-devel/boost-m4/boost-m4-0.4.ebuild b/sys-devel/boost-m4/boost-m4-0.4.ebuild
deleted file mode 100644
index 5fdcd0d72395..000000000000
--- a/sys-devel/boost-m4/boost-m4-0.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit vcs-snapshot
-
-DESCRIPTION="Another set of autoconf macros for compiling against boost"
-HOMEPAGE="https://github.com/tsuna/boost.m4"
-SRC_URI="${HOMEPAGE}/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-# boost.m4 has a buildsystem, but the distributer didn't use make dist
-# so we'd have to eautoreconf to use it. Also, its ./configure script
-# DEPENDs on boost. For installing one file, bootstrapping the
-# buildsystem isn't worth it.
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins build-aux/boost.m4
-
-	dodoc AUTHORS NEWS README THANKS
-}
diff --git a/sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild b/sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
index 66dfeaa5c885..ce2f59b99369 100644
--- a/sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
+++ b/sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 S="${WORKDIR}/boost.m4-1489691f65aecb593e33abc3e56ac482dd67da7b"
 
diff --git a/sys-devel/boost-m4/files/boost-m4-0.4-gcc5.patch b/sys-devel/boost-m4/files/boost-m4-0.4-gcc5.patch
deleted file mode 100644
index a929957e8aa6..000000000000
--- a/sys-devel/boost-m4/files/boost-m4-0.4-gcc5.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-https://bugs.gentoo.org/549618
-Note: I dropped the last hunk from the upstream patch. It doesn't apply and
-is unnecessary since we build boost with --layout=system.
-
-From 32553aaf4d5090da19aa0ec33b936982c685009f Mon Sep 17 00:00:00 2001
-From: Akim Demaille <akim@lrde.epita.fr>
-Date: Wed, 26 Nov 2014 16:56:28 +0100
-Subject: [PATCH] boost.m4: cope with GCC 5
-
-Serial 24.
-
-There are two needed adjustments.
-
-One due to the output format which has changed:
-
-  $ cat conftest.cc
-  #include <boost/version.hpp>
-  boost-lib-version = BOOST_LIB_VERSION
-  $ g++-mp-4.9 -E conftest.cc            $ g++-mp-5 -E conftest.cc
-  # 1 "conftest.cc"                      # 1 "conftest.cc"
-  # 1 "<built-in>"                       # 1 "<built-in>"
-  # 1 "<command-line>"                   # 1 "<command-line>"
-  # 1 "conftest.cc"                      # 1 "conftest.cc"
-  # 1 "/include/boost/version.hpp" 1 3   # 1 "/include/boost/version.hpp" 1 3
-  # 2 "conftest.cc" 2                    # 2 "conftest.cc" 2
-  boost-lib-version = "1_56"           ! boost-lib-version =
-                                       ! # 2 "conftest.cc" 3
-                                       !                    "1_56"
-
-Since I fear that -P is not portable, let's play with tr and grep to
-get rid of all the # lines and glue the remaining lines together.
-
-The other one is that, finally, gcc 4.10 will actually be named gcc 5,
-so recognize this name.
-
-* build-aux/m4/boost.m4 (_BOOST_SED_CPP): Clean the preprocessor output
-before handing it to the sed command.
-(_BOOST_FIND_COMPILER_TAG): Support GCC 5.
-Improve accuracy of error messages by adding delimiters to bad strings.
-
-Signed-off-by: Benoit Sigoure <tsunanet@gmail.com>
----
- build-aux/boost.m4 | 25 ++++++++++++++++++++++---
- 1 file changed, 22 insertions(+), 3 deletions(-)
-
---- a/build-aux/boost.m4
-+++ b/build-aux/boost.m4
-@@ -72,8 +72,25 @@ dnl strip `\n' with backquotes, not the `\r'.  This results in
- dnl boost_cv_lib_version='1_37\r' for instance, which breaks
- dnl everything else.
- dnl Cannot use 'dnl' after [$4] because a trailing dnl may break AC_CACHE_CHECK
-+dnl
-+dnl Beware that GCC 5, when expanding macros, may embed # line directives
-+dnl a within single line:
-+dnl
-+dnl # 1 "conftest.cc"
-+dnl # 1 "<built-in>"
-+dnl # 1 "<command-line>"
-+dnl # 1 "conftest.cc"
-+dnl # 1 "/opt/local/include/boost/version.hpp" 1 3
-+dnl # 2 "conftest.cc" 2
-+dnl boost-lib-version =
-+dnl # 2 "conftest.cc" 3
-+dnl                    "1_56"
-+dnl
-+dnl So get rid of the # lines, and glue the remaining ones together.
- (eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
-+  grep -v '#' |
-   tr -d '\r' |
-+  tr -s '\n' ' ' |
-   $SED -n -e "$1" >conftest.i 2>&1],
-   [$3],
-   [$4])
-@@ -208,7 +225,7 @@ AC_LANG_POP([C++])dnl
-   AC_CACHE_CHECK([for Boost's header version],
-     [boost_cv_lib_version],
-     [m4_pattern_allow([^BOOST_LIB_VERSION$])dnl
--     _BOOST_SED_CPP([/^boost-lib-version = /{s///;s/\"//g;p;q;}],
-+     _BOOST_SED_CPP([[/^boost-lib-version = /{s///;s/[\" ]//g;p;q;}]],
-                     [#include <boost/version.hpp>
- boost-lib-version = BOOST_LIB_VERSION],
-     [boost_cv_lib_version=`cat conftest.i`])])
-@@ -216,7 +233,7 @@ boost-lib-version = BOOST_LIB_VERSION],
-     boost_major_version=`echo "$boost_cv_lib_version" | sed 's/_//;s/_.*//'`
-     case $boost_major_version in #(
-       '' | *[[!0-9]]*)
--        AC_MSG_ERROR([invalid value: boost_major_version=$boost_major_version])
-+        AC_MSG_ERROR([invalid value: boost_major_version='$boost_major_version'])
-         ;;
-     esac
- fi
diff --git a/sys-fs/udev/udev-238.ebuild b/sys-fs/udev/udev-238.ebuild
index 757ea0518094..a840ca91bf10 100644
--- a/sys-fs/udev/udev-238.ebuild
+++ b/sys-fs/udev/udev-238.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index e5d19296258c..58a449ad06f1 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -9,8 +9,8 @@ DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c
 DIST patch-3.16.56.xz 1956224 BLAKE2B 27db858a51be5d57ff1f3d5409d511df5002f542584d80b64d2303f1569c0502d0d15783a3e36facc2ee9481ada4b8f08359a79972b4a3ca07ac180c2e607c01 SHA512 e1c1c004c2ac52fb6944718c82b6c70a9ee4175943fc8477b298dbbde42d16f1e1c9387f9d5ca05958b3efa0e851eb0105daf4a0d59ad836b31ec3919ee857b6
 DIST patch-3.2.101.xz 1942280 BLAKE2B 9000a0e0d23a6e9e8651c6f2f936e0aa14e6660ad27fa8d29c35fc71e4cb0590337460a80aecd5725804546a20a610f367ee9da5864d53ffd1fea45c0e43b2a1 SHA512 00a8d179a60bf628ea12595d866c25ce5848e9c68ae44d7a10388e5ab2e99fb7f3ae77d57689a9ae161c9084d5de84c595f0f96e4d8eaf60230bd28f3435acf2
 DIST patch-4.1.51.xz 1456804 BLAKE2B 8c95a6a85258c1ac13cd475b73ecf70bdd82018b74be68f34345ccdea88a2acc464117dbdeb764d11251a8a023eac2558753431025c9849ad62c60cecafff562 SHA512 37a5d84e15d1ca9096aff7e762007e6abec370d865a91e6f254412a322b3f371d95cb3dc5143118583a2a553ebad93f425439fdd0985a6ec2a4ecf65dcb3e1ac
-DIST patch-4.14.43.xz 1144288 BLAKE2B ae4e70f674fa6e8d738a6d2fa643490a9e82ced855dcdf1fc9bbfb0ec12b4dfaadc4eee2f95c68a7faa6fd1c34d8717c9ae01169a19da2b30f7921170d79aae2 SHA512 51e7359df7018b5f9d8d1c9fac55f3519df1700ac0dca2b625a08853f45c108511c13d256ea8b2f8af5159748059075cf63e451ff39e9b2c10c5e2df25dfa2ed
+DIST patch-4.14.44.xz 1182800 BLAKE2B 940c879cf823db29bd03f9ad6aa520b6bac46e7792e617acc320e26a94f607b4bb55de20cb3d50d9bf679a0f871db2d89125f561c9617f0388aabb7515c7607d SHA512 f5a38c51c9e3b2bb63ca582038d95c35aa02d8e35c6414347792f0a6eaa04392db2b3b29dfbad1e18e3d18da09c4b6d3ade9a07833fa85aaa368169db3ffafdb
 DIST patch-4.15.18.xz 456456 BLAKE2B 94b41c7ada6547c6e2823602e11504f8ba57c9b1ac9bfcfb156a35ec42415df55fb1faeb6f548f6d52cf435bd5109ec03d35c599ca742160672ae814281f91db SHA512 c40dfeedce4876fa4df51ae93978b2a8d9844ca04cf890a6d708fd85786dcda99a6611066977d5a4d841a03af8838d6aa6e1bc69084720fbf7147058b8394fb8
-DIST patch-4.16.11.xz 253100 BLAKE2B 3edc6d9b2291e27f5d88e92cedfa9d6edf5509f2c82d586389dd08d18f70db47865e4d51d7c5844a12254d4cbc9fe87b3874cf4364ae7748766c793aa5f74c61 SHA512 03c2dbd6f5bac48875a08f6ef3603379fd5736d7b4d1abe1d4271d484ac5b08790c8d28177cec4e45421a303eb539fc79e15a9b67383b249b7d999e47652135c
-DIST patch-4.4.132.xz 1883948 BLAKE2B 77e06affb5b3ec82cbb1dd95e87e896813c1891fbf0d6267508e5966182161ea1017e0d70667e6280fc531724e69f366e79987ba65ec953f789e7dc7696e5443 SHA512 eb4c2c9e4e91ec5a89039de1bcaef7e5003a5e353b000483a6e942bafa3499f718f91f396a8d76eb35e097f3d03bc0226dbf498be0f9a75e7d19da0341e41eda
-DIST patch-4.9.102.xz 1851224 BLAKE2B 5fde2b526076b7e5a0963de6a1257ff4b1b7bb2155749284b392c17503cf34e28dc475d7aef41a814242764d31704783302697488f07040dec0045fadd894cc4 SHA512 653ee9eb12dd5a0b7489feee8b3370ead3061e1e45e10d1636d39a0dd18812c361320bba6fafc03e80540b70423ef5f8468c41b8ebf52b0aac05b1b3ebde8445
+DIST patch-4.16.12.xz 301028 BLAKE2B 8700a03dda8a741311d0b09e7a6aa96476978dad03451582a9fe772dc4abe410a9f542edc65742bb7a214b3a6a9e5e2aba0e9113b42a48864763c11c60669b7d SHA512 7bd2b4fa54b69df5558a4a151936fb1787f2faa0f4e73c03db04ef84ac088f764425faf5d6b5a023d4863e190775dcbb251eba1efc3b10eb133330bb6b210b72
+DIST patch-4.4.133.xz 1907980 BLAKE2B 4795ac1fa5f3cd6b9ca4cb81a946fe0427ca262283b1af1597a1033a13d5e9cc088dddc47eb34f2bdf51768f64977f79e85004c8a60605db34bbdff5f2dbf640 SHA512 cf9ca8001198ad49f589a1d87b16cd7bab923259b1322e42a2ec120b681776942938c85ef58c562939985a36a08605dba7d99a5f2644dd6dd1c50efffe16ca9c
+DIST patch-4.9.103.xz 1869960 BLAKE2B 96f1099a8dda61cd5bae58ca9c747db4ff04af57c3b728029498880539e81c30e554406a465f43c58b09cb012dee6fe87f78d23259375d055b8cd8e577881639 SHA512 36ceb0c7496df3584aa1ca4c8270977ecf3ffa12be7dbbfa0e82c2b8c999a14bdea9c6b6827766c6a018884bb3bb68119d6489d8150d5d426cb5069de2ad6070
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.43.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.44.ebuild
index 2e4a132369ff..2e4a132369ff 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.43.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.44.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.16.11.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.16.12.ebuild
index 2e4a132369ff..2e4a132369ff 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.16.11.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.16.12.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.132.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.133.ebuild
index 2e4a132369ff..2e4a132369ff 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.4.132.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.4.133.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.102.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.103.ebuild
index 2e4a132369ff..2e4a132369ff 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.102.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.103.ebuild
diff --git a/sys-libs/libsemanage/libsemanage-2.8.ebuild b/sys-libs/libsemanage/libsemanage-2.8.ebuild
index 0cc1dbbf8b49..f527f9bb25f7 100644
--- a/sys-libs/libsemanage/libsemanage-2.8.ebuild
+++ b/sys-libs/libsemanage/libsemanage-2.8.ebuild
@@ -116,7 +116,7 @@ multilib_src_install() {
 pkg_postinst() {
 	# Migrate the SELinux semanage configuration store if not done already
 	local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' "${EROOT}"/etc/selinux/config 2>/dev/null)
-	if [ -n "${selinuxtype}" ] && [ ! -d "${EROOT}"/var/lib/selinux/${mcs}/active ] ; then
+	if [ -n "${selinuxtype}" ] && [ ! -d "${EROOT}"/var/lib/selinux/${selinuxtype}/active ] ; then
 		ewarn "Since the 2.4 SELinux userspace, the policy module store is moved"
 		ewarn "from /etc/selinux to /var/lib/selinux. The migration will be run now."
 		ewarn "If there are any issues, it can be done manually by running:"
diff --git a/sys-libs/libsemanage/libsemanage-9999.ebuild b/sys-libs/libsemanage/libsemanage-9999.ebuild
index 0cc1dbbf8b49..f527f9bb25f7 100644
--- a/sys-libs/libsemanage/libsemanage-9999.ebuild
+++ b/sys-libs/libsemanage/libsemanage-9999.ebuild
@@ -116,7 +116,7 @@ multilib_src_install() {
 pkg_postinst() {
 	# Migrate the SELinux semanage configuration store if not done already
 	local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' "${EROOT}"/etc/selinux/config 2>/dev/null)
-	if [ -n "${selinuxtype}" ] && [ ! -d "${EROOT}"/var/lib/selinux/${mcs}/active ] ; then
+	if [ -n "${selinuxtype}" ] && [ ! -d "${EROOT}"/var/lib/selinux/${selinuxtype}/active ] ; then
 		ewarn "Since the 2.4 SELinux userspace, the policy module store is moved"
 		ewarn "from /etc/selinux to /var/lib/selinux. The migration will be run now."
 		ewarn "If there are any issues, it can be done manually by running:"
diff --git a/x11-wm/lumina/lumina-1.4.0_p1.ebuild b/x11-wm/lumina/lumina-1.4.0_p1-r1.ebuild
index 4bab7adf10bf..27374bbd02dc 100644
--- a/x11-wm/lumina/lumina-1.4.0_p1.ebuild
+++ b/x11-wm/lumina/lumina-1.4.0_p1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,6 +23,7 @@ COMMON_DEPEND="dev-qt/qtcore:5
 	dev-qt/qtx11extras:5
 	dev-qt/qtgui:5
 	dev-qt/qtdeclarative:5
+	dev-qt/qtprintsupport:5
 	x11-libs/libxcb:0
 	x11-libs/xcb-util
 	x11-libs/xcb-util-image
@@ -46,7 +47,6 @@ S="${WORKDIR}/${P/_/-}"
 
 PATCHES=(
 	"${FILESDIR}/1.2.0-desktop-files.patch"
-	"${FILESDIR}/1.3.0-OS-detect.patch"
 	"${FILESDIR}/1.4.0-poppler.patch"
 )
 
@@ -65,22 +65,16 @@ src_prepare(){
 
 src_configure(){
 	eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
+		CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
 }
 
 src_install(){
-	# A hack to avoid sandbox violation and install liblthemeengine*.so to the correct places
 	emake install INSTALL_ROOT="${D}"
-	rm "${ED%/}"/${PN}-* "${ED%/}"/start-${PN}-desktop "${ED%/}"/liblthemeengine*.so "${ED%/}"/lthemeengine || die
-	mv "${D}/${D}/etc" "${D}/etc" || die
-	mv "${D}/${D}/usr/bin" "${D}/usr/bin" || die
-	mv "${D}/${D}/usr/share" "${D}/usr/share" || die
-	rm -rf "${D}/var" || die
-	mv "${ED%/}"/etc/luminaDesktop.conf{.dist,} || die
 	einstalldocs
 
 	remove_locale() {
-		rm -f "${D}"/usr/share/${PN}-desktop/i18n/l*_${1}.qm
+		rm -f "${ED%/}"/usr/share/${PN}-desktop/i18n/l*_${1}.qm
+
 	}
 	l10n_for_each_disabled_locale_do remove_locale
 }
author	Repository QA checks <repo-qa-checks@gentoo.org>	2018-05-27 11:43:59 +0000
committer	Repository QA checks <repo-qa-checks@gentoo.org>	2018-05-27 11:43:59 +0000
commit	3bba99e51f0975671bb33c87d6694c25a59193fb (patch)
tree	fb1b83fce30bd53939d208d5aa7995fc26d7ed8c
parent	Merge updates from master (diff)
parent	sys-fs/udev: arm stable wrt bug #655712 (diff)
download	gentoo-3bba99e51f0975671bb33c87d6694c25a59193fb.tar.gz gentoo-3bba99e51f0975671bb33c87d6694c25a59193fb.tar.bz2 gentoo-3bba99e51f0975671bb33c87d6694c25a59193fb.zip