gentoo resync : 25.08.2018

35 files changed, 897 insertions, 48 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 0efb2175986e..e7bf89ee6c6c 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/cdcat/Manifest b/app-misc/cdcat/Manifest
index b964640d32c6..10fb23294b0a 100644
--- a/app-misc/cdcat/Manifest
+++ b/app-misc/cdcat/Manifest
@@ -1,3 +1,4 @@
 DIST cdcat-0.3.tar.gz 7464 BLAKE2B 24d0acce5bca9f84d24944e74a463ec64fee19a989ef89c187dc283d5c87dbdffb76e9471159903603c07924e0affef6f1b48dc7ab5e7292e5ae427510f7a259 SHA512 6d30a22c29a1846a3899f384bcc395444af77b62024cb9f45da877819614c3f1ff495e03f7d7b498716fe4725c569c88a14480a37fc4e4fef5cfd9a640e4cfa3
-EBUILD cdcat-0.3.ebuild 1220 BLAKE2B 9bdec6ac62b4c2c51dbf5a7652adf90c75d459d45e4969a5b1866523f427d671917f935de3fac4847fc413104de53071db3c9bb975c9a240cc9b53ffc5d778a5 SHA512 98d1f7c4a0bd7ca6c06cbedc6323f2d40cee757c66bc8a6e9d88a86a3f202428dd8f3a681f2d82bbe91b5fb7723d7d44fb29eb1d9cea02e6aebb99fd2f0a1743
+EBUILD cdcat-0.3-r1.ebuild 1245 BLAKE2B c45100b1cb46d197421f9964a22edcbb7a5f4d026348d6a8c436c30df1d4463e6ecf353458957f8b9e8f05bf2cccc13a1ae42e91359ce0471e351195d9884e58 SHA512 1fc07b8db7fa5e486171370a4f0577321ce3d7c39766dd1eca9678ac11671c6430416a14490129d32b2928aae619b057f3ac9847fce7e14af15a859568269521
+EBUILD cdcat-0.3.ebuild 1231 BLAKE2B 435ec1d0f9750158055c9ddf2ebc1a31fa0223d51d59b34832fd9bd8cef528244e3a9d645c0d20b9149d0b1b578a4c43ef495d61b31822e07a84336da09a19ce SHA512 a21844dbbc3ba3206407dd59e0af6bc520fb09d83a08fc3454853bcd2c44853e8f68d2ffed1819a034c6e22c6792f0ba7b4b35d91df62f75716429a82f5185fa
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/cdcat/cdcat-0.3-r1.ebuild b/app-misc/cdcat/cdcat-0.3-r1.ebuild
new file mode 100644
index 000000000000..3649b8e2eacc
--- /dev/null
+++ b/app-misc/cdcat/cdcat-0.3-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Simple yet effective CD indexing program"
+# original src went away: SRC_URI="http://littledragon.home.ro/unix/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/cdcatalog/${P}.tar.gz"
+HOMEPAGE="http://cdcatalog.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="virtual/cdrtools
+	!app-backup/cdbkup"
+
+src_prepare() {
+	default
+	# workaround install.sh ignoring --man_prefix
+	sed -i 's:^MAN_PREFIX:#:' install.sh || die
+
+	# fix path to cd index files to be FHS-compliant
+	sed -i 's:/mnt/ext/cd:/var/lib/cdcat:' src/cdcat.pl || die
+
+	# work around problem with isoinfo -di
+	sed -i 's:isoinfo -di:isoinfo -d -i:' src/cdcat.pl || die
+}
+
+src_install() {
+	# workaround install.sh ignoring --man_prefix
+	export MAN_PREFIX="${D}/usr/share/man"
+	dodir /usr/share/man/man1
+
+	# create index files path
+	dodir /var/lib/cdcat
+	keepdir /var/lib/cdcat
+	chgrp cdrom "${D}"/var/lib/cdcat
+	chmod g+ws,o+w "${D}"/var/lib/cdcat || die
+
+	# now use the included install.sh
+	./install.sh --prefix="${D}/usr" \
+		--man_prefix="${D}/usr/share/man" || die "Install script failed."
+
+	insinto /etc
+	doins doc/cdcat.conf
+}
diff --git a/app-misc/cdcat/cdcat-0.3.ebuild b/app-misc/cdcat/cdcat-0.3.ebuild
index e97b12414768..6f165bb146e3 100644
--- a/app-misc/cdcat/cdcat-0.3.ebuild
+++ b/app-misc/cdcat/cdcat-0.3.ebuild
@@ -5,8 +5,8 @@ EAPI=0
 
 DESCRIPTION="simple yet effective CD indexing program"
 # original src went away: SRC_URI="http://littledragon.home.ro/unix/${P}.tar.gz"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-HOMEPAGE="https://dev.gentoo.org/~centic/cdcat/"
+SRC_URI="mirror://sourceforge/cdcatalog/${P}.tar.gz"
+HOMEPAGE="http://cdcatalog.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-misc/cdspeed/Manifest b/app-misc/cdspeed/Manifest
index 8652e51922bd..27dee7d6a862 100644
--- a/app-misc/cdspeed/Manifest
+++ b/app-misc/cdspeed/Manifest
@@ -1,3 +1,4 @@
 DIST cdspeed-0.4.tar.gz 3696 BLAKE2B bb3072478897c202de3732bc75cf1a3306066e639f1b23daf275af8b7e627c7a6353a881a19606f155f3c6a0938c7a72171a7ee070e7313dc19265f5c1840daa SHA512 2f656c0a8269a568f10a499efb6414c217369d42dc6fee393ccfdbb69b89ab6e01dae2e3901049081a29b7a2bed857591f9ff8b2855aa6e325b85aecba2e2b37
 EBUILD cdspeed-0.4-r1.ebuild 691 BLAKE2B 7872adab9e2355d257e819f9b4d4529c850a3809ff8f39e22a640856b50324d0293dd852219a4639164b38bcf69a538e1ddc07ff8179c7b317c9041bcbc7f63f SHA512 6a66a0206ab6628bde4b24878390249830e327c3e07e5917107e7df1d0660ed3d956d46e813f33f39ff6610ddf16b0a0e08d8c0d43ff18b358e27ff345313536
+EBUILD cdspeed-0.4-r2.ebuild 607 BLAKE2B 7e3698bfe020daa4f300eb7368bbe031fdc1d0bd8cd0a53afd69c49a603833902249023cb063a96fa3fc8b79fb146971c9ed52297c5168f512c0008371766474 SHA512 69b75a5ead830e1c903366aa7c2a708c5006c248699445155f685df4fa45464e6b66db0ddd42737f76e924bd060d8e4031da3310052f8f186c264a8671cba0f3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/cdspeed/cdspeed-0.4-r2.ebuild b/app-misc/cdspeed/cdspeed-0.4-r2.ebuild
new file mode 100644
index 000000000000..6c933ac2caff
--- /dev/null
+++ b/app-misc/cdspeed/cdspeed-0.4-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Change the speed of your CD drive"
+HOMEPAGE="http://linuxfocus.org/~guido/"
+SRC_URI="http://linuxfocus.org/~guido/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~x86"
+
+src_prepare() {
+	default
+	sed -i Makefile \
+		-e 's| -o | $(LDFLAGS)&|g' \
+		|| die "sed Makefile failed"
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS} -Wall -Wno-unused" CC=$(tc-getCC)
+}
+
+src_install() {
+	emake PREFIX="${D}/usr" install
+	dodoc README
+}
diff --git a/app-misc/go-jira/Manifest b/app-misc/go-jira/Manifest
index 96f28c3a0216..909630c68c0d 100644
--- a/app-misc/go-jira/Manifest
+++ b/app-misc/go-jira/Manifest
@@ -1,7 +1,5 @@
 DIST go-jira-1.0.17.tar.gz 1382832 BLAKE2B 17cada8407b5136ec3b84d9f43c67cb25a893bdfeae7309bc15eb479954ba3ce7df4bc1248782a0bd1874b08b48a68a8e69a1651960c10d6260b22c63a0a8147 SHA512 8abbe6233413d12495399446adbb02d6a37aedf2a2b1a860c403b6e210f5e1f44fa01dfe937d86241486cb4a56c52530eff1c582d59f5ddde4b466a6908fd020
-DIST go-jira-1.0.19.tar.gz 1292750 BLAKE2B 2377b5d677878e83d764d65fe3ef9c3388aa5999004adce956549b327e00554142f7fc82c724593652fd5b5a2d23e161b926bb3c34285f971df0bdac90c94a0a SHA512 42fb89f0886df19eac6cc7098da1e03a0e091876777de896a1b035b6f9d0cb5b546b8fb4c8d4469450da11e2a52b158256f959a63fc57ffeb4541cf792bf3b0f
 DIST go-jira-1.0.20.tar.gz 1292990 BLAKE2B 788dada892809df730988193e50bd1033b2efe4398cf1374c7c2a08c197e10215aa83feeb2b0573a04c7de72badf83089cd45da85d0e60a31d0fbf41615debae SHA512 f07e1fa6e24fa29a50e348490b0ebf6f3dfa1c1bcbc8420320f3c87b3fac74e6ff1d9acb8936fefb25debed2411508689f832eb19ce09f1c39657942c092220e
 EBUILD go-jira-1.0.17.ebuild 704 BLAKE2B 1aa8dad2ff3972debb356ae656cf97669dadecc9b502f7b59f679463e22f22b14965cf72e838ef8040be61b1ed78e6372653806ca6a0e6733c98c0b682b97e40 SHA512 66a7667d8e4939bd30e7f7ca9afbfbcf715a3582e8bb6ac60e4b27cb014e6f51ebbf755726345833ca9e734e42d461bf45f5f75ca93b1046ac8bb8dfbf9bc454
