gentoo resync : 23.09.2020

46 files changed, 71 insertions, 594 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index e5be3d343624..82fd0df35a75 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/OpenRGB/Manifest b/app-misc/OpenRGB/Manifest
index bfabfe84103b..8b4a4e34887c 100644
--- a/app-misc/OpenRGB/Manifest
+++ b/app-misc/OpenRGB/Manifest
@@ -1,7 +1,7 @@
 AUX OpenRGB-0.2-build-system.patch 736 BLAKE2B cf03e1690f6bc671de860cc2d7346cb8bf97bb0bde16d6931f476794358a682b740f976ffac12c0e3ab8b52a11d785d1b31706120c3323e35cc812cede2a98e5 SHA512 5959c2b2c07f53f583fbb7c6f29e2128343167daff4bad59d652be44dd6b8fb6bcf04e84bf523731ccd2d8f296966bd7239c8edbccb72b3a9c42a3e184db71f7
-DIST OpenRGB-0.3.tar.bz2 2153970 BLAKE2B 2b913fd867cfd2d856d70d15ec91abd6a6d2822b367bc72f8f4275784793474beab4f442bc1af0ec3c3f33630b2f6b09d490d4f326fa4dbc4dbe11e4944cbc6f SHA512 629eb654636051b18da0f49cccf4e35dbe11a1373941cd355b27492b8382c113637d80039fa7aa749ae3f36bf838ad4da8da00f5abf5a0b8910be0ad1ecd999c
 DIST OpenRGB-release_0.3.tar.bz2 2146596 BLAKE2B fc9228d8746770440b7d6bace1a858fed6e2b2db63b84f0e403352e1bd46dd594f24d929da447acdeee22a08a9e2e5394a58107643630c5e38c9780fd02bf2f4 SHA512 53924f315fd6f35ed8530798ed5fadd6171a0e896567173e95c9ac258cfc959db6d920730e606f9fceb9d360c9c87709d65e12ba00652f500d6c2f39506c9a44
-EBUILD OpenRGB-0.3-r1.ebuild 1048 BLAKE2B 09afeb71ac750d12bafa3bbb62f24ddcb49709917dee694ffd48c9bdd90201c557f56946bb244dd10da2cbbf54415e38c6cb3c87f532bf998730a16d84386151 SHA512 b0942da786220726fbe5b6e388672e7e17ef0d719562926947fa8bf147d300384891930285a9b42604de613dfe1d72bb564ad5d1f755ec01df874a39d57f5ab1
+DIST OpenRGB-release_0.4.tar.bz2 2195819 BLAKE2B 6416e143707e5ae48d0f26d205e1cc27571299d7d4b8483d18cc03db237d71ebc3574973fc1540dacc24662c536888e575e89db417e52dc9672d412fe41c540b SHA512 9ecdf0a0aec5916b1c705c1ad0bd567f46f9b0a4409211cb195ec7a4bfbc95c80bde13798839d23e867ed613cb34c6e9629da4aac942490f58ca9528f5f0a8bd
 EBUILD OpenRGB-0.3-r3.ebuild 1083 BLAKE2B 4fce3f3d31af44f3f2c4076d1c3935e5864196b4fc0fd76812b799a5426c36bcffd20e8703f308ac061c5cb56fd0c1740d3288e9848a2435ab8cb689f0f435ee SHA512 3d5aea2e6b3c91389927ce45e3f5dce040c72d9936cfceef38ac490294bb0bce75dcf13dec170ad91870be001f863785ed0900cd9f10c6b1fb15f42cd537db92
+EBUILD OpenRGB-0.4.ebuild 1114 BLAKE2B fbac5c83ffd46cd98d0665ca8e633508e04688a75ee593adbb094ea87fbf7e41e32f770dbccb596c4528b52d088a99cfce6fb7f155651c5c7bfffaf99009dd8d SHA512 3f80f1865c71f22069c8036cb3d54bf39eee755781ba70f784828bcffdb40a31704cf6e37c5ac0f60a29bc2d63f82aa46aa1b5147dbb9015de7f692131531832
 EBUILD OpenRGB-9999.ebuild 1114 BLAKE2B fbac5c83ffd46cd98d0665ca8e633508e04688a75ee593adbb094ea87fbf7e41e32f770dbccb596c4528b52d088a99cfce6fb7f155651c5c7bfffaf99009dd8d SHA512 3f80f1865c71f22069c8036cb3d54bf39eee755781ba70f784828bcffdb40a31704cf6e37c5ac0f60a29bc2d63f82aa46aa1b5147dbb9015de7f692131531832
-MISC metadata.xml 366 BLAKE2B 8d73f778c4bfa93787ee9c214130f136c4465449005929bb4614f1f90688609404f04382bfb37b7e14aa1dab61b75befdfc60df0f2616ef6ffc6a0a8932cfe12 SHA512 595c963c5b7c48aba2c50ab29bf8e106b2701ebb162c7babe2fdc51afb7463f147673a353cdd053f33952926b945463dbfe9ed5eeeea86307273a8c22cbdba53
+MISC metadata.xml 454 BLAKE2B 3494c8e32c5f741e269a332fbf382e5bc6dee352d9aa3ae674d78fab6b4db06ba734ab82182a9d0ac4888813b1d3bea80fb87e252070bf931575e8eabe58047c SHA512 586db979df41b203cc4c4df318ebeb136d7098c535325c34a5c75dd40dc0ed8b137e62ffec323ef1a28da7cb646f1fc1bc4aef75f9f25537f7dfcc8d502ba6bc
diff --git a/app-misc/OpenRGB/OpenRGB-0.3-r1.ebuild b/app-misc/OpenRGB/OpenRGB-0.4.ebuild
index 9f8cacca569a..f8119c80c919 100644
--- a/app-misc/OpenRGB/OpenRGB-0.3-r1.ebuild
+++ b/app-misc/OpenRGB/OpenRGB-0.4.ebuild
@@ -3,24 +3,25 @@
 
 EAPI=7
 
-inherit qmake-utils
+inherit qmake-utils udev
 
-MY_P="${PN}-release_${PV}"
-COMMIT_HASH="308bb6f9b8169c8e1c5123f9499373509f140268"
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://gitlab.com/CalcProgrammer1/OpenRGB"}
+else
+	SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/OpenRGB-release_${PV}.tar.bz2"
+	S="${WORKDIR}/OpenRGB-release_${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacturer software"
 HOMEPAGE="https://gitlab.com/CalcProgrammer1/OpenRGB/"
-SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/${P}.tar.bz2"
-S="${WORKDIR}/${MY_P}-${COMMIT_HASH}"
-
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="udev"
 
 DEPEND="
 	dev-libs/hidapi:=
-	dev-libs/libbsd:=
 	dev-qt/qtcore:5=
 	dev-qt/qtgui:5=
 	dev-qt/qtwidgets:5=
