gentoo resync : 16.09.2020

106 files changed, 1035 insertions, 560 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 432bf790b83c..e5be3d343624 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/anki/Manifest b/app-misc/anki/Manifest
index e660b72da3ac..77580f309815 100644
--- a/app-misc/anki/Manifest
+++ b/app-misc/anki/Manifest
@@ -5,5 +5,5 @@ DIST anki-2.1.13.tgz 4248906 BLAKE2B 82a2a9a556cbf3596af22a73a2865815561cdd408b2
 DIST anki-2.1.15.tgz 4269571 BLAKE2B 00b351f5ffacb363642e02bf806bcd7c0d9446c9815a75328e7fa37c848b271b135510de17cc012e8cc96d8a52a183a49de84b6f85f562a370255bd36c6f866e SHA512 f3acfa6ff62d43fa461efddd81a8570304ada53b97bd494fdbbe0a0439700d7a52aa62ead31cbaed731be0df96a6cc845a7cf92dcf65f3080dc63282fe5941c3
 EBUILD anki-2.1.0_beta27.ebuild 2219 BLAKE2B 76dcaf2ceb91906c74149db1559499628b86ce8a3491109da81d02a8c3eff1ecc94a4eb5cf06ce01e10aca4a6b2cc53bf71c962e3d607d7062face38f1dec2c6 SHA512 4261913d808ec9dae0f26b799f0a96fc8d225202626d9ee590fe3634b2d10f74514ba1a00401cf055a153251b243698c8463a05204e8baf0d528aae07da637b5
 EBUILD anki-2.1.13-r1.ebuild 2317 BLAKE2B d14f2116c5f2358160e80dcdfcd109dc0dd3c968cac8e5e5ed5ccf0047b87ebae804f7e68e0368a1f0504e590631b37e9590c1bd92bf7d66493b2bc44ad23075 SHA512 22cc7c60afeb37590c74bb7710e418a8cccf7efee418788cc4de06483ff053c2b50ce461229e1577834d47ee4099647da1212ad3e31d8dd76c64986782c98150
-EBUILD anki-2.1.15.ebuild 2453 BLAKE2B cbe512d96f2c12ab05d4acc3b06036df3172f40ea3b12c1258168c85eea7ad897733f5ab3fa8e8d6bcc06faa334f95d1d2366f1cdaca17ef496a27fac80cd5d3 SHA512 caaefb97efba9c5fb7e0e142b23caba036fffcfd620383de14b42ae9094b768c657c1f4b2b2d4dddf7a72ec7b03254fd333c51e5a11282ddab13ec60ccb9d5e7
+EBUILD anki-2.1.15.ebuild 2457 BLAKE2B c51071cb2410c942151aeffb04f498b28e1dc6b3f374484666d83fb762a17fe0f0348cdb4f060e89e4264a6ece122016f32197664f0505d489082193e5685b2b SHA512 2062b2838acf885efc66def7d51dca61c8991de4d319bb3de18ce89bbc7159c99f5a4674b31e03fba7688f372250ee2b2eb703cbbe84dc96fafc24640828afba
 MISC metadata.xml 619 BLAKE2B a41d6e72dccb367627bfc34855a7f2dc657021907f1940c837ea99f134bf30cccb84157c6eea96944fee4e4d5275c329b5721abcabfb31b3a572b86789cd0ed2 SHA512 8b6656964a3c2cee9761b278839f31546a3fe2a4efd500cd015658af3502b548888e939bbeee45ead9c88632ade12c7f0ed33fcf8cdfc6d0ac91de63ac8bb351
diff --git a/app-misc/anki/anki-2.1.15.ebuild b/app-misc/anki/anki-2.1.15.ebuild
index 2f651f60f1dc..ed52486d34ac 100644
--- a/app-misc/anki/anki-2.1.15.ebuild
+++ b/app-misc/anki/anki-2.1.15.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8} )
 PYTHON_REQ_USE="sqlite"
 
-inherit desktop eutils python-single-r1 xdg
+inherit desktop optfeature python-single-r1 xdg
 
 DESCRIPTION="A spaced-repetition memory training program (flash cards)"
 HOMEPAGE="https://apps.ankiweb.net"
diff --git a/app-misc/beancounter/Manifest b/app-misc/beancounter/Manifest
index 0fbf42ccb62e..1489b0043bb8 100644
--- a/app-misc/beancounter/Manifest
+++ b/app-misc/beancounter/Manifest
@@ -1,3 +1,3 @@
 DIST beancounter_0.8.10.tar.gz 88658 BLAKE2B e2f848289398e45066375f80a0e7e2d0e93e7bbaa1d957acff95e67c2f8ecf482c3fae9cda7c64735974f7228d15308e99b841716d26a5847ee4de2bd5e81e67 SHA512 6d1270f0846987fe73480e0f6b46d1c27971d70ffe2622dee9a907f852249f7d30459003cc560c95dff9e6c973a88e81c4f6f63af8f8aa278861962bba703c1b
 EBUILD beancounter-0.8.10-r1.ebuild 878 BLAKE2B 5da0358bda2b97afa349fa2100f05b6336f44cf6bf2e2eb92c730abd379eddac7aaabffdd995f890e2f6ba7ea1ebabd6ced55f2fb41ccfb04700b7f7cf760f05 SHA512 467645c90cfeb26bb6a011e422c3e7def9e000aec30fb90aaef0a6e5e852303cee4da4a351af75317de84c79582057b829d70f801528221e3f303c60ab49e83f
-MISC metadata.xml 323 BLAKE2B a124f17ff830d781687a13ce15eb6ef109741b360aa85169d73a1f66786835a46b51f678127fa0264b03b47d8931bd8b9425cd1a171e2603d5f2d5aee796c558 SHA512 45dbc118728f97578e8c3f89eef2facb9c8b1e0acd3fcd8fbf2f502ff2b60eb0e7eb7553ff90915d12835f6c04982c281bb75f7ffb66d45199530a1d7c3410bf
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-misc/beancounter/metadata.xml b/app-misc/beancounter/metadata.xml
index 055dc06115a6..7a38bb900964 100644
--- a/app-misc/beancounter/metadata.xml
+++ b/app-misc/beancounter/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		Finance performance calculation engine with data acquisition (Yahoo! Finance)
-		and SQL backend support.
-	</longdescription>
 </pkgmetadata>
diff --git a/app-misc/beanstalkd/Manifest b/app-misc/beanstalkd/Manifest
index 88a7c3b00e5f..71dc1e9380c5 100644
--- a/app-misc/beanstalkd/Manifest
+++ b/app-misc/beanstalkd/Manifest
@@ -6,4 +6,4 @@ DIST beanstalkd-1.10.tar.gz 66243 BLAKE2B ff9c37b82073435523e0bc98169026ba9c1f8e
 DIST beanstalkd-1.11.tar.gz 73386 BLAKE2B 345873711b4d40c17044dddfec02a03a95cb42b274fa2a3459227aba585678c1b3e192947c4c82e9b6688050e1add5623c38ed75040a1135d523c888706d519e SHA512 322e6400c36fb3d7b06b7feb3e7dde5e64137382fb81ca1f11e3b9f72b4246ba719d139a571efcde9fe1738ba0e9e05a6ce3ac2d49a9628f6d455c81ec2a033e
 EBUILD beanstalkd-1.10.ebuild 1052 BLAKE2B a33b258f2ba61e14b97c91a7bdb1ba086fcef9863c698e72fb32ce13fd04e6a39b54dd96be74f20bd8fcd3c7d1b559978a3d388a2e16d8e890c883208e6c31f5 SHA512 40275b672b14f144421067d42ed765ce76b03876f648a34c138bbefd983ae397936d256b0f1c413baebe65cc91324f4650e6b405ac4d4158bf1874676c3fdc2b
 EBUILD beanstalkd-1.11.ebuild 985 BLAKE2B 729045c56f460a1d9f517308885cf16edfb0c41f81854ce959c578fbe22f57c0afeac260233378ccb1168c30e657569f6928fe21814bc4676a73d9ce035c6c9c SHA512 d8cca359f0e66c4f48b08fc15a49b0f295c23a62c09fe8b9f741cda0205290165e4d929f8c8296efebceaebedaf5aba3517caf8ef4f34414a133e510208e1ef1
-MISC metadata.xml 436 BLAKE2B 72356d3a95f45dc54e13946b8d41e698b60d44205e9ec90cee10d916f71ed0e6ed2a81929cbc705c8eeae00587790b2c4d2439a0ca366f28cf123ddcf3137f38 SHA512 7766293e42fb4786e971b259480f4e697745d23db9b332e24c7edda52d8ccbc2ebdb1ed1b1c9265f22d9ec698fc144acd6e7576cef66f3a33db8a4f102b08140
+MISC metadata.xml 335 BLAKE2B 4e07d8ed52588274c004754f8d1e379057a081091f2d4d7fdb21c8b0cd07a6f0b8ca2ecf447686051a60a969179bd5401c9117c50d5317c5667296678ce6f1f3 SHA512 ef75a50ccb4db0c6c8423aa8527e25b23bfbe88db0d1c2461c0921bdd859b2dc823227642d91e420e81c26fd08729ae51b38ca8b6b3ccddfa90e7ca75fe7c7f1
diff --git a/app-misc/beanstalkd/metadata.xml b/app-misc/beanstalkd/metadata.xml
index f0352343e9be..7e81f273fbd7 100644
--- a/app-misc/beanstalkd/metadata.xml
+++ b/app-misc/beanstalkd/metadata.xml
@@ -5,9 +5,6 @@
     <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
   </maintainer>
-  <longdescription lang="en">
-beanstalked is a fast distributed workqueue service
-</longdescription>
   <upstream>
     <remote-id type="github">kr/beanstalkd</remote-id>
   </upstream>
diff --git a/app-misc/colordiff/Manifest b/app-misc/colordiff/Manifest
index 15cd38a59d92..b2f8ffa9338c 100644
--- a/app-misc/colordiff/Manifest
+++ b/app-misc/colordiff/Manifest
@@ -1,5 +1,5 @@
 DIST colordiff-1.0.18.tar.gz 21695 BLAKE2B 034e105d92766240d2f854efd44efe8c68d443803ac994983829be0e02fb4c6d087ffc76a626bf34832d30755c9be5d97c1c0e0629ebc1328d08d3d24002447f SHA512 53eb855b2554ca736146983adb522c8c06e4cfb9eb27bf9acb659c210b2af8101dba76ae392cf14db62fab61e3e5d3b664196c0f6432d47acdfa0846c799aa83
 DIST colordiff-1.0.19.tar.gz 21329 BLAKE2B 3137159aa9bb83d0813c18ef62936cdd7cfaaf9655b077fc7efd0c70b7f88157720f71166d9449dc9840762f09267c9baa81065a3bd7df15d322cba61c48a585 SHA512 2845c4b8229df317984ea93aa9d2e08b3bb39ba67b870a14f09dc19fa1e94b4fc8e4da9a7554d53934591766b3aa1696fdc62765ce95e55f50da219e44dae523
 EBUILD colordiff-1.0.18.ebuild 936 BLAKE2B d02f7bee2f06e05df8ea94539d9052d0ac95048d5b94901b9bdb34c81ded3c039192c8a995858501082f922c0dea0c371fa7feb805a065c807487a4c7ede2ccc SHA512 65d2e2eed05517b65449812096d8541d7b83ad307fbbf07e68e0aae912dda60132a7bbed3b576451322252ac725c1df45f820a75882354b500872cfbe07434c1
-EBUILD colordiff-1.0.19.ebuild 950 BLAKE2B f78640a9ff840d7fb576080686ce937ca389a734f010280960076874811296472b0f11397a15069f0a1aa30333d2b1ce0baa22a67b1b34b3bb449a35617818cc SHA512 fe7afde7ceef38fa16b13532ec00ad9d9b4b8e683798f271c4c843d601661d45c388606d6ba111eeb2d580ff0b229fffcc9961e9f47a6ceaacdfe6f009d1f383
+EBUILD colordiff-1.0.19.ebuild 944 BLAKE2B 231adbff0c570e8d195436e65499c4f2332fe7e05f1b4d9fb8f1c3235d18caafabefc4362bc196191ffeb5c0d4fefb1f48a2f0f85cd37d10970bdd2038dc688c SHA512 621e8cc7724d1e40cc7cad8d3d3372a45af2712ef9ff0a80adfc6d9ffbef737b42b688970087816ecee77434f6c5251ab09571ac43787a23d1732778cf2dc019
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/colordiff/colordiff-1.0.19.ebuild b/app-misc/colordiff/colordiff-1.0.19.ebuild
index 57707b8528d7..cb8da065746f 100644
--- a/app-misc/colordiff/colordiff-1.0.19.ebuild
+++ b/app-misc/colordiff/colordiff-1.0.19.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colordiff.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/app-misc/datefudge/Manifest b/app-misc/datefudge/Manifest
index 6b23e85f49a5..b786501132f2 100644
--- a/app-misc/datefudge/Manifest
+++ b/app-misc/datefudge/Manifest
@@ -1,4 +1,6 @@
 AUX datefudge-1.22-bsd.patch 2839 BLAKE2B 995dcdf0b03346ffc8dfa2b119ab9f2c2e4a9db1d56738cb152aead17d1ad079977e3ca0853ecfcb23cf9ee7cff10114e96d5d7201923861beaebe9d11d77168 SHA512 4ee404f54ecb4f7128fa77423f4773fc0e85120ef4f5335ad742b7b5eb7339cb6150241c943ce56967e451a97dda0461b62ff0612a542f4b88278a77ddcb6f43
 DIST datefudge_1.22.tar.xz 12964 BLAKE2B 2f76647a3f7c73e43ff6b4fd57d57d21cae75fd8bc304a5cab7c66d9798795e2386f6219a51d71f57e13463e88a3e518160d90ae01bae5253cbcb7c8a3acf763 SHA512 ed67d334ca8296ae1c7b5ee1efc6ec7aafaad0aeb9f0f0387245c2eeea94ccc59ab804778b93ab8b34a512b83a3ec81d10f341d4f4f22b4a07fccdadaefb6d8b
+DIST datefudge_1.24.tar.xz 14152 BLAKE2B c0a386193e6761abade4643e2f56520738baf4bb739d4c94cec3e47a8feb5ebdf32a6e8b4a0c3dbb9584136b9855abcc68f5134e082083dfb61e977ae45c0bc7 SHA512 cd548a7e8ff10189e101fa339b2845cdd19a59354e43b02cf47e466855ec192dc2084951f7663a94da56a580dd24524047651d8bcb41aa478fe94b24dffaedeb
 EBUILD datefudge-1.22.ebuild 973 BLAKE2B 9427b1f03d460a0d78989f8a9796e2b187c993287c9c2037cfe9515de95d2ec66e23fbcaa9af4d157d0ae7760a0dac9f47aef2ac4fb1a1a45f43ba4b303d53b9 SHA512 3aa437ab4cb0142b67e7a4b6ce4c66fe4afad4ac777cb6a4c42ea23bd1fd0781086fe4ed3219b16c1c4490cc822642b58dd40454f917483ed21397a7d930e8df
+EBUILD datefudge-1.24.ebuild 813 BLAKE2B ce49d3b8f08448a0908cb9d997db36c2d016a25ab740528f46c3cd9f85d81dfd8392900e019fb75179eddff42d33e6683bef7457fb1fb1aad8a7816ccf94f526 SHA512 8ec65154bbe85c88a8a2718390565a67af5e3506e6ce6bec44c0d4b5286678870e61077d535f900563a11bd0b7b4ebe07758643a42ac483a80e94f9f850c7787
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-misc/datefudge/datefudge-1.24.ebuild b/app-misc/datefudge/datefudge-1.24.ebuild
new file mode 100644
index 000000000000..ade713b8eb6f
--- /dev/null
+++ b/app-misc/datefudge/datefudge-1.24.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="A program (and preload library) to fake system date"
+HOMEPAGE="https://packages.qa.debian.org/d/datefudge.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/dpkg-parsechangelog/d' \
+		Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" libdir="/usr/$(get_libdir)" VERSION="${PV}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" CC="$(tc-getCC)" libdir="/usr/$(get_libdir)" install
+	einstalldocs
+}
diff --git a/app-misc/ddate/Manifest b/app-misc/ddate/Manifest
index 1120f51c7699..98c975c8ce37 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.2.tar.gz 8049 BLAKE2B 7a987595b2dc399a5fc254891b92af84c9f94830f65c756f75db30c1e4db008ad715608ad37d53f3b73f3f5263023c066c546eb7536dc7439ded3650996be001 SHA512 5d148e030bee392eb93c5ae519061af0736f2f75eaae916e3efaf927d9f4de8cc72afc4a5121b6fbc0264b73e9f580330a38b97bb78837d447d0b4c1fc29ec06
 DIST ddate-0.2.2_p20160627.tar.gz 8079 BLAKE2B 7885dd34762297df801f9fe5736d1409280646cc9295780f3fa6da0a06127fa455c96117883e1087b0390498de1b58ac31071434e6b9e30a0f6a15b2e4c6c279 SHA512 279e02e1846cc2f505466882828aa699eaa7206e0025575babdb33738b920291d65ac4082f58c77e6046e69c2604b05de67f5b9b3cbc64589ff28a27e2256eef
 EBUILD ddate-0.2.2.ebuild 514 BLAKE2B a8a35a87f6df49c2a907bce74ed184af0720308265bfee13e7d4fdf9c95ad2477530a1be92e98877e6c9b2d5d1fda1752f0df61216877204a7b583f7d2c66e5f SHA512 c75d4c255ce6455cbbc249b40c99fcfa5d358534b3485843a652e264048f5c4933cbbe9e148e3266252ad3e7598546fbfa2d5d0b263715746d3fe8e1a784e236
-EBUILD ddate-0.2.2_p20160627.ebuild 556 BLAKE2B 87a40721b3a3fd0d0d4d7f53fcbf686b8ae2fd31929e7bb97eb013c582d813c982ee57660ec6596c651ab65b0843da2df48d0e32f592bcde67ae9f2f345f3d0b SHA512 148fca981abb4006e21866ef2a03d9d86e1947548334c715260d8806eaaced6b4752301c75d3a284915c7327b1f62d44f483891f56974631abbd9bbd95150bf9
+EBUILD ddate-0.2.2_p20160627.ebuild 554 BLAKE2B 07d126a8ecd949c47393fb948f82ff3cc493d53dfcff5d78e4f364ced9220f04255d61424e40edf4b1ed8b5b7e5d39790d63551e98b2d0e76c517e22c5284388 SHA512 ff569fe612c055e9543c6d5f923d31a54fabacc86e415280f161230412a83bce56a93551382b6f416d12d735b90b41c9c7c7eb6e5d0720a2f72d79bc318f90a4
 MISC metadata.xml 592 BLAKE2B 61ca3e0a009926931b30da1413a9080ad3f147339990b70598c75f5a2521fb224dc8d326f3dfc5aeddc762d4e15d58941c2d37e93a437b73fe98d6af7d8e424f SHA512 3bf37c63caa2e55da6f44545dd78866df4e72b822e76a33a7d37a634a794d24b7375117432e84ed5b64f0177bc3d994ddd04052181c396d695e4d75a5bb7a009
diff --git a/app-misc/ddate/ddate-0.2.2_p20160627.ebuild b/app-misc/ddate/ddate-0.2.2_p20160627.ebuild
index fd6d45d5ff9a..9a170ead4308 100644
--- a/app-misc/ddate/ddate-0.2.2_p20160627.ebuild
+++ b/app-misc/ddate/ddate-0.2.2_p20160627.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Perpetual date converter from gregorian to poee calendar"
 HOMEPAGE="https://github.com/bo0ts/ddate"
 SRC_URI="https://github.com/bo0ts/${PN}/archive/${EGIT_COMMIT}.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/dvorak7min/Manifest b/app-misc/dvorak7min/Manifest
index edaf82c08404..58419b4e58e8 100644
--- a/app-misc/dvorak7min/Manifest
+++ b/app-misc/dvorak7min/Manifest
@@ -1,3 +1,6 @@
+AUX dvorak7min-1.6.1-debian-changes.patch 7956 BLAKE2B 77396f83105259f53556e6e47bc15291be00d7a822c5eecb52e95e525e10ee24f3a7cc6c731954de3b9a4228980bedc45b84f90c139c915766a53804a376f763 SHA512 274d9a33b59e18de206431b2fb4f1f37342b27dd4accb37dc16ee5470f4c6163f55c82d8b3466894ac20f3470d65ba05e8f332b0b489dc27814bcfe4270d4115
+AUX dvorak7min-1.6.1-makefile-flags.patch 684 BLAKE2B 94d9a24871d88f3d18e8804b3f09f5435dd1e5c4f084322dff2bb40213dfafd1ced7c931adc439b0ab8e089f080254bdff7dc58a7efc77b42da037ed10c9cfb3 SHA512 173858e4daaba8f6f764f4c9cb4aa8e7c6d513d1dff8bc3e2753a969bad15fd4d1a9e91a7da3b9a9353c67c40209b3f316d7f4394042329205d0d80dc9e1454c
+AUX dvorak7min-1.6.1-ncurses-pkg-config.patch 668 BLAKE2B 48dd6d4efe50ad7648c2caf3ebd333f212692d4c14c5be83e7d674fb133095a09860115974e2275674e798d81d03d89f943e210497637ace7f22803402d75577 SHA512 8a39fe1b1715d2b953f1e13e9548e4864324b78bfa7a0ca6165b787163807615dfc472e7a0c6a39aaff8257fc2008851e5768c42dbd3fca5e991bb8d1453e2ec
 DIST dvorak7min-1.6.1.tar.gz 53115 BLAKE2B f884f1900a7de0422f076e3701f7b982d5c5cba70ae1805bd3540ebd109e9bbaaa9e439272ac530862eac9dca2c0ba67b1d0040aa58294b5cabba2fa126d04ae SHA512 17ed601f298673a51d73b2efeb1555d91337f34cfbcc099a71c11de38fecdb29747de9533abec9028c3abc9f04dc9090e4452bba1c53cdac8d65e86a760e8a7a