-EBUILD go-jira-1.0.19.ebuild 686 BLAKE2B ab33305d1c3a5d86616dbe74f431e787a2f9580ae778467fd98c9f5f70b3054182036611d19d843137919b44f1662606b2811e53a263789a6d86d5210c7f81d4 SHA512 93c12cbaf1c43389ca3e96adcb78f63bdcc9057adf66b75d01841b9420f72d83b663e4e306997dbe1aae5306f786a0f7dd060591297ddc7a0a0c0ba6cd6f0b98
 EBUILD go-jira-1.0.20.ebuild 686 BLAKE2B ab33305d1c3a5d86616dbe74f431e787a2f9580ae778467fd98c9f5f70b3054182036611d19d843137919b44f1662606b2811e53a263789a6d86d5210c7f81d4 SHA512 93c12cbaf1c43389ca3e96adcb78f63bdcc9057adf66b75d01841b9420f72d83b663e4e306997dbe1aae5306f786a0f7dd060591297ddc7a0a0c0ba6cd6f0b98
 MISC metadata.xml 339 BLAKE2B 2b1e03ce70c1b7ff8244dc3673ce59305a6c9eabd2fc9d52209f3c85db21da04490378c95fbe647c21a0d26533d078a5b3842b4a41703a46aa670dc8dc569913 SHA512 f05c51962c3d381861ca4486baf4c1e4207c19ba87fb8113c4fd66c3a6b526ee5d9a74c98395631a7fca007fcbe2902464b02fb927dcc45b9f5ea0d4fcd96ef0
diff --git a/app-misc/go-jira/go-jira-1.0.19.ebuild b/app-misc/go-jira/go-jira-1.0.19.ebuild
deleted file mode 100644
index 513090c2a8f9..000000000000
--- a/app-misc/go-jira/go-jira-1.0.19.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="gopkg.in/Netflix-Skunkworks/go-jira.v1"
-
-inherit golang-build golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-
-DESCRIPTION="A simple JIRA commandline client in Go"
-HOMEPAGE="https://github.com/Netflix-Skunkworks/go-jira"
-SRC_URI="https://github.com/Netflix-Skunkworks/go-jira/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${WORKDIR}/${P}" go build -v -o jira  cmd/jira/main.go || die
-	popd || die
-}
-
-src_install() {
-	dobin src/${EGO_PN}/jira
-	dodoc src/${EGO_PN}/{CHANGELOG,README}.md
-}
diff --git a/app-misc/imgurbash2/Manifest b/app-misc/imgurbash2/Manifest
new file mode 100644
index 000000000000..ad32e0e4a0fc
--- /dev/null
+++ b/app-misc/imgurbash2/Manifest
@@ -0,0 +1,4 @@
+DIST imgurbash2-2.1.tar.gz 3619 BLAKE2B 01bb37615184113082a87b79b5bbda1707e36d8f4a28715e0686eb63f8d7c55f7aa760ecab9ab2457c1601e9cb0ff4b558cd08f8a77a123cfe97d8008ad1aa93 SHA512 32e7c39d3456f3d540af2db8b21d8a5724bf9b1db372953f3dd0ed21a6f7529209ec7afffe22410be46a99753202aca2454732d09c1314350187c5610b36ab9d
+EBUILD imgurbash2-2.1.ebuild 604 BLAKE2B b59d77dcfe8dab3d3d3f527618202ec252f8734d3df91fdbc8e7fed2e8871bd29e462dc8a641b1c5e6c27735507ddd925ea345111b7bcfb3dadab8233cacfff4 SHA512 bc052a2c24c485ec2afc2a4ef13d2c2ed99eba4d442802c3b7725724bb7c5f69c247ab44533d86bffa2200d86bb53f01d3988814dbac4a4d2ff430d68c1f16d4
+EBUILD imgurbash2-9999.ebuild 604 BLAKE2B b59d77dcfe8dab3d3d3f527618202ec252f8734d3df91fdbc8e7fed2e8871bd29e462dc8a641b1c5e6c27735507ddd925ea345111b7bcfb3dadab8233cacfff4 SHA512 bc052a2c24c485ec2afc2a4ef13d2c2ed99eba4d442802c3b7725724bb7c5f69c247ab44533d86bffa2200d86bb53f01d3988814dbac4a4d2ff430d68c1f16d4
+MISC metadata.xml 446 BLAKE2B d320d9d38032271643c158fa8bd5e356c41a2fa3d91c375eb58a42084f2d202a3728a4b49e2826111bf01de57c5e451b82be8cd8c11ce40f4ab86a41981839d7 SHA512 f5d5aa394eac1885bc1aec85009b73bce9f875ede01719a234a84d8a311441e372288abf04d993263828b0bdabee6da1ab81c7ebd70f1100f5c4c17a0ca6e1de
diff --git a/app-misc/imgurbash2/imgurbash2-2.1.ebuild b/app-misc/imgurbash2/imgurbash2-2.1.ebuild
new file mode 100644
index 000000000000..076690d530e5
--- /dev/null
+++ b/app-misc/imgurbash2/imgurbash2-2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ram-on/imgurbash2.git"
+else
+	SRC_URI="https://github.com/ram-on/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Bash script that uploads/deletes images to/from imgur"
+HOMEPAGE="https://github.com/ram-on/imgurbash2"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="X"
+
+RDEPEND="
+	net-misc/curl
+	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
+"
+
+src_install() {
+	einstalldocs
+	dobin imgurbash2
+}
diff --git a/app-misc/imgurbash2/imgurbash2-9999.ebuild b/app-misc/imgurbash2/imgurbash2-9999.ebuild
new file mode 100644
index 000000000000..076690d530e5
--- /dev/null
+++ b/app-misc/imgurbash2/imgurbash2-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ram-on/imgurbash2.git"
+else
+	SRC_URI="https://github.com/ram-on/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Bash script that uploads/deletes images to/from imgur"
+HOMEPAGE="https://github.com/ram-on/imgurbash2"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="X"
+
+RDEPEND="
+	net-misc/curl
+	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
+"
+
+src_install() {
+	einstalldocs
+	dobin imgurbash2
+}
diff --git a/app-misc/imgurbash2/metadata.xml b/app-misc/imgurbash2/metadata.xml
new file mode 100644
index 000000000000..080521c63d58
--- /dev/null
+++ b/app-misc/imgurbash2/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lucianposton@pm.me</email>
+		<name>Lucian Poston</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ram-on/imgurbash2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-misc/irtrans-irclient/Manifest b/app-misc/irtrans-irclient/Manifest
index d354d93abc38..26623ae02d28 100644
--- a/app-misc/irtrans-irclient/Manifest
+++ b/app-misc/irtrans-irclient/Manifest
@@ -1,4 +1,5 @@
 DIST irclient-src-6.01.05.tar.gz 69814 BLAKE2B fb8d854fa9c00e57ff5f4002047c1733fb42e95d4055efb2c23bdbe381f901705973f54c155a65ddab1ca134d0c31b5e36eb90784a9e9986bbd5c8a2f4d4775d SHA512 47d76f66ce6422252624dd805fbff042bcd9443f04b656cb2b20267dbf42a57345a0ac5cda0204a44535088a06c1232d2dea6305ad3561c78a7330774c1e998e
 DIST irtrans-irclient-5.11.04-ip_assign-1.patch.bz2 5051 BLAKE2B 79b8fb9249c69e8a868771a288e5f0e7c4d6658d36f97ce1ac0c577dae5c810207780406bb7a87df3392eb795463b9c62c6ce7d99ef349111db99637ee8d2432 SHA512 9be72f7f6fcc24c9bda73cf5dd8a2c112c6cb82e2ef50d40c17b43d7dcb8f11bcf8bc0ebb914046b5429bce1b4936278ade936db6c916384fbd637a300f528cf
