gentoo resync : 18.11.2018

51 files changed, 818 insertions, 1030 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index ac03f6511735..b6d2d6ac644c 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/datovka/Manifest b/app-misc/datovka/Manifest
index 8c514ff1b344..eaee48b50531 100644
--- a/app-misc/datovka/Manifest
+++ b/app-misc/datovka/Manifest
@@ -1,5 +1,7 @@
 DIST datovka-4.10.3.tar.xz 2554488 BLAKE2B a06c122403f7571c19abddca93e4d7270b66dbac9b86eb073634cc2c22dd26ad230ad36580b8f977e7033656d8f7066be89532c786ea554b293a2fab46309b9f SHA512 8a07c338b214bd0fdac216d6b278ebceee48aeb4df2d97a77a42f627479641d1824c5ed16f336f5da3205c46e753203aadfd0f83934b7caff4dc9c819e0cee0a
 DIST datovka-4.11.0.tar.xz 2575132 BLAKE2B c5fb753fe0a68c03571c490443428d36a76859b9be123e79a6fd32eb220f6f9f963c65e13b90e72554370c5d20bfef9fff6d47ebaa78e9865aff51d377280140 SHA512 ad245b0c2028a03690eeca6363e94852847ab20a4234aa89a4926d5727e9537e97a2dd53a6f8bfd7691e23480ab2c50ce681ffb7017a80996075bb000d6e1c5f
+DIST datovka-4.11.1.tar.xz 2583660 BLAKE2B 2d62e79c5be9d20e79d19bba43ce3d7fa8dd0b80e8bee6e63d04e63f6c878b84185b869fed1fc601f97350b499aa60041585693081e78bad5e0bc7e272aabcea SHA512 b36211b8830beb1f3a01b399303a1f2f87c77418975b007dac4b55613bdf54205eda0e7bac44d6c68e1102842eaa4231baaa46c31b99d5b6b145597f6a1366f9
 EBUILD datovka-4.10.3.ebuild 1081 BLAKE2B bbabd18fce31ecd0bd9033a59ce6740b8f3a6341d30ceba1159b7f439b258cb658dafbc42e617d30d2fee43b6c04e3b6d3174a41dacbc9400bad6438dd260ee7 SHA512 2133c2c95805f7ce88e2c05381c731db08f0b0f587938eda18d66a863c85716a1f04ee39bd9aa550371e483920222252a7d7341cd7215e35eb74403b79b6a1b2
 EBUILD datovka-4.11.0.ebuild 1083 BLAKE2B 5786e753c11d3c73611a61b2778eff825549adeb7418aefb71846f4a92ed6910136828f768eb04f7cb62313928a9cf7519e84f49fe2c1e713ae49a3897f01748 SHA512 1be92e4dbca5fa461c5df8906b7b1cf79fb86ef7478f6850db43d0629db280a22477e6d97f09f884e553011e8cc308c3458e94b09a291c84da46cb2541bc5ece
+EBUILD datovka-4.11.1.ebuild 1080 BLAKE2B bd4f51375216a6fcd0e25451a0174e2296b1499c20dca627b187a46a7fb114d72a34cb11b0f735185ec68bdfbc6a47a25be4ad37290148e32b7ddec403131e6c SHA512 498732996dc7b5b8a622d1985d6dd213791054889286f86ccf8b2180efbbda669a91b68a541eb3ba1017e733aa1365b155ad3d2ee8fbc4770ba01e734f2e783f
 MISC metadata.xml 445 BLAKE2B 52a23fa53d98a5f8a9890ee261fb8021f5125eb8981a9826f64747022668a26da1d74e7e5acc025d984324eb8c4996728cca0e856ff1435c4b35d6cf015e96a7 SHA512 682fca99a52a692346a2dc85281b1108c4c660afc70924e52e79be01fdd7122e76d0a9dbed4aa7816ff3020c4d4782d4bf9f79d880c46ab2bb02f99039f34a16
