gentoo resync : 25.09.2019

27 files changed, 365 insertions, 656 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 2791b5704e68..0da9c266ae79 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/datefudge/Manifest b/app-misc/datefudge/Manifest
index 6c19b1a0d15e..8a88f1496595 100644
--- a/app-misc/datefudge/Manifest
+++ b/app-misc/datefudge/Manifest
@@ -4,4 +4,4 @@ DIST datefudge_1.17.tar.gz 12606 BLAKE2B 5aef2bab1b434f66bb761dc6858984c4b555aff
 DIST datefudge_1.22.tar.xz 12964 BLAKE2B 2f76647a3f7c73e43ff6b4fd57d57d21cae75fd8bc304a5cab7c66d9798795e2386f6219a51d71f57e13463e88a3e518160d90ae01bae5253cbcb7c8a3acf763 SHA512 ed67d334ca8296ae1c7b5ee1efc6ec7aafaad0aeb9f0f0387245c2eeea94ccc59ab804778b93ab8b34a512b83a3ec81d10f341d4f4f22b4a07fccdadaefb6d8b
 EBUILD datefudge-1.17.ebuild 972 BLAKE2B de096b081d3d0f8050ae187b7206caed8385c4f024b6254cf7953cef65de367effac0b933d0514446058bd59cbae873cdba4e2c0d46974f3d469dc8719a24a74 SHA512 5490d0eeed9d1c2ac6a1f2aff174f8b5411876983bbcf1e8194f8d882617563d3a2ffac14e5e0b4d4a72727ea0b85b08c5461a90366626f264667fb049e67b86
 EBUILD datefudge-1.22.ebuild 1011 BLAKE2B 4054e31fb2d326c829659adce961be253c41c39c835e12dc6f5073e0fa8664f1738479dddbae7dc4ea3674068f170a20459c086ceb6e55b38ec5b308ba274cfc SHA512 bb12d1583f021703bf2f7567808c72c92124788751bd12fff40613dca2bec9964a717dc4188cc78d86254bfcd383fe3e9b194e89d11ef3c6da8ef124588dfb67
-MISC metadata.xml 166 BLAKE2B df899de61ee57cf9c2d5822a8ca4cb62c697c6da7142003688afbdd1261a8623d48058189ebe005c053ffddcb9f7275f19a0e48fc47ce1890341e276400f1d8f SHA512 12bfcd38af9dc9fe67b866a4ae090e26873d363409efc5949cca4b4a59ba0d770b09ebec8a108482b29b94c922bcdb8ce3f5ccbb578137b44e35bd783b4c9472
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-misc/datefudge/metadata.xml b/app-misc/datefudge/metadata.xml
index c1744fe7fc5b..7a38bb900964 100644
--- a/app-misc/datefudge/metadata.xml
+++ b/app-misc/datefudge/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!--maintainer-needed-->
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index e3c7ca921255..509a050d7460 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -14,20 +14,26 @@ DIST elasticsearch-5.6.16.tar.gz 33894983 BLAKE2B f96e78f1f28d8106948c91a0d31ea3
 DIST elasticsearch-6.6.1.tar.gz 114126547 BLAKE2B b335b224af0c241cbdf83f81feec103274d9cdd9ee7f9c3c5a788cbfc4d7a24b3a345aa14853e378796f733c151f7f21b5b081b2071b56f40f0f068ef6b07939 SHA512 3f8619ae6a10a34c57d8bc0c2ba3851b79a494ea05a3d02119a6e12d2c6cb6a651e73b43adfd674b7fb16664b709b643d4be9ba0785dbcc6d7a7cc41da7b669f
 DIST elasticsearch-6.7.1.tar.gz 148542786 BLAKE2B 4a9acd16788e6d84acfac09ee2434135fdef85d0bec5baa873f7bfd7cb6d340932d6b67b13a8f5095dc04d1981a029ab7f87d90c2b4a796eb198e9b8c531db9d SHA512 dcd3a6beae8b4a2322144058871074f193974565341da5703ec991947c2749ee67e87202e937148f653594f5fd33fdbb8adc891a200d4e03d8363575992eb9ec
 DIST elasticsearch-6.8.1.tar.gz 148584086 BLAKE2B dacc3fdf142fc46ede2a5891f95f69a1200632c46b57eb03f948437a39ef92538da7d3e64afd52c4acae478e6758b355729f8cbf8ceb91aa3d34353ff434fed4 SHA512 1d484287e9b67b16c28f1a4d2267e7ceb5a4438a18b26b3a46d4a176bb3f2f6fcadcbda617a7a91418293880d38c027266cb81a4e8893a28adee9fa693b2318b
+DIST elasticsearch-6.8.3.tar.gz 148609846 BLAKE2B ff32122bd53eca3e25f4ca797d76aae6d24787646fe532bd30aae737aac5c1d134b4fe73c7f60ad57e410e05d7b049a57beeec8a113de2d7c666e0b437f37bbc SHA512 191aa34f0178bcc480fc77f7a3c1736531a4b4db2d8f0196eab53a0dd28b34cc88df3064703cd523cc692da8b8e58e6310de256d728c33537c992935b3546bf7
 DIST elasticsearch-7.0.0-no-jdk-linux-x86_64.tar.gz 149074223 BLAKE2B 3c210b81de8882f99be45adc811c3867acb276978d3c788db5cb00ec0eacd0f096933849dfa066160ca2ec05e3fa2962329b200614db9927e4424602da53508f SHA512 b499aeab6a3f883547974b36221fd808a9da70ae0622856582287dcf729c3a2acfb1faef2727b17be97f64d8bb56ac5cdbae6d63f2a146027153f170ae6d91fc
 DIST elasticsearch-7.2.0-no-jdk-linux-x86_64.tar.gz 138948007 BLAKE2B 0e03779669f6113eac1561a3a907d8a3286ac7c7229e0ff7ad46ede4f22a2829f8d2ffafb319427f789fb95cca6669c59f8d840ec83625889bcdd6ada91be1d5 SHA512 b49a6d6b7361c499b1d9a9118746229113eaf4b88c1ad755c1ae8fd713428db4bc296cd75f3df58a239b09d6a8281f670f69c320839ef000596c776141cb1ce6
 DIST elasticsearch-7.2.1-no-jdk-linux-x86_64.tar.gz 138949755 BLAKE2B 3c77cec89a93c6b5d213afc326ef84df7d77c052914b387dc4ba35276d8f9814689d5305a131e1c647ece31277533e882b1170ad03eb3869f8443471223db066 SHA512 d2827be0b06361ab08f558dc88f76c614fb6a243a6d845749b3d23dff4078ffa58cc1b3407b84197d0f027ea9af5475fad8e3a503fc573ba31756bdd16a589d9
+DIST elasticsearch-7.3.2-no-jdk-linux-x86_64.tar.gz 140098396 BLAKE2B bb2eb1e69b459533ed785f244ebbdf06032f8115f298e4151164fa27c913c6cff674dc8e75d96734185ffe47c2dd16dff11f3f7447a21bd0020fd45e58abf5d4 SHA512 9d73f6fce0b5321099393c69b1ba8544f9fc919f5a850bac3eb5a77af50f392e8eeb20ff34ba85283649a19d9bee33351a4ffd363cda848d4d53cde91632e335
 DIST elasticsearch-oss-6.6.1.tar.gz 34492424 BLAKE2B 9a63aeb86ec3bebbe685804b262316726cb93b42693f9ba8937cac65c7ec186f0bb470893568234a0b7cc8b58f0c91d2af94eb16c3d016e7533231eba32fdbb0 SHA512 0e536ff760673dd740f790f1b0c01d984bf989a4a9ad3c4fe998de4f824330ce0d5ea18f04421a8648af719aabd25a4393f90182079186e48cef539b5621914c
 DIST elasticsearch-oss-6.7.1.tar.gz 68421385 BLAKE2B cf14f3babfc5dbe9de4c9e47c15b797ab7c73236936257043c435751a0d86348e34ee73d2a6785a9e1391edc1e00f9a56f922c368ef72a5d349175ee4735d43b SHA512 4865ebd3403593048b3f922769d6d09eb1d53a42cf206cdcba7c30e330b39d9bd57f9f0979a23fcf0ca7636d84ce85de210fdf655447fab7ecebb35bffdd3323
 DIST elasticsearch-oss-6.8.1.tar.gz 68419519 BLAKE2B cf34c4cf095b4271d067802df8130d66167e5f01fd0231361ce3e7f5e1023b39e6fbc325cc575f2c353a30b011127934b7b7a04f9a48998f88d27ce8a5560bf4 SHA512 cbcc81b8dd3a7a63c6e6574405417821c5dcd1a0b5df813818d39353fa29ea28e443db64b1a1938a1ffb23aa17d706e3edb6a46fdb24992b92f918d8d4f0c08a
+DIST elasticsearch-oss-6.8.3.tar.gz 68441884 BLAKE2B 45da3d4b027dcd36480d4d13de8d05bffaa69511b87b3558d58989449736639ec66fe38a9422a87f71245294fc52609f91c4e9b13907455946b04a9f5a386e71 SHA512 0a83a60c7959cad258453c12857d02e2adde7f2088dafd023bf6737180c3877e03012f6f582c6eb21da7385a74e9568676e0e1182eee0bfc6fa0c5c3598798fa
 DIST elasticsearch-oss-7.0.0-no-jdk-linux-x86_64.tar.gz 68788144 BLAKE2B 29206b277dc9997b155b54217f485c314a7efa35777bcb81908ce900e134e62d7ef14629cfeebcd3ebb724b76fe5380085ae6b50df46bdfddf5f657a0d2da3eb SHA512 ec9381d9310145b80fb2b8cdd7b7953ea7b2b45a66bf8435d8a982aed0eeb59f734f3936b4b40ec4530e106878d25c2f63d4ea7a734b12f1c8d86b39f7894963
 DIST elasticsearch-oss-7.2.0-no-jdk-linux-x86_64.tar.gz 68964879 BLAKE2B 6bebff074d9a22abaf1a7b669d9a47254a658f4954b2e27d4251860a0b8cd29f4bbc3baf217d7fb90c492d5dabce802b1e4d359531202e677ffcfd573b51b343 SHA512 a538c82dc177a66004912ce20b1b50ee1270e45b56879b4f0b7e2d4bfa00d9fe5c113b5e4927cb6f5669f8a1f2f4953c4bb12dc4a10510af4658bbcbcaba3cbc
 DIST elasticsearch-oss-7.2.1-no-jdk-linux-x86_64.tar.gz 68973563 BLAKE2B 5248a5e8443794134c55ef14d1b175ff931d599a45b4cbd0f187e864dd3d4b322f10df31672c0900417e84da0e83fd934234bba31dc116c5c3b6b9f14e9c62a6 SHA512 694aca59cc3e23bfcf41142d7bf3d3c75f6fcdb6d0a1b35157157cb2f4ac8152db1e424951e62ba1a2bd4a2d32a77bb9499085558b7e1580680c0de90fbc0902