+EBUILD irtrans-irclient-6.01.05-r1.ebuild 1331 BLAKE2B 9709f86529fe6fece10be99747e312d0a2467588e32cef7391f70cfef0bfe892db88b12b0d4cdaf07853fe30c160658f5ef31a7c85d17b55ed75734ba7765ff1 SHA512 3754845152408964332914b5e4ade4a3f38d3eec9534c2f12a1e863f77ec26f5cf539f0e6aec3cd6e434e3cc65e74e5c05956a357159a317208433c16959f5f3
 EBUILD irtrans-irclient-6.01.05.ebuild 1647 BLAKE2B 15d5c9cd56c80697b178798212130e406ca19dcdf3e81c4251b885cffcff37eabe2295390997a916a5d663830bc100d242a57f05597d0cf970600340f7337c00 SHA512 a454497e39e36731065ec6d4d2b78fedfbae575357fefedcd21439267964bc2ae483048c80e59c7e7663e7510a9fd8e70e9ad857ee2525fa2d31212656efb447
 MISC metadata.xml 460 BLAKE2B 8911eaf34bbdd8c9978c5d89582d1f0765ade9101da2102b02ab55f2f2c93384198c2fe79fcddb3ae8319bb32d0c8c973e69297a7830d7afafc454a7600dc145 SHA512 6067b6d98528ce0e9b0811ae31d949362173c43471d935197d2da5eeee5b4391cbd43b1bfbed8468c187d71c341f1eee247df0bfd3faf963104a67223501f75c
diff --git a/app-misc/irtrans-irclient/irtrans-irclient-6.01.05-r1.ebuild b/app-misc/irtrans-irclient/irtrans-irclient-6.01.05-r1.ebuild
new file mode 100644
index 000000000000..ace60918ca5c
--- /dev/null
+++ b/app-misc/irtrans-irclient/irtrans-irclient-6.01.05-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+RESTRICT="strip"
+
+DESCRIPTION="ASCII Client for the IRTrans Server"
+HOMEPAGE="http://www.irtrans.de"
+SRC_URI="http://www.irtrans.de/download/Client/irclient-src.tar.gz -> irclient-src-${PV}.tar.gz
+	http://ftp.disconnected-by-peer.at/irtrans/${PN}-5.11.04-ip_assign-1.patch.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~arm"
+
+S="${WORKDIR}"
+
+PATCHES=( "${WORKDIR}/${PN}"-5.11.04-ip_assign-1.patch )
+
+src_compile() {
+	append-flags -DLINUX
+
+	# Set sane defaults (arm target has no -D flags added)
+	local irbuild
+	local ipbuild
+	irclient=irclient
+	ip_assign=ip_assign
+
+	# change variable by need
+	if use amd64; then
+		irbuild=irclient64
+		irclient=irclient64
+		ipbuild=ip_assign64
+		ip_assign=ip_assign64
+	elif use arm; then
+		irbuild=irclient_arm
+		ipbuild=ip_assign_arm
+	elif use x86; then
+		irbuild=irclient
+		ipbuild=ip_assign
+	fi
+
+	emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+		"${irbuild}"
+	emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+		"${ipbuild}"
+}
+
+src_install() {
+	newbin "${irclient}" irclient
+	newbin "${ip_assign}" ip_assign
+}
diff --git a/app-misc/irtrans-irserver/Manifest b/app-misc/irtrans-irserver/Manifest
index cf8f38340a5d..423b25a8dca1 100644
--- a/app-misc/irtrans-irserver/Manifest
+++ b/app-misc/irtrans-irserver/Manifest
@@ -2,5 +2,6 @@ AUX irtrans-server.confd 392 BLAKE2B b23c07dc308bcda49f49985b7d6c77c3391a959a142
 AUX irtrans-server.initd 564 BLAKE2B 1ef6433ab6866ca5c3947737ec55a1a5bd129456aa3247d69005bf8b48ff2a139228ffdd1032dd9654528ffe77e369a8d8d796a8dc421f626cb8cb7a19519a1c SHA512 fb47c9d695e879e0db95fb5ae427b5d0248c65b6fa701408369c845cad1025cb913d85d68145fd69ad96ee65092b549384ee7e8135f095254840fd25ef7aa781
 DIST irserver-6.09.04.tar.gz 665809 BLAKE2B 1f336e34a3a79490266a762520083c74f79d34b2b8603a9d4b8e29347346c658c1723608627590d39ebb66bebe9886a4052376ade81704db3b2c1cccf229b87e SHA512 d63f8bc79c2a5a8050c5ac21b086be3826f66102dc2f111bf8084b57756c6bcd84615d1675781b26520c34f7a3e08726dbc4ae94dd4f4afc446383597c433399
 DIST irserver-src-6.09.04.tar.gz 200481 BLAKE2B 7eaffd5bb335dfcbe6f0716af57aa898d2cce1a984a2f050081bd71a9c63d5d1e5949fdebdcbbbee05c337141d0efe5c6ebcb937726ff9506a766f69ed8d2f58 SHA512 09c38066e64404808856a89a8451e41a6eb8a51b98635b1515fc07050f25b4552b9cc912bd9612c6746ba67cd9b1bb45f3d4871dfa820c9e9bd810ede20f28d6
+EBUILD irtrans-irserver-6.09.04-r1.ebuild 1879 BLAKE2B b7b2863ab4fe59391803a06836d1f18c3c7107128d0d30addfe98740f9378a7ecf810f2566e855bd9590100b2f091221c2e4c7e50e07876e294e9c3adaf97fe4 SHA512 b60b4f6ce52a8c40e6057fa9efe9704be3eb87b37d1398922c1db7773d9aa5e65aca6988f5a652cb330aebb7da8a3a98390b90f5b040b382d9b47b571d17ead9
 EBUILD irtrans-irserver-6.09.04.ebuild 2006 BLAKE2B 0add7e689507a9288a13fd1e728635c202587a0d9e5c8a03396a338c32b7109d37e862da59afea77745856fdcd8933db4b7a5c4adb563c933d4045ef1134c3fb SHA512 8e9d565c322ef914c68f2dabbadfd7b4b3bc78f72e196e27a75b0d7b348602e2eaf93bcb343ccb7e35c1bd2ecff217eccb42dcb287e0c1ed69fe7350a7e7dcb3
 MISC metadata.xml 540 BLAKE2B 3355962a1d9d6d94c207254ee0f49639ac55cba6504a4ecae2470c0df4d09189c3d00f76c6dffc554d13ebaa6d154040152a3169da166232ef4f2308c968e160 SHA512 9c1297f57d16730eba72da496f870d67aae2cca6a4c49da99e2f6bd4721f13c9208599b2a1a50ed8409ebb26f772a9906c5f9969f6e2f1f262592b0af2fa4b58