-EBUILD dvorak7min-1.6.1.ebuild 605 BLAKE2B d18c30969fbd3d1fb15ebd7c77867ed7f33d6cc01b2452a80f50efdf8bd57751700d99940b19e81e78ea3281ee7084c34bc6c43ec8af8910ae1ef28fb6060d53 SHA512 84a1760af7ea02ef465350dbe74d5960f76f5f7d1d301979c41463fff3096aecd2577dcdc70545618efdaef554c84daae1aa54b139d9a517b6edb69a2a192d98
+EBUILD dvorak7min-1.6.1-r1.ebuild 800 BLAKE2B a635043a5c9af9c5eadef748162e2b153038eb318f64e3c79f683e980a2e5ff9812a2e7ae87eaadb039a8db56eccb298ccab03c9211c017722d6c21cf2dbb0b5 SHA512 e22e35e8980266effade00b1ebab9765edf70da4ad142dfa6bb5b5fc158f39542399119d747130d506dd0c4dd06683a3ed1346911bd0f43b3c86a44ddd00eea1
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/dvorak7min/dvorak7min-1.6.1.ebuild b/app-misc/dvorak7min/dvorak7min-1.6.1-r1.ebuild
index 64c731780400..38f74d2fc070 100644
--- a/app-misc/dvorak7min/dvorak7min-1.6.1.ebuild
+++ b/app-misc/dvorak7min/dvorak7min-1.6.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,11 +12,16 @@ SRC_URI="http://www.linalco.com/ragnar/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
-src_prepare() {
-	emake clean
-}
+BDEPEND="virtual/pkgconfig"
+DEPEND="sys-libs/ncurses:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.6.1-debian-changes.patch"
+	"${FILESDIR}/${PN}-1.6.1-makefile-flags.patch"
+	"${FILESDIR}/${PN}-1.6.1-ncurses-pkg-config.patch"
+)
 
 src_compile() {
 	emake \
diff --git a/app-misc/dvorak7min/files/dvorak7min-1.6.1-debian-changes.patch b/app-misc/dvorak7min/files/dvorak7min-1.6.1-debian-changes.patch
new file mode 100644
index 000000000000..1257ee8eeaa0
--- /dev/null
+++ b/app-misc/dvorak7min/files/dvorak7min-1.6.1-debian-changes.patch
@@ -0,0 +1,194 @@
+"These are the combined Debian changes from upstream. They have been made only to the Debian packaging because the source is no longer maintained upstream."
+https://sources.debian.org/patches/dvorak7min/1.6.1+repack-4/debian-changes.patch/
+----
+--- a/README
++++ b/README
+@@ -2,28 +2,16 @@ First of all, please read COPYING.  Note
+ courtesy of Dan Wood <danwood@karelia.com>, and that they are available in
+ the original html format at http://www.karelia.com/abcd/
+ 
+-After that, just type
+-
+-        make
+-	
+-and when it's done, try running ``./dvorak7min''.
++Once the program is installed, try running ``./dvorak7min''.
+ 
+ If you get screwed up chars on the keyboard layout, you might want to try:
+ 
+   rm ~/.terminfo -R
+   
+-and, if that doesn't work, try uncommenting the COLORS and/or the
+-NOT_SO_PRETTY lines in the Makefile, and doing a ``make clean all''.  You
+-have a few other options in the Makefile, have a look to them.
+-
+ In addition of the built-in lessons, you can use any ascii file (as Smoke
+ suggests, Gutenberg books are good idea).  Just specify the filename as an
+ argument to the program, and you are done. 
+ 
+-If you are satisfied with the program, simply
+-
+-        make install
+-	
+ Remember that you can set your keyboard map with
+ 
+         loadkeys dvorak.map
+--- dvorak7min-1.6.1.orig/lessons.c
++++ dvorak7min-1.6.1/lessons.c
+@@ -166,6 +166,7 @@ char *lessons[] =
+ "gggg pppp gggg pppp gggg pppp gggg pppp gggg pppp gggg pppp gggg ppp\n"
+ "pg pg pg pg pg pg pg pg pg pg pg pg pg pg pg pg pg pg pg pg pg pg pg\n"
+ "gp gp gp gp gp gp gp gp gp gp gp gp gp gp gp gp gp gp gp gp gp gp gp\n"
++"\x1"
+ "gggg hhhh pppp uuuu gggg hhhh pppp uuuu gggg hhhh pppp uuuu\n"
+ "up up up up hug hug hug hug pug pug pug pug pup pup pup pup\n"
+ "ugh ugh ugh ugh Hugh Hugh Hugh Hugh Pugh Pugh Pugh Pugh",
+@@ -263,7 +264,7 @@ char *lessons[] =
+ "The catchup accident at the picnic depicted Dutch as an apathetic nuisance.\n"
+ "It is no coincidence that this idiotic sentence has eight concise Cs in it.\n"
+ "The enthusiastic duchess noticed the Pontiac coupe...and decided to chase it."
+-"\1"
++"\x1"
+ "I detect a headache...I hope it is not the\n"
+ "Schnapps and Cocoa I had as a nightcap.\n"
+ "\n"
+@@ -362,11 +363,12 @@ char *lessons[] =
+ "Allegra, an unparalleled intellectual, calculated the celestial latitudes and\n"
+ "longitudes in her sleep.",
+ 
+-    "YF: index fingers streching up",
++    "YF: index fingers stretching up",
+ "\x2"   
+ "ffff yyyy ffff yyyy ffff yyyy ffff yyyy ffff yyyy ffff yyyy ffff yyyy\n"
+ "ffff yyyy ffff yyyy ffff yyyy ffff yyyy ffff yyyy ffff yyyy ffff yyyy\n"
+ "fy fy fy fy fy fy fy yf yf yf yf yf yf yf ffff gggg hhhh yyyy pppp uuuu\n"
++"\x1"
+ "guy guy guy guy guy guy guy guy guy gyp gyp gyp gyp gyp gyp gyp gyp gyp\n"
+ "UHF UHF UHF UHF UHF UHF UHF UHF UHF yuh yuh yuh yuh yuh yuh yuh yuh yuh\n"
+ "huff huff huff huff huff huff huff puff puff puff puff puff puff puff\n"
+@@ -406,6 +408,7 @@ char *lessons[] =
+ "kkkk mmmm kkkk mmmm kkkk mmmm kkkk mmmm kkkk mmmm kkkk mmmm\n"
+ "kkkk mmmm kkkk mmmm kkkk mmmm kkkk mmmm kkkk mmmm kkkk mmmm\n"
+ "km km km km km km km km km km mk mk mk mk mk mk mk mk mk mk\n"
++"\x1"
+ "hhhh kkkk mmmm uuuu hhhh kkkk mmmm uuuu hhhh kkkk mmmm uuuu\n"
+ "ku ku ku ku ku ku ku ku ku ku mu mu mu mu mu mu mu mu mu mu\n"
+ "UK UK UK UK UK UK UK UK UK UK UK UK UK UK UK UK UK UK UK UK\n"
+@@ -442,6 +445,7 @@ char *lessons[] =
+ "jjjj wwww jjjj wwww jjjj wwww jjjj wwww jjjj wwww jjjj wwww\n"
+ "jjjj wwww jjjj wwww jjjj wwww jjjj wwww jjjj wwww jjjj wwww\n"
+ "jw jw jw jw jw jw jw jw jw jw jw wj wj wj wj wj wj wj wj wj\n"
++"\x1"
+ "eeee jjjj tttt wwww eeee jjjj tttt wwww eeee jjjj tttt wwww\n"
+ "ewe ewe ewe ewe ewe jet jet jet jet jet Jew Jew Jew Jew Jew\n"
+ "wee wee wee wee wee wee wee wet wet wet wet wet wet wet wet\n"
+@@ -500,6 +504,7 @@ char *lessons[] =
+ "An acquisitive mind helped Pavlov evolve his theories.\n"
+ "QVC's involvement with Paramount may give it new verve.\n"
+ "Vivian's new Volvo unequivocally vanquished her fears of driving.\n"
++"\x1"
+ "According to Pravda, Vladivostok was a quiet village in its Soviet days.\n"
+ "This unique, opaque liquor does not quench your thirst, it makes you queasy.\n"
+ "David's vivid imagination and his inquisitive and inventive mind suggest a high IQ."
+@@ -548,7 +553,7 @@ char *lessons[] =
+ "activity; several lizards hazarded the freezing waters and capsized the fish\n"
+ "tanks; a dozen grizzlies were waltzing in the plaza.",
+ 
+-    "XB: index fingers streching down",
++    "XB: index fingers stretching down",
+ "\x2"   
+ "bbbb xxxx bbbb xxxx bbbb xxxx bbbb xxxx bbbb xxxx bbbb xxxx\n"
+ "bbbb xxxx bbbb xxxx bbbb xxxx bbbb xxxx bbbb xxxx bbbb xxxx\n"
+--- dvorak7min-1.6.1.orig/Makefile
++++ dvorak7min-1.6.1/Makefile
+@@ -6,7 +6,7 @@ INSTALL = /usr/local/games/bin
+ #NASTINESS = -DNASTY_AS_USUAL
+ #BEEPS = -DBEEPS_ARENT_IRRITATING
+ #FLASHES = -DFLASHES_ARENT_IRRITATING
+-#COLORS = -DNO_COLORS_PLEASE
++COLORS = -DNO_COLORS_PLEASE
+ 
+ # Max length of imported texts.  Set it to 0 or comment it if you don't want
+ # a limit
+@@ -14,7 +14,7 @@ LIMIT_LENGTH = -DLIMIT_LENGTH=1024
+ 
+ ### That's all ###
+ 
+-#CC      = gcc
++CC      = gcc
+ PROF    = -g0 -O2
+ CFLAGS  = $(PROF) -Wall \
+ 	$(PRETTINESS) $(NASTINESS) $(BEEPS) $(FLASHES) $(COLORS) \
+--- dvorak7min-1.6.1.orig/dvorak7min.c
++++ dvorak7min-1.6.1/dvorak7min.c
+@@ -173,7 +173,8 @@ int myGetch(char shouldBe)
+ /* calculate typing speed in a given interval */
+ inline float calcSpeed (time_t timeStart, time_t timeFinish, int hits)
+ {
+-    return (float) hits / (timeFinish - timeStart);
++    // Use WPS/WPM as better standard, so also divide by 5 
++    return (float) hits / 5 / (timeFinish - timeStart);
+ }
+ 
+ 
+@@ -193,7 +194,7 @@ int importText (char const * const fileN
+    
+    file = fopen (fileName, "r");
+    if (!file) {
+-      postmortem = sys_errlist[errno];
++      postmortem = strerror(errno);
+       return -1;
+    }
+    
+@@ -220,7 +221,7 @@ int importText (char const * const fileN
+    while (1) {
+       c = fgetc (file);
+       if (errno) {
+-	 postmortem = sys_errlist[errno];
++	 postmortem = strerror(errno);
+ 	 fclose (file);
+ 	 return -1;
+       }
+@@ -418,6 +419,7 @@ void do_text (char * const text)
+ 	  ++p;
+ 	  if (!timeStart) {
+ 	     timeStart = time(0);
++	     hits = 0;
+ 	  }
+        }
+        
+@@ -431,8 +433,9 @@ void do_text (char * const text)
+ 	     float ratio = hits - misses;
+ 	     ratio = (ratio < 0) ? 0 : (100.0 * ratio / hits);
+ 	     timeCurrent = time(0);
+-	     speed = calcSpeed (timeStart, timeCurrent, hits);
+-	     mvprintw (LINES - 1, 0, "CPS %.2f  CPM %.2f Hits: %d Misses: %d Seconds: %d Ratio: %.2f%%", speed, speed * 60, hits, misses, time(0) - timeStart, ratio);
++	     speed = calcSpeed (timeStart, timeCurrent, hits + misses);
++	     // Use WPS/WPM as better standards
++	     mvprintw (LINES - 1, 0, "WPS %.2f  WPM %.2f Hits: %d Misses: %d Seconds: %d Ratio: %.2f%%", speed, speed * 60, hits, misses, time(0) - timeStart, ratio);
+ 	     clrtoeol();
+ 	  }
+        } while (ch == ERR);
+@@ -510,7 +513,7 @@ void do_text (char * const text)
+     }
+ 
+     timeFinish = time(0);
+-    speed = calcSpeed(timeStart, timeFinish, hits);
++    speed = calcSpeed(timeStart, timeFinish, hits + misses);
+     clear();
+     cbreak();
+     if (!timeStart) {
+@@ -519,8 +522,11 @@ void do_text (char * const text)
+        float ratio = hits - misses;
+        ratio = (ratio < 0) ? 0 : (100.0 * ratio / hits);
+        mvprintw (0, 0, "Elapsed time: %d seconds", timeFinish - timeStart);
+-       mvprintw (1, 0, "Total: %d  Misses: %d  Ratio: %.2f%%", hits, misses, ratio);
+-       mvprintw (2, 0, "CPS: %.2f  CPM: %.2f", speed, speed * 60);
++       mvprintw (1, 0, "Total: %d  Misses: %d  Ratio: %.2f%%",
++                 hits + misses, misses,
++		 (float)100*(hits) / (hits + misses));
++       // Use WPM/WPS as better standard
++       mvprintw (2, 0, "WPS: %.2f  WPM: %.2f", speed, speed * 60);
+     }
+    
+    mvprintw (4, 0, "[ ] Press ESCAPE to continue.");
diff --git a/app-misc/dvorak7min/files/dvorak7min-1.6.1-makefile-flags.patch b/app-misc/dvorak7min/files/dvorak7min-1.6.1-makefile-flags.patch
new file mode 100644
index 000000000000..83981050daf1
--- /dev/null
+++ b/app-misc/dvorak7min/files/dvorak7min-1.6.1-makefile-flags.patch
@@ -0,0 +1,26 @@
+https://sources.debian.org/patches/dvorak7min/1.6.1+repack-4/makefile-flags.patch/
+--- a/Makefile
++++ b/Makefile
+@@ -6,6 +6,7 @@
+ #NASTINESS = -DNASTY_AS_USUAL
+ #BEEPS = -DBEEPS_ARENT_IRRITATING
+ #FLASHES = -DFLASHES_ARENT_IRRITATING
++#PROF = -g0 -O2
+ COLORS = -DNO_COLORS_PLEASE
+ 
+ # Max length of imported texts.  Set it to 0 or comment it if you don't want
+@@ -15,11 +16,10 @@
+ ### That's all ###
+ 
+ CC      = gcc
+-PROF    = -g0 -O2
+-CFLAGS  = $(PROF) -Wall \
++CFLAGS  += -Wall \
+ 	$(PRETTINESS) $(NASTINESS) $(BEEPS) $(FLASHES) $(COLORS) \
+-	$(LIMIT_LENGTH)
+-LDFLAGS = $(PROF)
++	$(LIMIT_LENGTH) $(PROF)
++LDFLAGS += $(PROF)
+ LIBS    = -lncurses
+ 
+ OBJECTS = dvorak7min.o lessons.o
diff --git a/app-misc/dvorak7min/files/dvorak7min-1.6.1-ncurses-pkg-config.patch b/app-misc/dvorak7min/files/dvorak7min-1.6.1-ncurses-pkg-config.patch
new file mode 100644
index 000000000000..2f62112ceb48
--- /dev/null
+++ b/app-misc/dvorak7min/files/dvorak7min-1.6.1-ncurses-pkg-config.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/show_bug.cgi?id=722336
+https://bugs.gentoo.org/show_bug.cgi?id=689986
+https://bugs.gentoo.org/show_bug.cgi?id=698082
+https://bugs.gentoo.org/show_bug.cgi?id=702372
+diff --git a/Makefile b/Makefile
+index e0e7645..6aee6ab 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,12 +15,13 @@ LIMIT_LENGTH = -DLIMIT_LENGTH=1024
+ 
+ ### That's all ###
+ 
+-CC      = gcc
++PKG_CONFIG ?= pkg-config
++CC      ?= gcc
+ CFLAGS  += -Wall \
+ 	$(PRETTINESS) $(NASTINESS) $(BEEPS) $(FLASHES) $(COLORS) \
+ 	$(LIMIT_LENGTH) $(PROF)
+ LDFLAGS += $(PROF)
+-LIBS    = -lncurses
++LIBS    = $(shell pkg-config --libs ncurses)
+ 
+ OBJECTS = dvorak7min.o lessons.o
+ HEADERS = lessons.h
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 98d02df500bf..d0d901faab76 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -11,17 +11,17 @@ DIST elasticsearch-6.8.12.tar.gz 149091869 BLAKE2B 9cbc8cc424b1132f3e93de8f2cc7c
 DIST elasticsearch-7.6.2-no-jdk-linux-x86_64.tar.gz 148140124 BLAKE2B 9a850011533052d7a4041484936dfa2c8fe7f7976314147bc2b1d5f239bbdfe68a3593d3e0d2bb4d709a71e81aa7c200f9530921dab9d50c0ab3e349f4769ffb SHA512 aa5f499b26e92e19a673093fe2ff73c1c03a8da029b59cb83db43f9e2dfd7c650ee6a122bcf647b7e83f658ad9b9cc64092e6e7c1b4f8476f2973a6006b8df3c
 DIST elasticsearch-7.7.0-no-jdk-linux-x86_64.tar.gz 157716656 BLAKE2B 812c4db511f844fb23cb79bdfe3778281f1b6dad6a45553380829e330231304ce0e18eb975867e8474f652a63bdab2f4fb8c14158753aa8b29db5debfd3f00ae SHA512 a8d6cb7186301f50ba72ee5cde6c26390bdb6a8c13d902a75c63038b3dbb3cd7e544bbf6934d88324d722a213b7bf2efc0b27f9cae64428e6842d640bda5ee54
 DIST elasticsearch-7.8.1-no-jdk-linux-x86_64.tar.gz 161598020 BLAKE2B 7950d9570760683a939c961c0babdf66a57adfc49d541d75716ce1dc379f211f60edceae06855de0f4bfe50c9a6b1ca0296aa58fe324a28b009fb8cfe5c2a5d7 SHA512 1fd0dc28cc12f4cafe8499ca2894a00f0aef506429a3cd5fa4c9ec006e4dd281099bd0f41f1e0ff9d67ef25d5d1cf3be7f6c43c1758ef3464ee4b650fb560842
-DIST elasticsearch-7.9.0-no-jdk-linux-x86_64.tar.gz 162809477 BLAKE2B 79a0cb0a62f55876eac92edae39241ac3ca49b7655e083700ab7d8a3775cd5356049dc9b7e0ef02b5d8c638ca2d1aae0a28be029e98ae6d0c5a792d682592a65 SHA512 79dbc45fe41e352586c178085e3ee4dc87d94f9a2d883f5522acb8e8733e1663c36d58891d24f1f2813407cc02b27312bf261b98305168f614a6bb962163cb17
+DIST elasticsearch-7.9.1-no-jdk-linux-x86_64.tar.gz 162821211 BLAKE2B 219f56e1d2f258b20302482889e4da550d94be3e27cbb28282422428ac0cba2eca197f3291581d7a2537cc0ab1e72bbc4adf40e75569410e1f785298371b5224 SHA512 1be0d5c7b761275c0d4e42491fe10e4f105065cfc27861ac034e012653d7cb1b7da1140d61f65eefc6e50ed68d858fcb572a3c6a0c8cdc6f5d9511dbf9600b45
 DIST elasticsearch-oss-6.8.11.tar.gz 68247334 BLAKE2B d35bd5b2cec24923b03fe21e5f31055d0380c71908f9610d9897d7b97e599b65fbc98d04e905f35e7042f3b2697e89f9e927cf1b2b5b652f3a0e8731caaeaf54 SHA512 f92bd4dc68d8a42c1c5a8f424e375e4996d14d8860aef2e9a3208613a438543647e9999cdaa18870de4fb1f7d514929e535891e5cd6b8a668b2c90dab0106c51
 DIST elasticsearch-oss-6.8.12.tar.gz 68241645 BLAKE2B c62790e136c3c968b03a927d6fd67a5f8d6feae14a522213dd2432db1b53f14e931b40eb2120d47d23d7a8895487e2f8a03aaaf66098758a39d802556530b72c SHA512 9f6179ee49baa48b49c5328b88ddf2f0ef868f49c1f04d77975622120749725c48ac09cd565c05f6033eb227eaff905aff9f881a85efcf2fa75cc586cb8c45cb
 DIST elasticsearch-oss-7.6.2-no-jdk-linux-x86_64.tar.gz 72570377 BLAKE2B 5a5ec3e79cba236dd4a6ffd279b0fca4ad882c877b418261b0314d8101885a2d2496c837b44e5dbefe5ed994aeeca488a8f08a2ba26c4b44b156c180dae6004c SHA512 6197a0b62f577cd0692c1fb97a473a9971f8fef383dc6ef618035785dbc662947d2adbc425ce130ef531cbfaf9add9ed5da5a698387e770c49af820644d67e72
 DIST elasticsearch-oss-7.7.0-no-jdk-linux-x86_64.tar.gz 73216528 BLAKE2B f0f1a3d3347ea37703e90bd896b24f6e3c58406d9fb20f3607a4d08eee325b5ae293db48d1afdc208468ee775b9085a28f39f2e175b67e4881bfb61d5cb85a9a SHA512 f9b323cff078a0dc856f99efd164775a9cd0718bb0ddb6c4d4817fa53cae71748f1aec5158afa45d4b29076043cbada9743a996e685439436e93d94a9eff2768
 DIST elasticsearch-oss-7.8.1-no-jdk-linux-x86_64.tar.gz 75134201 BLAKE2B a3c88ad5f94a5cebefc1a5a3a913a62bc6c8751a78c179a05667f47da71c41b480edf8d7f962ad34aa8ab0eac8168d7b8cd57f33068c17ae7e0a8d5414fbc924 SHA512 f0caa06c1172b25d8f9cb9ddced72185aaaabb1b6d7f31fe1ba67172346236651ca3bc560e7ef206b4bf9521f228d46ee98df2e41b129253215135b583086ccc
-DIST elasticsearch-oss-7.9.0-no-jdk-linux-x86_64.tar.gz 75601594 BLAKE2B 7e6edba0cb4948a8602b188193d88337cb0061a519059a23055e36ae3ab8d7df95f5c85327cb049286915872c74ec9b6adc2df21566d5eea007d134f7e3a0920 SHA512 6ec0bbb5a9f2bbf7bf78aea2999be2216f47b9f96caba27f99d40bdcdbd9f78f55e804643240fa97438cef375f4f7237860998e1d63fc401b8930d64eddea800
+DIST elasticsearch-oss-7.9.1-no-jdk-linux-x86_64.tar.gz 75607610 BLAKE2B 02b3f978bbf26c35c82883cb125ce63a0ede9026308fb0bda73c2e85e68dc1e11b1affa1908f05358f63ac0d7a26a839dcd4f019792c0528ddf9fc101933c3bd SHA512 d306cc63c44dd553f344babf310435bdd857fe81d149ea8179b099cffaebb061d5f4fd51c95e5d65131b15328f390db846b4f485a864ab2b352573d46025c411
 EBUILD elasticsearch-6.8.11.ebuild 2539 BLAKE2B 4fd8e35d07ece1117ca5b6ebaf8d75b1d67a4d870ca7986841fb360ff6948f22701048a591a200e6072f533091f08bc8d5a3d980d56b85de397618015540fe3f SHA512 972e2fca78cc29bcdef9c96dc0fcb0571dede8318b7afe907427b8bc1c46677e4b6b87333c65de1138a8fde6a9c04f605b69131509776b54cfa8712ca813aed1
 EBUILD elasticsearch-6.8.12.ebuild 2539 BLAKE2B 4fd8e35d07ece1117ca5b6ebaf8d75b1d67a4d870ca7986841fb360ff6948f22701048a591a200e6072f533091f08bc8d5a3d980d56b85de397618015540fe3f SHA512 972e2fca78cc29bcdef9c96dc0fcb0571dede8318b7afe907427b8bc1c46677e4b6b87333c65de1138a8fde6a9c04f605b69131509776b54cfa8712ca813aed1
 EBUILD elasticsearch-7.6.2.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
 EBUILD elasticsearch-7.7.0.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
 EBUILD elasticsearch-7.8.1.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
-EBUILD elasticsearch-7.9.0.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
+EBUILD elasticsearch-7.9.1.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
 MISC metadata.xml 567 BLAKE2B 3123e01d77b67569afb2bb4908b38c702ebe1d308ea236b8ebba11709bc421af27ec29d72398a3af0aaefb39a2a2f34e27bffbbd1b3306dbc299e49bfd48cd35 SHA512 74669ea5437ad23c604c82a734973d58a31d78f0f4a2b7e2db655d884bf017d32ea25e451517601b35d406789e661ed2e173752bc232a03c3564e971c5a83a0c
diff --git a/app-misc/elasticsearch/elasticsearch-7.9.0.ebuild b/app-misc/elasticsearch/elasticsearch-7.9.1.ebuild
index 2155270debec..2155270debec 100644
--- a/app-misc/elasticsearch/elasticsearch-7.9.0.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-7.9.1.ebuild
diff --git a/app-misc/g15composer/Manifest b/app-misc/g15composer/Manifest
index 3c6f362f3d8a..334f757e1ad4 100644
--- a/app-misc/g15composer/Manifest
+++ b/app-misc/g15composer/Manifest
@@ -1,10 +1,7 @@
-AUX g15composer-3.1.confd 695 BLAKE2B c2a36ee0abd83b7d9ad4c6f3610a50cfd7e9dd4ae1c09d2d58cf2f4f54a9c46441b068d5e145c9a0023e7a510c80391294d90dbf493510ff7b83edf11b4420d3 SHA512 58c137d67f83a00a18f80ece66f3b41a402371d680a6527367df12bf574b4a1450ef130bab055d7940ce7b94534103108fa63cb0b97c585f0d69a67a14ec7bbb
-AUX g15composer-3.1.initd 1249 BLAKE2B bbda2808606485c186b13f84133fd654a82189ee2f6693d5cfd7dd06846b3663db7d5b08c0df9841cd2ccfe2af0ba74a514589a3efff21dfa61363258ee80b34 SHA512 1e63a8ec482874df65a7685b0eb671be264b1228fdf53a6cf6f3efcc18b7b0a7d511572f99318013bb86b099e66827e44bcb060ba1d13b2af4699e4a9f6b02eb
+AUX g15composer-3.2-docdir.patch 420 BLAKE2B 3b965ace9c7eb7a0d0d4739d35f702dbac37000194c560814e82f6cc41072661621a70d0289782e5d5473ee2b7567d0a49b85e917d1d1a44206344082b6052b5 SHA512 340a4dceebcf65a2505a1d67a7a0b13314c4b04e98e8cdbfe479a8c9dbf5c68da6522136d7224fee95f22934e4e3d7e3911114c2e921547888e42a2e3ffd0cb0
 AUX g15composer-3.2-freetype_pkgconfig.patch 1669 BLAKE2B 75e14fe368c3f1ee5adf357d339fd05773f8dcce279c488a413bc9b69c51abdc02425eeb2fadbb3ba52d2b8baf7d93aac72e981d31c7bf09ba8a6e0206178844 SHA512 6ae9a18927b8fc2066746b8c7532a3e9bb31432ed3ce2af59fbe02a741334b1ae18886e84b10480243f7b4b9001f9931d817efa1c4077d6f775f072c7f2488cc
 AUX g15composer-3.2.confd 695 BLAKE2B c2a36ee0abd83b7d9ad4c6f3610a50cfd7e9dd4ae1c09d2d58cf2f4f54a9c46441b068d5e145c9a0023e7a510c80391294d90dbf493510ff7b83edf11b4420d3 SHA512 58c137d67f83a00a18f80ece66f3b41a402371d680a6527367df12bf574b4a1450ef130bab055d7940ce7b94534103108fa63cb0b97c585f0d69a67a14ec7bbb
 AUX g15composer-3.2.initd 1249 BLAKE2B bbda2808606485c186b13f84133fd654a82189ee2f6693d5cfd7dd06846b3663db7d5b08c0df9841cd2ccfe2af0ba74a514589a3efff21dfa61363258ee80b34 SHA512 1e63a8ec482874df65a7685b0eb671be264b1228fdf53a6cf6f3efcc18b7b0a7d511572f99318013bb86b099e66827e44bcb060ba1d13b2af4699e4a9f6b02eb
-DIST g15composer-3.1.tar.bz2 104109 BLAKE2B 1880fd469dcbca5031724a23a5abee6d2242738a1674e2635d02aee20fa9859293fa383921f602bf04fb8bdaa294fad9aca099e56bd85b69d41d413f6561a309 SHA512 e4b0ddef2dfbfd3a8a392ebe9e53a59638cbb7aee7a007b8a20be388f074d54a27ed509a5805fadc9ffd708c027ec4c331dfab96905bee1c37690a5585198ad8
 DIST g15composer-3.2.tar.bz2 105805 BLAKE2B 1a843ed50f0374cb23d469be9c083437f13279f5584e3112037635225e5d5df7765452e3e805c4230fd33782c300f5abdb1fc05e394f636d160c8e49baf3dde0 SHA512 95b033e2bb957ef4a2f3d3e2954a11454af7d8576e037f723d2a7d45a7dadde4908540ff0a66b387209e689217ba0e6677dcee1e647b792c402f250371518bc1
-EBUILD g15composer-3.1.ebuild 865 BLAKE2B 32655857abe852de9e6e7c3dda738048fbe9b5cb84740deeebec3b4f6b3eef44f1dbdf651452c2e38af6e1c2bc5b2e3433d365ccbf57e406a6105499188e1464 SHA512 154f43f5e1a276f9a57673349bd1edfda7c6427a3ff57cc039d05bd62d887ca60e7eefb71c0aed54fad757778e381c26459474ffc757972052e9a6b1a301434a
-EBUILD g15composer-3.2.ebuild 1079 BLAKE2B 3a8a796a9cb74b3420c887e7c34e19ed7ae2bba36493b1db126fc2263e8df0c818468cd85f5fe462ced8308659d25514e0767af445b18c485da38d9a4df81c7a SHA512 6edd1c493c8e5acaaa8fca45748e23eca4862d7b0d207bf6f12801448b0b723177e4be283b81560588dfa48271c934e86d65905d54c6754c277642f8c5511b77
+EBUILD g15composer-3.2-r1.ebuild 1107 BLAKE2B 46db2e4afd4bdc1591c6781792f2998e1aa3827d14fed113723dd0b9e0fca24d99fa66057b9741ac17f8c26d0a1b0f587802759da1d370ce3b3f3b929c6cda70 SHA512 7f6554ace622fd63b76ffcaf98c14a93022be967eabc7f2b3e2d4b7ce388a14ac628d3993cb896f6463dd1efb4c5d56a308093724f25a66224d3be453dbc15a6
 MISC metadata.xml 408 BLAKE2B 2165f633654f865b41938473830e3a25c373d585a453ea4a084eb4912e0abb0567366c76a9d11373b54bc0e1fd1e76d5fbdc3724a1dd05e47442e778f60fe754 SHA512 e4da283d6a210afc06b392ed61be935a1a1dfa0d886c0f3e6e82bd5e78323e080e911ef7eee9ff2e6ab98ced93804ab8f48433b9f0f630d8c68a62f91a3e780d
