gentoo resync : 22.10.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-10-22 11:09:47 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-10-22 11:09:47 +0100
commit: 64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch)
tree: 9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /app-misc
parent: 957235cf19a691360c720f7913672adda4258ed0 (diff)
64 files changed, 411 insertions, 1880 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 92e383be2dc7..2e2e61bdbfec 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest
index 552c754474c0..192ff2b155fd 100644
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@@ -2,10 +2,10 @@ AUX carbon-c-relay.confd 362 BLAKE2B 7d33b9087ab77f07606fef84c4ed3dcff41e5604002
 AUX carbon-c-relay.confd-r1 365 BLAKE2B 10a531055296877bb027f5dc6546b054da7e5b84950bbcf8de8d4af552e61fcd9bbebeea3bc432a25f14103c4f2f30db4885259f855182e6923b79649e63fb60 SHA512 a432cf28c86ec45c807eeb5a7b506e7dcc6155c138aea5dc60eb8bcf5036ac0efc3a81fbc044af34dab5f05f250635892c5e706dfd69cc1087f0c283c3aa9393
 AUX carbon-c-relay.initd 1678 BLAKE2B f97d7390e0d03ffaa9cca658ac206eff4ea22336f100e860aa81c72e593440c79596af6c0245a8f8759fff2c24084f1019581b44f21e984820a616f10543d09a SHA512 5a3415395affe6c4e315c650733d8e335d5fa8e490ffeba8dc7c944976f3b68ca14e801175a2136499b00fa6adf403428ae509cb9c3596b6a3188ef20d09c575
 AUX carbon-c-relay.initd-r1 1801 BLAKE2B 4627b6e0d9a44d5c544ccff0c33557c73dd971929fbb442be79f3913752f39b1d534d4e4e936ebe94ebd5883d56e3f04314b9033c0a5ef7a3cbe7e05e1aeeb42 SHA512 5cf3c424a8be6bb55a80b58ce590838fec8ed26f8f407e8561c1e3ea094e80ad4021d153b3d816ab6d4e6589494d9ce621fe14196e223ef3a092d0aa26a63399
-DIST carbon-c-relay-3.1.tar.gz 271011 BLAKE2B 62d97ba268f121db466a761001f0c5f49e2571edc26c90ee4f40d311cc3f9abb55178ea375c6663407d5fce78c5162a8460a260c9baa7faed3908fc2e4bb9870 SHA512 8c8062e4fa9ec22281b1848923dc73b39c4617b0c6297f57f69080a7aedf07ef8d5c6e0bebbd5ef0faf3a1255ab155475bc40aeee582838d604da1cc2e43ca4e
 DIST carbon-c-relay-3.2.tar.gz 291396 BLAKE2B 6a7ba4f30498c217505098b3cafa69a481a0bb78776b207cb4120d686a896156a39a0c87795b2766d39c3b0e69d4ed17943bee43e3218bf079931ad2b8360116 SHA512 11065303e18e9e2660150a7ba2137abe48b514abcdba93632a5fa46c8412bfb3472bfebb93584c629e5978be210237fad77f975eb1abb1e07b9cdba119c7eef4
 DIST carbon-c-relay-3.3.tar.gz 293055 BLAKE2B 96d4d230e233f20ce02d519804f36787fc30238ba4fb173600e18a52af6a28bb954c476baffefcb229e42f3c2e6ff1d97196c188c527fc72fd5b98982f74451f SHA512 285f5d90c31644543a674b60e017c4d65f39762fe211b14a99583473e6d80313c3f907e4432750e6f25851e4a693457d1609a9bc176744b217f6cf0533ab4879
-EBUILD carbon-c-relay-3.1-r1.ebuild 765 BLAKE2B 6596ee93330fbe973d42479a8d8b1b1174464a5ffdc513cfb6235ed069873e59177fa1d9be862a579c2ed4c482b2a8df5b8cb3f9b8dc075ce4615133dbc5a381 SHA512 ab94696270aa31b1c4b48320aa211a4488f613a28497c6d08c502a9e14e642ea89d08233f6f128b7ddb5ef31e361bbe7053e91118d1fdbd4b40a9d1e12ce59fa
+DIST carbon-c-relay-3.4.tar.gz 297795 BLAKE2B 48e954af09db99fc6ab8a227be8742fadd268907c2dd203a9bd6b5417fbf77d604f13636416452108e9df77df6fe9350d5a3dba3f34b1f200b31aba5ebfb2d91 SHA512 12e5d952ac34d7ec33999946dc30c1c388fe5fba7d28355ead77377bca90228f003955353e8f92b743c1ccf5e55ffaf6c32188de3bfb0a1ad75a80cc418c5e00
 EBUILD carbon-c-relay-3.2.ebuild 941 BLAKE2B 08b97db03e44cc14b3b1d3d8f8a5acfb9c23d7dead00c2e1c3088b524e5f19865e8599e915d1b84c7ed7414c66cc1c75dba20ba467b8b4d8b34aa69f942f7e22 SHA512 41808fed0c890a1e335986e93ee3fb0ec764ba3e364f151080d477b8546707857f36a834b755d25caab9c393c5e12409b48a497aab292b49921697c8c5546a85
 EBUILD carbon-c-relay-3.3.ebuild 1468 BLAKE2B 682bd014531308e19c89b5ed966a04929c161d4ef338800e573d06dfa07173a121d490f5b02aeae90a2b76463adf9a03ecce325db8187d2abf04ed35e6568167 SHA512 2d5e58830ac28eefee38f254420d864d30512bd2ef6e60035e9cafe19d3bfa72de752cb672e1191b864d193d8823a4f856bb3f2b6f476dd175e33b2c56c8c967
-MISC metadata.xml 578 BLAKE2B 6b8f16ecb046eecf1315d39e62dacf5c79896b80375eed7696acf791b3e3324e008f122e8deec4098d2298200a655e497fdac1d059aac3d6b7d8df980b8a29cc SHA512 78615eb4a4d5812d45ede2a138ab70ad2c6152ef5e4f7873cb4e95f29ad643f9a9a7e8db5b52f61a7f464e2c875591bfe359970ed6dde1c7188c59c6ba87d211
+EBUILD carbon-c-relay-3.4.ebuild 1524 BLAKE2B 2a8981118520787f99095b5675c0b7a8796254fefb7c6060ef7433fc6b0e21b2688fbe6d87a43018efead41ff2ebe7c1d0e1e2ca296a7e5f1a9cf2f59bbca275 SHA512 d5245f24d09c3f352ad2aece0052744e74fae3b312313122b43d999453391a767a9ecca9265ec0f743f60e7dbbd9843de02454c7a4e2419daffa478f750897e5
+MISC metadata.xml 653 BLAKE2B 224540619f2aa5e40aeb57085a4d13640c7cc6381a7a26fea6a6854935f6705576b5ca5ea88b0b7647ff3c293c6bd83b4b170c66ab12521dc7e01811506a33da SHA512 91e5e7ea08dcac8edbbbe0ed7a6b8ccac8a6ea7c2ba89d33c4f188aabaa5a975ac1738c31b942c8db8c6a37f6b1dff67f757b60991143c13f821f63ffea5ca0a
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.1-r1.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.1-r1.ebuild
deleted file mode 100644
index b8caef32bf9c..000000000000
--- a/app-misc/carbon-c-relay/carbon-c-relay-3.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
-HOMEPAGE="https://github.com/grobian/carbon-c-relay"
-SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-pkg_preinst() {
-	enewgroup carbon
-	enewuser carbon -1 -1 -1 carbon
-}
-
-src_install() {
-	default
-	# rename too generic name
-	mv "${ED}"/usr/bin/{relay,${PN}} || die
-	dodoc ChangeLog.md
-
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
-}
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.4.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.4.ebuild
new file mode 100644
index 000000000000..7afbf976a689
--- /dev/null
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
+HOMEPAGE="https://github.com/grobian/carbon-c-relay"
+SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="lz4 snappy zlib ssl pcre pcre2 +oniguruma"
+
+# ensure only one of pcre, pcre2 and oniguruma is set, or none (libc)
+# unforunately pcre is in global USE, so we have to exclude that here
+REQUIRED_USE="
+	pcre2?     ( !oniguruma )
+	oniguruma? ( !pcre2 )
+"
+RDEPEND="lz4? ( app-arch/lz4 )
+	snappy? ( app-arch/snappy )
+	zlib? ( app-arch/gzip )
+	ssl? ( dev-libs/openssl:0 )
+	!oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) )
+	pcre2? ( dev-libs/libpcre2 )
+	oniguruma? ( dev-libs/oniguruma )"
+DEPEND="${RDEPEND}"
+
+pkg_preinst() {
+	enewgroup carbon
+	enewuser carbon -1 -1 -1 carbon
+}
+
+src_configure() {
+	local pcrecfg
+	if use !pcre2 && use !oniguruma ; then
+		pcrecfg=$(use_with pcre)
+	else
+		pcrecfg="--without-pcre"
+	fi
+
+	econf $(use_with lz4) $(use_with snappy) \
+		$(use_with ssl) $(use_with zlib gzip) \
+		"${pcrecfg}" $(use_with pcre2) $(use_with oniguruma)
+}
+
+src_install() {
+	default
+	# rename too generic name
+	mv "${ED}"/usr/bin/{relay,${PN}} || die
+	dodoc ChangeLog.md
+
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
+}
diff --git a/app-misc/carbon-c-relay/metadata.xml b/app-misc/carbon-c-relay/metadata.xml
index c023cb5be2a9..e59bce50e430 100644
--- a/app-misc/carbon-c-relay/metadata.xml
+++ b/app-misc/carbon-c-relay/metadata.xml
@@ -6,6 +6,7 @@
   </maintainer>
   <use>
     <flag name="lz4">add support for LZ4 compressed transport</flag>
+    <flag name="snappy">add support for Snappy compressed transport</flag>
     <flag name="pcre2">use <pkg>dev-libs/libpcre2</pkg> as regex implementation</flag>
     <flag name="oniguruma">use <pkg>dev-libs/oniguruma</pkg> as regex implementation</flag>
   </use>
diff --git a/app-misc/cdircmp/Manifest b/app-misc/cdircmp/Manifest
index a5f50352c87c..e393aa6a37b7 100644
--- a/app-misc/cdircmp/Manifest
+++ b/app-misc/cdircmp/Manifest
@@ -1,3 +1,3 @@
 DIST cdircmp-0.3.tar.gz 17253 BLAKE2B 090e73d2d60ff10e8ba01c77c172b6e4b4603c778f4ad8b29dbcedd8e214f54377c171bc964c14ab4f08dc8e995b5c6b55601f75977b35669cbcfb23d0c19fea SHA512 66fa27a3c06aa4bd6584da2c6a38ad0798f5f10eb9b021080c473d03733bd2dba344549e95c22485bf72536a03a4e91a7497192296b6c297166e47a679cf0079