diff --git a/app-misc/irtrans-irserver/irtrans-irserver-6.09.04-r1.ebuild b/app-misc/irtrans-irserver/irtrans-irserver-6.09.04-r1.ebuild
new file mode 100644
index 000000000000..66bc0d674992
--- /dev/null
+++ b/app-misc/irtrans-irserver/irtrans-irserver-6.09.04-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs mono-env
+
+DESCRIPTION="Server software for IRTrans"
+HOMEPAGE="http://www.irtrans.de"
+SRC_URI="http://ftp.disconnected-by-peer.at/irtrans/irserver-src-${PV}.tar.gz
+	 http://ftp.disconnected-by-peer.at/irtrans/irserver-${PV}.tar.gz
+	http://www.irtrans.de/download/Server/Linux/irserver-src.tar.gz -> irserver-src-${PV}.tar.gz
+	http://www.irtrans.de/download/Server/Linux/irserver.tar.gz -> irserver-${PV}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="mono"
+RESTRICT="strip"
+
+RDEPEND="mono? ( >=dev-lang/mono-2.10.5 )"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+	sed -e 's!^ODIRARM = .*!ODIRARM = n800!' -i makefile || die
+}
+
+src_compile() {
+	append-flags -DLINUX -DMEDIACENTER
+	append-ldflags --static
+
+	# Set sane defaults (arm target has no -D flags added)
+	local irbuild=irserver_arm_noccf
+	irserver=irserver
+
+	# change variable by need
+	if use x86 ; then
+		irbuild=irserver
+	elif use amd64 ; then
+		irbuild=irserver64
+		irserver=irserver64
+	elif use arm ; then
+		irbuild=irserver_arm
+	fi
+
+	emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" "${irbuild}"
+}
+
+src_install() {
+	newbin "${WORKDIR}/${irserver}" irserver
+
+	keepdir /etc/irserver/remotes
+
+	docinto remotes
+	dodoc -r remotes
+
+	newinitd "${FILESDIR}"/irtrans-server.initd irtrans-server
+	newconfd "${FILESDIR}"/irtrans-server.confd irtrans-server
+
+	if use mono ; then
+		# Wrapper script to launch mono
+		make_wrapper irguiclient "mono /usr/$(get_libdir)/${PN}/GUIClient.exe"
+
+		insinto /usr/$(get_libdir)/${PN}/
+		exeinto /usr/$(get_libdir)/${PN}/
+
+		# The Libs and Translations
+		doins GUIClient/*.tra
+		doexe GUIClient/*.dll
+
+		# The actual executable
+		doexe GUIClient/*.exe
+	fi
+}
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 5d2524e31c41..5975d8880273 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -21,6 +21,6 @@ AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a3
 AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae0d72f49fc8699fe9b9c7d8818a94eb7b40a5a653bfc8ca61ec11374c49ecebd1ef235d4ed8b8c08 SHA512 a64cac97e21ab53c247d8dd3e518b3caee5eeb9c3558727eba8a04684894c6be1695ce681e71d559474f4e78bbb39130d97f843eae18e56b3d3eb70f1fbefc63
 DIST lirc-0.10.1.tar.bz2 2523226 BLAKE2B 47b7ee87de8f64f7f829af519c0d296a85cf91790148927e850965177d4984bb994a0ad122cb59c3db508813d0824ffec45126e794abd08174a052361cea53e5 SHA512 31c0b6ee169b302b99994a2a3fa0ebcae0e01cb83c02fe02acf1de5ba8cf77a091a0221c7d8104448c30930adafe654cd08afb7d0df6b5b7ec2d47df26e5df9d
 DIST lirc-0.9.0.tar.bz2 857286 BLAKE2B 034c7b8492dd42301bb6d40da8c6c95f714b925ee50e7396290231684024dc3fe3bb64987db92d2a4e4d56203436007e68222bbf9a775bb9d29bbefcc4a7c1e4 SHA512 e91534c63e6065bd7da3b15e1676edf1672b8beb21864a6825df86247d7d165bf2dee6f8191732933e24e42a406e46afc55559948e4061eed2de7b08fac13431
-EBUILD lirc-0.10.1.ebuild 3738 BLAKE2B dad00c82d4c098609c975de7ab654f91aca0cd994793a3d5cbd0cef2767c5e99d8b26c515e9405f0bc93e97dc28a8dd34abb91c1560099fe24b1a5b5d04146c5 SHA512 1bcd35fc8bb738ef89197847791ffce72f06e240980e62a67f807abc3b9b00c27d35e769f542f2ea59cd84fb082f01854f1b7bdfb94d161633a160a43d1f844f
+EBUILD lirc-0.10.1.ebuild 3737 BLAKE2B c301a74cc28fe71b2baa93b8e971473b5c91ac8b5257ab78d2b26e71c2e013dae6e352b7eb8c15aa60e2e05bed3413ed9b5e0b30045eb667b6d8b9846539bae4 SHA512 c80ef32cb9d6d9a2cc61fc346de899308405dade3bc6e6e504ebc09389b835095f88057eaee90b37bf3a27ec87e26f7c9b273d783f95739fdbb48054fd54bfbd
 EBUILD lirc-0.9.0-r6.ebuild 13250 BLAKE2B 81ca3c71e46089a8f3a1b412d53e60096f14c0825f8f4c7daf9fee9387e3eced4dda10c8e5dc4550a9e0eb1347b1db40972a3a2397154dce2a8e1d2ed8b99977 SHA512 0d620d93bccf35721830420a7e367b45c1b6a71891843db12fe4c96b0d1228de6367969545eeb0f0416833f195ed933eafef69d5d38a0a46a1f0ddc32829240b
 MISC metadata.xml 1175 BLAKE2B 1bcfd5d3fed6ee42c3e53168cc40fd930e6b92bf52bc787c43439f053e1fb97bf841d71ec58ce3fae56187c77cac767613107e74a90f8871dcfe3f33e4ff293f SHA512 c1d6ff9a423c0ea5d52410d5dfa2cd9dd94b61109494c629706dc74c228032e19e6504884c50694450624d6c05f437eaaebaee0ab626f7004fc7377331fa847c
diff --git a/app-misc/lirc/lirc-0.10.1.ebuild b/app-misc/lirc/lirc-0.10.1.ebuild
index 265d43838009..ee28e97e8f99 100644
--- a/app-misc/lirc/lirc-0.10.1.ebuild
+++ b/app-misc/lirc/lirc-0.10.1.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc ppc64 x86"
 IUSE="audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X"
 
 REQUIRED_USE="
diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest
index 679331f0efe1..6ad7a8d87bf3 100644
--- a/app-misc/nnn/Manifest
+++ b/app-misc/nnn/Manifest
@@ -1,5 +1,7 @@
 DIST nnn-1.6.tar.gz 37456 BLAKE2B 90a6bcf7123b763585a05d5898ecee129561fa11dddbc40125f536b96315e4847b6187615df2bb6e0262d3df5efeec83d6681092ed69e4b65cd5486cf396e7e6 SHA512 7172f37f98f15b37cd2959c5ad144d32f55cde9cd2fe3221fc7a23887d3326da924c9be0bdc61a01a4d98ceb9b03de2420a66cc2cbf94a2ae1547da206e4c49a
 DIST nnn-1.8.tar.gz 42534 BLAKE2B acf1f9e211ddf688da96c77364f8eb2d12c853fa528774f2a3f8fa146203b155df089f6a3c995f0415d5349e9bb0c519cd0776c77094a83c23ecfe45561c846d SHA512 dfa3fc20cc9d77dc6a998913d79c1f98467f9e0f475d43317fe5b3b7c85f04a8aa1508305307873115ff810f5e212272e8348af9d8bd5283f48ad76ed34cad55
+DIST nnn-1.9.tar.gz 43405 BLAKE2B c085f13883eb379cc04b225d3a6bdbc95dcfb200a0c338bea82b64841918f41560a0b53ed49be0cf8eaec852eb1575d050197ece197fd655c2a3ba1c6cf20d57 SHA512 44eb3d569429ee27e35c0a1299e7cb248072b470b462a361eec3364163f03f577a1b28819cddfc9a85002d6ae90c61cc0633f0548c58cb154dfd8e6491c73369
 EBUILD nnn-1.6.ebuild 1079 BLAKE2B d80952f77883811cb91d4c5d9e5a412bf75896fd1827ae70daee380341060d30dd9589dfe0c49587220f2dc53a7dff24aa2e6a2ef537cb20452474c415f639cf SHA512 18eeadc9e37f7853bf2341e96ca1a3a4a6bbe70b8d8576f9dfd92509c0001e8b106a0e8ee34d30a335f9fc68956b82ab23ab6d41f7e34a3f201ba04abb910f99
 EBUILD nnn-1.8.ebuild 1079 BLAKE2B d80952f77883811cb91d4c5d9e5a412bf75896fd1827ae70daee380341060d30dd9589dfe0c49587220f2dc53a7dff24aa2e6a2ef537cb20452474c415f639cf SHA512 18eeadc9e37f7853bf2341e96ca1a3a4a6bbe70b8d8576f9dfd92509c0001e8b106a0e8ee34d30a335f9fc68956b82ab23ab6d41f7e34a3f201ba04abb910f99
+EBUILD nnn-1.9.ebuild 862 BLAKE2B c46fdf2d4a9fb6a4be07b557f44ec28764c4d24f30299941a31f45700f4ab4c1a1ac726146415522b2987128d9bb05d5d8c3fb2c7ed2920ff434004dac3f6626 SHA512 127bec82201acccd3764898f10636c75eb9af9562dec651fed4fd1a0fa1d6b6ed385fee20fc09bad8b8947c775011c6e1021edfcdbcddcd2c7fb8fdeeb5fb0bc
 MISC metadata.xml 324 BLAKE2B abbc05bbc35735d7a931021eac9e8f9a4584867c885fea581f57d7b4e9d83be1b2b3ec8b5246c1ecafd9c1e55078d66fa1cac22a8321beb5d4912a596c721e48 SHA512 291b497b906b3fdcbee656d90292d5b267c4082d1864e38f64938ce2d3b8aa56ca782d217f3a0776049db5dd7da416a4200e86f91da7075c54998b5901f78ef5
diff --git a/app-misc/nnn/nnn-1.9.ebuild b/app-misc/nnn/nnn-1.9.ebuild
new file mode 100644
index 000000000000..1f92d72054e7
--- /dev/null
+++ b/app-misc/nnn/nnn-1.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="The missing terminal file browser for X"
+HOMEPAGE="https://github.com/jarun/nnn"
+SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/ncurses:0=
+	sys-libs/readline:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	tc-export CC
+	sed -i -e '/strip/d' Makefile || die "sed failed"
+
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install
+
+	newbashcomp scripts/auto-completion/bash/nnn-completion.bash nnn
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins scripts/auto-completion/fish/nnn.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins scripts/auto-completion/zsh/_nnn
+
+	einstalldocs
+}
diff --git a/app-misc/pfm/Manifest b/app-misc/pfm/Manifest
index 3b382e633e3b..eb3d450b937c 100644
--- a/app-misc/pfm/Manifest
+++ b/app-misc/pfm/Manifest
@@ -1,3 +1,3 @@
 DIST pfm-2.12.3.tar.gz 2272053 BLAKE2B 257fb8b4682b884e1ee850668cc283cc1fc83d2cdc1366b5186fba6d71fa08b1f4c7d10123609c4bb8c79ab25f89c25994d749df098219efb9e9547e5e299d61 SHA512 d9feeaa95a0114ee513835a9273b62164a851ae8599d27575b3545f02144b4cf970a066afd5acec03092f0d49c85929c8127d1e134d1e80c15fe6d0a9b6921fc
-EBUILD pfm-2.12.3.ebuild 664 BLAKE2B f1a1c213046cf1413ff0a949d8efc84c0fa9ea7231bfa3696416b9d9322c1db3dbce0850d5128dfe4a9f095e2bd383c4130062f391437b06d4e38147c81cc503 SHA512 76dbd966ef5af47b14291035cb868a239d6d1f28926eeb9cc3fc1439b788e3f65b0ed0f254be7a6df3a18684a636546ea82ae8d7b0bd15b27407fb7609565877
+EBUILD pfm-2.12.3.ebuild 659 BLAKE2B 0ce8a828904fffdce8ee7b034a10c11836cfb6e4882be405eca8bfe6b64c3d2f743d6177f362d363f61a54d3fe3aad18e8bf3596105aba67fabe3d991852c80c SHA512 8b0795a28311a785384c449310225e4a80cc19b47fb20473378374564d5c16bec777f999901f65cff947a17a1be376322d1ae32c57cdba27440fe9199d2fbe60
 MISC metadata.xml 326 BLAKE2B ddedcf63628c21363e6b9f5835d5f3646c5ee32267dfe53390b4d7b9b69e6d7e7452503aef493d6814824904005ae5345cceac36abb750a97595a71069fecbd0 SHA512 74b827fb7bba6a09cbd67c07f3349b0e724bbda26f7b27cec24488a75d2dffc11415468c9bdbd12139115d8d40af137af10e51209200e5874b9f988cb27d7ce1
diff --git a/app-misc/pfm/pfm-2.12.3.ebuild b/app-misc/pfm/pfm-2.12.3.ebuild
index 64c1eb47dd88..6932426c8f50 100644
--- a/app-misc/pfm/pfm-2.12.3.ebuild
+++ b/app-misc/pfm/pfm-2.12.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/p-f-m/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 s390 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=dev-lang/perl-5.8
 	>=dev-perl/File-Stat-Bits-1.10.0
diff --git a/app-misc/qlcplus/Manifest b/app-misc/qlcplus/Manifest
index 24618dea9b1a..a6f790174989 100644
--- a/app-misc/qlcplus/Manifest
+++ b/app-misc/qlcplus/Manifest
@@ -1,3 +1,4 @@
+AUX qlcplus-4.11.1-qt-5.11.patch 7589 BLAKE2B 30aeafe90d1013fabe5d2f059ad483a3ddef64edeb691bf7a21b818b946cdbe028d52e4a13e29b0c0c571504dc0cac215e93584bf5a71f6ccfbdd807a16faf3d SHA512 e9b1b160463356a7a9c7768a55435a50a9c7081b342807bdd83282bc500a186f81420402db321463bb2e2ad29db95c3b8b33a7621aa481e34668420c85213636
 DIST qlcplus-4.11.1.tar.gz 9394093 BLAKE2B 0b91359217b723ed184f6a609ee0ef0a39f5f08aa8933abc7a3c429e4d5a3b2d1dc8ef454c00a172bc0e7b8f7fb0779d7fbba96ed5fafe403853f2a3bb8ce7b8 SHA512 14efdbe5cd53da592a58b48efb1daf7dda2a4e19d7d20792d34674af2aa1b9c287cfd58673db7838885642bb2ebfaf9b462be41d33f8d89497cb61dfab7246df
-EBUILD qlcplus-4.11.1.ebuild 1307 BLAKE2B 6b1d664e7370bb3e21465c8bed0b966e634d106797004f0997df552db14daec41f9f0b2a9a5d4d99a718c0248534416f4e8110c705b65771ee9ef755a74baf7c SHA512 1c8d14210707b7d758056bf80b5d1736db088cc46b0b1d790f4ffd8232eff307020a24d3b4038345e3943d0749ba40240a92b059e08a1089473c715040cec997
+EBUILD qlcplus-4.11.1.ebuild 1353 BLAKE2B 2ca629dcbc50ff860abb98ec27146521acafc69621aa1096b10a5e6d95ac1d6b11eaf90cbecb9092e9820d5e743085f82c661676333fb247d855872e214a8334 SHA512 bbbb98982ac9afabf3ed5729b6acd04257a4ac6bfc7c09c19e514f12317a68f4511bc245c0fd26a575e87dd21437e44b3848f2001d33ba01e91acd895b2cd60e
 MISC metadata.xml 326 BLAKE2B 8d391e1f300d364a5e985caad82387023c6f9d6081313b571ece49d2f5daf60f25527685bb7567ad18cbe3234202f8fe53b0a786b401477687b5b8ec39dfc1d9 SHA512 5de2dc43ec5ae4d9a2c598cfac00dc124a956040d0721cb867acc5c4ed312e8c9ef415205eaaed8ff5742281251c970a5ade2eae6280b62477f4fda3fedc2504
diff --git a/app-misc/qlcplus/files/qlcplus-4.11.1-qt-5.11.patch b/app-misc/qlcplus/files/qlcplus-4.11.1-qt-5.11.patch
new file mode 100644
index 000000000000..1279148283b1
--- /dev/null
+++ b/app-misc/qlcplus/files/qlcplus-4.11.1-qt-5.11.patch
@@ -0,0 +1,243 @@
+From f8be095c95831ae6ffc8426a94901197c0dacc38 Mon Sep 17 00:00:00 2001
+From: Jano Svitok <jan.svitok@gmail.com>
+Date: Mon, 9 Apr 2018 23:54:50 +0200
+Subject: [PATCH] Fix compilation with QT 5.11.0 beta2
+
+---
+ fixtureeditor/capabilitywizard.cpp            | 1 +
+ fixtureeditor/editchannel.cpp                 | 1 +
+ fixtureeditor/edithead.cpp                    | 1 +
+ fixtureeditor/editmode.cpp                    | 1 +
+ ui/src/aboutbox.cpp                           | 1 +
+ ui/src/addfixture.cpp                         | 1 +
+ ui/src/chasereditor.cpp                       | 1 +
+ ui/src/fixtureselection.cpp                   | 1 +
+ ui/src/functionwizard.cpp                     | 1 +
+ ui/src/inputchanneleditor.cpp                 | 1 +
+ ui/src/selectinputchannel.cpp                 | 1 +
+ ui/src/virtualconsole/addvcbuttonmatrix.cpp   | 1 +
+ ui/src/virtualconsole/addvcslidermatrix.cpp   | 1 +
+ ui/src/virtualconsole/vcbuttonproperties.cpp  | 1 +
+ ui/src/virtualconsole/vccuelistproperties.cpp | 2 ++
+ ui/src/virtualconsole/vcpropertieseditor.cpp  | 1 +
+ ui/src/virtualconsole/vcsliderproperties.cpp  | 1 +
+ ui/src/virtualconsole/vcxypadproperties.cpp   | 1 +
+ 18 files changed, 19 insertions(+)
+
+diff --git a/fixtureeditor/capabilitywizard.cpp b/fixtureeditor/capabilitywizard.cpp
+index d77c30fe1..ddb4c5b26 100644
+--- a/fixtureeditor/capabilitywizard.cpp
++++ b/fixtureeditor/capabilitywizard.cpp
+@@ -21,6 +21,7 @@
+ #include <QTextEdit>
+ #include <QSpinBox>
+ #include <QDialog>
++#include <QAction>
+ 
+ #include "capabilitywizard.h"
+ #include "qlccapability.h"
+diff --git a/fixtureeditor/editchannel.cpp b/fixtureeditor/editchannel.cpp
+index c44097783..9278c31b6 100644
+--- a/fixtureeditor/editchannel.cpp
++++ b/fixtureeditor/editchannel.cpp
+@@ -32,6 +32,7 @@
+ #include <QPainter>
+ #include <QPoint>
+ #include <QSize>
++#include <QAction>
+ 
+ #include "qlccapability.h"
+ #include "qlcconfig.h"
+diff --git a/fixtureeditor/edithead.cpp b/fixtureeditor/edithead.cpp
+index a95ecf726..68025b70d 100644
+--- a/fixtureeditor/edithead.cpp
++++ b/fixtureeditor/edithead.cpp
+@@ -20,6 +20,7 @@
+ #include <QTreeWidgetItem>
+ #include <QTreeWidget>
+ #include <QDebug>
++#include <QAction>
+ 
+ #include "qlcfixturehead.h"
+ #include "qlcfixturemode.h"
+diff --git a/fixtureeditor/editmode.cpp b/fixtureeditor/editmode.cpp
+index 440ab4956..5b8b1884f 100644
+--- a/fixtureeditor/editmode.cpp
++++ b/fixtureeditor/editmode.cpp
+@@ -30,6 +30,7 @@
+ #include <QPoint>
+ #include <QDebug>
+ #include <QSize>
++#include <QAction>
+ 
+ #include "addchannelsdialog.h"
+ #include "qlcfixturemode.h"
+diff --git a/ui/src/aboutbox.cpp b/ui/src/aboutbox.cpp
+index 68ece2d54..9296e566b 100644
+--- a/ui/src/aboutbox.cpp
++++ b/ui/src/aboutbox.cpp
+@@ -22,6 +22,7 @@
+ #include <QTimer>
+ #include <QDesktopServices>
+ #include <QUrl>
++#include <QAction>
+ 
+ #include "qlcconfig.h"
+ #include "aboutbox.h"
+diff --git a/ui/src/addfixture.cpp b/ui/src/addfixture.cpp
+index dad12f4e6..ae6bc0efc 100644
+--- a/ui/src/addfixture.cpp
++++ b/ui/src/addfixture.cpp
+@@ -30,6 +30,7 @@
+ #include <QSpinBox>
+ #include <QLabel>
+ #include <QDebug>
++#include <QAction>
+ 
+ #include "qlcfixturedefcache.h"
+ #include "qlcfixturemode.h"
+diff --git a/ui/src/chasereditor.cpp b/ui/src/chasereditor.cpp
+index bd949dcf2..246b71606 100644
+--- a/ui/src/chasereditor.cpp
++++ b/ui/src/chasereditor.cpp
+@@ -27,6 +27,7 @@
+ #include <QSettings>
+ #include <QDebug>
+ #include <QUrl>
++#include <QAction>
+ 
+ #include "qlcfixturedef.h"
+ #include "qlcmacros.h"
+diff --git a/ui/src/fixtureselection.cpp b/ui/src/fixtureselection.cpp
+index 0954a00a1..30851fa21 100644
+--- a/ui/src/fixtureselection.cpp
++++ b/ui/src/fixtureselection.cpp
+@@ -21,6 +21,7 @@
+ #include <QTreeWidget>
+ #include <QHeaderView>
+ #include <QLabel>
++#include <QAction>
+ 
+ #include "qlcfixturedef.h"
+ 
+diff --git a/ui/src/functionwizard.cpp b/ui/src/functionwizard.cpp
+index 00e7d5a4c..815b20e4c 100644
+--- a/ui/src/functionwizard.cpp
++++ b/ui/src/functionwizard.cpp
+@@ -21,6 +21,7 @@
+ #include <QString>
+ #include <QDebug>
+ #include <QHash>
++#include <QAction>
+ 
+ #include "palettegenerator.h"
+ #include "fixtureselection.h"
+diff --git a/ui/src/inputchanneleditor.cpp b/ui/src/inputchanneleditor.cpp
+index 6ad638c1f..69b9ca2ae 100644
+--- a/ui/src/inputchanneleditor.cpp
++++ b/ui/src/inputchanneleditor.cpp
+@@ -21,6 +21,7 @@
+ #include <QComboBox>
+ #include <QSpinBox>
+ #include <QIcon>
++#include <QAction>
+ 
+ #include "qlcchannel.h"
+ #include "qlcinputprofile.h"
+diff --git a/ui/src/selectinputchannel.cpp b/ui/src/selectinputchannel.cpp
+index c07c617fe..72006f2ca 100644
+--- a/ui/src/selectinputchannel.cpp
++++ b/ui/src/selectinputchannel.cpp
+@@ -21,6 +21,7 @@
+ #include <QTreeWidgetItem>
+ #include <QTreeWidget>
+ #include <QDebug>
++#include <QAction>
+ 
+ #include "selectinputchannel.h"
+ #include "qlcinputchannel.h"
+diff --git a/ui/src/virtualconsole/addvcbuttonmatrix.cpp b/ui/src/virtualconsole/addvcbuttonmatrix.cpp
+index 7ad7160e8..09523bd04 100644
+--- a/ui/src/virtualconsole/addvcbuttonmatrix.cpp
++++ b/ui/src/virtualconsole/addvcbuttonmatrix.cpp
+@@ -19,6 +19,7 @@
+ 
+ #include <QSettings>
+ #include <QDebug>
++#include <QAction>
+ 
+ #include "addvcbuttonmatrix.h"
+ #include "functionselection.h"
+diff --git a/ui/src/virtualconsole/addvcslidermatrix.cpp b/ui/src/virtualconsole/addvcslidermatrix.cpp
+index 63aa9dcce..cd80b3fe3 100644
+--- a/ui/src/virtualconsole/addvcslidermatrix.cpp
++++ b/ui/src/virtualconsole/addvcslidermatrix.cpp
+@@ -19,6 +19,7 @@
+ 
+ #include <QSettings>
+ #include <QSpinBox>
++#include <QAction>
+ 
+ #include "addvcslidermatrix.h"
+ #include "vcpropertieseditor.h"
+diff --git a/ui/src/virtualconsole/vcbuttonproperties.cpp b/ui/src/virtualconsole/vcbuttonproperties.cpp
+index ef0bb24ee..8e6dbde72 100644
+--- a/ui/src/virtualconsole/vcbuttonproperties.cpp
++++ b/ui/src/virtualconsole/vcbuttonproperties.cpp
+@@ -26,6 +26,7 @@
+ #include <QLineEdit>
+ #include <QCheckBox>
+ #include <QSpinBox>
++#include <QAction>
+ #include <qmath.h>
+ 
+ #include "qlcinputchannel.h"
+diff --git a/ui/src/virtualconsole/vccuelistproperties.cpp b/ui/src/virtualconsole/vccuelistproperties.cpp
+index efcb4dae8..d3a1b9118 100644
+--- a/ui/src/virtualconsole/vccuelistproperties.cpp
++++ b/ui/src/virtualconsole/vccuelistproperties.cpp
+@@ -17,6 +17,8 @@
+   limitations under the License.
+ */
+ 
++#include <QAction>
++
+ #include "vccuelistproperties.h"
+ #include "inputselectionwidget.h"
+ #include "functionselection.h"
+diff --git a/ui/src/virtualconsole/vcpropertieseditor.cpp b/ui/src/virtualconsole/vcpropertieseditor.cpp
+index 11ea5cd7b..d1080b06b 100644
+--- a/ui/src/virtualconsole/vcpropertieseditor.cpp
++++ b/ui/src/virtualconsole/vcpropertieseditor.cpp
+@@ -21,6 +21,7 @@
+ #include <QSettings>
+ #include <QCheckBox>
+ #include <QSpinBox>
++#include <QAction>
+ 
+ #include "qlcinputprofile.h"
+ #include "qlcinputchannel.h"
+diff --git a/ui/src/virtualconsole/vcsliderproperties.cpp b/ui/src/virtualconsole/vcsliderproperties.cpp
+index ff55b71b8..01fd60e9a 100644
+--- a/ui/src/virtualconsole/vcsliderproperties.cpp
++++ b/ui/src/virtualconsole/vcsliderproperties.cpp
+@@ -28,6 +28,7 @@
+ #include <QLineEdit>
+ #include <QSpinBox>
+ #include <QLabel>
++#include <QAction>
+ 
+ #include "qlccapability.h"
+ #include "qlcchannel.h"
+diff --git a/ui/src/virtualconsole/vcxypadproperties.cpp b/ui/src/virtualconsole/vcxypadproperties.cpp
+index ed7ba7f64..60be83c49 100644
+--- a/ui/src/virtualconsole/vcxypadproperties.cpp
++++ b/ui/src/virtualconsole/vcxypadproperties.cpp
+@@ -23,6 +23,7 @@
+ #include <QHeaderView>
+ #include <QSettings>
+ #include <QDebug>
++#include <QAction>
+ 
+ #include "qlcfixturemode.h"
+ #include "qlcinputchannel.h"
\ No newline at end of file
diff --git a/app-misc/qlcplus/qlcplus-4.11.1.ebuild b/app-misc/qlcplus/qlcplus-4.11.1.ebuild
index db27fbd90c1b..de801605d298 100644
--- a/app-misc/qlcplus/qlcplus-4.11.1.ebuild
+++ b/app-misc/qlcplus/qlcplus-4.11.1.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
@@ -34,6 +34,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
 src_prepare() {
 	default
 	sed -e "s:/etc/udev/rules.d:${EROOT}lib/udev/rules.d:" -i \
diff --git a/app-misc/radeontop/Manifest b/app-misc/radeontop/Manifest
new file mode 100644
index 000000000000..6f3d4bce48e6
--- /dev/null
+++ b/app-misc/radeontop/Manifest
@@ -0,0 +1,6 @@
+DIST radeontop-1.0.tar.gz 32677 BLAKE2B e3445c400dff0f8afaa743d349477b67ccc4da187cbf979fe42c63b9e60f246f54e5fa2076ef6af789fea093c175d0ec66fa9f0f30bfb926a28f1aa12f2b10cf SHA512 bd7e8ecff962d8ac3072f3f1fa7a5d9981e2da28b38a1f234f6fe550511c3fbda2c1c6e9a6d1120bf99ef3ae621a91ff67c451eaf98dfa1264e9e6a59ae55e08
+DIST radeontop-1.1.tar.gz 33527 BLAKE2B 920376e5fb8acffb181b7a9e1362f46bad2de66fcf3665dc212f931d9b6fb9bf3f6765e2f8de78f8b2ba7d13cc5baae3e4d3b0612a1097f917420a43b3215f8d SHA512 abf4e51582cc668e1abbcd87bfa6ec5f16a301c3327a276a6f27fe928f780acf1442a696bb00bdbd3e8cad21a1416ffcf500a865dd4bac9517fac1a43d851c5a
+EBUILD radeontop-1.0-r1.ebuild 946 BLAKE2B 6dcfb167e77aefa263764053f0684befc113d832bc81c4ba9d81e352ed0c8b87c2090c2e4982dc67fd2d5d0b538ec549aba84871268f41115c569911e2512545 SHA512 2d129777b521aee7510afb4dd4768e289e85358cf459113b0fbdee379f0075fdb1b5000ded11ed50330564e91863d1fa60ee4e856bb0796135f31e1464cac611
+EBUILD radeontop-1.1.ebuild 959 BLAKE2B 7a3ac2dcd1683cde61dfa6d73ad9bfb6bd2527a5598950923bb8a9a9395ef35a668396993e73ff9ec3cf5e46a8d4692343f2e980785555f51576180a48a15b15 SHA512 0a5394b279d4a9addc9dfc92f71b38561a4bfc7d27fa3009309364421e758d5e0a24a2af813f2de33d3fad155162762810050ba5bd12b102ee19b5ad1ec7e436
+EBUILD radeontop-9999.ebuild 748 BLAKE2B 3679dd2dccc6d14c0143d888453c5eac4f57483b9ee27fb1e25a2499b23dcf3150dce541c8967f53d31cabed3fa55421cec56deef48596c537ae6bf5bb5f4e8c SHA512 eda32f616f03f1ddecce6510a2f1c14f11c6108cfda99c700fea5a423f45a788cc1ce538e3cb1ff6cc1c45578dd6227c31bd49a43531d5393f578ba7fc790924
+MISC metadata.xml 453 BLAKE2B 18fab387867187fcab94b7d38721c1010e84719148fbede0ce150122e3b5785db8abeaff3b53f106004dbf67a681265eff7488cf5abb9fa4be5d2b30a9d15e04 SHA512 3ab348ef1969d23feb339fa452ba1781308a5b2bc79da19817567e5c7a66f5c521ff4700c0fe8276d3a1f8574bc80a69aa4d63c851235b8fb089f141d4f37983
diff --git a/app-misc/radeontop/metadata.xml b/app-misc/radeontop/metadata.xml
new file mode 100644
index 000000000000..4229aa40eac1
--- /dev/null
+++ b/app-misc/radeontop/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bu9zilla@gmail.com</email>
+		<name>Michael Mair-Keimberger</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">clbr/radeontop</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-misc/radeontop/radeontop-1.0-r1.ebuild b/app-misc/radeontop/radeontop-1.0-r1.ebuild
new file mode 100644
index 000000000000..dbe582980fc9
--- /dev/null
+++ b/app-misc/radeontop/radeontop-1.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="Utility to view Radeon GPU utilization"
+HOMEPAGE="https://github.com/clbr/radeontop"
+SRC_URI="https://github.com/clbr/radeontop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	x11-libs/libdrm
+	x11-libs/libpciaccess
+	x11-libs/libxcb
+	nls? (
+		sys-libs/ncurses:0=[unicode]
+		virtual/libintl
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+	default
+
+	cat > include/version.h <<-EOF || die
+	#ifndef VER_H
+	#define VER_H
+
+	#define VERSION "${PV}"
+
+	#endif
+	EOF
+	>getver.sh || die
+	touch .git || die
+}
+
+src_configure() {
+	tc-export CC
+	export LIBDIR=$(get_libdir)
+	export nls=$(usex nls 1 0)
+	export amdgpu=1
+	export xcb=1
+	# Do not add -g or -s to CFLAGS
+	export plain=1
+}
diff --git a/app-misc/radeontop/radeontop-1.1.ebuild b/app-misc/radeontop/radeontop-1.1.ebuild
new file mode 100644
index 000000000000..aea4af8f9436
--- /dev/null
+++ b/app-misc/radeontop/radeontop-1.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Utility to view Radeon GPU utilization"
+HOMEPAGE="https://github.com/clbr/radeontop"
+SRC_URI="https://github.com/clbr/radeontop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	x11-libs/libdrm
+	x11-libs/libpciaccess
+	x11-libs/libxcb
+	nls? (
+		sys-libs/ncurses:0=[unicode]
+		virtual/libintl
+	)
+"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	cat > include/version.h <<-EOF || die
+		#ifndef VER_H
+		#define VER_H
+
+		#define VERSION "${PV}"
+
+		#endif
+	EOF
+	>getver.sh || die
+	touch .git || die
+}
+
+src_configure() {
+	tc-export CC
+	export LIBDIR=$(get_libdir)
+	export nls=$(usex nls 1 0)
+	export amdgpu=1
+	export xcb=1
+	# Do not add -g or -s to CFLAGS
+	export plain=1
+}
diff --git a/app-misc/radeontop/radeontop-9999.ebuild b/app-misc/radeontop/radeontop-9999.ebuild
new file mode 100644
index 000000000000..af212477ea75
--- /dev/null
+++ b/app-misc/radeontop/radeontop-9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs git-r3
+
+DESCRIPTION="Utility to view Radeon GPU utilization"
+HOMEPAGE="https://github.com/clbr/radeontop"
+EGIT_REPO_URI="https://github.com/clbr/radeontop.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="nls"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	x11-libs/libdrm
+	x11-libs/libpciaccess
+	x11-libs/libxcb
+	nls? (
+		sys-libs/ncurses:0=[unicode]
+		virtual/libintl
+	)
+"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	tc-export CC
+	export LIBDIR=$(get_libdir)
+	export nls=$(usex nls 1 0)
+	export amdgpu=1
+	export xcb=1
+	# Do not add -g or -s to CFLAGS
+	export plain=1
+}
diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest
index 7166661679be..28a701ad7ad8 100644
--- a/app-misc/recoll/Manifest
+++ b/app-misc/recoll/Manifest
@@ -1,6 +1,9 @@
+AUX recoll-1.24.1-qt-5.11.patch 290 BLAKE2B b68f02b9fce837cbfdc54c63787546608db2823c73a36809ceb4ef611f63b0be3528bbbab3f966e4481b09f314968ee22e6e74e5f86a65944dc7e6cd6420cf7b SHA512 51f2cfaeb1a6b62a012867d04d4ec4ca726f6d10e4dfb30d006588b02507d20f3d2a14c011b90a55df334b306ac4351aa5c81532d86822acb16a31b5eac3285b
 AUX recoll-python3.patch 473 BLAKE2B 78b15249de8b20a46e3331d90c52cc8987278d4c508480ceab35ee878c9467f796b209dca5eb0ed5637019718a5e0dc7a2888283b149041ffcedfc175419509c SHA512 50cd8bea004e2ee3a7b861b3b9bc981d5dc0656421894dc8f47777516f290aaaba4300eff52d01d496c873d0f135bfb39f2606a41e95a3dc4edd0a1195614774
 DIST recoll-1.23.3.tar.gz 2590148 BLAKE2B ec058bac500aa61b4e395720bffcc2bfbcaded954c986e8e1fe69720456267c33b5e34eb3e28de47f57d9af207c60b138c521792882b093120b988b682600b2a SHA512 bfad118dd9561c8d18e194b11d8014e2f9ea74f6aaf50f91704087775e6f72d5f3574a3eafe470dab7658cb4a7233817a672af939f21b3e69c719e599bc5cd06
 DIST recoll-1.23.6.tar.gz 2601494 BLAKE2B e64ed422a1ac1a816091f9ee00ee23b551690f5038cf3378a00ebf39c9e4f4e22436105ed01a1aa2bc21b633c85a73ba2847a265e4d199109a8b0c03ec53421e SHA512 ae6f6dfe5e63faf2310b32bd0ffd90f08b12de7452ded9e5bd58a45690797caa9f5c66ea94ef94ed7a4ee3e55083cc191fbecfc112dbce42415d0af1300fe8fd