@@ -31,13 +32,12 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}/OpenRGB-0.2-build-system.patch"
-)
-
 src_prepare() {
 	default
 	rm -rf dependencies/{hidapi,libusb}* || die
+	if [[ ${PV} != *9999* ]]; then
+		eapply "${FILESDIR}/OpenRGB-0.2-build-system.patch"
+	fi
 }
 
 src_configure() {
@@ -45,12 +45,11 @@ src_configure() {
 }
 
 src_install() {
-	emake INSTALL_ROOT="${D}" install
+	emake INSTALL_ROOT="${ED}" install
 
 	dodoc README.md OpenRGB.patch
 
 	if use udev; then
-		insinto /lib/udev/rules.d
-		doins 60-openrgb.rules
+		udev_dorules 60-openrgb.rules
 	fi
 }
diff --git a/app-misc/OpenRGB/metadata.xml b/app-misc/OpenRGB/metadata.xml
index d481584b51e5..54b4f43faa0e 100644
--- a/app-misc/OpenRGB/metadata.xml
+++ b/app-misc/OpenRGB/metadata.xml
@@ -9,4 +9,7 @@
 		<email>alexey+gentoo@asokolov.org</email>
 		<name>Alexey Sokolov</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">CalcProgrammer1/OpenRGB</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-misc/binwalk/Manifest b/app-misc/binwalk/Manifest
index cd679a5da8c9..614670053ad7 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -1,5 +1,5 @@
 AUX binwalk-2.2.0-disable-test-coverage.patch 378 BLAKE2B e1da360562eaa99fba1e5d3971fb9c7b2024b46319ec196a1408e8fc2d893e880749619595a884efab293842779b3745d071d5de9a30c0c411278595cefc56cd SHA512 0cac9b0714365196769a4e42e5cfcead7dad318b9bd60a737b6f25e3476d4127070d5ecab1ace155af4f3ba3f6c9a41be811c05c5ddf46390e7d49ca6bada94d
 DIST binwalk-2.2.0.tar.gz 39594514 BLAKE2B 899a919647258759f16c2e59766b0db68d1a78edf0f5c3755c2a987695199a1851deed2820e6323d82d8af85d294a6f1fcafb655e5d2257d49b673ddae49da67 SHA512 5f3ed31c0b5f9ca3057f86e82787a73b06f9f73747b51dd72130a78e4d69cf43a0207bffc495d177e97811de5bf835b3d0507f314b7a0c960eddf6d1efe0f0f9
-EBUILD binwalk-2.2.0.ebuild 1063 BLAKE2B e926b1e5706734a9ce899dba6daf046a6a411fef86d89dd97a4d1469d0eb419bc40c501055d7e7aff4ddab7a4ced05f275cff802a38f6b49358fe3bfdc166070 SHA512 ec003240e3d09a4f9472ad2a8908c32796f07d060ee1af6b553f8a0423641056635d2b96ff7879312307c47b489182676a26a0b0b4be48c14df6433605726531
+EBUILD binwalk-2.2.0.ebuild 1062 BLAKE2B 66de395f351936cfdd7a70cd149197798a7bfa9daf7d70ac364665cdb0f023c825ca112e318a9276983c518b9f24ad78fa92ae9b953e8464f755f772fc452118 SHA512 604e3b81893d909528b9947b2209f3cae898fc4501156d732ac01a90fa134db427555b5649db85bc50d9b155656b67e519481ffeb968f71078c39a28f6ad3405
 EBUILD binwalk-9999.ebuild 1059 BLAKE2B 6396a80d093b73c5fb6d853bd224a45ed059e672bb93e572396e9f657ef3443a50773a36a2ec612b004a34f50abe65548ab3f451c0167fda0d9d381201d0600e SHA512 d98ef1db2e644f31b2ab4a6879b1de928c347cb4ff2d10565fb8f3ebb263fd106b76b6476f386c663b538aac12181109eef7f345d9e39b01817702a7a79264a0
 MISC metadata.xml 910 BLAKE2B 2be4408e8546fec32d55527a3cda95fe5d2dba9a08db3700155b317a6a3c634d20ab9862e0459efc0a0bc4563a026b600d50d6a058bbb404c8edee83b73e3e84 SHA512 b080a492253731e1048dc6e263b257b601a6e20851e1399ae6e95b8794433ae7b8fd304f00d276582b2b1fd6ff605b45d3c370130293bc3488d57d557f2aad9a
diff --git a/app-misc/binwalk/binwalk-2.2.0.ebuild b/app-misc/binwalk/binwalk-2.2.0.ebuild
index a14298508c7c..63018b781dd8 100644
--- a/app-misc/binwalk/binwalk-2.2.0.ebuild
+++ b/app-misc/binwalk/binwalk-2.2.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ReFirmLabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ppc64 x86 ~x64-macos"
+	KEYWORDS="amd64 arm64 ppc64 x86 ~x64-macos"
 fi
 
 DESCRIPTION="A tool for identifying files embedded inside firmware images"
diff --git a/app-misc/colordiff/Manifest b/app-misc/colordiff/Manifest
index b2f8ffa9338c..e3ff7c1fdcba 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 944 BLAKE2B 231adbff0c570e8d195436e65499c4f2332fe7e05f1b4d9fb8f1c3235d18caafabefc4362bc196191ffeb5c0d4fefb1f48a2f0f85cd37d10970bdd2038dc688c SHA512 621e8cc7724d1e40cc7cad8d3d3372a45af2712ef9ff0a80adfc6d9ffbef737b42b688970087816ecee77434f6c5251ab09571ac43787a23d1732778cf2dc019
+EBUILD colordiff-1.0.19.ebuild 943 BLAKE2B 2214ea647f2c0284fb50e41281b0b5f95bb2d05905940f43030abd396a35aae133524f5f4aec6b5f7ada91c7dadf05b0a89764fdb8bd7afdd310802cb132b7ff SHA512 da25e13e6b949e885e81c4a3998679ef5f685c3a21eb0e23cdcf317694bd1dcddaa8d022b5e20b2c3a055335513452da58ba12bf1c460bb08dcd05eeb09b9fc3
 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 cb8da065746f..d60e7888d2a7 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 b786501132f2..8970b4083f69 100644
--- a/app-misc/datefudge/Manifest
+++ b/app-misc/datefudge/Manifest
@@ -2,5 +2,5 @@ AUX datefudge-1.22-bsd.patch 2839 BLAKE2B 995dcdf0b03346ffc8dfa2b119ab9f2c2e4a9d
 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
+EBUILD datefudge-1.24.ebuild 811 BLAKE2B 14f915bbe3324c2161c8db51a5ba69a0e210c849aa14d9c32ca7f9f8b5dd10c0aa22fa83f88cc4d0dffffbfcd06ac1bbd8e12f2edfb8db3feb4c40fd0a9e2413 SHA512 58f7ae341c0b1674d28ca20e62a24f67bc9214bf27b6026fe4aa72dbd3263bfbf8d5ec8d8724b76671a16981712acead563540d1fd9e4496aa46aaff017d034b
 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
index ade713b8eb6f..80dd1bfd51bf 100644
--- a/app-misc/datefudge/datefudge-1.24.ebuild
+++ b/app-misc/datefudge/datefudge-1.24.ebuild
@@ -10,7 +10,7 @@ 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"
+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() {
diff --git a/app-misc/ddate/Manifest b/app-misc/ddate/Manifest
index 98c975c8ce37..52f50add38f7 100644
--- a/app-misc/ddate/Manifest
+++ b/app-misc/ddate/Manifest
@@ -1,6 +1,4 @@
 AUX ddate-0.2.2-dont-compress-manpage.patch 646 BLAKE2B 18465cdb8ec25750868455214c4557f42a57448b8b5785a6793df2ff412d089af0e88743a7c361ab4284a9a6d98fda1c6cdccbb227628afa65beb7d5919ff6d9 SHA512 a967a30379e6fb07cd00cf133068409c24dfd660fc84a200fca8feae5664ce90598f23984b73e32e1dae9c4af31f0289f82cb24d6a4b74956c88c266d9c9e485
-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 554 BLAKE2B 07d126a8ecd949c47393fb948f82ff3cc493d53dfcff5d78e4f364ced9220f04255d61424e40edf4b1ed8b5b7e5d39790d63551e98b2d0e76c517e22c5284388 SHA512 ff569fe612c055e9543c6d5f923d31a54fabacc86e415280f161230412a83bce56a93551382b6f416d12d735b90b41c9c7c7eb6e5d0720a2f72d79bc318f90a4
+EBUILD ddate-0.2.2_p20160627.ebuild 552 BLAKE2B ee849f3d3d36a6872138955c0ae200177a29b33266dde8dda627b5f197abd0bc453120b60e59721e1056e38c042bf8815db581bfb313f11c2390d96e0413a4fb SHA512 dff35f75c860b29032cc00a9e33ad5b69a4eecf86830311a04a5b836961abdc98b028824b5532d8af62f09f254f2ffac6574be0780c44cc5fd474b661e07744b
 MISC metadata.xml 592 BLAKE2B 61ca3e0a009926931b30da1413a9080ad3f147339990b70598c75f5a2521fb224dc8d326f3dfc5aeddc762d4e15d58941c2d37e93a437b73fe98d6af7d8e424f SHA512 3bf37c63caa2e55da6f44545dd78866df4e72b822e76a33a7d37a634a794d24b7375117432e84ed5b64f0177bc3d994ddd04052181c396d695e4d75a5bb7a009
diff --git a/app-misc/ddate/ddate-0.2.2.ebuild b/app-misc/ddate/ddate-0.2.2.ebuild
deleted file mode 100644
index 3205993a3606..000000000000
--- a/app-misc/ddate/ddate-0.2.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-DESCRIPTION="Perpetual date converter from gregorian to poee calendar"
-HOMEPAGE="https://github.com/bo0ts/ddate"
-SRC_URI="https://github.com/bo0ts/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="amd64 arm arm64 x86"
-LICENSE="public-domain"
-SLOT="0"
-
-RDEPEND="!sys-apps/util-linux[ddate]"
-
-DOCS=( "README.org" )
-
-PATCHES=( "${FILESDIR}/${P}-dont-compress-manpage.patch" )
diff --git a/app-misc/ddate/ddate-0.2.2_p20160627.ebuild b/app-misc/ddate/ddate-0.2.2_p20160627.ebuild
index 9a170ead4308..22e451588c3f 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/dtach/Manifest b/app-misc/dtach/Manifest
index 8a646acb9870..05f3286b3f1a 100644
--- a/app-misc/dtach/Manifest
+++ b/app-misc/dtach/Manifest
@@ -1,3 +1,3 @@
 DIST dtach-0.9.tar.gz 60608 BLAKE2B 915b3a13cfd86a2e72505c9f8778ebbc9f25db761815e1352c0bc1281aaddcc95a837a880999379c19912fd3980bb77a20711796ef71b06282f1a27a6cc3572d SHA512 28c13dc8c96c16b9c6153a3a11fdeb4a4bc72e84e1f2575043b047cd8e600a47232f29544ffd87d82e2575623ec2e999a26e23e9eac25ec81c7722bdf98cfb18
-EBUILD dtach-0.9.ebuild 456 BLAKE2B f5f78c06771c684236427a6dbe37e7bac6666f2b554f20d9b410fcb704f356514f2126db9413da7a0c935d7c93eb2448d6942502eab06b05f898a731744f1bca SHA512 efb3e9c53baa48d110572a26f92b495ea13310b9f8e0354400ed60098fece0d8c8c8c57abaff030d8dbfda1bf8cbbe4e32ccfd4e8d1f0951cd3e25f4651fdd71
+EBUILD dtach-0.9.ebuild 455 BLAKE2B add548fb913ea05c1e4635d0f8462dd42df7ce2f10efa99ca747c9f3a04d876951791c8dd0b5c047977a17ec963e671d12e8869d776d3a4fec345f93254bd98e SHA512 a37d33f53634879c3ab1f04a72b2cbb473164a273d8c0b62dd14647c36122b51173a58e8623638b281e4d4a6feff5f70c23f66405128633fb9a7ce43a29f6334
 MISC metadata.xml 393 BLAKE2B 0a07b0eac6407190f07439b29f3cfbe185450ba5dfe0c4d3988c6d6abfe12c728029bda874cfaef61c48abe6182288e70ceee27d5db22b8eec03b20476db2991 SHA512 39071ddc8ee3913fb6898bbf5ce5488c76f6a7fa5f3f3905359a228d432cc76fe0336c0640d0fcd26c1be97abc220626c4258c5cd1de280a50d033b57d84aaa7
diff --git a/app-misc/dtach/dtach-0.9.ebuild b/app-misc/dtach/dtach-0.9.ebuild
index 02bb0f512cb9..e6fd332e1549 100644
--- a/app-misc/dtach/dtach-0.9.ebuild
+++ b/app-misc/dtach/dtach-0.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE=""
 
 src_install() {
diff --git a/app-misc/email2trac/Manifest b/app-misc/email2trac/Manifest
deleted file mode 100644
index e8af49d62bd6..000000000000
--- a/app-misc/email2trac/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST email2trac-2.12.2.tar.gz 102415 BLAKE2B 33917aebb828b3ef10f1f3e0f54a652c88041c3c6e788ae5a5fc9ea3005a4632e114864171519ce24b3b89273d79275fd4d8da2b2b3ea1b957591a7155e9d17c SHA512 15b14d436f28092f0a9c3ecc0be0197d54085710b6cd651505168e14bf3c002ce4e218bdf2725a09c7caa2a1f72c83b24daf193eddc52658c8510e25c65a7c1b
-EBUILD email2trac-2.12.2.ebuild 995 BLAKE2B 607fff0b1d00a45d5f2d4d6c16f9664986dde29409df6611470a2244dfbdeb15a0fd66612ce3d5873c7a68143396858c84753709bead1dac09349794926c3ac6 SHA512 7972584300483a30232147f31c37f59729ea6a0a679780273a245d65d7c8da5a6b91f9d24b7da03a08377f8f2fe0ba96a7c9937c48e9afdfadc95db805234e60
-MISC metadata.xml 249 BLAKE2B 58e91668bbe25a94a9ee787048ee974f1cb6944ae51bdf9f872f7df04894f44b261855cee2124514219894d93c3b643f9a47bccdf63f9cb0f46adc75528664c9 SHA512 8a900abd5f574a3ada624556efcdc93f5702661e50e03ae696f24ddb8d20a64cbe3bf3f5c71a018c6ad285d580d58eadcf4efc583046532b98405c9629d8d61f
diff --git a/app-misc/email2trac/email2trac-2.12.2.ebuild b/app-misc/email2trac/email2trac-2.12.2.ebuild
deleted file mode 100644
index b0afc6f55762..000000000000
--- a/app-misc/email2trac/email2trac-2.12.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1
-
-DESCRIPTION="Utilities to convert emails to trac tickets"
-HOMEPAGE="https://oss.trac.surfsara.nl/email2trac"
-SRC_URI="ftp://ftp.sara.nl/pub/outgoing/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-		<www-apps/trac-1.3[${PYTHON_SINGLE_USEDEP}]"
-
-pkg_setup() {
-	einfo "You can set the following variables in make.conf:"
-	einfo " - EMAIL2TRAC_TRAC_USER (default: apache)"
-	einfo " - EMAIL2TRAC_MTA_USER (default: nobody)"
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	sed -i -e "/^CFLAGS/s:=:&${CFLAGS} :" \
-		-e "s:\$(CC):& ${LDFLAGS} :" \
-		Makefile.in || die 'sed failed'
-}
-
-src_configure() {
-	econf --sysconfdir=/etc/${PN}/ \
-		--with-trac_user=${EMAIL2TRAC_TRAC_USER:-apache} \
-		--with-mta_user=${EMAIL2TRAC_MTA_USER:-nobody}
-}
diff --git a/app-misc/email2trac/metadata.xml b/app-misc/email2trac/metadata.xml
deleted file mode 100644
index ad70e38f24e0..000000000000
--- a/app-misc/email2trac/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-		<email>web-apps@gentoo.org</email>
-		<name>Gentoo Webapps</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-misc/glastree/Manifest b/app-misc/glastree/Manifest
index db462e597b50..c87ac7053652 100644
--- a/app-misc/glastree/Manifest
+++ b/app-misc/glastree/Manifest
@@ -1,6 +1,6 @@
-AUX glastree-posix-make.patch 559 BLAKE2B be055c7114bd0ddf52aed5b09ccba2110b15167019146ccddd411aba48e07f6d8091756a47034915ff7c253d166137e0e34a7fa92cb3263bff53886bd4a37aa8 SHA512 fe76f51fc869ce03b9e44270045b6b92c8d69e4fac5878eee7167899633aad1fe2d68648310f3ba6edd47360dcb93c7d0dbda2323e9c2d44adf0d984708a174d
+AUX glastree-posix-make.patch 535 BLAKE2B 3a8e4918c2a5206978cd0b748331e444e59643b2262b494aa11a9e8147afbffacc455afa89e7931a3013309241e9aa6a40ad9e5ecc11c8025afdc07926cab498 SHA512 a9a79aac878dddb49022f7fa1abf302147e540316e0fc472286dec839125003e9d09ff30807469a6a6ee179dabfb3b128ac111f94a295fcb10f63307a170a736
 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.ebuild 596 BLAKE2B 86b06b0707d170772207af3537b466e67890ceada4c98e43489b31a261f02735b1246662786ebf6c8b6279ee19ba37b071d7796660cf630bf911d9128d91ed09 SHA512 d0519c65d28a1faf6710c8fc4dc802d1ee863966e90cedf21f862444b84e4e98231c51248e749ee585a2d0708f7153d98b6c14a1cc9067c067534fb1cad54b03
 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/files/glastree-posix-make.patch b/app-misc/glastree/files/glastree-posix-make.patch
index 07e4bf6ec91a..6d0dc395812c 100644
--- a/app-misc/glastree/files/glastree-posix-make.patch
+++ b/app-misc/glastree/files/glastree-posix-make.patch
@@ -1,8 +1,8 @@
 Make sure the perl code is valid both with and without the backslashes.
 Some make versions strip them, others don't.
 
---- glastree-1.04/Makefile
-+++ glastree-1.04/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -24,8 +24,8 @@
  
  install:
diff --git a/app-misc/glastree/glastree-1.04.ebuild b/app-misc/glastree/glastree-1.04.ebuild
index 892b11bc30aa..699a36518cf8 100644
--- a/app-misc/glastree/glastree-1.04.ebuild
+++ b/app-misc/glastree/glastree-1.04.ebuild
@@ -1,9 +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
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="glastree is a poor mans snapshot utility using hardlinks written in perl"
 HOMEPAGE="http://www.igmus.org/code/"
@@ -12,17 +10,16 @@ DEPEND="dev-lang/perl
 	dev-perl/Date-Calc"
 SLOT="0"
 KEYWORDS="~amd64 ppc x86"
-IUSE=""
 LICENSE="public-domain"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-posix-make.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-posix-make.patch
+)
 
 src_compile() { :; }
 
 src_install() {
 	dodir /usr/share/man/man1
-	emake INSTROOT="${D}"/usr INSTMAN=share/man install
+	emake INSTROOT="${ED}"/usr INSTMAN=share/man install
 	dodoc README CHANGES THANKS TODO
 }
diff --git a/app-misc/gtk-sunlight/Manifest b/app-misc/gtk-sunlight/Manifest
index 1191f1483178..a05ce340aa86 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 562 BLAKE2B 07cdd893d3cc4bb56b05d023505b71dbe4fbb7a2d88838bb92387f907ce0f0cf7e182b96264a272453b039cccaaec759b845a3c80c952b0079ba0ce0ea3aeb8f SHA512 521d57a6a0a97832b74c1b4ec6fc7be4b45db71b5a2c78269f590e568ff915496c2d7850fa8dab3393027129e663df26b7e4b17ff9da73f4580f9bba8315b2d1
+EBUILD gtk-sunlight-0.4.2-r1.ebuild 566 BLAKE2B fab12ed2954eda60aaa1b3064683dc88b566c4d7ca96da0678ee718a36603af02e9892b67cf987be049adb54a70bae8b99dba406bd3d79a21adc4935244dbd31 SHA512 a99f5b575e19b0f6398abfc42274b86c30f74790048997873d0d57ab585911fbfcdf4032fb168de1992d782bc65459a0176fae2c229417f96a0cf66fb76d48bf
 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-r1.ebuild
index 1f1f20b8113d..e98885b1e722 100644
--- a/app-misc/gtk-sunlight/gtk-sunlight-0.4.2.ebuild
+++ b/app-misc/gtk-sunlight/gtk-sunlight-0.4.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit toolchain-funcs xdg
 
 DESCRIPTION="Real-time Sunlight Wallpaper"
 HOMEPAGE="http://realtimesunlightwallpaper.weebly.com/"
diff --git a/app-misc/kryoflux-dtc/Manifest b/app-misc/kryoflux-dtc/Manifest
index 967394c0df37..e52a7ed40de0 100644
--- a/app-misc/kryoflux-dtc/Manifest
+++ b/app-misc/kryoflux-dtc/Manifest
@@ -1,6 +1,4 @@
-DIST kryoflux-ui.jar 2101377 BLAKE2B db9922b9d5787772849d1ef9edae52d64de066f643c471412ed9129307c4ee399ec3a18ebcacd7428ab15eabf5307e916b678831f2fa456cbd7073aa60bbb574 SHA512 66ba81ed1b2a97a0391e513c45b19436f17677e3dfe7c063749e41763658f99a5eb92e5b3312f4151f8fc51bd79502ac11ffd895966117e1d5a9849867aeb957
 DIST kryoflux_2.6_linux.tar.bz2 9177658 BLAKE2B 6eb0bc7a166950bfedb32da466c17125a8a7d64e4bc9aa6610c69dd0f98c2fb5187ad19dbaf191b33dcb5a786ec4a1fa9bce2464c3c04eb152e0b9ed7ae770f2 SHA512 9bf700e9c646bad135999eb1fed12c86ff6fbc11a0034b86af7541fb16a4905dd740c706ebb87bf5848f5d80f45699c350a56397df5b6850559c2576d18eef1b
 DIST kryoflux_3.00_windows.zip 18502294 BLAKE2B f8e60b0feb6e7d7b9a43480b0b4cf67b79c5431fa20ee9e771ee7adf214e1c992d080c2eb6a043f141936f2de873d63079e994b90e994051a29391c6a308f190 SHA512 12de0c7d28b0abca2eb35748770fe96906c12940b7148103f56713fe1144e09759d362a24c094a7088713557da467b90f4e3d0ace59252cb84e3349dc73ee5bd
-EBUILD kryoflux-dtc-2.6-r1.ebuild 2455 BLAKE2B 67019b9cb6419a4a0927f8f061540294afcfddecd41e1b9a720949fefa99e61b83d5842b4d1e3d69fe1591bf974c5e1787b80d89d684160e92d292b75a69392d SHA512 e9d3c723458997b3ef1e4e5bccdca84a09d7412680438ea61ea05ca5b71113633f9be419610fa9be5cfd8d1dbe8b6496d8d96dfb42b5676c13e466920e122acb
-EBUILD kryoflux-dtc-2.6.ebuild 2411 BLAKE2B 08707c2e94ee349226b8e1fbc6c7ce4d63c73a3f12a74fb9c5da26d6af4c1c8ae3c2d88e5c71291b9a2e4ebc293760d6c4b8f650000975f5af2957fa3d480bdb SHA512 b8f561d7da48a9b80235b47c8fb04a7eb7bac506a4b7fe6ab89559ce40b8283f78121a5749fe9a3466ff11a905a8672dea8f6749874e542bdb0fb73b0e91c91e
+EBUILD kryoflux-dtc-2.6-r1.ebuild 2453 BLAKE2B 1758326f8194bbc0259b115d71bf841eda55a20b48d3229ce30782675e2bd95f3dd7cf4a2051c7cf84a638f6b3bb3c1a8001b4e45d6ca90af2f52932a68669aa SHA512 78325bd05b5646374760ce57274663a1a7f091ccf95ba77fb65ddf74ecefb04f69bdce40165de94980a24cd4b26d640d2a5b07c883e033c30ec82f0e2237d5d8
 MISC metadata.xml 412 BLAKE2B 4a92b64039475119e84a4c9f11b1c6dac92d92139b195d37adcc710b274436a69b538d68b66393ef6f090338aa162d159929a498ba3b7d95dbcaad3b29d9204c SHA512 e8844f948a8f53b8b932311dd12c36b8148e985cb9f6927c384c131d914bd2dc42a240d45b98354a5cde3c6d6e4915c177ebed7c780c4f0b1f065571ac54ccda
diff --git a/app-misc/kryoflux-dtc/kryoflux-dtc-2.6-r1.ebuild b/app-misc/kryoflux-dtc/kryoflux-dtc-2.6-r1.ebuild
index 35ec7750871b..4da077195a48 100644
--- a/app-misc/kryoflux-dtc/kryoflux-dtc-2.6-r1.ebuild
+++ b/app-misc/kryoflux-dtc/kryoflux-dtc-2.6-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 	gui? ( https://www.kryoflux.com/download/${MY_P_WINDOWS}.zip )
 "
 
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 LICENSE="SPS"
 SLOT="0"
 IUSE="demos doc fast-firmware gui static"
diff --git a/app-misc/kryoflux-dtc/kryoflux-dtc-2.6.ebuild b/app-misc/kryoflux-dtc/kryoflux-dtc-2.6.ebuild
deleted file mode 100644
index a9941574cb21..000000000000
--- a/app-misc/kryoflux-dtc/kryoflux-dtc-2.6.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="kryoflux_${PV}_linux"
-
-inherit desktop eutils udev xdg-utils
-
-DESCRIPTION="KryoFlux Host Software"
-HOMEPAGE="https://www.kryoflux.com"
-SRC_URI="https://www.kryoflux.com/download/${MY_P}.tar.bz2
-	gui? ( https://www.kryoflux.com/kryoflux-ui.jar )"
-
-KEYWORDS="-* amd64 x86"
-LICENSE="SPS"
-SLOT="0"
-IUSE="demos doc fast-firmware gui static"
-
-RDEPEND="dev-libs/spsdeclib
-	virtual/libusb:1
-	virtual/udev
-	gui? ( virtual/jre )"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror strip"
-
-S="${WORKDIR}/${MY_P}"
-
-QA_PREBUILT="/usr/bin/kryoflux-dtc"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-
-	if use gui; then
-		# Updated *.jar for compatibility with >= Java 9
-		cp "${DISTDIR}"/kryoflux-ui.jar "${S}" || die
-
-		# Extract kryoflux-ui.jar to get a logo for the meny entry
-		unpack kryoflux-ui.jar
-	fi
-}
-
-src_install() {
-	newbin dtc/$(usex amd64 x86_64 i686)/$(usex static static dynamic)/dtc kryoflux-dtc
-
-	cat <<-EOF > "${T}"/80-kryoflux.rules || die
-	ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="03eb", ATTR{idProduct}=="6124", GROUP="floppy", MODE="0660"
-	EOF
-	udev_dorules "${T}"/80-kryoflux.rules
-
-	if use gui; then
-		insinto /usr/share/kryoflux-ui
-		doins kryoflux-ui.jar
-
-		dosym ../../bin/kryoflux-dtc /usr/share/kryoflux-ui/dtc
-
-		make_wrapper kryoflux-ui "java -jar kryoflux-ui.jar" /usr/share/kryoflux-ui
-
-		newicon "${WORKDIR}"/images/disk.png kryoflux-ui.png
-
-		make_desktop_entry "kryoflux-ui" "KryoFlux UI" kryoflux-ui Development
-
-		dodoc dtc/kryoflux-ui_README.txt
-	fi
-
-	if use fast-firmware; then
-		insinto /lib/firmware
-		doins dtc/firmware_fast/firmware_kf_usb_rosalie.bin
-
-		dodoc dtc/firmware_fast/firmware_fast_README.txt
-	else
-		insinto /lib/firmware
-		doins dtc/firmware_kf_usb_rosalie.bin
-	fi
-
-	if use demos; then
-		dodoc -r g64_demo ipf_demo
-	fi
-
-	if use doc; then
-		dodoc -r docs schematics
-	fi
-
-	local DOCS=( "DONATIONS.txt" "RELEASE.txt" "README.linux" )
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "If you want to access your Kryoflux without root access,"
-	elog "please add yourself to the floppy group."
-
-	if use fast-firmware; then
-		elog ""
-		elog "You have enabled the fast firmware. Please keep in mind,"
-		elog "that this firmware can cause trouble with older floppy drives."
-	fi
-
-	if use gui; then
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/app-misc/ktoblzcheck/Manifest b/app-misc/ktoblzcheck/Manifest
index 81915af37c8f..191848996e95 100644
--- a/app-misc/ktoblzcheck/Manifest
+++ b/app-misc/ktoblzcheck/Manifest
@@ -1,4 +1,3 @@
 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 686 BLAKE2B 47164f43f697f95089708e6a55f177a191ef0f58f3ac4ee0a60a226d9f35074d8efcec5914c17579eec33d156a5d6f8ea74382bfbbba3a3642978d999a7a1c67 SHA512 412a8884467cc18848ff223937c290b18c0f43c1e1335c168e7d5510bca70a40fa7b9dbcbeebf48a25a74ea1ab42f3abaf474694dc62b3350211b9048a1dd070
 MISC metadata.xml 248 BLAKE2B 826a3223924d5353b8f0f7ab46e2e06e1c954652e1a4495c3dae2c07fec25b96cddf319af05972c3d099d0c66eb15b6c9dd76ad6c26f21078e55212572da81aa SHA512 f97d7e5dfeb875819d38dec85a16025425277266cd519e13b4e0bef4961ccec237b8da118687906bdb360a185be0f039cdaf0adfb6c0071b288e8d9108af7b64
diff --git a/app-misc/ktoblzcheck/ktoblzcheck-1.49-r1.ebuild b/app-misc/ktoblzcheck/ktoblzcheck-1.49-r1.ebuild
deleted file mode 100644
index c92ea80da4cb..000000000000
--- a/app-misc/ktoblzcheck/ktoblzcheck-1.49-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1
-
-DESCRIPTION="Library to check account numbers and bank codes of German banks"
-HOMEPAGE="http://ktoblzcheck.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE="python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	app-text/recode:0=
-	sys-apps/grep
-	sys-apps/sed
-	virtual/awk
-	|| ( net-misc/wget www-client/lynx )
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	econf $(use_enable python)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/app-misc/realpath/Manifest b/app-misc/realpath/Manifest
index a849f4ffa3ab..8791e52d7763 100644
--- a/app-misc/realpath/Manifest
+++ b/app-misc/realpath/Manifest
@@ -2,10 +2,7 @@ AUX realpath-1.14-no-po4a.patch 288 BLAKE2B cafe4fc0db905b3f9af36b256e392196bc37
 AUX realpath-1.15-prefix.patch 1443 BLAKE2B 3c62720d908dcb7ab29291e4029dd1923c2114649cc1c115e097e72193a4e9c1734a596434383b67b186796e605323f579e47c5f80ef9138f7556c9b9b965f70 SHA512 0e4980d60a4fff42823443ee9b8e9ef49a4f34ed031a3b01849f2d87b893f7205a4b7de2d6e090770aa2a3f7a31aab8f47d4f99c79d02d03fd5105001fdbcc5a
 AUX realpath-1.16-nonls.patch 685 BLAKE2B 84e67f77ef5263e860dd74b665377279b81853b9a9bff7266e2902673f6d86344ad79b3cbfcb42454a536879d696d32c86b3b895a478f13f8385900c1f931a47 SHA512 b27e44c1313e2c0dd0dfed719c373a3fc6f907a44cd1a9457c03bf1d83ce55b2aafefae84d2053f358e7dfe99dd7e4274137082c64c748e34680f324fe676719
 AUX realpath-1.17-build.patch 1161 BLAKE2B cd5821e86f048bae80b224b8db2322170e40638fcbe2d4582a2f21ef6a5218a576528446422d8363ca2e6b4a7cf209de9ff355ab229a683382d095436a22845a SHA512 507df6759deaf43c7973c8d9bb1faeffc22003308cd2fc4f73270eac9ba347e605093f55110b5c86170597eba4f2c80ea7d15b5ccab4b3d0b75dcef09203c09f
-DIST realpath_1.17.tar.gz 17800 BLAKE2B f2df9d9f3c73aaf6b4240518cc8ff361b97fa60c9493fa0148de6f14ad18dfa2ef05557932dec95a8b734b5d78881f0e239be41cba7bdaf4e353c092093ada3d SHA512 d4f8105e9256b140918dfa400eaac07bec9c29bced7284ab2a3a96282b13b59dca32ab0af38836dfe89dd4e3bf8b038ef4cf61a96d19951f46ac13264ceeec96
-DIST realpath_1.17_i386.deb 16372 BLAKE2B c8d7c2eb410c8c8129d6847d7cfe13265136fedcb51eb4bdaf62dda0dace1b9c0383445c1f407b404085306d6deff1a196b26cb7bb68b225710054b6bea582fe SHA512 15704a27f3f140c4d69411bfd9c319e3205e7b70cccefdc5bec94ad10d6b6c6ad948c2fa51cf2ed69c8884928ba6dcb83a865185f3b010dc6eb343c2125c2118
 DIST realpath_1.18.tar.gz 17618 BLAKE2B c42cbade8022a0aaafbf012c5f4db899bdadac6d06743a64fa0cf58c0533e9574fe1389939d296986fc1307362399753f58650d9029bf240fc6dc980c17a59f4 SHA512 98daa53b7a6d4b40ea3ff9ea89b7cb97782dd53f031e41a228a5aa8d2a41ae7920cbc1e2213f568098496e5c25da1381f08fb939f8668733a3c391f744fd16ed
 DIST realpath_1.18_i386.deb 16426 BLAKE2B 934d4d61bda3ce069959f3cf818b8d0b206c95ef458487f12c8afa59014dc141dcdf0ebd18a9540dd3104358139ce7f9317aabd8027dca6883f55905cc198d83 SHA512 fb2062041f8089a5ff07f76a9833e9d8bbe9560d72d4d5803c9524aeb782f9f4a135921b9984432ccfa361edc785a0f33785377ddf031a07ed316861a00a6f37
-EBUILD realpath-1.17.ebuild 1895 BLAKE2B cb908eb328e6dec2d6c6ef972b1af4f4dcbcfcf62e8d57ccf5c3eb145940a45b339bddae384562af8be7dc41c7e59d16fc6a39c54b32a3ea1303695c6a324bc1 SHA512 9df8b4c9b5d1083aca8430e6ca880eded53c7459d1731a51c1382e8b672541e1bd711754b6755c45725a173487ec4fd67321537401e00c01aba752e4592a16d4
-EBUILD realpath-1.18.ebuild 1909 BLAKE2B 49f98f4653823a9449beec14330445f6cfa3a98b8931139317eef07ecd708eec63b8cf6fc37c32c5d82fb11c67d07bd2771142560b1748b5294f20d5079fbffb SHA512 016d1820804a37d839f3965f8b4323dc682c59ea68a4826d4179e18c162321793211fcd73078c2bc42eb5439df3fee1b44961079f856033b5f77b607d1a31e36
+EBUILD realpath-1.18.ebuild 1905 BLAKE2B 9a1d6b65995913e45d4f4849f96b6022597529369c38184c710a1fe83f4eec0934fb5258b97dad2fdf994a9c89115a8f91a4f66743c0abb4d4e4b9fd16f03efd SHA512 2ebc0618b179a707f7eff362d29f362e9610c5f1beac2f7235cab5e457585057053ae59f11405314da112238d7ae054423060e0ee22e477036e9e29d40793ec0
 MISC metadata.xml 437 BLAKE2B 57ad5c49f2a37e30ac6d2f4e4a169f3fca789aa45169d0b9acfb16ab2bdf714c0b2c32cc2c609dc96e6ba516991b667884714d4bb7fb74b9fb519ae3d4b32c23 SHA512 db21930053e4af656fc8043dd5f60b8a78010aacb019435076db21c201fe0bafb4e742e347c430026991ff32819cb30c9e17819a302dc927c2b513301b5d06a1
diff --git a/app-misc/realpath/realpath-1.17.ebuild b/app-misc/realpath/realpath-1.17.ebuild
deleted file mode 100644
index 1e56a2e82dd2..000000000000
--- a/app-misc/realpath/realpath-1.17.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils toolchain-funcs flag-o-matic multilib prefix
-
-DESCRIPTION="Return the canonicalized absolute pathname"
-HOMEPAGE="http://packages.debian.org/unstable/utils/realpath"
-SRC_URI="
-	mirror://debian/pool/main/r/${PN}/${PN}_${PV}.tar.gz
-	nls? ( mirror://debian/pool/main/r/${PN}/${PN}_${PV}_i386.deb )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls"
-
-RDEPEND="
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	elibc_mintlib? ( virtual/libiconv )"
-
-src_unpack() {
-	unpack ${PN}_${PV}.tar.gz
-
-	if use nls; then
-		# Unpack the .deb file, in order to get the preprocessed man page
-		# translations. This way we avoid a dependency on app-text/po4a.
-		mkdir deb
-		cd deb
-		unpack ${PN}_${PV}_i386.deb
-		unpack ./data.tar.gz
-	fi
-}
-
-src_prepare() {
-	use nls || epatch "${FILESDIR}"/${PN}-1.16-nonls.patch
-	epatch "${FILESDIR}"/${PN}-1.17-build.patch
-	epatch "${FILESDIR}"/${PN}-1.14-no-po4a.patch
-	epatch "${FILESDIR}"/${PN}-1.15-prefix.patch
-	eprefixify common.mk
-}
-
-src_compile() {
-	tc-export CC
-	use nls && use !elibc_glibc && append-libs -lintl
-	[[ ${CHOST} == *-mint* ]] && append-libs "-liconv"
-
-	local subdir
-	for subdir in src man $(usex nls po ''); do
-		emake MAKE_VERBOSE=yes VERSION="${PV}" -C ${subdir}
-	done
-}
-
-src_install() {
-	emake VERSION="${PV}" SUBDIRS="src man $(usex nls po '')" \
-		DESTDIR="${D}" install
-	newdoc debian/changelog ChangeLog.debian
-
-	if use nls; then
-		local dir
-		for dir in "${WORKDIR}"/deb/usr/share/man/*; do
-			[ -f "${dir}"/man1/realpath.1 ] || continue
-			newman "${dir}"/man1/realpath.1 realpath.${dir##*/}.1
-		done
-	fi
-}
diff --git a/app-misc/realpath/realpath-1.18.ebuild b/app-misc/realpath/realpath-1.18.ebuild
index a97a044428ec..8710e8c8fb4d 100644
--- a/app-misc/realpath/realpath-1.18.ebuild
+++ b/app-misc/realpath/realpath-1.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="
diff --git a/app-misc/resolve-march-native/Manifest b/app-misc/resolve-march-native/Manifest
index b20ca55afe25..dbc7cb4ef3bc 100644
--- a/app-misc/resolve-march-native/Manifest
+++ b/app-misc/resolve-march-native/Manifest
@@ -1,9 +1,3 @@
-DIST resolve-march-native-0.9.2.tar.gz 7729 BLAKE2B 21cd69ee529b732f48db37616291757235792648d1b800a8091b091c83f4ccb523ec4e4576a4a34f6d85d91899c4890431cf41bae5c8641de06fbbd4fde301fc SHA512 918290cf0858c16f4a3730aa169768782af9f329a901e70db944172bc47c78ea18c07c448742a0c0c611951a3f50dee85cd6ffe8aba407cd40eef6f5e28c5b29
-DIST resolve-march-native-0.9.3.tar.gz 7780 BLAKE2B db86a0fe9ff92fc0bc45b94ff36bb4474b27f49098ff6f861fff5e6bb11c8a66a5f277fc0751abf444aeeea4eaae7e512a69215137e0562002b0c829980fd230 SHA512 045d7ab3cb31e309b0db8f5bf3d304334eb35841af05a9ca7694bf7077e693f923955cbcc16955b0cef68ad315b29615c6921a741b311157a3101eb8608ee5e3
 DIST resolve-march-native-0.9.4.tar.gz 7829 BLAKE2B 16c3492185c89c7a4dac48c4f9d9ce4ff6ca6ed794cf826cb141cd83936c2762db43d1d7b64fa6f39e1216b4738a58c35a07d9df7a78dbd061de636b7b181fed SHA512 b73e34c9f957dd3f8941b7db25af88b32cc1f67e4384c97034a310b98e6f6e6645a583ec567f8b1547bea41e072fcc20189017930a172781061d741839c5a9b2
-DIST resolve-march-native-0.9.tar.gz 7688 BLAKE2B 78ef662691071b480fd382a30024f9fc73ed8f7b22b3a814237c99139d3ba6d22f348ead7c413d199875ed74768618ac97d897204a7f633977a5c5bd8726154a SHA512 2079153a1d7f8f352baa1a0000d9e120d976bca8cef2a81dde85ba1689a260fb899c8b6d97f9cd79dda41c5b67b9fe76bfdf0fc5bc88ef09d2915a29f3ed33e2
-EBUILD resolve-march-native-0.9.2.ebuild 486 BLAKE2B dc0a9990c7da42847d560aa4df84c2edb6fc720d13b3090358e82c9e228b1b1e7c12d1bfdc2e47d30f00e9453d35334fbe71d5fab23a57e4fe1e98b0a38b870c SHA512 a591cec96d1bf8900df12e33f455ad1979fcee82f976248d2864a12ab9336175bf9cf3bfa18ebff05fe4964cb825aa66326e5dcc1e33b0a64bef133ab82a9fde
-EBUILD resolve-march-native-0.9.3.ebuild 494 BLAKE2B 08038fb9245b3b5534f5c84f2d810afd7fb0fdccfede013a6fd9d187a97103823a2cbf356460f0164c2f33021191d92f0f493edb7c9e5d5508427f81b909234a SHA512 15f9e227049bff342f40927997fc160af12fc8ff4269e7aa8b094dba22b8f7647c8cf2487551af508e46fb8ba947fcadfbedd093b2ab146a47f6d7aa55bebac9
 EBUILD resolve-march-native-0.9.4.ebuild 522 BLAKE2B 4f05fda4d58714db1b7dd03ab4b88e18cb457f422e34b806312ec67f7d5dfea6c58ddcfc411f06fbd4e7996ccbec377928e38b8ee715743a4cb18343fe6b6892 SHA512 5b588305e313de2f87125b155e4835518bb7be7ea357059ee12c559e1cffa579694c709f05ce519ba774c99ea0d937a907ad1614c2f6f4a8ad4c97aaa0862a83
-EBUILD resolve-march-native-0.9.ebuild 442 BLAKE2B bc0d1a73c4e58c75a7ce0ea00bd152218781602a225a6fb895d112addc71015ecac6ccc6a9ab86c4bc5c37306ca9f22c8545a99a72ecc5de19521b16b470d85a SHA512 399cd94d773ec28b5dd53961c290aa6a9c5a0a99c089df3f4e348cc877876f0b0c0560a97eaebca104c954b61108a510f71060909dd9f11d003e0beef248b24f
 MISC metadata.xml 343 BLAKE2B c2ce3c2f5c54a08cede40b51e58afb974f563d9729da5f9e33ea9650615bdd7c206661d8ca5511ee6a039b59b50d942d82334e86275e80cf5e502e0235c865e9 SHA512 46c1ae61e1cadebfbca360b2729a957c9b2830f502ecc559cee6de1e46de3526788eb5d53cdcfab173a55a575ba3f1b8d0da58baae2027d7815d53f4ba67b813
diff --git a/app-misc/resolve-march-native/resolve-march-native-0.9.2.ebuild b/app-misc/resolve-march-native/resolve-march-native-0.9.2.ebuild
deleted file mode 100644
index fdc3696bca71..000000000000
--- a/app-misc/resolve-march-native/resolve-march-native-0.9.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="Resolve GCC flag -march=native"
-HOMEPAGE="https://github.com/hartwork/resolve-march-native"
-SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=sys-devel/gcc-4.2"
diff --git a/app-misc/resolve-march-native/resolve-march-native-0.9.3.ebuild b/app-misc/resolve-march-native/resolve-march-native-0.9.3.ebuild
deleted file mode 100644
index bdc28fb3778b..000000000000
--- a/app-misc/resolve-march-native/resolve-march-native-0.9.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-inherit distutils-r1
-
-DESCRIPTION="Resolve GCC flag -march=native"
-HOMEPAGE="https://github.com/hartwork/resolve-march-native"
-SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=sys-devel/gcc-4.2"
diff --git a/app-misc/resolve-march-native/resolve-march-native-0.9.ebuild b/app-misc/resolve-march-native/resolve-march-native-0.9.ebuild
deleted file mode 100644
index f234833631e9..000000000000
--- a/app-misc/resolve-march-native/resolve-march-native-0.9.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="Resolve GCC flag -march=native"
-HOMEPAGE="https://github.com/hartwork/resolve-march-native"
-SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=sys-devel/gcc-4.2"
diff --git a/app-misc/rpick/Manifest b/app-misc/rpick/Manifest
index edfd500fc6e5..b2e377865d06 100644
--- a/app-misc/rpick/Manifest
+++ b/app-misc/rpick/Manifest
@@ -103,5 +103,5 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST yaml-rust-0.4.3.crate 45768 BLAKE2B 6af7374439000dc5e8795b26fccb1bc691040846f844e10765fe5df06237f5cf52752b0f9d25ed7c6f62337f628ee7be2e024f8aeb6b55a7c76f0d3b2ad0489c SHA512 31b0236fe041706befa938cdeb9c74940daccd2f80bdbd4e0e890901c868ecffc39367a41914c8bb98373d1002904f18b18ff13a08bbecd19dec634c08b7a7a3
 DIST yaml-rust-0.4.4.crate 48359 BLAKE2B 3c504a593663eff6ccdc96b949f2bf5ff9e9030b2cb08dd4bdb6ab2d0409513d4454ae99af4afe69a1dea1d7560454f2eed434cc6ded2c0cbaf9bedea2f3be85 SHA512 63cb5518101a8c841700efa556a14199d136ab390da3b79c9d11a54789e497d0ca0f420bfa31fa75257864beac619d1b28182714c99a8c92f44e333b299d1d6a
 EBUILD rpick-0.6.1.ebuild 1726 BLAKE2B 80001b4d34c5ad00b9981e04a44f372773b4615418a18fbe24c00fa8912acb354e8a8f81b1d09efa406709d0472cf4939e94446b0c40b58c0965e57efb36ddc5 SHA512 fafcf0e4956e0d66e1978b2ed4bb456c6447e1f00b83425a93169d7e9a99e3050ee5ac483f827136cd9a464a3fdc60cc15cca196a1e63a7c99d789ecd58aa520
-EBUILD rpick-0.7.0.ebuild 2139 BLAKE2B b229c118b09de0d29a906946734c0ef483e08861aa64f9f2d34d4f171f9218310993e6c779f89eb46bc3fe70b4ee57ea54f6256937a8d316b58bd2a604db1112 SHA512 96d2621ed615d0899e2f8f2d5e8267c6df02cdb8951c7e90c38c005cb14b564598060b86e59b3bf8099f54e8de3454eafc83cb6324f6716f33e8831fbc888af3
+EBUILD rpick-0.7.0.ebuild 2138 BLAKE2B 5e3281d7097ec908aa5c5bbc40cf62fb7c9b39246f11532acbfa7bf59e932915df9e0e64293f96e7f30a908eb147dc180a5ab8448647c2d6d8e6c4d424849ec2 SHA512 fb03ceb9dcb0c7a4c4ac930839fa2c00b927663e93bc983221da181b7adb42e987611a6427f8d489a942f9c6ebdbbc9fcd56af7ef91a218eb0d7608b61764869
 MISC metadata.xml 952 BLAKE2B 96e5353f41d21e7bf84e9519ce7fcfb39e2a06ef805751efdca7c85c5d7c121114a425c79b2d50c1eabd654b8519d4a51e66fd26e2ed55c821584ee9e6b821e2 SHA512 4da1e603b5f60c93f5d6a423a0306ee6132cfb2ad32b6acdf922e72d633d9a87abcefbb236011d63469a25247288cf2f618b4764cc43dfa8b21ed25bf2f7a2b3
diff --git a/app-misc/rpick/rpick-0.7.0.ebuild b/app-misc/rpick/rpick-0.7.0.ebuild
index 2c68b9cd74a9..1e49f1ba9167 100644
--- a/app-misc/rpick/rpick-0.7.0.ebuild
+++ b/app-misc/rpick/rpick-0.7.0.ebuild
@@ -98,7 +98,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 # use cargo-license for a more accurate license picture
 LICENSE="GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 MIT Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 x86"
 
 DOCS=( CHANGELOG.md README.md )
 
diff --git a/app-misc/timew/Manifest b/app-misc/timew/Manifest
index d713761243d8..fe50b581765a 100644
--- a/app-misc/timew/Manifest
+++ b/app-misc/timew/Manifest
@@ -1,3 +1,3 @@
-DIST timew-1.3.0.tar.gz 1125892 BLAKE2B 7ef9f6f405d710addd90758ea1188678aa3269354f81be583f63eb920c0163d0a428e9b62d896ba189f842494835df785e1f26d877bda03205a94067af8456d0 SHA512 38bf44c83d2315155ee43085957824db69d9501abf2cf0bdf51636169043d82b701ebfac3176bc1dfc0186abb7db7a3a40111968c85597e7edb73c66083f0ab0
-EBUILD timew-1.3.0.ebuild 919 BLAKE2B b2de4483dab2d91c091e45d2ee2480e9054142bf34adf4bebad4b1e589c95d5152e7f7a3e1b8a271e65cc0154e0965cb84d5d8a2df834550f71b679805ef4183 SHA512 be71ebb20ce5bb9beba8ed61747d441e063a5a5cfebb4a797bb35b9790fd1e5cfbbd1e224c1094f4048c112a6a2c236829f360b8c432dd11f68c7164ef518096
+DIST timew-1.4.2.tar.gz 1316841 BLAKE2B c451f37aeb32e999fe2cdca2eb5f234c7424b76f489324d5723a3649da37f53f5094989bdf8d5c2d27f5daa0d75c72ec4a01e3c19b8b064f28e4db82587498b9 SHA512 fe4c3def6b2cd78793dd97a38a61497b3910cd87a3315f826c64893b96a998bf30363f0df1892b74b718d03a279d51c1a636739225e101c5c126794e434076f0
+EBUILD timew-1.4.2.ebuild 888 BLAKE2B 41a2e83233277e5722567378b7337c33302b6319ade5605c9d3e32ed99896d523d1833f4ddc164e5345d4f83b5bee9af346f63b5d40dd59849e5c12ef7279263 SHA512 cb84813049c46eb18090f022e77c9eab56ecc4e72011bea60d12ed95f0e8f8b5e048fefd343c48bfa8eacdca447c3e83285f79b80ca9b4350af3e08abf5e1565
 MISC metadata.xml 679 BLAKE2B a0d48844e9b28b17958a0019744ea6366e0e7893fbedba5805f8c00b9fa3e1110f2d61462ad295409bdca399db04377417fe646408b4ef4914ec8cfed7537e20 SHA512 3a10119fa8224b6629985c9acb30900029d3507412e8c47732a214d55d6c12c7b6013c15808be318344f2fbf789f95e9b4c6e8f259dc4378597c917bcf06aac4
diff --git a/app-misc/timew/timew-1.3.0.ebuild b/app-misc/timew/timew-1.4.2.ebuild
index 86785cd3972f..3887d9064d48 100644
--- a/app-misc/timew/timew-1.3.0.ebuild
+++ b/app-misc/timew/timew-1.4.2.ebuild
@@ -15,8 +15,7 @@ KEYWORDS="~amd64 ~x86"
 
 src_configure() {
 	mycmakeargs=(
-		-DCMAKE_BUILD_TYPE=release
-		-DTIMEW_DOCDIR=share/doc/"${PF}"
+		-DTIMEW_DOCDIR=share/doc/${PF}
 	)
 
 	cmake_src_configure
diff --git a/app-misc/todo/Manifest b/app-misc/todo/Manifest
index 057b1dcbe798..833014ab1c8c 100644
--- a/app-misc/todo/Manifest
+++ b/app-misc/todo/Manifest
@@ -1,7 +1,6 @@
-AUX todo-2.10-fix-bash-completion.patch 344 BLAKE2B 8e19719ce96559e49715bec34e6e4b90ea2c3dae9d4a4ecd1a05be51919f5ae8d7a1a29fa55ae3d70d0c42e8e55b6bab596b598116a5f8399a9a4e95df3415e9 SHA512 eb7bf79eabc912f3a5ca211ff1c4d5ac09cb42b2a8719a8c60a1f0880d89703afbe7073a640ac1b8ef8bf0d8c5ec8e2891faf924123d3bbe04f37479eadac95d
 AUX todo-2.11.0-fix-bash-completion.patch 385 BLAKE2B cfb5b88e8113d45790d9dcc7a005a09816aa6658ec781b1a3a76721ff8f4d573a2ae1208fe27ae136c48747dde70d9ce2c375357c4117e0a2303dab1c648d565 SHA512 804ba00f3c3bf494c853778ad388583adc40b613c35dbe63ffc63a75660df5a12e0806ac2f3d352cb4818c2cb53ff4d49d519924d231f98ebce4af1dbb5085e5
-DIST todo-2.10.tar.gz 56509 BLAKE2B ec89d12506b5025bab8d05bab1122d48ef2e9edb811c4091c1ff96b4b18c2ced54026d3d908a565278804c15c6fbde8aef3ae5a0cb23d4b12bb36133fce5bb2c SHA512 b14d9d13948836d971f72b941770e8e2c59d171d35f074205900619c5c3efd7ca0a482887046c1865890afb6595fe27c69677c54ea5824163d291e16fa5329d3
 DIST todo-2.11.0.tar.gz 712455 BLAKE2B f9d0fa53712a49c2f6ee94c02a62c16b8184734f7bb0c9354db9d640e2f619c75e3b3468065cb51204c7872f1f155bda51b9e3387f62f0f478f80f6a99f199b4 SHA512 5500ed1aa10eceaaa3e5116605eed4f4228337fdc0f2ceaa5b889753a60576918c0953adbfbf80c40008d6dfdf854e8a538103bfed4d1015aa1c5a9876c2e47c
-EBUILD todo-2.10-r2.ebuild 1406 BLAKE2B a1bdc12885d8b93370373adae8be4d86bb12db6b2d845147d7a15c75267e570fbd0a7b386306a712ebed2c3d052ad6065a822c578148f9241c8e7104847960b2 SHA512 8b8abbfb387d5a07f8929560e4338fd64db09a57e36cfefd60e1d1dcfdd6742c09a8f0ab3576da4ac3c040336b5e2f35c43c2ca9516cb54a58728373799fec74
+DIST todo-2.12.0.tar.gz 716524 BLAKE2B 168951c50670228ba2e1438ec04f5907181073668f1e260874e48959f2e37d11ee7ba4f2b0e5e5c55c9375a31921eca258f720afe98d2a4841529ef6acbb1510 SHA512 3b30d5e395f878811831f57e8e1a040c990e1f042f57050b6381d83ffc8b92b1ce20bfd3c5aa8b5e028b4810a5b289599603b2e16efff8badac559d200ed79f5
 EBUILD todo-2.11.0.ebuild 1739 BLAKE2B d4470876d6533fe1fff3ed60fed423730b4c894262e15b78d4192d34cca6babfd506ae125c32b7b28a1608568b91144e8ba42083dd95b80c2f83a1136153df03 SHA512 7244f131a1dbff7d77dc873647cc7cca1fe22873a10af853a6c4169e8757b68ebcf602430ee411bdc0f20bba19f7fbb342bfb9e60108bafe46838704e529da62
+EBUILD todo-2.12.0.ebuild 1665 BLAKE2B 4a1100a2be6fb645c213dd2d5883a32797fbc235588f77dec8b491f12e4ba5de615599fedcde92c75ff22840a4cd13b99f3f363af78e43a9dfdf166f131c915a SHA512 84c4459b7628ccddf0c087d8fc8a7d482fda5a4afd1aaf79c50da386ae80b06fa3b2814a7681dcfc55b92f9253dc1f44353e179082f8b2e282e8ae9e392790e7
 MISC metadata.xml 565 BLAKE2B 854d88ec5a9d76fba34d2feb01a36d5a9513433f1dd3301883e3213eeb1e24e1e4db0876c0b26d4e0ba68acee07177eed06912c3ce285e163f8d287510338825 SHA512 052553ce06e888905ddd230bb40e59039a42bf9e9f6684812231cc9f21d478d0e7e44d7e4ee44896258852a6778bbb507b4824a6b70150c7314b507a652e9dc7
diff --git a/app-misc/todo/files/todo-2.10-fix-bash-completion.patch b/app-misc/todo/files/todo-2.10-fix-bash-completion.patch
deleted file mode 100644
index 7e6de2f10568..000000000000
--- a/app-misc/todo/files/todo-2.10-fix-bash-completion.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./todo_completion	2017-04-08 15:18:23.102736966 +0200
-+++ ./todo_completion	2017-04-08 15:18:56.839725605 +0200
-@@ -85,6 +85,9 @@
- }
- complete -F _todo todo.sh
- 
-+# Gentoo bug 614400
-+complete -F _todo todotxt
-+
- # If you define an alias (e.g. "t") to todo.sh, you need to explicitly enable
- # completion for it, too:
- #complete -F _todo t
diff --git a/app-misc/todo/todo-2.10-r2.ebuild b/app-misc/todo/todo-2.12.0.ebuild
index 90a86a6929da..d1dcad07e588 100644
--- a/app-misc/todo/todo-2.10-r2.ebuild
+++ b/app-misc/todo/todo-2.12.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit bash-completion-r1
 
 DESCRIPTION="A CLI-based TODO list manager"
-HOMEPAGE="http://todotxt.com"
-SRC_URI="https://github.com/ginatrapani/${PN}.txt-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="http://todotxt.org"
+SRC_URI="https://github.com/todotxt/${PN}.txt-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -17,15 +17,16 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="app-shells/bash"
 
-PATCHES=( "${FILESDIR}/${P}-fix-bash-completion.patch" )
-
-DOCS=( README.textile CONTRIBUTING.md LICENSE todo.cfg )
+DOCS=( README.md LICENSE todo.cfg )
 
 S="${WORKDIR}/${PN}.txt-cli-${PV}"
 
 src_prepare() {
 	default
 
+	# fix version string
+	sed -i -e "s/@DEV_VERSION@/${PV}/" todo.sh || die
+
 	# TODO_DIR variable is bogus
 	sed -i -e '/export TODO_DIR/d' todo.cfg || die
 	sed -i -e '4i export TODO_DIR="$HOME/.todo"' todo.cfg || die
@@ -36,10 +37,11 @@ src_test() {
 }
 
 src_install() {
-	newbin "${PN}.sh" "${PN}cli"
-	dosym "${PN}cli" "/usr/bin/${PN}txt"
-	newbashcomp "${PN}_completion" "${PN}cli.sh"
-	bashcomp_alias "${PN}cli.sh" "${PN}txt"
+	dobin "${PN}.sh"
+	dosym "${PN}.sh" "/usr/bin/${PN}cli"
+	dosym "${PN}.sh" "/usr/bin/${PN}txt"
+	newbashcomp "${PN}_completion" "${PN}.sh"
+	bashcomp_alias "${PN}.sh" "${PN}cli" "${PN}txt"
 	einstalldocs
 }
 
@@ -53,6 +55,11 @@ pkg_postinst() {
 	einfo 'configuration file in the same location:'
 	einfo "  $ bzcat /usr/share/doc/${PF}/todo.cfg.bz2 > \$HOME/.todo/config"
 	einfo
+	einfo 'Alternatively, you can use XDG directories instead:'
+	einfo '  $ mkdir -p $HOME/.local/share/todo'
+	einfo '  $ mkdir -p $HOME/.config/todo'
+	einfo "  $ bzcat /usr/share/doc/${PF}/todo.cfg.bz2 > \$HOME/.config/todo/config"
+	einfo
 	einfo 'You can then edit this file as you see fit.'
 	einfo 'Enjoy!'
 	einfo
diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest
deleted file mode 100644
index ee359d71a162..000000000000
--- a/app-misc/workrave/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX workrave-1.10.6-automagic-gstreamer.patch 881 BLAKE2B 9d74d1d51d1f351659b6ce237eb174b193e0dd8f4c1387cc8e5e2e787bc329c86249cd8d06e85c7a101c7edb8c51ae3e94c2dcc3ad565fb0c5699350981138f0 SHA512 87b9ee4847a8d3ed7afd479b0eb67864f328991c76c3525837e8fb31df299dfc5be43ab35c884a75a40f756d1a3b929c6a415448f88cbe726a2088e8cafeb290
-DIST workrave-1.10.20.tar.gz 6377941 BLAKE2B 00f573c05ddacd61d50d80a4079d161b18e7e52606cf502f359cf51c4b64407c978fa944e79314146baea62fe77212fa623d54706c62e23fd1ca17cbf25db409 SHA512 fc8d98aa560946f00ee30be0c28648245a425cd3fddeba8fbdd61fb89d107cc8085d5c4d8a326c739b394e6baada2b28cf98ce9ccaf85dca6bfaa1ae78d4ce56
-EBUILD workrave-1.10.20.ebuild 2833 BLAKE2B a21f3d65c5d9995d9f2700eab180797715e0bd0f890f3c00b3fe328ef45f80997b6bc69ed3e0e65503bb01445947c4940e00788e7cf8d5d40d2a3e49e86c2409 SHA512 c8f646a4dda1ccf9c127f1ffd1c450204ebecbf2f88face28bb2cf661078b8a8d057eb11ea5251a2f4789388e9af3fd4ce51486861932fa082d34155a6c42ffc
-MISC metadata.xml 766 BLAKE2B 7fdc6a41af2c9048875b633ed213337c255b0449474d9c3052615655a904406ee35e226b652ca5519d3c12be63550da344eeabad3656604a8c5cb8df0b25fc18 SHA512 980b66185f9d02d4c0cfd2fe24700a4bb325741097ecf63e7bcd7e47c183e4693c22a6486c70dfce2b7d80837de7ab7c9c908f3be12ba5d16bba1de5d61f6858
diff --git a/app-misc/workrave/files/workrave-1.10.6-automagic-gstreamer.patch b/app-misc/workrave/files/workrave-1.10.6-automagic-gstreamer.patch
deleted file mode 100644
index 76c2e67ed607..000000000000
--- a/app-misc/workrave/files/workrave-1.10.6-automagic-gstreamer.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/configure.ac.old	2015-10-24 10:11:47.469290574 +0200
-+++ b/configure.ac	2015-10-24 10:14:35.918680898 +0200
-@@ -884,20 +884,12 @@
- if test "x$enable_gstreamer" != "xno";
- then
-     PKG_CHECK_MODULES([GSTREAMER],
--                      [gstreamer-0.10],
--                      [config_gstreamer=yes
--                       AC_DEFINE(HAVE_GSTREAMER, 1, [Use GStreamer for playing sounds])], [ ])
--		     
--    if test "x$config_gstreamer" != "xyes";
--    then
--        PKG_CHECK_MODULES([GSTREAMER],
-                       [gstreamer-1.0],
-                       [config_gstreamer=yes
-                        AC_DEFINE(HAVE_GSTREAMER, 1, [Use GStreamer for playing sounds])],
-                          [if test "x$enable_gstreamer" = "xyes"; then
-                            AC_MSG_ERROR([GStreamer development headers not found.])
-                        fi])
--    fi
- fi
- 
- 
diff --git a/app-misc/workrave/metadata.xml b/app-misc/workrave/metadata.xml
deleted file mode 100644
index a6781d3a5e7c..000000000000
--- a/app-misc/workrave/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<use>
-		<flag name="mate">Add support for MATE panel</flag>
-		<flag name="xfce">Add support for XFCE panel</flag>
-	</use>
-	<longdescription>
-		Workrave is a program that assists in the recovery and prevention
-		of Repetitive Strain Injury (RSI). The program frequently alerts
-		you to take micro-pauses, rest breaks and restricts you to your
-		daily limit.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">rcaelers/workrave</remote-id>
-		<remote-id type="sourceforge">workrave</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-misc/workrave/workrave-1.10.20.ebuild b/app-misc/workrave/workrave-1.10.20.ebuild
deleted file mode 100644
index a59057629c07..000000000000
--- a/app-misc/workrave/workrave-1.10.20.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools gnome2 python-single-r1 versionator vcs-snapshot
-
-DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)"
-HOMEPAGE="http://www.workrave.org/"
-MY_PV=$(replace_all_version_separators '_')
-SRC_URI="https://github.com/rcaelers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-# dbus support looks to be used only for trying to use panel applets on gnome3!
-IUSE="appindicator doc gnome gstreamer introspection mate nls pulseaudio test xfce"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="appindicator? ( introspection ) ${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=dev-libs/glib-2.28.0:2
-	>=x11-libs/gtk+-3.0:3[introspection?,X]
-	>=dev-cpp/gtkmm-3.18.0:3.0
-	>=dev-cpp/glibmm-2.28.0:2
-	>=dev-libs/libsigc++-2.2.4.2:2
-	appindicator? (
-		>=dev-libs/libdbusmenu-0.4[gtk3,introspection]
-		>=dev-libs/libindicator-0.4:3 )
-	gnome? ( >=gnome-base/gnome-shell-3.6.2 )
-	gstreamer? (
-		media-libs/gstreamer:1.0[introspection?]
-		media-libs/gst-plugins-base:1.0[introspection?]
-		media-plugins/gst-plugins-meta:1.0 )
-	introspection? ( dev-libs/gobject-introspection:= )
-	mate? ( mate-base/mate-applets )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
-	xfce? (
-		>=x11-libs/gtk+-2.6.0:2[introspection?]
-		>=xfce-base/xfce4-panel-4.4 )
-	x11-libs/libXScrnSaver
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXt
-	x11-libs/libXmu
-	${PYTHON_DEPS}
-"
-#        dbus? (
-#                >=sys-apps/dbus-1.2
-#                dev-libs/dbus-glib )
-
-DEPEND="${RDEPEND}
-	dev-python/cheetah
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40.0
-	sys-devel/autoconf-archive
-	x11-base/xorg-proto
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-sgml-utils
-		app-text/xmlto )
-	nls? ( >=sys-devel/gettext-0.17 )
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	vcs-snapshot_src_unpack
-}
-
-src_prepare() {
-	# Fix gstreamer slot automagic dependency, bug #563584
-	# http://issues.workrave.org/show_bug.cgi?id=1179
-	eapply "${FILESDIR}"/${PN}-1.10.6-automagic-gstreamer.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# gnet ("distribution") is dead for ages and other distributions stopped
-	# relying on it for such time too.
-	gnome2_src_configure \
-		--disable-dbus \
-		--disable-distribution \
-		--enable-exercises \
-		--disable-experimental \
-		--disable-gnome2 \
-		--disable-static \
-		--disable-xml \
-		$(use_enable appindicator indicator) \
-		$(use_enable doc manual) \
-		$(use_enable gnome gnome3) \
-		$(use_enable gstreamer) \
-		$(use_enable introspection) \
-		$(use_enable mate) \
-		$(use_enable nls) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable test tests) \
-		$(use_enable xfce)
-}