-EBUILD cdircmp-0.3-r2.ebuild 661 BLAKE2B 765f4f6ffc232b57178724fecd2f17791fd36977ed6de2b04775011411918d9df3bfd27d4af582780a15e6d13c06c370640a5a7b627d8f75995adba8cd70293f SHA512 b040bfdcb52a22d3579420b993c8a3a02bdf1afbb2e4f20192c6caf17e2675b9925c5dbb29713f99b882c37c8533d4cb72e087f35511f9318ea5764e731d8274
+EBUILD cdircmp-0.3-r2.ebuild 727 BLAKE2B b5e09d848d206728b43f6ab953eedd87fa3b325536388f71d2ec36a05fc8833e02fba8e5a8da521142247a10d7469e5b389d8fe2f2e4a61dcf5cc3af4bd19905 SHA512 31a4cb6ef8f315c3d0ba171e07f3493aa8b02d33ddd9fc328f645c169c710439a89507bbd40b4721c88e05007fb1daa57fabed5b27df90652ad3b4ed28a7920a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/cdircmp/cdircmp-0.3-r2.ebuild b/app-misc/cdircmp/cdircmp-0.3-r2.ebuild
index 928b138f683c..320af7a9c01d 100644
--- a/app-misc/cdircmp/cdircmp-0.3-r2.ebuild
+++ b/app-misc/cdircmp/cdircmp-0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,6 +15,9 @@ KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND=">=sys-libs/ncurses-5.4:0="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
 
 src_prepare() {
 	sed -i Makefile \
@@ -26,7 +29,7 @@ src_prepare() {
 src_compile() {
 	emake CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+		LDFLAGS="$(pkg-config --libs ncurses) ${LDFLAGS}"
 }
 
 src_install() {
diff --git a/app-misc/cdspeed/Manifest b/app-misc/cdspeed/Manifest
index 27dee7d6a862..ba0c82f200e7 100644
--- a/app-misc/cdspeed/Manifest
+++ b/app-misc/cdspeed/Manifest
@@ -1,4 +1,3 @@
 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
+EBUILD cdspeed-0.4-r2.ebuild 600 BLAKE2B bd151803e507ae48438aa30c6fd715992f1d91136a96ee68a8d5013e9c4836da2c4ba2c53703b60212bc3ae5a7788a514b61625a54bbcd4adf09d0ecc096449f SHA512 0ea41cbec546f786630b320f78fcd708056d99d5c6ae319b84e97e7f99d0ea7f304ef7bf88bc860620bc5e35e13237a78fffe829e41a9db5c94bb6a0100a9d28
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/cdspeed/cdspeed-0.4-r1.ebuild b/app-misc/cdspeed/cdspeed-0.4-r1.ebuild
deleted file mode 100644
index 9701b686d358..000000000000
--- a/app-misc/cdspeed/cdspeed-0.4-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-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"
-IUSE=""
-
-DEPEND=">=sys-apps/sed-4"
-RDEPEND=""
-
-src_prepare() {
-	sed -i Makefile \
-		-e 's| -o | $(LDFLAGS)&|g' \
-		|| die "sed Makefile failed"
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS} -Wall -Wno-unused" CC=$(tc-getCC) \
-		|| die "emake failed"
-}
-
-src_install() {
-	emake PREFIX="${D}/usr" install || die "emake install"
-	dodoc README
-}
diff --git a/app-misc/cdspeed/cdspeed-0.4-r2.ebuild b/app-misc/cdspeed/cdspeed-0.4-r2.ebuild
index 6c933ac2caff..a51688d15102 100644
--- a/app-misc/cdspeed/cdspeed-0.4-r2.ebuild
+++ b/app-misc/cdspeed/cdspeed-0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://linuxfocus.org/~guido/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~x86"
+KEYWORDS="alpha amd64 ~hppa ~mips ppc x86"
 
 src_prepare() {
 	default
diff --git a/app-misc/fhem/Manifest b/app-misc/fhem/Manifest
index 61eb71f5e033..949b8f8df229 100644
--- a/app-misc/fhem/Manifest
+++ b/app-misc/fhem/Manifest
@@ -1,5 +1,9 @@
 AUX fhem.cfg 791 BLAKE2B ba55b71711199794c38720ad724fbc9d5f05d1713c1af0d02662765e8248e845bc3c07ae619b46e450d9b3a96a993a814e0c831a51edce6129d8efe07baee0db SHA512 9ce1c1cc2d7c55a29df2e344ad6600704e68536b734997a7cc1a73a225970c26f924c902c4d4e6f318e22a000b9b4ec2ceb52edd650fe3a8d12488b5293f7ad3
 AUX fhem.initd 447 BLAKE2B c724aa0b16fa7c6e1018e78c6ece9d1ba6357d147d1909326a5adc580af2cad57a0c13549b3c9f4b19b6fdad279ebbf8d0b64a36f29690911b342a06c865c7da SHA512 3be01778d970f4b93e551ff3769ed7b0825508dc5216a43ed0bb12f589103350bdb400561cbada9315050d32a99f723f5291e9bf1c6318642b16b8b9dc9e8c61
+AUX fhem.service 208 BLAKE2B b577fd84a166ef87f2aaf58f2fc6758d070b4181f3254e236aa376322ad4bd4b0c7e04aa9205fbc235fc39f9e8f27d17a6ae36a732058d9a7ca97154ac61398d SHA512 3f2baf5e2238074ce65e1eacfadd8f2ffd582c26e50ab03d3ac18a03acbe6b5aa85bb1258e405dae81b51f9c5554a2ee872f72dc4e929df88f7fa5681916171b
+AUX fhem.tmpfiles 31 BLAKE2B 57659fe7fe189d03cd1fdbd073421f2215b90db9d2c00b335ca3b98b7c42b23085c9ccadd85fc40c5c21e393c571bacc6804b06dc47de88bfcfe4384d7be88f8 SHA512 4e29020ae5d114c6ab3ad1935a8b4b1b4d6d521771554130304534f69a0ec6961f93b64ad45aabeeff9ab1a73dbe97187922f845c849565105801edffc1ac0ce
 DIST fhem-5.8.tar.gz 22139481 BLAKE2B 444b041b591d3c960036a262e6eb3fda026d4b229a21df16d7817c32a1fd57282a7fbe5559164b760bd9cfad314c2977e7d6f611320d35be090cdb9df66fb8fd SHA512 6cfaa14288ce553a2418db4cb47c719f2d5edbccbde9e76f221cd47cf8a175a67125031c4971f9f9972b218fc709a267757c2abefe6a33be47eb4bb45e23be57
+DIST fhem-5.9.tar.gz 23267499 BLAKE2B c2c2e4ab21f82fbe67c9e99aed4d1edd6db889aedac0611b5ba2873667520c4aa63d8553e014563f6f6ee58c5792ae1735853f58c8f4ef0599583b2ed23a9efe SHA512 9f75058e698fc33ec64081695db3eb2511f686dedc3107c87d4377f655c8b204892c6f61141de28970f2ed3f8cef5d24124d17ee20ee71a9eb9318bb17335bb8
 EBUILD fhem-5.8.ebuild 2226 BLAKE2B 1e938078cde599e3a2acde068ff4e9f4be16c3160ca95819d7c51f0ca8e3c32902577c3076cdef2972dc13ac5b0cf31eb5bff9afc476548a3b25b34872724836 SHA512 9e104f7626b17dd8b43bd2ef36d264a1d48219d36fff8345f1b0bde78c289b88c3c4f3ab87a0e60d3683134b486759d5c5d407357367380daeab005a2662e1c6
+EBUILD fhem-5.9.ebuild 2359 BLAKE2B 5cdbf07dc8cdfeb9ac223edc366210ea91ade46d0e959935a33c592b0cdcb2eaa33f35c3c9d534be4bc9d9cdeef951aa1e46365fce7b5882745f3e3b1eaca621 SHA512 676f0f4a8d878f61e4ec9c32b38d756c2c5a9b5902baabd0b1562e1232c8e2b0705d4ed819325b46940b6cd08aefc16089995626d09eb6b1e77c541458b58271
 MISC metadata.xml 767 BLAKE2B 16319027b755dc2d63c9176681196af9da38d9c5002ca75554f824bca03c67303cee0f1b15f9583d8264eb87c25373704569ac629258c81ed999882500f04014 SHA512 ba31d04179d2f12b1ba803a4cb589ca17b35b33013b78804fb89a716644bcad9fdb71795b36a6519e90b125164b7fe5d6744f0e1e519fc129a7197bd722c6ae4
diff --git a/app-misc/fhem/fhem-5.9.ebuild b/app-misc/fhem/fhem-5.9.ebuild
new file mode 100644
index 000000000000..622c74eac409
--- /dev/null
+++ b/app-misc/fhem/fhem-5.9.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit systemd user
+
+DESCRIPTION="A GPL'd perl server for house automation"
+HOMEPAGE="https://www.fhem.de/"
+SRC_URI="https://www.fhem.de/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="dev-perl/Crypt-CBC
+	dev-perl/Device-SerialPort
+	dev-perl/Digest-CRC
+	dev-perl/JSON"
+
+DEPEND="media-gfx/pngcrush"
+
+pkg_setup() {
+	enewgroup fhem
+	enewuser fhem -1 -1 /opt/fhem fhem
+}
+
+src_prepare() {
+	default
+
+	# Allow install path to be set by DESTDIR in Makefile
+	sed -i -e 's,^\(BINDIR=\),\1'\$\(DESTDIR\)',' Makefile || die
+
+	# Remove docs in Makefile, as they will be installed manually
+	sed -i -e 's/docs//g' Makefile || die
+	sed -i -e '/README_DEMO.txt/d' Makefile || die
+
+	# Remove manpage in Makefile, as it will be installed manually
+	sed -i -e '/fhem.pl.1/d' Makefile || die
+
+	# Remove lcd4linux binaries, as they are provied by app-misc/lcd4linux
+	rm -r contrib/lcd4linux || die
+
+	# Remove log dir, as it will be replaced with a symlink
+	rm -r log || die
+
+	# Fix fhemicon_darksmall.png, as it reports "broken IDAT window length"
+	# Reported to Upstream: https://forum.fhem.de/index.php/topic,86238.0.html
+	pngcrush -fix -force -ow www/images/default/fhemicon_darksmall.png || die
+
+	cp "${FILESDIR}"/fhem.cfg fhem.cfg || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local DOCS=(
+		"CHANGED"
+		"HISTORY"
+		"MAINTAINER.txt"
+		"README.SVN"
+		"README_DEMO.txt"
+		"docs"/*.txt
+		"docs"/*.patch
+		"docs"/*.pdf
+		"docs/changelog"
+		"docs/copyright"
+		"docs/dotconfig"
+		"docs/fhem.odg.readme"
+		"docs/LIESMICH.update-thirdparty"
+		"docs"/README*
+		"docs/X10"
+	)
+
+	if use doc; then
+		local DOCS+=( "docs/X10" )
+		local HTML_DOCS=( "docs/"*.eps "docs/"*.html "docs"/*.jpg "docs"/*.js "docs"/*.odg "docs/"*.png "docs/km271" )
+	fi
+
+	diropts -o fhem -g fhem
+	keepdir "/var/lib/fhem"
+	keepdir "/var/log/fhem"
+	diropts
+
+	dosym ../../var/lib/fhem /opt/fhem/data
+	dosym ../../var/log/fhem /opt/fhem/log
+
+	default
+
+	newinitd "${FILESDIR}"/fhem.initd fhem
+
+	systemd_dounit "${FILESDIR}"/fhem.service
+	systemd_newtmpfilesd "${FILESDIR}"/fhem.tmpfiles fhem.conf
+
+	newman docs/fhem.man fhem.pl.1
+
+	echo 'CONFIG_PROTECT="/opt/fhem /var/lib/fhem"' > "${T}"/99fhem || die
+	doenvd "${T}"/99fhem
+
+	fowners fhem:fhem /opt/fhem/fhem.cfg
+}
diff --git a/app-misc/fhem/files/fhem.service b/app-misc/fhem/files/fhem.service
new file mode 100644
index 000000000000..697a10179d40
--- /dev/null
+++ b/app-misc/fhem/files/fhem.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=FHEM
+After=network-online.target
+
+[Service]
+Type=simple
+User=fhem
+Group=fhem
+WorkingDirectory=/opt/fhem
+ExecStart=/opt/fhem/fhem.pl /opt/fhem/fhem.cfg
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-misc/fhem/files/fhem.tmpfiles b/app-misc/fhem/files/fhem.tmpfiles
new file mode 100644
index 000000000000..bccf63774dee
--- /dev/null
+++ b/app-misc/fhem/files/fhem.tmpfiles
@@ -0,0 +1 @@
+d /run/fhem 0700 fhem fhem - -
diff --git a/app-misc/gnutu/Manifest b/app-misc/gnutu/Manifest
index 0aa8ae8b8542..a00c9e14a994 100644
--- a/app-misc/gnutu/Manifest
+++ b/app-misc/gnutu/Manifest
@@ -1,3 +1,3 @@
 DIST gnutu-2.5.tar.gz 287100 BLAKE2B 1e5c140e33097643dac12c1018468f34946d232237a35d16993a6750a04e71b9a1d5eff4e0e8388de7f22d98cec173107ebdfe276cff5d2969bfd45dbcfac584 SHA512 b3ce4a39ca06cdb18459b64ca0ee167a735ae01dcac155c606d4ee61ace4d128540aa60f5ca2c0a5ed9ed561a7b1ebe02cd1dd4cffe79c3f0cbb8af831fdcd82
-EBUILD gnutu-2.5-r1.ebuild 439 BLAKE2B f8c4fd6e6eb80a62ab014feeb8526f7ac08e39afe4cd730d620022d2d38e5736b7ec0163ffa8d55e567c686cb0f68bd2c52a7339035ed0c33642827aadc6ad3b SHA512 658c06c9ad74ffbcf4b950edff4b0256271eb85c0717b60e6a30b00e2100d881430e3f1b9b6a678c7599823e2cd850c18d735c315e3f79cf719a25e21c8cae77
+EBUILD gnutu-2.5-r1.ebuild 428 BLAKE2B a0b098383bfc8b3e0252d8cf3af352b7df77b99aca509384c8d547556658191edf50a08eed991ca646c1dbc80bd4edb38e149a6c1f015e8293b942299352ad2b SHA512 9c47c78124e7e1588ece414a94fe671887363b9420be44e895c875e472f05a5022c8b164944d42bbdb306063f79717bc092acfe153741d768cfa15993a7c9ad4
 MISC metadata.xml 873 BLAKE2B c317e6972dd81efa9ceebc224f089b9661c77be69894f0062f5e7e93cb5e17967ac683bba1c47332ec6448b6ae05d6db6835d25d3252e631dd893254307e1907 SHA512 c8954a8cd9ba16d5bb61e47ec33eec0c8631ebcffb01e324ddb2fd3cb7de1bf8c989d7a8e209449e99af1e72cd0aa86881ac6f22a63a5b3a63801cd22e15547b
diff --git a/app-misc/gnutu/gnutu-2.5-r1.ebuild b/app-misc/gnutu/gnutu-2.5-r1.ebuild
index fbb2fd2a9f30..15ea1c63c534 100644
--- a/app-misc/gnutu/gnutu-2.5-r1.ebuild
+++ b/app-misc/gnutu/gnutu-2.5-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="GNU Student's Timetable for polish users"
-HOMEPAGE="http://gnutu.devnull.pl/"
-SRC_URI="http://gnutu.devnull.pl/download/sources/${P}.tar.gz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,4 +17,5 @@ RDEPEND="
 	>=dev-dotnet/gtk-sharp-2.12.21
 "
 DEPEND="${RDEPEND}
-	sys-devel/gettext"
+	sys-devel/gettext
+"
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 95248535a4bd..46f9f77ecebc 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,6 +1,8 @@
 AUX gramps-4.2.8-uncompressed-docs.patch 1261 BLAKE2B 48ebdddf13e9f29f01a3f5456686fce3d93e89437264c96918b39800f95a0bf65ed05802a74c6061aa3a375d710fdfe484c8a8afffd4a6805487453f4ebc96b7 SHA512 422338a2b6aa7865c59c5238728be95e7852097a464d328fc5d75c93305c05a1a05dc077c0a20838d66d67984d1cb9d9482fc92763f022f08a88d2dc414c5b0d
 DIST gramps-4.2.5.tar.gz 18694912 BLAKE2B f91bc665ab4a970e7de193ba3bea4250e99b692cb92e76fae4a37cfa2c46280e6a45ff6712c7a68213735b6e7016f2caa3180971976c92aaa7e61d73ad2e3d5a SHA512 20a8ebff7ea2e3a80248830e55d58ebe0b5a350e1ac31efb3f2b900af38c134037bae91a58fb441be54f9fac8226555a3f5771cc358d3a4a92e89af911433b9c
 DIST gramps-4.2.8.tar.gz 18704769 BLAKE2B 795febcc2c93a0c9b72aceeba1ac4c4f10953c2bf3b23dd8d38f662a231e21967e6f263e14d2344ef2f422e170617b7b80be4fafc2cb20c4a659366836b0e641 SHA512 c814914eb3a650dd5753d83e492d91d5db11b55321f63bd460e4eb8d80a36dd727a3792a203e3061dfaa89fd13549f51809bb83cc65b2a494c1fb8f42dcb4b8f
+DIST gramps-5.0.0.tar.gz 16773759 BLAKE2B 603a73b448fd41e4d491ca681c0177112541ff780566756f26a2bca7614a4699b90006d321e7925dd936a32367ccfd9b4b93d6ce70af5b750de641b17dd9c2d8 SHA512 95d775fc48a8165b14431a76cd9e60a80df5db0256c98d953fd1a270849446748d8630e0b5ff1b823345fcc7992b48a7c9d577c81a28e10ba0a6177f2501b6e3
 EBUILD gramps-4.2.5.ebuild 1336 BLAKE2B fbf43f646f953dc31e245f29e2efb6c0cbccceac8272162819aaab5363d284a821ec7220c022563085e3540c2ff23e57e766a88e74bf0dece8e7188fd5b3b4b8 SHA512 4eb326bcf7909cdf56ed57d0d97203003b34472e4c6a5c774c8b55f09afcec64ef1e3ae93acb21fff40343e78179cf5fafaa6b7d3e587636b4dfca481435cb27
 EBUILD gramps-4.2.8.ebuild 1606 BLAKE2B 8a147903eb6ae7c9d75328977b6fbab798a40ae3bb9d51fb600488f780bd3194213e949f257039c87dc8d2180bf5523dae567bb54feffa09ed36d009c02d1bd4 SHA512 f324c0791d404b280784e77edd660b313e647d3bd6d8849568b7ef13816d6329f6f340c7c4ff000f7d88c054e64511b0313cd24b492319341fa35d2babd96b7b
-MISC metadata.xml 5730 BLAKE2B 0f0915a541ef3aebaa124fcd3914db315b0d0ab72ed50af26fa9010a28b5bf5f8514dfe280041d4c7fb7aecc904ccf6d32708074048e05f68efc75c2c7dc7163 SHA512 2b5bdbffe1c49e83a5df03d2158dfe3bce9a746c1ac07b15f6421c3c18ee6a5b24998e59b942482ce788820afc9f508d956f06a1472b65cebb36044dd648e48d
+EBUILD gramps-5.0.0.ebuild 1994 BLAKE2B 00994156b533444378cdc892b516d6cbabfa4467292727beeaf76e5b6313a0933c79ab03e27c2d4fd407c0a1369d63d062da1c157f7d2f3c91094e159f87fdea SHA512 72f722d1d8299196e5e686036a1c276f22b03fcaa29adc00596794056180f4004203974a4f06bd3e93576bdcb83fc7188b07318ab59d232d4fb9286684b4d77a
+MISC metadata.xml 5598 BLAKE2B ff887427b9bcb043e848c7e7b9fbcd3e4364f4a8672f94e35ae08644e0417d2c35292beca630731bf1a21f0c8bcc7075a7607c9fb35f3c3bd674bf199665b70e SHA512 42ac77766caef5c416c1c99dbeea7d3e8191f745f461147ba7ff04211339f961abe9cc4c609eb926799844bb0c83d9e58b33fd00ed4a4c71826ca7f48f8da264
diff --git a/app-misc/gramps/gramps-5.0.0.ebuild b/app-misc/gramps/gramps-5.0.0.ebuild
new file mode 100644
index 000000000000..f72ed60e1b6a
--- /dev/null
+++ b/app-misc/gramps/gramps-5.0.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="sqlite"
+
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Genealogical Research and Analysis Management Programming System"
+HOMEPAGE="https://gramps-project.org/"
+SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+rcs +reports exif geo postscript spell"
+
+RDEPEND="
+	dev-python/bsddb3[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
+	dev-python/pyicu[${PYTHON_USEDEP}]
+	gnome-base/librsvg:2
+	>x11-libs/gtk+-3.14.8:3[introspection]
+	x11-libs/pango[introspection]
+	x11-misc/xdg-utils
+	reports? ( media-gfx/graphviz[postscript?] )
+	exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
+	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	spell? ( app-text/gtkspell:3[introspection] )
+	rcs? ( dev-vcs/rcs )
+"
+
+python_prepare_all() {
+	# Install documentation to the proper location. This can't be done
+	# easily with a patch because we substitute in the $PF variable,
+	# and that changes with every revision.
+	sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	mydistutilsargs=(
+		--resourcepath=/usr/share
+		--no-compress-manpages
+	)
+}
+
+python_test_all() {
+	# GRAMPS builds just fine out of tree but it confuses its test suite.
+	# The following might be an ugly hack but at least it lets the tests
+	# run properly until either I or upstream have come up with something
+	# better.
+	rm -rf "${S}/build" && ln -s "${BUILD_DIR}" "${S}"/build || \
+		die "Failed to symlink build directory to source directory"
+
+	esetup.py test
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-misc/gramps/metadata.xml b/app-misc/gramps/metadata.xml
index f7eab38a8930..4398f3959769 100644
--- a/app-misc/gramps/metadata.xml
+++ b/app-misc/gramps/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>herb@hlmjr.com</email>
-		<name>Herb Miller Jr. (herbmillerjr)</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
 	</maintainer>
 	<longdescription lang="en">
 		GRAMPS helps you track your family tree. It allows you to store, edit,
diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
index 488b05f81d73..2f514a275035 100644
--- a/app-misc/jq/Manifest
+++ b/app-misc/jq/Manifest
@@ -2,5 +2,5 @@ AUX jq-1.5-dynamic-link.patch 292 BLAKE2B 65edf9902b3a97621cb5485931d6978625b898
 AUX jq-1.5-heap_buffer_overflow_in_tokenadd.patch 1241 BLAKE2B ae161ea9ce220f57ee5aeec1b9d202de8401dcb5e842ba8d105eb3a2bc2cbd0f387980d76bfe8a30a6304ea04a1d00fe8733e7dab46507602d16eac74387f3a6 SHA512 7c0e7268a8715f9354322b81e82971fd6e6810206024fb59f55fdf319c1053fdd17ab4d2a78c8edc9ed1638339671419f4ea92cbb0f8ffbb34e5b521efb35718
 AUX jq-1.5-remove-automagic-dep-on-oniguruma.patch 1879 BLAKE2B 821dc0ba57bdabf268efb3429417ee5e32d666dc33debea89aa7550c4bbad3c5938a6a0bf0cb4adfc2c0173b7bfeac3dcd16c52b19be6e92733ea8dfee89b4b5 SHA512 3c7efccf85beda5f80c66432f6950b2d885c4587e6ed3cdc66447f60440dc0287da834cc5744ddd7af8ad36677254ebae6969bc498d36e457dfac69ca0da3f6d
 DIST jq-1.5.tar.gz 739309 BLAKE2B 9d36db80fa9365d9967c9e1691e723d5237e7db2ddef43e06391bb97ba3a163f07c79906b9cf94d4b53f20598dc8ccacaff9e54ff3c32387fef1b3d484c13e73 SHA512 4a0bb069ae875f47731d7d84ae6b82240703dc7a694cfb0aee4c7e9639defe7ba9af575d17dc32bda4426b80c186cc8dcd4505f3a6bcbe16b39e9b13097da238
-EBUILD jq-1.5-r3.ebuild 1385 BLAKE2B e5e6fcc3dd40dc2a6667763dced918ed3c007275a2daecb60704ecfdcacae7398fcba373809c9f22c146f91caafae4b4d2b0eeae6c187a2cfeb34efdb9027d6d SHA512 da253fc8d393a3106437b5cba2a4c618076f9c8d23b834d8aab2079de876a53e8a2f2b5ebcd6d79ff48b53c54276a81aa314ccbbbc22e02d720a800a40e20ef7
+EBUILD jq-1.5-r3.ebuild 1392 BLAKE2B 3bf5f4a5124ed0e44158969a38201e5c9a5311ce23af5bca431acb2b0e69f50d5c6be60561a29c067f813f7bb4bb1d57bd7659672258574e3e9cebaf9e8da1c7 SHA512 2d1a0ca492838b08b40232cc574d3cbd3319250a45f23a53f5b8688e12def7702cce59bb761d3d30e58fd50ba8cde1dc0e1d7790a0ce0411444dc39922a81426
 MISC metadata.xml 423 BLAKE2B 1e5f03ac7d6b93814bdfe760d9b2d9b74447272b554f7e92c40918069c7787ee8c60dd68a86df38c67f27422f0f281c7ad7234305a45532b657be0397a5b81af SHA512 1787b1ce5d050aaa440996ceaf2367e39192af71e7d9a0d973e8dc8a87854f910aefd020c869867e3da5da33d27cc261047a1ded58b18052b21bf6737ef3081c
diff --git a/app-misc/jq/jq-1.5-r3.ebuild b/app-misc/jq/jq-1.5-r3.ebuild
index f2b7f8001e52..b64204f809c6 100644
--- a/app-misc/jq/jq-1.5-r3.ebuild
+++ b/app-misc/jq/jq-1.5-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="MIT CC-BY-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE="oniguruma static-libs"
 
 DEPEND="
diff --git a/app-misc/lcd4linux/Manifest b/app-misc/lcd4linux/Manifest
index 43847a54cd62..fe6fc2779816 100644
--- a/app-misc/lcd4linux/Manifest
+++ b/app-misc/lcd4linux/Manifest
@@ -8,6 +8,6 @@ AUX lcd4linux-0.10.1_rc2.initd 539 BLAKE2B 314810d6bf8a402a435dc1cb53f610ed1f0fd
 AUX lcd4linux-r1.initd 775 BLAKE2B f1b4ee44d147e1ea191658edc2b7502acfc8d5a82e5b1af2deb74457cb3b20b32477d055cd24b7587019b711dfe55c7bb5dadd43d5a1d76d320e3ff6a2c19021 SHA512 471517952391880f3bcf85e21de56523ee40578fcf75b4e7256554498bbb691e8bbfe4add509d32dc99b409d7b7b3abd608a60326d883a43cb114b279a217213
 DIST lcd4linux-0.10.1-RC2.tar.gz 386188 BLAKE2B 7d396ee15e00212eb314721cd9627147ec1654f43fff1d3ae3f8c38d33d8d133f1fd5c53ef2b78eba7afefb7f65a53810da52a903911abdd95383b2b2c28d06f SHA512 8c4299f50ab4068d4106ba32309f4f66bfedf382a4aed7495cf400d22c57c22c4dfabd80f7e4355417c5c0d964e69f0c268a50bae6924b759b720bd728a969f9
 DIST lcd4linux-0.11.0_pre20170527.tar.bz2 478823 BLAKE2B 7b332e7262781dd0dc954a0576890dda78ecbeab9dc003d1d5b84a643ad522d57e32a04a2aa6fbe13b18e4699d07d88412e19c81739fafdf98ba327b151061a9 SHA512 c131b9cb04bb0ff4dc46c1e3ab8f5dcda309bbef89bcb670508f9afe7c515d6ccfe79a03782be4f4b2ba4aaf977cd13c0059805e5b7230216e39ee3421b0f143
-EBUILD lcd4linux-0.10.1_rc2-r4.ebuild 5156 BLAKE2B 9cd0d0231dfec0ff6fab4c668969e16a546e70167d0d495caf8d527554521a1878e3b4f14451ce7abd29c2db7b8c0bb87cb2815a087c79777592e431a8b4610d SHA512 a17a33cbeac88b0eec6a6d5fb8435667f3f9d5c33bb77e360ba7d755f6c3c138d3d6a7ee87c83eee4f4679d4df59dc27457a61ed108c0a11ed30d2dbf8d4b1d9
+EBUILD lcd4linux-0.10.1_rc2-r4.ebuild 5152 BLAKE2B c93e24bde5ee61bb926079a8b487d723046681c776954d41d6c258d638f5a0f4a47bbbcb4ce6592b76715cf28c6f60762dda7b82d02567c98fce599c126c1ab8 SHA512 b1ef4cf6203d51c7b8518ce9d554db5541b6eed4d59548218c4ac9d8d7fea3c0ce2a04a24dd518da1e75eeeda40c34ee819fd588a6c647baab3911216cecd340
 EBUILD lcd4linux-0.11.0_pre20170527.ebuild 5554 BLAKE2B 8df277c018df83a5f32907605bb8d43e45125cb8b285731bd0a4cc9e5a20a0aba4ecd08df5e098c354110f404b9e8e037fdc4cffc7ec076ce480d43b881ba0d6 SHA512 4a7ee882463293c0fc7bf8ca52fbc1726ad54208930bb707020419a2c9e6180b613987471a473ad282b24598060a579ae580b7f7e356e2b950a4482366942749
 MISC metadata.xml 3555 BLAKE2B 507770da472d7befe06269d3b8ed52ca258467acb8d18892f47db3a630742c66f48f55f069c160ef0c889bc0fd31fbdd41b81fc6574ff4a51eea247373b8e25e SHA512 618885236669c7b9c28114d01f2f2f8c05638eb4eb85aca3d311d180cf82af01255f143ccdc0db2e890d42d2cb7fa3223638fcf4985d80322c95101e6c00e9fe
diff --git a/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r4.ebuild b/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r4.ebuild
index dd4dad81be11..ce72ad458094 100644
--- a/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r4.ebuild
+++ b/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE="mysql python iconv mpd"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 5975d8880273..ed8d8a5fd567 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -1,26 +1,10 @@
 AUX irexec-confd 280 BLAKE2B ad6663659c459811710a257cf357ddd5efbd17c09201c6e3ecc68d680004e8212e76365e09984b6c422fb5fa9603245c7443d1b71bb6064a2ed35734ab6dd630 SHA512 2b33e1044086d11fd6e1f9a204ce925182a3a2b92ef4399610e01702f9c2c8fbc87cae52961123297171eef3d40468ac17437b4281b26a5f3b256c9cebc612ac
-AUX irexec-initd-0.8.6-r2 703 BLAKE2B c13b5348222f18d9883bc59f5db73ed1aa98f880c878f7059e0f150a9a0903395739a2364c2a9ce8d305f0d363bbc6aa676b20e4f70b941505770e30003897f9 SHA512 2d06c0bedbd2af9120caa54c049815a2bd920054afbcbd6b0bc1a48dab479527aea5e4fc7065428742f8d46032476ee37fb075669e93e16b2df5bfb8b572f86a
 AUX irexec-initd-0.9.4a-r2 681 BLAKE2B d2bf21ab1fe275bf5afea31a890c1de3300e836879b76c1c33bb40a59d9ad2b33285745a4d0a78f8bc2f589ba44e6fde31c7d07a02d9751e4b13b23975b1d9aa SHA512 0514712ce1a3e147e1c798319f90663baab7509299e2eb35551a716cf208e42b225f8539968bba1bd15270006fb728ff2f458015fb07bf325df8b0e095f5a206
-AUX irexec.service 140 BLAKE2B 6ee184023b77da18b2447704165fbda27b6b19ae70f0ae99fd3f07f046e80c480fa851a3315fda6c20c5d68c8186d200bb2637ae2249f993338e08ee62b1c345 SHA512 573e037d7132d216f095e4af370cdd020d72eca4ca6dfb1a652d6cd3f533b7d86491469a14d86419406561a6fb6500567e5e38a13b8dd0c99c63ff8494562249
-AUX lirc-0.8.3_pre1-remotewonderplus.patch 943 BLAKE2B 1041002d814fef683eefd409874783d5d3fc4fccfdc740d6d499628399c86a1b2a99243894752753cb6c0eef549e6293474d13ec0a92cb3c87202fc4b1010c67 SHA512 f1c5b03eafb8fb9d4190e438fb4ca734cac102c7f3a097f193a0a1ac7cdee33b01fb1d794959e00be16c78bb66e34d113f3ff8fb87678e99f82670ec0306e3ca
-AUX lirc-0.8.4-portaudio_check.patch 769 BLAKE2B 08450f17818ef2525af534345bd5e5544416b0fa6f91a854f98ce0b03667458cb54aa565a581f35169581f4ec7bb71bda365c41b00378bc2c5cac9ec19895924 SHA512 a4e63da5d03f1fbb072679c3a415ae55767d601512f158c5e2fc52a045b632a055b94dca4e9d0d236ceeeb367daf22d4cc71f542229edb4fb13410512a8e4f0b
-AUX lirc-0.9.0-add-zotac-support.patch 19305 BLAKE2B aa968c0fe02057c3310731bdab00bc196657a826c28746e0038c9b72b85140669fc008b69e90c0bbf28bc222424a149b78014367eea7ccc551cdd53102f139eb SHA512 72ac76eba13ed043630b10adad7a8a0df9183c7b2eeab1cc2bee3f7d6a97d56382debcf61aa4a2d6068d85bbd8d592ee425f34a6ac6eabcbf0a300ed6fb208cb
-AUX lirc-0.9.0-atiusb_kfifo.patch 437 BLAKE2B c2215e718924e5185cef1f5b80428902c20b3b69d313ee9f8fe0d98d5553bdf03ec64ac359c3e42c78e40c6d9d1b0f38986387e15a95e630796e3b2148688004 SHA512 d072ecd94ed4b7f1662441106650b7eb329cbe62887819c1e607ae87375a17dedea02a3a5dcf6956a1151743fd652ec5884577c595771740eef509daab8dbd02
-AUX lirc-0.9.0-fixed-font.patch 630 BLAKE2B 39e12cca466fbee96112395104b2055997ec6941465782ecb928de4793cba29203f5f99d280d530fbaadf5d2377d1e25a88e4897c103d3d12fbf0a6cfcd8e6e9 SHA512 782eb14bd540f202a3df71ce801a42b9adca17fa25a79265af6a3b0ed6b503a67b46a0d29ac6b4607862b712a3511a3a3f16cdc7bef70ba1e43967be11971ed4
-AUX lirc-0.9.0-kernel-2.6.39-fixes.patch 2175 BLAKE2B db4c75de0f7c2de3b99f50b17321ec1cd93bbba480536f533c64d07e8cac8fe1710f03d1f91005e5ff7db52ea906799aaf08ff1a6174fa4a2676d8f6f77da601 SHA512 a502b815cec565a49382e9ad0e7237a9bc7da431f41e94db42d214655577212606500ea2651a298db8cd3a68ce706461e6a773b0d9e3316ac7d49b2038fda354
-AUX lirc-0.9.0-kernel-3.3.0-fixes.patch 1545 BLAKE2B 400ef11e93b9cc58bbfa7f414df66208d1ad6fe14301b85dd05599b400aa1ecf6299b1e9692945f10f4b7ed085e8e087b0cdf218644bea0b7f785e00959d2be3 SHA512 75743844d7fe61a91174c1d7ee78a229e347659a35d1062a704c39e424d8a433efac4216a0b840282c38a4f2f22baa7a489c1c0402a40f734e7475992046a2ae
-AUX lirc-0.9.0-kernel-3.5-err-fix.patch 326 BLAKE2B ebfc117d5f1f1abe2a456ea6b5ed730ec22ebe03fee976eaf9005464afbfe5519f290cb5a107946286b8632a695d2f352ddb8581f63c429f75a7080d1916189b SHA512 c3a6e802b140595155a7ae8dc695bc13e4d6147323949a8dc9c86857bf7abcd442339eac64f99869925c308a100bfb1b7b0eb715f086afb8997252164ff079df
-AUX lirc-0.9.0-kernel-3.8-fixes.patch 2727 BLAKE2B 26601a6e34f0dadad36de1efa9b9a43127643a5c548372d9a64b2b919ddcef3d412ccd4bd59e8c18cd9d5fb9a41efe2d213a3f91397d9067a5851aa84b7832fe SHA512 0db9cbb3aba7d43dc497bc8009afb8335bfe013a06aa6936e1cd357e58c60f545575b06fb6941740d82b496dd4f2ac51b3a165435aee6b3c57107ae62bae7bdc
-AUX lirc.service 216 BLAKE2B f1ee64926ab99eaeb5604f93d6394994eff97b9e5ae5b32a10d066e143e66278114722e15c3757815911ebc0485fde43c1f10e8abecf4a90550ccf4c08c5aa1b SHA512 c3e43d24f562ba5ac7e0f12d160026ebf5db00fe066d9e28e0cbb6767fb272474103ad271fba10b970a6613f6e4545150d61b7aa096c696fddca4f2db8019e49
 AUX lircd-0.8.6-r2 1204 BLAKE2B ae4082b6f063d3100865bb3e974d9ebec8f04e08dae8c296c30152f69700924b8850c85687a5cedb3895f52c1e7a576b0855a52e350462a0552da64cd3a7e6a4 SHA512 482fccd204671f6258822029b9eb9a1e22abf02e382b3814f924f171fd1168d46560f52a90727f3de60c27a78158173a4e0c3e848d45e489471c27851c907c05
 AUX lircd.conf.4 699 BLAKE2B 573b16d756f6df55c399fd77027ebb1e6bec1f28106d1a1d4cb028ab3694350a959486d33b82502a258492882e2fdfcb8f8e5220998ee4e1a503618ec247b30b SHA512 1fb1778f4cc72fc9c11b13a704b3abe80bcce5b3770b69b6b6bea8571e5293adad8c6968779b812e611b67734462c9a577cc71c6b16da3a5bfe31b8007300a62
-AUX lircm.service 174 BLAKE2B 30db4e9dd3eed5ae896f60d2363d25f5bf11c83b946e668e7b13e31465682405eb1e5bb436c8987a59ddf9be6e0032745a5867cbeca978ccaf9c47e8eb24633c SHA512 8baccd7138fb9095c99f4f0a8ef398114dfa2bba798f23e07d41d6a7433242e2e1f071d44e1b336fb2a36b30c650ed01f2ccdb1ed365e590f85007c012343db5
-AUX lircmd 364 BLAKE2B 71971476198f92bb2d26cbacc8fe330c4d73e0b36370180cfc6438047339487451b093455761b92660e3f3571c7884b97e6c79cbf7415bff6bcc6ad5198ddd43 SHA512 2f4aae24982a51c54fa59ddd8a48190c11f86ac67fc25bbb599f750be5b91e457c2f779e915943803bde2ec3e5e8988f3c0ffb9d1ea4a08c2e7f05cd3e8b75a5
 AUX lircmd-0.10.0.conf 57 BLAKE2B 8c39aac91bf5ac603a1495bb7e27b74ee5f09e55e35297aae75b17ed1bb858a57aa1f524d096ec2744f0d543b719f13e80a467869b7ac86e560cc396a24b0648 SHA512 6a69c7600024f00947dc35e3c6cebf7524fcf5f2a1e799fe70590fef2070c1049c4e6177711821f4e7b13972fd6f535591b48bb1006acd44fa650591b3265ace
 AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a387be62a9e54b3d4f3c78734f5dd0a54ddb04dd2b48ba270177ca7af777ac80ba8bacdcbe3f9ce2d62 SHA512 c744553b6246e62845ee61e18d78d97e7242969d0bb5478072bd9072ce0a02486306b577ca64c1c569c9b136e3231a4f0663c94114879827329a769e5f36413d
 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 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
+EBUILD lirc-0.10.1.ebuild 3733 BLAKE2B 54b4dbb14785de95d6db40fffdd8bb7ce1213ad23825fca80b952bfcfbc64957554bfeb150b7f3919386f47d34baf876b9e3e6337881ac82dc3b0e1143e156e5 SHA512 733bd887df1fa1ff895dedf91bae965b3c41d15e5e58d82858c54eca0576a6c69519f4be07cb0e20cb58becf5192c09b362c2513eecba9bdb9b49352b14335eb
+MISC metadata.xml 969 BLAKE2B 6dabf8921994f06c7f9e39e2049c0ac86b5e5523c554eec3c061151627512f6f17d14eeb00256585dd9fd323f4293f74175ace6bd87846ba461a72ab6e7caef4 SHA512 fc510d070b7b97d28159b77a7540b38e8558efd8a780dffe8755e3bcea7bbd601211f19733c217ce670407c523b6c5daac2c9aedde2ddeecb81dda8472c48fb6
diff --git a/app-misc/lirc/files/irexec-initd-0.8.6-r2 b/app-misc/lirc/files/irexec-initd-0.8.6-r2
deleted file mode 100644
index e62497306d0f..000000000000
--- a/app-misc/lirc/files/irexec-initd-0.8.6-r2
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2003 Martin Hierling <mad@cc.fh-lippe.de>
-# Distributed under the terms of the GNU General Public License v2
-
-: ${IREXEC_USER:=root}
-
-depend() {
-	need lirc
-}
-
-start() {
-	if [ "x${IREXEC_USER}" = "xroot" -a "x${IREXEC_DISABLE_ROOT_WARNING}" != "xyes" ]; then
-		ewarn "Warning: Running irexec as root can open security holes"
-	fi
-
-	ebegin "Starting irexec"
-	start-stop-daemon --start --chuid ${IREXEC_USER} --user ${IREXEC_USER} --chdir / \
-		--exec /usr/bin/irexec -- --daemon ${IREXEC_OPTS}
-	eend $? "Failed to start irexec."
-}
-
-stop() {
-	ebegin "Stopping irexec"
-	start-stop-daemon --stop --exec /usr/bin/irexec --user ${IREXEC_USER}
-	eend $? "Failed to stop irexec."
-}
-
diff --git a/app-misc/lirc/files/irexec.service b/app-misc/lirc/files/irexec.service
deleted file mode 100644
index 53dac65dc234..000000000000
--- a/app-misc/lirc/files/irexec.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=IR Exec
-After=lirc.service
-Wants=lirc.service
-
-[Service]
-ExecStart=/usr/bin/irexec
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-misc/lirc/files/lirc-0.8.3_pre1-remotewonderplus.patch b/app-misc/lirc/files/lirc-0.8.3_pre1-remotewonderplus.patch
deleted file mode 100644
index 66527bcc5709..000000000000
--- a/app-misc/lirc/files/lirc-0.8.3_pre1-remotewonderplus.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- lirc-0.8.0/drivers/lirc_atiusb/lirc_atiusb.c.orig	2005-10-29 08:18:53.000000000 -0600
-+++ lirc-0.8.0/drivers/lirc_atiusb/lirc_atiusb.c	2006-04-01 14:31:05.000000000 -0700
-@@ -147,8 +147,9 @@
- /* init strings */
- #define USB_OUTLEN		7
- 
--static char init1[] = {0x01, 0x00, 0x20, 0x14};
--static char init2[] = {0x01, 0x00, 0x20, 0x14, 0x20, 0x20, 0x20};
-+static char init1[] = {0x80, 0x05, 0x1b, 0x15, 0x14, 0x20, 0x24, 0x15};
-+static char init2[] = {0x83, 0x03};
-+static char init3[] = {0x84, 0xd7, 0x020};
- 
- struct in_endpt {
- 	/* inner link in list of endpoints for the remote specified by ir */
-@@ -1034,8 +1034,9 @@
- 			usb_sndintpipe(ir->usbdev, oep->ep->bEndpointAddress), oep->buf,
- 			USB_OUTLEN, usb_remote_send, oep, oep->ep->bInterval);
- 
--		send_packet(oep, 0x8004, init1);
--		send_packet(oep, 0x8007, init2);
-+		send_packet(oep, 0x8007, init1);
-+		send_packet(oep, 0x8002, init2);
-+		send_packet(oep, 0x8003, init3);
- 	}
- }
- 
diff --git a/app-misc/lirc/files/lirc-0.8.4-portaudio_check.patch b/app-misc/lirc/files/lirc-0.8.4-portaudio_check.patch
deleted file mode 100644
index 36f5f360cd18..000000000000
--- a/app-misc/lirc/files/lirc-0.8.4-portaudio_check.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Portaudio is only needed for LIRC_DEVICES=audio, so not checking for Portaudio when the device is disabled will prevent automagic dependencies.
---- configure.ac.orig	2009-03-13 10:02:50.000000000 +0100
-+++ configure.ac	2009-03-13 10:04:00.000000000 +0100
-@@ -336,14 +336,6 @@
-   AC_DEFINE(HAVE_LIBIRMAN_SW)
-   possible_drivers="${possible_drivers} (irman_sw)"
- )
--dnl audio driver requires PortAudio library installed and some linker flags
--AC_CHECK_HEADERS(portaudio.h,[
--  AC_CHECK_LIB(portaudio, Pa_Initialize,[
--    AC_DEFINE(HAVE_LIBPORTAUDIO)
--    possible_drivers="${possible_drivers} (audio)"
--    ],,${portaudio_lib_other}
--  )]
--)
- dnl audio_alsa driver requires ALSA library installed and some linker flags
- have_alsa=no
- AC_CHECK_HEADERS(alsa/asoundlib.h,[
diff --git a/app-misc/lirc/files/lirc-0.9.0-add-zotac-support.patch b/app-misc/lirc/files/lirc-0.9.0-add-zotac-support.patch
deleted file mode 100644
index 381860ced6fb..000000000000
--- a/app-misc/lirc/files/lirc-0.9.0-add-zotac-support.patch
+++ /dev/null
@@ -1,658 +0,0 @@
-diff -rupN base/configure.ac mod/configure.ac
---- base/configure.ac	2011-03-25 23:28:18.000000000 +0100
-+++ mod/configure.ac	2013-03-21 16:25:07.218419985 +0100
-@@ -383,7 +383,7 @@ AC_CHECK_HEADERS(linux/input.h,[
- dnl check if hiddev is available
- AC_CHECK_HEADERS([linux/types.h])
- AC_CHECK_HEADERS([linux/hiddev.h],[
--  possible_drivers="${possible_drivers} (asusdh) (bw6130) (dvico) (macmini)"
-+  possible_drivers="${possible_drivers} (asusdh) (bw6130) (dvico) (macmini) (zotac)"
-   AC_MSG_CHECKING(for HIDDEV_FLAG_UREF support)
-   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <linux/types.h>
-@@ -393,7 +393,7 @@ AC_CHECK_HEADERS([linux/hiddev.h],[
-     ]])],[
-     AC_MSG_RESULT(yes)
-     AC_DEFINE(HAVE_LINUX_HIDDEV_FLAG_UREF)
--    possible_drivers="${possible_drivers} (samsung) (sb0540)"
-+    possible_drivers="${possible_drivers} (samsung) (sb0540) (zotac)"
-     ],[
-     AC_MSG_RESULT(no)
-     ])
-@@ -446,7 +446,7 @@ AC_ARG_WITH(driver,
-                           srm7500libusb, tekram,
-                           tekram_bt829, tira, tira_raw, ttusbir,
-                           tuxbox, tvbox, udp, uirt2, uirt2_raw,
--                          usb_uirt_raw, usbx, wpc8769l],
-+                          usb_uirt_raw, usbx, wpc8769l, zotac],
- driver=${withval},
- driver="unset"
- )
-@@ -464,6 +464,7 @@ portaudio_lib=""
- alsa_lib=""
- atilibusb_lib=""
- atwf83_lib=""
-+zotac_lib=""
- awlibusb_lib=""
- dfclibusb_lib=""
- srm7500libusb_lib=""
-@@ -683,6 +684,10 @@ if test "$driver" = "userspace" -o "$dri
- 	usbx)
- 		hw_module="${hw_module} hw_usbx.o serial.o"
- 		;;
-+	zotac)
-+		hw_module="${hw_module} hw_zotac.o"
-+		zotac_lib=-lpthread
-+		;;
-   esac
-   done
-   #remove duplicates
-@@ -733,6 +738,14 @@ if test "$driver" = "alsa_usb"; then
-   lircd_conf="creative/lircd.conf.alsa_usb"
- fi
- 
-+if test "$driver" = "zotac"; then
-+  lirc_driver="$driver"
-+  hw_module="hw_zotac.o"
-+  HW_DEFAULT="hw_zotac"
-+  lircd_conf="zotac/lircd.conf.zotac"
-+  zotac_lib=-lpthread
-+fi
-+
- if test "$driver" = "animax"; then
-   lirc_driver="lirc_dev lirc_serial"
-   lircd_conf="animax/lircd.conf.animax"
-@@ -1499,6 +1512,7 @@ if test "$lirc_driver" = "none" || \
- 	test "$lirc_driver" = "macmini" || \
- 	test "$lirc_driver" = "samsung" || \
- 	test "$lirc_driver" = "sb0540" || \
-+	test "$lirc_driver" = "zotac" || \
- 	test "$lirc_driver" = "srm7500libusb" || \
- 	test "$lirc_driver" = "userspace"; then
-   lirc_driver=
-@@ -1669,7 +1683,7 @@ if ! echo ${hw_module}|grep " receive.o"
- 	receive="receive.o"
- fi
- 
--hw_module_libs="${alsa_lib} ${atilibusb_lib} ${awlibusb_lib} ${caraca_lib} ${commandir_lib} ${dfclibusb_lib} ${ftdi_lib} ${iguanaIR_lib} ${irman_lib} ${portaudio_lib} ${srm7500libusb_lib} ${atwf83_lib}"
-+hw_module_libs="${alsa_lib} ${atilibusb_lib} ${awlibusb_lib} ${caraca_lib} ${commandir_lib} ${dfclibusb_lib} ${ftdi_lib} ${iguanaIR_lib} ${irman_lib} ${portaudio_lib} ${srm7500libusb_lib} ${atwf83_lib} ${zotac_lib}"
- 
- dnl tell the Makefiles what we decided
- AC_SUBST(daemon)
-diff -rupN base/daemons/Makefile.am mod/daemons/Makefile.am
---- base/daemons/Makefile.am	2011-03-25 23:28:18.000000000 +0100
-+++ mod/daemons/Makefile.am	2013-03-21 16:25:40.488790784 +0100
-@@ -58,7 +58,8 @@ EXTRA_libhw_module_a_SOURCES = \
- 			hw_usbx.c hw_usbx.h \
- 			receive.c receive.h \
- 			transmit.c transmit.h \
--			serial.c serial.h
-+			serial.c serial.h \
-+			hw_zotac.c
- 
- libhw_module_a_LIBADD = @hw_module@
- libhw_module_a_DEPENDENCIES = @hw_module@
-diff -rupN base/daemons/hw-types.c mod/daemons/hw-types.c
---- base/daemons/hw-types.c	2011-03-25 23:28:18.000000000 +0100
-+++ mod/daemons/hw-types.c	2013-03-21 16:26:38.913200218 +0100
-@@ -59,6 +59,7 @@ extern struct hardware hw_uirt2;
- extern struct hardware hw_uirt2_raw;
- extern struct hardware hw_usb_uirt_raw;
- extern struct hardware hw_usbx;
-+extern struct hardware hw_zotac;
- 
- #ifndef HW_DEFAULT
- # define HW_DEFAULT hw_default
-@@ -160,6 +161,7 @@ struct hardware *hw_list[] = {
- #ifdef HAVE_LINUX_HIDDEV_FLAG_UREF
- 	&hw_samsung,
- 	&hw_sb0540,
-+	&hw_zotac,
- #endif
- 	&hw_silitek,
- #ifdef HAVE_LIBUSB
-diff -rupN base/daemons/hw_zotac.c mod/daemons/hw_zotac.c
---- base/daemons/hw_zotac.c	1970-01-01 01:00:00.000000000 +0100
-+++ mod/daemons/hw_zotac.c	2013-03-21 16:31:06.989272556 +0100
-@@ -0,0 +1,429 @@
-+/****************************************************************************
-+ ** hw_zotac.c *************************************************************
-+ ****************************************************************************
-+ *
-+ * Lirc driver for Zotac remote
-+ *
-+ * Copyright (C) 2010 Rainer Hochecker
-+ *
-+ * Distribute under GPL version 2 or later.
-+ *
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include <stdio.h>
-+#include <pthread.h>
-+#include <sys/fcntl.h>
-+#include <signal.h>
-+#include <linux/hiddev.h>
-+#include <sys/ioctl.h>
-+#include "hardware.h"
-+#include "ir_remote.h"
-+#include "lircd.h"
-+
-+enum {
-+	RPT_NO = 0,
-+	RPT_YES = 1,
-+};
-+
-+static int zotac_init();
-+static int zotac_deinit();
-+static char *zotac_rec(struct ir_remote *remotes);
-+static int zotac_decode(struct ir_remote *remote, ir_code * prep, ir_code * codep, ir_code * postp, int *repeat_flagp,
-+			 lirc_t * min_remaining_gapp, lirc_t * max_remaining_gapp);
-+static void *zotac_repeat();
-+static int zotac_getcode();
-+
-+/** Max number of repetitions */
-+static unsigned max_repeat_count = 500;
-+/** Code that triggers key release */
-+static unsigned release_code = 0x00000000;
-+/** Code that triggers device remove  */
-+static unsigned remove_code =0x00FFFFFF;
-+/** Time to wait before first repetition */
-+static unsigned repeat_time1_us = 500000;
-+/** Time to wait between two repetitions */
-+static unsigned repeat_time2_us = 100000;
-+/** Pipe between main thread and repetition thread */
-+static int fd_pipe[2] = { -1, -1 };
-+
-+/** Thread that simulates repetitions */
-+static pthread_t repeat_thread;
-+/** File descriptor for the real device */
-+static int fd_hidraw;
-+
-+static int main_code_length = 32;
-+static signed int main_code = 0;
-+static struct timeval start, end, last;
-+static int repeat_state = RPT_NO;
-+static int error_state = 0;
-+static int probe_code = 0;
-+
-+#ifdef HAVE_LINUX_HIDDEV_FLAG_UREF
-+/* Zotac USB iR Receiver */
-+struct hardware hw_zotac = {
-+	"/dev/usb/hiddev0",		/* "device" */
-+	-1,			/* fd (device) */
-+	LIRC_CAN_REC_LIRCCODE,	/* features */
-+	0,			/* send_mode */
-+	LIRC_MODE_LIRCCODE,	/* rec_mode */
-+	32,			/* code_length */
-+	zotac_init,		/* init_func */
-+	zotac_deinit,		/* deinit_func */
-+	NULL,			/* send_func */
-+	zotac_rec,		/* rec_func */
-+	zotac_decode,		/* decode_func */
-+	NULL,			/* ioctl_func */
-+	NULL,			/* readdata */
-+	"zotac"		/* name */
-+};
-+#endif
-+
-+static int zotac_decode(struct ir_remote *remote, ir_code * prep, ir_code * codep, ir_code * postp, int *repeat_flagp,
-+		  lirc_t * min_remaining_gapp, lirc_t * max_remaining_gapp)
-+{
-+	LOGPRINTF(1, "zotac_decode");
-+
-+	if (!map_code(remote, prep, codep, postp, 0, 0, main_code_length, main_code, 0, 0)) {
-+		return 0;
-+	}
-+
-+	map_gap(remote, &start, &last, 0, repeat_flagp, min_remaining_gapp, max_remaining_gapp);
-+	/* override repeat */
-+	*repeat_flagp = repeat_state;
-+
-+	return 1;
-+}
-+
-+static int zotac_getcode() {
-+
-+	ssize_t rd;
-+	struct hiddev_usage_ref uref;
-+	struct hiddev_report_info rinfo;
-+	struct hiddev_field_info finfo;
-+	int shift = 0;
-+
-+	rd = read(fd_hidraw, &uref, sizeof(uref));
-+	if (rd < 0) {
-+		logprintf(LOG_ERR, "error reading '%s'", hw.device);
-+		logperror(LOG_ERR, NULL);
-+		zotac_deinit();
-+		error_state = 1;
-+		return -1;
-+	}
-+
-+	if (uref.field_index == HID_FIELD_INDEX_NONE) {
-+		/*
-+		 * we get this when the new report has been send from
-+		 * device at this point we have the uref structure
-+		 * prefilled with correct report type and id
-+		 *
-+		 */
-+
-+		switch (uref.report_id) {
-+		case 1:	/* USB standard keyboard usage page */
-+			{
-+				/* This page reports cursor keys */
-+				LOGPRINTF(3, "Keyboard (standard)\n");
-+
-+				/* check for special codes */
-+				uref.field_index = 0;
-+				uref.usage_index = 1;
-+				/* fetch the usage code for given indexes */
-+				ioctl(fd_hidraw, HIDIOCGUCODE, &uref, sizeof(uref));
-+				/* fetch the value from report */
-+				ioctl(fd_hidraw, HIDIOCGUSAGE, &uref, sizeof(uref));
-+
-+				if (uref.value)
-+					shift = 1;
-+
-+				/* populate required field number */
-+				uref.field_index = 1;
-+				uref.usage_index = 0;
-+				/* fetch the usage code for given indexes */
-+				ioctl(fd_hidraw, HIDIOCGUCODE, &uref, sizeof(uref));
-+				/* fetch the value from report */
-+				ioctl(fd_hidraw, HIDIOCGUSAGE, &uref, sizeof(uref));
-+				/* now we have the key */
-+
-+				LOGPRINTF(3, "usage: %x   value: %x   shift: %d\n",uref.usage_code, uref.value, shift);
-+
-+				/* now we have the key */
-+				if (uref.value) {
-+					probe_code = (uref.usage_code | uref.value);
-+					if (shift)
-+						probe_code |= 0x10000000;
-+					LOGPRINTF(3, "Main code 1: %x\n", probe_code);
-+					return 1;
-+				}
-+				else {
-+					LOGPRINTF(3, "rel button\n");
-+					probe_code = release_code;
-+					return 2;
-+				}
-+			}
-+			break;
-+
-+		case 2:
-+		case 3:	/* USB generic desktop usage page */
-+		case 4:
-+			{
-+				/* This page reports power key
-+				 * (via SystemControl SLEEP)
-+				 */
-+				LOGPRINTF(3, "Generic desktop (standard)\n");
-+
-+
-+				/* traverse report descriptor */
-+				rinfo.report_type = HID_REPORT_TYPE_INPUT;
-+				rinfo.report_id = HID_REPORT_ID_FIRST;
-+				rd = ioctl(fd_hidraw, HIDIOCGREPORTINFO, &rinfo);
-+
-+				unsigned int i,j;
-+				while (rd >= 0) {
-+					for (i = 0; i < rinfo.num_fields; i++) {
-+						finfo.report_type = rinfo.report_type;
-+				        finfo.report_id = rinfo.report_id;
-+				        finfo.field_index = i;
-+				        ioctl(fd_hidraw, HIDIOCGFIELDINFO, &finfo);
-+				        for (j = 0; j < finfo.maxusage; j++) {
-+				        	uref.field_index = i;
-+				            uref.usage_index = j;
-+				            ioctl(fd_hidraw, HIDIOCGUCODE, &uref);
-+				            ioctl(fd_hidraw, HIDIOCGUSAGE, &uref);
-+
-+				            if (uref.value != 0) {
-+				            	LOGPRINTF(3, "field: %d, idx: %d, usage: %x   value: %x\n",i, j, uref.usage_code, uref.value);
-+				            	probe_code = uref.usage_code;
-+				            	return 1;
-+				            }
-+				        }
-+					}
-+					rinfo.report_id |= HID_REPORT_ID_NEXT;
-+				 	rd = ioctl(fd_hidraw, HIDIOCGREPORTINFO, &rinfo);
-+				}
-+				return 2;
-+			}
-+			break;
-+		default:
-+			/* Unknown/unsupported report id.
-+			 * Should not happen because remaining reports
-+			 * from report descriptor seem to be unused by remote.
-+			 */
-+			logprintf(LOG_ERR, "Unexpected report id %d", uref.report_id);
-+			break;
-+		}
-+	}
-+	else {
-+			/* This page reports power key
-+			 * (via SystemControl SLEEP)
-+			 */
-+			LOGPRINTF(3, "Same Event ...\n");
-+
-+			/* traverse report descriptor */
-+			rinfo.report_type = HID_REPORT_TYPE_INPUT;
-+			rinfo.report_id = HID_REPORT_ID_FIRST;
-+			rd = ioctl(fd_hidraw, HIDIOCGREPORTINFO, &rinfo);
-+
-+			unsigned int i,j;
-+			while (rd >= 0) {
-+				for (i = 0; i < rinfo.num_fields; i++) {
-+					finfo.report_type = rinfo.report_type;
-+				    finfo.report_id = rinfo.report_id;
-+				    finfo.field_index = i;
-+				    ioctl(fd_hidraw, HIDIOCGFIELDINFO, &finfo);
-+				    for (j = 0; j < finfo.maxusage; j++) {
-+				       	uref.field_index = i;
-+				        uref.usage_index = j;
-+				        ioctl(fd_hidraw, HIDIOCGUCODE, &uref);
-+				        ioctl(fd_hidraw, HIDIOCGUSAGE, &uref);
-+
-+				        if (uref.value != 0) {
-+				         	LOGPRINTF(3, "usage: %x   value: %x\n",uref.usage_code, uref.value);
-+				          	//probe_code = uref.usage_code;
-+				          	return 0;
-+						}
-+					}
-+				}
-+				rinfo.report_id |= HID_REPORT_ID_NEXT;
-+			 	rd = ioctl(fd_hidraw, HIDIOCGREPORTINFO, &rinfo);
-+			}
-+			return 2;
-+	}
-+	return 0;
-+}
-+
-+static int zotac_init()
-+{
-+	logprintf(LOG_INFO, "zotac initializing '%s'", hw.device);
-+	if ((fd_hidraw = open(hw.device, O_RDONLY)) < 0) {
-+		logprintf(LOG_ERR, "unable to open '%s'", hw.device);
-+		return 0;
-+	}
-+	int flags = HIDDEV_FLAG_UREF | HIDDEV_FLAG_REPORT;
-+	if (ioctl(fd_hidraw, HIDIOCSFLAG, &flags)) {
-+		return 0;
-+	}
-+	hw.fd = fd_hidraw;
-+
-+	/* Create pipe so that events sent by the repeat thread will
-+	   trigger main thread */
-+	if (pipe(fd_pipe) != 0) {
-+		logperror(LOG_ERR, "couldn't open pipe");
-+		close(fd_hidraw);
-+		return 0;
-+	}
-+	hw.fd = fd_pipe[0];
-+	/* Create thread to simulate repetitions */
-+	if (pthread_create(&repeat_thread, NULL, zotac_repeat, NULL)) {
-+		logprintf(LOG_ERR, "Could not create \"repeat thread\"");
-+		return 0;
-+	}
-+	return 1;
-+}
-+
-+static int zotac_deinit()
-+{
-+	pthread_cancel(repeat_thread);
-+	if (fd_hidraw != -1) {
-+		// Close device if it is open
-+		logprintf(LOG_INFO, "closing '%s'", hw.device);
-+		close(fd_hidraw);
-+		fd_hidraw = -1;
-+	}
-+	// Close pipe input
-+	if (fd_pipe[1] >= 0) {
-+		close(fd_pipe[1]);
-+		fd_pipe[1] = -1;
-+	}
-+	// Close pipe output
-+	if (fd_pipe[0] >= 0) {
-+		close(fd_pipe[0]);
-+		fd_pipe[0] = -1;
-+	}
-+	hw.fd = -1;
-+	return 1;
-+}
-+
-+/**
-+ *	Runtime that reads device, forwards codes to main thread
-+ *	and simulates repetitions.
-+ */
-+static void *zotac_repeat()
-+{
-+	int repeat_count = 0;
-+	unsigned current_code;
-+	int ret;
-+	int sel;
-+	fd_set files;
-+	struct timeval delay;
-+	int pressed = 0;
-+	int fd = fd_pipe[1];
-+
-+	while (1) {
-+		// Initialize set to monitor device's events
-+		FD_ZERO(&files);
-+		FD_SET(fd_hidraw, &files);
-+		if (pressed) {
-+			sel = select(FD_SETSIZE, &files, NULL, NULL, &delay);
-+		} else {
-+			sel = select(FD_SETSIZE, &files, NULL, NULL, NULL);
-+		}
-+
-+		switch (sel) {
-+		case 1:
-+			// Data ready in device's file
-+			ret = zotac_getcode();
-+
-+			if (ret < 0) {
-+				// Error
-+				logprintf(LOG_ERR, "(%s) Could not read %s", __FUNCTION__, hw.device);
-+				goto exit_loop;
-+			}
-+			if (ret == 1) {
-+				// Key code : forward it to main thread
-+				pressed = 1;
-+				repeat_count = 0;
-+				delay.tv_sec = 0;
-+				delay.tv_usec = repeat_time1_us;
-+				current_code = probe_code;
-+			} else if (ret == 2) {
-+				// Release code : stop repetitions
-+				pressed = 0;
-+				current_code = release_code;
-+			} else if (ret == 0) {
-+				continue;
-+			}
-+			break;
-+		case 0:
-+			repeat_count++;
-+			if (repeat_count >= max_repeat_count) {
-+				// Too many repetitions, something must have gone wrong
-+				logprintf(LOG_ERR,"(%s) too many repetitions", __FUNCTION__);
-+				goto exit_loop;
-+			}
-+			// Timeout : send current_code again to main
-+			//           thread to simulate repetition
-+			delay.tv_sec = 0;
-+			delay.tv_usec = repeat_time2_us;
-+			break;
-+		default:
-+			// Error
-+			logprintf(LOG_ERR, "(%s) select() failed", __FUNCTION__);
-+			goto exit_loop;
-+		}
-+		// Send code to main thread through pipe
-+		write(fd, &current_code, sizeof(current_code));
-+	}
-+exit_loop:
-+
-+	// Wake up main thread with special key code
-+	current_code = remove_code;
-+	write(fd, &current_code, sizeof(current_code));
-+	return NULL;
-+}
-+
-+/*
-+*  Aureal Technology ATWF@83 cheap remote
-+*  specific code.
-+*/
-+
-+static char *zotac_rec(struct ir_remote *remotes)
-+{
-+	unsigned ev;
-+	int rd;
-+	last = end;
-+	gettimeofday(&start, NULL);
-+	rd = read(hw.fd, &ev, sizeof(ev));
-+
-+	if (rd == -1) {
-+		// Error
-+		logprintf(LOG_ERR, "(%s) could not read pipe", __FUNCTION__);
-+		zotac_deinit();
-+		return 0;
-+	}
-+
-+	if (ev == release_code) {
-+		// Release code
-+		main_code = 0;
-+		return 0;
-+	} else if (ev == remove_code) {
-+		// Device has been removed
-+		zotac_deinit();
-+		return 0;
-+	}
-+
-+	LOGPRINTF(1, "zotac : %x", ev);
-+	// Record the code and check for repetition
-+	if (main_code == ev) {
-+		repeat_state = RPT_YES;
-+	} else {
-+		main_code = ev;
-+		repeat_state = RPT_NO;
-+	}
-+	gettimeofday(&end, NULL);
-+	return decode_all(remotes);
-+}
-diff -rupN base/remotes/zotac/lircd.conf.zotac mod/remotes/zotac/lircd.conf.zotac
---- base/remotes/zotac/lircd.conf.zotac	1970-01-01 01:00:00.000000000 +0100
-+++ mod/remotes/zotac/lircd.conf.zotac	2013-03-21 16:31:31.343367869 +0100
-@@ -0,0 +1,77 @@
-+
-+# Please make this file available to others
-+# by sending it to <lirc@bartelmus.de>
-+#
-+# this config file was automatically generated
-+# using lirc-0.9.1-git(zotac) on Mon Apr  2 14:10:29 2012
-+#
-+# contributed by 
-+#
-+# brand:                       zotac.conf
-+# model no. of remote control: 
-+# devices being controlled by this remote:
-+#
-+
-+begin remote
-+
-+  name  zotac.conf
-+  bits           32
-+  eps            30
-+  aeps          100
-+
-+  one             0     0
-+  zero            0     0
-+  gap          100123
-+  min_repeat      9
-+#  suppress_repeat 9
-+#  uncomment to suppress unwanted repeats
-+#  toggle_bit_mask 0x7004F
-+
-+      begin codes
-+          KEY_SLEEP                0x00010082
-+          KEY_WAKEUP               0x00010083
-+          KEY_RECORD               0x000C00B2
-+          KEY_PAUSE                0x000C00B1
-+          KEY_STOP                 0x000C00B7
-+          KEY_REWIND               0x000C00B4
-+          KEY_PLAY                 0x000C00B0
-+          KEY_FORWARD              0x000C00B3
-+          KEY_LEFTSHIFT            0x000C00B6
-+          KEY_RIGHTSHIFT           0x000C00B5
-+          KEY_BACK                 0x000C0224
-+          KEY_INFO                 0x000C0209
-+          KEY_MENU                 0xFFBC000D
-+          KEY_UP                   0x00070052
-+          KEY_LEFT                 0x00070050
-+          KEY_RIGHT                0x0007004F
-+          KEY_DOWN                 0x00070051
-+          KEY_OK                   0x00070028
-+          KEY_VOLUMEUP             0x000C00E9
-+          KEY_VOLUMEDOWN           0x000C00EA
-+          KEY_MUTE                 0x000C00E2
-+          KEY_CHANNELUP            0x000C009C
-+          KEY_CHANNELDOWN          0x000C009D
-+          KEY_1                    0x0007001E
-+          KEY_2                    0x0007001F
-+          KEY_3                    0x00070020
-+          KEY_4                    0x00070021
-+          KEY_5                    0x00070022
-+          KEY_6                    0x00070023
-+          KEY_7                    0x00070024
-+          KEY_8                    0x00070025
-+          KEY_9                    0x00070026
-+          KEY_0                    0x00070027
-+          KEY_NUMERIC_STAR         0x10070025
-+          KEY_NUMERIC_POUND        0x10070020
-+          KEY_CLEAR                0x00070029
-+          KEY_TEXT                 0xFFBC005A
-+          KEY_TITLE                0x000C008D
-+          KEY_ENTER                0x00070028
-+          KEY_RED                  0xFFBC005B
-+          KEY_GREEN                0xFFBC005C
-+          KEY_YELLOW               0xFFBC005D
-+          KEY_BLUE                 0xFFBC005E
-+      end codes
-+
-+end remote
-+
-diff -rupN base/setup.data mod/setup.data
---- base/setup.data	2011-03-25 23:28:18.000000000 +0100
-+++ mod/setup.data	2013-03-21 16:28:11.433935463 +0100
-@@ -146,6 +146,7 @@ hw_menu_entry: @hw-usb
- 	usb_uirt_raw: "USB-UIRT"
- 	mplay: "VLSystem MPlay Blast"
- 	mplay: "VLSystem MPlay Mini"
-+	zotac: "Zotac USB IR Receiver"
- 
- param_type: \
- 	act200l \
-@@ -260,7 +261,8 @@ param_type: \
- 	ttusbir \
- 	tvbox \
- 	udp \
--	wpc8769l
-+	wpc8769l \
-+	zotac
- 	none:
- 
- default_param: \
-@@ -331,7 +333,8 @@ default_param: \
- 	ttusbir \
- 	tvbox \
- 	udp \
--	wpc8769l
-+	wpc8769l \
-+	zotac
- 	none:
- 
- default_param: \
diff --git a/app-misc/lirc/files/lirc-0.9.0-atiusb_kfifo.patch b/app-misc/lirc/files/lirc-0.9.0-atiusb_kfifo.patch
deleted file mode 100644
index 32edb244b412..000000000000
--- a/app-misc/lirc/files/lirc-0.9.0-atiusb_kfifo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/drivers/lirc_atiusb/lirc_atiusb.c	2012-07-17 16:04:39.000000000 -0400
-+++ b/drivers/lirc_atiusb/lirc_atiusb.c	2012-07-17 16:19:06.000000000 -0400
-@@ -1050,7 +1050,11 @@
- 		goto new_irctl_failure_check;
- 	}
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38)
- 	if (lirc_buffer_init(driver->rbuf, dclen, 1)) {
-+#else
-+	if (lirc_buffer_init(driver->rbuf, dclen, 2)) {
-+#endif
- 		mem_failure = 4;
- 		goto new_irctl_failure_check;
- 	}
diff --git a/app-misc/lirc/files/lirc-0.9.0-fixed-font.patch b/app-misc/lirc/files/lirc-0.9.0-fixed-font.patch
deleted file mode 100644
index fd122e7362b6..000000000000
--- a/app-misc/lirc/files/lirc-0.9.0-fixed-font.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/tools/xmode2.c	2011-03-25 23:28:18.000000000 +0100
-+++ b/tools/xmode2.c	2012-07-29 19:36:34.972246587 +0200
-@@ -69,7 +69,7 @@
- Window w0, w1;			/*w0 = root */
- char w1_wname[] = "xmode2";
- char w1_iname[] = "xmode2";
--char font1_name[] = "-*-Courier-medium-r-*-*-8-*-*-m-*-iso8859-1";
-+char font1_name[] = "fixed";
- 
- int w1_x = 0, w1_y = 0;
- unsigned int w1_w = 640, w1_h = 480, w1_border = 0;
-@@ -201,7 +201,7 @@
- 		printf("coudn't allocate blue color\n");
- 	f1_str = XLoadQueryFont(d1, font1_name);
- 	if (f1_str == NULL) {
--		printf("could't load font\n");
-+		printf("couldn't load font\n");
- 		exit(EXIT_FAILURE);
- 	}
- 
diff --git a/app-misc/lirc/files/lirc-0.9.0-kernel-2.6.39-fixes.patch b/app-misc/lirc/files/lirc-0.9.0-kernel-2.6.39-fixes.patch
deleted file mode 100644
index 624737090bbe..000000000000
--- a/app-misc/lirc/files/lirc-0.9.0-kernel-2.6.39-fixes.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -u a/drivers/lirc_atiusb/lirc_atiusb.c b/drivers/lirc_atiusb/lirc_atiusb.c
---- a/drivers/lirc_atiusb/lirc_atiusb.c
-+++ b/drivers/lirc_atiusb/lirc_atiusb.c
-@@ -48,7 +48,9 @@
- #include <linux/slab.h>
- #include <linux/module.h>
- #include <linux/kmod.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
- #include <linux/smp_lock.h>
-+#endif
- #include <linux/completion.h>
- #include <linux/uaccess.h>
- #include <linux/usb.h>
-diff -u a/drivers/lirc_i2c/lirc_i2c.c b/drivers/lirc_i2c/lirc_i2c.c
---- a/drivers/lirc_i2c/lirc_i2c.c
-+++ b/drivers/lirc_i2c/lirc_i2c.c
-@@ -555,8 +555,8 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
- 		kfree(ir);
- 		return -EINVAL;
- 	}
--	printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n",
--	       adap->id, addr, ir->c.name);
-+	printk(KERN_INFO "lirc_i2c: chip found @ 0x%02x (%s)\n",
-+	       addr, ir->c.name);
- 
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
- 	/* register device */
-diff -u a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
---- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-+++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-@@ -361,14 +361,22 @@ static irqreturn_t irq_handler(int irqno, void *blah, struct pt_regs *regs)
- 		size = count << 3;
- 
- 		ldata = (unsigned long *) data_buf;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
- 		next_one = generic_find_next_le_bit(ldata, size, 0);
-+#else
-+		next_one = find_next_zero_bit_le(ldata, size, 0);
-+#endif
- 
- 		if (next_one > 0)
- 			put_pulse_bit(next_one
- 				* WPC8769L_USECS_PER_BIT);
- 
- 		while (next_one < size) {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
- 			next_zero = generic_find_next_zero_le_bit(ldata,
-+#else
-+			next_zero = find_next_zero_bit_le(ldata,
-+#endif
- 				size, next_one + 1);
- 
- 			put_space_bit(
-@@ -376,7 +384,11 @@ static irqreturn_t irq_handler(int irqno, void *blah, struct pt_regs *regs)
- 				* WPC8769L_USECS_PER_BIT);
- 
- 			if (next_zero < size) {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
- 				next_one = generic_find_next_le_bit(ldata,
-+#else
-+				next_one = find_next_bit_le(ldata,
-+#endif
- 					size, next_zero + 1);
- 
- 				put_pulse_bit(
--- 
-1.7.5.4
diff --git a/app-misc/lirc/files/lirc-0.9.0-kernel-3.3.0-fixes.patch b/app-misc/lirc/files/lirc-0.9.0-kernel-3.3.0-fixes.patch
deleted file mode 100644
index 9b7d3ef1f539..000000000000
--- a/app-misc/lirc/files/lirc-0.9.0-kernel-3.3.0-fixes.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ur drivers/lirc_serial/lirc_serial.c drivers.new/lirc_serial/lirc_serial.c
---- drivers/lirc_serial/lirc_serial.c	2011-03-25 18:28:18.000000000 -0400
-+++ drivers.new/lirc_serial/lirc_serial.c	2012-10-24 14:32:14.000000000 -0400
-@@ -66,7 +66,12 @@
- #include <linux/poll.h>
- #include <linux/platform_device.h>
- 
-+#include "drivers/kcompat.h"
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(3, 3, 0)
-+#include <asm/switch_to.h>
-+#else
- #include <asm/system.h>
-+#endif
- #include <linux/io.h>
- #include <linux/irq.h>
- #include <linux/fcntl.h>
-@@ -80,7 +85,6 @@
- #define UART_IE_IXP42X_UUE   0x40 /* IXP42X UART Unit enable */
- #define UART_IE_IXP42X_RTOIE 0x10 /* IXP42X Receiver Data Timeout int.enable */
- 
--#include "drivers/kcompat.h"
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)
- #include <media/lirc.h>
- #include <media/lirc_dev.h>
-diff -ur drivers/lirc_sir/lirc_sir.c drivers.new/lirc_sir/lirc_sir.c
---- drivers/lirc_sir/lirc_sir.c	2011-03-25 18:28:18.000000000 -0400
-+++ drivers.new/lirc_sir/lirc_sir.c	2012-10-24 14:32:46.000000000 -0400
-@@ -59,7 +59,14 @@
- #include <linux/mm.h>
- #include <linux/delay.h>
- #include <linux/poll.h>
-+
-+#include "drivers/kcompat.h"
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(3, 3, 0)
-+#include <asm/switch_to.h>
-+#else
- #include <asm/system.h>
-+#endif
-+
- #include <linux/io.h>
- #include <asm/irq.h>
- #include <linux/fcntl.h>
-@@ -74,7 +81,6 @@
- 
- #include <linux/timer.h>
- 
--#include "drivers/kcompat.h"
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)
- #include <media/lirc.h>
- #include <media/lirc_dev.h>
diff --git a/app-misc/lirc/files/lirc-0.9.0-kernel-3.5-err-fix.patch b/app-misc/lirc/files/lirc-0.9.0-kernel-3.5-err-fix.patch
deleted file mode 100644
index b06d94efb322..000000000000
--- a/app-misc/lirc/files/lirc-0.9.0-kernel-3.5-err-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/drivers/kcompat.h	2011-03-25 18:28:18.000000000 -0400
-+++ b/drivers/kcompat.h	2012-11-27 13:37:55.000000000 -0500
-@@ -136,4 +136,9 @@
- )
- #endif
- 
-+#ifndef err
-+#define err(format, arg...)                                     \
-+	printk(KERN_ERR KBUILD_MODNAME ": " format "\n", ##arg)
-+#endif
-+
- #endif /* _KCOMPAT_H */
diff --git a/app-misc/lirc/files/lirc-0.9.0-kernel-3.8-fixes.patch b/app-misc/lirc/files/lirc-0.9.0-kernel-3.8-fixes.patch
deleted file mode 100644
index bd11b61c19d8..000000000000
--- a/app-misc/lirc/files/lirc-0.9.0-kernel-3.8-fixes.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -Naur lirc-0.9.0/drivers/lirc_serial/lirc_serial.c lirc-0.9.0.new/drivers/lirc_serial/lirc_serial.c
---- lirc-0.9.0/drivers/lirc_serial/lirc_serial.c	2013-05-24 11:58:31.017566567 -0400
-+++ lirc-0.9.0.new/drivers/lirc_serial/lirc_serial.c	2013-05-24 12:00:38.733568898 -0400
-@@ -1107,12 +1107,12 @@
- 
- static struct platform_device *lirc_serial_dev;
- 
--static int __devinit lirc_serial_probe(struct platform_device *dev)
-+static int lirc_serial_probe(struct platform_device *dev) 
- {
- 	return 0;
- }
- 
--static int __devexit lirc_serial_remove(struct platform_device *dev)
-+static int lirc_serial_remove(struct platform_device *dev) 
- {
- 	return 0;
- }
-@@ -1163,7 +1163,7 @@
- 
- static struct platform_driver lirc_serial_driver = {
- 	.probe		= lirc_serial_probe,
--	.remove		= __devexit_p(lirc_serial_remove),
-+	.remove      = lirc_serial_remove, 
- 	.suspend	= lirc_serial_suspend,
- 	.resume		= lirc_serial_resume,
- 	.driver		= {
-diff -Naur lirc-0.9.0/drivers/lirc_sir/lirc_sir.c lirc-0.9.0.new/drivers/lirc_sir/lirc_sir.c
---- lirc-0.9.0/drivers/lirc_sir/lirc_sir.c	2013-05-24 11:58:31.017566567 -0400
-+++ lirc-0.9.0.new/drivers/lirc_sir/lirc_sir.c	2013-05-24 12:00:38.733568898 -0400
-@@ -1296,19 +1296,19 @@
- 	return 0;
- }
- 
--static int __devinit lirc_sir_probe(struct platform_device *dev)
-+static int lirc_sir_probe(struct platform_device *dev) 
- {
- 	return 0;
- }
- 
--static int __devexit lirc_sir_remove(struct platform_device *dev)
-+static int lirc_sir_remove(struct platform_device *dev) 
- {
- 	return 0;
- }
- 
- static struct platform_driver lirc_sir_driver = {
- 	.probe		= lirc_sir_probe,
--	.remove		= __devexit_p(lirc_sir_remove),
-+	.remove      = lirc_sir_remove, 
- 	.driver		=	{
- 		.name	= "lirc_sir",
- 		.owner	= THIS_MODULE,
-diff -Naur lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0.new/drivers/lirc_wpc8769l/lirc_wpc8769l.c
---- lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c	2013-05-24 11:58:30.974566567 -0400
-+++ lirc-0.9.0.new/drivers/lirc_wpc8769l/lirc_wpc8769l.c	2013-05-24 12:00:38.734568898 -0400
-@@ -942,12 +942,12 @@
- #ifdef MODULE
- static struct platform_device *lirc_wpc8769l_platform_dev;
- 
--static int __devinit lirc_wpc8769l_probe(struct platform_device *dev)
-+static int lirc_wpc8769l_probe(struct platform_device *dev) 
- {
- 	return 0;
- }
- 
--static int __devexit lirc_wpc8769l_remove(struct platform_device *dev)
-+static int lirc_wpc8769l_remove(struct platform_device *dev) 
- {
- 	return 0;
- }
-@@ -975,7 +975,7 @@
- 
- static struct platform_driver lirc_wpc8769l_platform_driver = {
- 	.probe		= lirc_wpc8769l_probe,
--	.remove		= __devexit_p(lirc_wpc8769l_remove),
-+	.remove      = lirc_wpc8769l_remove, 
- 	.suspend	= lirc_wpc8769l_suspend,
- 	.resume		= lirc_wpc8769l_resume,
- 	.driver		= {
diff --git a/app-misc/lirc/files/lirc.service b/app-misc/lirc/files/lirc.service
deleted file mode 100644
index e184dfc09d44..000000000000
--- a/app-misc/lirc/files/lirc.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Linux Infrared Remote Control
-After=network.target
-
-[Service]
-RuntimeDirectory=lirc
-ExecStart=/usr/sbin/lircd --nodaemon --driver=default --device=/dev/lirc0
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/app-misc/lirc/files/lircm.service b/app-misc/lirc/files/lircm.service
deleted file mode 100644
index cfd2c93caf6a..000000000000
--- a/app-misc/lirc/files/lircm.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=LIRC Mouse
-Requires=lirc.service
-After=network.target lirc.service
-
-[Service]
-ExecStart=/usr/sbin/lircmd --nodaemon
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/app-misc/lirc/files/lircmd b/app-misc/lirc/files/lircmd
deleted file mode 100644
index e979f74413fc..000000000000
--- a/app-misc/lirc/files/lircmd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need lircd
-}
-
-start() {
-	ebegin "Starting lircmd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/lircmd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping lircmd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/lircmd
-	eend $?
-}
diff --git a/app-misc/lirc/lirc-0.10.1.ebuild b/app-misc/lirc/lirc-0.10.1.ebuild
index ee28e97e8f99..cb93b634743b 100644
--- a/app-misc/lirc/lirc-0.10.1.ebuild
+++ b/app-misc/lirc/lirc-0.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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/lirc/lirc-0.9.0-r6.ebuild b/app-misc/lirc/lirc-0.9.0-r6.ebuild
deleted file mode 100644
index 8672858485e8..000000000000
--- a/app-misc/lirc/lirc-0.9.0-r6.ebuild
+++ /dev/null
@@ -1,428 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils linux-mod linux-info systemd toolchain-funcs flag-o-matic autotools
-
-DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
-HOMEPAGE="http://www.lirc.org/"
-
-MY_P=${PN}-${PV/_/}
-
-if [[ "${PV/_pre/}" = "${PV}" ]]; then
-	SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
-else
-	SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="debug doc hardware-carrier transmitter static-libs X"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libICE
-	)
-	lirc_devices_alsa_usb? ( media-libs/alsa-lib )
-	lirc_devices_audio? ( >media-libs/portaudio-18 )
-	lirc_devices_irman? ( media-libs/libirman )"
-
-# 2012-07-17, Ian Stakenvicius
-# A helper script that scrapes out values for nearly all of the variables below
-# from lirc's configure.ac is available at
-# https://dev.gentoo.org/~axs/helper-for-lirc-iuse.sh
-
-# This are drivers with names matching the
-# parameter --with-driver=NAME
-IUSE_LIRC_DEVICES_DIRECT="
-	all userspace accent act200l act220l
-	adaptec alsa_usb animax asusdh atilibusb
-	atiusb audio audio_alsa avermedia avermedia_vdomate
-	avermedia98 awlibusb bestbuy bestbuy2 breakoutbox
-	bte bw6130 caraca chronos commandir
-	cph06x creative creative_infracd
-	devinput digimatrix dsp dvico ea65 ene0100
-	exaudio flyvideo ftdi gvbctv5pci hauppauge
-	hauppauge_dvb hercules_smarttv_stereo i2cuser
-	igorplugusb iguanaIR imon imon_24g imon_knob
-	imon_lcd imon_pad imon_rsc irdeo irdeo_remote
-	irlink irman irreal it87 ite8709
-	knc_one kworld leadtek_0007 leadtek_0010
-	leadtek_pvr2000 livedrive_midi
-	livedrive_seq logitech macmini
-	mediafocusI mouseremote
-	mouseremote_ps2 mp3anywhere mplay nslu2
-	packard_bell parallel pcmak pcmak_usb
-	pctv pixelview_bt878 pixelview_pak
-	pixelview_pro provideo realmagic
-	remotemaster sa1100 samsung sasem sb0540 serial
-	silitek sir slinke streamzap tekram
-	tekram_bt829 tira ttusbir tuxbox tvbox udp uirt2
-	uirt2_raw usb_uirt_raw usbx wpc8769l zotac"
-
-# drivers that need special handling and
-# must have another name specified for
-# parameter --with-driver=NAME
-IUSE_LIRC_DEVICES_SPECIAL="
-	serial_igor_cesko
-	remote_wonder_plus xboxusb inputlirc"
-
-IUSE_LIRC_DEVICES="${IUSE_LIRC_DEVICES_DIRECT} ${IUSE_LIRC_DEVICES_SPECIAL}"
-
-# The following are lists which are used to provide ewarns on incompatibilities
-# with the kernel:
-
-#drivers that do not build kernel modules
-NO_KMOD_BUILT_FOR_DEV="
-	accent bte creative creative_infracd devinput dsp ea65 exaudio
-	ftdi i2cuser irlink irreal livedrive_midi livedrive_seq logitech
-	mediafocusI mouseremote mouseremote_ps2 mp3anywhere mplay mplay2
-	pcmak pcmak_usb pctv realmagic remotemaster silitek tira tira_raw
-	tuxbox udp uirt2 uirt2_raw usb_uirt_raw usbx"
-
-#drivers that build lirc_dev and so will conflict with kernel lirc_dev
-LIRCDEV_BUILT_FOR_DEV="all
-	act200l act220l adaptec animax atiusb breakoutbox hauppauge
-	hauppauge_dvb hercules_smarttv_stereo igorplugusb imon imon_24g
-	imon_knob imon_lcd imon_pad imon_rsc irdeo irdeo_remote knc_one
-	leadtek_pvr2000 nslu2 packard_bell parallel pixelview_bt878
-	provideo sa1100 sasem serial sir tekram tekram_bt829 ttusbir
-	tvbox wpc8769l zotac"
-
-#lirc_gpio drivers, which cannot be supported on kernel >= 2.6.22
-LIRC_GPIO_DEV="
-	avermedia avermedia98 avermedia_vdomate bestbuy bestbuy2 chronos
-	cph03x cph06x flyvideo gvbctv5pci kworld leadtek_0007 leadtek_0010
-	pixelview_pak pixelview_pro"
-
-#device-driver which use libusb
-LIBUSB_USED_BY_DEV="
-	all atilibusb awlibusb sasem igorplugusb imon imon_lcd imon_pad
-	imon_rsc streamzap xboxusb irlink commandir"
-
-for dev in ${LIBUSB_USED_BY_DEV}; do
-	DEPEND="${DEPEND} lirc_devices_${dev}? ( virtual/libusb:0 )"
-done
-
-# adding only compile-time depends
-DEPEND="${RDEPEND} ${DEPEND}
-	virtual/linux-sources
-	lirc_devices_ftdi? ( dev-embedded/libftdi:0 )
-	lirc_devices_all? ( dev-embedded/libftdi:0 )"
-
-# adding only run-time depends
-RDEPEND="${RDEPEND}
-	lirc_devices_inputlirc? ( app-misc/inputlircd )
-	lirc_devices_iguanaIR? ( app-misc/iguanaIR )"
-
-# add all devices to IUSE
-# and ensure lirc_devices_all is not set alongside lirc_devices_*
-REQUIRED_USE="lirc_devices_all? ("
-for dev in ${IUSE_LIRC_DEVICES}; do
-	IUSE="${IUSE} lirc_devices_${dev}"
-	if [[ "${dev}" != "all" ]]; then
-		REQUIRED_USE="${REQUIRED_USE} !lirc_devices_${dev}"
-	fi
-done
-REQUIRED_USE="${REQUIRED_USE} )"
-
-add_device() {
-	local dev="${1}"
-	local desc="device ${dev}"
-	if [[ -n "${2}" ]]; then
-		desc="${2}"
-	fi
-
-	# Bug #187418
-	if kernel_is ge 2 6 22 && [[ " ${LIRC_GPIO_DEV} " == *" ${dev} "* ]]; then
-		eerror "${desc} uses lirc_gpio which fails with kernel 2.6.22 or above.  Not building."
-		eerror "Use 'devinput' instead, or use 'userspace' along with in-kernel drivers"
-		return 0
-	fi
-	: ${lirc_device_count:=0}
-	((lirc_device_count++))
-
-	elog "Compiling support for ${desc}"
-
-	if [[ " ${LIRCDEV_BUILT_FOR_DEV} " == *" ${dev} "* ]] ; then
-		if linux_chkconfig_present LIRC ; then
-			ewarn "${desc} builds lirc_dev and CONFIG_LIRC is set in the kernel -- this may conflict."
-		fi
-		if ! linux_chkconfig_present MODULE_UNLOAD ; then
-			ewarn "${desc} builds modules and CONFIG_MODULE_UNLOAD is unset in kernel."
-			ewarn "You will need MODULE_UNLOAD support in your kernel."
-		fi
-	fi
-	if [[ " ${NO_KMOD_BUILT_FOR_DEV} " == *" ${dev} "* ]] && ! linux_chkconfig_present IR_LIRC_CODEC ; then
-		ewarn "${desc} builds no kernel module and CONFIG_IR_LIRC_CODEC is unset in kernel."
-	fi
-
-	if [[ ${lirc_device_count} -eq 2 ]] ; then
-		ewarn
-		ewarn "LIRC_DEVICES has more than one entry."
-		ewarn "When selecting multiple devices for lirc to be supported,"
-		ewarn "it can not be guaranteed that the drivers play nice together."
-		ewarn "If this is not intended, then please adjust LIRC_DEVICES"
-		ewarn "and re-emerge."
-		ewarn
-	fi
-
-	MY_OPTS="${MY_OPTS} --with-driver=${dev}"
-}
-
-pkg_pretend() {
-	if [[ -n "${LIRC_OPTS}" ]] ; then
-		ewarn
-		ewarn "LIRC_OPTS is deprecated from lirc-0.8.0-r1 on."
-		ewarn
-		ewarn "Please use LIRC_DEVICES from now on."
-		ewarn "e.g. LIRC_DEVICES=\"serial sir\""
-		ewarn
-		ewarn "Flags are now set per use-flags."
-		ewarn "e.g. transmitter, hardware-carrier"
-
-		local opt
-		local unsupported_opts=""
-
-		# test for allowed options for LIRC_OPTS
-		for opt in ${LIRC_OPTS}; do
-			case ${opt} in
-				--with-port=*|--with-irq=*|--with-timer=*|--with-tty=*)
-					MY_OPTS="${MY_OPTS} ${opt}"
-					;;
-				*)
-					unsupported_opts="${unsupported_opts} ${opt}"
-					;;
-			esac
-		done
-		if [[ -n ${unsupported_opts} ]]; then
-			eerror "These options are no longer allowed to be set"
-			eerror "with LIRC_OPTS: ${unsupported_opts}"
-			die "LIRC_OPTS is no longer supported, use LIRC_DEVICES."
-		fi
-	fi
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	# set default configure options
-	MY_OPTS=""
-	LIRC_DRIVER_DEVICE="/dev/lirc0"
-
-	if use lirc_devices_all; then
-		# compile in drivers for a lot of devices
-		add_device all "a lot of devices"
-	else
-		# compile in only requested drivers
-		local dev
-		for dev in ${IUSE_LIRC_DEVICES_DIRECT}; do
-			if use lirc_devices_${dev}; then
-				add_device ${dev}
-			fi
-		done
-
-		if use lirc_devices_remote_wonder_plus; then
-			add_device atiusb "device Remote Wonder Plus (atiusb-based)"
-		fi
-
-		if use lirc_devices_serial_igor_cesko; then
-			add_device serial "serial with Igor Cesko design"
-			MY_OPTS="${MY_OPTS} --with-igor"
-		fi
-
-		if use lirc_devices_imon_pad; then
-			ewarn "The imon_pad driver has incorporated the previous pad2keys patch"
-			ewarn "and removed the pad2keys_active option for the lirc_imon module"
-			ewarn "because it is always active."
-			ewarn "If you have an older imon VFD device, you may need to add the module"
-			ewarn "option display_type=1 to override autodetection and force VFD mode."
-		fi
-
-		if use lirc_devices_xboxusb; then
-			add_device atiusb "device xboxusb"
-		fi
-
-		if [[ "${MY_OPTS}" == "" ]]; then
-			if [[ "${PROFILE_ARCH}" == "xbox" ]]; then
-				# on xbox: use special driver
-				add_device atiusb "device xboxusb"
-			else
-				# no driver requested
-				elog
-				elog "Compiling only the lirc-applications, but no drivers."
-				elog "Enable drivers with LIRC_DEVICES if you need them."
-				MY_OPTS="--with-driver=none"
-			fi
-		fi
-	fi
-
-	use hardware-carrier && MY_OPTS="${MY_OPTS} --without-soft-carrier"
-	use transmitter && MY_OPTS="${MY_OPTS} --with-transmitter"
-
-	einfo
-	einfo "lirc-configure-opts: ${MY_OPTS}"
-	elog  "Setting default lirc-device to ${LIRC_DRIVER_DEVICE}"
-
-	filter-flags -Wl,-O1
-}
-
-src_prepare() {
-	# Rip out dos CRLF
-	edos2unix contrib/lirc.rules
-
-	# Apply patches needed for some special device-types
-	use lirc_devices_audio || epatch "${FILESDIR}"/lirc-0.8.4-portaudio_check.patch
-	use lirc_devices_remote_wonder_plus && epatch "${FILESDIR}"/lirc-0.8.3_pre1-remotewonderplus.patch
-
-	# Apply fixes for kernel-2.6.39 and above
-	epatch "${FILESDIR}"/${P}-kernel-2.6.39-fixes.patch
-	# Slightly massaged upstream patch to fix kfifo issues >=2.6.38
-	# for bug 377033
-	epatch "${FILESDIR}"/${P}-atiusb_kfifo.patch
-	# Apply fixes for kernel-3.3 and above (bug 439538)
-	epatch "${FILESDIR}"/${P}-kernel-3.3.0-fixes.patch
-	# Apply fix for missing err() in usb.h for kernel 3.5+ (bug 444736)
-	epatch "${FILESDIR}"/${P}-kernel-3.5-err-fix.patch
-	# Apply fix for missing __devinit __devexit defines in kernel 3.8+ (bug 461532)
-	epatch "${FILESDIR}"/${P}-kernel-3.8-fixes.patch
-	# Add support for zotac remote, bug 342848
-	epatch "${FILESDIR}"/${P}-add-zotac-support.patch
-	# Use fixed font
-	epatch "${FILESDIR}"/${P}-fixed-font.patch
-
-	# Do not build drivers from the top-level Makefile
-	sed -i -e 's:\(SUBDIRS =\) drivers\(.*\):\1\2:' Makefile.am
-
-	# remove parallel driver on SMP systems
-	if linux_chkconfig_present SMP ; then
-		sed -i -e "s:lirc_parallel\.o::" drivers/lirc_parallel/Makefile.am
-	fi
-
-	# Bug #187418 - only need this part for lirc_devices_all as others die in pkg_setup
-	if use lirc_devices_all && kernel_is ge 2 6 22 ; then
-		ewarn "Disabling lirc_gpio driver as it does no longer work Kernel 2.6.22+"
-		sed -i -e "s:lirc_gpio\.o::" drivers/lirc_gpio/Makefile.am
-	fi
-
-	# respect CFLAGS
-	sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.ac
-
-	# setting default device-node
-	local f
-	for f in configure.ac acconfig.h; do
-		[[ -f "$f" ]] && sed -i -e '/#define LIRC_DRIVER_DEVICE/d' "$f"
-	done
-	echo "#define LIRC_DRIVER_DEVICE \"${LIRC_DRIVER_DEVICE}\"" >> acconfig.h
-
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die # automake 1.13
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-syslog=LOG_DAEMON \
-		--enable-sandboxed \
-		--with-kerneldir="${KV_DIR}" \
-		--with-moduledir="/lib/modules/${KV_FULL}/misc" \
-		$(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_with X x) \
-		${MY_OPTS} \
-		ABI="${KERNEL_ABI}" \
-		ARCH="$(tc-arch-kernel)"
-}
-
-src_compile() {
-	# force non-parallel make, Bug 196134 (confirmed valid for 0.9.0-r2)
-	emake -j1
-
-	MODULE_NAMES="lirc(misc:${S}/drivers)"
-	BUILD_TARGETS="all"
-	linux-mod_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake -C drivers DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
-	newinitd "${FILESDIR}"/lircmd lircmd
-	newconfd "${FILESDIR}"/lircd.conf.4 lircd
-
-	insinto /etc/modprobe.d/
-	newins "${FILESDIR}"/modprobed.lirc lirc.conf
-
-	newinitd "${FILESDIR}"/irexec-initd-0.8.6-r2 irexec
-	newconfd "${FILESDIR}"/irexec-confd irexec
-
-	systemd_dounit "${FILESDIR}"/irexec.service
-	systemd_dounit "${FILESDIR}"/lirc.service
-	systemd_dounit "${FILESDIR}"/lircm.service
-
-	if use doc ; then
-		dohtml doc/html/*.html
-		insinto /usr/share/doc/${PF}/images
-		doins doc/images/*
-	fi
-
-	insinto /usr/share/lirc/remotes
-	doins -r remotes/*
-
-	keepdir /etc/lirc
-	if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then
-		newdoc "${D}"/etc/lirc/lircd.conf lircd.conf.example
-	fi
-
-	use static-libs || rm "${D}/usr/$(get_libdir)/liblirc_client.la"
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-
-	local dir="${EROOT}/etc/modprobe.d"
-	if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
-		elog "Renaming ${dir}/lirc to lirc.conf"
-		mv -f "${dir}/lirc" "${dir}/lirc.conf"
-	fi
-
-	# copy the first file that can be found
-	if [[ -f "${EROOT}"/etc/lirc/lircd.conf ]]; then
-		cp "${EROOT}"/etc/lirc/lircd.conf "${T}"/lircd.conf
-	elif [[ -f "${EROOT}"/etc/lircd.conf ]]; then
-		cp "${EROOT}"/etc/lircd.conf "${T}"/lircd.conf
-		MOVE_OLD_LIRCD_CONF=1
-	elif [[ -f "${D}"/etc/lirc/lircd.conf ]]; then
-		cp "${D}"/etc/lirc/lircd.conf "${T}"/lircd.conf
-	fi
-
-	# stop portage from touching the config file
-	if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then
-		rm -f "${D}"/etc/lirc/lircd.conf
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# copy config file to new location
-	# without portage knowing about it
-	# so it will not delete it on unmerge or ever touch it again
-	if [[ -e "${T}"/lircd.conf ]]; then
-		cp "${T}"/lircd.conf "${EROOT}"/etc/lirc/lircd.conf
-		if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
-			elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
-			rm -f "${EROOT}"/etc/lircd.conf
-		fi
-	fi
-
-	einfo "The new default location for lircd.conf is inside of"
-	einfo "/etc/lirc/ directory"
-}
diff --git a/app-misc/lirc/metadata.xml b/app-misc/lirc/metadata.xml
index 3a8d3814118e..98b33f1b6a8d 100644
--- a/app-misc/lirc/metadata.xml
+++ b/app-misc/lirc/metadata.xml
@@ -8,8 +8,6 @@
     <use>
         <flag name="uinput">Enable support for uinput</flag>
         <flag name="devinput">Support the devinput input device</flag>
-        <flag name="hardware-carrier">The transmitter device generates its clock signal in hardware</flag>
-        <flag name="transmitter">Add transmitter support to some lirc-drivers (e.g. serial)</flag>
         <flag name="inputlirc">Add a dependency on app-misc/inputlircd</flag>
         <flag name="audio">Support using an audio device connected to an IR receiver</flag>
         <flag name="ftdi">Support FTDI devices</flag>
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index b66100fde2a3..550b62b3178c 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,11 +1,10 @@
 AUX mosquitto 559 BLAKE2B 16a34850c13d9fd6007b5fbd26b4db9e31caa0ee91b8eee8dbca605c273756bf6c92458d5093eee56f603cce7f10956ee084403e188d49693a759538976f411f SHA512 0bb0e648484269c2a5396118340177af10fae9ccbe4973371f7c8f5e31c96ff97c5146680415c450bad63397baa5c076e7c994f897fd3af2fcce0d1e0965ee22
 AUX mosquitto-1.4.10-conditional-tests.patch 1142 BLAKE2B 66be5988681be543a1c9d61bbd47baa528be1d8d8b1206e7d711b0d7789aba41ae8bd28e2729d084c6bb64fc43386e31a426717b0719c5c26219d3fa0a166455 SHA512 d07a081830fe7d23db380033c0c68d366bf60652f86c43a39074faa9bbcc6286485aad225226b64ef3055b4bd7a6c6969fa9ddd97eb2e6d8d98e815a881e634c
-AUX mosquitto-1.4.15-conditional-tests.patch 371 BLAKE2B 4e96752a6ef489a6dec24cb02381f11ec38f3440c13f99ee2adee2aa7995b591c341ff050793960d81e73849147e809f9cd98a29c035038ed1f3b2047bd7431f SHA512 a970740b0cabd34f2532fbd27037546c125337943b848c4489ed44c3e3408e802d223b6f2c8a0144c43ccf5d7ae1270f0c4bb23833827492994d7bfe569639de
+AUX mosquitto-1.5-fix-socket_get_address.patch 1024 BLAKE2B 72cda074a2e609f4e67b22c8f40ca924814ab8b5053afc5860b132ecae0929f0d721aff7b8db0095abc23fd506a1a47b2398ea16cf21b5bada3d1e1b6c24ad35 SHA512 1e8828232ff795aab47c22f0d2bf380d71c0962acb2aa7f421c3618dc9476fc2ff58ddf9b3add33fd59f878d0456bbe0682428552cec1129e2b9a45431c33205
+AUX mosquitto-fix-conditional-tests.patch 371 BLAKE2B 4e96752a6ef489a6dec24cb02381f11ec38f3440c13f99ee2adee2aa7995b591c341ff050793960d81e73849147e809f9cd98a29c035038ed1f3b2047bd7431f SHA512 a970740b0cabd34f2532fbd27037546c125337943b848c4489ed44c3e3408e802d223b6f2c8a0144c43ccf5d7ae1270f0c4bb23833827492994d7bfe569639de
 AUX mosquitto.service 261 BLAKE2B 6ea8059914acf8730f2e7d04bfd5f79c59a335b65ddecb4773bb4418260c6ed6d0120eaa2e3f7ba4842fc7014e5b51d1ba376cf1db2009b7a55a53a4e6747221 SHA512 3552618733fc106705375c5a1126db72e356694705312072f27f18e21c142cd75ae3ff1f17854ce54cdee092ff9e01fd75c1a8a12d68f75ead8a3697c69623e9
 DIST mosquitto-1.4.14.tar.gz 365596 BLAKE2B 92bcb1fd9e67711d6ce8db5e767be31a1321866205cf4cad684d8b77a8b14a2eaf5e4367a74d5dd8f814f0d229dc77ce878879632c0c34c6a23f7975bf6ae8c7 SHA512 dc75a971354f87deeb79f32435acfae9bc561a1a24a75ee4940a35176ff91758071930d2105d8dee2a090e07527dbfaa5692bece67e03cc87e8b4b8b46f846c2
-DIST mosquitto-1.4.15.tar.gz 368961 BLAKE2B 28bfab7d41d9e057ba8b52e0c428967ecc5d0c25a3d73dca420ae883c2b462ee02da1eeb9c22f4d392f0ccf62224acab6f24d4a0798a594f4b9f90c907fa1495 SHA512 36b06547553cf28af3ca9b728c42fc27e849c4ae84d7964572d430233ab26e2b59eee2a215ac23ddf2d0bef419e7c70e64e2a22c397fadb3e0677314d03f1100
-EBUILD mosquitto-1.4.14-r1.ebuild 2462 BLAKE2B e747f7751b56d1f93a460985e19555fd7fdb1bf08540eec7ab2107ad8165797de2363f0383eeaab4b2bc5011d830022f63ec5baf73804a1f0492c03a7632de3b SHA512 59f100a47c98636c82f4ca5b4d2edb0c1e6399ef25d95dd62f576f9694b11fef32d01dc58c63d69d5aa4bd119dd467199f3d49d19760be9b8220ff7420749c0c
+DIST mosquitto-1.5.tar.gz 419614 BLAKE2B d405e1e4f967f1030229a2e64793b84a3c8dc356a3b8d95a9bfc50a623cdb79517bbcfda87275f23c44002f3a41a20db58fed5a33d2c7d63da95e0d6d15951bb SHA512 29b82bc0c6510fa5062cb43c06bd91ce5223be5689cba077df8b2cb5ac377cb125b8a8bb292b53bcec0d4b186977c25c3ecdd8c92d4ed996fde07f8c759c0668
 EBUILD mosquitto-1.4.14.ebuild 2453 BLAKE2B e8785e9f2dcd4d8d1a627dff29a895b0ff1f149b0a63454371b31ff241a42e7bbb7288c7a5becf3175cafe29c4da11e5fd656f8bb311cb892909929e62e93034 SHA512 a7ce7e5f393cf6508415c044a51518891f7a953ecdaa680f952cfbfdb8905561a017b0a7dad5281d9fee41c909331b26712c0466a33e345a232d538ffafb2a7f
-EBUILD mosquitto-1.4.15-r2.ebuild 2463 BLAKE2B 3e6c1a3ab075a62675e3f9158a665f65238c8a35c72bd7e1a4b5517f756907e5769bc4ea46b6f5c1cff2a74f3983caa3945fb6a0df3203d76ae182764d43f9ec SHA512 6cc77d34fd71a288db14c8f2b74ead1602953d8c5c96fba9c6b742fa74ec0c356ded19ff0d0d6436c1f7c8b8bf42c239568c8ed7c59fbf07b2e525dcc47c2b49
-EBUILD mosquitto-1.4.15.ebuild 2366 BLAKE2B 6df167983ebe736631cc55fb47b9487bd456928e17d149653e7f5ec333ab874f41e4371ee882ee16a984fc055146ddb1fe7727ff71f5917fd1e3c0dd50db76f4 SHA512 609584b242bbabca2214fa6027f948ce6c237fe9e6be43acb38625abdf83e5c898c9158244612b5a4201a18e99b0fd78b987b71d54dbbf6a0a62f4a60ce4bb5c
-MISC metadata.xml 656 BLAKE2B 58ecef974e662c6dccf267ba8732116010a3db7679d6ee3e163cd351073a210f0bb06e5098945564f048353caf4ed7fe73d69bc96cce42c56ba298073fe95384 SHA512 2034ecb6ff73024cd905d275da23b27568d897dd616ca70a2485922667a74d4ac1d6df11b0a7a413bc8d595962697959e4cbe13c8934e8b3333c6a4e290d657f
+EBUILD mosquitto-1.5.ebuild 2553 BLAKE2B e24122599e0d670a92ee3a6b1063d0bd5eb342eae27ea2029f4a60b5e3ddc9c9c98fc07d7cd980ac1d72b9743e7f964210b05f7131101e8330d7974096006df3 SHA512 c73492cff20a123be5122fe37d9c0c4a12ec86d0dac6c18c8257d8999aa31d1696cb4524d5e13bd09d71a6be1545734f1b5cc4d367b65de3aeed11679c9a6e7c
+MISC metadata.xml 655 BLAKE2B de83cc66cc1d0be8f565cb8412104868536ba0f2abf7de393e449805106d0e80d9277dea323cb19c989d4029a8a84bda13a3d93eb1e00f39165b0b204297e596 SHA512 4fd71c3aa058a2a91d8b9f769c407a81899809e30e023ee2bb0c87306792619a90eb34bb17053403b6aeb06549f8deec5db631bfaed946e485e8ec399aed8709
diff --git a/app-misc/mosquitto/files/mosquitto-1.5-fix-socket_get_address.patch b/app-misc/mosquitto/files/mosquitto-1.5-fix-socket_get_address.patch
new file mode 100644
index 000000000000..7e9778e8b70f
--- /dev/null
+++ b/app-misc/mosquitto/files/mosquitto-1.5-fix-socket_get_address.patch
@@ -0,0 +1,29 @@
+# Fix missing rename of mosquitto__socket_get_address. Mosquitto bug 810.
+
+diff --git a/src/conf.c b/src/conf.c
+index f3d812d..daf2bf4 100644
+--- a/src/conf.c
++++ b/src/conf.c
+@@ -735,8 +735,8 @@ int config__read_file_core(struct mosquitto__config *config, bool reload, struct
+ 	struct mosquitto__listener *cur_listener = &config->default_listener;
+ #ifdef WITH_BRIDGE
+ 	char *address;
+-	int i;
+ #endif
++	int i;
+ 	int lineno_ext;
+ 	struct mosquitto__security_options *cur_security_options = NULL;
+ 
+diff --git a/src/net.c b/src/net.c
+index 7397de5..670b7e2 100644
+--- a/src/net.c
++++ b/src/net.c
+@@ -114,7 +114,7 @@ int net__socket_accept(struct mosquitto_db *db, mosq_sock_t listensock)
+ 	fromhost(&wrap_req);
+ 	if(!hosts_access(&wrap_req)){
+ 		/* Access is denied */
+-		if(!mosquitto__socket_get_address(new_sock, address, 1024)){
++		if(!net__socket_get_address(new_sock, address, 1024)){
+ 			log__printf(NULL, MOSQ_LOG_NOTICE, "Client connection from %s denied access by tcpd.", address);
+ 		}
+ 		COMPAT_CLOSE(new_sock);
diff --git a/app-misc/mosquitto/files/mosquitto-1.4.15-conditional-tests.patch b/app-misc/mosquitto/files/mosquitto-fix-conditional-tests.patch
index 1642597c5620..1642597c5620 100644
--- a/app-misc/mosquitto/files/mosquitto-1.4.15-conditional-tests.patch
+++ b/app-misc/mosquitto/files/mosquitto-fix-conditional-tests.patch
diff --git a/app-misc/mosquitto/metadata.xml b/app-misc/mosquitto/metadata.xml
index 2b05da7a5d48..ec6718456c6e 100644
--- a/app-misc/mosquitto/metadata.xml
+++ b/app-misc/mosquitto/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ramage.lucas@openmailbox.org</email>
+		<email>ramage.lucas@protonmail.com</email>
 		<name>Lucas Ramage</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/app-misc/mosquitto/mosquitto-1.4.14-r1.ebuild b/app-misc/mosquitto/mosquitto-1.4.14-r1.ebuild
deleted file mode 100644
index 96530da48cb2..000000000000
--- a/app-misc/mosquitto/mosquitto-1.4.14-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit systemd user toolchain-funcs python-any-r1
-
-DESCRIPTION="An Open Source MQTT v3 Broker"
-HOMEPAGE="http://mosquitto.org/"
-SRC_URI="http://mosquitto.org/files/source/${P}.tar.gz"
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bridge examples +persistence +srv ssl tcpd websockets"
-
-RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	srv? ( net-dns/c-ares )
-	websockets? ( net-libs/libwebsockets )"
-
-pkg_setup() {
-	enewgroup mosquitto
-	enewuser mosquitto -1 -1 -1 mosquitto
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-1.4.10-conditional-tests.patch"
-	if use persistence; then
-		sed -i -e "s:^#autosave_interval:autosave_interval:" \
-			-e "s:^#persistence false$:persistence true:" \
-			-e "s:^#persistence_file:persistence_file:" \
-			-e "s:^#persistence_location$:persistence_location /var/lib/mosquitto/:" \
-			mosquitto.conf || die
-	fi
-
-	# Remove prestripping
-	sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
-		client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
-
-	python_setup
-	python_fix_shebang test
-	eapply_user
-}
-
-src_configure() {
-	LIBDIR=$(get_libdir)
-	makeopts=(
-		"CC=$(tc-getCC)"
-		"LIB_SUFFIX=${LIBDIR:3}"
-		"WITH_BRIDGE=$(usex bridge)"
-		"WITH_PERSISTENCE=$(usex persistence)"
-		"WITH_SRV=$(usex srv)"
-		"WITH_TLS=$(usex ssl)"
-		"WITH_WEBSOCKETS=$(usex websockets)"
-		"WITH_WRAP=$(usex tcpd)"
-	)
-}
-
-src_compile() {
-	emake "${makeopts[@]}"
-}
-
-src_test() {
-	emake "${makeopts[@]}" test
-}
-
-src_install() {
-	emake "${makeopts[@]}" DESTDIR="${D}" prefix=/usr install
-	keepdir /var/lib/mosquitto
-	fowners mosquitto:mosquitto /var/lib/mosquitto
-	dodoc readme.md CONTRIBUTING.md ChangeLog.txt
-	doinitd "${FILESDIR}"/mosquitto
-	insinto /etc/mosquitto
-	doins mosquitto.conf
-	systemd_dounit "${FILESDIR}/mosquitto.service"
-
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		insinto "/usr/share/doc/${PF}/examples"
-		doins -r examples/*
-	fi
-}
-
-pkg_postinst() {
-	elog ""
-	elog "The Python module has been moved out of mosquitto."
-	elog "See http://mosquitto.org/documentation/python/"
-	elog ""
-	elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
-	elog ""
-	elog "    rc-update add mosquitto default"
-	elog "    or"
-	elog "    systemctl enable mosquitto"
-}
diff --git a/app-misc/mosquitto/mosquitto-1.4.15.ebuild b/app-misc/mosquitto/mosquitto-1.4.15.ebuild
deleted file mode 100644
index 65dffc2f3f19..000000000000
--- a/app-misc/mosquitto/mosquitto-1.4.15.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit systemd user toolchain-funcs python-any-r1
-
-DESCRIPTION="An Open Source MQTT v3 Broker"
-HOMEPAGE="http://mosquitto.org/"
-SRC_URI="http://mosquitto.org/files/source/${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
-
-REQUIRED_USE="test? ( bridge )"
-
-RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	srv? ( net-dns/c-ares )
-	websockets? ( net-libs/libwebsockets )"
-
-_emake() {
-	LIBDIR=$(get_libdir)
-	emake \
-		CC="$(tc-getCC)" \
-		LIB_SUFFIX="${LIBDIR:3}" \
-		WITH_BRIDGE="$(usex bridge)" \
-		WITH_PERSISTENCE="$(usex persistence)" \
-		WITH_SRV="$(usex srv)" \
-		WITH_TLS="$(usex ssl)" \
-		WITH_WEBSOCKETS="$(usex websockets)" \
-		WITH_WRAP="$(usex tcpd)" \
-		"$@"
-}
-
-pkg_setup() {
-	enewgroup mosquitto
-	enewuser mosquitto -1 -1 -1 mosquitto
-}
-
-src_prepare() {
-	if use persistence; then
-		sed -i -e "/^#autosave_interval/s|^#||" \
-			-e "s|^#persistence false$|persistence true|" \
-			-e "/^#persistence_file/s|^#||" \
-			-e "s|#persistence_location|persistence_location /var/lib/mosquitto/|" \
-			mosquitto.conf || die
-	fi
-
-	# Remove prestripping
-	sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
-		client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
-
-	python_setup
-	python_fix_shebang test
-	eapply_user
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake test
-}
-
-src_install() {
-	_emake DESTDIR="${D}" prefix=/usr install
-	keepdir /var/lib/mosquitto
-	fowners mosquitto:mosquitto /var/lib/mosquitto
-	dodoc readme.md CONTRIBUTING.md ChangeLog.txt
-	doinitd "${FILESDIR}"/mosquitto
-	insinto /etc/mosquitto
-	doins mosquitto.conf
-	systemd_dounit "${FILESDIR}/mosquitto.service"
-
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto "/usr/share/doc/${PF}"
-		doins -r examples
-	fi
-}
-
-pkg_postinst() {
-	elog ""
-	elog "The Python module has been moved out of mosquitto."
-	elog "See http://mosquitto.org/documentation/python/"
-	elog ""
-	elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
-	elog ""
-	elog "    rc-update add mosquitto default"
-	elog "    or"
-	elog "    systemctl enable mosquitto"
-}
diff --git a/app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild b/app-misc/mosquitto/mosquitto-1.5.ebuild
index 48165a4db6f3..a2251b4ffda2 100644
--- a/app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,13 +18,16 @@ IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 REQUIRED_USE="test? ( bridge )"
 
 RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	srv? ( net-dns/c-ares )
 	ssl? ( dev-libs/openssl:0= )"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	srv? ( net-dns/c-ares )
 	websockets? ( net-libs/libwebsockets )"
 
-PATCHES=( "${FILESDIR}/${P}-conditional-tests.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-fix-conditional-tests.patch"
+	"${FILESDIR}/${P}-fix-socket_get_address.patch"
+)
 
 _emake() {
 	LIBDIR=$(get_libdir)
@@ -60,6 +63,7 @@ src_prepare() {
 		client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
 
 	python_setup
+	rm test/{broker,lib}/ptest.py || die
 	python_fix_shebang test
 }
 
diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest
index b14c529dfbcd..395e0247014c 100644
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@@ -1,8 +1,4 @@
-DIST neofetch-3.4.0.tar.gz 82090 BLAKE2B afc00b37d84cdf3ae0fd4037312b1c67fdadcbe99d6d602e8f3b6caa844b3780861c9d2522ec605ba5b7aa08e4e85ef804129da2ce3f6f01ab8b536704cdd182 SHA512 931648e8173eb91fdf5c79b5bb9b6efef132d30cf2f10d6f75dcff42f3661d40ceec712c109e90e2226e1aa85cad7676c438b6cad49e8298a77d990d9a3d197b
-DIST neofetch-4.0.2.tar.gz 111792 BLAKE2B 865c45a366224915aeeff82c843c869685814ccb5f553d7da59ab51e26336500cb133b5c827dd6dccccef3e771b357852e86db166d88cda894515419e9eadbc8 SHA512 326b7a9fdf08aa10b790c281148946727dc6a10c5c073654fc0ce9cee9afe663de84ac13144cb3e1d2e33b5ca3ed5094d2cb83e78b7b5f6e1ced49d78e191ce4
 DIST neofetch-5.0.0.tar.gz 110526 BLAKE2B 7149321c051021644407d28b232631c8149d21f1b8463b3a4470d1baaf88494f3a88026c606ac539938933333da5671f4a14b6ce029268ba01a16e85d4a30c33 SHA512 7872e646a0d784d0c9d851d16cb1ef03926d07f67ec9573b673b2a82fd9a1ffbb7bbcb0ca0e67c299dd210947396a8c36dacb98d8a61c3ea72b5a438995e7de6
-EBUILD neofetch-3.4.0.ebuild 528 BLAKE2B 55af7ef9e6137fe42359f3db5af58c3418d4efbb9c1cf2dd5321acb0990e31de3db5258bc1bd6f4784e54cc4e9b3dd6abfc7ebe7c6dc366d72ebba82f6964042 SHA512 21b9a4f2d6df165860872f58794b34550df3dcacc5a9a3673a5ac45eab46fa7e2c3de238f266f7ef3944aacfe6787b1debf70d8f7b85fb4c186029efdf78a2df
-EBUILD neofetch-4.0.2.ebuild 648 BLAKE2B 05e30152c4f705eff009e3c87c44f4b9f1979e471c62edd347a33e44b9ecc33961a4049e2b7e419528d82c88a02aec7b2e24018e48232aae336569584e98f62d SHA512 62c141cc2bc888c346d4dfc6e79e014a62472cc7e3be32c71b46b2688f0da58f1acd765de5c38093eebb37700370318f3e2bd338882acc61e35ee5ac31b534b4
-EBUILD neofetch-5.0.0.ebuild 698 BLAKE2B f42ee7ffcabbe948c1e4de18e24c10f82b019ddfa7bb2ea0a5310fe987a048f93cf42de6e48803424e39658b876eea0d3df08d84429fe9d0414219b4785fd5fd SHA512 63dff45a3587448eb429703d9b8695c4b7ab600864c3f104e9117c879f9ca29f9394bd7d552cb2845646acffd71bafab4417d42c0e6494358b0d845c3da6ad2e
+EBUILD neofetch-5.0.0.ebuild 693 BLAKE2B 322d42370c759b75c54d4059ffa49a6812878812ec7e00f1b22ffa067788741db2c5777cbc272e7bd7a40c2a5457524faff3aa0f9569373fcf0b9f415c2b26e5 SHA512 b4568a595e5dc2d2c73c42fa7a5fd7d55bd50568ff3f0822ba3bf48d8a189696dd487c882355c6ba706f875368ca2f33dd2f27564334e95372a075e9ce44bf63
 EBUILD neofetch-9999.ebuild 648 BLAKE2B 05e30152c4f705eff009e3c87c44f4b9f1979e471c62edd347a33e44b9ecc33961a4049e2b7e419528d82c88a02aec7b2e24018e48232aae336569584e98f62d SHA512 62c141cc2bc888c346d4dfc6e79e014a62472cc7e3be32c71b46b2688f0da58f1acd765de5c38093eebb37700370318f3e2bd338882acc61e35ee5ac31b534b4
 MISC metadata.xml 808 BLAKE2B 8f8f20ac1f262e69c525c9e626c64ea28ae3165982052dcf74fbcf76b8c362fe6407ddb5994d04dbff6f07ead6ad2c0e3bbe7f9a1a73bc194be30346a3f68c4f SHA512 9e28e51cfba1e7c648cc96d32c2c86a0341dc077457e9e62ce42d667f1a689407e65bf0b7d6df87526167b157b16bb7495752932036c9dff12052573c9f9dae3
diff --git a/app-misc/neofetch/neofetch-3.4.0.ebuild b/app-misc/neofetch/neofetch-3.4.0.ebuild
deleted file mode 100644
index 861c13b16942..000000000000
--- a/app-misc/neofetch/neofetch-3.4.0.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
-
-DESCRIPTION="Simple information system script"
-HOMEPAGE="https://github.com/dylanaraps/neofetch"
-SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-fbsd"
-IUSE="X"
-
-RDEPEND="sys-apps/pciutils
-	X? (
-		media-gfx/imagemagick
-		media-libs/imlib2
-		www-client/w3m[imlib]
-		x11-apps/xprop
-		x11-apps/xrandr
-		x11-apps/xwininfo
-	)"
diff --git a/app-misc/neofetch/neofetch-4.0.2.ebuild b/app-misc/neofetch/neofetch-4.0.2.ebuild
deleted file mode 100644
index 4757864917ab..000000000000
--- a/app-misc/neofetch/neofetch-4.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
-fi
-
-DESCRIPTION="Simple information system script"
-HOMEPAGE="https://github.com/dylanaraps/neofetch"
-LICENSE="MIT-with-advertising"
-SLOT="0"
-IUSE="X"
-
-RDEPEND="sys-apps/pciutils
-	X? (
-		media-gfx/imagemagick
-		media-libs/imlib2
-		www-client/w3m[imlib]
-		x11-apps/xprop
-		x11-apps/xrandr
-		x11-apps/xwininfo
-	)"
diff --git a/app-misc/neofetch/neofetch-5.0.0.ebuild b/app-misc/neofetch/neofetch-5.0.0.ebuild
index 83f1ec36f8d1..62677c4b07a8 100644
--- a/app-misc/neofetch/neofetch-5.0.0.ebuild
+++ b/app-misc/neofetch/neofetch-5.0.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 x86 ~amd64-fbsd"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
diff --git a/app-misc/screenfetch/Manifest b/app-misc/screenfetch/Manifest
index 51ce9824000b..ca41cbec5d84 100644
--- a/app-misc/screenfetch/Manifest
+++ b/app-misc/screenfetch/Manifest
@@ -1,5 +1,4 @@
 DIST screenfetch-3.8.0.tar.gz 71970 BLAKE2B 783d14bb30f5858f2f2f8ac81c6c8bca2fa4c1e7c9225d9ba13a7ace05c365459e277bea625b680fc3e3fedd0303507a583190d866627cedcb33e042aa8fdca7 SHA512 903f42e3bfcd719c4d6b91d10e5678063e223c2baa58214c7e8dae9ea925852f9e2c07ad90148e02d87ce5f9af7b989e80e93c2f569cd579e6f4f7d5c49c62f2
-EBUILD screenfetch-3.8.0-r1.ebuild 645 BLAKE2B da3565843558442dcfb92af2f56da8dbfddb25d88ea21492dd716377e6de0975b25e5ff25d25014c9342c0ee6abd7a1e479386bae10b5e5f505c1b109aee9efb SHA512 230977a4b296c7536799ebe36812bcbd1d311568cd5e243e96e6fdd6582dab322163dc767c796984e2fe7d16b904f3732d457b0fe59d206fcafc3a6cc3a55a6a
-EBUILD screenfetch-3.8.0.ebuild 693 BLAKE2B ad0cb380e1a3cd16f21e695e178abb984c76d6d696ef36dcd518b683c84ff82ebdbec02c9dd94f28c4b6b77a59f559614b07ef4cdd22a5a13104c9460a14da95 SHA512 99082dbdb51ba4ef62e0acdc41fddc59544644e8bb94dfbabe33bc3cd171e6416d5525c90770fdae8f86792ceb154e0be74373542668675cfff89c2d15074f9f
+EBUILD screenfetch-3.8.0-r1.ebuild 640 BLAKE2B 845d29382aa7241fad2ee9bb66e216df880fec4148eb3faebfa18ff739f51c66d2e1b9618f2b417248caf49081d1effc7cbc74b7e153e6652d14bec5da7edc3a SHA512 550f60f7ef1a57f44dedd488a2a8f015cb56d56608b061f436e75015a8307166c80d7d48444f5af4db8f2390e00b2873f630e0081a3b3ea09ace92a0499251ef
 EBUILD screenfetch-9999.ebuild 645 BLAKE2B da3565843558442dcfb92af2f56da8dbfddb25d88ea21492dd716377e6de0975b25e5ff25d25014c9342c0ee6abd7a1e479386bae10b5e5f505c1b109aee9efb SHA512 230977a4b296c7536799ebe36812bcbd1d311568cd5e243e96e6fdd6582dab322163dc767c796984e2fe7d16b904f3732d457b0fe59d206fcafc3a6cc3a55a6a
 MISC metadata.xml 433 BLAKE2B 50f5c928a8db5e71033fd780bd2ea13af87d8d14d83b694ff6765fc65ca3f7313c53de0a22ee5cdc0ed4ad88c754a0ccd750e59e46cfd1456b4ea185162ae1df SHA512 d07492a28cab27bba43976cc18148cde296f7e3a5ec76f06f066812b085c8b1a2b7ba9ed0a5eeea7aa838b052f177a2fde0a99ff5ff5ef9a46c4c0553cf012e0
diff --git a/app-misc/screenfetch/screenfetch-3.8.0-r1.ebuild b/app-misc/screenfetch/screenfetch-3.8.0-r1.ebuild
index f2c6bb16d7d5..459928ae2f31 100644
--- a/app-misc/screenfetch/screenfetch-3.8.0-r1.ebuild
+++ b/app-misc/screenfetch/screenfetch-3.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="${HOMEPAGE}.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm x86 ~x64-macos"
 	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
diff --git a/app-misc/screenfetch/screenfetch-3.8.0.ebuild b/app-misc/screenfetch/screenfetch-3.8.0.ebuild
deleted file mode 100644
index 35f27763226d..000000000000
--- a/app-misc/screenfetch/screenfetch-3.8.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/f/F}"
-
-DESCRIPTION="Bash Screenshot Information Tool"
-HOMEPAGE="https://github.com/KittyKatt/screenFetch"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="curl X"
-
-DEPEND=""
-RDEPEND="
-	curl? ( net-misc/curl )
-	X? (
-		media-gfx/scrot
-		x11-apps/xdpyinfo
-	)"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/KittyKatt/screenFetch.git"
-	inherit git-r3
-else
-	KEYWORDS="amd64 x86 ~x64-macos"
-	SRC_URI="https://github.com/KittyKatt/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-src_install() {
-	newbin ${PN}-dev ${PN}
-	einstalldocs
-}
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 9bf36cda9f21..45e0bc7a4f31 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -5,7 +5,7 @@ DIST tmux-2.8.tar.gz 637609 BLAKE2B d95fbdbc79c2c512908f82778816aa8540bf2fe26509
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
 DIST tmux.vim-95f6126c187667cc7f9c573c45c3b356cf69f4ca 5626 BLAKE2B dd22713fee56e3dadd573c888ab17561879f756df369cdbe552e052842f527c5310c6cd46342ccd3e3e01835d0f616f4ecb202567674dc4809bc08253ad66bea SHA512 956b2c1ca08e3c92aa39c9df54fbe1c661d0e076c91628c4b88f81f97104241b6505412fa0e21a681adc231eb2e6e7feee850474d4277812d186548bbb05f6d1
 EBUILD tmux-2.6.ebuild 2140 BLAKE2B eaf576a0984fee2d9ef0eee0d823d28e5e4949e5a80003e539cb936e74fe1acf07ed883b71936dc3fd3c681806e766108a20cc574eb36a165f9abe584df2bd2c SHA512 cc02589f7cba6668bfe99193e910e4816cb9ef5e0adf6660bd6d4d2a281e3821e2ed383c50c905a95f97ec3c10d9b0c22a4f1fd552d05d7e869731deefc985ca
-EBUILD tmux-2.7.ebuild 2141 BLAKE2B 52286b25466be1d8108ef3370ba50c3628447cc8aa10756bb0ac10ba56a5b64d933b14b2fc246a6d207b8293ca3885461dbd97ac6431a919037817be71269295 SHA512 4a8dacdf74989e9fadb1dd159d938cd3b90b0ddca00ac102eea82fd267fc1e257491e62ccff4084141cb444b7f72863b6df18a530d721e83df7077d6169a43b5
+EBUILD tmux-2.7.ebuild 2139 BLAKE2B 5c9aa9bf3925ef13c0f5693537f5e67901a88b14468a9e912a3fdaa30f6df272981bff901e1ebf0018bbc28f4e6c4bde6c5c0d2b807084b4a0d73095562b87bb SHA512 8b78fae41fdcb1d773902045a5011a36f40378bb56a546d26cf50b9e2dd74dfd4e2cdf233de55dc8516748fb0094eb6cdaff88a505eeac7465f549bdf32cc460
 EBUILD tmux-2.8.ebuild 2117 BLAKE2B 3edfccc8b61961b65e7d866ae3797b437283e37c29b2da28d71ff7246a7146e01bd091ed4854a8df864ea242de3bea82eb2c52f0169ef16a2dabe3a744a7fd60 SHA512 8884a5ca026a5f84bffbc76f794a8460e31f50997790ef4cf7f6cd306d1108ccf33d18fcc203a15428d57ba5bcdb4589d6a746bce64033ce2f1e64b929a2e730
 EBUILD tmux-9999.ebuild 2350 BLAKE2B a2fea8d287803a5779740ce34ed42ecf8f889f9b10020921aaf1e48d2fb65b12a43773caf04c088b5ac963d5b5f879746c789d4d24a839a1fcc040b370e109b4 SHA512 db22402a7bfa146ea6f4553f7f8d1291456466aa1c2938a747671fbd8123a7ab8cfba9a5ed4405d2c8faefdac93307e99ea55ddf3c5e60f0d5667603fe7d26f4
 MISC metadata.xml 708 BLAKE2B f89d9daf3de56b07d231b4fa3dec0179d8e32579a76142085b96611fd08db4c26af40d1ac92684f9d1e378ce624647bab26ddf877aceb86af4987aa4e555e045 SHA512 2d676e2d9a5427a287d7dbe0d73e6ea96b2eba3328c8380a503e814e263a5c6ea5b4bf33aef7c9e0840f37d75b40e5e4a4feca5cc07c38de50b35e9da497f8ce
diff --git a/app-misc/tmux/tmux-2.7.ebuild b/app-misc/tmux/tmux-2.7.ebuild
index bfe4e67a390c..7b74613dbeb5 100644
--- a/app-misc/tmux/tmux-2.7.ebuild
+++ b/app-misc/tmux/tmux-2.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_*}/${P/_/-}.tar.
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
 
 CDEPEND="
diff --git a/app-misc/ttyload/Manifest b/app-misc/ttyload/Manifest
index 1a6e497ed4c9..5344cd9c1006 100644
--- a/app-misc/ttyload/Manifest
+++ b/app-misc/ttyload/Manifest
@@ -1,3 +1,3 @@
 DIST ttyload-0.5.3.tar.bz2 15039 BLAKE2B 0614b492a86013c524d21de9dcb2c28e357afd8cc811b103b294d60c89c8b7503ca3e47dfe0c2eaa0ff92c76ff7e4453761300ea2fae1d8f5adbbe36d201c93e SHA512 1affc171fd569d4127d7a51dda5764272e554a96db6ad4418ff6120f9b0e573679b33d45797adcb667216d167e9f3ee41349a53d4f7808b3b1c5bed76e3f4bbb
-EBUILD ttyload-0.5.3.ebuild 715 BLAKE2B 4124a559f5873aae5105b0d5b8695ddd7d7ef0d076487eb88fe4ad8ee876accf04dc6c06579e50f372b938a1ce065b8f6c481f306470cc425c482ccfbbba9160 SHA512 c29bee509b9788891adb4971439cc2333a3f3856f1063aef12036314e33e4e2ec946ef20d7bd2f692ecb74c68e7211572f3d80e60e682fa0b57847047d4234c4
+EBUILD ttyload-0.5.3.ebuild 713 BLAKE2B 4f881ae2ad81300d4ad7fd7e3470dba988473e7ad8d60d5983a29c3d3777f169dfed5c2de5b8e7cf20c28776a8ac3ee89d9ae1be74b69d24b71395bf32dfc4a8 SHA512 9ce81b03526785457f46b962bbe5b8295e92869346c33e9fbeb51ff7b4639d5ecd6c4c7107d6f57f7bfb508fb1940e6f7a2f5b0545a295a9e575f3ca8ab4a0aa
 MISC metadata.xml 377 BLAKE2B 377ae6a1620e09bf5a309a212ed7b4db5516e51b9e955373502252ab4fa5bdd9520d5c145905634d76e3884a3a993a6fb2cbe37e730e177081ea5f0c65b3c1ec SHA512 7db7620ce42324e2a551b2fa5898aab491c868b5d28b938e163ea1bf24aed66913fff8d611e95c634e65aa5372bed9314a55b278d62157929d6873cea7994bd6
diff --git a/app-misc/ttyload/ttyload-0.5.3.ebuild b/app-misc/ttyload/ttyload-0.5.3.ebuild
index 0ef762b01215..8f725f68538d 100644
--- a/app-misc/ttyload/ttyload-0.5.3.ebuild
+++ b/app-misc/ttyload/ttyload-0.5.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
@@ -9,7 +9,7 @@ DESCRIPTION="color-coded graph of load averages over time"
 HOMEPAGE="http://www.daveltd.com/src/util/ttyload https://github.com/lindes/ttyload"
 SRC_URI="http://www.daveltd.com/src/util/${PN}/${P}.tar.bz2"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="ISC"
 SLOT="0"
 
diff --git a/app-misc/vcontrold/Manifest b/app-misc/vcontrold/Manifest
index ced57c0e75bf..727ff7b1eb11 100644
--- a/app-misc/vcontrold/Manifest
+++ b/app-misc/vcontrold/Manifest
@@ -1,4 +1,7 @@
+AUX man_generation.patch 1033 BLAKE2B 431deaaf6b7e48e975ac8c7bcee7bd144d610cd4e8bc2d7c472e26ac440f5a0c0b793026258ec75662eb6834e9542b0ca15f68c7619da9b6b9bf5e48da8baedd SHA512 67456107d42db0a2b584f3600c68ab9ba787b292198da0c69926c6b627b7f58b80b958513a3cfe537d8bc65fc03c3352b43886d433b6f06cc51bad24eb0da610
 AUX vcontrold 157 BLAKE2B c8d08ae44343850d95e9b99626690a2f79403bb9bafef9ea6125376623c617c4fc1523beb4be4d3cfa50d67c3a7ef84e4b3042afcaf8211ea0276d4e519cd713 SHA512 10583cff05a3099d06ec13cd35711c93dece72de1ba05a2026d85b31cb6279136cbbffa00bcc162cba841232d2f8fe2babda463bdadb6b4f3e1f39ce95562401
 DIST vcontrold-0.98.5.tar.gz 86684 BLAKE2B 07ed2c932b9f1c03410cbd6c23cfbfb7bf1aeaff027f597fb6f05a6b61c647f229a75b5a87d893a66c6b8e917595083d193c5da8585c6b9546d12c5867ca1a1b SHA512 b94dbb09ffe274e0a0a0ac4948365ed3213f221dbc00ed2b2adec2ac5a632e293686d62a07575454b3d11b1b8e4e058625a067461996dd720c2f84066d57e60e
+DIST vcontrold-0.98.6.tar.gz 86999 BLAKE2B bb2933c166793a851fc9b3292cdf00228e0f5383ab6cfce66150383103e7c6b54661ef8c7f0bb177aecedef9f7ca7d3e64a20c1af106d45a6c5a1f2a32bdd971 SHA512 74c17dc83af456e9fbece44a00d775d6e474b1de76993da69f5cb897658be13a83ef2abc3fe75f571f1d52120e2ddade08079336a338af81eae8557b3b357481
 EBUILD vcontrold-0.98.5.ebuild 906 BLAKE2B ede2a31302a852636266f97069eae207937bc630fa16db5f982ff676c453b1c2da0dfbf8d023197ebd4132f4a55ed16b8fa5bc6659d0cfe0ee7b9898416028f9 SHA512 cb627f085e3d3b9d0cce3c48a4e5e2f1e115c699414da293ff81783689fb7111e0f13d145901616cdd98526d7610a67fab72e0e9a051e07879e4b8371d77bd47
+EBUILD vcontrold-0.98.6.ebuild 950 BLAKE2B e8ec145ef75d4ff2d41fdcbd68e5d2f7ad541a84343cef2c3e8cd18d2830df3d5e08815b392990dfa901fa2bd3cf0a554a5d79e1721eda43a251f9cf9832ce84 SHA512 c22d888251d4f7c0e336436758c57c7d8da4e258af9c940c07819b864ebe5105af4903fd316cf33f733bab7a86a4f5eeaa1188652ebf82b0fe82bdbb11f24ec2
 MISC metadata.xml 910 BLAKE2B eb06d0c4ca09ba13dc5ec335afc9da950429c650c05289608c90f91e0b7d550f97f6833752a8e71101fad25d2600dd24c522f9747ddad20c958b31c790769d36 SHA512 9eeeb42e54cff821d986407940d3a8e434ba3126708eef45f3234bbd8519dc7fd564f5bd6767d249370a796e7ed13d934b52b309305b4bcc03401c63a68a3d64
diff --git a/app-misc/vcontrold/files/man_generation.patch b/app-misc/vcontrold/files/man_generation.patch
new file mode 100644
index 000000000000..81b8941d00a6
--- /dev/null
+++ b/app-misc/vcontrold/files/man_generation.patch
@@ -0,0 +1,22 @@
+diff --git a/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt
+index 65024b3..c3e3211 100644
+--- a/doc/man/CMakeLists.txt
++++ b/doc/man/CMakeLists.txt
+@@ -14,14 +14,13 @@ if(VSIM)
+ endif(VSIM)
+ 
+ foreach(MANUAL IN LISTS MANUALS)
+-    set(MANPAGE_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${MANUAL}.1.gz)
++    set(MANPAGE_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${MANUAL}.1)
+     set(MANPAGE_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/${MANUAL}.rst)
+     add_custom_command(OUTPUT ${MANPAGE_OUTPUT}
+-        COMMAND ${RST2MAN} ${RST2MAN_OPTS} ${MANPAGE_SOURCE} | gzip > ${MANPAGE_OUTPUT}
++        COMMAND ${RST2MAN} ${RST2MAN_OPTS} ${MANPAGE_SOURCE} ${MANPAGE_OUTPUT}
+         DEPENDS ${MANPAGE_SOURCE}
+-        BYPRODUCTS ${MANPAGE_OUTPUT}
+         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+-        COMMENT "Converting ${MANUAL}.rst from ReStructuredText into manpage ${MANUAL}.1.gz"
++        COMMENT "Converting ${MANUAL}.rst from ReStructuredText into manpage ${MANUAL}.1"
+         VERBATIM
+     )
+     list(APPEND MANPAGES_LIST ${MANPAGE_OUTPUT})
diff --git a/app-misc/vcontrold/vcontrold-0.98.6.ebuild b/app-misc/vcontrold/vcontrold-0.98.6.ebuild
new file mode 100644
index 000000000000..cd6ff144ee01
--- /dev/null
+++ b/app-misc/vcontrold/vcontrold-0.98.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Daemon for communication with Viessmann Vito heatings"
+HOMEPAGE="https://github.com/openv/vcontrold/"
+SRC_URI="https://github.com/openv/vcontrold/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+man +vclient vsim"
+
+RDEPEND="dev-libs/libxml2"
+DEPEND="${RDEPEND}
+	man? ( dev-python/docutils )"
+
+src_prepare() {
+	sed "s/@VERSION@/${PV}/" "src/version.h.in" \
+		> "src/version.h" || die "Setting version failed"
+	eapply "${FILESDIR}"/man_generation.patch
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DMANPAGES="$(usex man)"
+		-DVCLIENT="$(usex vclient)"
+		-DVSIM="$(usex vsim)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	doinitd "${FILESDIR}/vcontrold"
+	insinto /etc/vcontrold/
+	doins -r xml
+}
diff --git a/app-misc/zisofs-tools/Manifest b/app-misc/zisofs-tools/Manifest
index 3378051c92c0..7e8e356d17c9 100644
--- a/app-misc/zisofs-tools/Manifest
+++ b/app-misc/zisofs-tools/Manifest
@@ -1,3 +1,3 @@
 DIST zisofs-tools-1.0.8.tar.bz2 52968 BLAKE2B 81224adfcf4309513ceec7c25f72d90e4dfbacc225c756b35f1ae2ce721709abd4f52559596632a121813bae2c14d259e7950e84cbed43a547e77bf3491f8fdb SHA512 2c50bb73428c065e02e95def81950e1f64aff3cec0a4d74ee91ddbf4c15b81a423d8a128a4abc2e11aeb866b9d5f67f55019f7ae884c9e1a8b013ed3133db50d
-EBUILD zisofs-tools-1.0.8.ebuild 663 BLAKE2B 68f0c648b1a0041af79cfd613370a0c3f4b21725c6e87450a16a2ad538f3a63746094530696f51e0e9ec0123892f97d7587b7aa8e1f5e0d324757667f84ddca4 SHA512 4d1216f196d2c2f3930c1db7472b087e0b2720a59cf22786133ea78afc773ab29eacdf326766397f21f69a2d15f6e00db5a68bbb4c3a6c23fa4cdbc6917377ee
+EBUILD zisofs-tools-1.0.8.ebuild 622 BLAKE2B efc2acf2469ef458e8ba0a11c49acf322d601783576343a729f762a94c9c485b530db3035c1c67c3baa4f52604ad245094439f0c37b8e394e1c60c125bebc879 SHA512 aaedbb20761ebbe192b6c71ce2a6cec225a15797202a8993a28065aa05d6b31163e7bc888170c4cb29c9f06215c29b376e988a3899bd2a0842dc64fb8d5edca8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild b/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
index 5cfc5013f7dc..e66ca77db98e 100644
--- a/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
+++ b/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-
+EAPI=7
 inherit flag-o-matic
 
 DESCRIPTION="User utilities for zisofs"
 HOMEPAGE="https://www.kernel.org/pub/linux/utils/fs/zisofs/"
-SRC_URI="mirror://kernel/linux/utils/fs/zisofs/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static"
 
-RDEPEND=">=sys-libs/zlib-1.1.4"
+RDEPEND=">=sys-libs/zlib-1.1.4:0="
 DEPEND="${RDEPEND}"
 
 src_configure() {
@@ -24,5 +23,5 @@ src_configure() {
 
 src_install() {
 	emake INSTALLROOT="${D}" install
-	dodoc CHANGES INSTALL README
+	einstalldocs
 }
author	V3n3RiX <venerix@redcorelinux.org>	2018-10-22 11:09:47 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-10-22 11:09:47 +0100
commit	64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch)
tree	9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /app-misc
parent	957235cf19a691360c720f7913672adda4258ed0 (diff)