+DIST recoll-1.24.1.tar.gz 2644672 BLAKE2B e5bce2231e075fe9a2bfad7d0d1068906e625106b09247dc5baffaf92957db111dd6be90c658266b8b9940d885b3495769c68ce66247d00568df24c1b5222226 SHA512 60bf57d2718a21dbd578fa1dc73a542fc7ab2152c4c5bb763885b19c14d080340587cb8c01f82f1ca7d1cb63a03edf03b4501f3ef63f06ab6506356c4a0a095c
 EBUILD recoll-1.23.3.ebuild 3537 BLAKE2B a6fbcf8c4f6f0fa5649748b743cd790e18794d1b4ccb5b0e7dea727c919e7e13379d1b581ca780133b95da610f35004c9eb861681f90d5209481fb96a2479905 SHA512 15a1cd9c52b3e564c34ec81826527dab8f4d9b543d80497b6cdc2ba1b6c63422a3b7d20ccbf464e91f8cf59a7f244ddad0e96d3904563486a94d1f8f658906e1
 EBUILD recoll-1.23.6.ebuild 3543 BLAKE2B 7759c44f9c0325e2daa478f5c63e5c14c362031f4633ad0209c974ae81a3f362da655266df079de66b8c95871087753dcd8a921cafc52ce0456c085b53aa46a7 SHA512 0770d7316dd8d9385d8210e8bd10f2a4b4ef298880c1423226be366e79fc974abd7fc9bc5ec4ad8bb00126fd2f24ef58f5f6faa5f50c27ca1219efacff410085