diff --git a/app-misc/g15composer/files/g15composer-3.1.confd b/app-misc/g15composer/files/g15composer-3.1.confd
deleted file mode 100644
index f42ab956e242..000000000000
--- a/app-misc/g15composer/files/g15composer-3.1.confd
+++ /dev/null
@@ -1,17 +0,0 @@
-# /etc/conf.d/g15composer: Configuration for the g15composer
-
-# The CONTROL_FIFO is the name of the FIFO that g15composer listens to.
-# It does not create a screen on the display, but allows programs to
-# create their own non-virtual screens.
-# Please make sure the file specified does not exist.
-CONTROL_FIFO="/var/run/g15composer"
-
-# Set the user who owns the CONTROL_FIFO.
-# As this is also the user as whom g15composer is run,
-# it has to be someone who can create further message channels
-# This should be the user who runs the LCD clients
-FIFO_USER=
-
-# Set the grop which owns the CONTROL_FIFO.
-# The users who want to display screens on the LCD need to be in this group.
-FIFO_GROUP=users
diff --git a/app-misc/g15composer/files/g15composer-3.1.initd b/app-misc/g15composer/files/g15composer-3.1.initd
deleted file mode 100644
index 0d7c24f85609..000000000000
--- a/app-misc/g15composer/files/g15composer-3.1.initd
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-PIDFILE=/var/run/${SVCNAME}.pid
-
-depend() {
-	need g15daemon
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-
-	if [ -z "${FIFO_USER}" -o -z "${FIFO_GROUP}" ] ; then
-		eerror "Please set the FIFO_USER and FIFO_GROUP variables in /etc/conf.d/${SVCNAME}"
-		eend 1
-		return 1
-	fi
-	if [ -e "${CONTROL_FIFO}" -a ! -p "${CONTROL_FIFO}" ] ; then
-		eerror "${CONTROL_FIFO} exists and is not a FIFO. Please remove."
-		eend 1
-		return 1
-	fi
-	if [ ! -p "${CONTROL_FIFO}" ] ; then
-		einfo "Creating FIFO at ${CONTROL_FIFO}"
-		mkfifo -m660 "${CONTROL_FIFO}"
-	else
-		einfo "Reusing FIFO at ${CONTROL_FIFO}"
-	fi
-
-	chown ${FIFO_USER} "${CONTROL_FIFO}"
-	chgrp ${FIFO_GROUP} "${CONTROL_FIFO}"
-	start-stop-daemon --start --background --pidfile ${PIDFILE} --make-pidfile --exec \
-		/usr/bin/g15composer -- -b -u "${FIFO_USER}" -g "${FIFO_GROUP}" "${CONTROL_FIFO}"
-	eend $?
-}
-
-stop() {
-	ebegin "Stoping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile ${PIDFILE} --name g15composer
-	if [ -p "${CONTROL_FIFO}" ] ; then
-		einfo "Removing FIFO at ${CONTROL_FIFO}"
-		rm -f "${CONTROL_FIFO}"
-	else
-		ewarn "FIFO at ${CONTROL_FIFO} was lost"
-	fi
-	eend $?
-}
diff --git a/app-misc/g15composer/files/g15composer-3.2-docdir.patch b/app-misc/g15composer/files/g15composer-3.2-docdir.patch
new file mode 100644
index 000000000000..cd81cde5de41
--- /dev/null
+++ b/app-misc/g15composer/files/g15composer-3.2-docdir.patch
@@ -0,0 +1,11 @@
+--- g15composer-3.2/Makefile.am
++++ g15composer-3.2/Makefile.am
+@@ -3,7 +3,7 @@
+ EXTRA_DIST = g15composer.l g15composer.y debian examples doc
+ noinst_HEADERS = g15composer.h g15c_logo.h
+ man1_MANS = $(top_srcdir)/doc/g15composer.1
+-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
++docdir = @docdir@
+ doc_DATA = AUTHORS ChangeLog COPYING NEWS README
+ 
+ g15composer.tab.c: g15composer.lex.c g15composer.y g15composer.h
diff --git a/app-misc/g15composer/g15composer-3.1.ebuild b/app-misc/g15composer/g15composer-3.1.ebuild
deleted file mode 100644
index 28ae4aaf5304..000000000000
--- a/app-misc/g15composer/g15composer-3.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A library to render text and shapes into a buffer usable by the Logitech G15"
-HOMEPAGE="https://sourceforge.net/projects/g15tools/"
-SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="truetype examples"
-
-DEPEND="app-misc/g15daemon
-	>=dev-libs/libg15render-1.2[truetype?]
-	truetype? ( media-libs/freetype )"
-
-src_configure() {
-	econf \
-		$(use_enable truetype ttf)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/${P}.initd" ${PN}
-	newconfd "${FILESDIR}/${P}.confd" ${PN}
-
-	if use examples ; then
-		exeinto "/usr/share/${PN}"
-		doexe examples/*
-	fi
-}
-
-pkg_postinst() {
-	elog "Set the user to run g15composer in /etc/conf.d/g15composer before starting the service."
-}
diff --git a/app-misc/g15composer/g15composer-3.2.ebuild b/app-misc/g15composer/g15composer-3.2-r1.ebuild
index 03f3cb42bbfd..747c325e7f3b 100644
--- a/app-misc/g15composer/g15composer-3.2.ebuild
+++ b/app-misc/g15composer/g15composer-3.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -11,18 +11,17 @@ SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="truetype examples"
 
 DEPEND="app-misc/g15daemon
 	>=dev-libs/libg15render-1.2[truetype?]
-	truetype? (
-		media-libs/freetype
-		virtual/pkgconfig
-	)"
+	truetype? ( media-libs/freetype	)"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.2-freetype_pkgconfig.patch
+	"${FILESDIR}/${P}-freetype_pkgconfig.patch"
+	"${FILESDIR}/${P}-docdir.patch"
 )
 
 src_prepare() {
diff --git a/app-misc/g15daemon/Manifest b/app-misc/g15daemon/Manifest
index ac06d8919aa6..5e2543ee7e63 100644
--- a/app-misc/g15daemon/Manifest
+++ b/app-misc/g15daemon/Manifest
@@ -1,14 +1,18 @@
 AUX 20g15daemon 173 BLAKE2B 70c9a7e6769d98f2f8195a8d8e120fc514e956125c5d887412a165c2c038006060169f8fddc31a0334c543dde083136682cdec34b27418fd99cb4776a0cdac2c SHA512 daee2c432860dd3147209724417cbf04ec1ed0c8e882900900722420cbe67d88f32efc81422e04221e54796b66d69e050135b72a96baf40137da58023202d3ca
 AUX 99-g15daemon.rules 90 BLAKE2B ffcee5b3039d9aa1d63ff6d58fb29d84a2c9988dc4815407ec8c529e874d3af1d8f05f0623588a3264e3ece6cf23168b4c6a102316c249ae26b68f4311dd2359 SHA512 f3ff958bb4e0344b600328fcab86674ce14d852287ec2e083751d0eb855a0591aa17fdae767de4517bcd8a1fa542ab9b559ee79fe284207d2872b8901f2c77f7
-AUX g15daemon-1.2.7.confd 329 BLAKE2B 1c28f1ee1c6400cc1067df7bfddf66a138abcaf0168b548511c390233392eb722d3c5c5c9d03d6106eecdec5c37fd4588d80713bb0793879cfe6701c89368cfb SHA512 ea94ab43c78566c570a510cccb6860ade6c26a281956b6e37ea746eb06608a5a00ed55773752c7aad44bf86cdfec5788e9f1137667fd5030d54b20b97811b43a
-AUX g15daemon-1.9.5.3-forgotten-open-mode.patch 639 BLAKE2B dcd28ba55f823c26cf38d273a5bd9893715de3e361cdca73cb9e0baf015da04a23f239bcc9471b8d52a623e82c5b2bb6e39bb5cb28dc7d92b4b5397544ccdb71 SHA512 dc603a576eaf6bd8512827de712c3ba6a116905d5f6c692dccda1b499a3bab8480a785155d3b0189b41e2dff099fc5896cb958bcc83357ff54333a82f4b6ca93
-AUX g15daemon-1.9.5.3-g510-keys.patch 14095 BLAKE2B 51e0fc084298923a44fc7453cb7d91dd39f54685c67a09eaf90628e1f0005569f9cb702f66425bb5ca243d97b70c74b68e512bf89a6f509a6f8240b08004ba5a SHA512 ac43f573175a8842ac571fe4d30fe2b2bb901d46da75fb9a7fe591b6a144df6308c5aecb65319667e01a316414cbccf44dbb492412e0d28bd9fb1cd09ce9bb75
-AUX g15daemon-1.9.5.3-overflow-fix.patch 619 BLAKE2B 8d7f71d946315b1844c25ad3687fcceb0e7c1e87ad818b6b70b4accda951d10a271214945f4b03360e4b999a3229405b7728b3154cfa74a65c0f1d47ca223616 SHA512 e5f4494c0890ce985391d5a07d809e7168f765549c17b55457d93436ce816074aa97f991b894067badacf5e0bcc7f482d6b7e1623b0157a04d728f2ca4b1bf27
+AUX g15daemon-1.2.7.confd 330 BLAKE2B e25cf425e9d26946d617759cc07d3a9a73591539a7d6c7e1e09c5803032841b7c343d83156034ef01276454acb6853b291888346438a59908320a549378743d9 SHA512 0274394bc9442686b89e94bad80b4df352a772ca0b51a8b0d05a8de0551f747e8eceb9c10d290f22e9e8a433a2e2c94b061866d32db45bd3ef0d050facc484bf
+AUX g15daemon-1.9.5.3-avoid_bashisms.patch 839 BLAKE2B 49269760a077a39924c39bd8182365ea767f4f57d3bd2ddefa3c6aadc1a84ec8ee773a802a483d859e693d0051b1dd256abd373d4558c95db88713a442844abc SHA512 5eac0f9bb87bbdab08ffb05dc17122f0090cb78ce068e6acdaac16dfc3bba0d1bc150445c02f48fb155af255368b89e3d90b6d109243185c7a5abbd01004cd05
+AUX g15daemon-1.9.5.3-docdir.patch 473 BLAKE2B 5370c2e89d45b7cd1255dd987210b37b5019b636643f68399a05bbbabccf867e6bd219e7f89f0ee2d1f2408e6a9d6f3da38853d19a486028bcee1a726b45daae SHA512 e1ef8f9f290b37a3a5648109e1340ec984684fff50ec7e9c5d7baa9b1ab4209432ecac5da64b917dd13de0141662b0ebc958bd04cc4b7789d626a3fc4fbe11d2
+AUX g15daemon-1.9.5.3-forgotten-open-mode.patch 563 BLAKE2B 33d2b9ff82d9fbdd490f31d539c0432c9ef65fb14f23bedadc497d76732c32aaafac1ac64ff3c59c7b5098ddcbbfa44f8087e61a57147cf9293c39c0f34cce2b SHA512 8eced9d04c4880c5883d536bc3c4d8cdd452e182e434b2314abd8c8bb0e036c377424c0f757a0c2596972da2b87befc6442f6880e1e580597a1cb3b1357beea4
+AUX g15daemon-1.9.5.3-g510-keys.patch 13908 BLAKE2B 4fd1141b6e739f1b07356e9a06489251eb7d247e0e5f9ba0f454389e05513681260370330a28ea2ac5be7f064c006020afee8bc8676cd9a702a3058e6eb7e761 SHA512 06a170a8c405fd84aba39b2b511c257a1152d0d4e1c17e220a01ef3ad1962e44870cd2ca355b07f9b54a028775ddcb3c93eeec1f6cdf9f65068d5d7755169677
+AUX g15daemon-1.9.5.3-overflow-fix.patch 543 BLAKE2B fafc620e8f8338208a8fbb093308d1bd36e09d1fc136442eaac05b467871aac7fbac1daba8a354ee0798cef48bf316e5b32a8001a48d65a1f7daee091c970499 SHA512 6aa9c56ebfb6735ceeee982c4d9ee71a3e5cfb3b35d5806203cfeec2630f4dd3f349aeec644540bf665dd163f39be75a545644b69c7373f9a805a0e30bc8ebf2
 AUX g15daemon-1.9.5.3.initd 955 BLAKE2B fe4c71358d206768dde9d0361ab926f8e36d2fce1d46a15992ec4880c0df37ec2ae26808902d7593c5c1783f679c1c12d163d8a6f409f2d6931f432b08f8a7c4 SHA512 a2e21fe65f730e0a3f0062da07a9896884329e3d3b2cb89ce41b96f33851868c0c27281fc87a13eb7bb7ba934175df19dddfd78b695339b4a89512c42951fd1a
 AUX g15daemon-hotplug 224 BLAKE2B 6348dfec6c942d28c2db287b82765f194ffd7d1e9c58faaf03670ff6222f0a32fb70428873452d8229a967849f49b3042ef20352d677b0e5d4dc05b7f769caee SHA512 6384aa8267a665b0b26f45f7339856647374ad5b1860f299b2e19afb0209b8637919f00b3638affbe4fb86adaf115eb93e814b70c17d52f1c878d840e1e464e8
 AUX g15daemon.conf 516 BLAKE2B 9a003040306ddfeccccb5b12730c6c1c478ab39cf44abbacfaed37b7154f2485cbc0979f900523457e14a5ca14041b41bf2da0c3b4d7519f2e798b0cb291f4c4 SHA512 e575fd8a91c87f226481ae406a1b66de6d8eb66f061b0ce7f2b89ce63f7bda88470eac50adcc9de97ef866970ee835af8a1bb0402a2e4b4d214251d0b8ebe25c
+AUX g15daemon.service 209 BLAKE2B 0b909fd73dc8d0961f35257d430e4c8b321bf12671a77838eb1bbc0044ed6d98a5d90421367a77c0117dee66cbb7a6f54a71ce066905ec550ebfbd0709dbf2e5 SHA512 3b4d7e22665e360271807e2de356af79038a6474aeb8c862665714b717f62d105ce57f5acd8078520ab92b9b7963a956617998074b8752ce99ce97ce860b4c25
 DIST g15daemon-1.9.5.3.tar.gz 414603 BLAKE2B 4f683bab47f6cbde3a028b306c1999ea4fcb84c0c05160a17374be93f953d21588f332e8fbf040c607545c31ee09e30b56b1068db95a801472c9d72ee9fe8e43 SHA512 7a1770d08d1d4155866bba3b676d33bf943363f4519af41a13ab6ec73cc5d6c536b173977b3e3583b594b149b7f01ffbc51123a4678c2a249a51ff0b42c8b69a
-EBUILD g15daemon-1.9.5.3-r13.ebuild 3844 BLAKE2B c729568b5b17b7f0e1fab0baa447c08754522cc64d6ae4ea44069af01c77b8df1c5b3aa2766c5595403bbe0825ef107513dbb7a3e3ad2cb93afc4eb2b9b21f76 SHA512 f04650f6cedf3924460827ac4ddfa43e6ec65dd810e11cf6d345f3dd7c81b1069cc5812ba25d52d979ba0b54d69b435c2cb0fd1f82301ca69db6b4a5ad69c54e
-EBUILD g15daemon-1.9.5.3-r21.ebuild 3861 BLAKE2B 07d5c7ba8973c98b821023110f4e9fbcf4992a35ed0cbeef3d404e867782faaa51cace995db969d74da64f5b81cfedef04ee4825fdfa0198f00bd5f07ea5475d SHA512 0756e936b6938f1c9ae69201005a8b1602d03bd5e09ea042925d043f112a576133c62d5b6f6f32e5beb749faf04f366c9832c2f774b0084d6fd35cafe38518ca
-EBUILD g15daemon-9999.ebuild 4201 BLAKE2B d93f82ca46892521cd0e609ba1cf5f23ca1de0fcd563a1aaf94248b87f535cf53aeebca5a98c20768571bd8abaa0a481124fc1b0e34c2036e0e94f0de39c5c2a SHA512 053af76acaf9c8dc01aa8194ccc262a84bcf938ffc6cbcd32dd1bcc93f03548c5032729ea0aabd2521ea2d73d32fcc65c53be17412058ff97604f920ba1d9d33
+EBUILD g15daemon-1.9.5.3-r14.ebuild 3618 BLAKE2B feb5d82e02c8a323b8b181026a3901900f7deb293f0a5ea5ae2fd8e646734d4a7831f63caed326a095b9cdc328229bb361b94d7757d3cb4f387f019e36a34aed SHA512 3af32ddd33081a202cf0c204d8463f6bbf7665a5ac56a5cb14ddb059b0a19ef9ee9abcc7df9d0a0dcf33f216a1226cf13bf39b1ccac8cc8d224bbd9c2389d233
+EBUILD g15daemon-1.9.5.3-r15.ebuild 3670 BLAKE2B 7fcc72a0ca0ded18c2900ab5c1875adcad9834b9dac8182842337e6ec77fe4686d7060eb1a275cdf317a7b11bd3b99fb40c05e62568de5412d3446527c347b99 SHA512 0da399aa499738c1cb4f7b613df740e55831b939985d79e975e97af25ef78568d2b213129dce897bc7c92e2f79bbcce846079214275975c3d2ff8e34449b28dc
+EBUILD g15daemon-1.9.5.3-r21.ebuild 3686 BLAKE2B 3f01e34e4faa0543ec3dcb27b0e34d1372dcc38359289216f83854704c9a1ff1da2fb86b8b32fe98fc14a7c98e564edc562e6eafa0059fc2df98e6087caa3ecf SHA512 adac636f001da27d189c1f5b9ceeaed78b1fa956567cf802da13af93f99ec16812dd7aea5e6d44ffccf38cc33c5aae0306c78d86d574a676361c3d58c78bdd99
+EBUILD g15daemon-9999.ebuild 3920 BLAKE2B 2d9bb2d713a950b8955739a83701b91bd06b69ea3242a3444b03e022c2a2e5b2b365eded1bfea9737bfaf905f386b496c9357316a95ec917b8fbe388cb602938 SHA512 09012652885ced1ccccb3e44d18ee14fca634bddc88e537a2eaeed5b444cdaa4945b3ec0fa8c7b9a078c0a116e5c465c84ceeee557aa046f2eebe450bb88b8b2
 MISC metadata.xml 409 BLAKE2B 89362ec09a6bc416fe1919f4e48d774f1cf751f147673ae89088b70bf7db7367ab8c7ece5e7276f5d9f2207cb5b3c15316dcdbf7dd65ce76a991b465c74e9b80 SHA512 f37883d9542d61a9abcc2596e88d80aa41aac439b1366239c7fa234c00776ce837cf19c8b2d153333c22e050380d7add26b7531423ef02e655157d39a72b121e
diff --git a/app-misc/g15daemon/files/g15daemon-1.2.7.confd b/app-misc/g15daemon/files/g15daemon-1.2.7.confd
index 08ea97f49763..5ce5392b93b1 100644
--- a/app-misc/g15daemon/files/g15daemon-1.2.7.confd
+++ b/app-misc/g15daemon/files/g15daemon-1.2.7.confd
@@ -2,7 +2,7 @@
 
 # Key to switch the client-screens. Default is the MR key,
 # Set to "yes" to use L1 key instead (black round key below the LCD, above the multimedia keys).
-CLIENT_SWITCH_L1="no"
+CLIENT_SWITCH_L1="yes"
 
 # Set to "yes" to switch off the lcd backlight when stopping g15daemon.
 BACKLIGHT_OFF="no"
diff --git a/app-misc/g15daemon/files/g15daemon-1.9.5.3-avoid_bashisms.patch b/app-misc/g15daemon/files/g15daemon-1.9.5.3-avoid_bashisms.patch
new file mode 100644
index 000000000000..194d68eefeea
--- /dev/null
+++ b/app-misc/g15daemon/files/g15daemon-1.9.5.3-avoid_bashisms.patch
@@ -0,0 +1,20 @@
+--- g15daemon-1.9.5.3/configure.in
++++ g15daemon-1.9.5.3/configure.in
+@@ -53,7 +53,7 @@
+ AC_ARG_ENABLE([--disable-uinput],[  --disable-uinput	do not build linux uinput plugin (default: autodetect)])
+ 
+ if test "x$enable_uinput" != "xno"; then
+-  if test "x$have_linux_uinput_h" == "xyes"; then
++  if test "x$have_linux_uinput_h" = "xyes"; then
+     #if HAVE_LINUX_UINPUT_H 
+ 	dnl check for uinput.h version 2.4 or 2.6 ?
+ 	AC_CHECK_MEMBER([struct uinput_user_dev.id],
+@@ -110,7 +110,7 @@
+ AM_CONDITIONAL(UINPUT_INTERFACE_PLUGIN, [test x$uinput = xtrue])
+ 
+ dnl Some versions of libusb do not honour timeout and block. Suns' version is one of them.
+-if test "x$libusb_blocks" == "xtrue"; then 
++if test "x$libusb_blocks" = "xtrue"; then 
+       AC_DEFINE([LIBUSB_BLOCKS], [1],[Define if libusb implementation blocks on read or write])
+ fi
+ 
diff --git a/app-misc/g15daemon/files/g15daemon-1.9.5.3-docdir.patch b/app-misc/g15daemon/files/g15daemon-1.9.5.3-docdir.patch
new file mode 100644
index 000000000000..9c76e4cbc6aa
--- /dev/null
+++ b/app-misc/g15daemon/files/g15daemon-1.9.5.3-docdir.patch
@@ -0,0 +1,11 @@
+--- g15daemon-1.9.5.3/Makefile.am
++++ g15daemon-1.9.5.3/Makefile.am
+@@ -5,7 +5,7 @@
+ 
+ EXTRA_DIST = debian contrib Documentation lang-bindings patches rpm README.usage FAQ LICENSE images README.Linux README.FreeBSD README.Solaris
+ 
+-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
++docdir = @docdir@
+ doc_DATA = FAQ README.usage README ChangeLog TODO AUTHORS NEWS LICENSE README.Linux README.FreeBSD README.Solaris
+ 
+ man1_MANS = $(top_srcdir)/Documentation/g15daemon.1
diff --git a/app-misc/g15daemon/files/g15daemon-1.9.5.3-forgotten-open-mode.patch b/app-misc/g15daemon/files/g15daemon-1.9.5.3-forgotten-open-mode.patch
index b475f1d58d69..d4a5381992e1 100644
--- a/app-misc/g15daemon/files/g15daemon-1.9.5.3-forgotten-open-mode.patch
+++ b/app-misc/g15daemon/files/g15daemon-1.9.5.3-forgotten-open-mode.patch
@@ -1,5 +1,5 @@
---- ./g15daemon-1.9.5.3/g15daemon/utility_funcs.c	2008-01-26 06:02:07.000000000 +0100
-+++ ./g15daemon-1.9.5.3/g15daemon/utility_funcs.c	2009-02-01 17:00:55.203009264 +0100
+--- g15daemon-1.9.5.3/g15daemon/utility_funcs.c
++++ g15daemon-1.9.5.3/g15daemon/utility_funcs.c
 @@ -356,7 +356,7 @@
      config_items_t * item=NULL;
      char line[1024];
diff --git a/app-misc/g15daemon/files/g15daemon-1.9.5.3-g510-keys.patch b/app-misc/g15daemon/files/g15daemon-1.9.5.3-g510-keys.patch
index e00836766795..a53001f1932d 100644
--- a/app-misc/g15daemon/files/g15daemon-1.9.5.3-g510-keys.patch
+++ b/app-misc/g15daemon/files/g15daemon-1.9.5.3-g510-keys.patch
@@ -1,8 +1,7 @@
 From https://sourceforge.net/tracker/?func=detail&aid=3152167&group_id=167869&atid=844658
 
-diff -aNru trunk/g15daemon-wip/plugins/g15_plugin_uinput.c mod/g15daemon-wip/plugins/g15_plugin_uinput.c
---- trunk/g15daemon-wip/plugins/g15_plugin_uinput.c	2011-06-26 06:50:50.000000000 +0000
-+++ mod/g15daemon-wip/plugins/g15_plugin_uinput.c	2011-06-26 06:51:42.000000000 +0000
+--- g15daemon-wip/plugins/g15_plugin_uinput.c
++++ g15daemon-wip/plugins/g15_plugin_uinput.c
 @@ -164,146 +164,195 @@
      
  static void g15_process_keys(g15daemon_t *masterlist, unsigned int currentkeys, unsigned int lastkeys)
diff --git a/app-misc/g15daemon/files/g15daemon-1.9.5.3-overflow-fix.patch b/app-misc/g15daemon/files/g15daemon-1.9.5.3-overflow-fix.patch
index 71cbf914d839..07bb68601d76 100644
--- a/app-misc/g15daemon/files/g15daemon-1.9.5.3-overflow-fix.patch
+++ b/app-misc/g15daemon/files/g15daemon-1.9.5.3-overflow-fix.patch
@@ -1,5 +1,5 @@
---- ./g15daemon-1.9.5.3/libg15daemon_client/g15daemon_net.c	2008-01-25 05:45:05.000000000 +0100
-+++ ./g15daemon-1.9.5.3/libg15daemon_client/g15daemon_net.c	2011-02-14 22:51:55.203009264 +0100
+--- g15daemon-1.9.5.3/libg15daemon_client/g15daemon_net.c
++++ g15daemon-1.9.5.3/libg15daemon_client/g15daemon_net.c
 @@ -217,7 +217,7 @@
      if(poll(pfd,1,100)>0){
         if(pfd[0].revents & POLLPRI && !(pfd[0].revents & POLLERR || pfd[0].revents & POLLHUP || pfd[0].revents & POLLNVAL)) { 
diff --git a/app-misc/g15daemon/files/g15daemon.service b/app-misc/g15daemon/files/g15daemon.service
new file mode 100644
index 000000000000..668b8ba13a86
--- /dev/null
+++ b/app-misc/g15daemon/files/g15daemon.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Logitech G15 extra-key and LCD manager
+
+[Service]
+Type=forking
+PIDFile=/run/g15daemon.pid
+ExecStart=/usr/sbin/g15daemon
+ExecStop=/usr/sbin/g15daemon -k
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r14.ebuild
index 9dd8a9dafdb0..407950bcbb25 100644
--- a/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild
+++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r14.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
 GENTOO_DEPEND_ON_PERL="no"
 
-inherit eutils linux-info perl-module python-r1 base
+inherit autotools flag-o-matic linux-info perl-module toolchain-funcs udev
 
 DESCRIPTION="Takes control of the G15 keyboard, through the linux kernel uinput device driver"
 HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
@@ -15,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="perl python static-libs"
+IUSE="perl static-libs"
 
 DEPEND="virtual/libusb:0
 	>=dev-libs/libg15-1.2.4
@@ -24,22 +23,23 @@ DEPEND="virtual/libusb:0
 		dev-lang/perl
 		dev-perl/GDGraph
 		>=dev-perl/Inline-0.4
-	)
-	python? ( ${PYTHON_DEPS} )"
+	)"
 RDEPEND="${DEPEND}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 PATCHES=(
 	"${FILESDIR}/${P}-forgotten-open-mode.patch"
 	"${FILESDIR}/${P}-overflow-fix.patch"
+	"${FILESDIR}/${P}-docdir.patch"
+	"${FILESDIR}/${P}-avoid_bashisms.patch"
 )
+
 uinput_check() {
 	ebegin "Checking for uinput support"
 	local rc=1
 	linux_config_exists && linux_chkconfig_present INPUT_UINPUT
 	rc=$?
 
-	if [[ $rc -ne 0 ]] ; then
+	if [[ ${rc} -ne 0 ]] ; then
 		eerror "To use g15daemon, you need to compile your kernel with uinput support."
 		eerror "Please enable uinput support in your kernel config, found at:"
 		eerror
@@ -51,39 +51,40 @@ uinput_check() {
 }
 
 pkg_setup() {
+	export CC="$(tc-getCC)" #729294
+
 	linux-info_pkg_setup
 	uinput_check
 }
 
 src_unpack() {
 	unpack ${A}
-	if use perl; then
+	if use perl ; then
 		unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
 	fi
-	if use python; then
-		unpack "./${P}/lang-bindings/pyg15daemon-0.0.tar.bz2"
-	fi
 }
 
 src_prepare() {
-	if use perl; then
+	if use perl ; then
 		perl-module_src_prepare
 		sed -i \
 			-e '1i#!/usr/bin/perl' \
-			"${S}"/contrib/testbindings.pl
+			"${S}"/contrib/testbindings.pl || die
 	else
 		# perl-module_src_prepare always calls base_src_prepare
-		base_src_prepare
+		default
 	fi
+	mv configure.{in,ac} || die
+	eautoreconf
 }
 
 src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable static-libs static)
+	append-cflags -fcommon #706712
+
+	econf $(use_enable static-libs static)
 
-	if use perl; then
-		cd "${WORKDIR}/G15Daemon-0.2"
+	if use perl ; then
+		cd "${WORKDIR}/G15Daemon-0.2" || die
 		perl-module_src_configure
 	fi
 }
@@ -91,8 +92,8 @@ src_configure() {
 src_compile() {
 	default
 
-	if use perl; then
-		cd "${WORKDIR}/G15Daemon-0.2"
+	if use perl ; then
+		cd "${WORKDIR}/G15Daemon-0.2" || die
 		perl-module_src_compile
 	fi
 }
@@ -100,23 +101,22 @@ src_compile() {
 src_install() {
 	default
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	find "${ED}" -type f -name '*.la' -delete || die
 
 	# remove odd docs installed my make
-	rm "${ED}/usr/share/doc/${PF}/"{LICENSE,README.usage}
+	rm "${ED}"/usr/share/doc/${PF}/README.usage || die
 
 	insinto /usr/share/${PN}/contrib
 	doins contrib/xmodmaprc
 	doins contrib/xmodmap.sh
-	if use perl; then
+	if use perl ; then
 		doins contrib/testbindings.pl
 	fi
 
 	newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN}
 	newinitd "${FILESDIR}/${PN}-1.9.5.3.initd" ${PN}
 	dobin "${FILESDIR}/g15daemon-hotplug"
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}/99-g15daemon.rules"
+	udev_dorules "${FILESDIR}/99-g15daemon.rules"
 
 	insinto /etc
 	doins "${FILESDIR}"/g15daemon.conf
@@ -125,22 +125,12 @@ src_install() {
 	exeinto /usr/lib/pm-utils/sleep.d
 	doexe "${FILESDIR}"/20g15daemon
 
-	if use perl; then
+	if use perl ; then
 		ebegin "Installing Perl Bindings (G15Daemon.pm)"
-		cd "${WORKDIR}/G15Daemon-0.2"
+		cd "${WORKDIR}/G15Daemon-0.2" || die
 		docinto perl
 		perl-module_src_install
 	fi
-
-	if use python; then
-		ebegin "Installing Python Bindings (g15daemon.py)"
-		cd "${WORKDIR}/pyg15daemon"
-
-		python_foreach_impl python_domodule g15daemon.py
-
-		docinto python
-		dodoc AUTHORS
-	fi
 }
 
 pkg_postinst() {
diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild
new file mode 100644
index 000000000000..2042898ab06a
--- /dev/null
+++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit autotools flag-o-matic linux-info perl-module systemd toolchain-funcs udev
+
+DESCRIPTION="Takes control of the G15 keyboard, through the linux kernel uinput device driver"
+HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="perl static-libs"
+
+DEPEND="virtual/libusb:0
+	>=dev-libs/libg15-1.2.4
+	>=dev-libs/libg15render-1.2
+	perl? (
+		dev-lang/perl
+		dev-perl/GDGraph
+		>=dev-perl/Inline-0.4
+	)"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-forgotten-open-mode.patch"
+	"${FILESDIR}/${P}-overflow-fix.patch"
+	"${FILESDIR}/${P}-docdir.patch"
+	"${FILESDIR}/${P}-avoid_bashisms.patch"
+)
+
+uinput_check() {
+	ebegin "Checking for uinput support"
+	local rc=1
+	linux_config_exists && linux_chkconfig_present INPUT_UINPUT
+	rc=$?
+
+	if [[ ${rc} -ne 0 ]] ; then
+		eerror "To use g15daemon, you need to compile your kernel with uinput support."
+		eerror "Please enable uinput support in your kernel config, found at:"
+		eerror
+		eerror "Device Drivers -> Input Device ... -> Miscellaneous devices -> User level driver support."
+		eerror
+		eerror "Once enabled, you should have the /dev/input/uinput device."
+		eerror "g15daemon will not work without the uinput device."
+	fi
+}
+
+pkg_setup() {
+	export CC="$(tc-getCC)" #729294
+
+	linux-info_pkg_setup
+	uinput_check
+}
+
+src_unpack() {
+	unpack ${A}
+	if use perl ; then
+		unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
+	fi
+}
+
+src_prepare() {
+	if use perl ; then
+		perl-module_src_prepare
+		sed -i \
+			-e '1i#!/usr/bin/perl' \
+			"${S}"/contrib/testbindings.pl || die
+	else
+		# perl-module_src_prepare always calls base_src_prepare
+		default
+	fi
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	append-cflags -fcommon #706712
+
+	econf $(use_enable static-libs static)
+
+	if use perl ; then
+		cd "${WORKDIR}/G15Daemon-0.2" || die
+		perl-module_src_configure
+	fi
+}
+
+src_compile() {
+	default
+
+	if use perl ; then
+		cd "${WORKDIR}/G15Daemon-0.2" || die
+		perl-module_src_compile
+	fi
+}
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	# remove odd docs installed my make
+	rm "${ED}"/usr/share/doc/${PF}/README.usage || die
+
+	insinto /usr/share/${PN}/contrib
+	doins contrib/xmodmaprc
+	doins contrib/xmodmap.sh
+	if use perl ; then
+		doins contrib/testbindings.pl
+	fi
+
+	newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}-1.9.5.3.initd" ${PN}
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	dobin "${FILESDIR}/g15daemon-hotplug"
+	udev_dorules "${FILESDIR}/99-g15daemon.rules"
+
+	insinto /etc
+	doins "${FILESDIR}"/g15daemon.conf
+
+	# Gentoo bug #301340, debian bug #611649
+	exeinto /usr/lib/pm-utils/sleep.d
+	doexe "${FILESDIR}"/20g15daemon
+
+	if use perl ; then
+		ebegin "Installing Perl Bindings (G15Daemon.pm)"
+		cd "${WORKDIR}/G15Daemon-0.2" || die
+		docinto perl
+		perl-module_src_install
+	fi
+}
+
+pkg_postinst() {
+	elog "To use g15daemon, you need to add g15daemon to the default runlevel."
+	elog "This can be done with:"
+	elog "# /sbin/rc-update add g15daemon default"
+	elog "You can edit some g15daemon options at /etc/conf.d/g15daemon"
+	elog ""
+	elog "To have all new keys working in X11, you'll need create a "
+	elog "specific xmodmap in your home directory or edit the existent one."
+	elog ""
+	elog "Create the xmodmap:"
+	elog "cp /usr/share/g15daemon/contrib/xmodmaprc ~/.Xmodmap"
+	elog ""
+	elog "Adding keycodes to an existing xmodmap:"
+	elog "cat /usr/share/g15daemon/contrib/xmodmaprc >> ~/.Xmodmap"
+}
diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild
index 0d6bc4d90920..5e6b82ace427 100644
--- a/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild
+++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
 GENTOO_DEPEND_ON_PERL="no"
 
-inherit eutils linux-info perl-module python-r1 base
+inherit autotools flag-o-matic linux-info perl-module systemd toolchain-funcs udev
 
 DESCRIPTION="Takes control of the G15 keyboard, through the linux kernel uinput device driver"
 HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
@@ -15,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="perl python static-libs"
+IUSE="perl static-libs"
 
 DEPEND="virtual/libusb:0
 	>=dev-libs/libg15-9999
@@ -24,15 +23,15 @@ DEPEND="virtual/libusb:0
 		dev-lang/perl
 		dev-perl/GDGraph
 		>=dev-perl/Inline-0.4
-	)
-	python? ( ${PYTHON_DEPS} )"
+	)"
 RDEPEND="${DEPEND}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 PATCHES=(
 	"${FILESDIR}/${P}-forgotten-open-mode.patch"
 	"${FILESDIR}/${P}-overflow-fix.patch"
 	"${FILESDIR}/${P}-g510-keys.patch"
+	"${FILESDIR}/${P}-docdir.patch"
+	"${FILESDIR}/${P}-avoid_bashisms.patch"
 )
 
 uinput_check() {
@@ -41,7 +40,7 @@ uinput_check() {
 	linux_config_exists && linux_chkconfig_present INPUT_UINPUT
 	rc=$?
 
-	if [[ $rc -ne 0 ]] ; then
+	if [[ ${rc} -ne 0 ]] ; then
 		eerror "To use g15daemon, you need to compile your kernel with uinput support."
 		eerror "Please enable uinput support in your kernel config, found at:"
 		eerror
@@ -53,39 +52,40 @@ uinput_check() {
 }
 
 pkg_setup() {
+	export CC="$(tc-getCC)" #729294
+
 	linux-info_pkg_setup
 	uinput_check
 }
 
 src_unpack() {
 	unpack ${A}
-	if use perl; then
+	if use perl ; then
 		unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
 	fi
-	if use python; then
-		unpack "./${P}/lang-bindings/pyg15daemon-0.0.tar.bz2"
-	fi
 }
 
 src_prepare() {
-	if use perl; then
+	if use perl ; then
 		perl-module_src_prepare
 		sed -i \
 			-e '1i#!/usr/bin/perl' \
-			"${S}"/contrib/testbindings.pl
+			"${S}"/contrib/testbindings.pl || die
 	else
 		# perl-module_src_prepare always calls base_src_prepare
-		base_src_prepare
+		default
 	fi
+	mv configure.{in,ac} || die
+	eautoreconf
 }
 
 src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable static-libs static)
+	append-cflags -fcommon #706712
 
-	if use perl; then
-		cd "${WORKDIR}/G15Daemon-0.2"
+	econf $(use_enable static-libs static)
+
+	if use perl ; then
+		cd "${WORKDIR}/G15Daemon-0.2" || die
 		perl-module_src_configure
 	fi
 }
@@ -93,8 +93,8 @@ src_configure() {
 src_compile() {
 	default
 
-	if use perl; then
-		cd "${WORKDIR}/G15Daemon-0.2"
+	if use perl ; then
+		cd "${WORKDIR}/G15Daemon-0.2" || die
 		perl-module_src_compile
 	fi
 }
@@ -102,23 +102,23 @@ src_compile() {
 src_install() {
 	default
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	find "${ED}" -type f -name '*.la' -delete || die
 
 	# remove odd docs installed my make
-	rm "${ED}/usr/share/doc/${PF}/"{LICENSE,README.usage}
+	rm "${ED}"/usr/share/doc/${PF}/README.usage || die
 
 	insinto /usr/share/${PN}/contrib
 	doins contrib/xmodmaprc
 	doins contrib/xmodmap.sh
-	if use perl; then
+	if use perl ; then
 		doins contrib/testbindings.pl
 	fi
 
 	newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN}
 	newinitd "${FILESDIR}/${PN}-1.9.5.3.initd" ${PN}
+	systemd_dounit "${FILESDIR}/${PN}.service"
 	dobin "${FILESDIR}/g15daemon-hotplug"
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}/99-g15daemon.rules"
+	udev_dorules "${FILESDIR}/99-g15daemon.rules"
 
 	insinto /etc
 	doins "${FILESDIR}"/g15daemon.conf
@@ -127,22 +127,12 @@ src_install() {
 	exeinto /usr/lib/pm-utils/sleep.d
 	doexe "${FILESDIR}"/20g15daemon
 
-	if use perl; then
+	if use perl ; then
 		ebegin "Installing Perl Bindings (G15Daemon.pm)"
-		cd "${WORKDIR}/G15Daemon-0.2"
+		cd "${WORKDIR}/G15Daemon-0.2" || die
 		docinto perl
 		perl-module_src_install
 	fi
-
-	if use python; then
-		ebegin "Installing Python Bindings (g15daemon.py)"
-		cd "${WORKDIR}/pyg15daemon"
-
-		python_foreach_impl python_domodule g15daemon.py
-
-		docinto python
-		dodoc AUTHORS
-	fi
 }
 
 pkg_postinst() {
diff --git a/app-misc/g15daemon/g15daemon-9999.ebuild b/app-misc/g15daemon/g15daemon-9999.ebuild
index 5e6baded32a9..71c34ecf83b2 100644
--- a/app-misc/g15daemon/g15daemon-9999.ebuild
+++ b/app-misc/g15daemon/g15daemon-9999.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
 GENTOO_DEPEND_ON_PERL="no"
 ESVN_PROJECT=${PN}/trunk
 ESVN_REPO_URI="https://svn.code.sf.net/p/${PN}/code/trunk/${PN}-wip"
 
-inherit eutils linux-info perl-module python-r1 base subversion autotools
+inherit autotools flag-o-matic linux-info perl-module subversion systemd toolchain-funcs udev
 
 DESCRIPTION="Takes control of the G15 keyboard, through the linux kernel uinput device driver"
 HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
@@ -17,7 +16,7 @@ HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="perl python static-libs"
+IUSE="perl static-libs"
 
 DEPEND="virtual/libusb:0
 	>=dev-libs/libg15-9999
@@ -26,16 +25,14 @@ DEPEND="virtual/libusb:0
 		dev-lang/perl
 		dev-perl/GDGraph
 		>=dev-perl/Inline-0.4
-	)
-	python? ( ${PYTHON_DEPS} )"
+	)"
 RDEPEND="${DEPEND}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.9.5.3-g510-keys.patch"
+	"${FILESDIR}/${PN}-1.9.5.3-docdir.patch"
+	"${FILESDIR}/${PN}-1.9.5.3-avoid_bashisms.patch"
 )
-# "${FILESDIR}/${PN}-1.9.5.3-forgotten-open-mode.patch"
-# "${FILESDIR}/${PN}-1.9.5.3-overflow-fix.patch"
 
 uinput_check() {
 	ebegin "Checking for uinput support"
@@ -43,7 +40,7 @@ uinput_check() {
 	linux_config_exists && linux_chkconfig_present INPUT_UINPUT
 	rc=$?
 
-	if [[ $rc -ne 0 ]] ; then
+	if [[ ${rc} -ne 0 ]] ; then
 		eerror "To use g15daemon, you need to compile your kernel with uinput support."
 		eerror "Please enable uinput support in your kernel config, found at:"
 		eerror
@@ -55,49 +52,49 @@ uinput_check() {
 }
 
 pkg_setup() {
+	export CC="$(tc-getCC)" #729294
+
 	linux-info_pkg_setup
 	uinput_check
 }
 
 src_unpack() {
-	if [[ ${PV} = *9999* ]]; then
+	if [[ ${PV} = *9999* ]] ; then
 		subversion_src_unpack
 	else
 		unpack ${A}
 	fi
-	if use perl; then
+	if use perl ; then
 		unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
 	fi
-	if use python; then
-		unpack "./${P}/lang-bindings/pyg15daemon-0.0.tar.bz2"
-	fi
 }
 
 src_prepare() {
-	if [[ ${PV} = *9999* ]]; then
+	if [[ ${PV} = *9999* ]] ; then
 		subversion_wc_info
 	fi
-	if use perl; then
+	if use perl ; then
 		perl-module_src_prepare
 		sed -i \
 			-e '1i#!/usr/bin/perl' \
-			"${S}"/contrib/testbindings.pl
+			"${S}"/contrib/testbindings.pl || die
 	else
 		# perl-module_src_prepare always calls base_src_prepare
-		base_src_prepare
+		default
 	fi
-	if [[ ${PV} = *9999* ]]; then
+	if [[ ${PV} = *9999* ]] ; then
+		mv configure.{in,ac} || die
 		eautoreconf
 	fi
 }
 
 src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable static-libs static)
+	append-cflags -fcommon #706712
 
-	if use perl; then
-		cd "${WORKDIR}/G15Daemon-0.2"
+	econf $(use_enable static-libs static)
+
+	if use perl ; then
+		cd "${WORKDIR}/G15Daemon-0.2" || die
 		perl-module_src_configure
 	fi
 }
@@ -105,8 +102,8 @@ src_configure() {
 src_compile() {
 	default
 
-	if use perl; then
-		cd "${WORKDIR}/G15Daemon-0.2"
+	if use perl ; then
+		cd "${WORKDIR}/G15Daemon-0.2" || die
 		perl-module_src_compile
 	fi
 }
@@ -114,23 +111,23 @@ src_compile() {
 src_install() {
 	default
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	find "${ED}" -type f -name '*.la' -delete || die
 
 	# remove odd docs installed my make
-	rm "${ED}/usr/share/doc/${PF}/"{LICENSE,README.usage}
+	rm "${ED}"/usr/share/doc/${PF}/README.usage || die
 
 	insinto /usr/share/${PN}/contrib
 	doins contrib/xmodmaprc
 	doins contrib/xmodmap.sh
-	if use perl; then
+	if use perl ; then
 		doins contrib/testbindings.pl
 	fi
 
 	newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN}
 	newinitd "${FILESDIR}/${PN}-1.9.5.3.initd" ${PN}
+	systemd_dounit "${FILESDIR}/${PN}.service"
 	dobin "${FILESDIR}/g15daemon-hotplug"
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}/99-g15daemon.rules"
+	udev_dorules "${FILESDIR}/99-g15daemon.rules"
 
 	insinto /etc
 	doins "${FILESDIR}"/g15daemon.conf
@@ -139,22 +136,12 @@ src_install() {
 	exeinto /usr/lib/pm-utils/sleep.d
 	doexe "${FILESDIR}"/20g15daemon
 
-	if use perl; then
+	if use perl ; then
 		ebegin "Installing Perl Bindings (G15Daemon.pm)"
-		cd "${WORKDIR}/G15Daemon-0.2"
+		cd "${WORKDIR}/G15Daemon-0.2" || die
 		docinto perl
 		perl-module_src_install
 	fi
-
-	if use python; then
-		ebegin "Installing Python Bindings (g15daemon.py)"
-		cd "${WORKDIR}/pyg15daemon"
-
-		python_foreach_impl python_domodule g15daemon.py
-
-		docinto python
-		dodoc AUTHORS
-	fi
 }
 
 pkg_postinst() {
diff --git a/app-misc/g15macro/Manifest b/app-misc/g15macro/Manifest
index 2da7333e12ec..37ec8f8ec983 100644
--- a/app-misc/g15macro/Manifest
+++ b/app-misc/g15macro/Manifest
@@ -1,5 +1,5 @@
 AUX g15macro-1.0.3-Makefile.am.patch 345 BLAKE2B d00da6975fd9a25a3ff6fd8272466e0472e9d1f97cf9a4e0c9af2455ed3ce382827a4ddfa7325f04a9351915a08d5b04b1afc98b03de834670ceb003160fe5a5 SHA512 234b05866e993ce4bf486f8e9b57166c481fdb2487a1a026664b9675a79061cf18c6fd2a0b9e68580823fff4c393b1cfb0048ff24a1ced779790f270918aa00c
 AUX g15macro-1.0.3-configure.in.patch 280 BLAKE2B 3b8f6aa6b5562e19c419e722abaad6f831ef410e1a678784f48bc79a73258d06a780fb8984b66421ef5d1ff9685968aeaabeab31c22edc6f571fc6712915996b SHA512 a754e925f6ab35615a768f2869fac784e987785bc42f3be7b7bb32999dbdc1a332118db644867e39e426fcfd6f143e277187b415c8f43dd6861f54c41ce3625e
 DIST g15macro-1.0.3.tar.gz 324859 BLAKE2B 66168090d6daa82c1a9ce3fb8b028316f12691b599fecc683d141a3584bcbf28e5169044d5baa0957c27e51d7634092bf65158da1106059ec87cdfa4f9fa7c36 SHA512 8497aea4a6c8df3b9015ce87c38c8ad20fc66c6b2b04368716a11130e09ef75e32ba9664b57fcda0f5d8a962653ba46e6f851e6e56110d89629765cf77fa751d
-EBUILD g15macro-1.0.3-r2.ebuild 781 BLAKE2B 0d475d9a4d347393929833e8dae183f81fd158846b4316400451bb82af5861d52bbd80b9efb0f2de5083f039a6969dd6247fb7de02702565c65dc08539b37221 SHA512 f5175f5dcc2ad71b03492690195a72d561784ec8e34ba6320cc6dbf84f4aa5bc2bf58947b529a3e96f649afca7d932a5efc2e48830270a102e0cdf04fffa4291
+EBUILD g15macro-1.0.3-r2.ebuild 778 BLAKE2B 2c503268d3e659f7a7168820d4280f32f5629180eae71df1f1e0f640504212d6da02cbb873b9734a550509fcd0aea49fe5bffd845190ab3086adc36f20dae7d3 SHA512 427a300807aae979dc9868f69bac452ee484c37a9ba41e3faa5f38541514bb489f6d4896e3717f0e23f672342b45afbb9fe2dbb4067048e257996d700b95b0a6
 MISC metadata.xml 409 BLAKE2B 89362ec09a6bc416fe1919f4e48d774f1cf751f147673ae89088b70bf7db7367ab8c7ece5e7276f5d9f2207cb5b3c15316dcdbf7dd65ce76a991b465c74e9b80 SHA512 f37883d9542d61a9abcc2596e88d80aa41aac439b1366239c7fa234c00776ce837cf19c8b2d153333c22e050380d7add26b7531423ef02e655157d39a72b121e
diff --git a/app-misc/g15macro/g15macro-1.0.3-r2.ebuild b/app-misc/g15macro/g15macro-1.0.3-r2.ebuild
index c86e4550bd28..4a2436d7c321 100644
--- a/app-misc/g15macro/g15macro-1.0.3-r2.ebuild
+++ b/app-misc/g15macro/g15macro-1.0.3-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils
+EAPI=7
+inherit autotools
 
 DESCRIPTION="Macro recording plugin to G15daemon"
 HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
@@ -23,10 +23,14 @@ RDEPEND="${DEPEND}
 	sys-libs/zlib
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-Makefile.am.patch
+	"${FILESDIR}"/${P}-configure.in.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-Makefile.am.patch
-	epatch "${FILESDIR}"/${P}-configure.in.patch
-	mv configure.in configure.ac || die
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
@@ -36,5 +40,5 @@ src_configure() {
 
 src_install() {
 	default
-	rm -rf "${ED}"/usr/share/doc/${P}
+	rm -rf "${ED}"/usr/share/doc/${P} || die
 }
diff --git a/app-misc/g15message/Manifest b/app-misc/g15message/Manifest
index fc9c0314d85b..90ffea057a5a 100644
--- a/app-misc/g15message/Manifest
+++ b/app-misc/g15message/Manifest
@@ -1,3 +1,4 @@
+AUX g15message-1.0.0-docdir.patch 293 BLAKE2B 266f67d2e21aca8a2ba19a0aee37c3eeb343e6e4ef704828cfb9f43d743def4a8ebf0988a10ab4c021bf6c01d9bb7d7d14a3110d7e68741d66a69bd380ac204d SHA512 888f1af6cad4b31c893fe6c613ad39448e6d01a70bae4f53b2b1288a6d77c0a478be2d83b5830404c97e2e29da11dceb0d9ecf154fc8c174a7d0f4957e55476c
 DIST g15message-1.0.0.tar.bz2 219798 BLAKE2B 47320e9f43547756e3f427d917b76f816e5422ad65151e5b9cac72813a6a5c7233273c089e9bc2693c243d98bc612c0a2a824d7e6c84b2565f99c01f3034f476 SHA512 608fb789e1390e6f8fabe4c1f21cabfb0c445660a2629616ddca253d232d9e58775c8aeb8c44dde0b014e6e26cbab70db991000f1bfcb4daed1727a06de7a78f
-EBUILD g15message-1.0.0-r1.ebuild 466 BLAKE2B 13817da368acf6e69b7e132cfab56e416e31158d8fc6cfb47cf757e3cfb01b676617bab4e1287977e72c9099e0f9fda1632e04d1bd32ffda9e5d81995838a62b SHA512 14f41b0e97883870c74890dc05734bcdea84a658fd02abf832516026e6271534ed27f858b8dcec1950db674259c9898534584df3de09b883756ee20fd3ebdbb4
+EBUILD g15message-1.0.0-r2.ebuild 597 BLAKE2B 03c5942e2e48db2cd45c5f9727ee13d70ff0e15ac53fead08d0cc3f47e9efc5c481e2ea0ffaea87ab84449532f7c88cb507798d88866fab4ce40b654c9a986c6 SHA512 da9271a866dbb3acefcb8ca62712573a296ed6a802ef07860c8a299808385ccdf3877237e468126af2d1d7e0341c8a8fe97ab083ab4c167fe0de5b1b0b2e53a1
 MISC metadata.xml 409 BLAKE2B 89362ec09a6bc416fe1919f4e48d774f1cf751f147673ae89088b70bf7db7367ab8c7ece5e7276f5d9f2207cb5b3c15316dcdbf7dd65ce76a991b465c74e9b80 SHA512 f37883d9542d61a9abcc2596e88d80aa41aac439b1366239c7fa234c00776ce837cf19c8b2d153333c22e050380d7add26b7531423ef02e655157d39a72b121e
diff --git a/app-misc/g15message/files/g15message-1.0.0-docdir.patch b/app-misc/g15message/files/g15message-1.0.0-docdir.patch
new file mode 100644
index 000000000000..e30f15fc74e4
--- /dev/null
+++ b/app-misc/g15message/files/g15message-1.0.0-docdir.patch
@@ -0,0 +1,11 @@
+--- g15message-1.0.0/Makefile.am
++++ g15message-1.0.0/Makefile.am
+@@ -3,7 +3,7 @@
+ METASOURCES = AUTO
+ bin_PROGRAMS = g15message
+ 
+-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
++docdir = @docdir@
+ doc_DATA = README ChangeLog AUTHORS NEWS COPYING
+ 
+ LIBS = -lg15daemon_client -lg15render
diff --git a/app-misc/g15message/g15message-1.0.0-r1.ebuild b/app-misc/g15message/g15message-1.0.0-r2.ebuild
index 833b89120139..67ce1006de3e 100644
--- a/app-misc/g15message/g15message-1.0.0-r1.ebuild
+++ b/app-misc/g15message/g15message-1.0.0-r2.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="A simple message/alert client for G15daemon"
 HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
@@ -18,3 +20,11 @@ RDEPEND=">=app-misc/g15daemon-1.9.0
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-docdir.patch" )
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
diff --git a/app-misc/g15mpd/Manifest b/app-misc/g15mpd/Manifest
index 3cb54f72c312..6084c4072f4e 100644
--- a/app-misc/g15mpd/Manifest
+++ b/app-misc/g15mpd/Manifest
@@ -1,5 +1,6 @@
 AUX g15mpd-1.0.0-cflags-and-lib-fix.patch 746 BLAKE2B 9fce8bbfc245b8fafc638f31feca90dfa1939f6722c0ad31a8aec175c7f4ed9f755ca325e9309175d790a77012c76bd6cec7df29b0b13345ea0143aaa406c928 SHA512 79b24ec54f55741f7fb5a5a22a547e515b909e69253418de434c032179ed2a2f4e9397eabcc13de460d8c9219b3aeeafce387ba84cff17a79778ee151465b7c2
+AUX g15mpd-1.0.0-docdir.patch 301 BLAKE2B 6d174cbb9707c46495d66ae1a9651b989051f37346d4164c22108087c3b4b654a7d9cc8ed618cf7965db71fe2d01218999ef2affe8265e5f6ca516af5c6b4b8b SHA512 638599adf9d17961250703e5eb0e192cdf6d15b08cbf729c64c4ad8aead98cc800db8b61a3c659cb38338331d18231092381cacdcb29d7be33f4b2dbe601c7fb
 AUX g15mpd-1.0.0-libmpd.patch 1460 BLAKE2B 360dd9412aecf2b805145263b9d021484eca3dfb966eec8b44857f263a5b5fbb31d17dfcec276d531c76ef4c1d1e4cdf32d598771b3c414df8bd2660bb6ea5b7 SHA512 240c82b84c4eba2095e6fcfd0e7da7fb54197afa600dcd0ce92b3eacc9f8907e69ac64e44dfa5314a29bc4db793f9e21f8efd44589c0a3c226426cd52445945e
 DIST g15mpd-1.0.0.tar.bz2 220482 BLAKE2B 82103773005566764bab5e8b583633a14b5103887ac7e4c3571cfc85064e483943189e6b4b76e8f3f3b7383d327b29a19b281f23364d3bcc18b10ef44de1e9b5 SHA512 509b634c8ba1f3b9efd0d7af47b553671efe3526c9acd44b292bf5883b1016cfbf18dec69c8bb5b3a35853e76b9b4fe7a51cd2a33acf4c755d2824dc793fa0ca
-EBUILD g15mpd-1.0.0-r1.ebuild 793 BLAKE2B 2c68b3700cfb372e3787a6d1ca9070907cf0ea1313a7e1413502e43959b011251f904657f7df861243c553db02d810db90a7bffbc54cdaee65208c64c27091e2 SHA512 69d7c474440a80f52fa92929671c80d51e4e35e21649c818ed1fd713da95ce1c3af8bfcca0f93eb2542302bf9ec5c46ed7ee42cf2e63816bc26fd4fc45d50b9c
+EBUILD g15mpd-1.0.0-r2.ebuild 834 BLAKE2B cfea98d8e5d68031159a685a18ba47848b9f5a72044f80326b5def307fcaa4a7dacf0979fd21c10b5425f07d8dfe27a366b0583e65939ad1ee187de85e9b01e6 SHA512 74617887c870236e3eba3380a0a0669492cb3f53f85f8e2365dac06fec9319accf844cd198a3c4d5e4524543fed7157b22c1b7e940cfabd45704718801b6216c
 MISC metadata.xml 246 BLAKE2B a95774ec5f588845ea4765db8b51d75fe0b71c04129ddfba9706afca19ebf4fcefa5bcee0c71b295d270de24e8942142d2af9449a46b7407cfc24a5797fb6885 SHA512 b9fd89855ed25a0b766566521a33295c6d3f4469ba31da9fed2d4f133d3c56b1a59e7c4cc66171ebf6c8a9137ccded19a942072f80dcded8b7efcf0912fdfce1
diff --git a/app-misc/g15mpd/files/g15mpd-1.0.0-docdir.patch b/app-misc/g15mpd/files/g15mpd-1.0.0-docdir.patch
new file mode 100644
index 000000000000..8ee294226797
--- /dev/null
+++ b/app-misc/g15mpd/files/g15mpd-1.0.0-docdir.patch
@@ -0,0 +1,11 @@
+--- g15mpd-1.0.0/Makefile.am
++++ g15mpd-1.0.0/Makefile.am
+@@ -3,7 +3,7 @@
+ METASOURCES = AUTO
+ bin_PROGRAMS = g15mpd
+ 
+-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
++docdir = @docdir@
+ doc_DATA = README ChangeLog AUTHORS NEWS COPYING
+ 
+ LIBS = -lg15daemon_client -lg15render -lX11 -lXtst -lmpd 
diff --git a/app-misc/g15mpd/g15mpd-1.0.0-r1.ebuild b/app-misc/g15mpd/g15mpd-1.0.0-r2.ebuild
index b7c7430f5385..e80010f84b49 100644
--- a/app-misc/g15mpd/g15mpd-1.0.0-r1.ebuild
+++ b/app-misc/g15mpd/g15mpd-1.0.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils
+EAPI=7
+inherit autotools
 
 DESCRIPTION="MPD (music player daemon) plugin to G15daemon"
 HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
@@ -25,13 +25,19 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
+PATCHES=(
+	"${FILESDIR}/${P}-libmpd.patch"
+	"${FILESDIR}/${P}-cflags-and-lib-fix.patch"
+	"${FILESDIR}/${P}-docdir.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-libmpd.patch
-	epatch "${FILESDIR}/${PN}-1.0.0-cflags-and-lib-fix.patch"
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	rm "${D}"/usr/share/doc/${P}/{COPYING,NEWS}
+	default
+	rm "${ED}"/usr/share/doc/${PF}/{COPYING,NEWS} || die
 }
diff --git a/app-misc/g15stats/Manifest b/app-misc/g15stats/Manifest
index b04d7f2b5085..63a8d5e29e1c 100644
--- a/app-misc/g15stats/Manifest
+++ b/app-misc/g15stats/Manifest
@@ -1,5 +1,6 @@
+AUX g15stats-1.9.7-docdir.patch 315 BLAKE2B 805d2b85153ccc1b551fd496467636d7f340265940f7b9bf7b9d4578367d4a7a6534d748889048e132ec4e3bb8695369b7a2260ee0a75dc2525d128cd36ef16e SHA512 90868fed8449d9da23924e294d5dc735e189dcd095a25eb02da557a28117cce559c6668decd805068e44064fd5e8915e38ee40fe66845f9b245e0442e9c2a7e1
 AUX g15stats-1.9.7.confd 637 BLAKE2B d85597aba7b14048078a60a8b7e8d2c782f499d649d30c5c48ae09bc545a2ae1642ab1776d119a1d6fddb7317c94e13d85a888c09507608257bd0ac7b3ec37a5 SHA512 f31ea949d3bdc1c8c18628f31ef0252a8d07a636055bff493cc368db702aea2d0d23b6b812d16040cd0015c1daf25357e29149d74e0bb3f233560a15df5ca58c
 AUX g15stats-1.9.7.initd 496 BLAKE2B 52bed11f8b0c9c084c1e1c313ea629cfbde5964b21f6bf7a8667544de6e702cb4b5a89a4022d66d53abfb6f4c14b43669bef290ab6041720e193b96f9b9482b8 SHA512 ad61ddfdbd60bf8906c6ee114ed01385bc20480225579a2034296231feb211eddc48fe8a088ea314822972f80a6df12d3f5bbea44e4e649ea7156b241457ff34
 DIST g15stats-1.9.7.tar.bz2 24103 BLAKE2B ead6f95c1e320b975a0d3ace2c76c1244e5c36b5df60bb73133d19c2bab4f21e1a9d1c423baa9d87feae166861734c02fa60d7ec2e06a0ab764b77a0e00c7ba5 SHA512 de447dfddd563513205b29b3611b0558371b2a7fbe7bf3aa11cd997c0ee2767b3aba05df9745d15e5c0b81382b96163fb7d33ba6a77e04ac817c7a8e26e228ff
-EBUILD g15stats-1.9.7.ebuild 910 BLAKE2B 0def83364b305ae2e39a8437007690e1d20a9ede7ae90b0fe4216466573ed18e960a2cd23bc1a5e0382ebfe743d4e57eccd354bf91a6a95b767972d7fdeb9a76 SHA512 d0cf3acce9c19f48381050e04f28ab18b7d396dee8000aae1b20ef69c2fdf71368e444862b61a3150e834cd92334e002e4c8792ca1d0eaa8834f9df9ccfcd749
+EBUILD g15stats-1.9.7-r1.ebuild 983 BLAKE2B 5617484a315f9c27ba9eeeebf5e24aff4f79ecaf618e27c37601cb82195c23a2ca00f57d8e485ac0c019f0e7cbf606571602d18f527631fae22320126bc58050 SHA512 edec672e64cf48bc6dd714c6883510f1adb9afa7477ff465a875246aef839c576f812605cafd9e959a5455afa5ab18815d3c51e074d7182c149cbb5ce624d047
 MISC metadata.xml 409 BLAKE2B 89362ec09a6bc416fe1919f4e48d774f1cf751f147673ae89088b70bf7db7367ab8c7ece5e7276f5d9f2207cb5b3c15316dcdbf7dd65ce76a991b465c74e9b80 SHA512 f37883d9542d61a9abcc2596e88d80aa41aac439b1366239c7fa234c00776ce837cf19c8b2d153333c22e050380d7add26b7531423ef02e655157d39a72b121e
diff --git a/app-misc/g15stats/files/g15stats-1.9.7-docdir.patch b/app-misc/g15stats/files/g15stats-1.9.7-docdir.patch
new file mode 100644
index 000000000000..e4d9c4725814
--- /dev/null
+++ b/app-misc/g15stats/files/g15stats-1.9.7-docdir.patch
@@ -0,0 +1,11 @@
+--- g15stats-1.9.7/Makefile.am
++++ g15stats-1.9.7/Makefile.am
+@@ -4,7 +4,7 @@
+ bin_PROGRAMS = g15stats
+ noinst_HEADERS = g15stats.h
+ 
+-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
++docdir = @docdir@
+ doc_DATA = README ChangeLog AUTHORS NEWS COPYING
+ 
+ LIBS = -lg15daemon_client -lg15render -lpthread -lm -lrt
diff --git a/app-misc/g15stats/g15stats-1.9.7.ebuild b/app-misc/g15stats/g15stats-1.9.7-r1.ebuild
index c46f9b7e499b..199760efdca1 100644
--- a/app-misc/g15stats/g15stats-1.9.7.ebuild
+++ b/app-misc/g15stats/g15stats-1.9.7-r1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="CPU, memory, swap, network stats for G15 Keyboard"
 HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
@@ -18,25 +20,25 @@ RDEPEND=">=app-misc/g15daemon-1.9.0
 	sys-libs/zlib
 	gnome-base/libgtop"
 
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-docdir.patch" )
 
 src_prepare() {
-	sh autogen.sh
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
 }
 
 src_configure() {
-	export CPPFLAGS=$CFLAGS
+	export CPPFLAGS="${CFLAGS}"
 	econf
 }
 
-src_compile() {
-	emake
-}
-
 src_install() {
-	emake DESTDIR="${D}" install
-	rm "$D"/usr/share/doc/${P}/{COPYING,NEWS}
+	default
+	rm "${D}"/usr/share/doc/${PF}/{COPYING,NEWS} || die
 
 	newconfd "${FILESDIR}/${PN}-1.9.7.confd" ${PN}
 	newinitd "${FILESDIR}/${PN}-1.9.7.initd" ${PN}
diff --git a/app-misc/glastree/Manifest b/app-misc/glastree/Manifest
index 84ca0da76890..db462e597b50 100644
--- a/app-misc/glastree/Manifest
+++ b/app-misc/glastree/Manifest
@@ -1,4 +1,6 @@
 AUX glastree-posix-make.patch 559 BLAKE2B be055c7114bd0ddf52aed5b09ccba2110b15167019146ccddd411aba48e07f6d8091756a47034915ff7c253d166137e0e34a7fa92cb3263bff53886bd4a37aa8 SHA512 fe76f51fc869ce03b9e44270045b6b92c8d69e4fac5878eee7167899633aad1fe2d68648310f3ba6edd47360dcb93c7d0dbda2323e9c2d44adf0d984708a174d
 DIST glastree-1.04.tar.gz 5846 BLAKE2B b380b577a712f08b0a3ec89627d9f8bd20c76244ab19c8e76d27ac2fa08b0242381c280430fafe8a43bef78de8954d4660051d7648550c4ecd789a8941b55a4d SHA512 81b819bc91780f42f945db13efc97faadd661c3272007dc0b90ed998776d3fc0fbe406249f069f0065271208c9f6ccd0488021d384e05d5b9da39311bec8f94d
+DIST glastree-1.04_p20150525.tar.gz 5716 BLAKE2B e248d607ce87f4e78d880c67415c8eb15325a15dca222d14bc9fbafbcfd30c356f71a73fcfc4c8df80c645741e8b0edeca71cfdd0d66b284facad23b5322d64b SHA512 cff2fc671265f7be62b098f9c0a6f8c7711f86c014b64bd0bc1dde4c1570e7707de735d2a421e78d15ff126bcd6cbf18c90ba96bf7a5b30c5f6135c2e4a03179
 EBUILD glastree-1.04.ebuild 635 BLAKE2B e4ff8181d2701c2933136ddc98f6685e2c43e8c70d8993d2d1fa2d709a441c2191a005a0a91e275c5802aa310b0359cd4d8270bf36960cdc3d44e9bd1cb8fc45 SHA512 cd9989a5c734ba1df00af5dc79a34cb7ff4c3ffc9367a9dda494dcdb6bdd31a201fc3b95b664a79014c22ac895df4fdb20daca5968b124d10e18773939853406
+EBUILD glastree-1.04_p20150525.ebuild 790 BLAKE2B 0f3970c2eac909b4f328c9d6c3a4c5f468216eb3fd3461238d001b384cd0624af07a425d1ee89f06ac78d76ec94548272324f17395293bbb1825fae0cd8751d1 SHA512 f9b549bfe93c93a2f79071a2a6d167df57387e2e39c5e8e22b87636b5c761c028ce9cbdd8744e73a08e61c59690394e096453fce5ada40defcb26dcb7fd003d3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/glastree/glastree-1.04_p20150525.ebuild b/app-misc/glastree/glastree-1.04_p20150525.ebuild
new file mode 100644
index 000000000000..8e8a41a96311
--- /dev/null
+++ b/app-misc/glastree/glastree-1.04_p20150525.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT="1dc111308356d999f2a32aa50b6a0737ec5e6b09"
+DESCRIPTION="glastree is a poor mans snapshot utility using hardlinks written in perl"
+HOMEPAGE="http://www.igmus.org/code/"
+SRC_URI="https://github.com/jeremywohl/glastree/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Date-Calc
+"
+BDEPEND="test? ( ${RDEPEND} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-posix-make.patch
+)
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr/share/man/man1
+	emake INSTROOT="${ED}"/usr INSTMAN=share/man install
+	dodoc README CHANGES THANKS
+}
diff --git a/app-misc/gnutu/Manifest b/app-misc/gnutu/Manifest
index bcadd7d1b9a8..4a0e1ff45f88 100644
--- a/app-misc/gnutu/Manifest
+++ b/app-misc/gnutu/Manifest
@@ -1,3 +1,3 @@
 DIST gnutu-2.9.tar.gz 325519 BLAKE2B 4c98d9f7f6a4752821bff464d744a019736353f0011bb162624f3458e1e872dfbe6039572ed79f3c479cdcda4d93f61a4a12fd10c72cd3bbddff45be8d8b0775 SHA512 7ad470ff524422b2236f05bf79cf2a144d166cac7a26d94851b6aacda32e8fa4f8e0ef6abf12157aba19d1e92b7774c3b86f89a8e32514b1ebf7d6e460045411
-EBUILD gnutu-2.9.ebuild 617 BLAKE2B 8888b504b4db24d36f7d366a7d1dc3efcdd9284f178ef99c679b3f5e015999a3fe886f29730020d109c1c38743c9c6800896e1f3675631a5447e8795ee7fa17e SHA512 59769a6f4eee6baa0eb7deb6187d1e33e0be41659767e340d7273a0ad8ce97b2d1d75f8962f73d43a25ba67fda81444ca68b080977193da66fc05011a678a543
+EBUILD gnutu-2.9.ebuild 616 BLAKE2B 77cdd01c72fb988f42126616fd84ebe2cabfc0bb8a7eb7268375141b78d5172aa6f74dd3be5db0b74c389bf188584973f8c34807d094e34499f882c83361408a SHA512 5c1543c4bd31f5f4030c19ccd90cd378e3c38c7c5b1ae00b96f1a41e2fb4d2de980b62b18c9b483d4bb0249040293b256d2827fdc896c5deebcc564a4f00fdb2
 MISC metadata.xml 1074 BLAKE2B 6c0522bee38564ad715c44022803d11f1999c5774ff07aac9ee42259a1bda24c024bc0f83e4c329dbb4d3d9e380aee4df61af9ec41dcd17064a3879d7b4aa3c9 SHA512 4e9df2df20f654d87bf9b6a6be9d873129878f610a25f08446135f8fc7ac74ecb35d7cef3de0aa06cd2b19768fd5bcd9d399d781de11533c8064d5cc61a2f0d5
diff --git a/app-misc/gnutu/gnutu-2.9.ebuild b/app-misc/gnutu/gnutu-2.9.ebuild
index 5ff9f4bd17b3..1bb9d411e3d3 100644
--- a/app-misc/gnutu/gnutu-2.9.ebuild
+++ b/app-misc/gnutu/gnutu-2.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://master.dl.sourceforge.net/project/gnutu/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index d92fcccfa630..4e432f333c1f 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -2,8 +2,6 @@ AUX golly-3.3-allow-py23-exec.patch 688 BLAKE2B d72ba8e9264f2b677818f46e94efac0b
 AUX golly-3.3-allow-py3.patch 3018 BLAKE2B ca05bc615f2bce230bb80bddcfca5d017181fba11c3117c438ec8cbff16fbd645a49b0f8f1cb3f52efb6a5c6548e2398b95167b738dfa3df36336ff43fc59d4f SHA512 409f765d7107b1f9d7df8389a57a06c7be37c050eed26f5724f24bed36fa5d93ff074d6ded991faf1c02341c726c4c8ceca268f89b64fef38f98c5c331a51f23
 AUX golly-3.3-glife-py23.patch 1087 BLAKE2B bc00e95ac7f07bae2c778f1faf93fee7e1ccd92947e12bb1fbc97c0a074c5a347c6ff084a47085c656a94bd2add2fe14c313aff39f60174c983670be006ad9b3 SHA512 814c8a9ac2e96bf4ff61bd46b86a5ef7cfd5a4ba027fd5af78029cfbfb2b8334c76bede82770912509b0c858a2e3ff3af8258aec6e8ee328710d805d527a2863
 AUX golly-3.3-nondynamic-python.patch 1830 BLAKE2B b202aebb3975f55de4748a925d3e4ef87e2033fa6dca7773327e5ca272872bdd817000a02a9bf5a6630eb1716ffa220844bfc324271d9b9a889a4f3cb25257e4 SHA512 5e12d9e6800cf4f3a495964d9320dae1a8a9ad4350d374c9ffa0ec61316d48d4d545d95e200a4b04a700fdb923a841214788da05d0d05bb8768018f83e5bf9a4
-DIST golly-3.3-src.tar.gz 5465595 BLAKE2B e74da3799d1086a46fba523e6b087e6bc50c908098b27a80573936629fd5ad6195968df46b2933a9984cff85068222a80040761254298c5f648b040d5532a7ba SHA512 2aa9c2e7b2ebe3fe85bcb6177e58ee83bd08475e0a37a04cdb7e649b9faf5c2f936c534af62c8cf2322baade65c6e5197768901dfb464c17b20b941e1fa77265
 DIST golly-3.4-src.tar.gz 5480295 BLAKE2B 6bd0c71083d021adb660ed8fd333399865e5f486b6d95d2851aefd31fd2ad09a04419e6e3b2e0ff38b1d934ebb975525c07ca841210cc05f60f9ecf92362bc48 SHA512 bb2b1a653f9556901aa18d2d56c75c2c5e55bd7451b2b5bfb6268793758c12a6b00d30fa52c08ebd47e5db98fbec6fb80c64194cd93a1a41846adbd824c7af47
-EBUILD golly-3.3-r3.ebuild 1349 BLAKE2B 3ecc2e4808a8ff7831dd868403df970dc599f2e8330819507b3ec5e8bdbeefd186af96d1932104276f7a9b4d58caf2248b6d0b140f11035fc70ac85fd297e725 SHA512 c86877d3f72acd958888e68ff5c263ea3d503f101769542bb4b7a741aee68fa2412524599c5dcd528deff0e79788731ca1041def490283007c7690568b512b35
-EBUILD golly-3.4.ebuild 1371 BLAKE2B 15dcc3839e2d8cea284b55df93f86a2bc9c3e332cf42811ac7d17202567625cd8acdeadd725a2836c36082a56305ed601c3fc46e432794d32773cc16bff0f5b3 SHA512 06440ac25965dd04571c8c87c816ae63d6228fe792acf34048198b261ead92fff6dbc477b929795eb7a6ebdceecaa9ba5e527d5f239d1ad4d0dbcda6e63ba71f
+EBUILD golly-3.4.ebuild 1369 BLAKE2B eec1f5eaae1aa29c1cf4a37e8e0c4f1a9ea9af1e989d9491222e311d3c7df19eac8b14ddf2c7b0269e4477b7205a197dac892d3ba22a3da7e8c1d6747f5c62bd SHA512 c913ae097775509899401c6de02e69626c13dd26e04178daa28269e1aa812f47b51e81bb289f8e937f52a9249ff3dd2e2c6076a39ec3a3115fba619e93cf571c
 MISC metadata.xml 326 BLAKE2B 6064832ecd0867971a46cd3c998419df96a09aea31c361b98cc81212e1a84bb99053f14a86321b194196df7e74d1859d7c82c2f55adcf0dd887224754aed381e SHA512 be4d2ed3256cbb48987657dc4a6569c4fa415a495488f17bffe0954bd54127bfc4f6652912b18666a02887bfe31769d1b0c1a67c311e286abca347a9b756301f
diff --git a/app-misc/golly/golly-3.3-r3.ebuild b/app-misc/golly/golly-3.3-r3.ebuild
deleted file mode 100644
index 8e1fd8ca0964..000000000000
--- a/app-misc/golly/golly-3.3-r3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER=3.0-gtk3
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools desktop python-single-r1 wxwidgets xdg-utils
-
-DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
-HOMEPAGE="http://golly.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="tiff"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="virtual/opengl
-	sys-libs/zlib
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,tiff?]
-	${PYTHON_DEPS}
-"
-
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}-src
-
-PATCHES=(
-	"${FILESDIR}"/${P}-nondynamic-python.patch
-	"${FILESDIR}"/${P}-allow-py23-exec.patch
-	"${FILESDIR}"/${P}-glife-py23.patch
-	"${FILESDIR}"/${P}-allow-py3.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	setup-wxwidgets
-}
-
-src_prepare() {
-	default
-
-	# patches change configure.ac and Makefile.am
-	pushd gui-wx/configure
-		eautoreconf
-	popd
-}
-
-src_configure() {
-	ECONF_SOURCE=gui-wx/configure econf \
-		--with-wxshared
-}
-
-src_install() {
-	emake docdir= DESTDIR="${D}" install
-	dodoc docs/ReadMe.html
-	newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Golly" ${PN} "Science"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-misc/golly/golly-3.4.ebuild b/app-misc/golly/golly-3.4.ebuild
index 33eaee6f7422..550db180b0d2 100644
--- a/app-misc/golly/golly-3.4.ebuild
+++ b/app-misc/golly/golly-3.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="tiff"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest
index c4df7f4ba9fe..35412ecd0ec5 100644
--- a/app-misc/graphlcd-base/Manifest
+++ b/app-misc/graphlcd-base/Manifest
@@ -1,6 +1,6 @@
 AUX graphlcd-base-2.0.0-musl.patch 334 BLAKE2B 4930f69284c65ac852c54ce921fc3860bfbb34b2402daad3c58c0bc1aed704065db6b8698bd004b0eda95d8bc23b7a39ebdef42a529c40ca766fc685d21efbb4 SHA512 02f5628e59d0d0144ab51d8eba5abc914d7fbb10997d0ed90fddaad4f359b7cf390154bf70743a7edda9ab14fd56d4af37f9f1761385fa7965013be7623cdfaf
 DIST graphlcd-base-1.0.2.tar.bz2 522753 BLAKE2B 68612f197d340a7baba4f88b5f7ac4e96de1882d132a0a680fa4b81233094cc67d900cb05d855d74dd5dd777440d3be92faf74b4098e1c8027e09b50e602a40b SHA512 625fe6d0c3dcc698522aa1653ba8d22bdb377cbd187de8c26ab3005de4990c8c02f4c0ee477d27ed3930f5d69ea78eb3cd40a79c6272820c67f587e7fabd30ca
 DIST graphlcd-base-2.0.0.tar.bz2 522921 BLAKE2B 34223a84b11fef03d6dbd3f9d5f17362206823a5df0828b7494e88809f313ccd82ccc3ef62df129e6ccd6912a4152829a49c56024976aaf58fbf127d98b0903c SHA512 7fd0d558df16b845b4cd788f597552be85563b00d26d37181b3e0cc7cdc1a9eb00f2437b1c0dc6e9bb7851c6c9168dcc2d952898c1a371aeb8684b6c6aa8d995
-EBUILD graphlcd-base-1.0.2-r1.ebuild 2264 BLAKE2B f380c5e9573837ce363ff70f48525ad23b016a96ddcf754dddb7625445d966c8b8a5d36c4161f25873e1ca49d0e1c50a1326b62b9798620247cc664fcfbe3a8f SHA512 4d8b5d1d6d91dcaf00ecf0fe553fc97f98f7f233d674b6fc3a15cab20c2611b05e647a45b4276bb5946ef907ae346e18341b853f743ea2ce446ed74da81080d8
-EBUILD graphlcd-base-2.0.0.ebuild 2246 BLAKE2B a5547678f3d5d6c6fd771025fcee55a322734464c79486596dd76c99332f63463bcac885232aaf98ee9faafb3a861382e0bcfda41215f4a37fd4515030f386ca SHA512 b7379d254ca7cf03f57971bf7b26e5e726bc2e4fee8ccc43a36031d488f3fb8039193bdc1cf1648bc531a0125586998f19abb80274d3dfca7c8f971ea945cfa2
+EBUILD graphlcd-base-1.0.2-r1.ebuild 2255 BLAKE2B d8f8b90faaf5e86fd14353f48ae9b20057dc4d966f78c49ef2db08f0574c58566b273718005d7b9b7a4ea68b2647e120eac63c2b49a3101b67e2db025289f525 SHA512 491e01907f5b0daa3d6104e2b67967266534095839e7d830e3bdfed9a36c57dc2948ca8bd3fc4a1d35668fe8fbeb6fd541b5ed1598c0aaaf36534f5a362b6aae
+EBUILD graphlcd-base-2.0.0.ebuild 2250 BLAKE2B 7b856460d8763263eb0a85d3c8eddafba126a81fb24a9adfaaabb16222e5b7c90bd0f0cb8eb6c7e4249f3aa153ac018eea7238efb3916d434520d8af44988f92 SHA512 420ddf7cf5b68158c5ce7e3f936b6d0d0f970bf9e890a0f489fb3cad7e7d47fc751c7362f7fb9af9bf94754700e85040fa099b126cabecaed7b36ea22e0440c4
 MISC metadata.xml 1009 BLAKE2B a227fe76bfafa6f3aa6977ec5bd56959187999926e4c95436411e255db079d919fb174970b198bc8a26cb488f82e8466512342e00cca4f7a367e6d5730dc8f6b SHA512 8bccbe3bf3457e280fcbe9bded2cf5bb78f64ce528b5bed27249e33392f9fef6d2716744c08385df915e0839d9146b1e0fa2db7b46d574e9a7cedf4a8079240a
diff --git a/app-misc/graphlcd-base/graphlcd-base-1.0.2-r1.ebuild b/app-misc/graphlcd-base/graphlcd-base-1.0.2-r1.ebuild
index 03b878878ba7..3c1a30caae96 100644
--- a/app-misc/graphlcd-base/graphlcd-base-1.0.2-r1.ebuild
+++ b/app-misc/graphlcd-base/graphlcd-base-1.0.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs udev
+inherit optfeature toolchain-funcs udev
 
 DESCRIPTION="Contains the lowlevel lcd drivers for GraphLCD"
 HOMEPAGE="https://projects.vdr-developer.org/projects/graphlcd-base"
diff --git a/app-misc/graphlcd-base/graphlcd-base-2.0.0.ebuild b/app-misc/graphlcd-base/graphlcd-base-2.0.0.ebuild
index 97b2f327bd99..14554e36bfde 100644
--- a/app-misc/graphlcd-base/graphlcd-base-2.0.0.ebuild
+++ b/app-misc/graphlcd-base/graphlcd-base-2.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils toolchain-funcs udev
+inherit optfeature toolchain-funcs udev
 
 DESCRIPTION="Contains the lowlevel lcd drivers for GraphLCD"
 HOMEPAGE="https://projects.vdr-developer.org/projects/graphlcd-base"
diff --git a/app-misc/gtk-sunlight/Manifest b/app-misc/gtk-sunlight/Manifest
index 286cbf2c4434..1191f1483178 100644
--- a/app-misc/gtk-sunlight/Manifest
+++ b/app-misc/gtk-sunlight/Manifest
@@ -1,3 +1,3 @@
 DIST gtk-sunlight_0.4.2.orig.tar.gz 562581 BLAKE2B 6fd80fd0324de2e7fbe5cf72eddecee128abe4d4d4cb13c30c224241f1fb99a8683bce43f2b60dc309ac9479f424bd31db5a5c2c659a36da0266b3fc58cd687c SHA512 6490172beeb4c3566a42de858e321cdf83be6852d5c290f75f41d22855d002e8609948164cb757e787a1123a4fe47b69272996ffc821c057b7c6ce8b0b180083
-EBUILD gtk-sunlight-0.4.2.ebuild 559 BLAKE2B 750d438eccb58dcc04d89c6553ae13c815279d5ae3c9ae5e4f1ab55618edd6919b134341a5725710a4f0b74454894efcb9f3a5189fa85a6e3a149c6f3b8dbf69 SHA512 edcd618616c2c1595439a8736b4974685656d4de258d447bb4ca1543a603c19c2d496ebdf2bf839dbc691a097c84700c8e6c05951b96a93ce74a9ea5758fa9ce
+EBUILD gtk-sunlight-0.4.2.ebuild 562 BLAKE2B 07cdd893d3cc4bb56b05d023505b71dbe4fbb7a2d88838bb92387f907ce0f0cf7e182b96264a272453b039cccaaec759b845a3c80c952b0079ba0ce0ea3aeb8f SHA512 521d57a6a0a97832b74c1b4ec6fc7be4b45db71b5a2c78269f590e568ff915496c2d7850fa8dab3393027129e663df26b7e4b17ff9da73f4580f9bba8315b2d1
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/gtk-sunlight/gtk-sunlight-0.4.2.ebuild b/app-misc/gtk-sunlight/gtk-sunlight-0.4.2.ebuild
index 5cc337b88d9f..1f1f20b8113d 100644
--- a/app-misc/gtk-sunlight/gtk-sunlight-0.4.2.ebuild
+++ b/app-misc/gtk-sunlight/gtk-sunlight-0.4.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,13 +12,13 @@ SRC_URI="https://ppa.launchpad.net/realtime.sunlight.wallpaper/rsw/ubuntu/pool/m
 LICENSE="GPL-1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="dev-libs/glib:2
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	dev-libs/glib:2
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
 src_compile() {
 	tc-export CC
diff --git a/app-misc/khard/Manifest b/app-misc/khard/Manifest
index 69854a431f50..8a2ead4c980a 100644
--- a/app-misc/khard/Manifest
+++ b/app-misc/khard/Manifest
@@ -2,4 +2,4 @@ DIST khard-0.13.0.tar.gz 5083020 BLAKE2B 6dc95335f89d5034ddc5fdfafca06b2bfc96c2d
 DIST khard-0.17.0.tar.gz 593928 BLAKE2B 488e1df70212c856d8dfa43955e681344fb1a257d765c81820444f6435d39aec782da9d01edeeaac0b9a87412db680fde368c39c74faa82b0eff2d7a0a2dbc6b SHA512 9cb936aeaa327b9837488a752906bf603429ca0c7240703829220119049f5f62e84f7e4c90bb81799307fe446c3aa47fe6ee4112c276b6bb329c959be438ba25
 EBUILD khard-0.13.0.ebuild 1235 BLAKE2B 55db533885da6339c122802a22806fb789d7d10af7d9fdfe07eeff2ac6716ae69ff6cb48e85535bedc2a4d04b302e8045f8e8d3f8ae5a43b04c6efc4297daea2 SHA512 199f0c7adf2192b699926113a62813c9c3ef6fb357e8afb7a51fae19b655bb5dfce8ba9311f700fe26b8f55e65f2ffce5185f4268487eaaf396a98d3c7a5edcd
 EBUILD khard-0.17.0.ebuild 1210 BLAKE2B 17fe3e43bfd65b9a619a49327528ac429b12a33427fd7807439e994f3057601cc3e5268314776468702eeeb9d5c7feed4595c3ef2bf718d579767d0b03ba0a9b SHA512 adf86ed27af6a4658298cc2c9e0c0608f63ce0ecae52341bb2fb5beae56fda8198062ba0c9024bcf8315b79a97955bfef6bee031f1fdc095cde2b6d5a85bf544
-MISC metadata.xml 562 BLAKE2B d36c685675eadef8a3d6fa9e0f3caca84c25b9d82157e003883c069bee020148981b3f409d0d4b54824b7afd333bdf46c300c46065de73f2c625ef23f8c73038 SHA512 2d7233616e782afbcafe7bb91294c9db007cbc34cb298383598af52484ac201ed70d3c7840956e2906b34ef6dd381368f9b8d6396f650dd385b893f64431c042
+MISC metadata.xml 543 BLAKE2B 6da71501ec740c50c0d48e058620d59ec4224daaa79762dc05655962cc57d08ace200fed8e584185f63587cadffcae18e4e2870ff804a1901b559bf8825a0105 SHA512 3ed52f8d71a10c2c1ae9136434be79191d6c8c4f42f9c935c3f4d5e6517dfae09820ee8ec5436f73411ae6cba982d5e537ab5d3e33b9b66ab8759a560b8ce734
diff --git a/app-misc/khard/metadata.xml b/app-misc/khard/metadata.xml
index 983f508b74c2..0810dfe60baf 100644
--- a/app-misc/khard/metadata.xml
+++ b/app-misc/khard/metadata.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
@@ -15,5 +16,4 @@
 <upstream>
 	<remote-id type="github">scheibler/khard</remote-id>
 </upstream>
-<longdescription>Console CardDAV client</longdescription>
 </pkgmetadata>
diff --git a/app-misc/ktoblzcheck/Manifest b/app-misc/ktoblzcheck/Manifest
index 8501ea253d33..81915af37c8f 100644
--- a/app-misc/ktoblzcheck/Manifest
+++ b/app-misc/ktoblzcheck/Manifest
@@ -1,4 +1,4 @@
 DIST ktoblzcheck-1.49.tar.gz 561501 BLAKE2B 209d88fac131f58413c27a2df1bb2a380a7517ae20050c8151c368c1a2e7675ce4d563d20e481fa7d843991a95d5edecd393dfbf601446d2657c72302fb5d7ff SHA512 da2321112a78b11ccaa938ec295275cb27a4830de0de62e7b9335f2991b9ca335f0ad10e422d9dcbd32a16effc2fc59f3cdde0fd732a639d3e6a39e141081aaa
 EBUILD ktoblzcheck-1.49-r1.ebuild 884 BLAKE2B 12fdd58f04418b90b32ea4f83aa1c652dd73f9ef64d91915a86552eef9439938413dbecb9f6545f10f97eba70e77eb6f26e572264feaed42d28dfa5a73f121d9 SHA512 1e48b63552c974266cde28b61cc87eab5820f05e8486e7918989ebfcc22c56b13f169fc99b9b58b1318e7f92ab71857b046fe67616faa3264e28bb49f8aef04b
-EBUILD ktoblzcheck-1.49-r2.ebuild 688 BLAKE2B 62ace1bd72efc12996c2c97a1b44bee2d821307a850617906348081513df3f7a8a8d6caf6153de2e9fed1cc97a8097af87522c1550d5e4ca7e9978d0bb8c97ad SHA512 fd71ebba172db8db874292454689318188c634c15003ad3d6db8299fc2b55faad55f117136be09316b3d66f3a8a3f058f455d6067665300bdfffd775126c2447
-MISC metadata.xml 297 BLAKE2B c7fe2728b531d1325f0335b85b9fdf9b0cb828780ccd279dd516af6036ec17f5c0416564b50e1cb972690a43e6a250f0c120dd90e1533f36d6077508214f4133 SHA512 c4c121f254990adfc30d96af3e0d58bbf937863f521422d759779dba224f3eb6a904c7e5a03bdd65e25afcc0fd67fb8ffd84566799771b1c73bf7f43d9c92c0a
+EBUILD ktoblzcheck-1.49-r2.ebuild 686 BLAKE2B 47164f43f697f95089708e6a55f177a191ef0f58f3ac4ee0a60a226d9f35074d8efcec5914c17579eec33d156a5d6f8ea74382bfbbba3a3642978d999a7a1c67 SHA512 412a8884467cc18848ff223937c290b18c0f43c1e1335c168e7d5510bca70a40fa7b9dbcbeebf48a25a74ea1ab42f3abaf474694dc62b3350211b9048a1dd070
+MISC metadata.xml 248 BLAKE2B 826a3223924d5353b8f0f7ab46e2e06e1c954652e1a4495c3dae2c07fec25b96cddf319af05972c3d099d0c66eb15b6c9dd76ad6c26f21078e55212572da81aa SHA512 f97d7e5dfeb875819d38dec85a16025425277266cd519e13b4e0bef4961ccec237b8da118687906bdb360a185be0f039cdaf0adfb6c0071b288e8d9108af7b64
diff --git a/app-misc/ktoblzcheck/ktoblzcheck-1.49-r2.ebuild b/app-misc/ktoblzcheck/ktoblzcheck-1.49-r2.ebuild
index 293a0a673c58..f6308504b34a 100644
--- a/app-misc/ktoblzcheck/ktoblzcheck-1.49-r2.ebuild
+++ b/app-misc/ktoblzcheck/ktoblzcheck-1.49-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-misc/ktoblzcheck/metadata.xml b/app-misc/ktoblzcheck/metadata.xml
index e7d969e77aff..c3bbbd30cb18 100644
--- a/app-misc/ktoblzcheck/metadata.xml
+++ b/app-misc/ktoblzcheck/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hanno@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">ktoblzcheck</remote-id>
 	</upstream>
diff --git a/app-misc/linux-logo/Manifest b/app-misc/linux-logo/Manifest
index 20a95edd673d..c46039bc5c56 100644
--- a/app-misc/linux-logo/Manifest
+++ b/app-misc/linux-logo/Manifest
@@ -13,4 +13,4 @@ DIST linux_logo-6.0.tar.gz 117486 BLAKE2B 3340b893574f0c18561b208824cd80cff19c38
 EBUILD linux-logo-5.11-r4.ebuild 2260 BLAKE2B 991a099bfe2644d2cdbc8a87bc6ad741bcaf957af788246bf9e9d80c0f4c40b013c8ab30b34877af053263b22d249266d6f2ed8d3681657c23ce1a9d43994d95 SHA512 9319f5f3d9db13737766bb2ab8bbd6a84c4a281106ff6d0f3ee171560b4201b23385797ee6ad1ce87f4017b79882cf98a32a7588ea2eb418b97bb0e52231e7be
 EBUILD linux-logo-5.11-r5.ebuild 2282 BLAKE2B beb00eaa05d1075dfae1ee11650e36e619a3c9773ac27d86e6485e2842af6bbf74957494aeaa31a310129e1af1338e32ed1bd8ba0aa88b9d546a48e02e9ff3e9 SHA512 c085b8f05f310098ef3effddc8ad3651fca8801d8d5ef6f0d62b205559dbc1ee4ec58402671e7fefb8dd76ea57a16c6889e5240d0c3a3a2d194078b674dab952
 EBUILD linux-logo-6.0.ebuild 2164 BLAKE2B 429e394ccb44b1d0359883405cbcd925ebb791418399bb5344a53380a300de6f7be2f96b125b17e54dca4f4f00e45db700e64346106b8e234905daef379818a8 SHA512 42212145ba364a016c4a7b551f2ba0fb04dd7cd60f4c7b4eac3ded055cd22391280c84b45c751585d6d4a1e643d18ae1ed6a7bce78bad7f1839c34c278805b62
-MISC metadata.xml 490 BLAKE2B 86e3962880353e6e86dbbf5d6582140126a5d2c56eff5e110119aa9a77b73051258ab4624220733da236e6ab438aeb6ac11102481a792afd4807dcbcdf669c11 SHA512 103652d3e84265d69b041a3268935de7fd1935c0cca90d905656d845009037774e46cae7116fccdac64c3fdb919a1a2b011600ea1858277117420bb63b5740df
+MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/app-misc/linux-logo/metadata.xml b/app-misc/linux-logo/metadata.xml
index 351315604363..7d273a80ff68 100644
--- a/app-misc/linux-logo/metadata.xml
+++ b/app-misc/linux-logo/metadata.xml
@@ -5,6 +5,4 @@
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
 	</maintainer>
-	<longdescription lang="en">A utility that displays an ANSI/ASCII logo and some system information</longdescription>
-	<longdescription lang="es">Una utilidad que muestra un logotipo ANSI/ASCII e información del sistema</longdescription>
 </pkgmetadata>
diff --git a/app-misc/linuxspa/Manifest b/app-misc/linuxspa/Manifest
index bf0f5ad8f728..883dd2123c65 100644
--- a/app-misc/linuxspa/Manifest
+++ b/app-misc/linuxspa/Manifest
@@ -1,4 +1,4 @@
 AUX linuxspa-0.7.1-compile-fix.patch 345 BLAKE2B 98594daf87751bab29059329768e7de15b5310afe6480438791751c209be10478a95ad0d9b8b6bd5fe748e990ab52753daf30bba622fce434e9017dc6b54bde2 SHA512 28ca542d3b72cbf7a5e33caa1a98b6a0d76a021359f5fa7222cc1328b938dffc5fdf4a39cf11d60c7247d269cce938239a1c0eff8e32b60835598a41290c07a5
 DIST LinuxSPA-0.7.1.tgz 45448 BLAKE2B a3181e823cf780e000bed2850786bda8045e5d4781ccd78fad420fd42109918aa5c8167ca4a1246795c8c98bea65b3fbe633d6fcea3d58770199c33eab81b5e8 SHA512 4b622330e88abe7d4b91392e75ef8d90902b731e051a7bdc93895aa82b6ae33a5e65bbe950c8d6884985cf8b7bdb1c3dd46b24d75f7c90a872e0a7758f929673
 EBUILD linuxspa-0.7.1-r2.ebuild 850 BLAKE2B 16f6b4dfe385f1bea3c4e2d565acea5bfb672f0c19fadab134d96b2f252dd09a4329acfc78d3f27dccc9281de211b8f2ce76c06cc84339cb92521e863f58ff06 SHA512 5f818484257272ea59c0df8ced170a37682b69c9e5b391081fe2264879e376866792d596c52c8f72a7ec890c74941b0a39ad08d27276d73e7b48581c9675f62f
-MISC metadata.xml 317 BLAKE2B da3d82b00fe50b1bdab6212a93c7acd25587825cb1999f85f3a27ff1902cffeeb0de13202bc32f4549e6369a2cedcf422625e584a658a19b08eae633ebe1bc21 SHA512 a6d35dec316005a67ca7ab5da64ff695567b864282601de68b8cf2927ca28c5c0970592ef27c8d5031a0fb3dfbef7753e485fc4a6cacfc3beecef475fba14d72
+MISC metadata.xml 250 BLAKE2B 323b829796ef95b2c3b28a76479a54bf8da53e2e2bb8a112e984cc405ff36de4e66632f9d42526dfec353f2eb7b36e2daa71cdfb473125e27656704f4fa8848c SHA512 37ec77d2258edb70beaf298e53680c0feda9191988bbdc537d8c661770a08cae897d337213730682a4854cd08d592b56a3be3c1247cece6bd9cc2cfbf6fc8963
diff --git a/app-misc/linuxspa/metadata.xml b/app-misc/linuxspa/metadata.xml
index 77681b22f7c4..e9e3dfd9408a 100644
--- a/app-misc/linuxspa/metadata.xml
+++ b/app-misc/linuxspa/metadata.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription>Linux Serial Protocol Analyser</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">serialsniffer</remote-id>
 	</upstream>
diff --git a/app-misc/lsx/Manifest b/app-misc/lsx/Manifest
index 4025bd1be3b0..297195dd5b08 100644
--- a/app-misc/lsx/Manifest
+++ b/app-misc/lsx/Manifest
@@ -1,3 +1,3 @@
 DIST lsx-0.1.tar.gz 2130 BLAKE2B 0293945b76d76d755675d8d57ef7f09b668d0df7997ec0e5df927dfb4dcd6d24217b27e114c498680028c52bb21c8a1106dbde2010c47d77d66acf9589e74a9d SHA512 19f3fa4ecc22817332716d58d287ab7ea4b07bbed1d909b00931b272f1613d8aeb315435495d51a5f918f53e3f0ce68e964813cdbfefce0176924f3c75aa623a
 EBUILD lsx-0.1-r1.ebuild 714 BLAKE2B ad30f900830734f5456c22c349962a845dc4e6437f54cdadc6233b5c32b5b3546b74d48ae00080c186fddbf90a9f8f44693cf80ee9dca79f1e116cf82b2d7abd SHA512 d8f99da2eb10aafd864be451677afeab72d42e27bbf4a7f2d6c0c85fd459eaafc1dcbcbb14f0401cc7bb44df3332bac5e9c0a58804cdcf7bebe17232b434d19e
-MISC metadata.xml 277 BLAKE2B b9389d5db9efc1f16568f1fce62c47e9fd8829608aa3084db3decedefa711e065af20f29b0c5a2d9e93beac60ed0f54d098640e56fb93824dcb0b3d2f75af7bf SHA512 99cfc61af14bb324d776b6865339d8f9626450ba2f837bced0624ed80aad5f177c35c4ac3e3cfe636d175ad1f7eb478cc735dde57a6bb691fd608c57253db1c4
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/lsx/metadata.xml b/app-misc/lsx/metadata.xml
index fddc83784ddf..6f49eba8f496 100644
--- a/app-misc/lsx/metadata.xml
+++ b/app-misc/lsx/metadata.xml
@@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
-<longdescription>Prints all executable file names of given absolute paths to standard output</longdescription>
 </pkgmetadata>
diff --git a/app-misc/muttprint/Manifest b/app-misc/muttprint/Manifest
index 701a32b2ada9..ab93ea5e004b 100644
--- a/app-misc/muttprint/Manifest
+++ b/app-misc/muttprint/Manifest
@@ -4,4 +4,4 @@ AUX muttprint-0.73-pod-encoding.patch 1305 BLAKE2B 4a53284c3531cf71e9a86b6de10f2
 AUX muttprint-0.73-warning.patch 404 BLAKE2B 23f0dbcae883aecbe2f9a26567ca432309e3345a8791930ea7c961c71d7fa452ba2b810715dba56825c972be0b65503c9351a2c3a077eebc8f460cb99bca0fea SHA512 4f39fb455c0f99a68b2c004556377c5c385ecf136ae5a317fc1418497bfa28d0965e8b4572897a74da651b75c17cbebe0e12cb37950f8a45cb3b2c4205f65bd5
 DIST muttprint-0.73.tar.gz 361268 BLAKE2B 0d7a84056df8550368783acec52693dbb68f5be547394cbba8701619ab7e73ce69d68f2d531cfa45b56321db89565d5be4e7b72e0c58bfac977c3143ca7b895f SHA512 607bdbee769e6d3a954979f15f017875a70078462bdbd747ff65dc3ac61fda3a0c32b261430faab8e457d6781b03d9f266ae2d21cdbdd058a7635ba9ddd27834
 EBUILD muttprint-0.73-r4.ebuild 1749 BLAKE2B 7c6777010a6f30df0a00822f7633fac2753386de478b902be59573ccb32b225cba7e15621f9f6f27838322d101673ca367ab2b5ceb5c88cadb0f835fda60ca5e SHA512 9cc56828a72af4684403853f88dd28c59d78173135500f4d52e8009aa9d49f81382db6bf73b5f569c71ccb0e655b7ac05fa4b9070610ebe3907dfdf54b61bd9e
-MISC metadata.xml 475 BLAKE2B ea3b25e47a492d7445f598c459130b89bc95a5c710dd3a90be5ea8cf031299e8e5009d05bd43491ce957b7582bb9da7c29ecf4e3f53a09049b0099ce2aaa7e2e SHA512 087e4806bfeeddf8abd777cf75038e80ec754205808d3a595b76bcb91be592e25ff09e9a1a4510b61ff404002746d46e64eef65fc2a67cc3324c1c337b748082
+MISC metadata.xml 308 BLAKE2B fde4441a8f5a4e0d84bcf73daafd749fc02eb642824a78776b39e91e0daaa59767aefab5f2bbc6793d35da66ca710a59955d5cdcbf5c4d0c58040ab884f5726c SHA512 9021c73bc666f5213c3c1246b2544a0fbbb930bfaa3acbf3c79f142199cdb5d0c0fd0131989c7f48a2b4c95c2404411d3afeb6bbdc715a5f7d256ab5b36384c5
diff --git a/app-misc/muttprint/metadata.xml b/app-misc/muttprint/metadata.xml
index adfa2f1f4a12..e03f22a0dc24 100644
--- a/app-misc/muttprint/metadata.xml
+++ b/app-misc/muttprint/metadata.xml
@@ -2,12 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		Pretty printing of your mails
-	</longdescription>
-	<longdescription lang="es">
-		Impresión elegante de sus correos
-	</longdescription>
 	<use>
 		<flag name="doc">Builds documentation</flag>
 	</use>
diff --git a/app-misc/qcma/Manifest b/app-misc/qcma/Manifest
index 4aa3ff2edc80..8a719a2d6483 100644
--- a/app-misc/qcma/Manifest
+++ b/app-misc/qcma/Manifest
@@ -3,4 +3,4 @@ DIST qcma-0.4.2_pre20181227.tar.gz 244336 BLAKE2B 5a7a33384d4c73050954901e8e8f31
 EBUILD qcma-0.4.1.ebuild 942 BLAKE2B 46dbbaad37e7213b9f1be161318df1a33fd1db83161cc080c4f020410e0edb67465b22e27a31ee8dc85a5c7597f453903329df9a0cc64376d08327624c83fb3b SHA512 5ddcc125f584614ec7d4cfbc67d932ab9e2bc212e30c46f7c9980e7ea6d9e9dfc9c2bba5b0fb447a897b56755aa9dcf1c37dcf5a5bcac71199120650403956a5
 EBUILD qcma-0.4.2_pre20181227.ebuild 1017 BLAKE2B eb3dd5f777c425365ed2053dae32f59fa8f0605787aea99b10e52c86c98f68cdc9e2501d320cf03b3b2cdba0d514371f25f4c8de0f7eeb6035e78f05e3ea907f SHA512 0616dc4d6e2d4717e5de542f00069ba28be193dc56f76dbfbe799ae000dfa3c0b38727c79e5bd9d7017d361dca938c3a1c46039147914091891775fcc2a594cc
 EBUILD qcma-9999.ebuild 888 BLAKE2B 60914b30ecf6a12d8723795e2fb21bf4f137f639eed8d599d4e44134ee9b244297344db623575040158cd92669ab29d8b56c99758ccec433427f3e1cd94737b1 SHA512 b55b80ca481d111a11b4721a24441256b8c8725084e20178598a37f99984f880e19374f6c7cc1c5fe07fabf65ca074603a8af6ea23d76884924f450f2e1f2e46
-MISC metadata.xml 442 BLAKE2B decbd7d9d4961c0750267cd1a52f4c269e0cbe9ecf50af99d515d908346e581e26b93dcde20e7c94b769b8ff8526213f209a96608ca35d8e561ba7d087bca354 SHA512 c7fd8f8df81d3d7077de804b688e6310f62a86ebb223e4686334e201503e480f5bf5f7cb151a5086ab9cc5119897d37a7c794d79bce7e73ad98dcab3888ead1f
+MISC metadata.xml 333 BLAKE2B 5bc19c81c25ca3c74535aba527df3512142645937959dcdc1de96a7117f2fb05ad5159280d715869c02e1800a6c597ba1e6d2128c4bbb93f0889428c98707235 SHA512 6b2d45fded47078cb5541bb216f09e71f9b436cf55cc03486f8840830e3946d02b8181ceda0d94f952d7aa8cecbfbb75c55ae503cdc5a9aad61da8e0c3af6c66
diff --git a/app-misc/qcma/metadata.xml b/app-misc/qcma/metadata.xml
index 1587fbdb1e91..0b0e1782d2e3 100644
--- a/app-misc/qcma/metadata.xml
+++ b/app-misc/qcma/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mva@gentoo.org</email>
 		<name>Vadim Misbakh-Soloviov</name>
 	</maintainer>
-	<longdescription lang="en">
-		Cross-platform content manager assistant for the PS Vita.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">codestation/qcma</remote-id>
 	</upstream>
diff --git a/app-misc/qlcplus/Manifest b/app-misc/qlcplus/Manifest
index d0fce528c631..4b5eee5ca466 100644
--- a/app-misc/qlcplus/Manifest
+++ b/app-misc/qlcplus/Manifest
@@ -1,5 +1,7 @@
 DIST QLC+_4.12.2.tar.gz 10804401 BLAKE2B 95b005985da99d1d1f557b4ac5d6ae7d844ea4f69a7cfa63d79b288ce654b5a70f9e6168f6fd4144496d3cff59a721972acd3ba47fd1477ab4bfd0218f5aeeda SHA512 b274f0559ce15e045d653f4c034dc083922a13c6f9c5e7ba11026b3be9bb85fe447bb489d536dd24bb99bd4b08433f24f1713b73701afff99fa845fcef2547af
+DIST QLC+_4.12.3.tar.gz 10954027 BLAKE2B 9a188e2bc2cce1a0a5170122989d5ee1194a83e7d1c8c05a80ad6271e903941effb5c63940a941fa32146699b3b2a7943b9938a5407420da69c1199b5f6f217b SHA512 f25601a44a81d2fd15c54a05588e687fa1f0c0473d0e2188fa0c052b905df806b0516f8b80bf28451a583aa241d137f858fe83b9d7e0e0747bcc3b0bae91d9f0
 DIST QLC+_5.0.0_alpha3.tar.gz 10016411 BLAKE2B 51c0885f6e2e286f9f63830bcd269db699946c0969cb0f0a0139f82a421a9a4957ab07612db7aa047fe6650a642479282f6cfe0d124a41a935dd853d09b7253f SHA512 e703747aa243bc4c6b2e9fc3cf1a4e67524fa13fa64a59054e66164e879073b1bd69756a42bb423ff05dcb7da946cbcd99bb9edc3fde9a70d75b8a9f164a71d0
 EBUILD qlcplus-4.12.2.ebuild 1217 BLAKE2B bd8c0c256e255ff88eed2f6f9e9f5d9f6af0011f1a5b540f254e8b068dcc7246cc8b08ef8e5ef12b7bfd4f2d9275929701f6dbff946aa37e888f2c4bdf4d45ab SHA512 f31e8a8572b0a6bb49576aed423449e33d6ea8bda937cbee4f4456202eb5b5b96e26d21a061c925f04f8e2364119827bd707ba7a8bd3215c6c7b86375e523e3f
+EBUILD qlcplus-4.12.3.ebuild 1217 BLAKE2B c4c507caf1551d22815ed9f2a863b5860fdb9e0aaaeef3e5dd7038e6e220c092bad8c3ac17861c3c13bf9df0f0c0a01088e9a3fc96d42715e84eced2ff4d33cf SHA512 4e10f5121e8d3c425c1a1c29ef7e72141cc3cbe5cdfe1273c83f6c63ea8e670a31259eae25f509847b4da8cfa424aa898e7c92d95d045f3aa8b6c3af617d2c80
 EBUILD qlcplus-5.0.0_alpha3.ebuild 1509 BLAKE2B 4c3267f85207c1f763ad5c4d7be46df95845e5a30b6769df7dbafe0e9f65b80c4fdb75f3435ea5296934c3b355a79680c6dcdafb90ace5791d5c17b1a6cacfe8 SHA512 06284d1b8f216915031a6974de5070b0a266a1e3cc9ca80399bf377fa8bbb744d593d9427760dc614dccd64253a4d2474aff8cd9ae6b2d587b88a6e2fca30231
 MISC metadata.xml 455 BLAKE2B eb880143c2d81895284171757362efbbf7a7cf53b5e4802d45ee5a6032d6be87ac609c0d4b2e2e0f5a2b7da407ef425ca5e00f2f8d5acce281725fc2e71e988b SHA512 98b45a554c331f71371178ffd02eca17bb6ff4e3477534538223d5478fe49d8594e35c3986c27aaa17f0a413a0ddde4f07cc586ffdbd94842884c428379b9339
diff --git a/app-misc/qlcplus/qlcplus-4.12.3.ebuild b/app-misc/qlcplus/qlcplus-4.12.3.ebuild
new file mode 100644
index 000000000000..6fb4d8a64529
--- /dev/null
+++ b/app-misc/qlcplus/qlcplus-4.12.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils udev virtualx xdg
+
+DESCRIPTION="A software to control DMX or analog lighting systems"
+HOMEPAGE="https://www.qlcplus.org/"
+SRC_URI="https://github.com/mcallegari/${PN}/archive/QLC+_${PV}.tar.gz"
+S="${WORKDIR}/qlcplus-QLC-_${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+RDEPEND="
+	dev-embedded/libftdi:=
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5[widgets]
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	media-libs/libmad
+	media-libs/libsndfile
+	sci-libs/fftw:3.0
+	virtual/libusb:0
+	virtual/libusb:1
+	virtual/udev
+"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+"
+
+src_prepare() {
+	default
+
+	sed -e "/UDEVRULESDIR/s:/etc/udev/rules.d:$(get_udevdir)/rules.d:" \
+		-i variables.pri || die
+
+	## Remove Werror-flag since there are some warnings with gcc-9.x
+	sed -e "s/QMAKE_CXXFLAGS += -Werror/#&/g" \
+		-i variables.pri || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/app-misc/razertool/Manifest b/app-misc/razertool/Manifest
index f0a55d4ee910..fb18eae2a73e 100644
--- a/app-misc/razertool/Manifest
+++ b/app-misc/razertool/Manifest
@@ -1,3 +1,4 @@
+AUX razertool-0.0.7-ar.patch 347 BLAKE2B 8225103a88e2fbbdcbc23546c06b6052c4d148dbde8151648fa9b4aa563c815296a7801c8b10a5337aa762cd8e2eb76aff3329b261033dff0082a5d1df9a12f2 SHA512 70c570cf089bd165b76adc4242d39b484333931352406d32324db80746151f6722c5a4fcd718b875d9cfae34ffd0d17bf02c63c94cc0f0b1addf43028f0f1734
 DIST razertool_0.0.7.orig.tar.gz 192274 BLAKE2B 415896f9f6ebaf653be9ede84985b13149f27d4471a8aa53089d138f4f7d58a10ade2aa5f46ec88951572bc7ca1c222db5f88b3df6b37e3ef2ad544a2a7ff28e SHA512 0221ec90b55f4459f5a772eb651e9807423d9e3c82ebd680ee835167bcebf2552e1d7767d294c5392b1fbc58558084e7022cb67f529c033eaff33b4fb3eb1017
-EBUILD razertool-0.0.7-r4.ebuild 1764 BLAKE2B 27c58b0eb22bbd4f3a07b8922a1e1c5b8bedabe5a02958cf92e936bf96339a2e360b013fbe74db245b41f4f97667bfcb0e218805f76ac6fbede1c9cba36f1e8d SHA512 1c772f0b27c03f49462def5082bcc4f11a23760efcf41dd74f53085f7b8fe98aa290950312b4794c595df58107147c61dcfa89559b91749ecbd92173dc8d53f4
+EBUILD razertool-0.0.7-r4.ebuild 1760 BLAKE2B 5372848aa026321c7f9f62bffc6b4a1d33526713852ae5a0e47c3563eb7bd8a2c3f0ab88a4a8407bc6dc5956ee6f767cc604a038d16eff0c819087fbd714cdfa SHA512 76d01f704a4ed0238820d865f5bc522c907935d72608c52e8e97e2916edd4aa38380731f75aa591375448f4c2b20c443a55face93a32f21490dce757a17fa610
 MISC metadata.xml 669 BLAKE2B 033318e57004d253f5cd774cbe6163ef84e800a04c75c9115dff3877857e36d5062a0ea898fdabb2bdc5edbb3c3c3682989f76168051ea1cc1091b54c9c38749 SHA512 e14e8d1b8af18a78314722909095c39d5db6edc0c87a0eb15cff01afeebf7739e6d8eb5b96089ca4a4138b207d8de7a95e6dea76954bf4026682f65659403b12
diff --git a/app-misc/razertool/files/razertool-0.0.7-ar.patch b/app-misc/razertool/files/razertool-0.0.7-ar.patch
new file mode 100644
index 000000000000..b585205b1b92
--- /dev/null
+++ b/app-misc/razertool/files/razertool-0.0.7-ar.patch
@@ -0,0 +1,11 @@
+diff -Naur razertool-0.0.7.orig/configure.in razertool-0.0.7/configure.in
+--- razertool-0.0.7.orig/configure.in	2006-08-13 21:57:35.000000000 +0200
++++ razertool-0.0.7/configure.in	2020-09-03 12:53:51.991020189 +0200
+@@ -10,6 +10,7 @@
+ dnl checks for programs
+ AC_ISC_POSIX
+ AC_PROG_CC
++AM_PROG_AR
+ AM_PROG_CC_STDC
+ AC_PROG_RANLIB
+ AC_HEADER_STDC
diff --git a/app-misc/razertool/razertool-0.0.7-r4.ebuild b/app-misc/razertool/razertool-0.0.7-r4.ebuild
index 916571dbd9e0..5255af99c271 100644
--- a/app-misc/razertool/razertool-0.0.7-r4.ebuild
+++ b/app-misc/razertool/razertool-0.0.7-r4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="Unofficial tool for controlling the Razer Copperhead mouse"
 HOMEPAGE="http://razertool.sourceforge.net/"
@@ -13,10 +13,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gtk"
 
-RDEPEND="virtual/libusb:0
+RDEPEND="dev-libs/glib:2
+	virtual/libusb:0
 	gtk? (
 		dev-libs/atk
-		dev-libs/glib:2
 		>=gnome-base/librsvg-2.0
 		>=x11-libs/cairo-1.0.0
 		x11-libs/gdk-pixbuf
@@ -27,17 +27,21 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 
+PATCHES=( "${FILESDIR}"/${P}-ar.patch )
+
 src_prepare() {
 	default
 
 	sed -i razertool.rules.example \
 		-e 's:ACTION=="add", ::;s:BUS=:SUBSYSTEMS=:;s:SYSFS{:ATTRS{:g' \
-		|| die "sed razertool.rules.example action failed"
+		|| die
 
 	# plugdev group may not exist (created by hal), default to usb
 	sed -i razertool.rules.example \
 		-e 's:plugdev:usb:' \
-		|| die "sed razertool.rules.example plugdev failed"
+		|| die
+
+	eautoreconf
 }
 
 src_configure() {
@@ -51,8 +55,10 @@ src_install() {
 	newins razertool.rules.example 90-razertool.rules
 
 	# Icon and desktop entry
-	dosym ../razertool/pixmaps/razertool-icon.png /usr/share/pixmaps/razertool-icon.png
-	make_desktop_entry "razertool-gtk" "RazerTool" ${PN}-icon "GTK;Settings;HardwareSettings"
+	if use gtk; then
+		dosym ../razertool/pixmaps/razertool-icon.png /usr/share/pixmaps/razertool-icon.png
+		make_desktop_entry "razertool-gtk" "RazerTool" ${PN}-icon "GTK;Settings;HardwareSettings"
+	fi
 }
 
 pkg_postinst() {
diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest
index bd7aafd441b6..cbcf3a343f14 100644
--- a/app-misc/recoll/Manifest
+++ b/app-misc/recoll/Manifest
@@ -1,3 +1,3 @@
 DIST recoll-1.25.19.tar.gz 2845683 BLAKE2B 745eac2dd3208619e173abba78f1e03186cdb5deb363c30728184a9d826c698d8e088cc0420178754131792f0d933f395a4fdb209a4315888b733a1209644580 SHA512 d56aff810e335f8212b908118de8fe12fc8d8f8341ebc281244c00dfe2216e008c655f4d39955b6c71928a28ea0aea073036fed17be5b80e8443fe6dfbe374f6
-EBUILD recoll-1.25.19.ebuild 3622 BLAKE2B ef6de54e1c249519a69016dc60c4dcc7aa0908299a8399a725f9d068912fb0987fb1c5cce2dce53c4c4e37a27e67ec0e95760b232ae982f99a3dd2b8185f89af SHA512 724fa2f70dcf57a7cf921f9d282901d846b6fd103195883bf79465c1c570bba3ecd59619aaa0182285b3692042941172bfedaa1ac382d50d3c7c79525e39e97a
+EBUILD recoll-1.25.19.ebuild 3626 BLAKE2B ee225b0e2a67b4daa437abd238d82dddcdd3532bc8dda11ff72ec6812e9c7133a5e5f269d813101309b035e08a75b0f254491dcd826e0ac5fe5ffb47bd2114c2 SHA512 1265aa3c34bf97fe18785e5744de9d202a5d60d2d3c72f8d9a2549360ed665d9c764c6320e375ad61a11f66baae5e5ab594eb89c44bcc7f8286949f110bad239
 MISC metadata.xml 1382 BLAKE2B e0fe8843b74140663aa9eb968ee212ef0fd76bda4dd17b353b8382fcee917f9d47c82c9790ccae260e375d66ff1ef34049130ddab90d89e89819139848341e00 SHA512 b677720fb6be1b93e6fc26360bb4b9c4008bb2908db4cb8a4d10e84312f5b7e2a59a4e67ef2c5c7b410abdb11b80385efc6d2d604445048a9a9a29c97141223c
diff --git a/app-misc/recoll/recoll-1.25.19.ebuild b/app-misc/recoll/recoll-1.25.19.ebuild
index 69845d664f2a..24369b53d320 100644
--- a/app-misc/recoll/recoll-1.25.19.ebuild
+++ b/app-misc/recoll/recoll-1.25.19.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
 
-inherit eutils linux-info python-single-r1 qmake-utils
+inherit linux-info optfeature python-single-r1 qmake-utils
 
 DESCRIPTION="A personal full text search package"
 HOMEPAGE="https://www.lesbonscomptes.com/recoll/"
diff --git a/app-misc/rundeck-bin/Manifest b/app-misc/rundeck-bin/Manifest
index c47e59661e7b..9f4c94448569 100644
--- a/app-misc/rundeck-bin/Manifest
+++ b/app-misc/rundeck-bin/Manifest
@@ -3,4 +3,4 @@ AUX rundeckd.initd 452 BLAKE2B 991239e09590f82b0b5f45c2f17700479f2e5fc8f0922bb25
 DIST rundeck-2.6.8-1.20.GA.noarch.rpm 101053077 BLAKE2B 44dc66ebbeb105e4ed5c198ca2cff9e69a03a226e43c0e68898a225955aaca471d1ada163962e25dbd3de097aa7582a3fae351d44a9740f1e46fc64526575620 SHA512 15620e306c10cae09eec95c43207cf88ebce69d4c7fd70289fac7f2f580343c623d77605f3dd5aa98cc882ec3512196aa431a2ff72e453780b415d19ee8bcebd
 DIST rundeck-config-2.6.8-1.20.GA.noarch.rpm 9460 BLAKE2B 97f943904ecfaa6d7a07bb7b8635ce13184f78fa3f042b5db8a4509d558836eda05772724e5fc58864a776900afeab790bbb6c86754e0f19dab12de827fda2a4 SHA512 ab4b9933bf942706cc1b8184375122d3e122e960761582d7b00b2a8981dc9b6cd6442ad8e65699db9e80e0a64b921f2916527f4c2263a58f70363e63a99b95d7
 EBUILD rundeck-bin-2.6.8.ebuild 1277 BLAKE2B f5ed62450c7331c9e21981258ee1b2ab67c8a04c442cca015279422189473d6654342a08819b2df3fe64e9bf1c1d3bab9280d7bc7d452a9cff27346780195d9a SHA512 e8174725622e3a8619194c50918ac68e97dcecf312d0d1dee3596e0cb23df1f195c1dedd5a162d75385dbfcbf3e87801b0581e4be7baee2c806d8a200ce93f49
-MISC metadata.xml 446 BLAKE2B 67031aade4a42706f4df737979e8638152084b91e5428d722771dee17a6ec0cf8b47d4be7e0f84d9e2ee48d3b0e72bf16681a1522cdab5135a05a8d875a1d165 SHA512 920ac4a31f6d230aa42afb98a197e7faf6cf13fc7ae77cab7824ab9f6ceac6aafd0b12f7e1478354304b754924f70d315ef06dba13ec51c57af3ad65154fb54e
+MISC metadata.xml 357 BLAKE2B 12dd8fa6e9f2fde87a1099ccfff29321cf82cb73617fb8c173f9ec3f28171b41f266a8a5a12224bef3c3fa56c830ed961630a640c1299a75c71b69ec6ecc0549 SHA512 381f317e07e399bc38d3b6eb773d9d8846fab3644deead6401f525cdf9d64987270edf4b38a2a82b0197fc2998ef825cec2d789ac84365d066271f0b16c859cf
diff --git a/app-misc/rundeck-bin/metadata.xml b/app-misc/rundeck-bin/metadata.xml
index 361b8c439fef..141fcf81ab49 100644
--- a/app-misc/rundeck-bin/metadata.xml
+++ b/app-misc/rundeck-bin/metadata.xml
@@ -9,7 +9,4 @@
 		<email>java@gentoo.org</email>
 		<name>Gentoo Java team</name>
 	</maintainer>
-	<longdescription lang="en">
-		Rundeck is a tool for job automation.
-	</longdescription>
 </pkgmetadata>
diff --git a/app-misc/rundeck-cli-bin/Manifest b/app-misc/rundeck-cli-bin/Manifest
index 35c322e79264..d775b0ded566 100644
--- a/app-misc/rundeck-cli-bin/Manifest
+++ b/app-misc/rundeck-cli-bin/Manifest
@@ -2,4 +2,4 @@ DIST rundeck-cli-0.1.11-all.jar 3447560 BLAKE2B e840d3b27dd173244781d1c37a6c3348
 DIST rundeck-cli-0.1.8-all.jar 3420534 BLAKE2B ea1ea74094fc0bbb84c0d8b052263d5e747a4407a8139124525b7d026d5ea3d9bf9c5db6dd2f0b00fd13a7d16f4c67133342da85f6872230a69fe44d6088eae1 SHA512 c7fff34c1a1091daf54e0ab89a832ab16e775704a6543af31745541419e3fc49d8b5fd47b404bda46dc1434945e652221825af553aff87b764623da4fe3bfdb6
 EBUILD rundeck-cli-bin-0.1.11.ebuild 539 BLAKE2B b8baa97a972f404a5d097aa8e79deb215ef13000d70175b5aacb8bf6a52f8017ce99ea8eadffdd167cf56ec05d77974a6c64085188eb5c4a7aad751cc7b6c6cf SHA512 098f2af034357d16c5397451189082a6d905fb4230b97569b29b06bb9613385aa4d62b3052a12d5474dfe650ccd9623a26968585f5c9eef99f9bd6131103c4b7
 EBUILD rundeck-cli-bin-0.1.8.ebuild 539 BLAKE2B b8baa97a972f404a5d097aa8e79deb215ef13000d70175b5aacb8bf6a52f8017ce99ea8eadffdd167cf56ec05d77974a6c64085188eb5c4a7aad751cc7b6c6cf SHA512 098f2af034357d16c5397451189082a6d905fb4230b97569b29b06bb9613385aa4d62b3052a12d5474dfe650ccd9623a26968585f5c9eef99f9bd6131103c4b7
-MISC metadata.xml 568 BLAKE2B 70e3ef9ffad4d6e5b64390db735dcb02835fd59dc7147b0a3c541ee7573a6a9a7dcc158aff4afc5702c7b052f3342aeb23683ceb3a284ae374390f2eca38d3be SHA512 3d650e73769e7ab68d5cd3e02f97325628172b8e36a99b3434029611f6c511122ff887f9a253095aa0a5a0ff0fba62128e23b0ef8c8863a3a8be6652073f617a
+MISC metadata.xml 441 BLAKE2B 63748c0f151f93be0e85a5bde27cc9715a834df86b317c01ba2fec414d89af69f1f944aa6935b159e1214c9cd992e0e3494ba45b1d853078d51266ed1ea04cc0 SHA512 d6c2f911e5280f428bda1b36b088fc363ed49a5f43ea739a7bb0b3ce79fa044a7850304ded546fdca351f87f9b250f8dc8a5006fb47119b40aa41ea5bd234c76
diff --git a/app-misc/rundeck-cli-bin/metadata.xml b/app-misc/rundeck-cli-bin/metadata.xml
index e5b6b571c957..216ad2c14e9f 100644
--- a/app-misc/rundeck-cli-bin/metadata.xml
+++ b/app-misc/rundeck-cli-bin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -9,10 +9,6 @@
 		<email>java@gentoo.org</email>
 		<name>Gentoo Java team</name>
 	</maintainer>
-	<longdescription lang="en">
-		This is a command line interface for
-		<pkg>app-misc/rundeck-cli-bin</pkg>.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">rundeck/rundeck-cli</remote-id>
 	</upstream>
diff --git a/app-misc/screenie/Manifest b/app-misc/screenie/Manifest
index ff5e26c8eb89..cefb4b026010 100644
--- a/app-misc/screenie/Manifest
+++ b/app-misc/screenie/Manifest
@@ -1,6 +1,3 @@
-AUX screenie-CVE-2008-5371.patch 636 BLAKE2B bf756636c9a7258fff968aaf5d8eba093ea4f41efc16fe9dd16c56ffb779f10ba097f52015c4acf0b82b68daca7e7b8a3243a230b8bb24928e8e9add323f2285 SHA512 64fb52e614d281e8302b6a664d28692b88c5f56301fec1f5f9be546eb71a17aaf462b9a96ea1f0ad1176583613edea292cfd08e10f4a144c12f67c575696a084
-DIST screenie-1.30.0.tar.bz2 10068 BLAKE2B 49bbb8f81141c2b0707aab04e8a43f27e5ccd5c4241cf0e0e7ee3a7bd7944dc61c11f3a9ac5ae3040fecae1947a4271561e9b164b64512043916e3b39f25901c SHA512 8068421aaa461df32bccbe72e23474b20ef3f761e78a3e520c1f9f19a383d9ad9fd0377e2cdf1c4f023ca570b172a40ebff63d3cb538b96d1e1706fe83d03fdd
 DIST screenie-20120406.tar.gz 3437 BLAKE2B 354410d41e1aa9c6bcef3951f26aafcabf8e5af5ba4abd69627e62575127c1190abc78db4ee72552b02ad5cbcde0b6c910dfbb9191f2fd8444e57dff36d16701 SHA512 73e9c9cf53792c51785d45319f65559f5d8f1c97f8637d3c3262384eb1a3835f3ba380e4c9284858e163e8d2021938c2ef3ab50f2854d5f932e96847b9a4c153
-EBUILD screenie-1.30.0-r1.ebuild 501 BLAKE2B 14ac796383358ce287b47d8712d9c8c5d67c48006c51639140d193fb8878754b4c0f11dd0cb5b051be0912159c9a4767e042fca7147488e77729b76206fc7ead SHA512 0c124ecbdadec4605d554f02fefca829710238010cb00ac9a6f78544677d42eda379d6a594b2b7d206a0b73cd7b7bbc307c1b2bfb3d91ff7e0f26d12dc83ef53
-EBUILD screenie-20120406.ebuild 474 BLAKE2B cfd40ec8d9484b36bb1465c0c678835ace922dde4f15606eb084772145c2d4493c5a90f14f4c6c9deb5cc08ad9e4be8bc54edf04f8fd5c5ca5d862d657b963dd SHA512 3211f3795d0c715e476c09cc6e70624d7d5f4c41fd9451f6dbca78899b4c7335cfe355375ebd8f3eb001ab5ba6cdc9a2ee8d4decfe5edc637c2113a720526fec
+EBUILD screenie-20120406.ebuild 470 BLAKE2B 5c3c462d06b9a765933199fd2b6e4e2960f82ca92b6edb576943c1750ea8836e14f36cf6de67fcb1fe75c04fe7001888440bdadaaa7e7b47efc8714ff112cf0e SHA512 d17c4fc9133702ec702b0dd5f25270d099d220e0dbb198cab298069b1d01013790ab7f5dd99102827216ca366f431faf6077997f1616989fee34d092e1b5baea
 MISC metadata.xml 662 BLAKE2B 0c32c03641dcd4c9bb279e3c17ba672258ccfa45ef03dcba773344bad57ed910372425d12debf1af02a15f6a9971e32ca0716b7260b8f641bc84e199c31c423c SHA512 7e94f65c55ea3e466d07eaee0f69f5669da66c02ef433b75c766bdaaf403a88e9124a96cddc6a8621278e36ac68e83cdb197410faf2adfd6255f87ab7469da25
diff --git a/app-misc/screenie/files/screenie-CVE-2008-5371.patch b/app-misc/screenie/files/screenie-CVE-2008-5371.patch
deleted file mode 100644
index 2bf8dbdc6b8a..000000000000
--- a/app-misc/screenie/files/screenie-CVE-2008-5371.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Patch for bug 250476 (CVE-2008-5371), courtesy of nion@debian.org.
-
-diff -u screenie-1.30.0/screenie screenie-1.30.0/screenie
---- screenie-1.30.0/screenie
-+++ screenie-1.30.0/screenie
-@@ -19,7 +19,7 @@
- # Foundation Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- 
- #global settings
--TMPF=/tmp/.screenie.$$
-+TMPF=$(mktemp -t skreenie.XXXXXX || exit 1)
- ACTIVE_SCREENS="screen \-ls | awk '/tached/ { print \$1}' | sort"
- i=0
- e=0
-@@ -59,9 +59,9 @@
- esac
- 
- #cleanup temp files
--if test -f /tmp/.screenie*
-+if test -f $TMPF
-   then
--    rm /tmp/.screenie* >/dev/null 2>&1   
-+    rm $TMPF >/dev/null 2>&1   
- fi
- 
- while :
diff --git a/app-misc/screenie/screenie-1.30.0-r1.ebuild b/app-misc/screenie/screenie-1.30.0-r1.ebuild
deleted file mode 100644
index 4b3a0fa8a2e9..000000000000
--- a/app-misc/screenie/screenie-1.30.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="screen(1) frontend that is designed to be a session handler"
-HOMEPAGE="https://sourceforge.net/projects/screenie/"
-SRC_URI="http://pubwww.hsz-t.ch/~mgloor/data/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ia64 sparc x86"
-IUSE=""
-
-RDEPEND="app-misc/screen"
-
-PATCHES=( "${FILESDIR}/${PN}-CVE-2008-5371.patch" )
-
-src_install() {
-	dobin screenie
-	default
-}
diff --git a/app-misc/screenie/screenie-20120406.ebuild b/app-misc/screenie/screenie-20120406.ebuild
index 2b2e7eb357cf..ad452493da10 100644
--- a/app-misc/screenie/screenie-20120406.ebuild
+++ b/app-misc/screenie/screenie-20120406.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://downloads.sourceforge.net/project/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm hppa ~ia64 sparc x86"
 
 RDEPEND="app-misc/screen"
 
diff --git a/app-misc/task/Manifest b/app-misc/task/Manifest
index 323f0193efc7..edb943995ab2 100644
--- a/app-misc/task/Manifest
+++ b/app-misc/task/Manifest
@@ -1,4 +1,6 @@
 AUX 0001-TW-1778-Unicode-strings-are-truncated-in-task-descri.patch 660 BLAKE2B 56250a860b836d64b190049912123ebc5a06202ad25a6aa974a420b856f472d7aa5364cee96539c204e2c09c88a9f6e59cc5606aacf5b8c29655310340233a49 SHA512 6af9226a73280ca1c5f3f95d11b9c8f10ad4d847df9401643a8294645031cd3141916e4b00a188e25795f4a51f9f55e4caf2ba3280d5c9bd89f44a89411389a5
+AUX task-2.5.1-clang-build-system.patch 720 BLAKE2B 346ed760dfdc0e7dfb90de4ed91f49fbe91e48e28c624177898ec317fef9f0c43854e18527c57b21ba84320dc87adde3837f5cce69e1ffeb548cc1cbc0ab51a5 SHA512 afeb97da39429fa7402d1f856923d168bd07ae05492099c3132ebf04e459707208ccd0c1a7927c554c7573ae4c296e224e49e12a72e499543057fe7a7b25d8e1
 DIST task-2.5.1.tar.gz 903428 BLAKE2B afa17364984237ea589921afb4379297b128ea1bb6b0834f875b1b02b38dbfde5e961122fdde00dc5ff29b56226a5ce0f805bd1be8a8194c9e185ab80ad6d6c2 SHA512 ec17e5cefff55ecd2c1cb717801c02683d94030906c8d86450c3c79c0bc5a18d82559a5e9e26a91411a1025a241b78ddbc1de51cafc1a2dd531e8229e5e61c10
 EBUILD task-2.5.1-r1.ebuild 1264 BLAKE2B 9ce29b7eb39bd74479dbd22f7169072047f6f84610dadfffff0cc092ec28764be925760ef0707c37b91294bbeb9bda530fde908837e704ed9d2132a338d32508 SHA512 1cb91bbc30012a9c292a4d3b3c40aa6ef80ff7580b2fd86d9e12e7a1b49b414c0fa9de60c1ac6b55067b5f258977517b7f103488d2923cd4e96d787dc074d150
-MISC metadata.xml 236 BLAKE2B f169c33fe55c71f409182027bb298488600a0430d4c48aa4330f560e294c808ece6dfd6c6060ed3b8dc2206e2c50c5b092431b3cb04d5305744f90f1775a67e0 SHA512 f480ca34742d0ccf07a52fa544ccb6a0d8af3426341e5b0e2492c9f349cb2e3788c87424208559af17f6552764b65e278e290148d9644a935e1e4aae2445a55a
+EBUILD task-2.5.1-r2.ebuild 1168 BLAKE2B 300fa4227912d43a7f81d2ab75b9d473057985625a31ec20c96d7e772955b110eb42d3e349ce5846889928ad26a0219645b8bf9bc420c052194b68f0159e5fc4 SHA512 877291c8484b3c6fea9a6ebd32d8ffe996540ce292b4f61e27e56754ca6fd4d2fb928ae901081e5bd76837c7803032997459d8207cf47c154983d7a4a0a27629
+MISC metadata.xml 435 BLAKE2B bc50b21afa9614b81ef07ba84c6261fa5978fc8e050a7b2436e83eb2030a86404c89c37a2acc6164d53d0aa265921fea209eb0e3e10d67b3dc028a41f4a2885a SHA512 2b2ea567948e32f5cab9fbebb7e5b96add831e4992eab88bcc304c26eb2bf533fade36048dbdbf36202c174a63cd8587b33f2a7ba86d0fd8bf009a860c9a7593
diff --git a/app-misc/task/files/task-2.5.1-clang-build-system.patch b/app-misc/task/files/task-2.5.1-clang-build-system.patch
new file mode 100644
index 000000000000..e138134fcd9a
--- /dev/null
+++ b/app-misc/task/files/task-2.5.1-clang-build-system.patch
@@ -0,0 +1,17 @@
+Do not force the use of libc++ when compiling with Clang
+Fix by David Denoncin
+https://bugs.gentoo.org/729560
+
+--- a/CMakeLists.txt	2020-08-09 14:04:40.095904996 -0000
++++ b/CMakeLists.txt	2020-08-09 14:04:59.449238208 -0000
+@@ -43,10 +43,6 @@
+  message (FATAL_ERROR "C++11 support missing. Try upgrading your C++ compiler. If you have a good reason for using an outdated compiler, please let us know at support@taskwarrior.org.")
+ endif (_HAS_CXX11)
+ 
+-if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+-  set (_CXX11_FLAGS "${_CXX11_FLAGS} -stdlib=libc++")
+-endif (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+-
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+   set (LINUX true)
+ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
diff --git a/app-misc/task/metadata.xml b/app-misc/task/metadata.xml
index 41d4a9ba90e9..3720d3657373 100644
--- a/app-misc/task/metadata.xml
+++ b/app-misc/task/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>ddenoncin@gmail.com</email>
+		<name>David Denoncin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="sync">Enable "task sync" support</flag>
 	</use>
diff --git a/app-misc/task/task-2.5.1-r2.ebuild b/app-misc/task/task-2.5.1-r2.ebuild
new file mode 100644
index 000000000000..3f7eacc9f2a5
--- /dev/null
+++ b/app-misc/task/task-2.5.1-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 cmake
+
+DESCRIPTION="Taskwarrior is a command-line todo list manager"
+HOMEPAGE="https://taskwarrior.org/"
+SRC_URI="https://taskwarrior.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE="+sync"
+
+DEPEND="
+	sync? ( net-libs/gnutls )
+"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/0001-TW-1778-Unicode-strings-are-truncated-in-task-descri.patch"
+	"${FILESDIR}/${P}-clang-build-system.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# don't automatically install scripts
+	sed -i '/scripts/d' CMakeLists.txt || die
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_SYNC=$(usex sync)
+		-DTASK_DOCDIR=share/doc/${PF}
+		-DTASK_RCDIR=share/${PN}/rc
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newbashcomp scripts/bash/task.sh task
+
+	# vim syntax
+	rm scripts/vim/README || die
+	insinto /usr/share/vim/vimfiles
+	doins -r scripts/vim/*
+
+	# zsh-completions
+	insinto /usr/share/zsh/site-functions
+	doins scripts/zsh/*
+
+	exeinto "/usr/share/${PN}/scripts"
+	doexe scripts/add-ons/*
+}
diff --git a/app-misc/ttysnoop/Manifest b/app-misc/ttysnoop/Manifest
index d201b6423922..5c33499194a7 100644
--- a/app-misc/ttysnoop/Manifest
+++ b/app-misc/ttysnoop/Manifest
@@ -1,5 +1,5 @@
-AUX pinkbyte_masking.patch 1028 BLAKE2B 8aaeb707d1ff8ec5325bfd27636fdcfdb78d486b8f9c1213ee0578762017468748239adc54d7f1c27f1feb8f076137bddc701ef4f1356f965b25b158ef7c9a0c SHA512 a4adede6ceeea84ccf760805fb4f7044fa06fcc00291556bcaf61b8be81256d10751e3efd7e35c8b26897d98878da6dc17d526cd335aee5bb91762cd129225f1
-AUX ttysnoop-makefile.patch 1004 BLAKE2B b0233a65382023260cb78d095be0ca298c2d43365f9488fd3c6f255acca10d3f9c9ffd2d9e3af5f711baa86da8932fac5b19909dd7437a1a049a95c226bf6ca2 SHA512 f5e8f5764ecfd7174646801650f63ed5608dd5ce1d5e321419ff5318946ed03b61f2e25108d9d5c9dbce95eb4b788c74543cc57b0ba57d430e6ddc519e73321d
+AUX pinkbyte_masking.patch 960 BLAKE2B b42c754ea33c41bfa1c6ca5c529af30c1fe05473accbb4be195e1d5d30944e4a38e4175226b16cd9d3560707135b9cc8056374b3e87a4a937515fd8cae8e8764 SHA512 20e6d3d8d909bdd9795e52c5e46ed6ca60a6a8448027cf011d8f77a2201fb44d49ba5b73d8a9e3c682c187fd88efb30ded531a2efb8183ae764cf6d2a5bfa38c
+AUX ttysnoop-makefile.patch 1085 BLAKE2B 6578ff063cc6b4e3d48085761deffdb8de1b98324f6c8ae08fbd46bb9b45cf968bbf5e9d14930ae23666c08656f10d695ef5022f384875122917b8c4c63373a5 SHA512 eab5831d6d744e5fb9f5a3105c773872f0c6995a917169c162bccf829ce9dbd63dcd28360ee99faf08cf7aaec034df02d73c21d7dae0f004779ac66519aab419
 DIST ttysnoop-0.12d.k26.tar.gz 9376 BLAKE2B 114c260de72c4909b97fb47d3ec8b22cf2406df433f708299098df7a7b1315ada8babd81c62ae3a12775fb2393c6548d24457df85523663223960390bb2891c1 SHA512 9ac90ce08e170442718ca4871b7cb569acd8a594e63a56a6889ff0852be93a6ae8e7a212ba1064e74286043dad5a27af5d8588cb3b1ea297db4bf7fa10c66665
-EBUILD ttysnoop-0.12d.ebuild 833 BLAKE2B 3bd50bd067edc0105d8c52dbe6bc5753f846096b682a5146a911237ebc37160591ce10a841013b15397fc884418552b3478e5a35e0fbed23dd8470262d1c947e SHA512 cdebbedcedf584bbbdb4d24a80b97deaff7c60b47ef5f6dfcc518acef7c03fd410d8015b092cd322e74f6f718d4fdb717430dca4b64a3859106c5ed65da23f86
+EBUILD ttysnoop-0.12d.ebuild 765 BLAKE2B 9efaac8d581419cdb97b2e0282345317035691cdd3e3f7fb069ee388d4336c01f4b4bb2b4e14d9d546f1db19803d4a6f23e2ea5a0faf4df769ef3633c49cd1fd SHA512 3a6aaee1f956f5d329c6969f2128a16363e68735d6e3dfd6fa36b04e39d6387c869287125c9b98fd95ea300835523f808d71ce57bd30cd7c675655dd8b6af49e
 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/app-misc/ttysnoop/files/pinkbyte_masking.patch b/app-misc/ttysnoop/files/pinkbyte_masking.patch
index a0539c239b04..8d944b21e3af 100644
--- a/app-misc/ttysnoop/files/pinkbyte_masking.patch
+++ b/app-misc/ttysnoop/files/pinkbyte_masking.patch
@@ -1,5 +1,5 @@
---- ttysnoops.c	2009-08-13 17:11:30.705202250 +0400
-+++ ttysnoops.c	2009-08-13 17:17:29.989201055 +0400
+--- a/ttysnoops.c
++++ b/ttysnoops.c
 @@ -18,6 +18,7 @@
  	v0.12d  8-4-98 Carl Declerck	- updated #includes a bit
  	   k26 28-5-00 Vinicius Anselmo - added sound alert (demoniac) created by Stas
diff --git a/app-misc/ttysnoop/files/ttysnoop-makefile.patch b/app-misc/ttysnoop/files/ttysnoop-makefile.patch
index 54d04dd40a29..ba8d702e9e6e 100644
--- a/app-misc/ttysnoop/files/ttysnoop-makefile.patch
+++ b/app-misc/ttysnoop/files/ttysnoop-makefile.patch
@@ -1,6 +1,15 @@
---- Makefile	2004-06-07 04:27:40.000000000 +0400
-+++ Makefile	2011-07-21 11:50:22.580167326 +0400
-@@ -11,7 +11,7 @@
+--- a/Makefile
++++ b/Makefile
+@@ -2,8 +2,6 @@
+ # Makefile for the ttysnoop programs
+ #
+ 
+-CC	= gcc
+-
+ # Without shadow support
+ 
+ #CCOPTS	= -O2
+@@ -11,7 +9,7 @@
  
  # For shadow support
  
@@ -9,28 +18,28 @@
  LIBS	= -lcrypt
  #LIBS	= -lshadow
  
-@@ -24,19 +24,19 @@
+@@ -24,19 +22,19 @@
  all:		ttysnoops ttysnoop
  
  ttysnoops:	$(SERVEROBJS)
 -		$(CC) $(SERVEROBJS) -o ttysnoops $(LIBS)
-+		$(CC) $(SERVEROBJS) -o ttysnoops $(LDFLAGS) $(LIBS)
++		$(CC) $(LDFLAGS) $(SERVEROBJS) -o ttysnoops $(LIBS)
  
  ttysnoop:	$(CLIENTOBJS)
 -		$(CC) $(CLIENTOBJS) -o ttysnoop $(LIBS)
-+		$(CC) $(CLIENTOBJS) -o ttysnoop $(LDFLAGS) $(LIBS)
++		$(CC) $(LDFLAGS) $(CLIENTOBJS) -o ttysnoop $(LIBS)
  
  ttysnoops.o:	$(SERVERSRCS) $(INCLUDES)
 -		$(CC) $(CCOPTS) -c -o ttysnoops.o $(SERVERSRCS)
-+		$(CC) $(CCOPTS) $(CFLAGS) -c -o ttysnoops.o $(SERVERSRCS)
++		$(CC) $(CCOPTS) $(CPPFLAGS) $(CFLAGS) -c -o ttysnoops.o $(SERVERSRCS)
  
  ttysnoop.o:	$(CLIENTSRCS) $(INCLUDES)
 -		$(CC) $(CCOPTS) -c -o ttysnoop.o $(CLIENTSRCS)
-+		$(CC) $(CCOPTS) $(CFLAGS) -c -o ttysnoop.o $(CLIENTSRCS)
++		$(CC) $(CCOPTS) $(CPPFLAGS) $(CFLAGS) -c -o ttysnoop.o $(CLIENTSRCS)
  
  common.o:	common.c common.h
 -		$(CC) $(CCOPTS) -c -o common.o common.c
-+		$(CC) $(CCOPTS) $(CFLAGS) -c -o common.o common.c
++		$(CC) $(CCOPTS) $(CPPFLAGS) $(CFLAGS) -c -o common.o common.c
  
  clean:
  		rm -f *.o core ttysnoop ttysnoops
diff --git a/app-misc/ttysnoop/ttysnoop-0.12d.ebuild b/app-misc/ttysnoop/ttysnoop-0.12d.ebuild
index 400e1e6c2c64..ccbb8cd23f2c 100644
--- a/app-misc/ttysnoop/ttysnoop-0.12d.ebuild
+++ b/app-misc/ttysnoop/ttysnoop-0.12d.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
 MY_P="${P}.k26"
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Tool to snoop on login tty's through another tty-device or pseudo-tty"
 HOMEPAGE="http://sysd.org/stas/node/35"
@@ -14,30 +14,28 @@ SRC_URI="http://sysd.org/stas/files/active/0/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-DOCS="README snooptab.dist"
-
-src_prepare() {
-	epatch "${FILESDIR}"/pinkbyte_masking.patch
-	epatch "${FILESDIR}"/"${PN}"-makefile.patch
-}
+PATCHES=(
+	"${FILESDIR}"/pinkbyte_masking.patch
+	"${FILESDIR}"/"${PN}"-makefile.patch
+)
 
-src_compile() {
-	emake CC="$(tc-getCC)"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
 	dodir /var/spool/ttysnoop
+	keepdir /var/spool/ttysnoop
+
 	fperms o= /var/spool/ttysnoop
-	dodoc ${DOCS}
-	dosbin ttysnoop
-	dosbin ttysnoops
+
+	dosbin ttysnoop ttysnoops
+
+	dodoc README snooptab.dist
+
 	doman ttysnoop.8
 	insinto /etc
 	newins snooptab.dist snooptab
diff --git a/app-misc/uptimed/Manifest b/app-misc/uptimed/Manifest
index fd9bb27642fc..b000047aedca 100644
--- a/app-misc/uptimed/Manifest
+++ b/app-misc/uptimed/Manifest
@@ -5,6 +5,6 @@ DIST uptimed-0.4.2.tar.gz 55339 BLAKE2B 120a3b1d6dc9518f7051af4d7e0f1bcf455f7dd9
 DIST uptimed-0.4.3.tar.gz 55396 BLAKE2B bebea6559c436d2700df905b63fabd73b1c55463e8633409bc05cd16c7d110d8116f52e00d63879cfb2e0482f648bda04dcb5a1d5ff629699d2758dcc85ba53a SHA512 f9485224dfe7173bab135a87b047d749f9b61d3c29d50523126b585ae77e68837680fdb725a08fd7cad39f0b35b2da7a6923b8540700881f9638286ab5082260
 EBUILD uptimed-0.4.1-r1.ebuild 1572 BLAKE2B d671cc82a3e76873eaa2ae175208196157a4bb9fcd0edb0ce94ae6328ed399d2537709bb079bcaf156682161d7578a533e817b35e0d81cb9f5120f0bfce177b6 SHA512 cba8c853d8bae0720a8c9c8a90b9e2a6be75be297b6840ec04bc5f50351117941b95ff2c74e37e520ee5fece5d631e61c5f7031e39fbb9bec9aa693f62fd9ab4
 EBUILD uptimed-0.4.1-r2.ebuild 1603 BLAKE2B 2fe5cb29ef9c1cc6c77898bc79ef14be68d90c8576bd2764cc939d4bbfb5d59dd9bc990618b7bcaa953335ccb3699d4558f3b96717b39886d107729fb01bb0be SHA512 c0a42a785ae77e3b4b79c0f7fef99696553294d5e54472b85b9990a6d562e76010f9903f46513899a103cd56edb6ba84345cc61f9bb621925da70e7ae6058e2b
-EBUILD uptimed-0.4.2.ebuild 1606 BLAKE2B 816f8ebf1e49e81716049afdaf5917647ae295209d4fb209e71e59234dacf4db4a1031edcd92813697ca660a5b21c89fc85d0c71ca7dcb9061d5e5555712f2ea SHA512 2fa5cb41761637098dc211e817e0966211c40623292c7a591bca03f48b05066ce69e3f2dd9b933dec11b7958eeb433a8967215d93d830063aa386fc4b3d825aa
+EBUILD uptimed-0.4.2.ebuild 1604 BLAKE2B de9bb7230f1ce7d088ec8d8c14f1d11195f6a28b1e5e899b80bddffab300bf2f9cdb130833ed7028826662c9f11674b13e26a4475c724c080f74c563b899af74 SHA512 aef3c2466a5e9bba70f7384630b31cdb0d7c88d293955c26e0891e976c2404803008b00f8298f6a3e3e4bf192cb8d1fc8a4b36fa2ac39bcebaae9de1358c82dd
 EBUILD uptimed-0.4.3.ebuild 1610 BLAKE2B d0e7bfc42af1f58fbb2ad1af6be005fd1205d3b2a02ea54df3436dfa7c1433c5c251db06db0eb4318276272103ed2fc39757008c0890393ea41c58cb89568f64 SHA512 55a244d867c1c3fe7c6b59b075664e8d9dda6fb20f0445b59c19f3a5162deb027fa6743b02190ce7045f43c13b1e7835a707ef20b2d3d5f3c8e13f2cfc97b9ee
 MISC metadata.xml 343 BLAKE2B c84e06dd0bdd9ae4d3b36bf4795c51e9037c38401f8d3fadeb9853190e8291f82f370ac45afab0f79326c89dcfb359d139a08a490ca4f7418738f61d8d0d1f02 SHA512 59bdf10b3845f10cfbb9441ccd3ac6d8a7a85791f57acc2148ad334d0b9883d4d98b388bc93eacdec8a77ac885339e2aea368a9755bbda483132ec69c68a430f
diff --git a/app-misc/uptimed/uptimed-0.4.2.ebuild b/app-misc/uptimed/uptimed-0.4.2.ebuild
index 9e22f6f7eb46..b5ad54d55125 100644
--- a/app-misc/uptimed/uptimed-0.4.2.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~mips ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/app-misc/vittk/Manifest b/app-misc/vittk/Manifest
index b629c53fb17c..fd4f4e2c1d98 100644
--- a/app-misc/vittk/Manifest
+++ b/app-misc/vittk/Manifest
@@ -1,6 +1,6 @@
-AUX vittk-1.1.1-dirs.patch 2540 BLAKE2B c2b55384c213960476d89aed85b9041d74842eaca87d22e9d1bce2e0e0949c61591b3af82fdf66c38398789536af27dbeb87d5d95a441f85893cb6eef92dd192 SHA512 bd2a32082d22c52d7f5db18795189562b06c7b5178276b2034e5614419879c2c32056a77991ce33f397c743630b38457effb0ed2ad6e5b53c4c160a0f83727ac
-AUX vittk-1.3-configure.patch 831 BLAKE2B 3838841a6ee8bb4fb686a7372740f5759340f8254e54b69986f7c3080e183994dce35408df8067863fad1b36948675b0b9634f7eb9a98c2b9029a313dfefee0f SHA512 b5a8032822643125687e8282b3fb775fb008156674c19485f70ab1aee9424cdc73294978f67f0b04c0dd765903d9be032a807086233b9a5dd1fdd7a04cabb5d8
-AUX vittk-1.3-makefile.patch 3750 BLAKE2B 6f4e3037a785d9b0bc71b7a4aa2eecba5e63805f96fd80668cb1b96d2e598997d698ba0acf0d9739cb6c401af60727e91fd5129567a0377a875ff123da590c73 SHA512 c8d59448ae96f3c25925aa707778079da52ec343e84252c4e03c2f9b6d8a3bffca21f03e0798c9ab7d66994bd6adcd3eded9ae4126ca8cef2a7f8a825e9a1c89
+AUX vittk-1.1.1-dirs.patch 2490 BLAKE2B 7eccfb13df6ca64a2244d45e60d193e1c828ae31e785bad5e35760a5aa2326f71692902907748a0d27eb837d549d115de0c37a2c42e16b0dd1a82775aacaf812 SHA512 67f4ad9f44b06017c5f8fe4370ebfd2d7467abe51223281905ddf8f1a09457ff9fa097226a51d3a0d8034b861d90e6026bf6ac583a46db9f67eac129ad1e01e0
+AUX vittk-1.3-configure.patch 810 BLAKE2B 40e4cc3efc99cf976aaeccc7d075f9a77e2396cfad67aefd2298ff8d9d3d0091ddcd96631f5f05e89340d872861c75c0ba3ea7b2027e31013731fa0b43500452 SHA512 0ac4b5c6a1df2405be3ddf9e87d2a6978db157e1646824ce9baf8f80865e5a59e7185eca6a799cfdc47a6fbe521dec9c27db66fcd6128d0bd224f517b937c4e1
+AUX vittk-1.3-makefile.patch 3729 BLAKE2B 2ba2d2096dd522331e1b7dd719c7d98db80f4b4b25385499a02b87c9b79d7313240a889951cc6612341884a2f180324c640cb592b75b3e6317e4ab9b7d25af7f SHA512 9f284630c003bcdb911f34e2a49a1d8ad3119fa781a9eadd0dda7116220ce2481dd64104258fd90fcef4fad1b49dd2f9be54b1769bef2ec293e487a02890c200
 DIST vittk-1.3.tar.gz 71921 BLAKE2B eae3aeee88f1986fd654307b0bae4fd7bc9c3f86312f82bb3776ee5f8d36b45489aee386762a9c8a1ef67766d75aa01086ab50a4743bffe14910411ccb19dd88 SHA512 feda4eda7780a5a2a51acbc4c4d47ba5b88c3c01c82ae8715e7822700843e0d7de365b786554db59f7e40dbdff6f6bb0083a2126b1b082586504d8d16112af6d
-EBUILD vittk-1.3.ebuild 671 BLAKE2B 60f3e2aee3ba0b8dd88f7026aaa1a6459b04b3632875cf0efc4c1d0ac7cb54d02254abe906d9efb6e17dde1e7b5e3fbede004ea906461a6f31dc638a7fcb18c0 SHA512 d27e434a6fa1d108dcbfd49660b1b9a1728ff5df48fd14bbfa3a307b843f3c550981e94ad521e15537a714e7eb9dff62014658f7c2f88aa3c9fecb2b752dc8d8
+EBUILD vittk-1.3.ebuild 621 BLAKE2B 339c485bbb9e403e7a86d25ee9f9afb5a0a042eb3b7e831100001619480be40d1dd34657d722ad5b904bafa35df4c61c64b249503076788f47d817ddb406c5f4 SHA512 7f21ec4b34af48bdac13d61df6d6f1bc7fe55d03dd9a02f0e2be8a775953544e0c94cf8f7fc9002462233d4fcbd318d2336c722d41eadc68cda44578dc5eb429
 MISC metadata.xml 390 BLAKE2B 894900220ccdd655ebedc4eb754233116f9bd0a4a41ef17f3da95f93a665c9435ce507b0dcf4b27f618b1e7fef88de95fdb47e0f2eeac9bcae969d27928d431a SHA512 22fe059e8490e1a6a338aafcd8257cd121e629ed52cd80a95b8a57061e8ca2b0483f6fe4a5926e85b533ff60d96dfe8d7c6ec31bfc91f2b621ca0ecc86462b79
diff --git a/app-misc/vittk/files/vittk-1.1.1-dirs.patch b/app-misc/vittk/files/vittk-1.1.1-dirs.patch
index 050d1bcded01..ceee0c5c5394 100644
--- a/app-misc/vittk/files/vittk-1.1.1-dirs.patch
+++ b/app-misc/vittk/files/vittk-1.1.1-dirs.patch
@@ -1,5 +1,5 @@
---- vittk-1.1.1.orig/vittk.in
-+++ vittk-1.1.1/vittk.in
+--- a/vittk.in
++++ b/vittk.in
 @@ -17,7 +17,7 @@
  
  set font "@FONT@"
@@ -20,8 +20,8 @@
  }
  
  ReadRcs
---- vittk-1.1.1.orig/vittk.man.in
-+++ vittk-1.1.1/vittk.man.in
+--- a/vittk.man.in
++++ b/vittk.man.in
 @@ -89,13 +89,13 @@
  in Taskwarrior.  At this time, various other parts of the VITtk color
  scheme can only be changed system-wide by altering the variables in
diff --git a/app-misc/vittk/files/vittk-1.3-configure.patch b/app-misc/vittk/files/vittk-1.3-configure.patch
index b45464bfb8b1..0973c0b5d43d 100644
--- a/app-misc/vittk/files/vittk-1.3-configure.patch
+++ b/app-misc/vittk/files/vittk-1.3-configure.patch
@@ -1,5 +1,5 @@
---- vittk-1.3/configure.in.orig
-+++ vittk-1.3/configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -14,11 +14,11 @@
  fi
  AC_SUBST(BASH)
diff --git a/app-misc/vittk/files/vittk-1.3-makefile.patch b/app-misc/vittk/files/vittk-1.3-makefile.patch
index a7148fdf64dc..a6fa32adc22c 100644
--- a/app-misc/vittk/files/vittk-1.3-makefile.patch
+++ b/app-misc/vittk/files/vittk-1.3-makefile.patch
@@ -1,5 +1,5 @@
---- vittk-1.3/Makefile.in.orig
-+++ vittk-1.3/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -10,45 +10,45 @@
  	@echo "usage: make install"
  
diff --git a/app-misc/vittk/vittk-1.3.ebuild b/app-misc/vittk/vittk-1.3.ebuild
index c53b6a2df04a..bc1c47519edb 100644
--- a/app-misc/vittk/vittk-1.3.ebuild
+++ b/app-misc/vittk/vittk-1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="A front end for Taskwarrior (app-misc/task)"
 HOMEPAGE="http://taskwarrior.org/wiki/taskwarrior/Vittk"
@@ -12,21 +12,23 @@ SRC_URI="http://taskwarrior.org/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="dev-lang/tcl:0"
-RDEPEND="${DEPEND}
+RDEPEND="
+	${DEPEND}
+	app-misc/task
 	dev-lang/tk:0
-	app-misc/task"
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-configure.patch
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${PN}-1.1.1-dirs.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-configure.patch \
-		"${FILESDIR}"/${P}-makefile.patch \
-		"${FILESDIR}"/${PN}-1.1.1-dirs.patch
-	eautoreconf
-}
+	default
 
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}
+	mv configure.{in,ac} || die
+	eautoreconf
 }