+DIST elasticsearch-oss-7.3.2-no-jdk-linux-x86_64.tar.gz 69289138 BLAKE2B 2ab3658a2acf1899f44fb29252932862759dd134ffe4872daac15092f9a08b536492197b9cd44287ec48a7aaee1c3f78edf2957f807aaebac866bc835972a592 SHA512 abb183a05db25a877d4e5a8f8b75fba517444008f34e35e82806a6239c3ccec1c32dc787313b899be55caefdab8343a62db31f9491bffbabefaecccaba1210d0
 EBUILD elasticsearch-5.6.16.ebuild 1686 BLAKE2B 45ba9183eacdc9e25a9c640ea98a6c4bcaaa6894ac1fcf87874fa70205677a4a4991fe81b52934ab9b0e6243d967b653ded4c27ab157491eb6671e08855c3b31 SHA512 9198ef6590d77ca6817e504ee846a80aa2b2a0a440f57786fa63f3b2332480dc630207474c0e5d859dbb2c6a035f9db3a2f3a8ff965defba2fcb4c76ab4ca95d
 EBUILD elasticsearch-6.6.1.ebuild 2579 BLAKE2B 35aa006966938554dcea8f77202a355adde841a5faec231fda4615fb79f5968c89ea2519cd7f737071c37fab74b848e297e56951af23cc034dfc7839f4b65796 SHA512 fe8a12e1efb2b096b4ed7854d9da952af85797f8020bf843a01732040b07fefcf616fe50574f9faab2b89fa103a542b2cc83f44f9ebc42715dc81fe9c8a9c668
 EBUILD elasticsearch-6.7.1.ebuild 2579 BLAKE2B 35aa006966938554dcea8f77202a355adde841a5faec231fda4615fb79f5968c89ea2519cd7f737071c37fab74b848e297e56951af23cc034dfc7839f4b65796 SHA512 fe8a12e1efb2b096b4ed7854d9da952af85797f8020bf843a01732040b07fefcf616fe50574f9faab2b89fa103a542b2cc83f44f9ebc42715dc81fe9c8a9c668
 EBUILD elasticsearch-6.8.1.ebuild 2579 BLAKE2B 8581c232ba6a291994a61ef4c9406bfaf0fb6590fee36c60cab0d319a8a0472e2899fc2e136ab4267c1b6d6d52d601d4d4cb7fd5090ae05e46b63856dd986974 SHA512 956ab4ca9d9d5643ea3045cb15d6e98c6de74fe4bed56b4e44cca9a5b9073ad3d04fb24c8b7c04bb0dcee7f0a5baa9a44aea8e00999857fe51437e42bd6015a1
+EBUILD elasticsearch-6.8.3.ebuild 2539 BLAKE2B bbf97b9bfd59a523d6a15a1ce94b5143faf011ebfb62e89d07424bb56bef16f172d3770516d7b170d7469d67f0b3462251778c60621f3472fe3d966bddc3f778 SHA512 dcd7a9909aee6c957e53154e34308e0df6ca3f7b02d815a9df7ea861fbe8753dbba46bd32c63c819dbb13f194eba909058ba18b7e3a6a6cce24cb1e50b2d9b70
 EBUILD elasticsearch-7.0.0.ebuild 2570 BLAKE2B 34f783dfea91989cb241fa8f1e94c209509bc87d9d63c754507d23aeb3b10d1dc97819764505227982b4721eb73280f9dc01b59034bcdbbc31fea0b454a1ab2f SHA512 59a97e54612b663302de40f5a94c7ee03c046f9642ea2d3966a53723c11e0b224a125443983bbf31eb9ffbbb372f90fdfbbd1239f283b3268af590c029da42bc
 EBUILD elasticsearch-7.2.0.ebuild 2478 BLAKE2B 152933e675b5d159de07e31592f883d16206201b844056c3e27ba69b27769700ff0891938e017deb0600d3be08b1d172d2856b482b7a98887f648ef54f151e49 SHA512 de5df3dae8215eb3fa3cb2306a0da5b87e3dd4135b8cbf663fd297d6b8e074b643b4c611f34da5ac87fce7658b46efc7803ff92f97b44cd88ae6af5d98fd5e8c
 EBUILD elasticsearch-7.2.1.ebuild 2478 BLAKE2B 5e3b853ed335f7a691a664a3dc1b6e8307d09be38b97c7a632a4d857c059fded6e1f20ceadc6fc6afe99d7bbad3dfb2f041ade09d62e39733e62d87fd4cefed0 SHA512 c634e16b86ddbd3b3cb689c467aa992bb9a78179e93ef190547a8d55e511a30c47c3459df2d3dd55c865cd9ce96bb48497c683c1bd4875967a3a0838f8a09341
+EBUILD elasticsearch-7.3.2.ebuild 2438 BLAKE2B 430878ac0dd8fb2d67694248c24d01399e2bfc66bed965b5c785c155d36a69b5870d54de0c6ea04bf6325e3a7e6203d2a61e167e1cce09ae5d7758b132e0296e SHA512 df94298047f304b0b30a9f6bb4b623a4c08bec91f9b19b06c02efc787788ffaaf89196338851288baa081a7a67db954b9db991b77aaee8ce059bb1b8b7d8d032
 MISC metadata.xml 567 BLAKE2B 3123e01d77b67569afb2bb4908b38c702ebe1d308ea236b8ebba11709bc421af27ec29d72398a3af0aaefb39a2a2f34e27bffbbd1b3306dbc299e49bfd48cd35 SHA512 74669ea5437ad23c604c82a734973d58a31d78f0f4a2b7e2db655d884bf017d32ea25e451517601b35d406789e661ed2e173752bc232a03c3564e971c5a83a0c