+EBUILD recoll-1.24.1.ebuild 3615 BLAKE2B b170f5e8e3c135c348cecd17067accb8b3a0ef82f396ad7e8064e1eb5dbc6e2c9443c5e811dd544f0b0b9a9e25952627cc0ac99ae330bc08d1c51b715f61db42 SHA512 731e1c2932097c136ce917d5c79d79f008ed4749934db8dc94f8fabe83c25d171e13ab752be6dee0fcd4cc40d7b072c01e440f4c3dfe1fa5baa3a6bc9f3bad9a
 MISC metadata.xml 1204 BLAKE2B a27afe4b6f800a38fa63956a750e4ddcd8ac2e9a785df910f660fce03357a77b37752e405be6d76fad74ce6f90d8564912499f397eb819535859ddc259cbc7a3 SHA512 581c483f1d64131cb7a83e9a899b5286f03cbacc3f011c5fcdb3236b56e2b22e1a0fa880b34bb107874fe03fde7f82767805bb7e2d0aa46367e8d5dca0037ea5
diff --git a/app-misc/recoll/files/recoll-1.24.1-qt-5.11.patch b/app-misc/recoll/files/recoll-1.24.1-qt-5.11.patch
new file mode 100644
index 000000000000..146bc981b60c
--- /dev/null
+++ b/app-misc/recoll/files/recoll-1.24.1-qt-5.11.patch
@@ -0,0 +1,12 @@
+diff --git a/qtgui/ssearch_w.cpp b/qtgui/ssearch_w.cpp
+index 2d0c97c..ca72af1 100644
+--- a/qtgui/ssearch_w.cpp
++++ b/qtgui/ssearch_w.cpp
+@@ -32,6 +32,7 @@
+ #include <qevent.h>
+ #include <QTimer>
+ #include <QCompleter>
++#include <QAbstractItemView>
+ 
+ #include "log.h"
+ #include "guiutils.h"
\ No newline at end of file
diff --git a/app-misc/recoll/recoll-1.24.1.ebuild b/app-misc/recoll/recoll-1.24.1.ebuild
new file mode 100644
index 000000000000..a3d7abcba696
--- /dev/null
+++ b/app-misc/recoll/recoll-1.24.1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils linux-info python-single-r1 qmake-utils
+
+DESCRIPTION="A personal full text search package"
+HOMEPAGE="http://www.lesbonscomptes.com/recoll/"
+SRC_URI="http://www.lesbonscomptes.com/recoll/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="camelcase doc +inotify qt5 session +spell"
+REQUIRED_USE="session? ( inotify ) ${PYTHON_REQUIRED_USE}"
+
+CDEPEND="
+	dev-libs/xapian:=
+	sys-libs/zlib:=
+	virtual/libiconv
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwebkit:5
+	)
+	session? (
+		inotify? (
+			  x11-libs/libSM
+			  x11-libs/libICE
+			  x11-libs/libX11
+		)
+	)
+	spell? ( app-text/aspell )
+	${PYTHON_DEPS}
+"
+
+DEPEND="
+	${CDEPEND}
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+
+RDEPEND="
+	${CDEPEND}
+	app-arch/unzip
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-python3.patch # python3 patch
+	"${FILESDIR}"/${P}-qt-5.11.patch # bugs 663028, 660912
+)
+
+pkg_setup() {
+	if has_version "<app-misc/recoll-1.20"; then
+		einfo "Installing ${PV} over an 1.19 index is possible,"
+		einfo "but there have been small changes in the way"
+		einfo "compound words are indexed. So it is best to reset"
+		einfo "the index. The best method to reset the index is to"
+		einfo "quit all recoll programs and delete the index directory"
+		einfo "rm -rf ~/.recoll/xapiandb, then start recoll or recollindex."
+	fi
+	if use inotify; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		check_extra_config
+	fi
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	python_fix_shebang filters
+}
+
+src_configure() {
+	use qt5 && export QMAKE="$(qt5_get_bindir)/qmake"
+
+	econf \
+		$(use_enable camelcase) \
+		$(use_enable session x11mon) \
+		$(use_enable qt5 qtgui) \
+		$(use_enable qt5 webkit) \
+		$(use_with inotify) \
+		$(use_with spell aspell) \
+		--without-fam \
+		--enable-recollq
+}
+
+src_install() {
+	emake STRIP="$(type -P true)" DESTDIR="${D}" install
+
+	# html docs should be placed in /usr/share/doc/${PN}/html
+	use doc && dodoc -r "${ED}"/usr/share/recoll/doc/.
+	rm -r "${ED}/usr/share/recoll/doc" || die
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	einfo "In order to extract the full functionality of "
+	einfo "recoll, the following packages should be installed "
+	einfo "to get the corresponding document support."
+
+	optfeature "XML based documents support"    "dev-libs/libxslt[python] dev-libs/libxml2[python]"
+	optfeature "PDF files support"              app-text/poppler
+	optfeature "PDF files with OCR support"     app-text/tesseract
+	optfeature "MS Word files support"          app-text/antiword
+	optfeature "Wordperfect files support"      "app-text/libwpd[tools]"
+	optfeature "Lyx files support"              app-office/lyx
+	optfeature "CHM files support"              dev-python/pychm
+	optfeature "GNU Info files support"         sys-apps/texinfo
+	optfeature "RAR archives support"           dev-python/rarfile
+	optfeature "7zip archives support"          dev-python/pylzma
+	optfeature "iCalendar files support"        dev-python/icalendar
+	optfeature "Postscript files support"       app-text/pstotext
+	optfeature "RTF files support"              app-text/unrtf
+	optfeature "TeX files support"              dev-text/detex
+	optfeature "DVI files support"              virtual/tex-base
+	optfeature "DJVU files support"             app-text/djvu
+	optfeature "tags in audio files support"    media-libs/mutagen
+	optfeature "tags in image files support"    media-libs/exiftool
+	optfeature "Midi karaoke files support"     dev-python/chardet
+}
diff --git a/app-misc/spacenavd/Manifest b/app-misc/spacenavd/Manifest
index e9f82f3f2f6c..3221c4960b20 100644
--- a/app-misc/spacenavd/Manifest
+++ b/app-misc/spacenavd/Manifest
@@ -11,4 +11,4 @@ DIST spacenavd-0.6.tar.gz 54730 BLAKE2B 5d158ebb190359c6e6c2a20093f824f176e028c0
 EBUILD spacenavd-0.5-r5.ebuild 2319 BLAKE2B 7f555ec38a828848ff3686def93a853a3a3b1c8af40274c7f040b3143f1d0f44c71d9931f0587db9c48a23aa8085fe3297c6d53fff4b9ffea23c4a894e362f4f SHA512 4fca63971153edfb5a69ca8cf40e543edcfd3f8c97ec729fc3afb550d00027566097f409a46c15bc2585dfe833e63208f709e3d713e58cdef2e730cd58c95444
 EBUILD spacenavd-0.5-r6.ebuild 2303 BLAKE2B 2acc81a1da275309f5fa0d9dd6931f9242107a7622467c23b37b0b0ff401bc6c560bae31a614c281527183e2464dd9ec09f95584a07a79b8b9e556f74cf6ebe0 SHA512 aeb2e1501a7a0c40f94c809994c29dc902a142362b5d5802d4a3354b62dd9c7880699eb2ba9c79a3f288cc301d453177e24ec9850c40b26758c2bfd82740d31b
 EBUILD spacenavd-0.6.ebuild 2230 BLAKE2B f536ec95b124cce754294a8e5664c0d3b23d907ef74d296ba910ef09a1e1fa12a4205719b9d72eadc07bed677e0ec0995cfea0c9f926cd819bdb01922b2cc413 SHA512 aa5c1d28e0f21c2a12abce33b32001df0b708d0424136694ca222b9016a701af08eadf7d78141483720c7b72871313389286abfd70bd3fbd573ab5d4d65be827