diff --git a/app-misc/datovka/datovka-4.11.1.ebuild b/app-misc/datovka/datovka-4.11.1.ebuild
new file mode 100644
index 000000000000..96259fc146fb
--- /dev/null
+++ b/app-misc/datovka/datovka-4.11.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils qmake-utils
+
+DESCRIPTION="GUI to access the Czech eGov system of Datove schranky"
+HOMEPAGE="https://www.datovka.cz/"
+SRC_URI="https://secure.nic.cz/files/datove_schranky/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# minimum Qt version required
+QT_PV="5.3.2:5"
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.2
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qtnetwork-${QT_PV}
+	>=dev-qt/qtprintsupport-${QT_PV}
+	>=dev-qt/qtsql-${QT_PV}[sqlite]
+	>=dev-qt/qtsvg-${QT_PV}
+	>=dev-qt/qtwidgets-${QT_PV}
+	>=net-libs/libisds-0.10.8
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-qt/linguist-tools-${QT_PV}
+"
+
+DOCS=( ChangeLog README )
+
+src_configure() {
+	lrelease datovka.pro || die
+	eqmake5 PREFIX="/usr" DISABLE_VERSION_NOTIFICATION=1 TEXT_FILES_INST_DIR="/usr/share/${PN}/"
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-misc/ddate/Manifest b/app-misc/ddate/Manifest
index 098f726b64d6..b277bd776264 100644
--- a/app-misc/ddate/Manifest
+++ b/app-misc/ddate/Manifest
@@ -2,5 +2,5 @@ AUX ddate-0.2.2-dont-compress-manpage.patch 646 BLAKE2B 18465cdb8ec2575086845521
 DIST ddate-0.2.1.tar.gz 7757 BLAKE2B b2899b325d5cb45b2aa2460fa900740c41c7790823958fcd1cf971713d61283e050737b0cecdd1988c60718e2741ba1d3a0a48442b4013d9727db6a3765da882 SHA512 377ae4be0ddd2386de726603116ec64a524f2f4263cb30d2cd8f10024659f5fee552cf13de45cbaad36c93d2dfd16c0667993d67a37ba2276a96ca052265c714
 DIST ddate-0.2.2.tar.gz 8049 BLAKE2B 7a987595b2dc399a5fc254891b92af84c9f94830f65c756f75db30c1e4db008ad715608ad37d53f3b73f3f5263023c066c546eb7536dc7439ded3650996be001 SHA512 5d148e030bee392eb93c5ae519061af0736f2f75eaae916e3efaf927d9f4de8cc72afc4a5121b6fbc0264b73e9f580330a38b97bb78837d447d0b4c1fc29ec06
 EBUILD ddate-0.2.1.ebuild 665 BLAKE2B 976c1f0c0332d87d64147d0524f46f5971b4ea37477a42a70d4e4a63281c7eb02d4e41b5d66be204c1210372376a0ba8e0a5f415e858ed27cb189e298fe1cd2c SHA512 442a9548fc42ff0aa96f36020da4e6c840cc34dcdcb487d6be2c2efe3d71043fa98bb12f100a5c07dda3eed4ade983f8213e47a445c4bc9303583f0a68b04450
-EBUILD ddate-0.2.2.ebuild 518 BLAKE2B b0c492da6c0326f6430dba598b3037afbd2ac454bd91e1d43b2359ac7c15a0ce1f92c776dc85166f80d09c38d11dab81344ed2230ec12076c4dd5e37255d90d8 SHA512 f01eb4e97a2b5d48ed99579a7c857f8e121f72b183cf112f8e6402730a850c8ef08366939ab1a25f98f12212f2db58e3e783511a4f0d005e3bd192bfc0059994
+EBUILD ddate-0.2.2.ebuild 516 BLAKE2B 703711262f7fd6e1a5e92522d78c1b10fb137f67cb849ace848e574be499c5a1b706ba50fba7bc2fbac931d6748cc59d596b7cc949c624b5d4782a789bb4b52a SHA512 cd8e63919d42f005733fdab83b1cd8be77749542352e6fea4bd35022b46a9e0cef7e11e8aeb179b535a5d83c8906ef795e32e7879e7a4e42ef9b65897df5d4aa
 MISC metadata.xml 711 BLAKE2B ddfa1311f5fa3c5604c206dc77da1e40c3095ca3f5103b54b9d0d520626b62f49c95ebb077bea726c4f43100f0ebeec47005ac307d77012f8a592f29f61cc507 SHA512 4772c77e33981110fa4f1538414db73cfc67d09c686209bbfcf331e6fcb8c3fbae87b702ef88f672cd55a99a3b0c83996a8005c5f79b1a102b8410825f27a6ff
diff --git a/app-misc/ddate/ddate-0.2.2.ebuild b/app-misc/ddate/ddate-0.2.2.ebuild
index ed2ea3d74539..1b2e3b4760d6 100644
--- a/app-misc/ddate/ddate-0.2.2.ebuild
+++ b/app-misc/ddate/ddate-0.2.2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Perpetual date converter from gregorian to poee calendar"
 HOMEPAGE="https://github.com/bo0ts/ddate"
 SRC_URI="https://github.com/bo0ts/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 LICENSE="public-domain"
 SLOT="0"
 
diff --git a/app-misc/detox/Manifest b/app-misc/detox/Manifest
index 23b1a3d33819..f4c9b12d1ca4 100644
--- a/app-misc/detox/Manifest
+++ b/app-misc/detox/Manifest
@@ -4,5 +4,5 @@ AUX detox-1.2.0-format-security.patch 1964 BLAKE2B 41074dae01426f5a3293ba36dca12
 AUX detox-1.2.0-install-missing-file.patch 642 BLAKE2B 232a89c132c681d47243411c42c0975ec1c0ef493f7015db3591b89abf0b294e7fddeb7afabd992180ad7cd60031fd0f60aa228daa31b59116d7251a697d856c SHA512 32f83f700a508729c27941ae627c544dd2ba1900a647285d4160038e69dbad8f1205c5056daa9c5c19a56a70a6e528db187a59d56dfcfee7d772eb0fd809d087
 AUX detox-1.2.0-parallel.patch 1120 BLAKE2B bccae5f969e1127b8819a5542354ea2aaac765a3667679598d4edd5d3dd6bfac45845718599be59bbebc11d860d6fc56163777e3e3940da0805b9d5cc1bcf0bd SHA512 5a9c964cd46a1cd4463460a400226a80a9c1705bd60655362ca02950a06acacbafed1c039793eb6445988e91a47888dbf1c643bf8c34003e7c34a02398f58855
 DIST detox-1.2.0.tar.bz2 86118 BLAKE2B 2dbde6ebd98b59c18c60f99006731484dcbc698ab77b56991f2af94f4ad45da141046975af47b66242ff42d4e3a8bb3b515d4b70ba30f12cb1b8ceea5832f52a SHA512 48c0060ed0538c26aeba444bf327f1e52ea47d0e696577deeb43304dfb960ee5abe984651948bfc67c51d7f15f9051df2a208acfe53a5778a7471460e87f639a
-EBUILD detox-1.2.0-r3.ebuild 972 BLAKE2B e30b2d58d2b5815d54467970e7ddaa1e48810b3ae6540e28e7d4468aad99b1411f6eafba589ef31530e629ec60d4299c629a7715d6105f8b6e6ea94528b4f849 SHA512 6daffbe667fc692b837b0b66f17294464b7f5d9886a790c15bc4e93ddeb84d05bde89526029790dc484fdb6bb4939ed8517aa4840e92af5d63341e26be645b19
+EBUILD detox-1.2.0-r3.ebuild 993 BLAKE2B 0ecfb0ee6437c8d45be1eeffa7a35d63bd60a49fe54b1bf53ca29977f611e9cd094b79ab92e9135d319505e305b7a24804043841f02da5450b4124dc768b003e SHA512 8e631cf1e4918543ae6c92dd05aca05b268385dc95b465c3249a17f8e6b9a7091d6f5c08f617722cc2ee22e62074fffc0d5a801cfeb6c5e75bd903986468f5c8
 MISC metadata.xml 340 BLAKE2B 448af504cf3e5e2d644d5a7551d5a0e7775f95601c06704584df7be0fe68060deddd9ad41e04e6240c346bb37a7f6017f5ed54e999ecb36efda481463a10388e SHA512 22cb6a81a6b5001f6ebeae252400eb4a7568a6baf028413d1eeaccad3de9b7b2e5c4d5a3f9e0cd4c87567a2135e7a4e7d0796d2efc377f2f26ddf0b555713943
diff --git a/app-misc/detox/detox-1.2.0-r3.ebuild b/app-misc/detox/detox-1.2.0-r3.ebuild
index cbae89b41864..ec5d2e34a18c 100644
--- a/app-misc/detox/detox-1.2.0-r3.ebuild
+++ b/app-misc/detox/detox-1.2.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,8 +18,12 @@ IUSE=""
 
 S="${WORKDIR}"/${MY_P}
 
-RDEPEND="dev-libs/popt"
-DEPEND="${RDEPEND}
+RDEPEND="
+	dev-libs/popt
+	!dev-python/detox"
+
+DEPEND="
+	${RDEPEND}
 	sys-devel/flex
 	sys-devel/bison"
 
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index c7f2a9934026..a52c708a1a7f 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -8,12 +8,12 @@ AUX elasticsearch.service.3 1527 BLAKE2B 7f7bee9019de2814cdce1e4a66932a0a2a915cd
 AUX elasticsearch.service.conf 235 BLAKE2B 23ada111be21dff12323edbe981883cb1ed275b6c7a9f55e77fdcec1919d374818683403a2a7a7c2c2839db2b8afcd66f7667d5080ecb52cade853a400f972a6 SHA512 b300dbc1b3c341ebbcac68385c651133427f342dc0351501b47730b392cc176b7b8dc53877affc6ab384d2834d246a3d0c63b6015dddf2c90d4bcf41cee9968c
 AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721eae1d69e19c595bfbf329618b9cb67be9528f1994c546233cffd31b20eee39edc142bc86f7a7cf5e08903e SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c
 AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
-DIST elasticsearch-5.6.12.tar.gz 33861038 BLAKE2B 548513d568ffad6373f15671934cce84217d59b8a036847685ad055681f816d3a75fb6ba2c60c7965402e791d6f5b1a11fe8918bca9f4a60fb8e9d43809da0a2 SHA512 bc2436ff34bca652f6a6462920921dce3b085300787e02191c0673d7b3789c0cf81681108573f0ec4dc945e91a2e6ae19898d1b606ca35694bfde6d9cd5762cd
+DIST elasticsearch-5.6.13.tar.gz 33894848 BLAKE2B d6b486154c4b4df155e443adee7d07200822f4a14f9cc50753e5b4621630c3b5de7b6b3d3ad7745b898f5a24c02aaddbec05aaf0f5d38fbda8acd78eed433939 SHA512 dbda463f0fba0b921ac65ca8743f53cb21410001cb6113aeaa2bfe3e22fbdac9f9010a3bdd2df5b8bc6c7cd59513d9fbac8b408d22d2b885ff5dadbb463b7981
 DIST elasticsearch-6.3.2.tar.gz 91452574 BLAKE2B c422990fabad70e6e77e8f59f6fb9e9bf5a84eb7e6b8b67dfd91f53e474b1b501b3a1d5ea8f54f0793631504f194a116e816eb3558782b67c8dadecbc2711ee5 SHA512 954cd1e16a5f2e0b0efaeb7e6b19c708d1588d30814a31defb09037c3b90f78c5e9dbd1ca9af9c700d517145a4279bacc1d8ce7cc6894fbe7bf71eec9ed3110d
-DIST elasticsearch-6.4.1.tar.gz 97924081 BLAKE2B 179433ebe9fca80517057a0379d67545bfd42af741ca64fc2e5b307f9071634d20f297c46d43cfbcfa8dcc45f269c5db32b70656bd4c3035a47aacae861875a2 SHA512 a023a6db5554dee6f10718dfa297aa06a735c7857542c2db80fa5c2b86ff4bf405bb8167578c5b60741ad05ed96a64b54bc71d128a0ff955468b0449588b053c
+DIST elasticsearch-6.4.3.tar.gz 97872736 BLAKE2B e8c5db4f7238afccce4cf1ca0eced7b7e97891455cd28583eafd7ba028ba3cbc3596cedb2dc4267e677b3c7bbd459b8144284eca358f8c0e34a9a0b8a33426a8 SHA512 2f48720fd1644b1d0f103ca93bd19632c2a12bd3c94434ddf58bc692cb0b23631222f8d23cc0d0e85e271e11099fe0fc8aedf402906b76845ad680eb592f8987
 DIST elasticsearch-oss-6.3.2.tar.gz 29418577 BLAKE2B 152640dc01a10f44ba43f87f68361cc0dd5e1cf54d0ff92377f3acd1a12a247f002ffe2d003cc53760e891278249c10b1d6d4eb978b0bb1c1ebf8879a2cfcb9a SHA512 3c51a860414f7e55900b1d9a350bdbc3e673c8445e316454c2480315b4b9fc08df58090c6281cecc3ae63d12d78d6bd58e228b3371aa325db799ce18758a21f4
-DIST elasticsearch-oss-6.4.1.tar.gz 33725674 BLAKE2B e24809eab213aa34499dcfb1e9a9a2b37d85346d4647282de51c95b17f0ae693f9b48e1649658d700ed8e3d547fd22b5f2276c3b4a2b78aa6c129b8bd1eb096b SHA512 5036adbb091dff95416f4f4b24f615475d7c8c058fcda733ec49a9867b7dafcb90c430f486c667cdc30958280814e609c3f0bc49c20bdb06c0a22d01504a3873
-EBUILD elasticsearch-5.6.12.ebuild 1686 BLAKE2B 5275864107bfc5c8be3e0725eac78ec21021aff4716f494f8e793e2198223450ff5fa7eaeb63959641af4a4c9e30c3ba865e7871cec6ec903010a97b1cc3c107 SHA512 ef36e2a07bf258cacd735c87b765d72c678a47c2a968e89e9ed11ce2592aa42ec2509dc65fa39dd2a66ff4e681d724c05dc4f7ad93439753beee75aa0dccc744
+DIST elasticsearch-oss-6.4.3.tar.gz 33727639 BLAKE2B b4f4821af7a2447a6a16158c32bf676ebbfd8598fde8af558dd19d6e365df66be17d0984e3acb9380a0d5e0cff486b85f6edf96312bd3bb3fc5ae52c270306f3 SHA512 b1147baa95119a8a96779125351358b4c62f2a546b65a9750c11d1d1b9270f06db6da8ff1d9ad11efade1eaea8487087e2d8839b0edfc5da6d9b54da6c6df4e7
+EBUILD elasticsearch-5.6.13.ebuild 1686 BLAKE2B 5275864107bfc5c8be3e0725eac78ec21021aff4716f494f8e793e2198223450ff5fa7eaeb63959641af4a4c9e30c3ba865e7871cec6ec903010a97b1cc3c107 SHA512 ef36e2a07bf258cacd735c87b765d72c678a47c2a968e89e9ed11ce2592aa42ec2509dc65fa39dd2a66ff4e681d724c05dc4f7ad93439753beee75aa0dccc744
 EBUILD elasticsearch-6.3.2.ebuild 2603 BLAKE2B 329924c83731282a8054c4c5965f30fa6c2748b4558044fa7b1407ef406dbc02a02735274ec942c20830396e2eec9e614b7406028623e03bab570e42bba522ca SHA512 9435e7af52a42bbe8626330dce0c2b80a827d697a8fae96edceba3a9665472775e71e23cee099b931bf17dc65eddce2fbee68e36823d1796bc7187169153db55
-EBUILD elasticsearch-6.4.1.ebuild 2579 BLAKE2B c397625f021c0dfccede2c57e24cd0584def56204ec33ea7fecd36e901fce6a8cd9d449b03dd19cc3c7ec66be5e700f25454e0cc2e18e5dd924791349b66f7cf SHA512 b89368ddc71306ab1345257ee899e2b0be87276587e5157d714616ca7548175ec7be80fc646ded6ac86635fae785def9b63401a642b805470b7abf54e0038d8e
+EBUILD elasticsearch-6.4.3.ebuild 2579 BLAKE2B c397625f021c0dfccede2c57e24cd0584def56204ec33ea7fecd36e901fce6a8cd9d449b03dd19cc3c7ec66be5e700f25454e0cc2e18e5dd924791349b66f7cf SHA512 b89368ddc71306ab1345257ee899e2b0be87276587e5157d714616ca7548175ec7be80fc646ded6ac86635fae785def9b63401a642b805470b7abf54e0038d8e
 MISC metadata.xml 567 BLAKE2B 3123e01d77b67569afb2bb4908b38c702ebe1d308ea236b8ebba11709bc421af27ec29d72398a3af0aaefb39a2a2f34e27bffbbd1b3306dbc299e49bfd48cd35 SHA512 74669ea5437ad23c604c82a734973d58a31d78f0f4a2b7e2db655d884bf017d32ea25e451517601b35d406789e661ed2e173752bc232a03c3564e971c5a83a0c
diff --git a/app-misc/elasticsearch/elasticsearch-5.6.12.ebuild b/app-misc/elasticsearch/elasticsearch-5.6.13.ebuild
index 32370ac9f8a8..32370ac9f8a8 100644
--- a/app-misc/elasticsearch/elasticsearch-5.6.12.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-5.6.13.ebuild
diff --git a/app-misc/elasticsearch/elasticsearch-6.4.1.ebuild b/app-misc/elasticsearch/elasticsearch-6.4.3.ebuild
index 52da0c6d6359..52da0c6d6359 100644
--- a/app-misc/elasticsearch/elasticsearch-6.4.1.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-6.4.3.ebuild
diff --git a/app-misc/gourmet/Manifest b/app-misc/gourmet/Manifest
index 77a7bbc4fc1b..338f9f154e80 100644
--- a/app-misc/gourmet/Manifest
+++ b/app-misc/gourmet/Manifest
@@ -3,4 +3,4 @@ AUX no-docs-0.17.0.patch 338 BLAKE2B fae9f389c8ea29c275ac917358a572d2b7aabb98f11
 AUX tostring-to-tobytes.patch 988 BLAKE2B 05dad2fbf164fa5cc13bcdb831bd05444829c712fa3930a0221a3b47ee21e2c32ae30858d2d06b84f20ba3d7764c402605ce89496c6c5b5d33078eed1f3fdd77 SHA512 72b12c9e775bea34ce82c53a8e808fd212eec523f03ca591735ee90121cc45ec6a6464168fe16d66c9889e92168accf8643b0486bc53ef8d144aa92070f3f94c
 DIST gourmet-0.17.4.tar.gz 8487830 BLAKE2B 511da1ae85a788fdce622cb9eb1822e6f264daffc76f25ceb8148de0a4658d9a2307278e6e981073d1aed0fa6e96d543386ed7357e0c9a3c1b511bd107dee62d SHA512 54010a5527f33e08b38d0fdf143cc4528e8ccc65ccad3253074135212751c3bc4385ba5f721327268f455bf85ff6f248e56ebfa1b98933a4ee061983eb9daa4e
 EBUILD gourmet-0.17.4-r2.ebuild 2312 BLAKE2B 817f9e8f3b3cc8609eba941a3406b7ee4dfd8e3ee789337cb36fe1b6d14c734d0f20243d32d4dded941f3e7c8c9502ad6cd10431411c66ed4889d455c36a1e99 SHA512 4163adbc0a8d7142a4779855d920f238f6870d2b94f3142b09b0f99bcf22108ebbd8c0161c808eaef6ad63d9d1ed858ed8a300d1b29a1b2a81b17ad91ff0a04c
-MISC metadata.xml 1559 BLAKE2B 827915e778b988f9e264492d1f499254fcdf5f4403804396a3a7dd79cf9b4fe527f53208d67a56fe720223434e8044b16118cc4969bb530ad2295f687941ef7b SHA512 67cb0b91052e1a2b0cd917839f796435cd45fe157e69d1ac8fbad7a3f4e09176db9f8d217edf0dd032cdc5b20a1e1c2ab3c56e57ddb8e291f55e5a1ff27764bf
+MISC metadata.xml 1585 BLAKE2B 1f533902211f87a711ea73f3d0979bca74866271fd96a4e71e9826e473ef91ce169dab035a27c0886329867750535a1e6f1198fc948c71b188013da4551e1c8e SHA512 257a5072d155af3104f20014fbe9cfffe44d8ba283f0bed70ca4cdee96e873bff60a1573d16ce78447f814b2d3b4c5581bdc06a55f21cdbf7eed93c3808c5671
diff --git a/app-misc/gourmet/metadata.xml b/app-misc/gourmet/metadata.xml
index 90652c4bf09f..e36c4e51d64e 100644
--- a/app-misc/gourmet/metadata.xml
+++ b/app-misc/gourmet/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<maintainer type="person">
 		<email>nixphoeni@gentoo.org</email>
 		<name>Joe Sapp</name>
diff --git a/app-misc/jail/Manifest b/app-misc/jail/Manifest
index abc0746bf2b3..9d09a61b2968 100644
--- a/app-misc/jail/Manifest
+++ b/app-misc/jail/Manifest
@@ -2,9 +2,13 @@ AUX jail-1.9-gentoo.patch 3186 BLAKE2B 289f102f6041e4352b0ae1bb1548ae2c4b6c2a2d8
 AUX jail-1.9-ldflags.patch 328 BLAKE2B f6965d1b43af4b16ec8db30add8b1c448557ad00d6ba0c0793b3b00898fa0decbe42c77822c6361183314c5cd2197e52366e6cb3d5e2197448b7d21a853a380b SHA512 8b92e834a447f5fb916ff4cfb3fa1ca89d048e954ffc2a8cd8889e21a8037b54ee14d241f1a988d2c686d3ce844205354a5763f0f44cef8b2413e1ba05ff405b
 AUX jail-1.9-multiuser-rsa.patch 856 BLAKE2B 4974cf19df37b5a9f5c75fdb31c65e3556a22ec7bfe9b7a1d385d3286615f95571d95887826f72bc09202c77fef03f0158f385db15bc60a67cd29c635637d37a SHA512 b6cc3018faf06346c747242b8b721554438dd4db11621411142a50e7ed41ee009af8387fb2742a44c8fe243f5201f58da77d48a54a83d709ed5e8e8172f50541
 AUX jail-1.9-wrongshell.patch 330 BLAKE2B 5d707238febc3fa77daabdd39f74644873fbd7971d8e609b2112fe5b319dbd133bd6f75e291c92cb683f6552b06605249232f675f2217b5d42564d13b78e8a8d SHA512 ee92dbfb9e147d94d2ebfaaf597ad381d93bd1e5fc65e85a20ee37c9066dbe7560a3385977cd3d30b87f5cdb2d90c19827a7adac69f667ea61a4920ec0b02cbd
+AUX jail-2.0-duplicate-jail.patch 543 BLAKE2B 2e52f6ea3aac4c30ccd347aea66b00a866feb0920227a15a90615cde7793c79b8308fb66b58b60e78aad32fe691acae77f55509747fdfbf786505a8193260329 SHA512 e1b36f0eb326b6ea4f243a1ec523b991cad3c7b753365b16d54faabd2c5d57971eadb205859874aa0c6ed8fac34c2b6616ac79c6e5cbee042d5e16cfa3d2dc82
+AUX jail-2.0-fix-paths.patch 568 BLAKE2B dee607234d1a243cf769ddaaa9480efe704b8c51963133f338ba9df17894c0316375ea77963d6d67beb461d1b7837993147b94b36a6c644210cad88c04ebb09d SHA512 3263b23ceca63c54fc1cbe923ed13cdf638094f1c59fadddd0d831e6c52dd4d7ea2daf8c882dcf87375f89d716c6bf74f6f4c86b719feea92490a04f6d44ffe1
+AUX jail-2.0-ldd-call.patch 586 BLAKE2B 97ad24ed99d8ab22e4ecbc5ac93eb54f018233dcc393a48dc8b2b81894673caee64ae6f7ba1263398542795bd01e098c8e89c26673ee81c87d048d19e4c54bd8 SHA512 cef02e2c6a5a9950b500ac1f80be39801485f31b70f240dbd162e2ef49d1e100b3f5e221f23f7eefd19923f2027bbd7913bfeb055d9733f7e2487de9fc1fedf8
+AUX jail-2.0-openat-syscall.patch 645 BLAKE2B db200b5969f031059a749283d5ee0945ab34f0769506eb897f34393ca38677df6fabfde3f5facd29d24fcf7e550ada06894509af47ae895fc26c0c58318c8007 SHA512 ea2278df96b2d52eb61c370ce9b22d05871eb479fd89ae117ef97289955ebede21e04378cdd979f78d5b6ec518fafbc4160fe8595510e99546048bf452c22e08
 AUX jail-2.0-symlinks.patch 308 BLAKE2B ebe34547c79b036a4303afc48f8d3581b7963982d7c435418a2895a19f9663c8f015ee5992a2484f4dcfa1f7be5a5ac953cc6e76c2b035c63a4410e2a22824f4 SHA512 64e72367dee1f1639a4206280a28228d01702ddb1eefa75c7faabe32cbec699f3083d11b67dccdd56b8953f34646ab4eceb70ac898f1b2a60d142ce564a92b4f
 AUX jail-2.0-sysmacros.patch 426 BLAKE2B b4cccd5258f9e164f5432083ffb9aaa418c475b90a3a5b6210eb38a62440acc0b47ef6df07ff7241de6f3d9b284cebb151ca10b40b64b1591722097028dfbc1b SHA512 b8baa43c1ca0ddd1b08171489e2a3bf08bdd1911cb7d3bb06b8a20178b64716742faf505aec4156c012b3643298c5f4b79f03787f914717caa4c92e752852e4b
 DIST jail-2.0.tar.gz 31095 BLAKE2B c86d0c677eab38c7d90317c3a19dfdadd17ea74903a886015fc1c3926fe09855be4ed9f72b18e6f144de4a7c93fb6c5be3ca77f4ccf501ebedd09533337ce578 SHA512 dfca62091b34f9adbe4e94de1dbf0ccd31bd3f8e492ea9788f712e97271b389475bc19e0390c12445353c4f73e5ba2458360bf55f5f64491705e82192db985ae
 EBUILD jail-2.0-r1.ebuild 1991 BLAKE2B a0e0ba8b3d16324cf15199cb27f87e39a7df73f5d7d67a19b0806d7fc32c7b032a88b93876c2669d9a02702ecb5263f759b706763cf6ff41c5c5a4787a0cf388 SHA512 fe7787da5600a14444902560c8de142c237585b9ac006d96081ab0736ae9a09816d2e59158a76cb80efac867404c3aa09aee4e9ad899eb4b90de77982dd1a56f
-EBUILD jail-2.0-r2.ebuild 1932 BLAKE2B 67e57ab57efe111166d9b01f7029e26f4ca6d5961c2e120721da18731c0235131c268210e9e397a750bd2a9c05853699a7722ac7b68f9a7a062b27c6947bb114 SHA512 6efe7c5ce0f9ef53fdc86dbd2fe81758cf28015c1d69c9a1c3bddb139f975de17f8392c9873ca01a67959f1598d70c3588287f43ad7b6fa959b356d8ad7b4692
+EBUILD jail-2.0-r4.ebuild 2212 BLAKE2B cd01439177e25004b8d772e6ae0af33c645f76dbbd994b50bfbd9bb81920e5de9ed44262ac22547909b7bc19cdd352ebd7e11cbc3aaa2b045116a0493a98bfa4 SHA512 238a11d7df549581d56fa29d83aca319c2356ef8d4bf1b6a9cb2cbda4c45d2a4e0c3813095991f96185ff714787eb250a5952ec3d2b04c6f4eb1cd77a5159d76
 MISC metadata.xml 749 BLAKE2B 6280537aad78398b6a8eb29ca55982ca838f91ad547a71a78dbedb5e63e9e028740ef230d3fd8668079c3d2983daf55187a04fdf662cceaff1f39e468d6f6143 SHA512 a9cee89d1b10080ba67cbbce957b8118484c0224368728ba1dbb553c0c6189c73c2f9c7b257a5e4fcde39270bd4d83f8e43f25948b28c151f0d9170af121b7d9
diff --git a/app-misc/jail/files/jail-2.0-duplicate-jail.patch b/app-misc/jail/files/jail-2.0-duplicate-jail.patch
new file mode 100644
index 000000000000..1522f3aa99ec
--- /dev/null
+++ b/app-misc/jail/files/jail-2.0-duplicate-jail.patch
@@ -0,0 +1,19 @@
+commit 984f62591b264aa8ed5c17f4033ec96dbba4bf5f
+Author: Alexander Zubkov <green@qrator.net>
+Date:   Wed Oct 17 22:47:50 2018 +0200
+
+    do not duplicate jail in shells file
+
+diff --git a/lib/arch/generic/functions b/lib/arch/generic/functions
+index b1fdbc8..89cd607 100755
+--- a/lib/arch/generic/functions
++++ b/lib/arch/generic/functions
+@@ -823,7 +823,7 @@ sub add_jail_to_shells {
+   close(F);
+ 
+   for $k (@elem) {
+-    if ($k =~ /^$INSTALL_DIR\/jail/) {
++    if ($k =~ /^$INSTALL_DIR\/bin\/jail/) {
+       $found = 1;
+       last;
+     }
diff --git a/app-misc/jail/files/jail-2.0-fix-paths.patch b/app-misc/jail/files/jail-2.0-fix-paths.patch
new file mode 100644
index 000000000000..e522828e286c
--- /dev/null
+++ b/app-misc/jail/files/jail-2.0-fix-paths.patch
@@ -0,0 +1,21 @@
+commit 762cca3fd4aa754b266f928ec3fa2ad2261a831e
+Author: Alexander Zubkov <green@qrator.net>
+Date:   Mon Oct 22 20:31:04 2018 +0200
+
+    honor standalone '.' in path, split jail dir on "/./" pattern
+
+diff --git a/src/jail.c b/src/jail.c
+index 74f3eb1..3d649c4 100644
+--- a/src/jail.c
++++ b/src/jail.c
+@@ -121,8 +121,9 @@ void make_jail_dir( char*  dir )
+ {
+     for( ; *dir != '\0'; ++dir )
+     {
+-        if( *dir == '.' )
++        if( dir[0] == '/' && dir[1] == '.' && dir[2] == '/' )
+         {
++            ++dir;
+             *dir = '\0';
+             break;
+ 	}
diff --git a/app-misc/jail/files/jail-2.0-ldd-call.patch b/app-misc/jail/files/jail-2.0-ldd-call.patch
new file mode 100644
index 000000000000..22b2152066e7
--- /dev/null
+++ b/app-misc/jail/files/jail-2.0-ldd-call.patch
@@ -0,0 +1,19 @@
+commit 87867b2a117eef19500600a1f88b9caf260cfe3b
+Author: Alexander Zubkov <green@qrator.net>
+Date:   Wed Oct 17 22:38:13 2018 +0200
+
+    do not pass program parameters to ldd call
+
+diff --git a/lib/arch/generic/functions b/lib/arch/generic/functions
+index 66653c3..b0c6572 100755
+--- a/lib/arch/generic/functions
++++ b/lib/arch/generic/functions
+@@ -704,7 +704,7 @@ sub generate_dep {
+       return();
+     }
+     
+-    $query = "($ldd_cmd $p_name $p_args </dev/null 2>&1)";
++    $query = "($ldd_cmd $p_name </dev/null 2>&1)";
+     local @res_a = `$query`;
+     
+     local @items = ();
diff --git a/app-misc/jail/files/jail-2.0-openat-syscall.patch b/app-misc/jail/files/jail-2.0-openat-syscall.patch
new file mode 100644
index 000000000000..37f2a59b14b9
--- /dev/null
+++ b/app-misc/jail/files/jail-2.0-openat-syscall.patch
@@ -0,0 +1,23 @@
+commit 0894cc54b5b385201cdcf7ce227c6ea03d765ef9
+Author: Alexander Zubkov <green@qrator.net>
+Date:   Wed Oct 17 22:45:24 2018 +0200
+
+    support openat() syscall too
+
+diff --git a/lib/arch/generic/functions b/lib/arch/generic/functions
+index b0c6572..b1fdbc8 100755
+--- a/lib/arch/generic/functions
++++ b/lib/arch/generic/functions
+@@ -647,9 +647,9 @@ sub extract_open_from_ldd {
+ 
+   local $file;
+   local $val;
+-  if ($line =~ /^open\(\"(.+)\".+\)\s*=\s*([-]?\d+)/) {
+-    $file = $1;
+-    $val = $2;
++  if ($line =~ /^open(at)?\([^\"]*\"(.+)\".+\)\s*=\s*([-]?\d+)/) {
++    $file = $2;
++    $val = $3;
+     return($file,$val);
+   }
+   return();
\ No newline at end of file
diff --git a/app-misc/jail/jail-2.0-r2.ebuild b/app-misc/jail/jail-2.0-r4.ebuild
index 8243ee0dfd3c..fc4cdee1bb55 100644
--- a/app-misc/jail/jail-2.0-r2.ebuild
+++ b/app-misc/jail/jail-2.0-r4.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
@@ -26,6 +26,12 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.9-ldflags.patch
 	"${FILESDIR}"/${PN}-2.0-sysmacros.patch
 	"${FILESDIR}"/${PN}-2.0-symlinks.patch #659094
+	"${FILESDIR}"/${PN}-2.0-fix-paths.patch #646116
+	# https://github.com/spiculator/jail/issues/2
+	"${FILESDIR}"/${PN}-2.0-openat-syscall.patch
+	# https://github.com/spiculator/jail/issues/3
+	"${FILESDIR}"/${PN}-2.0-ldd-call.patch
+	"${FILESDIR}"/${PN}-2.0-duplicate-jail.patch #668898
 )
 
 src_compile() {
diff --git a/app-misc/lcd4linux/Manifest b/app-misc/lcd4linux/Manifest
index fe6fc2779816..dc4736849d72 100644
--- a/app-misc/lcd4linux/Manifest
+++ b/app-misc/lcd4linux/Manifest
@@ -1,13 +1,5 @@
-AUX lcd4linux-0.10.1_rc2-autoconf-2.65.patch 593 BLAKE2B 4dfc40b408c668db5b0ddb74a0328d58b542e342142c055496782c9606cb6408284d900c8eb07da0f32ec2857a547c9ab468e0cd9e5d66aaef7b9126bdd1dd03 SHA512 55f09599fa894f9ce7aa128e708d7c7bc145630d0db6ec31b04302cdf9df19aec12a05debf66dc8fb8cf6b657f3f6c430ae6615a946c7d84a7b6875880241bb2
-AUX lcd4linux-0.10.1_rc2-missing-header.patch 337 BLAKE2B 2fd4f1a58bde455739880d2ce3232120a34b08869e2823b712a67d385f86f8c2a86620a8da9c35899ea0350606d9c18140d35530facfe747465bda94d705a1ce SHA512 3bec09fbd773565945c925a39412223e1f59db2752290ba945d254ccdf826b8789162c7482d98feca8ebd0dde14be7ce18c46fb7c4d98cd9c4129d4e96dfea89
-AUX lcd4linux-0.10.1_rc2-mpd.patch 9230 BLAKE2B d20fe911ced307e3ab99ac3b23913faad177fb18fa911376a2f2dbfa53852c0d99098d9da7424df711c5360116d8fc5af4e3b100e3a30d5f09f0e619e19a1a24 SHA512 8763f22deb728d5bfbd4ae601c3cc8808ada042374b604a3787429497373d6d52cbe48f72be37d149f823debfdc740b2a23db5fe2e20ab1091743f2d6ba186af
-AUX lcd4linux-0.10.1_rc2-nordtsc.patch 4703 BLAKE2B 951f35d6b935cc74d7a39b8101015b762627591e2942513755d134c456e59017827fd542b09481b3a2b9e1fc409746c2e454567e89a45b1fa583aaad861edcaa SHA512 fb0579cde4ce812e4f26a3e30f0b223c9dbafd07ccf297dffb8ba50bc757f2a7a01c37d456b4a8c8b5ec616a4b694d2efd11a55d1f2e20f4397bfcdda1d59585
-AUX lcd4linux-0.10.1_rc2-usbdebug.patch 3032 BLAKE2B f6672c30554fd271b5fbaf2832ec2d55c3e14544147cfbdbfa29a579f7a59243a08b6523af779938db4c2f7cf368d7f47dfe7c6581ece5bcd4f4fc60efbc96d2 SHA512 252ebab0e125c2189178f1de35c46d398f79d4b5fd4ff5b92c72874e95c7b45c25eaa92b600a8d5a160e4e45c265f69b6240123c6d2ec4076c7947659e46ae46
-AUX lcd4linux-0.10.1_rc2-warnings.patch 2229 BLAKE2B 4e4c6f34ffc440083890df845616cb723bb26756ea08b34d7dc01da25abe33b59b4bb81f78a53c6c71a57dab42bc30429ba4b399c2c55b1611c3443bf8d454b2 SHA512 ee6b163dc93f2913c629b056ec79cffaecbdb9124d187be8e616e10cc3cec917d98cc8131fda9d3b310530c00cd61dc1617dce4f54143c77962cbc0c58f4d615
-AUX lcd4linux-0.10.1_rc2.initd 539 BLAKE2B 314810d6bf8a402a435dc1cb53f610ed1f0fd3ec8965cc9fd798b5aa097bf1c35a5baa4a76dc9ed7d244943c9aa1b05aaf5e010b431522fdc3d7d45bbdffeca4 SHA512 c3f6cc42bb6c0d7ecaa180c28c0d9a9530b32dca97cb563960a0c30ca9cbed80a7b249f970d791ba034f115ef22218feac7a449ab6fe69109a1427565d62be07
 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 5152 BLAKE2B c93e24bde5ee61bb926079a8b487d723046681c776954d41d6c258d638f5a0f4a47bbbcb4ce6592b76715cf28c6f60762dda7b82d02567c98fce599c126c1ab8 SHA512 b1ef4cf6203d51c7b8518ce9d554db5541b6eed4d59548218c4ac9d8d7fea3c0ce2a04a24dd518da1e75eeeda40c34ee819fd588a6c647baab3911216cecd340
-EBUILD lcd4linux-0.11.0_pre20170527.ebuild 5554 BLAKE2B 8df277c018df83a5f32907605bb8d43e45125cb8b285731bd0a4cc9e5a20a0aba4ecd08df5e098c354110f404b9e8e037fdc4cffc7ec076ce480d43b881ba0d6 SHA512 4a7ee882463293c0fc7bf8ca52fbc1726ad54208930bb707020419a2c9e6180b613987471a473ad282b24598060a579ae580b7f7e356e2b950a4482366942749
+EBUILD lcd4linux-0.11.0_pre20170527-r1.ebuild 5594 BLAKE2B 7833584b733ca61b452ae4786d29f0b10f1cbf463a1f845ff32a8a8b9977fc196adabb6a6d9335cda10231868d6e5ea79ec862509927bd2ac371cb97e92d4ab8 SHA512 6c44114cc4067457ef452fb5f9d80463056786ab36c467e9c13c98aecb98bce3cd1fa270a71d769006370640e3d3b9ede29368f600435cac5f5c74d455e38809
+EBUILD lcd4linux-0.11.0_pre20170527.ebuild 5550 BLAKE2B d9488943d12768363e4fe26511e203856de5a7aa61d79c5668f3b39a7bd72b0b07486b90d2e15c277de8ef04a1b828ff6e77cfe6b8eee14a5a7af5c735ceb3cc SHA512 63191fa94067bf27955c830e24fe13c49b9217ef9eedbbd62fc1f0399c7242062696d076dbaff98fb9a0b33fab297fc94069ebae6610c0ad39467980d75f350c
 MISC metadata.xml 3555 BLAKE2B 507770da472d7befe06269d3b8ed52ca258467acb8d18892f47db3a630742c66f48f55f069c160ef0c889bc0fd31fbdd41b81fc6574ff4a51eea247373b8e25e SHA512 618885236669c7b9c28114d01f2f2f8c05638eb4eb85aca3d311d180cf82af01255f143ccdc0db2e890d42d2cb7fa3223638fcf4985d80322c95101e6c00e9fe
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-autoconf-2.65.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-autoconf-2.65.patch
deleted file mode 100644
index 6b176a6ecf64..000000000000
--- a/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-autoconf-2.65.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ac_python_devel.m4.orig	2010-03-06 01:28:40.000000000 +0200
-+++ ac_python_devel.m4	2010-03-06 01:29:47.000000000 +0200
-@@ -68,7 +68,7 @@
- PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
- Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
- to something else than an empty string.
--])dnl
-+])
- 		else
- 			AC_MSG_RESULT([skip at user request])
- 		fi
-@@ -92,7 +92,7 @@
- If you have it installed, but it isn't the default Python
- interpreter in your system path, please pass the PYTHON_VERSION 
- variable to configure. See ``configure --help'' for reference.
--])dnl
-+])
- 		fi
- 	fi
- 
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-missing-header.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-missing-header.patch
deleted file mode 100644
index 6b38dc038c4a..000000000000
--- a/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-missing-header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur lcd4linux-0.10.1-RC2.orig/lcd4linux.c  lcd4linux-0.10.1-RC2/lcdinux-0.10.1-RC2/lcd4linux.c
---- lcd4linux.c	2007-03-22 15:10:41.000000000 +0900
-+++ lcd4linux.c	2011-11-23 12:12:03.782869315 +0800
-@@ -26,7 +26,7 @@
-  */
- 
- #include "config.h"
--
-+#include <sys/stat.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-mpd.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-mpd.patch
deleted file mode 100644
index c3fa8ac36350..000000000000
--- a/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-mpd.patch
+++ /dev/null
@@ -1,374 +0,0 @@
-Patch for >=lcd4linux-0.10.1_rc2-r1
-
-Fixes memory and other bugs in plugin_mpd
-
-Accepted upstream
-
-Index: plugin_mpd.c
-===================================================================
---- plugin_mpd.c	(Revision 801)
-+++ plugin_mpd.c	(Arbeitskopie)
-@@ -4,6 +4,7 @@
-  * mpd informations
-  *
-  * Copyright (C) 2006 Stefan Kuhne <sk-privat@gmx.net>
-+ * Copyright (C) 2007 Robert Buchholz <rbu@gentoo.org>
-  * Copyright (C) 2006 The LCD4Linux Team <lcd4linux-devel@users.sourceforge.net>
-  *
-  * This file is part of LCD4Linux.
-@@ -81,8 +82,8 @@
- 
-     iport = strtol(port, &test, 10);
- 
--    if (iport < 0 || *test != '\0') {
--	fprintf(stderr, "MPD_PORT \"%s\" is not a positive integer\n", port);
-+    if ((iport < 0) || (*test != '\0')) {
-+	error("[MPD] MPD_PORT \"%s\" is not a positive integer\n", port);
- 	exit(EXIT_FAILURE);
-     }
- 
-@@ -94,17 +95,16 @@
-     mpd_sendCommandListEnd(mpd.conn);
- 
-     if ((mpd.status = mpd_getStatus(mpd.conn)) == NULL) {
--	fprintf(stderr, "%s\n", mpd.conn->errorStr);
-+	error("[MPD] error when getting status: %s\n", mpd.conn->errorStr);
- 	mpd_closeConnection(mpd.conn);
--    }
--
--    if (mpd.status->error) {
--	printf("error: %s\n", mpd.status->error);
--    }
--
--    if (mpd.conn->error) {
--	fprintf(stderr, "%s\n", mpd.conn->errorStr);
-+	mpd.conn = NULL;
-+    } else if (mpd.status->error) {
-+	info("[MPD] status error when connecting: %s\n", mpd.status->error);
-+    } else if (mpd.conn->error) {
-+	error("[MPD] error when connecting: %s\n", mpd.conn->errorStr);
-+	mpd_freeStatus(mpd.status);
- 	mpd_closeConnection(mpd.conn);
-+	mpd.conn = NULL;
-     }
- 
-     return mpd;
-@@ -114,14 +114,15 @@
- static void disconnect(struct Pointer mpd)
- {
-     if (mpd.conn->error) {
--	fprintf(stderr, "%s\n", mpd.conn->errorStr);
-+	error("[MPD] error when disconnecting: %s\n", mpd.conn->errorStr);
-+	mpd_freeStatus(mpd.status);
- 	mpd_closeConnection(mpd.conn);
-+	return;
-     }
- 
-     mpd_finishCommand(mpd.conn);
-     if (mpd.conn->error) {
--	fprintf(stderr, "%s\n", mpd.conn->errorStr);
--	mpd_closeConnection(mpd.conn);
-+	error("[MPD] error when disconnecting: %s\n", mpd.conn->errorStr);
-     }
- 
-     mpd_freeStatus(mpd.status);
-@@ -132,8 +133,12 @@
- 
- static void artist(RESULT * result, RESULT * query)
- {
--    char *value = " ";
-+    char *value = NULL;
-     struct Pointer mpd = connect();
-+    if (mpd.conn == NULL) {
-+	SetResult(&result, R_STRING, " ");
-+	return;
-+    }
- 
-     mpd_nextListOkCommand(mpd.conn);
- 
-@@ -145,9 +150,10 @@
- 	    continue;
- 	}
- 
--	if (song->artist) {
-+	if (!value && song->artist) {
-+	    /* we found our first song */
- 	    value = strdup(song->artist);
--	    //add comment
-+	    /* add comment */
- 	    if (query) {
- 		char *myarg;
- 		myarg = strdup(R2S(query));
-@@ -160,8 +166,8 @@
- 
-     disconnect(mpd);
- 
--    /* store result */
--    SetResult(&result, R_STRING, value);
-+    /* store result, value must not be NULL */
-+    SetResult(&result, R_STRING, value ? value : " ");
- 
-     free(value);
- }
-@@ -169,8 +175,12 @@
- 
- static void title(RESULT * result)
- {
--    char *value = " ";
-+    char *value = NULL;
-     struct Pointer mpd = connect();
-+    if (mpd.conn == NULL) {
-+	SetResult(&result, R_STRING, " ");
-+	return;
-+    }
- 
-     mpd_nextListOkCommand(mpd.conn);
- 
-@@ -182,7 +192,7 @@
- 	    continue;
- 	}
- 
--	if (song->title) {
-+	if (!value && song->title) {
- 	    value = strdup(song->title);
- 	}
- 	mpd_freeInfoEntity(mpd.entity);
-@@ -190,8 +200,8 @@
- 
-     disconnect(mpd);
- 
--    /* store result */
--    SetResult(&result, R_STRING, value);
-+    /* store result, value must not be NULL  */
-+    SetResult(&result, R_STRING, value ? value : " ");
- 
-     free(value);
- }
-@@ -199,8 +209,12 @@
- 
- static void album(RESULT * result)
- {
--    char *value = " ";
-+    char *value = NULL;
-     struct Pointer mpd = connect();
-+    if (mpd.conn == NULL) {
-+	SetResult(&result, R_STRING, " ");
-+	return;
-+    }
- 
-     mpd_nextListOkCommand(mpd.conn);
- 
-@@ -212,7 +226,7 @@
- 	    continue;
- 	}
- 
--	if (song->album) {
-+	if (!value && song->album) {
- 	    value = strdup(song->album);
- 	}
- 	mpd_freeInfoEntity(mpd.entity);
-@@ -220,8 +234,8 @@
- 
-     disconnect(mpd);
- 
--    /* store result */
--    SetResult(&result, R_STRING, value);
-+    /* store result, value must not be NULL */
-+    SetResult(&result, R_STRING, value ? value : " ");
- 
-     free(value);
- }
-@@ -236,7 +250,7 @@
- void error_callback( __attribute__ ((unused)) MpdObj * mi, int errorid, char *msg, __attribute__ ((unused))
- 		    void *userdata)
- {
--    printf("Error %i: '%s'\n", errorid, msg);
-+    info("[MPD] caught error %i: '%s'\n", errorid, msg);
- }
- 
- static int mpd_get(int function)
-@@ -278,95 +292,89 @@
- 
- static void elapsedTime(RESULT * result)
- {
--    char *value = " ";
-+    char myTime[6] = " ";
- 
--    int playTime = mpd_get(_mpd_status_get_elapsed_song_time);
-+    const int playTime = mpd_get(_mpd_status_get_elapsed_song_time);
- 
--    if (playTime != -1) {
--	char myTime[6];
--	memset(myTime, 0, 6);
--	int minutes = (int) (playTime / 60);
--	int seconds = (int) (playTime % 60);
-+    if ((playTime >= 0) && (playTime < 6000)) {
-+	const int minutes = (int) (playTime / 60);
-+	const int seconds = (int) (playTime % 60);
- 	sprintf(myTime, "%02d:%02d", minutes, seconds);
-+    } else if (playTime >= 6000) {
-+	strcpy(myTime, "LONG");
-+    }
- 
--	value = strdup(myTime);
--    }
--    // store result     
--    SetResult(&result, R_STRING, value);
-+    /* store result */
-+    SetResult(&result, R_STRING, myTime);
- }
- 
- static void elapsedTimeSec(RESULT * result)
- {
--    int playTime = mpd_get(_mpd_status_get_elapsed_song_time);
-+    const int playTime = mpd_get(_mpd_status_get_elapsed_song_time);
-     double d = 0.0;
- 
-     if (playTime != -1)
- 	d = playTime;
- 
--    // store result     
-+    /* store result */
-     SetResult(&result, R_NUMBER, &d);
- }
- 
- static void totalTime(RESULT * result)
- {
--    char *value = " ";
-+    char myTime[6] = "ERROR";
- 
--    int totTime = mpd_get(_mpd_status_get_total_song_time);
--    if (totTime != -1) {
--	char myTime[6];
--	memset(myTime, 0, 6);
--	int minutes = (int) (totTime / 60);
--	int seconds = (int) (totTime % 60);
-+    const int totTime = mpd_get(_mpd_status_get_total_song_time);
-+    if ((totTime >= 0) && (totTime < 6000)) {
-+	const int minutes = (int) (totTime / 60);
-+	const int seconds = (int) (totTime % 60);
- 	sprintf(myTime, "%02d:%02d", minutes, seconds);
-+    } else if (totTime >= 6000) {
-+	strcpy(myTime, "LONG");
-+    }
- 
--	value = strdup(myTime);
--    } else
--	value = strdup("ERROR");
--    // store result     
--    SetResult(&result, R_STRING, value);
-+    /* store result */
-+    SetResult(&result, R_STRING, myTime);
- }
- 
- static void totalTimeSec(RESULT * result)
- {
--    int totTime = mpd_get(_mpd_status_get_total_song_time);
-+    const int totTime = mpd_get(_mpd_status_get_total_song_time);
-     double d = 0.0;
- 
-     if (totTime != -1)
- 	d = totTime;
- 
--    // store result     
-+    /* store result */
-     SetResult(&result, R_NUMBER, &d);
- }
- 
- static void bitRate(RESULT * result)
- {
--    char *value = "";
-+    char rateStr[4];
- 
--    int rate = mpd_get(_mpd_status_get_bitrate);
-+    const int rate = mpd_get(_mpd_status_get_bitrate);
- 
--    if (rate != -1) {
--	char rateStr[4];
--	memset(rateStr, 0, 4);
-+    if ((rate >= 0) && (rate < 1000)) {
- 	sprintf(rateStr, "%03d", rate);
-+    }
- 
--	value = strdup(rateStr);
--    }
--    // store result     
--    SetResult(&result, R_STRING, value);
-+    /* store result */
-+    SetResult(&result, R_STRING, rateStr);
- }
- 
- static void getRepeat(RESULT * result)
- {
-     char *value = " ";
- 
--    int rep = mpd_get(_mpd_player_get_repeat);
-+    const int rep = mpd_get(_mpd_player_get_repeat);
- 
-     if (rep != -1) {
- 	if (rep)
--	    value = strdup("REP");
--	// else value = strdup("   ");          
-+	    value = "REP";
-+	/* else value = strdup("   "); */
-     }
--    // store result     
-+    /* store result */
-     SetResult(&result, R_STRING, value);
- }
- 
-@@ -375,26 +383,26 @@
- {
-     char *value = " ";
- 
--    int ran = mpd_get(_mpd_player_get_random);
-+    const int ran = mpd_get(_mpd_player_get_random);
- 
-     if (ran != -1) {
- 	if (ran)
- 	    value = strdup("RND");
--	// else value = strdup("   ");          
-+	/* else value = strdup("   "); */
-     }
--    // store result     
-+    /* store result */
-     SetResult(&result, R_STRING, value);
- }
- 
- static void getRepRand(RESULT * result)
- {
--    char *value = " ";
-+    char str[9] = " ";
- 
--    int ran = mpd_get(_mpd_player_get_random);
--    int rep = mpd_get(_mpd_player_get_repeat);
-+    const int ran = mpd_get(_mpd_player_get_random);
-+    const int rep = mpd_get(_mpd_player_get_repeat);
- 
-     if (ran != -1 && rep != -1) {
--	char str[9];
-+
- 	if (rep)
- 	    sprintf(str, "REP/");
- 	else
-@@ -403,17 +411,16 @@
- 	    sprintf(str, "%sRND", str);
- 	else
- 	    sprintf(str, "%s---", str);
--	value = strdup(str);
-     }
--    // store result     
--    SetResult(&result, R_STRING, value);
-+    /* store result */
-+    SetResult(&result, R_STRING, str);
- }
- 
- int plugin_init_mpd(void)
- {
-     /* Check for File */
-     if (mpd_get(_mpd_dummy) != 1) {
--	error("Error: Cannot connect to MPD! Is MPD started?");
-+	error("[MPD] Error: Cannot connect to MPD! Is MPD started?");
- 	return -1;
-     }
- 
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-nordtsc.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-nordtsc.patch
deleted file mode 100644
index b25d01e8e901..000000000000
--- a/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-nordtsc.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-kMessage-ID: <47011930.60100@reinelt.co.at>
-Date: Mon, 01 Oct 2007 17:58:40 +0200
-From: Michael Reinelt <michael@reinelt.co.at>
-Subject: [Lcd4linux-devel] asm/msr.h inclusion and RDTSC stuff removed
-
-Hi there,
-
-I just committed a changeset where I removed the whole RDTSC delay loop 
-stuff, and therefore lcd4linux does no longer need asm/msr.h
-
-Instead, a gettimeofday() delay loop will be used when necessary.
-
-The rdtsc stuff worked fine, but had two major disadvantages: It did not 
-work with variable CPU frequencies, and latest kernels do no longer 
-offer the rdtsc() macro.
-
-The changeset has been committed to trunk, and will be backported to the 
-0.10.1 branch as soon as I get some positive feedback 8or at least I 
-don't get any negative feedback)
-
-
-bye, Michael
-
--- 
-Michael Reinelt <michael@reinelt.co.at>
-http://home.pages.at/reinelt
-GPG-Key 0xDF13BA50
-ICQ #288386781
-
-Index: configure.in
-===================================================================
---- lcd4linux-0.10.1-RC2/configure.in.orig
-+++ lcd4linux-0.10.1-RC2/configure.in
-@@ -99,7 +99,6 @@ AC_HEADER_STDC
- AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h sys/vfs.h syslog.h termios.h unistd.h])
- AC_CHECK_HEADERS(sys/io.h asm/io.h)
- AC_CHECK_HEADERS(linux/parport.h linux/ppdev.h)
--AC_CHECK_HEADERS(asm/msr.h)
- 
- # Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
-Index: udelay.c
-===================================================================
---- lcd4linux-0.10.1-RC2/udelay.c.orig
-+++ lcd4linux-0.10.1-RC2/udelay.c
-@@ -55,11 +55,6 @@
- #include <string.h>
- #include <sys/time.h>
- 
--#ifdef HAVE_ASM_MSR_H
--#define u32 unsigned int
--#include <asm/msr.h>
--#endif
--
- 
- #include "debug.h"
- #include "cfg.h"
-@@ -67,79 +62,10 @@
- #include "udelay.h"
- 
- 
--static unsigned int ticks_per_usec = 0;
--
--
--static void getCPUinfo(int *hasTSC, double *MHz)
--{
--    int fd;
--    char buffer[4096], *p;
--
--    *hasTSC = 0;
--    *MHz = -1;
--
--    fd = open("/proc/cpuinfo", O_RDONLY);
--    if (fd == -1) {
--	error("udelay: open(/proc/cpuinfo) failed: %s", strerror(errno));
--	return;
--    }
--    if (read(fd, &buffer, sizeof(buffer) - 1) == -1) {
--	error("udelay: read(/proc/cpuinfo) failed: %s", strerror(errno));
--	close(fd);
--	return;
--    }
--    close(fd);
--
--    p = strstr(buffer, "flags");
--    if (p == NULL) {
--	info("udelay: /proc/cpuinfo has no 'flags' line");
--    } else {
--	p = strstr(p, "tsc");
--	if (p == NULL) {
--	    info("udelay: CPU does not support Time Stamp Counter");
--	} else {
--	    info("udelay: CPU supports Time Stamp Counter");
--	    *hasTSC = 1;
--	}
--    }
--
--    p = strstr(buffer, "cpu MHz");
--    if (p == NULL) {
--	info("udelay: /proc/cpuinfo has no 'cpu MHz' line");
--    } else {
--	if (sscanf(p + 7, " : %lf", MHz) != 1) {
--	    error("udelay: parse(/proc/cpuinfo) failed: unknown 'cpu MHz' format");
--	    *MHz = -1;
--	} else {
--	    info("udelay: CPU runs at %f MHz", *MHz);
--	}
--    }
--
--}
--
- 
- void udelay_init(void)
- {
--#ifdef HAVE_ASM_MSR_H
--
--    int tsc;
--    double mhz;
--
--    getCPUinfo(&tsc, &mhz);
--
--    if (tsc && mhz > 0.0) {
--	ticks_per_usec = ceil(mhz);
--	info("udelay: using TSC delay loop, %u ticks per microsecond", ticks_per_usec);
--    } else
--#else
--    error("udelay: The file 'include/asm/msr.h' was missing at compile time.");
--    error("udelay: Even if your CPU supports TSC, it will not be used!");
--    error("udelay: You *really* should install msr.h and recompile LCD4linux!");
--#endif
--    {
--	ticks_per_usec = 0;
--	info("udelay: using gettimeofday() delay loop");
--    }
-+    info("udelay: using gettimeofday() delay loop");
- }
- 
- 
-@@ -172,37 +98,17 @@ unsigned long timing(const char *driver,
- void ndelay(const unsigned long nsec)
- {
- 
--#ifdef HAVE_ASM_MSR_H
--
--    if (ticks_per_usec) {
-+    struct timeval now, end;
- 
--	unsigned int t1, t2;
--	unsigned long tsc;
--
--	tsc = (nsec * ticks_per_usec + 999) / 1000;
--
--	rdtscl(t1);
--	do {
--	    rep_nop();
--	    rdtscl(t2);
--	} while ((t2 - t1) < tsc);
--
--    } else
--#endif
--
--    {
--	struct timeval now, end;
--
--	gettimeofday(&end, NULL);
--	end.tv_usec += (nsec + 999) / 1000;
--	while (end.tv_usec > 1000000) {
--	    end.tv_usec -= 1000000;
--	    end.tv_sec++;
--	}
--
--	do {
--	    rep_nop();
--	    gettimeofday(&now, NULL);
--	} while (now.tv_sec == end.tv_sec ? now.tv_usec < end.tv_usec : now.tv_sec < end.tv_sec);
-+    gettimeofday(&end, NULL);
-+    end.tv_usec += (nsec + 999) / 1000;
-+    while (end.tv_usec > 1000000) {
-+	end.tv_usec -= 1000000;
-+	end.tv_sec++;
-     }
-+
-+    do {
-+	rep_nop();
-+	gettimeofday(&now, NULL);
-+    } while (now.tv_sec == end.tv_sec ? now.tv_usec < end.tv_usec : now.tv_sec < end.tv_sec);
- }
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-usbdebug.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-usbdebug.patch
deleted file mode 100644
index 6ecc7a248990..000000000000
--- a/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-usbdebug.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-diff -crB lcd4linux-0.10.1-RC2-orig/drv_BWCT.c lcd4linux-0.10.1-RC2/drv_BWCT.c
-*** lcd4linux-0.10.1-RC2-orig/drv_BWCT.c	2007-02-25 13:39:09.000000000 +0100
---- lcd4linux-0.10.1-RC2/drv_BWCT.c	2013-11-10 21:32:06.119047221 +0100
-***************
-*** 72,78 ****
-  static usb_dev_handle *lcd;
-  static int interface;
-  
-- extern int usb_debug;
-  extern int got_signal;
-  
-  
---- 72,77 ----
-***************
-*** 89,96 ****
-  
-      info("%s: scanning USB for BWCT LCD...", Name);
-  
--     usb_debug = 0;
-- 
-      usb_init();
-      usb_find_busses();
-      usb_find_devices();
---- 88,93 ----
-diff -crB lcd4linux-0.10.1-RC2-orig/drv_LCD2USB.c lcd4linux-0.10.1-RC2/drv_LCD2USB.c
-*** lcd4linux-0.10.1-RC2-orig/drv_LCD2USB.c	2007-02-25 13:39:10.000000000 +0100
---- lcd4linux-0.10.1-RC2/drv_LCD2USB.c	2013-11-10 21:32:15.686677498 +0100
-***************
-*** 98,104 ****
-  static usb_dev_handle *lcd;
-  static int controllers = 0;
-  
-- extern int usb_debug;
-  extern int got_signal;
-  
-  /****************************************/
---- 98,103 ----
-***************
-*** 120,127 ****
-      if (device_id != NULL)
-  	info("%s: scanning for device id: %s", Name, device_id);
-  
--     usb_debug = 0;
-- 
-      usb_init();
-      usb_find_busses();
-      usb_find_devices();
---- 119,124 ----
-diff -crB lcd4linux-0.10.1-RC2-orig/drv_picoLCD.c lcd4linux-0.10.1-RC2/drv_picoLCD.c
-*** lcd4linux-0.10.1-RC2-orig/drv_picoLCD.c	2007-02-25 13:39:10.000000000 +0100
---- lcd4linux-0.10.1-RC2/drv_picoLCD.c	2013-11-10 21:32:30.102120440 +0100
-***************
-*** 75,81 ****
-  static char *BufPtr;
-  
-  static usb_dev_handle *lcd;
-- extern int usb_debug;
-  
-  
-  
---- 75,80 ----
-***************
-*** 97,104 ****
-  
-      info("%s: scanning for picoLCD...", Name);
-  
--     usb_debug = 0;
-- 
-      usb_init();
-      usb_find_busses();
-      usb_find_devices();
---- 96,101 ----
-diff -crB lcd4linux-0.10.1-RC2-orig/drv_Trefon.c lcd4linux-0.10.1-RC2/drv_Trefon.c
-*** lcd4linux-0.10.1-RC2-orig/drv_Trefon.c	2007-02-25 13:39:10.000000000 +0100
---- lcd4linux-0.10.1-RC2/drv_Trefon.c	2013-11-10 21:32:46.441489039 +0100
-***************
-*** 72,78 ****
-  static usb_dev_handle *lcd;
-  static int interface;
-  
-- extern int usb_debug;
-  
-  
-  /****************************************/
---- 72,77 ----
-***************
-*** 88,95 ****
-  
-      info("%s: scanning USB for TREFON LCD...", Name);
-  
--     usb_debug = 0;
-- 
-      usb_init();
-      usb_find_busses();
-      usb_find_devices();
---- 87,92 ----
-diff -crB lcd4linux-0.10.1-RC2-orig/drv_USBLCD.c lcd4linux-0.10.1-RC2/drv_USBLCD.c
-*** lcd4linux-0.10.1-RC2-orig/drv_USBLCD.c	2007-02-25 13:39:10.000000000 +0100
---- lcd4linux-0.10.1-RC2/drv_USBLCD.c	2013-11-10 21:33:01.508906792 +0100
-***************
-*** 86,93 ****
-  static usb_dev_handle *lcd;
-  static int interface;
-  
-- extern int usb_debug;
-- 
-  #endif
-  
-  
---- 86,91 ----
-***************
-*** 107,114 ****
-  
-      info("%s: scanning for USBLCD...", Name);
-  
--     usb_debug = 0;
-- 
-      usb_init();
-      usb_find_busses();
-      usb_find_devices();
---- 105,110 ----
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-warnings.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-warnings.patch
deleted file mode 100644
index 58791ee91ff7..000000000000
--- a/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2-warnings.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Index: ./plugin_kvv.c
-===================================================================
---- ./plugin_kvv.c (revision 771)
-+++ ./plugin_kvv.c (revision 797)
-@@ -414,5 +414,5 @@
- 
- 	if (count > 0) {
--	    char *input, *cookie, *name, *value;
-+	    char *input, *cookie, *name = NULL, *value = NULL;
- 	    int input_len, cookie_len, name_len, value_len;
- 
-Index: ./plugin_mpd.c
-===================================================================
---- ./plugin_mpd.c (revision 786)
-+++ ./plugin_mpd.c (revision 797)
-@@ -65,5 +65,10 @@
-     int iport;
-     char *test;
--    struct Pointer mpd;
-+
-+    struct Pointer mpd = {
-+	.conn = NULL,
-+	.status = NULL,
-+	.entity = NULL
-+    };
- 
-     if ((test = getenv("MPD_HOST"))) {
-@@ -229,5 +234,6 @@
- #define _mpd_player_get_random			005
- 
--void error_callback(MpdObj * mi, int errorid, char *msg, void *userdata)
-+void error_callback( __attribute__ ((unused)) MpdObj * mi, int errorid, char *msg, __attribute__ ((unused))
-+		    void *userdata)
- {
-     printf("Error %i: '%s'\n", errorid, msg);
-Index: ./drv_Image.c
-===================================================================
---- ./drv_Image.c (revision 771)
-+++ ./drv_Image.c (revision 797)
-@@ -115,5 +115,5 @@
-     if (bitbuf == NULL) {
- 	if ((bitbuf = malloc(xsize * ysize * sizeof(*bitbuf))) == NULL) {
--	    error("%s: malloc(%d) failed: %s", Name, (int) xsize * ysize * sizeof(*bitbuf), strerror(errno));
-+	    error("%s: malloc() failed: %s", Name, strerror(errno));
- 	    return -1;
- 	}
-@@ -122,5 +122,5 @@
-     if (rowbuf == NULL) {
- 	if ((rowbuf = malloc(3 * xsize * sizeof(*rowbuf))) == NULL) {
--	    error("Raster: malloc(%d) failed: %s", (int) 3 * xsize * sizeof(*rowbuf), strerror(errno));
-+	    error("Raster: malloc() failed: %s", strerror(errno));
- 	    return -1;
- 	}
-Index: ./plugin_i2c_sensors.c
-===================================================================
---- ./plugin_i2c_sensors.c (revision 771)
-+++ ./plugin_i2c_sensors.c (revision 797)
-@@ -297,5 +297,5 @@
- 	    strcat(path_cfg, "/");
- 	}
--	debug("using i2c sensors at %s (from %s)", path, cfg_source());
-+	debug("using i2c sensors at %s (from %s)", path_cfg, cfg_source());
- 	path = realloc(path, strlen(path_cfg) + 1);
- 	strcpy(path, path_cfg);
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2.initd b/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2.initd
deleted file mode 100644
index 1135ea3d588b..000000000000
--- a/app-misc/lcd4linux/files/lcd4linux-0.10.1_rc2.initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-PIDFILE=/var/run/lcd4linux.pid
-DAEMON=/usr/bin/lcd4linux
-
-depend() {
-	use net
-}
-
-start() {
-	ebegin "Starting lcd4linux"
-	start-stop-daemon --start --quiet --pidfile ${PIDFILE} --exec ${DAEMON}
-	eend $? "Failed to start lcd4linux. Did you remember to set up /etc/lcd4linux.conf?"
-}
-
-stop() {
-	ebegin "Stopping lcd4linux"
-	start-stop-daemon --stop --quiet --oknodo --exec ${DAEMON} --pidfile ${PIDFILE}
-	eend $?
-}
diff --git a/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r4.ebuild b/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r4.ebuild
deleted file mode 100644
index ce72ad458094..000000000000
--- a/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r4.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-WANT_AUTOMAKE="1.9"
-inherit eutils multilib autotools python-single-r1
-
-MY_P=${P/_rc/-RC}
-
-DESCRIPTION="Shows system and ISDN information on an external display or in a X11 window"
-HOMEPAGE="https://lcd4linux.bulix.org/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="mysql python iconv mpd"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# The following array holds the USE_EXPANDed keywords
-IUSE_LCD_DEVICES=(beckmannegle bwct cfontz ncurses cwlinux
-		ea232 g15 hd44780 hd44780i2c lcd2usb
-		lcdlinux lcdterm ledmatrix lph7508 m50530
-		mtxorb milfordbpk noritake null picolcd
-		png ppm routerboard serdisplib simplelcd
-		t6963 trefon usbhub usblcd wincor
-		X luise)
-
-# 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
-
-DEPEND="
-	mysql?  ( virtual/mysql )
-	iconv?  ( virtual/libiconv )
-	mpd?    ( media-libs/libmpd )
-
-	lcd_devices_bwct?     ( =virtual/libusb-0* )
-	lcd_devices_g15?      ( =virtual/libusb-0* )
-	lcd_devices_lcd2usb?  ( =virtual/libusb-0* )
-	lcd_devices_picolcd?  ( =virtual/libusb-0* )
-	lcd_devices_trefon?   ( =virtual/libusb-0* )
-	lcd_devices_usbhub?   ( =virtual/libusb-0* )
-	lcd_devices_usblcd?   ( =virtual/libusb-0* )
-	lcd_devices_luise?    ( dev-libs/luise-bin )
-	lcd_devices_ncurses?  ( sys-libs/ncurses:0= )
-	lcd_devices_noritake? ( media-libs/gd )
-	lcd_devices_t6963?    ( media-libs/gd )
-	lcd_devices_png?      ( media-libs/libpng:0= media-libs/gd )
-	lcd_devices_X?        ( x11-libs/libX11  media-libs/gd )
-	lcd_devices_serdisplib? ( dev-libs/serdisplib  media-libs/gd )
-"
-RDEPEND="${DEPEND}
-	python? ( ${PYTHON_DEPS} )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	elog "If you wish to compile only specific plugins, please use"
-	elog "the LCD4LINUX_PLUGINS environment variable. Plugins must be comma separated and can be either of:"
-	elog "apm cpuinfo diskstats dvb exec file i2c_sensors imon isdn kvv loadavg meminfo netdev pop3 ppp proc_stat seti statfs uname uptime wireless"
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-warnings.patch"
-	epatch "${FILESDIR}/${P}-mpd.patch"
-	epatch "${FILESDIR}/${P}-nordtsc.patch"
-	epatch "${FILESDIR}/${P}-autoconf-2.65.patch"
-	epatch "${FILESDIR}/${P}-missing-header.patch"
-	epatch "${FILESDIR}/${P}-usbdebug.patch"
-	eautoreconf
-}
-
-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=(BeckmannEgle BWCT CrystalFontz Curses Cwlinux
-		EA232graphic G15 HD44780 HD44780-I2C LCD2USB
-		LCDLinux LCDTerm LEDMatrix LPH7508 M50530
-		MatrixOrbital MilfordInstruments Noritake NULL picoLCD
-		PNG PPM RouterBoard serdisplib SimpleLCD
-		T6963 Trefon USBHUB USBLCD WincorNixdorf
-		X11 LUIse)
-
-	local myconf myp
-
-	# plugins
-	if [ -n "$LCD4LINUX_PLUGINS" ]; then
-		myp="$LCD4LINUX_PLUGINS"
-	else
-		myp="all,!xmms"
-	fi
-	use iconv || myp="${myp},!iconv"
-	use mpd || myp="${myp},!mpd"
-	use mysql || myp="${myp},!mysql"
-	use python || myp="${myp},!python"
-	elog "Active plugins: ${myp}"
-
-	# Generate comma separated list of drivers
-	local COMMA_DRIVERS
-	local FIRST_DRIVER
-	local index=0
-	local driver
-
-	while [ "${index}" -lt "${NUM_DEVICES}" ] ; do
-		if use "lcd_devices_${IUSE_LCD_DEVICES[$index]}" ; then
-			driver=${DEVICE_DRIVERS[$index]}
-			if [ -z ${COMMA_DRIVERS} ] ; then
-				# First in the list
-				COMMA_DRIVERS="${driver}"
-				FIRST_DRIVER="${driver}"
-			else
-				# Second, third, ... include a comma at the front
-				COMMA_DRIVERS="${COMMA_DRIVERS},${driver}"
-			fi
-		fi
-		let "index = ${index} + 1"
-	done
-
-	# activate at least one driver
-	if [ -z ${COMMA_DRIVERS} ] ; then
-		COMMA_DRIVERS="NULL"
-	fi
-
-	# workaround the build failing because of b0rked settings
-	if use lcd_devices_hd44780 && use lcd_devices_hd44780i2c ; then
-		echo
-		ewarn "Disabling hd44780 LCD_DEVICE as hd44780i2c is set!"
-		echo
-		COMMA_DRIVERS="${COMMA_DRIVERS},!HD44780"
-	fi
-
-	# avoid package brokenness
-	if use lcd_devices_X ; then
-		myconf="--x-libraries=/usr/$(get_libdir) --x-include=/usr/include"
-	else
-		myconf="--without-x"
-	fi
-
-	econf \
-		--sysconfdir=/etc/lcd4linux \
-		--with-drivers="${COMMA_DRIVERS}" \
-		--with-plugins="${myp}" \
-		$(use_with python) \
-		${myconf}
-
-	sed -i.orig -e 's/-L -lX11/ -lX11 /g' Makefile || die "sed fixup failed"
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/${P}.initd" ${PN}
-
-	insinto /etc
-	insopts -o root -g root -m 0600
-	newins lcd4linux.conf.sample lcd4linux.conf
-}
-
-pkg_postinst() {
-	if use lcd_devices_lcdlinux; then
-		ewarn "To actually use the lcd-linux devices, you will need to install the lcd-linux kernel module."
-		ewarn "You can either do that yourself, see http://lcd-linux.sf.net or "
-		ewarn "checkout https://overlays.gentoo.org/dev/jokey/browser/trunk and emerge app-misc/lcd-linux"
-	fi
-}
diff --git a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r1.ebuild b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r1.ebuild
new file mode 100644
index 000000000000..0d0113516571
--- /dev/null
+++ b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r1.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools flag-o-matic python-single-r1
+
+DESCRIPTION="A small program that grabs information and displays it on an external LCD"
+HOMEPAGE="https://lcd4linux.bulix.org/"
+SRC_URI="https://www.bl4ckb0x.de/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dmalloc outb"
+REQUIRED_USE="
+	?? ( lcd_devices_hd44780 lcd_devices_hd44780-i2c )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# Define the list of valid lcd devices.
+# Some drivers were removed from this list:
+# - lcdlinux: It's an ancient driver, which needs app-misc/lcd-linux, that made it never to the portage tree.
+# - lcdlinux: Besides, app-misc/lcd-linux won't compile on a modern linux kernel.
+# - st2205: It's needs dev-libs/libst2205,  which made it never to the portage tree and is quite outdated.
+IUSE_LCD_DEVICES=(
+	ASTUSB BeckmannEgle BWCT CrystalFontz Curses Cwlinux D4D DPF EA232graphic EFN FutabaVFD
+	FW8888 G15 GLCD2USB HD44780 HD44780-I2C IRLCD LCD2USB LCDTerm LEDMatrix LPH7508 LUIse LW_ABP M50530
+	MatrixOrbital MatrixOrbitalGX MilfordInstruments MDM166A Newhaven Noritake NULL Pertelian PHAnderson
+	PICGraphic picoLCD picoLCDGraphic PNG PPM RouterBoard Sample SamsungSPF serdisplib ShuttleVFD
+	SimpleLCD T6963 TeakLCM Trefon ULA200 USBHUB USBLCD VNC WincorNixdorf X11
+)
+
+# Define the list of valid lcd4linux plugins.
+# Some plugins were removed from this list:
+# - imon: Uses telmond, which is only available on a fli4l router or an eisfair server.
+# - ppp: It has been replaced by the netdev plugin.
+# - seti: SETI@home software was replaced by sci-misc/boinc, which is not compatible.
+# - xmms: XMMS software was replaced by media-sound/xmms2, which is not compatible.
+IUSE_LCD4LINUX_PLUGINS=(
+	apm asterisk button_exec cpuinfo dbus diskstats dvb exec event
+	fifo file gps hddtemp huawei i2c_sensors iconv isdn kvv
+	loadavg meminfo mpd mpris_dbus mysql netdev netinfo pop3
+	proc_stat python qnaplog raspi sample statfs uname uptime
+	w1retap wireless
+)
+
+# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
+REQUIRED_USE+=" || ( "
+for LCD_DEVICE in "${IUSE_LCD_DEVICES[@]}"; do
+	LCD_DEVICE=${LCD_DEVICE,,}
+	IUSE+=" lcd_devices_${LCD_DEVICE} "
+	REQUIRED_USE+=" lcd_devices_${LCD_DEVICE} "
+done
+REQUIRED_USE+=" ) "
+unset LCD_DEVICE
+
+# Add supported plugins from 'IUSE_LCD4LINUX_PLUGINS' to 'IUSE' and 'REQUIRED_USE'
+IUSE+=" ${IUSE_LCD4LINUX_PLUGINS[*]} "
+REQUIRED_USE+=" || ( ${IUSE_LCD4LINUX_PLUGINS[*]} ) "
+
+# Define dependencies for all drivers in 'IUSE_LCD_DEVICES'
+DEPEND_LCD_DEVICES="
+	lcd_devices_astusb? ( virtual/libusb:0= )
+	lcd_devices_bwct? ( virtual/libusb:0= )
+	lcd_devices_curses? ( sys-libs/ncurses:0= )
+	lcd_devices_dpf? ( virtual/libusb:0= )
+	lcd_devices_g15? ( virtual/libusb:0= )
+	lcd_devices_glcd2usb? ( virtual/libusb:0= )
+	lcd_devices_irlcd? ( virtual/libusb:0= )
+	lcd_devices_lcd2usb? ( virtual/libusb:0= )
+	lcd_devices_ledmatrix? ( virtual/libusb:0= )
+	lcd_devices_luise? (
+		dev-libs/luise-bin
+		virtual/libusb:0=
+	)
+	lcd_devices_matrixorbitalgx? ( virtual/libusb:0= )
+	lcd_devices_mdm166a? ( virtual/libusb:0= )
+	lcd_devices_picolcd? ( virtual/libusb:0= )
+	lcd_devices_picolcdgraphic? ( virtual/libusb:0= )
+	lcd_devices_png? (
+		media-libs/gd[png]
+		media-libs/libpng:0=
+	)
+	lcd_devices_ppm? ( media-libs/gd )
+	lcd_devices_samsungspf? ( virtual/libusb:0= )
+	lcd_devices_serdisplib? ( dev-libs/serdisplib )
+	lcd_devices_shuttlevfd? ( virtual/libusb:0= )
+	lcd_devices_trefon? ( virtual/libusb:0= )
+	lcd_devices_ula200? (
+		dev-embedded/libftdi:1=
+		virtual/libusb:0=
+	)
+	lcd_devices_usbhub? ( virtual/libusb:0= )
+	lcd_devices_usblcd? ( virtual/libusb:0= )
+	lcd_devices_vnc? ( net-libs/libvncserver )
+	lcd_devices_x11? ( x11-libs/libX11 )
+"
+
+# Define dependencies for all plugins in 'IUSE_LCD4LINUX_PLUGINS'
+DEPEND_LCD4LINUX_PLUGINS="
+	asterisk? ( net-misc/asterisk )
+	dbus? ( sys-apps/dbus )
+	gps? ( dev-libs/nmeap )
+	hddtemp? ( app-admin/hddtemp )
+	iconv? ( virtual/libiconv )
+	mpd? ( media-libs/libmpd )
+	mpris_dbus? ( sys-apps/dbus )
+	mysql? (
+		|| (
+			dev-db/mariadb-connector-c
+			dev-db/mysql-connector-c
+		)
+	)
+	python? ( ${PYTHON_DEPS} )
+	wireless? (
+		|| (
+			net-wireless/iw
+			net-wireless/wireless-tools
+		)
+	)
+"
+
+RDEPEND="
+	dmalloc? ( dev-libs/dmalloc )
+	${DEPEND_LCD_DEVICES}
+	${DEPEND_LCD4LINUX_PLUGINS}"
+
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# Enable all users enabled lcd devices
+	local myeconfargs_lcd_devices
+	for lcd_device in "${IUSE_LCD_DEVICES[@]}"; do
+		if use "lcd_devices_${lcd_device,,}"; then
+			myeconfargs_lcd_devices+=",${lcd_device}"
+		fi
+	done
+
+	# Enable all users enabled lcd4linux plugins
+	local myeconfargs_lcd4linux_plugins
+	for lcd4linux_plugin in "${IUSE_LCD4LINUX_PLUGINS[@]}"; do
+		if use "${lcd4linux_plugin}"; then
+			myeconfargs_lcd4linux_plugins+=",${lcd4linux_plugin}"
+		fi
+	done
+
+	local myeconfargs=(
+		--disable-rpath
+		$(use_with dmalloc)
+		$(use_with outb)
+		$(use_with python)
+		$(use_with lcd_devices_x11 x)
+		--with-drivers="${myeconfargs_lcd_devices#,}"
+		--with-plugins="${myeconfargs_lcd4linux_plugins#,}"
+		--x-include="/usr/include"
+		--x-libraries="/usr/$(get_libdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# Install sample config, and must have 600, as lcd4linux checks this.
+	insinto	/etc/lcd4linux
+	insopts -m 0600
+	doins lcd4linux.conf.sample
+
+	newinitd "${FILESDIR}/lcd4linux-r1.initd" lcd4linux
+}
diff --git a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527.ebuild b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527.ebuild
index 61e495539ea9..c563c89881a3 100644
--- a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527.ebuild
+++ b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527.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
@@ -13,7 +13,7 @@ SRC_URI="https://www.bl4ckb0x.de/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="dmalloc outb"
 REQUIRED_USE="?? ( lcd_devices_hd44780 lcd_devices_hd44780-i2c )
 	python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest
index 4898e52079d3..f4c4c76678e4 100644
--- a/app-misc/lcdproc/Manifest
+++ b/app-misc/lcdproc/Manifest
@@ -1,11 +1,22 @@
 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
+AUX lcdexec.service 171 BLAKE2B cad9c32ce67365158a210fbc65c794881cf84ddcba870019e2772eb6b0913fcbcba99f82f803621930b867d72c63f16bc61710174c35da0ba923e9f68dc119dd SHA512 5372cf10ee750122d2312ecb595a827aa3c5f14bf34049f90950b36b7a77a7c36bcf2d72a30dc6ebf8830251c901c9703c05a6c92fdc580940b6ffe1e421cb2f
+AUX lcdproc-0.5.9-fix-parallel-make.patch 910 BLAKE2B 5a9daa1871e64b4bfcc7ea2fbc06f0e4ec6493fe61d678d5b0cc252764ecbc1906c102f2347e18a10432bd390b19d990a270423e8054690283b17174a8297a08 SHA512 75c42f716175751c07b5385f87c2d378229c59cb7ef5adb517b23d3c032373627f9d6173987251c5d3c259764dbaa2ad167d8769bdcb2afa1b1387ff1926a316
+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
-MISC metadata.xml 1423 BLAKE2B b5f4d4202cc8178d0ddb4ace19592e15c5bdd68cd0239a219b866d3b6f7e404110858eadb81a7bbd456bc1db237754edfcf7bd9966a76755a81e4b5742712d7c SHA512 b62797738fd47a23fd83c31a027b1636374183488075e9c2073419ca6c08960c60d0bc6108c7148a144852dd45cad5ddd457879249331426f9594fac43cef306
+EBUILD lcdproc-0.5.9.ebuild 6437 BLAKE2B 803505496345bf5fd2fd39ee27442f534e901ce49c1e79698bea44afb82e0ab886171cd397a7bb1379e87521bd3e63467a91ce5303187fbedd8f53f91376488f SHA512 e7e4b02d4693df9a6e0f7b7f16bda22d6b00298458c35f68ac6f60f845c314a24313b32e44f5688ef05049de2bcdcec628b7d7fb4b081faeee2568a5ebf58160
+MISC metadata.xml 2261 BLAKE2B 71a100c5a9e9ff1810f925b027a09337634e6191bc38b828e779e99a92d942979a412d7b13eaf83aecb186dc6f7f55a1a9b743592292814d95225758e28df977 SHA512 e263460ac19220cc16d08a4199d5f623d7018b8c04655d9494db05524cf2e0e9437db2c0d87f22e21e827d4c4185ef0f11e775c515992395ae47a0d835bc739c
diff --git a/app-misc/lcdproc/files/LCDd.initd b/app-misc/lcdproc/files/LCDd.initd
new file mode 100644
index 000000000000..792ae9201796
--- /dev/null
+++ b/app-misc/lcdproc/files/LCDd.initd
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+instance="${SVCNAME}"
+name="LCDProc (${instance})"
+pidfile="/run/${instance}.pid"
+
+command="/usr/sbin/LCDd"
+command_args="-c /etc/${instance}.conf"
+
+depend() {
+	use g15daemon
+	use net
+}
diff --git a/app-misc/lcdproc/files/LCDd.service b/app-misc/lcdproc/files/LCDd.service
new file mode 100644
index 000000000000..bd53c8cae3cb
--- /dev/null
+++ b/app-misc/lcdproc/files/LCDd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=LCDProc (LCDd)
+After=network-online.target
+
+[Service]
+ExecStart=/usr/sbin/LCDd -c /etc/LCDd.conf
+Type=simple
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-misc/lcdproc/files/lcdexec.initd b/app-misc/lcdproc/files/lcdexec.initd
new file mode 100644
index 000000000000..b349ae972d83
--- /dev/null
+++ b/app-misc/lcdproc/files/lcdexec.initd
@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+instance="${SVCNAME}"
+name="LCDProc (${instance})"
+pidfile="/run/${instance}.pid"
+
+command="/usr/bin/lcdexec"
+command_args="-c /etc/${instance}.conf"
+
+depend() {
+	after ntp-client
+	use LCDd
+	use net
+}
diff --git a/app-misc/lcdproc/files/lcdexec.service b/app-misc/lcdproc/files/lcdexec.service
new file mode 100644
index 000000000000..56ec3dd64cb1
--- /dev/null
+++ b/app-misc/lcdproc/files/lcdexec.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=LCDProc (LCDd)
+After=network-online.target
+
+[Service]
+ExecStart=/usr/bin/lcdexec -c /etc/lcdexec.conf
+Type=simple
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-misc/lcdproc/files/lcdproc-0.5.9-fix-parallel-make.patch b/app-misc/lcdproc/files/lcdproc-0.5.9-fix-parallel-make.patch
new file mode 100644
index 000000000000..763038d14ab5
--- /dev/null
+++ b/app-misc/lcdproc/files/lcdproc-0.5.9-fix-parallel-make.patch
@@ -0,0 +1,16 @@
+--- a/server/drivers/Makefile.am	2017-01-22 23:18:54.000000000 +0100
++++ b/server/drivers/Makefile.am	2018-10-04 22:48:50.302344274 +0200
+@@ -47,11 +47,11 @@
+ futaba_LDADD =       @LIBUSB_LIBS@ @LIBUSB_1_0_LIBS@ libLCD.a
+ g15_LDADD =          @LIBG15@
+ glcd_LDADD =         libLCD.a @GLCD_DRIVERS@ @FT2_LIBS@ @LIBPNG_LIBS@ @LIBSERDISP@ @LIBUSB_LIBS@ @LIBX11_LIBS@
+-glcd_DEPENDENCIES =  @GLCD_DRIVERS@ glcd-glcd-render.o
++glcd_DEPENDENCIES =  @GLCD_DRIVERS@ glcd-glcd-render.o libLCD.a
+ glcdlib_LDADD =      @LIBGLCD@
+ glk_LDADD =          libbignum.a
+ hd44780_LDADD =      libLCD.a @HD44780_DRIVERS@ @HD44780_I2C@ @LIBUSB_LIBS@ @LIBFTDI_LIBS@ @LIBUGPIO@ libbignum.a
+-hd44780_DEPENDENCIES = @HD44780_DRIVERS@ @HD44780_I2C@
++hd44780_DEPENDENCIES = @HD44780_DRIVERS@ @HD44780_I2C@ libLCD.a libbignum.a
+ i2500vfd_LDADD =     @LIBFTDI_LIBS@
+ imon_LDADD =         libLCD.a libbignum.a
+ imonlcd_LDADD =      libLCD.a
diff --git a/app-misc/lcdproc/files/lcdproc-0.5.9-use-freetype2-pkg-config.patch b/app-misc/lcdproc/files/lcdproc-0.5.9-use-freetype2-pkg-config.patch
new file mode 100644
index 000000000000..9149bf784276
--- /dev/null
+++ b/app-misc/lcdproc/files/lcdproc-0.5.9-use-freetype2-pkg-config.patch
@@ -0,0 +1,15 @@
+--- a/configure.ac	2017-06-18 22:33:56.000000000 +0200
++++ b/configure.ac	2018-10-04 22:30:22.668770478 +0200
+@@ -389,11 +389,7 @@
+ AC_MSG_RESULT($enable_freetype)
+ 
+ if test "$enable_freetype" = "yes"; then
+-	ifdef([AC_CHECK_FT2],
+-		[AC_CHECK_FT2([],
+-			[AC_DEFINE(HAVE_FT2, [1], [Define to 1 if you have freetype])],
+-			[enable_freetype=no])],
+-		[AC_MSG_WARN([freetype does not seem to be installed])])
++	PKG_CHECK_MODULES(FT2, freetype2 >= 7.0.1, [enable_freetype="yes"],[enable_freetype="no"])
+ fi
+ AC_SUBST([FT2_CFLAGS])
+ AC_SUBST([FT2_LIBS])
diff --git a/app-misc/lcdproc/files/lcdproc.initd b/app-misc/lcdproc/files/lcdproc.initd
new file mode 100644
index 000000000000..bbeba4033c02
--- /dev/null
+++ b/app-misc/lcdproc/files/lcdproc.initd
@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+instance="${SVCNAME}"
+name="LCDProc (${instance})"
+pidfile="/run/${instance}.pid"
+
+command="/usr/bin/lcdproc"
+command_args="-c /etc/${instance}.conf"
+
+depend() {
+	after ntp-client
+	use LCDd
+	use net
+}
diff --git a/app-misc/lcdproc/files/lcdproc.service b/app-misc/lcdproc/files/lcdproc.service
new file mode 100644
index 000000000000..f2ee435a169b
--- /dev/null
+++ b/app-misc/lcdproc/files/lcdproc.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=LCDProc (LCDd)
+After=network-online.target
+
+[Service]
+ExecStart=/usr/bin/lcdproc -c /etc/lcdproc.conf
+Type=simple
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-misc/lcdproc/lcdproc-0.5.9.ebuild b/app-misc/lcdproc/lcdproc-0.5.9.ebuild
new file mode 100644
index 000000000000..a8eb7fee247f
--- /dev/null
+++ b/app-misc/lcdproc/lcdproc-0.5.9.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools systemd
+
+DESCRIPTION="Displays real-time system information from your Linux/*BSD box on a LCD"
+HOMEPAGE="http://www.lcdproc.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz
+	https://raw.githubusercontent.com/lcdproc/lcdproc/master/docs/lcdproc-user/drivers/linux_input.docbook"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug doc ethlcd extra-charmaps freetype menu nfs png samba test-menu"
+REQUIRED_USE="ethlcd? ( lcd_devices_hd44780 )
+	freetype? ( lcd_devices_glcd )
+	png? ( lcd_devices_glcd )"
+
+# Define the list of valid lcd devices.
+# Some drivers were removed from this list:
+# - svga: It needs media-libs/svgalib, which is masked and obsolete.
+IUSE_LCD_DEVICES=( bayrad CFontz CFontzPacket curses CwLnx ea65
+	EyeboxOne futaba g15 glcd glcdlib glk hd44780 i2500vfd
+	icp_a106 imon imonlcd IOWarrior irman irtrans
+	joy lb216 lcdm001 lcterm linux_input lirc lis MD8800 mdm166a
+	ms6931 mtc_s16209x MtxOrb mx5000 NoritakeVFD
+	Olimex_MOD_LCD1x9 picolcd pyramid rawserial
+	sdeclcd sed1330 sed1520 serialPOS serialVFD
+	shuttleVFD sli stv5730 SureElec t6963 text
+	tyan ula200 vlsys_m428 xosd yard2LCD )
+
+# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
+REQUIRED_USE+=" || ( "
+for LCD_DEVICE in "${IUSE_LCD_DEVICES[@]}"; do
+	LCD_DEVICE="${LCD_DEVICE,,}"
+	IUSE+=" lcd_devices_${LCD_DEVICE} "
+	REQUIRED_USE+=" lcd_devices_${LCD_DEVICE} "
+done
+REQUIRED_USE+=" ) "
+unset LCD_DEVICE
+
+# Define dependencies for all drivers in 'IUSE_LCD_DEVICES'
+DEPEND_LCD_DEVICES="lcd_devices_cfontz? ( dev-libs/libhid:= )
+	lcd_devices_cfontzpacket? ( dev-libs/libhid:= )
+	lcd_devices_cwlnx? ( dev-libs/libhid:= )
+	lcd_devices_futaba? ( virtual/libusb:1= )
+	lcd_devices_g15? ( app-misc/g15daemon
+		dev-libs/libg15render:=
+		virtual/libusb:0= )
+	lcd_devices_glcd? ( app-misc/glcdprocdriver:=
+		dev-embedded/libftdi:1=
+		dev-libs/libhid:=
+		dev-libs/serdisplib:=
+		virtual/libusb:0=
+		x11-libs/libX11:= )
+	lcd_devices_hd44780? ( dev-embedded/libftdi:1=
+		dev-libs/libugpio:=
+		virtual/libusb:0= )
+	lcd_devices_i2500vfd? ( dev-embedded/libftdi:1= )
+	lcd_devices_irman? ( media-libs/libirman:= )
+	lcd_devices_iowarrior? ( virtual/libusb:0= )
+	lcd_devices_lirc? ( app-misc/lirc )
+	lcd_devices_lis? ( dev-embedded/libftdi:1= )
+	lcd_devices_lb216? ( dev-libs/libhid:= )
+	lcd_devices_mdm166a? ( dev-libs/libhid:= )
+	lcd_devices_mtc_s16209x? ( dev-libs/libhid:= )
+	lcd_devices_mx5000? ( app-misc/mx5000tools )
+	lcd_devices_noritakevfd? ( dev-libs/libhid:= )
+	lcd_devices_picolcd? ( virtual/libusb:1= )
+	lcd_devices_shuttlevfd? ( virtual/libusb:0= )
+	lcd_devices_ula200? ( dev-embedded/libftdi:1= )
+	lcd_devices_xosd? ( x11-libs/libX11:=
+		x11-libs/xosd:= )"
+
+RDEPEND="${DEPEND_LCD_DEVICES}"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen[dot]
+		app-text/xmlto )
+	freetype? ( media-libs/freetype:2= )
+	nfs? ( net-fs/nfs-utils )
+	png? ( media-libs/libpng:0= )
+	samba? ( net-fs/samba )"
+
+DOCS=( "CREDITS.md" "TODO" )
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-parallel-make.patch"
+	"${FILESDIR}/${P}-use-freetype2-pkg-config.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	# Copy missing docbook or the buildung of the lcdproc-user docbook will fail
+	cp "${DISTDIR}"/linux_input.docbook "${S}"/docs/lcdproc-user/drivers/linux_input.docbook || die
+}
+
+src_prepare() {
+	default
+
+	# Fix path for modules
+	sed -e "37s:server/drivers:/usr/$(get_libdir)/lcdproc:" -i LCDd.conf || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# Enable all users enabled lcd devices
+	local myeconfargs_lcd_devices
+	for lcd_device in "${IUSE_LCD_DEVICES[@]}"; do
+		if use "lcd_devices_${lcd_device,,}"; then
+			myeconfargs_lcd_devices+=",${lcd_device}"
+		fi
+	done
+
+	local enable_ftdi="--disable-libftdi"
+	if use lcd_devices_glcd || use lcd_devices_hd44780 || use lcd_devices_i2500vfd || use lcd_devices_lis || use lcd_devices_ula200; then
+		enable_ftdi="--enable-libftdi"
+	fi
+
+	local enable_hid="--disable-libhid"
+	if use lcd_devices_cfontz || use lcd_devices_cfontzpacket || use lcd_devices_cwlnx || use lcd_devices_glcd || use lcd_devices_lb216 || use lcd_devices_mdm166a || use lcd_devices_mtc_s16209x || use lcd_devices_noritakevfd; then
+		enable_hid="--enable-libhid"
+	fi
+
+	local enable_png="--disable-libpng"
+	use lcd_devices_glcd && enable_png=""
+
+	local enable_usb0="--disable-libusb"
+	if use lcd_devices_futaba || use lcd_devices_g15 || use lcd_devices_glcd || use lcd_devices_hd44780 || use lcd_devices_iowarrior || use lcd_devices_picolcd || use lcd_devices_shuttlevfd; then
+		enable_usb0="--enable-libusb"
+	fi
+
+	local enable_usb1="--disable-libusb-1-0"
+	if use lcd_devices_futaba || use lcd_devices_picolcd; then
+		enable_usb1="--enable-libusb-1-0"
+	fi
+
+	local enable_x11="--disable-libX11"
+	use lcd_devices_glcd && enable_x11="--enable-libX11"
+
+	local myeconfargs=(
+		--enable-drivers="${myeconfargs_lcd_devices#,}"
+		$(use_enable debug)
+		$(use_enable doc doxygen)
+		$(use_enable doc dot)
+		$(use_enable doc html-dox)
+		$(use_enable doc latex-dox)
+		$(use_enable ethlcd)
+		$(use_enable extra-charmaps)
+		$(use_enable freetype)
+		$(use_enable menu lcdproc-menus)
+		$(use_enable nfs stat-nfs)
+		$(use_enable samba stat-smbfs)
+		$(use_enable test-menu testmenus)
+		${enable_ftdi}
+		${enable_hid}
+		${enable_png}
+		${enable_usb0}
+		${enable_usb1}
+		${enable_x11}
+		--with-lcdport="13666"
+		--with-pidfile-dir="/run"
+		--without-included-getopt
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake dox
+
+		local docbook
+		for docbook in lcdproc-user lcdproc-dev; do
+			cd "${S}"/docs/"${docbook}" || die
+			xmlto html "${docbook}".docbook || die
+		done
+	fi
+}
+
+src_install() {
+	default
+
+	# Move example clients from '/usr/bin' into '/usr/share/lcdproc/clients'
+	rm -f "${ED%/}"/usr/bin/{fortune,lcdident,lcdmetar,iosock,tail,x11amp}.pl || die
+	insinto /usr/share/lcdproc/clients
+	doins clients/examples/*.pl clients/metar/*.pl
+
+	newinitd "${FILESDIR}"/LCDd.initd LCDd
+	newinitd "${FILESDIR}"/lcdexec.initd lcdexec
+	newinitd "${FILESDIR}"/lcdproc.initd lcdproc
+
+	systemd_dounit "${FILESDIR}"/LCDd.service
+	systemd_dounit "${FILESDIR}"/lcdexec.service
+	systemd_dounit "${FILESDIR}"/lcdproc.service
+
+	if use doc; then
+		dodoc -r docs/html
+
+		local docbook
+		for docbook in lcdproc-user lcdproc-dev; do
+			docinto "${docbook}"
+			dodoc docs/"${docbook}"/*.html
+		done
+	fi
+}
diff --git a/app-misc/lcdproc/metadata.xml b/app-misc/lcdproc/metadata.xml
index 863d531d0995..ab8591e847e6 100644
--- a/app-misc/lcdproc/metadata.xml
+++ b/app-misc/lcdproc/metadata.xml
@@ -5,25 +5,38 @@
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 	</maintainer>
-	<longdescription lang="en">
-		LCDproc is a piece of software that displays real-time system information
-		from your Linux/*BSD box on a LCD. The server supports several serial
-		devices: Matrix Orbital, CrystalFontz, Bayrad, LB216, LCDM001
-		(kernelconcepts.de), Wirz-SLI, Cwlinux(.com) and PIC-an-LCD; and some
-		devices connected to the LPT port: HD44780, STV5730, T6963, SED1520 and
-		SED1330. Various clients are available that display things like CPU load,
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		LCDproc is a piece of open source software that displays real-time system information
+		from your Linux/*BSD box on a LCD. The server supports several serial and USB devices
+		from Matrix Orbital and CrystalFontz as well as
+		some devices connected to the LPT port:	HD44780, T6963, SED1520 and SED1330.
+		Various clients are available that display things like CPU load,
 		system load, memory usage, uptime, and a lot more.
 	</longdescription>
 	<use>
-		<flag name="hid">Enable HID support using libhid</flag>
-		<flag name="irman">Enable support for IRMan (<pkg>media-libs/libirman</pkg>)</flag>
-		<flag name="nfs">Adds support for NFS file system</flag>
-		<flag name="seamless-hbars">Try to avoid gaps in horizontal bars</flag>
-		<flag name="ftdi">Enable support for FTDI connections in some selected LCD_DEVICES (currently hd44780)</flag>
-		<flag name="lcd_devices_sdeclcd">Enable support for VLSYS M428 display</flag>
-		<flag name="lcd_devices_vlsys_m428">Enable support for VLSYS M428 display</flag>
+		<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>
-		<remote-id type="sourceforge">lcdproc</remote-id>
+		<bugs-to>https://www.github.com/lcdproc/lcdproc/issues</bugs-to>
+		<remote-id type="github">lcdproc/lcdproc</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index e1135ab20ae5..964d1b1f27de 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -2,8 +2,8 @@ AUX mc-4.8.13-tinfo.patch 1742 BLAKE2B d9428200e62bbffd0cf056bd25b3cec9a3c4b8363
 AUX mc-4.8.19-selected-size.patch 988 BLAKE2B de407c64d1d7e2460f165ace967f6b83c50e45c6842a1d174928c872d4f6a9aff31939942f2896bb2f3d34f656fb2c1e262c35a7c72f1cb58256472d5cac7c19 SHA512 f7740ec01e38857b1e365737cc4e1cd41397e41aea9ef5aa121c6db2f11955980df949a440cce7bbf810b7b8a6f0c1c5e5090de3c5008dd6390ecee4c659d80c
 DIST mc-4.8.20.tar.xz 2529580 BLAKE2B 14e575b650d28e0dcaa8ef0dc0b8e9bbf3e840ddc3d34d20518d28a6b253a8769c041c29ef7136c5fb72bd6130b0fc6c367dab8e44e040ef6dfd5406c364b86c SHA512 c2460561ae94bed75b1ed12f5c8039c9f8ace4c06987c57d07b8399c4e01c5a6c57851fddb3e918a4541ade089c89e8526078572a09580ccd0ae95344e3c1138
 DIST mc-4.8.21.tar.xz 2528292 BLAKE2B 0cbebcd2284f9ed9687022280aa1ba9e4a5960c6f1de27e5f4bab1b9bf205077dec2851e47b787aa6aec9cac28d467bf58ee2647a592e194ab3bfc63138b373f SHA512 db1a252744b47ebf5339ad204d8b69cb914f25ade7fe5aae2650c4abb57478715d3b7b3a24f4460adfb9fbdc928e8728b369b4f1709215e5e9af3d430fce6acf
-EBUILD mc-4.8.20-r1.ebuild 2482 BLAKE2B 1bf8934ae7f8d5478804017453efc0a8d16e1f6b2f8bedd8d878202df154fa01138e5284f18a4a5e3a7ca11b70785fcf250275b45941e4b411a045142a3e0705 SHA512 6345f42e21960543ccd50ee95790c017667f73a293386ad28a6107e4575e649902b8e26970185f3ef59d8ef23f4a45b02596d0f99156c704083ab15f54f87384
-EBUILD mc-4.8.20-r2.ebuild 2619 BLAKE2B 818c6c1ab7b190d80566935453e3467479733e266683e17f02c397d6d55bc2ad3a9aeacad91e4c2ad7dd6e26e9a6319b1392726a097415d5302dc49a9daf7843 SHA512 50e29ca64ea1e6172653960220e8bee6b7a298792e7774971a7c3db6a3187646ae84a88291ba0deb898ca6294fd752b827b0213ea7d770a078edd9f506abd0cc
-EBUILD mc-4.8.21.ebuild 2425 BLAKE2B c1fd699e82c24ac68898dbb3a67eb61c9a5bcc27f2c31a6cb2c76adaba25651f18f24eafc9434b36144cbec1fc4451d306cb8661cf433217f973ce5b24077317 SHA512 806b4dc06c0afcfecbd5a00469e85fbfb115b2645df2c504c79f8788fd6e0248155b0c8e728580b8b12ee74e091f8f8ade41bd57e5c2c8eb86abdb9318b1d928
-EBUILD mc-9999.ebuild 2670 BLAKE2B 62748de970525ad3d52a9c9dcbc17895d0a82eeb85bbf1862a2503600b3b7d551e6b219558bbce7ea1d3efbaabe3747f0069ceedb31faacdd233aed9bcfa7bff SHA512 4579c8849f58d51207160e3d67ac4eee944727b0a1a4abbccd8c9cf210c54131a35f77ecb07a2aed6ba2194904bb29a0381d51c375798f933a5ae63355bebe36
+EBUILD mc-4.8.20-r1.ebuild 2489 BLAKE2B 36736aba7e7cf3a54445d09aa3ca89940eea27f75662e338a177de584007467466f57878aeedeeab17c3de3ed99d508b571c6e17cf3668ad4c40324832479e98 SHA512 357c2fee6e10147f5b85b9dd645010f7a04365fd5f3d3b0d18fe6a25a48ec4534f492f924a869402a05072c26817bdda80b61f3c0af20f6aaa06d21376dceb0d
+EBUILD mc-4.8.20-r2.ebuild 2626 BLAKE2B 7c91fffbe41d84790039342966abc75ba05c40ddde03148493be89bdd5e1c8bef88640d8f800d10c571bdc74ee09153138d6fc06e2ec9f58657eeda21084f580 SHA512 fb5e82276dc7a1fe0e36d0f8cc2209aefebbb677e247685c918fb0ffbd36c132ef154a5e20b3dde2de4fde0adcf4afe85bc152fdb6289e186cd5dde2ca721bbb
+EBUILD mc-4.8.21.ebuild 2432 BLAKE2B a7c051633f812a0817f1fe590feece7f8926798a0e8aff4580d695fb1ecee428a82d66e269cfb3e1c3a041e1643079abd1ba30291a4f1c87e4d0e185fa31ff4f SHA512 fd97e7bf3293fb22d3dfa17cac05d2ee229fcf05c8bf496ea03e08b626abedc1e2b33b41711b38ae1c5083480682540c99064c49fc7969acbb9de3b4fd2442f5
+EBUILD mc-9999.ebuild 2677 BLAKE2B 615258f6fb5a176d5a839133f55b6f3fad98e571db13405285223228979bca96850128eca2ba9bf4df4da7a08983dcb8b4e7ee51ab7ac249e68b568f2e4bfa22 SHA512 07fd6b9559e0c72585536ecc1502ba28e988b2c7437acaa1d48f697d624afc2129f2f31c255eea08bf309dfd0d1dc93b64b88d6e71b098f296f92d1b0755e3bc
 MISC metadata.xml 994 BLAKE2B 59d3e1c9bc8bcaf74ef8f646f1067a07127a70825bb2651e7bee1628e93131769caf1c7251b6aecd4ed35707984b95c928fcf5563b3e2ba6997c090ea08ea0b4 SHA512 8e36834754b8335c133eb3693d17d02a0c6c3c7d25263857558cf290922b8e7508bf90c609e09ebbfaed54eecc2179936ded60c2b723cc0abc6722db180cc3ed
diff --git a/app-misc/mc/mc-4.8.20-r1.ebuild b/app-misc/mc/mc-4.8.20-r1.ebuild
index 344079ed4251..9b71011a40e1 100644
--- a/app-misc/mc/mc-4.8.20-r1.ebuild
+++ b/app-misc/mc/mc-4.8.20-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 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 mclib nls samba sftp +slang spell test X +xdg"
 
 REQUIRED_USE="spell? ( edit )"
diff --git a/app-misc/mc/mc-4.8.20-r2.ebuild b/app-misc/mc/mc-4.8.20-r2.ebuild
index 9b920e68246d..4a9db190f7b8 100644
--- a/app-misc/mc/mc-4.8.20-r2.ebuild
+++ b/app-misc/mc/mc-4.8.20-r2.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 ~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 mclib nls samba sftp +slang spell test unicode X +xdg"
 
 REQUIRED_USE="spell? ( edit )"
diff --git a/app-misc/mc/mc-4.8.21.ebuild b/app-misc/mc/mc-4.8.21.ebuild
index a7b19052bb2f..e45e8f54e1b3 100644
--- a/app-misc/mc/mc-4.8.21.ebuild
+++ b/app-misc/mc/mc-4.8.21.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 ~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 mclib nls samba sftp +slang spell test unicode X +xdg"
 
 REQUIRED_USE="spell? ( edit )"
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild
index dc579aa74ee3..3af128d35dc4 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.ebuild
@@ -15,7 +15,7 @@ MY_P=${P/_/-}
 
 if [[ -z ${LIVE_EBUILD} ]]; then
 	SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU Midnight Commander is a text based file manager"
diff --git a/app-misc/mx5000tools/Manifest b/app-misc/mx5000tools/Manifest
new file mode 100644
index 000000000000..53bbd1126458
--- /dev/null
+++ b/app-misc/mx5000tools/Manifest
@@ -0,0 +1,4 @@
+AUX mx5000tools-0.1.2-find-netpbm-header.patch 941 BLAKE2B af7f7ae5d27f403b2429a4c8298acaf7fcf3971382a8c8c630b6ec12462164e2b1433894de4aac4235ae96706c0b79b4b7fba49611f31ed8a83fc73f93946abb SHA512 c663b416fae74cb937db9dce28e4b3d23ab3fb78df154f226524adb4cd8af7f5db38602e029cd8ca4ab8d66d250bd88083a92c09136fed3501e1b4dfac75aebe
+DIST mx5000tools-0.1.2.tar.gz 343118 BLAKE2B 74316ca3c730b5e03aa73a8cf5422eb3690b0e088254f9078da549f2d964df065ca7cd09f5f822cb3e66ad5bac0eab546c49703eaf837a132a61ab0755e729b8 SHA512 3773b8b233f02711bb7a768a68ccd3bf72e3d51fbb64ee2a70197d1b51e884a4f40048ba6b7dcde4be0703f25672ccb0fac9b0d6612b8a94f9e01b6a9f463613
+EBUILD mx5000tools-0.1.2.ebuild 761 BLAKE2B e550e51f34f767ffde0aa0b8f2eb33f6cfbf8c64bf78202dc65c04be8590d9d5528f7c88fd0676ebd317c3c852166604ac8ff19316e938062bd630a3709ec6df SHA512 17c20d3d2ad526ca67dcbffc73687edc727cf6a5166317bc70317d5519d1f1f71c94fedb8b33babc724bb503d4b142e6f29e2cd641464bb558e63d96868885c1
+MISC metadata.xml 739 BLAKE2B f242204a9d3f27f2c68cc7771be37cb329cbf57725ddb0ae823191fb62ec23050dc530b20fb22115fd2582a919375404322a8b3192734975d6eb6b187a02c618 SHA512 19a17587727e544f9c3c7dcb5a58693aa294c6e86807a610d484fb568b0a83472abc155609e5fe66e33a07d165ebd1b5968cea18b474ad5a934e99cd7318743f
diff --git a/app-misc/mx5000tools/files/mx5000tools-0.1.2-find-netpbm-header.patch b/app-misc/mx5000tools/files/mx5000tools-0.1.2-find-netpbm-header.patch
new file mode 100644
index 000000000000..9fb03d5b6aa3
--- /dev/null
+++ b/app-misc/mx5000tools/files/mx5000tools-0.1.2-find-netpbm-header.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac	2006-12-05 05:37:05.000000000 +0100
++++ b/configure.ac	2018-10-05 14:42:12.449181591 +0200
+@@ -13,7 +13,7 @@
+ AC_CHECK_HEADER([linux/hiddev.h], [], [AC_MSG_ERROR([You need kernel headers that supports hiddev\, that is Linux 2.4 or greater])], [#include <asm/types.h>]) 
+ 
+ 
+-AC_CHECK_HEADER([pbm.h], [], [AC_MSG_ERROR([You need pbm.h from the netpbm package\, possible the netpbm-devel package of your distribution])])
++AC_CHECK_HEADER([netpbm/pbm.h], [], [AC_MSG_ERROR([You need pbm.h from the netpbm package\, possible the netpbm-devel package of your distribution])])
+ AC_CHECK_LIB([netpbm],[pbm_readpbm], [], [AC_MSG_ERROR([You need netpbm installed])])
+ 
+ 
+--- a/libmx5000/mx5000image.c	2006-12-05 05:13:50.000000000 +0100
++++ b/libmx5000/mx5000image.c	2018-10-05 14:48:44.093392505 +0200
+@@ -3,7 +3,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ 
+-#include <pbm.h>
++#include <netpbm/pbm.h>
+ #include "config.h"
+ 
+ 
diff --git a/app-misc/mx5000tools/metadata.xml b/app-misc/mx5000tools/metadata.xml
new file mode 100644
index 000000000000..eb2ca7b65228
--- /dev/null
+++ b/app-misc/mx5000tools/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		The Logitech Cordless Desktop MX 5000 Laser comes with a keyboard that has a nice LCD.
+		But Logitech did not provide any way to control the LCD on a Free operating system.
+		These tools make it possible to control what is displayed on the LCD and to use some
+		of the keys that are not recognized by the stock Linux HID driver.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-misc/mx5000tools/mx5000tools-0.1.2.ebuild b/app-misc/mx5000tools/mx5000tools-0.1.2.ebuild
new file mode 100644
index 000000000000..097373603932
--- /dev/null
+++ b/app-misc/mx5000tools/mx5000tools-0.1.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Tools for controlling the LCD on a Logitech MX5000 keyboard"
+HOMEPAGE="https://web.archive.org/web/20160409073317/http://home.gna.org/mx5000tools/"
+SRC_URI="https://web.archive.org/web/20170225160711/http://download.gna.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="media-libs/netpbm:="
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-find-netpbm-header.patch" )
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index 92b2b13d0190..229ca92c1dd8 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -1,6 +1,6 @@
 AUX vifm-0.9.1-fix-ncurses-linking.patch 1562 BLAKE2B 415cd5421a7bf74cc48ec77919181e0fb0b101b455dee470ceb8875c861b14a8835b5f912c517efd9f1f1a8b3db93d633b6b4b68462fae66ec7a2ff0ced2521b SHA512 4b6dc0945f5afd2d0395775ceef94c007e604b30184e86653bc8c2f306b7d726d1a1a7273c4601502e6602fdff86b8b3f596409cf2e55f2e4c2691d342e7088a
+DIST vifm-0.10.tar.bz2 1054361 BLAKE2B 81ec964b3bf236764976bcedb84c922eca0da650922b71fc1d6ef107ce51af9a4b1155fb699f800cca452e644345568af4cf17170dc15509393df529336b3959 SHA512 53f45824ffdbd987fecd3a7f7b6d6c5da036aeb3ddbb219d7665a63cae55d68db608239055b18b88a721b39002fcf57cbfd88aa366cffb02ca5f2eb94a206eb2
 DIST vifm-0.9.1.tar.bz2 1002758 BLAKE2B 8eb9cc4c299877485bb4a44d95fe2412e196686399a6246bc1b5036dbc34ecbcf1cd43d1d55bdacdcc099a65e03f589f360d39ee38da4e12bff0a4bfcbdd180b SHA512 a30457329bf9501efd7e9e0853107b5ecd653ab70e7081764677d035bd0f61876bc96b35bea5258153d68b7be075091168331be79d7398f94353f73bbf78933d
-DIST vifm-0.9.tar.bz2 971539 BLAKE2B 5d6dd8c399e38886ab3e2d548b93492bf31b464e5661c6f6d54504701bf1eab8338155a9ddc9b220c4cb2a67417d5622094e9ffb717ddf594984fe475214af60 SHA512 5ae2b03e672bd9a7f95a5c59141dabac8bc7946a4e307d6a3df70bdb52e1f7665b960a3d20709c811cbfbcf76f7836d23b5edb191968e5277fb705a291ab3a9a
+EBUILD vifm-0.10.ebuild 2115 BLAKE2B 2c4af2cdd610d10cebb29815f3c1c0d840593339eeb8165d32bc21a0f33c2bcaa8a88c86760620dd4000eee87b6807f37db30fc611a9824a3eb10e2fd713b102 SHA512 97af2e063f33030d81a8013d47cd905c981413f87052588d776351d63c17964590af64ace4ac17b42554bd778c7336d558928f35373b6c332410bfdc52ac1c4e
 EBUILD vifm-0.9.1.ebuild 2171 BLAKE2B a21fb0c2f78322b2fff57396ee4b7a0e8177b5b8a9249cba884ce98062e9aa63d5bed314f53709dd125377e58701558bab58d4ad64693387d6e0cb51ab8f4d80 SHA512 3018627eea8ad64162a8239ddf84d5054f8639fb0771b2ad9eaedc2d4b46f2c467cc0c0947b890f3b6494146903b7db573a765a652b817e607816024f1efe2c7
-EBUILD vifm-0.9.ebuild 1975 BLAKE2B 109e5ed44f8297e6283ecb2443bbb89f8c4da9170e8e5d5cdb50d26d8bb44db2b84461c06cd8a5711271f76d405f5522a31ae86218a98878ee6083ded5bfd6d5 SHA512 f6e33c5c1fbc1990c0aab33a191071ae79de4ffc7034d1c8c0feab3ab0cb32476c8a826983319c677191f8e3713db7a5be6ff657a5cd85873fb33a8ef6250bb5
 MISC metadata.xml 1315 BLAKE2B 2e31d51dfdd5df5d84edbb860f2b981513490ff58d776d3c75669e961da6d8eceb55e9957f7ad65e428645e0d39983fbde164940a679f5931ade43397fcec1ea SHA512 09965612c0613b994ea1b5780fdf79d4eddbb2464225132375390980b8bf29e2a2622dc3dd2c43a8650d1f90f888db9d30e9449e37b0311d1abc1cf9fca82812
diff --git a/app-misc/vifm/vifm-0.9.ebuild b/app-misc/vifm/vifm-0.10.ebuild
index 9621f77ac8d4..24a2c7f576dd 100644
--- a/app-misc/vifm/vifm-0.9.ebuild
+++ b/app-misc/vifm/vifm-0.10.ebuild
@@ -3,15 +3,17 @@
 
 EAPI=6
 
-inherit autotools vim-doc versionator
+inherit autotools vim-doc versionator xdg-utils
+
+MY_P=$(replace_version_separator 4 '-' ${PF})
 
 DESCRIPTION="Console file manager with vi(m)-like keybindings"
 HOMEPAGE="https://vifm.info/"
-SRC_URI="mirror://sourceforge/vifm/${PF}.tar.bz2"
+SRC_URI="mirror://sourceforge/vifm/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="X developer +extended-keys gtk +magic vim vim-syntax"
 
 DEPEND="
@@ -28,10 +30,12 @@ RDEPEND="
 
 DOCS="AUTHORS FAQ NEWS README TODO"
 
+S="${WORKDIR}/${MY_P}"
+
 src_prepare() {
+	default
 	sed -i -e '/stat.h/a#include <sys/sysmacros.h>' "${S}/src/modes/file_info.c" \
 		|| die
-	eapply_user
 	eautoreconf
 }
 
@@ -74,6 +78,7 @@ src_test() {
 }
 
 pkg_postinst() {
+	xdg_desktop_database_update
 	if use vim; then
 		update_vim_helptags
 
@@ -92,5 +97,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+	xdg_desktop_database_update
 	use vim && update_vim_helptags
 }