diff --git a/app-misc/elasticsearch/elasticsearch-6.8.3.ebuild b/app-misc/elasticsearch/elasticsearch-6.8.3.ebuild
new file mode 100644
index 000000000000..f2652b931f0e
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-6.8.3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${P}.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}.tar.gz )"
+LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RDEPEND="acct-group/elasticsearch
+	acct-user/elasticsearch
+	virtual/jre:1.8"
+
+QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
+
+src_prepare() {
+	default
+
+	rm bin/*.{bat,exe} LICENSE.txt NOTICE.txt || die
+	rmdir logs || die
+
+	if use x-pack; then
+		rm bin/x-pack/*.bat || die
+		rm -r modules/x-pack-ml/platform/{darwin,windows}-x86_64 || die
+	fi
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /etc/${PN}/scripts
+
+	insinto /etc/${PN}
+	doins -r config/.
+	rm -r config || die
+
+	fowners root:${PN} /etc/${PN}
+	fperms 2750 /etc/${PN}
+
+	insinto /usr/share/${PN}
+	doins -r .
+
+	exeinto /usr/share/${PN}/bin
+	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
+
+	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
+
+	if use x-pack; then
+		chmod +x "${ED}"/usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin/* || die
+	fi
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+	dodir /usr/share/${PN}/plugins
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
+
+	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.6" ${PN}
+
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
+	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
+}
+
+pkg_postinst() {
+	elog
+	elog "You may create multiple instances of ${PN} by"
+	elog "symlinking the init script:"
+	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
+	elog
+	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
+	elog "from /etc/${PN} into the configuration directory of the instance:"
+	elog "/etc/${PN}/instance"
+	elog
+	ewarn "Please make sure you have proper permissions on /etc/${PN}"
+	ewarn "prior to keystore generation or you may experience startup fails."
+	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
+	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
+}
diff --git a/app-misc/elasticsearch/elasticsearch-7.3.2.ebuild b/app-misc/elasticsearch/elasticsearch-7.3.2.ebuild
new file mode 100644
index 000000000000..4c17fb08c836
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-7.3.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${P}-no-jdk-linux-x86_64.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}-no-jdk-linux-x86_64.tar.gz )"
+LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RDEPEND="acct-group/elasticsearch
+	acct-user/elasticsearch
+	virtual/jre"
+
+QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
+
+src_prepare() {
+	default
+
+	rm LICENSE.txt NOTICE.txt || die
+	rmdir logs || die
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /etc/${PN}/scripts
+
+	insinto /etc/${PN}
+	doins -r config/.
+	rm -r config || die
+
+	fowners root:${PN} /etc/${PN}
+	fperms 2750 /etc/${PN}
+
+	insinto /usr/share/${PN}
+	doins -r .
+
+	exeinto /usr/share/${PN}/bin
+	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
+
+	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
+
+	if use x-pack; then
+		chmod +x "${ED}"/usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin/* || die
+	fi
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+	dodir /usr/share/${PN}/plugins
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
+
+	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.7" ${PN}
+
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
+	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
+}
+
+pkg_postinst() {
+	elog
+	elog "You may create multiple instances of ${PN} by"
+	elog "symlinking the init script:"
+	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
+	elog
+	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
+	elog "from /etc/${PN} into the configuration directory of the instance:"
+	elog "/etc/${PN}/instance"
+	elog
+	ewarn "Please make sure you have proper permissions on /etc/${PN}"
+	ewarn "prior to keystore generation or you may experience startup fails."
+	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
+	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
+}
diff --git a/app-misc/elasticsearch/files/elasticsearch-systemd-pre-exec b/app-misc/elasticsearch/files/elasticsearch-systemd-pre-exec
index 30f773638d37..30f773638d37 100755..100644
--- a/app-misc/elasticsearch/files/elasticsearch-systemd-pre-exec
+++ b/app-misc/elasticsearch/files/elasticsearch-systemd-pre-exec
diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest
index 1737462264ed..7b8e831af9bd 100644
--- a/app-misc/lcdproc/Manifest
+++ b/app-misc/lcdproc/Manifest
@@ -1,6 +1,3 @@
-AUX 0.5.1-LCDd.initd 533 BLAKE2B 65263278bb7bd6cbba7d4c599cefd3735dd5d16ad0d56c130cf035286c7fe6d19c546d43662a513e73eeeaae154f6f24aecd534531e960cf67c6cade635bc8b0 SHA512 66e6ac519ca9919dc1321cdfbac3c8a54be681f534dcdfd06b5ec90c859a14694c6a6925983c3be58f2aa8d6391028fd8d978d7641710a23394ae87dca892900
-AUX 0.5.1-lcdproc.initd 364 BLAKE2B 62cae56b4e7093e7866a3f0f4d64d949930566f4434fb9dc1d6fc104b793f7d4762c3697409de429e8cb73aa0b6ed3cdaa05195acfc594eb25ac61aa47aec7e7 SHA512 4dce2d2e3d18c8fb57c7a84b2f9b7c67b8721e751af1a79fe60107a1559baacbf3531d5a495f68dd2ed890f9dd6d1834b51363e9ae96b606245bd2dc72680e34
-AUX 0.5.2-r2-lcdproc.initd 382 BLAKE2B 9e050b785119e23a749f52a893d2672cab608e7a5881319e1dc230e77ad9ce647f7258d86a8a710aebaf3de94fb691c1e974c21b2445453cd6bd5ca3c0ae3bec SHA512 9dc7667af52a2e95a28ee07c7646a124b46019643df19becc8f129da553a70b40c534b6c73057c73238efd232e98f02372d55a92135fccd9c297d776c53d3767
 AUX LCDd.initd 310 BLAKE2B 415321c1b8c80016f21e283339e21c6adbbb92dbf99649846044f329f23853b603878058f636695ff5c4c8d52938077a46d02c915ed5b225e086b87b5379d6ba SHA512 7ea73b919e81d98d5732624912195f06f711dc34112ae2c5079d325c58409521d6049dbb541d7ae701bf0ce6c9a1f13a8aa0929ef4a7d9184c176f9f3ab3bfc8
 AUX LCDd.service 166 BLAKE2B ef3d9a7af9e8e8d8bb54e11110dbcb44c968cbc8fec63529f86dbb0a027154997d12e927405ca228a5740fcadc7518448c640ddbe5f38eabee1b7698b17b3035 SHA512 d09829efb26c9b8ca01f6cd07f704d55d05b3328866c169251683b1343ec37e569f95ad14b3b51e2d832ea7b0d3eba5579cec02decb86504016e535a61d7ea46
 AUX lcdexec.initd 325 BLAKE2B 7a7b48e2e24c763533934bca78debd36a1fb6146f6e72204777f50d7dc962a519ab06ef0bc9b1c91b36cd726b67679e7a94d2edbd28bd524ecccf6d20f6a53de SHA512 f8bf380b2e452e830cc3805f297d06c4cdf623db91eff310da2b20cd87cd87ef850c1c7e5b843044333167fa8724acb8de8d65752328ec4144b486d0bed6bfce
@@ -9,14 +6,7 @@ AUX lcdproc-0.5.9-fix-parallel-make.patch 910 BLAKE2B 5a9daa1871e64b4bfcc7ea2fbc
 AUX lcdproc-0.5.9-use-freetype2-pkg-config.patch 552 BLAKE2B afa135d8abb2bb47f75f5306ed26a5447289618575c26873bf5335c94286c36dc0444b2ef8b74dd7087b0a3d2529602c25de680ff534df303e094a90f258f8bd SHA512 d5922c61274b420dc3138c5345868924ab7562f7aaa267068c925b4c36b74309ce8132103e265cdfc5b84cb6f3d6f5bea7036c617e14e7a22aa32c360202014e
 AUX lcdproc.initd 325 BLAKE2B 405944d2808e308c27732ef9e75d65e388616596ede330848a66d9135c6dfd48101534159c344a3b4afc1fbba9694f412e5a82ed8cc3a9a2cff0a74754348192 SHA512 057c0f6aef2d6e09c3707382f281888738d7e30f25f151f0588c5a678e34f5bc2e2f11a44fe1c4e30ba13c18504e8578f45b92c3ce5822259f9e9a9cba8a6ae9
 AUX lcdproc.service 171 BLAKE2B aca4177b065f31aab4c940629850f7045ff7a9420975f8555f1dad9071cb58a17be8123c4a72f26e6a366ca0edd5581724b16bb3fbc4e0457c9016af802a18f2 SHA512 c71684ad0ff7b81466922676fd8612f6f8ec6641c4504089efb1a335d5f7eccbcce010de1e0c7a33dc07d9cd8abf80a3f5d0118fc7c711fe592ef9f98643a629
-DIST lcdproc-0.5.2-patches.tar.gz 6571 BLAKE2B 11cc34b39ceed329ba1aa9d0750a5c90dc0ff33f0650a3e285fd534b54928dc5f6d93854e530c249ed61fa1dde2cd369b32df82dbcb6c4ab3e6d1844672a5692 SHA512 d872099e524ed99525b642783d413f0cbff68aceb30857a4b7078390be9f98aa3acfa23c72e4455802376bc1bedb20019fa8a79e97066e2a1e97b5d68fbcd975
-DIST lcdproc-0.5.2.tar.gz 822695 BLAKE2B f7065c2d6ee1c6305d3682166bb2b4920a9f0ac2a079b57389f76edf75c81fa9ebe954358b216dbad866e2daa10f95857106e125cc54a9207a98553f408ae77b SHA512 e21a1f2d3d5f53aa09477e9aea1f9685c1fe224a8f79f15d0d032214de211c51619a9eea9183743c024859349d481fe35d7999cc51e0de81dc2fa8e0c85d7a5d
-DIST lcdproc-0.5.5.tar.gz 946206 BLAKE2B eb9e1248e84d4c9352a39991a1125e74cbfee9094d19a75da4298811120fcf2ef8fef056b35873b6308af79f92eb9187e504f43c4b28c07ca402de2c5d8fdc97 SHA512 42500188adb018547db4db4a472dded478a03f19974843865e07a466870fbca409b4259b57366b7dfdd4a5fd444a89c1930032d1127ae036128dbd9279a24b29
-DIST lcdproc-0.5.6.tar.gz 998996 BLAKE2B 022ce656390caea0c9394ca7a5458f7285e2655f53c49f6fa7d9f94c0638f9f97cc70af66bb779a6b7ca8024b70c2865d51719b72918a4a7da3f6af7d4451976 SHA512 7c506b4691c8544855dadf939863672230c3e0903bbe4bbde82df04ff932f818cdc406c5b159554ec155d0c46fff23d435121298f4e19bac73658b121c6b8220
 DIST lcdproc-0.5.9.tar.gz 1091292 BLAKE2B 10b26fc803cf14bf301177336bd14497131440f129d16fa75cbb4782da839eb3a3835091d7c211cfc75d35f07823a1c301cf7ebfae25f2a344d0dfcaf894ca17 SHA512 48e11a587570376b9524591f4c23deace9ac1609b83ba9e17f2a4e950d5598f8f88b580ca01c174ec9c2ef98b1eef7ac274c23ca3541d4d7ff918af0598c6a25
 DIST linux_input.docbook 1764 BLAKE2B 8e82173d0169e2e79f2625b7bd572409b10fff1ac1a6ebd59527887e3568aad2aa459bb225d95af5e7b2a24b23671d8e7b3a78fdadc7a70e2fe33a36129bed32 SHA512 9b0579713c6d084fa9e0adee6c04387a3f91375f2cbcf2c7e47c01238df07e355330ebeb98081fd296279980fa808e4943c958772891559731465a9e75436ec0
-EBUILD lcdproc-0.5.2-r1.ebuild 5511 BLAKE2B eaa3431092a1e7794f24b7905e1c6c61a9d268179dfb093bd17a99aeb9a80a88ad9569a29ab8126db6bfeccd54369cce46513a3b625d15e8cdb7c9bc7003a7de SHA512 8a97517fa76ff856a7b56266efd77be52c269c1e651d7ff2bf836554be7bac84db3e0021d18a73592dfcb054a99f9efe7ca4de11f683d59f6a829523aae3f684
-EBUILD lcdproc-0.5.5.ebuild 5888 BLAKE2B 05f74abb99fba00d7cc2b2d633d0c41a743fe0537426b4997970d7fb2df1c89c5bb18e00ae24b7979a51de365f761672516ee266a6b570ed15deec484a8c8403 SHA512 3141859061d9a3d46814e361022c017ad1fab8eb92cad8a3561f371d03eef033908bd5d85391da5aa7a445309006a998699e2e5e412025ca074df5fd0f5ce130
-EBUILD lcdproc-0.5.6-r1.ebuild 6083 BLAKE2B 6d2a29febe9e6ba72fc254fb6d7c34f850dcf5b87f2115d01713b1eeac3b91b0e9004e2306b56774fe64cdbb261822dae08f50490d756a3f7cd2c58c9f52c006 SHA512 b18c7ccd63592c303081500055ada6e08c408002e0ed52e4a14fd6b799d0c70566104380eeaf1422fab424a9a68176fd37dcb2f99d614efb72587711476cd738
 EBUILD lcdproc-0.5.9.ebuild 6435 BLAKE2B b158f60e808abfe2f157dda515cd1a2d689936c524282a7d54e949e97d8cf158cbfc0b5db646036f7ed0da6738b2c23bb81f6ac4c0ce4ebe9f1f3020d340c0fd SHA512 b7287a7aaefc61f70dce9c54a90ef59d7272b6e5a3172cbb73ba6bfbc05f27b70f790bdc1ef6a03ade1b413f1aedeea811a1d79d9d4167c7a5cc9309a7af8c9c
-MISC metadata.xml 2157 BLAKE2B 4b4539bd61cdb9e6026a2b32552035f1601436867310469569875275dde9d8c55c2a0a8f161a545ddfa12608351360c3578539699cc0df3701b7af7fbeaef001 SHA512 70fb2fb6503b81394926e44a3d0110cae6955185b2c8d9f40ee9d37c8a967bbc0207318fa17076aa53cb3fa20c5f93e309729b763dc879604df9a8021216c733
+MISC metadata.xml 1657 BLAKE2B 451feff202b2689815732765bb51e50c4e034702b674dd43f37294be9cdfa18f674af05aa067ae12956b41a15bde33c9fd3577fc181cde39b2ca4ae6eb578011 SHA512 fe207c4c26c9eb6140d165b9ddd0826bbdc1ff38f60f1cf97ede90ed601d52c94c4f302b429ab40709cb097e756e09387b7dba8c81eb052b2f8890c6a0006bed
diff --git a/app-misc/lcdproc/files/0.5.1-LCDd.initd b/app-misc/lcdproc/files/0.5.1-LCDd.initd
deleted file mode 100644
index 9cc32667eb94..000000000000
--- a/app-misc/lcdproc/files/0.5.1-LCDd.initd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use net
-	use g15daemon
-}
-
-start() {
-	ebegin "Starting LCDd"
-	start-stop-daemon --start --quiet -m --pidfile /var/run/LCDd.pid \
-		--background --exec /usr/sbin/LCDd -- -s 1 -f
-	eend $? "Failed to start LCDd. Did you remember to set a driver in /etc/LCDd.conf? See syslog for details."
-}
-
-stop() {
-	ebegin "Stopping LCDd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/LCDd.pid
-	eend $?
-}
diff --git a/app-misc/lcdproc/files/0.5.1-lcdproc.initd b/app-misc/lcdproc/files/0.5.1-lcdproc.initd
deleted file mode 100644
index ab23fb806efd..000000000000
--- a/app-misc/lcdproc/files/0.5.1-lcdproc.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend(){
-	use LCDd
-}
-
-start() {
-	ebegin "Starting lcdproc"
-	start-stop-daemon --start --background \
-		--exec /usr/bin/lcdproc
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping lcdproc"
-	start-stop-daemon --stop --exec /usr/bin/lcdproc
-	eend $?
-}
diff --git a/app-misc/lcdproc/files/0.5.2-r2-lcdproc.initd b/app-misc/lcdproc/files/0.5.2-r2-lcdproc.initd
deleted file mode 100644
index 2e00eb86bdd8..000000000000
--- a/app-misc/lcdproc/files/0.5.2-r2-lcdproc.initd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend(){
-	use LCDd
-	after ntp-client
-}
-
-start() {
-	ebegin "Starting lcdproc"
-	start-stop-daemon --start --background \
-		--exec /usr/bin/lcdproc
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping lcdproc"
-	start-stop-daemon --stop --exec /usr/bin/lcdproc
-	eend $?
-}
diff --git a/app-misc/lcdproc/lcdproc-0.5.2-r1.ebuild b/app-misc/lcdproc/lcdproc-0.5.2-r1.ebuild
deleted file mode 100644
index 9dfadf6234ce..000000000000
--- a/app-misc/lcdproc/lcdproc-0.5.2-r1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-WANT_AUTOMAKE="1.9"
-inherit eutils autotools multilib
-
-DESCRIPTION="Client/Server suite to drive all kinds of LCD (-like) devices"
-HOMEPAGE="http://lcdproc.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/${P}-patches.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-IUSE="doc debug nfs samba seamless-hbars usb lirc irman joystick"
-
-# The following array holds the USE_EXPANDed keywords
-IUSE_LCD_DEVICES=(ncurses bayrad cfontz cfontz633 cfontzpacket
-	cwlinux eyeboxone g15 graphlcd glk
-	hd44780 icpa106 imon iowarrior
-	lb216 lcdm001 lcterm
-	md8800 ms6931 mtcs16209x mtxorb noritakevfd
-	pyramid sed1330 sed1520 serialvfd sli
-	stv5730 svga t6963 text tyan
-	ula200 xosd ea65 picolcd serialpos )
-
-# Iterate through the array and add the lcd_devices_* that we support
-NUM_DEVICES=${#IUSE_LCD_DEVICES[@]}
-index=0
-while [ "${index}" -lt "${NUM_DEVICES}" ] ; do
-	IUSE="${IUSE} lcd_devices_${IUSE_LCD_DEVICES[${index}]}"
-	let "index = ${index} + 1"
-done
-
-RDEPEND="
-	usb?      ( =virtual/libusb-0* )
-	lirc?     ( app-misc/lirc )
-	irman?    ( media-libs/libirman )
-
-	lcd_devices_graphlcd?  ( app-misc/graphlcd-base  app-misc/glcdprocdriver )
-	lcd_devices_g15?      ( dev-libs/libg15  >=dev-libs/libg15render-1.1.1 )
-	lcd_devices_ncurses?   ( sys-libs/ncurses )
-	lcd_devices_svga?     ( media-libs/svgalib )
-	lcd_devices_ula200?   ( >=dev-embedded/libftdi-0.7 =dev-embedded/libftdi-0* =virtual/libusb-0* )
-	lcd_devices_xosd?     ( x11-libs/xosd  x11-libs/libX11  x11-libs/libXext )
-	lcd_devices_cfontzpacket? ( =virtual/libusb-0* )
-	lcd_devices_cwlinux?    ( =virtual/libusb-0* )
-	lcd_devices_pyramid?  ( =virtual/libusb-0* )
-	lcd_devices_picolcd?  ( =virtual/libusb-0* )"
-DEPEND="${RDEPEND}
-	doc?      ( app-text/xmlto )"
-RDEPEND="${RDEPEND}
-	lcd_devices_g15?      ( app-misc/g15daemon )"
-
-pkg_setup() {
-	if [ -n "${LCDPROC_DRIVERS}" ] ; then
-		ewarn "Setting the drivers to compile via LCDPROC_DRIVERS is not supported anymore."
-		ewarn "Please use LCD_DEVICES now and see emerge -pv output for the options."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${WORKDIR}/${P}-patches/${PV}-picolcd.patch"
-
-	sed -i "79s:server/drivers:/usr/$(get_libdir)/lcdproc:" LCDd.conf
-	einfo "Patching LCDd.conf to use DriverPath=/usr/$(get_libdir)/lcdproc/"
-
-	eautoreconf
-}
-
-src_compile() {
-	# This array contains the driver names required by configure --with-drivers=
-	# The positions must be the same as the corresponding use_expand flags
-	local DEVICE_DRIVERS=(curses bayrad CFontz CFontz633 CFontzPacket
-		CwLnx EyeboxOne g15 glcdlib glk
-		hd44780 icp_a106 imon IOWarrior
-		lb216 lcdm001 lcterm
-		MD8800 ms6931 mtc_s16209x MtxOrb NoritakeVFD
-		pyramid sed1330 sed1520 serialVFD sli
-		stv5730 svga t6963 text tyan
-		ula200 xosd ea65 picolcd serialPOS)
-
-	# Generate comma separated list of drivers
-	COMMA_DRIVERS=""
-	FIRST_DRIVER=""
-	local index=0
-
-	while [ "${index}" -lt "${NUM_DEVICES}" ] ; do
-		if use "lcd_devices_${IUSE_LCD_DEVICES[${index}]}" ; then
-			append-driver "${DEVICE_DRIVERS[${index}]}"
-		fi
-		let "index = ${index} + 1"
-	done
-
-	# Append the not-lcd-drivers (input)
-	use lirc && append-driver "lirc"
-	use irman && append-driver "irman"
-	use joystick && append-driver "joy"
-
-	if [ -z "${COMMA_DRIVERS}" ] ; then
-		ewarn "You are compiling LCDd without support for any LCD drivers at all."
-	else
-		# Patch the config to contain a driver that is actually installed instead of the default
-		elog "Compiling the following drivers for LCDd: ${COMMA_DRIVERS}"
-		elog "Setting Driver=${FIRST_DRIVER} in LCDd.conf"
-		sed -i "44s:curses:${FIRST_DRIVER}:" LCDd.conf
-	fi
-
-	local ENABLEUSB
-	if use lcd_devices_cfontzpacket || use lcd_devices_cwlinux || use lcd_devices_pyramid; then
-		ENABLEUSB="--enable-libusb"
-	else
-		ENABLEUSB="$(use_enable usb libusb)"
-	fi
-
-	econf \
-		$(use_enable debug) \
-		$(use_enable nfs stat-nfs) \
-		$(use_enable samba stat-smbfs ) \
-		$(use_enable seamless-hbars) \
-		${ENABLEUSB} \
-		"--enable-drivers=${COMMA_DRIVERS}"  \
-		|| die "configure failed"
-
-	emake || die "make failed"
-
-	if use doc; then
-		ebegin "Creating user documentation"
-		cd "${S}"/docs/lcdproc-user
-		xmlto html --skip-validation lcdproc-user.docbook
-		eend $?
-
-		ebegin "Creating dev documentation"
-		cd "${S}"/docs/lcdproc-dev
-		xmlto html --skip-validation lcdproc-dev.docbook
-		eend $?
-	fi
-}
-
-append-driver() {
-	[[ -z $* ]] && return 0
-	if [ -z "${COMMA_DRIVERS}" ] ; then
-		# First in the list
-		COMMA_DRIVERS="$*"
-		FIRST_DRIVER="$*"
-	else
-		# Second, third, ... include a comma at the front
-		COMMA_DRIVERS="${COMMA_DRIVERS},$*"
-	fi
-	return 0
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	# move example clients installed to /usr/bin
-	rm -f "${D}"/usr/bin/{tail,lcdmetar,iosock,fortune,x11amp}.pl
-	insinto /usr/share/lcdproc/clients
-	doins clients/examples/*.pl
-	doins clients/metar/
-
-	newinitd "${FILESDIR}/0.5.1-LCDd.initd" LCDd
-	newinitd "${FILESDIR}/0.5.1-lcdproc.initd" lcdproc
-
-	dodoc README CREDITS ChangeLog INSTALL TODO
-	dodoc docs/README.* docs/*.txt
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}/lcdproc-user
-		doins docs/lcdproc-user/*.html
-		insinto /usr/share/doc/${PF}/lcdproc-dev
-		doins docs/lcdproc-dev/*.html
-	fi
-}
-
-pkg_postinst() {
-	ewarn "IMPORTANT: Please update your /etc/LCDd.conf"
-	ewarn "As of lcdproc-0.5.1-r2, the DriverPath changed from /usr/share/lcdproc to /usr/$(get_libdir)/lcdproc ."
-}
diff --git a/app-misc/lcdproc/lcdproc-0.5.5.ebuild b/app-misc/lcdproc/lcdproc-0.5.5.ebuild
deleted file mode 100644
index 07326bd3f021..000000000000
--- a/app-misc/lcdproc/lcdproc-0.5.5.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit multilib versionator
-
-MY_PV=$(replace_version_separator 3 '-')
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Client/Server suite to drive all kinds of LCD (-like) devices"
-HOMEPAGE="http://lcdproc.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE="doc debug hid nfs samba seamless-hbars usb lirc irman joystick ftdi"
-
-# The following array holds the USE_EXPANDed keywords
-IUSE_LCD_DEVICES=(ncurses bayrad cfontz cfontz633 cfontzpacket
-	cwlinux eyeboxone g15 graphlcd glk
-	hd44780 icpa106 imon imonlcd iowarrior
-	lb216 lcdm001 lcterm
-	md8800 mdm166a ms6931 mtcs16209x mtxorb noritakevfd
-	pyramid sed1330 sed1520 serialvfd sli
-	stv5730 SureElec svga t6963 text tyan
-	ula200 xosd ea65 picolcd serialpos
-	i2500vfd irtrans lis shuttlevfd )
-
-# Iterate through the array and add the lcd_devices_* that we support
-NUM_DEVICES=${#IUSE_LCD_DEVICES[@]}
-index=0
-while [ "${index}" -lt "${NUM_DEVICES}" ] ; do
-	IUSE="${IUSE} lcd_devices_${IUSE_LCD_DEVICES[${index}]}"
-	let "index = ${index} + 1"
-done
-
-REQUIRED_USE="lcd_devices_mdm166a? ( hid )"
-
-RDEPEND="
-	usb?      ( virtual/libusb:0 )
-	ftdi?     ( dev-embedded/libftdi:0 )
-	lirc?     ( app-misc/lirc )
-	irman?    ( media-libs/libirman )
-	hid?	  ( >=dev-libs/libhid-0.2.16 )
-
-	lcd_devices_graphlcd?  ( app-misc/graphlcd-base  app-misc/glcdprocdriver )
-	lcd_devices_g15?       ( dev-libs/libg15  dev-libs/libg15render )
-	lcd_devices_ncurses?   ( sys-libs/ncurses )
-	lcd_devices_svga?      ( media-libs/svgalib )
-	lcd_devices_ula200?    ( dev-embedded/libftdi:0 )
-	lcd_devices_xosd?      ( x11-libs/xosd  x11-libs/libX11  x11-libs/libXext )
-	lcd_devices_cfontzpacket? ( virtual/libusb:0 )
-	lcd_devices_cwlinux?    ( virtual/libusb:0 )
-	lcd_devices_pyramid?    ( virtual/libusb:0 )
-	lcd_devices_picolcd?    ( virtual/libusb:0 )
-	lcd_devices_i2500vfd?   ( dev-embedded/libftdi:0 )
-	lcd_devices_lis?        ( dev-embedded/libftdi:0 virtual/libusb:0 )
-	lcd_devices_shuttlevfd? ( virtual/libusb:0 )"
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto
-	       app-text/docbook-xml-dtd:4.5 )"
-RDEPEND="${RDEPEND}
-	lcd_devices_g15?      ( app-misc/g15daemon )"
-
-pkg_setup() {
-	if [ -n "${LCDPROC_DRIVERS}" ] ; then
-		ewarn "Setting the drivers to compile via LCDPROC_DRIVERS is not supported anymore."
-		ewarn "Please use LCD_DEVICES now and see emerge -pv output for the options."
-	fi
-}
-
-src_prepare() {
-	sed -i "37s:server/drivers:/usr/$(get_libdir)/lcdproc:" LCDd.conf || die
-	einfo "Patching LCDd.conf to use DriverPath=/usr/$(get_libdir)/lcdproc/"
-}
-
-src_configure() {
-	# This array contains the driver names required by configure --with-drivers=
-	# The positions must be the same as the corresponding use_expand flags
-	local DEVICE_DRIVERS=(curses bayrad CFontz CFontz633 CFontzPacket
-		CwLnx EyeboxOne g15 glcdlib glk
-		hd44780 icp_a106 imon imonlcd IOWarrior
-		lb216 lcdm001 lcterm
-		MD8800 mdm166a ms6931 mtc_s16209x MtxOrb NoritakeVFD
-		pyramid sed1330 sed1520 serialVFD sli
-		stv5730 SureElec svga t6963 text tyan
-		ula200 xosd ea65 picolcd serialPOS
-		i2500vfd irtrans lis shuttleVFD )
-
-	# Generate comma separated list of drivers
-	COMMA_DRIVERS=""
-	FIRST_DRIVER=""
-	local index=0
-
-	while [ "${index}" -lt "${NUM_DEVICES}" ] ; do
-		if use "lcd_devices_${IUSE_LCD_DEVICES[${index}]}" ; then
-			append-driver "${DEVICE_DRIVERS[${index}]}"
-		fi
-		let "index = ${index} + 1"
-	done
-
-	# Append the not-lcd-drivers (input)
-	use lirc && append-driver "lirc"
-	use irman && append-driver "irman"
-	use joystick && append-driver "joy"
-
-	if [ -z "${COMMA_DRIVERS}" ] ; then
-		ewarn "You are compiling LCDd without support for any LCD drivers at all."
-	else
-		# Patch the config to contain a driver that is actually installed instead of the default
-		elog "Compiling the following drivers for LCDd: ${COMMA_DRIVERS}"
-		elog "Setting Driver=${FIRST_DRIVER} in LCDd.conf"
-		sed -i "53s:curses:${FIRST_DRIVER}:" LCDd.conf || die
-	fi
-
-	local EXTRA_CONF
-	if use lcd_devices_cfontzpacket || use lcd_devices_cwlinux || use lcd_devices_pyramid || \
-		use lcd_devices_picolcd || use lcd_devices_lis || use lcd_devices_shuttlevfd ; then
-		EXTRA_CONF="--enable-libusb"
-	else
-		EXTRA_CONF="$(use_enable usb libusb)"
-	fi
-
-	if use lcd_devices_ula200 || use lcd_devices_i2500vfd || use lcd_devices_lis ; then
-		EXTRA_CONF="${EXTRA_CONF} --enable-libftdi"
-	else
-		EXTRA_CONF="${EXTRA_CONF} $(use_enable ftdi libftdi)"
-	fi
-
-	econf --enable-extra-charmaps \
-		$(use_enable debug) \
-		$(use_enable nfs stat-nfs) \
-		$(use_enable samba stat-smbfs ) \
-		$(use_enable seamless-hbars) \
-		${EXTRA_CONF} \
-		"--enable-drivers=${COMMA_DRIVERS}"
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		ebegin "Creating user documentation"
-		cd "${S}"/docs/lcdproc-user
-		xmlto html --skip-validation lcdproc-user.docbook
-		eend $?
-
-		ebegin "Creating dev documentation"
-		cd "${S}"/docs/lcdproc-dev
-		xmlto html --skip-validation lcdproc-dev.docbook
-		eend $?
-	fi
-}
-
-append-driver() {
-	[[ -z $* ]] && return 0
-	if [ -z "${COMMA_DRIVERS}" ] ; then
-		# First in the list
-		COMMA_DRIVERS="$*"
-		FIRST_DRIVER="$*"
-	else
-		# Second, third, ... include a comma at the front
-		COMMA_DRIVERS="${COMMA_DRIVERS},$*"
-	fi
-	return 0
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# move example clients installed to /usr/bin
-	rm -f "${D}"/usr/bin/{tail,lcdmetar,iosock,fortune,x11amp}.pl
-	insinto /usr/share/lcdproc/clients
-	doins clients/examples/*.pl
-	doins clients/metar/*.pl
-
-	newinitd "${FILESDIR}/0.5.1-LCDd.initd" LCDd
-	newinitd "${FILESDIR}/0.5.2-r2-lcdproc.initd" lcdproc
-
-	dodoc README CREDITS ChangeLog INSTALL TODO
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}/lcdproc-user
-		doins docs/lcdproc-user/*.html
-		insinto /usr/share/doc/${PF}/lcdproc-dev
-		doins docs/lcdproc-dev/*.html
-	fi
-}
diff --git a/app-misc/lcdproc/lcdproc-0.5.6-r1.ebuild b/app-misc/lcdproc/lcdproc-0.5.6-r1.ebuild
deleted file mode 100644
index 1a748f898607..000000000000
--- a/app-misc/lcdproc/lcdproc-0.5.6-r1.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib versionator
-
-MY_PV=$(replace_version_separator 3 '-')
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Client/Server suite to drive all kinds of LCD (-like) devices"
-HOMEPAGE="http://lcdproc.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE="debug doc ftdi hid irman joystick lirc nfs png samba seamless-hbars truetype usb"
-
-# The following array holds the USE_EXPANDed keywords
-IUSE_LCD_DEVICES=(ncurses bayrad cfontz cfontzpacket
-	cwlinux eyeboxone g15 graphlcd glk
-	hd44780 icpa106 imon imonlcd iowarrior
-	lb216 lcdm001 lcterm
-	md8800 mdm166a ms6931 mtcs16209x mtxorb noritakevfd
-	pyramid sdeclcd sed1330 sed1520 serialvfd sli
-	stv5730 SureElec svga t6963 text tyan
-	ula200 vlsys_m428 xosd ea65 picolcd serialpos
-	i2500vfd irtrans lis shuttlevfd )
-
-# Iterate through the array and add the lcd_devices_* that we support
-NUM_DEVICES=${#IUSE_LCD_DEVICES[@]}
-index=0
-while [ "${index}" -lt "${NUM_DEVICES}" ] ; do
-	IUSE="${IUSE} lcd_devices_${IUSE_LCD_DEVICES[${index}]}"
-	let "index = ${index} + 1"
-done
-
-REQUIRED_USE="lcd_devices_mdm166a? ( hid )"
-
-RDEPEND="
-	ftdi?     ( dev-embedded/libftdi:0 )
-	hid?	  ( >=dev-libs/libhid-0.2.16 )
-	irman?    ( media-libs/libirman )
-	lirc?     ( app-misc/lirc )
-	png?      ( media-libs/libpng:0 )
-	truetype? ( media-libs/freetype:2 )
-	usb?      ( virtual/libusb:0 )
-
-	lcd_devices_graphlcd?  ( app-misc/graphlcd-base  app-misc/glcdprocdriver dev-libs/serdisplib )
-	lcd_devices_g15?       ( dev-libs/libg15  dev-libs/libg15render )
-	lcd_devices_ncurses?   ( sys-libs/ncurses:= )
-	lcd_devices_svga?      ( media-libs/svgalib )
-	lcd_devices_ula200?    ( dev-embedded/libftdi:0 )
-	lcd_devices_xosd?      ( x11-libs/xosd  x11-libs/libX11  x11-libs/libXext )
-	lcd_devices_cfontzpacket? ( virtual/libusb:0 )
-	lcd_devices_cwlinux?    ( virtual/libusb:0 )
-	lcd_devices_pyramid?    ( virtual/libusb:0 )
-	lcd_devices_picolcd?    ( virtual/libusb:0 )
-	lcd_devices_i2500vfd?   ( dev-embedded/libftdi:0 )
-	lcd_devices_lis?        ( dev-embedded/libftdi:0 virtual/libusb:0 )
-	lcd_devices_shuttlevfd? ( virtual/libusb:0 )"
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto
-	       app-text/docbook-xml-dtd:4.5 )"
-RDEPEND="${RDEPEND}
-	lcd_devices_g15?      ( app-misc/g15daemon )"
-
-pkg_setup() {
-	if [ -n "${LCDPROC_DRIVERS}" ] ; then
-		ewarn "Setting the drivers to compile via LCDPROC_DRIVERS is not supported anymore."
-		ewarn "Please use LCD_DEVICES now and see emerge -pv output for the options."
-	fi
-}
-
-src_prepare() {
-	sed -i "37s:server/drivers:/usr/$(get_libdir)/lcdproc:" LCDd.conf || die
-	einfo "Patching LCDd.conf to use DriverPath=/usr/$(get_libdir)/lcdproc/"
-}
-
-src_configure() {
-	# This array contains the driver names required by configure --with-drivers=
-	# The positions must be the same as the corresponding use_expand flags
-	local DEVICE_DRIVERS=(curses bayrad CFontz CFontzPacket
-		CwLnx EyeboxOne g15 glcd,glcdlib glk
-		hd44780 icp_a106 imon imonlcd IOWarrior
-		lb216 lcdm001 lcterm
-		MD8800 mdm166a ms6931 mtc_s16209x MtxOrb NoritakeVFD
-		pyramid sdeclcd sed1330 sed1520 serialVFD sli
-		stv5730 SureElec svga t6963 text tyan
-		ula200 vlsys_m428 xosd ea65 picolcd serialPOS
-		i2500vfd irtrans lis shuttleVFD )
-
-	# Generate comma separated list of drivers
-	COMMA_DRIVERS=""
-	FIRST_DRIVER=""
-	local index=0
-
-	while [ "${index}" -lt "${NUM_DEVICES}" ] ; do
-		if use "lcd_devices_${IUSE_LCD_DEVICES[${index}]}" ; then
-			append-driver "${DEVICE_DRIVERS[${index}]}"
-		fi
-		let "index = ${index} + 1"
-	done
-
-	# Append the not-lcd-drivers (input)
-	use lirc && append-driver "lirc"
-	use irman && append-driver "irman"
-	use joystick && append-driver "joy"
-
-	if [ -z "${COMMA_DRIVERS}" ] ; then
-		ewarn "You are compiling LCDd without support for any LCD drivers at all."
-	else
-		# Patch the config to contain a driver that is actually installed instead of the default
-		elog "Compiling the following drivers for LCDd: ${COMMA_DRIVERS}"
-		elog "Setting Driver=${FIRST_DRIVER} in LCDd.conf"
-		sed -i "53s:curses:${FIRST_DRIVER}:" LCDd.conf || die
-	fi
-
-	local EXTRA_CONF
-	if use lcd_devices_cfontzpacket || use lcd_devices_cwlinux || use lcd_devices_pyramid || \
-		use lcd_devices_picolcd || use lcd_devices_lis || use lcd_devices_shuttlevfd ; then
-		EXTRA_CONF="--enable-libusb"
-	else
-		EXTRA_CONF="$(use_enable usb libusb)"
-	fi
-
-	if use lcd_devices_ula200 || use lcd_devices_i2500vfd || use lcd_devices_lis ; then
-		EXTRA_CONF="${EXTRA_CONF} --enable-libftdi"
-	else
-		EXTRA_CONF="${EXTRA_CONF} $(use_enable ftdi libftdi)"
-	fi
-
-	econf --enable-extra-charmaps \
-		$(use_enable debug) \
-		$(use_enable nfs stat-nfs) \
-		$(use_enable png libpng) \
-		$(use_enable samba stat-smbfs ) \
-		$(use_enable seamless-hbars) \
-		$(use_enable truetype freetype) \
-		${EXTRA_CONF} \
-		"--enable-drivers=${COMMA_DRIVERS}"
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		ebegin "Creating user documentation"
-		cd "${S}"/docs/lcdproc-user
-		xmlto html --skip-validation lcdproc-user.docbook
-		eend $?
-
-		ebegin "Creating dev documentation"
-		cd "${S}"/docs/lcdproc-dev
-		xmlto html --skip-validation lcdproc-dev.docbook
-		eend $?
-	fi
-}
-
-append-driver() {
-	[[ -z $* ]] && return 0
-	if [ -z "${COMMA_DRIVERS}" ] ; then
-		# First in the list
-		COMMA_DRIVERS="$*"
-		FIRST_DRIVER="$*"
-	else
-		# Second, third, ... include a comma at the front
-		COMMA_DRIVERS="${COMMA_DRIVERS},$*"
-	fi
-	return 0
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# move example clients installed to /usr/bin
-	rm -f "${D}"/usr/bin/{tail,lcdmetar,iosock,fortune,x11amp}.pl
-	insinto /usr/share/lcdproc/clients
-	doins clients/examples/*.pl
-	doins clients/metar/*.pl
-
-	newinitd "${FILESDIR}/0.5.1-LCDd.initd" LCDd
-	newinitd "${FILESDIR}/0.5.2-r2-lcdproc.initd" lcdproc
-
-	dodoc README CREDITS ChangeLog INSTALL TODO
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}/lcdproc-user
-		doins docs/lcdproc-user/*.html
-		insinto /usr/share/doc/${PF}/lcdproc-dev
-		doins docs/lcdproc-dev/*.html
-	fi
-}
diff --git a/app-misc/lcdproc/metadata.xml b/app-misc/lcdproc/metadata.xml
index f54e361fd68b..8b296d83b823 100644
--- a/app-misc/lcdproc/metadata.xml
+++ b/app-misc/lcdproc/metadata.xml
@@ -21,14 +21,10 @@
 		<flag name="ethlcd">Enable support for ethlcd in the hd44780 driver.</flag>
 		<flag name="extra-charmaps">Enable extra language specific charmaps.</flag>
 		<flag name="freetype">Enable support for <pkg>media-libs/freetype</pkg> in the glcd driver.</flag>
-		<flag name="ftdi">Enable support for <pkg>dev-embedded/libftdi</pkg> in the glcd,hd44780,i2500vfd,lis and ula200 driver.</flag>
-		<flag name="hid">Enable support for <pkg>dev-libs/libhid</pkg> in the cfontz,cfontzpacket,cwlnx,glcd,lb216,mdm166a,mtc_s16209x and noritakevfd driver.</flag>
-		<flag name="irman">Enable support for <pkg>media-libs/libirman</pkg> in the irman driver.</flag>
 		<flag name="menu">Enable menu support in the lcdproc client.</flag>
 		<flag name="nfs">Display NFS filesystem stats in the lcdproc client.</flag>
 		<flag name="png">Enable support for <pkg>media-libs/libpng</pkg> in the glcd driver.</flag>
 		<flag name="samba">Display SMBFS filesystem stats in the lcdproc client.</flag>
-		<flag name="seamless-hbars">Don't produce any gaps in horizontal bar graphs, if hardware supports it.</flag>
 		<flag name="test-menu">Enable test menu support for the lcdproc server.</flag>
 	</use>
 	<upstream>
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 92101c4685f4..81ebaa853e43 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -5,7 +5,7 @@ AUX mc-4.8.23-gettext.patch 2017 BLAKE2B 9d67398051f77e94d1b9932a89801335efef851
 DIST mc-4.8.22.tar.xz 2538524 BLAKE2B f7839177dfb02d5b56d6a4ae1f045f7bc501b70fc845efaa6d45ef8e432ec680e51e4530aa5aa25c33ad339171d1ff435f6a1c5dbc5ac150053c64101b7a5c30 SHA512 834d467a4561fe4361bbde61be2c9ded95ade2a89855d953f58b7bfeb21297a3d6ebf674e72ac665b1794e0cbc8da752bc14fb37b129ff870856b339091f6bed
 DIST mc-4.8.23.tar.xz 2552944 BLAKE2B f246f30d852f93ac96f81ec7a933a1bcd86ff3bfa040a0fa1cb32c14d781f77df34452e4dd94f0846e379d91a648cd417241e4660930a9c90defe58cb19d1cee SHA512 e51c7f926d296280a57a8ecb5f4b296a850022b7ab9beaba89f5cb7554d8fc3e13c73b8571f78c3162ee85df88f7f46d07c9c893156cda4d1377a01071cdd1c6
 EBUILD mc-4.8.22.ebuild 2854 BLAKE2B b62a578f351b1535f3b48ddf01c21aa5ab5bbf02cdabc9b967a108cbaf1304ad3130ea26211d06e45697d00cd65bb7842badbfecdf6f360ae8443afaf812777c SHA512 6534293609a40883ff86f9cbf1894b9898c7a8ea910b1a05f8057ce30e26e726b13f5bab7060e64196376fd244b90f41e48632860684c3c5bb1f85eab6bedf0c
-EBUILD mc-4.8.23-r1.ebuild 3040 BLAKE2B aac361288d71fdd59225368aa6e6340f201df078130c7506f7d9f11c4ab9531270f760a15af5bff356a35caa0e53cd33d7508e989fa11befee1c658432b16229 SHA512 0d5536275904b043fc31b3659f3a8080513790c195609fe24110187f047f9b4afe8e7421c670579e8f20d01d7e1eea05703c7dd160c608e798a65e1b3526f9ea
+EBUILD mc-4.8.23-r1.ebuild 3039 BLAKE2B bc3f902ed3351483b693be1df3579652a2003175408c846671a0b2a9a1e03ae55137f3ffb18c2a73fc75bcc33f4b981131f459d25959718dd95b3a987eb47d03 SHA512 641b017d194863d720abbbad06e97d9285e72acdeced76154ab546a75df5719a92080a98878b85703667be60eba152d26e8c0a31bc053d4aae569b73aa132bdd
 EBUILD mc-4.8.23.ebuild 2864 BLAKE2B 4d2fa3896976b9775a0077db49890995d8348caa003357c27cf429c4b372381cb21a66b8477fd28bcbd821b143f94c4753f91abdc96a1f60c1de2dc746412a0f SHA512 439957bfb9c4441a3e344ff8ea7361efec8a19f19a5277237b4ac98152fe59213451d3b04b430c0e558001c7f10119381aed7fa4e3e933a5b02529dc7f948bbf
 EBUILD mc-9999.ebuild 3111 BLAKE2B 31c178fdbef8bb48d7ca13c15f7e7e56bb3d3de730ee62bccd75a593d9ad313e5cc6fc6e5dbd60a116ab5770ddcb24d31bc67393b1868b2cb57ea99a8dfb174c SHA512 fc8bbce6e66c343e141fcd0ad6c3a6fd450db0ebc366450589bf24a27556a3e536653c7430b65f2e4766172f8aece01c0206fe8c00a0bfefe4f8676c269e7553
 MISC metadata.xml 916 BLAKE2B ebd4f95dda619c29e09fdb42087a52a5c1ff2dfa0d5a7ed5bea12776734247bb04d8e19333be9ea45345a3e520ac7504ea490501767111feacf9f933caf3661a SHA512 e8b3384dc473a15550dca185fce45d12019939170155665ce26e6ce2e0abf8e387501e6429c30eefe0e5f15a1b0b1b49d12e2cf5305ef6c08415bbddb48db9ec
diff --git a/app-misc/mc/mc-4.8.23-r1.ebuild b/app-misc/mc/mc-4.8.23-r1.ebuild
index 422585f12d98..48f903c3ae54 100644
--- a/app-misc/mc/mc-4.8.23-r1.ebuild
+++ b/app-misc/mc/mc-4.8.23-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
 
 REQUIRED_USE="spell? ( edit )"
diff --git a/app-misc/prog-express/Manifest b/app-misc/prog-express/Manifest
index 63a508499ae1..bd0527ed42a0 100644
--- a/app-misc/prog-express/Manifest
+++ b/app-misc/prog-express/Manifest
@@ -1,5 +1,8 @@
 AUX pe.exe.config 102 BLAKE2B 8cbb33802ee55ed8a814b55372ecfed87b12e58ed4400554cb41e28204f42ecc3cb83f5d7bc23a4806a72b889deda6f451ab5538bcb882915811201c2907ce76 SHA512 282c302d4613f360e8d28cc0ab711ac4125768557d087d6ee46df75c1c7948503a26d46e1d0605b514335bd6626e7840d4886b2ce0ebab148284af166bc55a22
 DIST prog-express-3.7.8-1.amd64.deb 36468792 BLAKE2B 7edc5b4c9b7c145877298ac33db743960850d2fbd4cc33943612573277a32935dba15a531f13ad7d75309291cf74ca8f0b80b084dafd840f7831362315c6b8c5 SHA512 647549edd846330044bf34eb40436cc622c4e0871726a31049a93b032e5e1c4428231bee97a21cf75baeeade4e651f7d593ed0cdeb0698679582ff6a7f4293e2
 DIST prog-express-3.7.8-1.i386.deb 36468530 BLAKE2B 9e6e81546889a5892bce33168e26b067abe91ceecd9a77f8a0f4af788cbb9da3930e3c1fcf682d6b5aceda04bc84d7ddcf7f45ee4936be8833be4b5244f12541 SHA512 149ae0150d5f8cb99aec92485e4309973f425a87d5c46971b850c69263ea2cbf39df73025709327f80e8b01219114ef9b7219bad7647d947de3625e1bec4904b
+DIST prog-express-3.8.3-1.amd64.deb 37858252 BLAKE2B 0edc06e138fb06bf1d09cc8c1e0650fd1e9f3259f8738c8ec2d072914bc1a215eff60f13871b12ea3e650824c2b2e077edc617bd35e41329505343fdc8c18a0c SHA512 e8e7088eb98e4b63e875308c45ee9dbce8cae5d86ce82eff29a2a3ad2798d22f3621fa38ccc7a66f4e6bd3b71c063e1e793453665640e11ffd0848ec243519ad
+DIST prog-express-3.8.3-1.i386.deb 37858512 BLAKE2B e812e44f7d440a7891e30fc3d9230daf034b7aa0eef800388eeccff50ef9a8dd22e5e989e7d8b6f5d07e77fe317d0fd01dd9e21e7f6510adf2e412c09ce7ac77 SHA512 b5805add8c51c6eeda2ba76ebd3a33df753527a60f81ace515e90945b70c5d720dac5d8dd87c0c381b52a690d2501b618e81cde51320759b639ec9bd143c422f
 EBUILD prog-express-3.7.8-r1.ebuild 1504 BLAKE2B 49e7d487e736e3029271fa30e750d400f8ee75b81b9e8995d0680f781847ce5b925dd0b348ac51b3db96a207ae6d1bb542e5dbfeaaf02b24695562ef480aa741 SHA512 6389367325a55a79d1ab443abab31d6efd9ab737534f579b5d56ce1a748f14641ba6fe7ff63419dcc41ede98d778847b8bc8658566f9c692a16c4be95e374b72
+EBUILD prog-express-3.8.3.ebuild 1619 BLAKE2B 4d94131b9c5d1e9268e3bef2f921408408593ccf5f89a67e5c62131dace0fa0b3e3e259823c38352eb03f0c11ecb50cc440693515160e7f1d85726096a6593ee SHA512 7fe24c2102f5741ab73f181bbd3c651692a760ee2dc2fab5957371f2287a5226f0af30141d0ed99d4ff6575eac00990188eae3b6f83c0cdf2bcbf01679fe52b3
 MISC metadata.xml 523 BLAKE2B ea6df68f08186fa4b039a199b83452e561480ca24836dea6d96723058c74d8657f0c8dac3404492a4aad660d9d3d10a30702dc0cd90e6712c4a74e6803ee85a9 SHA512 d7e5c947e7f15307c97c5b4940765245a0b4198a32ba896b8c4587f2d6ece0e3631b654c50b3d918716e598c213ad33d7ae636b4bf119149c90d2ba5f70b5aa2
diff --git a/app-misc/prog-express/prog-express-3.8.3.ebuild b/app-misc/prog-express/prog-express-3.8.3.ebuild
new file mode 100644
index 000000000000..d9dfb64aae89
--- /dev/null
+++ b/app-misc/prog-express/prog-express-3.8.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop udev unpacker xdg-utils
+
+DESCRIPTION="A modern and intuitive control software for the Batronix USB programming devices"
+HOMEPAGE="https://www.batronix.com"
+SRC_URI="
+	amd64? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/${P}-1.amd64.deb )
+	x86? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/${P}-1.i386.deb )
+"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="prog-express"
+SLOT="0"
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-dotnet/gtk-sharp:2
+	dev-dotnet/libgdiplus
+	dev-lang/mono
+	dev-lang/mono-basic
+	virtual/libusb:1
+	virtual/udev
+"
+
+S="${WORKDIR}"
+
+DOCS=(
+	"usr/share/doc/prog-express/changelog"
+	"usr/share/doc/prog-express/manuals"
+)
+
+QA_PREBUILT="
+	usr/bin/bxusb
+	usr/bin/bxusb-gui
+	usr/bin/prog-express
+	usr/sbin/bxfxload
+"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	default
+
+	gunzip usr/share/doc/prog-express/changelog.gz usr/share/man/man1/*.gz || die
+}
+
+src_install() {
+	dobin usr/bin/{bxusb,bxusb-gui,prog-express}
+	dosbin usr/sbin/bxfxload
+
+	insinto /usr/lib
+	doins -r usr/lib/bxusb usr/lib/prog-express
+
+	insinto /usr/lib/prog-express
+	doins "${FILESDIR}"/pe.exe.config
+
+	udev_dorules lib/udev/rules.d/85-batronix-devices.rules
+
+	doicon usr/share/pixmaps/prog-express.png
+
+	domenu usr/share/applications/prog-express.desktop
+
+	doman usr/share/man/man1/{bxfxload,bxusb,bxusb-gui,prog-express}.1
+}
+
+pkg_postinst() {
+	udev_reload
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	udev_reload
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-misc/solaar/Manifest b/app-misc/solaar/Manifest
index 6eec6c20ba93..32d0efbf0bdc 100644
--- a/app-misc/solaar/Manifest
+++ b/app-misc/solaar/Manifest
@@ -1,3 +1,5 @@
 DIST solaar-0.9.2.tar.gz 864509 BLAKE2B 57c58d203d8d1ae390eaaa1cfc963cfcc9523de8d7edcb482f30c66bcaaceebc7c514cf0fcffb1b20ca5cc3bc869c94cb61bcddff44debba9307ec3b1c0e1def SHA512 13f469df753cc8fab55f5259ccc3e62b6e44471d277d240cd56ce0580144d2b1f95d731268176648663dd15e5607bfb512f477362f4f100aa0a653b001dfe04b
+DIST solaar-1.0.1.tar.gz 1195660 BLAKE2B e6cd89b5735e125dd438255a8961b1d5d38feb515c5097efec0403d99b9db6e29c439c13e279fcffe69cb314bf2650a7a11770830fdf1e971ade27ce8331aed2 SHA512 e0b2bbfd97d9650d94f1a4b47e4e70f09c75f684e7e1d3e67d2cf6dd197109084e941b98333e173fb205d5c9464dd07e17390d9c2d5b46393fee2efdb20429ac
 EBUILD solaar-0.9.2-r3.ebuild 1337 BLAKE2B da7b2feebd9fb7558c3f793113c25a13788b36cbdaadd38c68cc86c972ab56cd8d19c151e1ed5df005d6c2f98c7d590471f1ee2485d7cc569ce645fba863a73a SHA512 0fd7b6581d925419aeaa8f0fe67c35d4a83b9ffc2a16a3bd81d61c8034f5a872e7288ce722df139e3fffebf7183eef28c5d877658b114e0009b8534c725d45ae
+EBUILD solaar-1.0.1.ebuild 1103 BLAKE2B c56a6f91c846131ffd2c397689472f29ffa745a8403713a5af675623e8d8935752a16828984c500fe211629725305f1d9a2f2066559bdea13935244ceb8ea51c SHA512 33727e766ed85f3234c0904731bb1ef7ff40a38b27bae6948e1c419758796c8f4ee84f469dadc8733542e79c2f09dae04c7be82ab9af7392f55cbc8cb2a08b1e
 MISC metadata.xml 247 BLAKE2B 28b1a6239555a2c8babc0c1ee34558209080f365bb6b8e2f29461758cce930f9ece751ebda2c364eccefb106aead7896b47c5bda1b8d275197c69d071edd2504 SHA512 5c9618d73d0e1e0b66294e959564df8703bc276f6e430d4692230429a377dbdaf38e7d569dd9b89b35f4acc4e2692ef6520e5cf118d0e76c8498d8ded0c98b14
diff --git a/app-misc/solaar/solaar-1.0.1.ebuild b/app-misc/solaar/solaar-1.0.1.ebuild
new file mode 100644
index 000000000000..399bbca7d482
--- /dev/null
+++ b/app-misc/solaar/solaar-1.0.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 linux-info udev xdg
+
+DESCRIPTION="A Linux device manager for Logitech's Unifying Receiver peripherals"
+HOMEPAGE="https://pwr-solaar.github.io/Solaar/"
+SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc"
+
+RDEPEND="
+	acct-group/plugdev
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]"
+
+S=${WORKDIR}/Solaar-${PV}
+
+CONFIG_CHECK="~HID_LOGITECH_DJ ~HIDRAW"
+
+python_prepare_all() {
+	# don't autostart (bug #494608)
+	sed -i '/yield autostart_path/d' setup.py || die
+
+	# grant plugdev group rw access
+	sed -i 's/#MODE=/MODE=/' rules.d/42-logitech-unify-permissions.rules || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	udev_dorules rules.d/*.rules
+
+	dodoc docs/devices.md
+	if use doc; then
+		dodoc -r docs/*
+	fi
+}
diff --git a/app-misc/tdfsb/Manifest b/app-misc/tdfsb/Manifest
index 31ea51e517d2..62373c1f74a9 100644
--- a/app-misc/tdfsb/Manifest
+++ b/app-misc/tdfsb/Manifest
@@ -3,4 +3,4 @@ AUX tdfsb-0.0.10-debugging.patch 2106 BLAKE2B 27d00c7a5bfee66126417c336d43890c30
 AUX tdfsb-0.0.10-format-security.patch 1398 BLAKE2B fc461e169ca717fa75b1220d606cf1bd6a2d8c7b15c928402ac1d9f1a37413beaec464b5da867d1ef9cfba35baf2b17f24a57c06b894c468b0e961481cb05e3b SHA512 17543c4edcc09adc21a1dd8787eef2c7e57803d2ea490e4d0f259275e40d8619009ca1f5bd22970d1461078f998d3334ce5af9667f00c31b40a7c41841b151ca
 DIST tdfsb-0.0.10.tar.gz 35630 BLAKE2B 6df88ac449c8c671921aabe0b429e9b5074328c6b5c47869e06001f2996583c483427f744ce64874c2f70705463d432e945e1946436ebee8300c33702a64dca1 SHA512 4bfde530761bbc8373f2a9cc8bc5a4ea721ac564e7440d67ebf0c8b019c553b2e1288db86e54aaf111253decdbd4df93ea812fd5a70fd95acf11ff702387a7eb
 EBUILD tdfsb-0.0.10-r1.ebuild 914 BLAKE2B 025a6278b386ccd288c72ea6a95c06958efd21fb01ae3076ef64319f9cd3f61c7337293944716d9f465b89f19192151c81147dc915a08e9f11bcef2e287c7723 SHA512 2307b4ea3739fdaad830787048da9f0d3eca7e5885486dfa18145038f42359fe4ef0bff574abadb9cb62a14991d2500181cf43401d8bfefc0811adbe6e0323a4
-MISC metadata.xml 166 BLAKE2B df899de61ee57cf9c2d5822a8ca4cb62c697c6da7142003688afbdd1261a8623d48058189ebe005c053ffddcb9f7275f19a0e48fc47ce1890341e276400f1d8f SHA512 12bfcd38af9dc9fe67b866a4ae090e26873d363409efc5949cca4b4a59ba0d770b09ebec8a108482b29b94c922bcdb8ce3f5ccbb578137b44e35bd783b4c9472
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-misc/tdfsb/metadata.xml b/app-misc/tdfsb/metadata.xml
index c1744fe7fc5b..7a38bb900964 100644
--- a/app-misc/tdfsb/metadata.xml
+++ b/app-misc/tdfsb/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!--maintainer-needed-->
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index fcbda0210f8d..1973909a5116 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -8,6 +8,6 @@ EBUILD tmux-2.7-r1.ebuild 2117 BLAKE2B 8d4bb5506da4aafd44fdcee8c8397e247cdb1c966
 EBUILD tmux-2.7.ebuild 2138 BLAKE2B 89c87ee11e1a73fd76f271eabc6fcda3809ee460b882b1bd86964ea6d4fd2753675c04ce0d81703338ff16da679add1df1e8abb3a7473e62d8897fbd245b79dd SHA512 d4dbe7723d81806f78d1d6e02edb851ce978189ad48242f7f765d19a13635bb0428d477ceb827af845b1d1fc18bbd7b446ece50d3853534f32d6526207dfe7cd
 EBUILD tmux-2.8-r2.ebuild 1999 BLAKE2B 2ee9211029103f19ad942252c136e5cc50cdeb7b2d0a8b2a6ad5cecc1978be286a2264fa6ebbf979a900030c4cfac17c8afb9328518ff27343892469da9bb0ba SHA512 74ef935157bc5f61ef305c2ae0913f5e9215b9326cc7433e42c1f01ceb594d95e3d730e3cf6291e7207d63ece7cb48a05184d1af8e66487502eb2a316f6ab367
 EBUILD tmux-2.9.ebuild 2343 BLAKE2B 477341a4ae0c857652fb5d889e37a8967f59d50cc02b6a3c282c54c38e710131c0e033b1dc513d8ce9824f1ab16af0c17032ae83b4e8d6325a31c0264f7a3645 SHA512 1c2e8550dfba24673980d00a6c4d54f0f6a4a73b3ae54faaaa4e8b215caf2d8860deaab5d0965b629c62ba2731322fb705356a55c2e55f9bd3a8103f12e2639b
-EBUILD tmux-2.9a.ebuild 2334 BLAKE2B 513cb9cfacf185cd0d95aeaef70c781200e4031d4a6d0b64e3e22606804d079b85ac12fa2fe093b8f4da671c11d279fecb1760fe5c45a8d158c707c61f8f916b SHA512 149720b87a688dc11f5f48249b22fbd2498b893feb89bb03771567674716e38bdc5abf4c8ef7e472e8a5ad448b0968780c96c1d87ceebd14319abbb6e368671f
+EBUILD tmux-2.9a.ebuild 2333 BLAKE2B fda293b0602c650578d92e5065270abbffaab9d000102535cf6cb87d037c8e3e0413be21ca9549caf44f2ec99bfb4e0452ff486c14c40625cd3c3ee454b1c4fa SHA512 7dc539a60549466a9610ae9a4d7bbea39c15e2ec2f357c906fb67becfeb83f19c88088afd01463b08f87ac26e8f9d485d69f4474ab98c262c688c398883bcd6e
 EBUILD tmux-9999.ebuild 2338 BLAKE2B b69396cad7f3e80f248ebcf1e25e96ae5d6f785aab57a8c8c3879ce3646cad3b4a1038631a9c94e5cff1379b7832832f45e4bd18e3d2fe87263c0323a90ddb9a SHA512 739f8a9ef385410fffd0fa9ec3fbb9c6277a37890e3f3cc2e3fa5e314b03d0303673d8778aa34546c08e12ea271b6fe83b763b3d8aa2835b860049c0df561698
 MISC metadata.xml 708 BLAKE2B f89d9daf3de56b07d231b4fa3dec0179d8e32579a76142085b96611fd08db4c26af40d1ac92684f9d1e378ce624647bab26ddf877aceb86af4987aa4e555e045 SHA512 2d676e2d9a5427a287d7dbe0d73e6ea96b2eba3328c8380a503e814e263a5c6ea5b4bf33aef7c9e0840f37d75b40e5e4a4feca5cc07c38de50b35e9da497f8ce
diff --git a/app-misc/tmux/tmux-2.9a.ebuild b/app-misc/tmux/tmux-2.9a.ebuild
index dedce499ebd1..561221b38ce0 100644
--- a/app-misc/tmux/tmux-2.9a.ebuild
+++ b/app-misc/tmux/tmux-2.9a.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
 	[[ "${PV}" == *_rc* ]] || \
-	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"
 	S="${WORKDIR}/${P/_/-}"
 fi
 
diff --git a/app-misc/vcontrold/Manifest b/app-misc/vcontrold/Manifest
index 727ff7b1eb11..716f502365ab 100644
--- a/app-misc/vcontrold/Manifest
+++ b/app-misc/vcontrold/Manifest
@@ -2,6 +2,8 @@ AUX man_generation.patch 1033 BLAKE2B 431deaaf6b7e48e975ac8c7bcee7bd144d610cd4e8
 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
+DIST vcontrold-0.98.8.tar.gz 87831 BLAKE2B cb6ac6771e087e355f909c63be480caf974632a2fc6378f6c7c461d2cd5d6f12fc0fc762a925d05af4f0ccc9252320009c3f8eee33cc026b5621ec8bcb531b72 SHA512 a3452735bc78ba4add991c03c263c1e59ae6ebfc4eb41f27136bd76c01745990b956dea17b489c6d4f088ec0d69d6f6215f2377baf78ee485e0b31642d4ae468
 EBUILD vcontrold-0.98.5.ebuild 906 BLAKE2B ede2a31302a852636266f97069eae207937bc630fa16db5f982ff676c453b1c2da0dfbf8d023197ebd4132f4a55ed16b8fa5bc6659d0cfe0ee7b9898416028f9 SHA512 cb627f085e3d3b9d0cce3c48a4e5e2f1e115c699414da293ff81783689fb7111e0f13d145901616cdd98526d7610a67fab72e0e9a051e07879e4b8371d77bd47
 EBUILD vcontrold-0.98.6.ebuild 950 BLAKE2B e8ec145ef75d4ff2d41fdcbd68e5d2f7ad541a84343cef2c3e8cd18d2830df3d5e08815b392990dfa901fa2bd3cf0a554a5d79e1721eda43a251f9cf9832ce84 SHA512 c22d888251d4f7c0e336436758c57c7d8da4e258af9c940c07819b864ebe5105af4903fd316cf33f733bab7a86a4f5eeaa1188652ebf82b0fe82bdbb11f24ec2
+EBUILD vcontrold-0.98.8.ebuild 906 BLAKE2B d48567b6b04374fced2572729a63bafca76c48551cb8f2287538d5f8b7d30feb008a78f457b3f8e3da138fd8a2fea246f64bc03dd439d6cb6ec0e0d149e89801 SHA512 fb4531c3418c5f760dd02703354e2979482fd3fbea755f097eec4861180d189335185fb17d53c6e4aac762e8e5ad5b464ad5cd3c45ee78c647b199af7a07bd73
 MISC metadata.xml 910 BLAKE2B eb06d0c4ca09ba13dc5ec335afc9da950429c650c05289608c90f91e0b7d550f97f6833752a8e71101fad25d2600dd24c522f9747ddad20c958b31c790769d36 SHA512 9eeeb42e54cff821d986407940d3a8e434ba3126708eef45f3234bbd8519dc7fd564f5bd6767d249370a796e7ed13d934b52b309305b4bcc03401c63a68a3d64
diff --git a/app-misc/vcontrold/vcontrold-0.98.8.ebuild b/app-misc/vcontrold/vcontrold-0.98.8.ebuild
new file mode 100644
index 000000000000..67b70f6ed21c
--- /dev/null
+++ b/app-misc/vcontrold/vcontrold-0.98.8.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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:2"
+DEPEND="${RDEPEND}
+	man? ( dev-python/docutils )"
+
+src_prepare() {
+	sed "s/@VERSION@/${PV}/" "src/version.h.in" \
+		> "src/version.h" || die "Setting version failed"
+
+	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
+}