-MISC metadata.xml 1044 BLAKE2B a38794b340bd633034a037621929c22a0673f3cd69725407a0c84e47143cc600e27e2c5b53224374741dbb0e02250f6e52485e4c011594cea986f927ae066c4e SHA512 04b15a567deac4a6bc1a0b250c585d863d9bebdca0a5160a3b77e1830190abadf1b98371b33e60a8d67978de3f0db117d51d598a861782663cf7b35e74a5d859
+MISC metadata.xml 804 BLAKE2B 88ee8f585c24c42670e3e251bd751d712752c0e9566828c8f00dadfda7d732ec75cf970398cfe73d9e81c3f556d74c48b1845bce4230f2fe524f5a8d7cd7a70a SHA512 edc302270122ef31692806ec2fec3836cd51afcb9eabeaf5f1fb8d66e2ab703eb615efa431b3f78fe6427a6f976b90f769cbd001dfe2832bc2ce9986731e26b0
diff --git a/app-misc/spacenavd/metadata.xml b/app-misc/spacenavd/metadata.xml
index 3e3914927158..009a65b6700a 100644
--- a/app-misc/spacenavd/metadata.xml
+++ b/app-misc/spacenavd/metadata.xml
@@ -2,17 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>anthoine.bourgeois@gmail.com</email>
-		<name>Anthoine Bourgeois</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		The spacenavd daemon can be used directly as a drop-in replacement
 		to the 3DxWare daemon. It can communicate with the official magellan