gentoo resync : 13.06.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-06-13 10:39:22 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-06-13 10:39:22 +0100
commit: 9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch)
tree: 8ac67e26b45f34d71c5aab3621813b100a0d5f00 /x11-misc
parent: f516638b7fe9592837389826a6152a7e1b251c54 (diff)
62 files changed, 779 insertions, 526 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 959f33f20983..f586ddcaafdd 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/bumblebee/Manifest b/x11-misc/bumblebee/Manifest
index 5fd04fc88425..065bf2b40d57 100644
--- a/x11-misc/bumblebee/Manifest
+++ b/x11-misc/bumblebee/Manifest
@@ -2,10 +2,10 @@ AUX bumblebee.confd 60 BLAKE2B 68cfe5dd4db512e10cf82977556336e7bb8eb7ab3f397a2ba
 AUX bumblebee.envd 127 BLAKE2B 2a993cd77706c2da4f90a3a77b4a6d0014b1322c584ae8970d75539b04b5d6a23adac7067a511f4f9d9a47797ac1d55f836c3242d26d0c464f6ea3833dc30ae5 SHA512 f42bd5992a8c80d045036a689e3c33cc2bdb7d54afb03bb7f33a80fa6a9c1e05f583cdec5b3da42021c48c1b59db4664e9c850e48ada47a1887327f7b11633af
 AUX bumblebee.initd 485 BLAKE2B 7583befe5a3e3b699bf895f1e4ac445dbe1bbbb172ef0c9e4d38a6c347699e80aca7a450f95cde9d8fe0f033d5d5a80716c9f17155f7d5ebdfa286b533fc4ab5 SHA512 12c4d28bb0dfa17239c7bf488408f3ca5e672a2167664b7d9f5501fcb878fe679c351bbe037f31b762e8e9a911088d08d66814cd8cc6b257fd973cc6c54ee10f
 DIST bumblebee-3.2.1.tar.gz 143110 BLAKE2B 537fe96e061f229c4c1e7748aef89e4eec040536d7a3161b449a34752c19078d3b4da6703f1c11268b4bb0e6590f94168bab5917fceac0eb73825b3c233548f0 SHA512 6f016f75d199577215ff00c059e196829e9d3efeb0fb6eebe6c3fad6176e330332e1ef25875a22ac9892895683d95899ea44f1ec1f85d31300ad83cb1fe0310a
-DIST bumblebee-3.2.1_p20170123.tar.gz 63376 BLAKE2B 986cc1ff39d937547268b07c98f8881810586c58a40f454cb3839aea4e5f116b27b8947acc7b1e05f3cca7a3f717f963ae3ad9f379473b40b898e6fcfedff5e6 SHA512 398101927211a8d09f19d519fd0537c94b942bd7fc11d10d394a3a520f2afa6abe174db78b60bb134caf78ffda4cdd50d0ef424134acd07ff4ce93998881e31b
 DIST bumblebee-3.2.1_p20170130.tar.gz 63428 BLAKE2B 33a2fbbd6e6cbc6cd026b87714d06e54d8803cc75e997cc1bd1aa1d1263c3fe9602f822b92c67fa7e76632bb19daaae11e591b88d087889a970d374f6316e847 SHA512 b457e8ce197782bd1b1fabd3c0c67e4ec26cdb90a3715bbe7a8e1550cdde19134151567cfa0c73d800c30e5d303b30bc1261d5f3cbceaa64d559416e4d541070
+DIST bumblebee-3.2.1_p20190421.tar.gz 63640 BLAKE2B 62bf3e7556b3cc3651f0e1f9fabd22501b82e78c0820b5ae113fddc24816cefd9c788a33d506944dc971092ae22dc3389ced79da6284a5e812ffad909bb03ebd SHA512 e24de3b60e55828ccbbd85774b9a776ba01b62850489b9d7952c4bf807f080b68d084f11de540a65d1bf78f6a35ce89d35f868de14e7ab9d768cdf21a1d422ec
 EBUILD bumblebee-3.2.1.ebuild 2005 BLAKE2B 3201a0ec6fc11d8b66090654b57cf79fbc504079819db90a303fb476bf99c5a7ca74183547b69b948c83a4285093c3ae8aa708d73440f2d0c23647d0d9b001d8 SHA512 02a045d7d3ed89c39b4b354d81e988cf015c873ece37ce4733405fc699e94e14935e8b395ab6a1fee32b3dfc7e186f908546766146a2f19f5702b83a201560aa
-EBUILD bumblebee-3.2.1_p20170123.ebuild 2215 BLAKE2B f9f61a4183cc43c2c1442101b433fec6a3477d6062da340d8421e0e63398927c5767177ea4d3c98ef87bd261de39b821d003d7a67e209de21b47c57c5e7aed21 SHA512 7da89e2bf3ee757b29fde2757dba5e63c157ff0b15b59d244df8ec43ce9a25adcd00b6f149b694488a916eb7d293b6a59d48e40c18eb94b4be1e9fa35c26a69d
-EBUILD bumblebee-3.2.1_p20170130.ebuild 2215 BLAKE2B 70dc2ee2c016d518854a50e62d1cef3cb8ebff39d06c7f55d865e599feca81ae75e29b56f108b6c5cdc961feab4093e050a0c3d5727c7c434bd03b87c866a52c SHA512 881ecd2dea9d2a1234b354651e236edde1059db8c91f0b91d52c7e3cb6bbb16c543f9485ba83b69bf6371a1c2e28f694eaf39f33117f0a074f43e57b68fd61ee
+EBUILD bumblebee-3.2.1_p20170130.ebuild 2219 BLAKE2B d422665f2e8033f644162a7ade48b83f7416747ce29a3dcaca58190054510e445bc72515d36e435dcf6990960ea1db852b3dab8b4cdc9ff42da54f6d1c174b93 SHA512 38bd8fe978bed7807f5fda4d6d48fbd97e648cd47e022efd5b11f5805aea5c175cb091eca7ae4f0da8faf67d8e27c49eae89691516932c63805258e85b080e28
+EBUILD bumblebee-3.2.1_p20190421.ebuild 2203 BLAKE2B d433d4c37f678fde7457ae4452a865ec6d4a77e6cd1ee9c7addd4c0b247acac3ad05ec7c72e02fcb3802ca3545b9d0df0ae474031abef3a051fb545d7525a9dd SHA512 6bb4be55bbcdf8f910b68d70ffca2e3fc4ed9f212d889cd6fedf505034f9df84afc3527d5dc2ca15144167843b99bb0cc215350714a2137544ebb7326da6ff5b
 EBUILD bumblebee-9999.ebuild 2215 BLAKE2B f9f61a4183cc43c2c1442101b433fec6a3477d6062da340d8421e0e63398927c5767177ea4d3c98ef87bd261de39b821d003d7a67e209de21b47c57c5e7aed21 SHA512 7da89e2bf3ee757b29fde2757dba5e63c157ff0b15b59d244df8ec43ce9a25adcd00b6f149b694488a916eb7d293b6a59d48e40c18eb94b4be1e9fa35c26a69d
-MISC metadata.xml 1006 BLAKE2B d62003b7a5d0c4a67eb4bc568d967c5cb0419db57013b4344e02e7290f578ae29851349b5bd780077ab84b2537268e499be8260fca6a9939fd10ca62be4e9d90 SHA512 71a8b920e4bac5a76bddeb54e8c0a2062f555ded301d5b3128f56fe2d65ec8da10e3323a6557a36f51eb2879b50fbb3a122f6c87a9201c62a5707a109fa8596b
+MISC metadata.xml 1111 BLAKE2B 9f9bcd089280889ccb6990617f6b470c0c69a8b77b2af849d5bde7ff45ec94e121569d2c217a87d7375e19503bf0d90de775c514e7b400c0dd2a6fbc897c21b4 SHA512 dc2f37b1def7e302fc3d82325d3179b0c64c96b2fa609f6cf5196cb97b89854fade361005327ee2f8ccc5927e0aefe1c997cf5e6f9862cc18ef09deb3a2aa814
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1_p20170130.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1_p20170130.ebuild
index cb8c3ee88762..1099ff0e4161 100644
--- a/x11-misc/bumblebee/bumblebee-3.2.1_p20170130.ebuild
+++ b/x11-misc/bumblebee/bumblebee-3.2.1_p20170130.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,11 +9,11 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Bumblebee-Project/Bumblebee.git"
 	EGIT_BRANCH="develop"
-	KEYWORDS=""
+	KEYWORDS="amd64 x86"
 else
 	COMMIT="d469a32fc0dfef5b3725c7a5331be2d04b870594"
 	SRC_URI="https://github.com/Bumblebee-Project/Bumblebee/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 
 	S="${WORKDIR}/Bumblebee-${COMMIT}"
 fi
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1_p20170123.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1_p20190421.ebuild
index 65477c88d732..ecedcc95c494 100644
--- a/x11-misc/bumblebee/bumblebee-3.2.1_p20170123.ebuild
+++ b/x11-misc/bumblebee/bumblebee-3.2.1_p20190421.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools multilib readme.gentoo-r1 systemd user
+inherit autotools readme.gentoo-r1 systemd user
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH="develop"
 	KEYWORDS=""
 else
-	COMMIT="c322bd849aabe6e48b4304b8d13cc4aadc36a30d"
+	COMMIT="7aa457fe7b4fffc3b175ad36fdae00d7777065dc"
 	SRC_URI="https://github.com/Bumblebee-Project/Bumblebee/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 
diff --git a/x11-misc/bumblebee/metadata.xml b/x11-misc/bumblebee/metadata.xml
index 8db7b5c88e4c..00460ee5c462 100644
--- a/x11-misc/bumblebee/metadata.xml
+++ b/x11-misc/bumblebee/metadata.xml
@@ -6,6 +6,10 @@
 		<name>NP-Hardass</name>
 	</maintainer>
 	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+		<name>Pacho Ramos</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>rei4dan@gmail.com</email>
 		<name>My Th</name>
 	</maintainer>
@@ -18,7 +22,7 @@
 	means of managing Optimus hybrid graphics chipsets. A primary goal of this
 	project is to not only enable use of the discrete GPU for rendering, but
 	also to enable smart power management of the dGPU when it's not in use.
-</longdescription>
+	</longdescription>
 	<use>
 		<flag name="bbswitch">Add dependency on <pkg>sys-power/bbswitch</pkg> for
 			PM feature</flag>
diff --git a/x11-misc/efax-gtk/Manifest b/x11-misc/efax-gtk/Manifest
index c2cc67ce802f..e171af653ac9 100644
--- a/x11-misc/efax-gtk/Manifest
+++ b/x11-misc/efax-gtk/Manifest
@@ -1,9 +1,8 @@
 AUX efax-gtk-3.2.13-fno-common.patch 890 BLAKE2B b21b9e622b33f0691b5cb5d32deaa2beb9b86720b9c41f34f68080a5347066942e34c8cd62d867b182a0b6199304b226ca406b6edade3d74fd5c998c8bb44f90 SHA512 723713ba260ecf77886a5888ed28f3eae48f26461c178787707a888bf910e9bf238256816c659cb9534f0765cc056cc5dd15581d905435ba7d778488e189ead8
-DIST efax-gtk-3.2.13.src.tgz 1245015 BLAKE2B 3de1e6eb75173d1fb8901e648ba98dee847f1c4171dfdb4cb8b3eb31094b44a736f4b34a988ff95011323a31db39d75135be2959c44d0f20ea0e219a8c652aaf SHA512 dde0f79df444bdaf5250eae1dc0a94184c0b32e319b04943e81178d2a744bb6e387b5aa0f2379bd23dd4c18d28c30c60083c0cda5819e5c853c1b7bdc4f5b64f
 DIST efax-gtk-3.2.14.src.tgz 1241132 BLAKE2B 8907907681076d9238219a42c7a490f15b988019be2dd291131fd48122421f8f9476ae59f4832395ff56c44b0981490f3c38c49df643dbc1125f33e735392bbf SHA512 28e0814c209c4c398a27b4f421b0902942fb2088e94d992c344093d755a74176cedce2912ad6f5c0a21fde1fc57acd8c5bb97bd98c42b76bdf2ab1b5919a595e
+DIST efax-gtk-3.2.15.src.tgz 1253414 BLAKE2B 1cd5eadced1e1ad03cb3d05b2068ce232c5632cebdba3320b721b773685f9ba4f1c69f4f0f0f0e261fce127ccaeb2f8eb5b95a4f6cbcc7adcc36c4a22729acb8 SHA512 83ba678162c2ec5c62eeba941a712f507aaeef3a42dfffe8a7dedca72af5ee46626e9c709d7617fc3bf62191ce0f6b10bac2498e1996cc45270db638fdfb7e63
 DIST efax-gtk-3.2.9.src.tgz 1176921 BLAKE2B 327ee205a747bc6f3909143b79ae9754009bb29ca35a755581d7a1a6604a76deb0b17ae9c3a679652d2216668c540e2074432c88bb31ef5322d9723c8382fa2f SHA512 a2a4a648b95f9143f8ad3b42c3f8f86323a2b312fed87616eddeaebe06742a5a4ae841d79f3078bf9e819288252ad4d79ec429a66116c1d2b8df8a8a13cac806
-EBUILD efax-gtk-3.2.13-r1.ebuild 1201 BLAKE2B 692c8484abf6af95bcb7c993ff17dfe30a7b365930ee5d127e17614c855ad17eeab53a92ede35caf1cbb7e2a8bb337427696267a85a526d24ebc482099a1c627 SHA512 7ff07a8547d5d9acd71423234b4723eb5f6a22b580ee6fd4df94609a1f43ad8b3785b94df7bb5f9cc82966abc84ae01affc0aa1c7827ed07f2fc28125238475e
-EBUILD efax-gtk-3.2.13.ebuild 1194 BLAKE2B aaa54409f108bac119cfd54b839303af902ddeb7b429891627906b2ea895865c8e91ef86b00d18995d3be5eac1994ee63a36d2b402ac20e68fdc5bb4914db68d SHA512 abd4f161dca129c2ce5a23b84eb0cd4b6db310e31e5925f3d3f3e4606cc5f8a937e7f5ca903ac67b3688e6f9289d10294989e8195806a5917a39473c5d18299b
 EBUILD efax-gtk-3.2.14.ebuild 1201 BLAKE2B 692c8484abf6af95bcb7c993ff17dfe30a7b365930ee5d127e17614c855ad17eeab53a92ede35caf1cbb7e2a8bb337427696267a85a526d24ebc482099a1c627 SHA512 7ff07a8547d5d9acd71423234b4723eb5f6a22b580ee6fd4df94609a1f43ad8b3785b94df7bb5f9cc82966abc84ae01affc0aa1c7827ed07f2fc28125238475e
+EBUILD efax-gtk-3.2.15.ebuild 1144 BLAKE2B aeb18760930539ad906618917327ef72332d5f068a8d3abe3de1602ceca6dfcadc05454b1af0d4c9cdf9f912ddc072332993a1b2b7232c4157f9f9d0f0bec582 SHA512 77b30769cc8bf783d8a7923e9d18c84a4ce4526dc827b9cbb8993a2374452598def6790fba3c71d9fef242ea00ffa2baf8c3b56d92c44c1460cd998c924bae87
 EBUILD efax-gtk-3.2.9.ebuild 1209 BLAKE2B f49936691e5286b360fe284130d14ba1a61e64502d9ffa6c502c49ce5b8e21e0ced3ffdad62ccdc7167ead726312bb04158a667133aed43e9bfaaa15047e35c3 SHA512 c2e20282c1dc1a7b59dfb7088da0ab6dda7f10027e63e90655207456136bf108f45d28ad8e20480e9ef17e22df3aa461bb4016a3c77719c42f6205b938baccc6
 MISC metadata.xml 354 BLAKE2B c4168be07b9ff9bb2a00459999ce4cd94ce8a0e2da7253df4c3a9c2ceed596e46e589d508dd4b561869ead4cda8c503a88de2256eec027e95be4191c7fc7aecd SHA512 6b32fac40a7eeabdbc54a4416d05fbe7d516b95056d00b4ecf5f707a667b53994fe519f653dbc2c00b48354698602c5b961684f9cfa67e1e6bc75faaabf3941f
diff --git a/x11-misc/efax-gtk/efax-gtk-3.2.13.ebuild b/x11-misc/efax-gtk/efax-gtk-3.2.13.ebuild
deleted file mode 100644
index 55711ad507fb..000000000000
--- a/x11-misc/efax-gtk/efax-gtk-3.2.13.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A graphical frontend for the 'efax' application"
-HOMEPAGE="http://efax-gtk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="nls"
-
-RDEPEND=">=dev-libs/glib-2.10
-	media-libs/tiff:0=
-	x11-libs/libX11
-	x11-libs/c++-gtk-utils:0[gtk]
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-DOCS="AUTHORS BUGS ChangeLog README"
-
-src_prepare() {
-	# Prevent sandbox violation with chown/chgrp and existing spooldir
-	sed -i -e '/ch.*lp.*spooldir/d' efax-gtk-faxfilter/Makefile.in || die
-
-	sed -i \
-		-e '/^Encoding/d' \
-		-e '/^Categories/s:Office;::' \
-		${PN}.desktop || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--with-gtk-version=gtk3
-}
-
-src_install() {
-	default
-	# File collision with net-misc/efax wrt #401221
-	mv "${ED}"usr/share/man/man1/efax{,-0.9a}.1 || die
-	mv "${ED}"usr/share/man/man1/efix{,-0.9a}.1 || die
-}
-
-pkg_postinst() {
-	local spooldir="${EROOT}"/var/spool/fax
-	[[ -d ${spooldir} ]] && chown lp:lp "${spooldir}"
-}
diff --git a/x11-misc/efax-gtk/efax-gtk-3.2.13-r1.ebuild b/x11-misc/efax-gtk/efax-gtk-3.2.15.ebuild
index 226321974658..1f8dcfaca924 100644
--- a/x11-misc/efax-gtk/efax-gtk-3.2.13-r1.ebuild
+++ b/x11-misc/efax-gtk/efax-gtk-3.2.15.ebuild
@@ -25,9 +25,6 @@ DEPEND="
 "
 
 DOCS="AUTHORS BUGS ChangeLog README"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.13-fno-common.patch
-)
 
 src_prepare() {
 	default
diff --git a/x11-misc/gromit/Manifest b/x11-misc/gromit/Manifest
index 96f08708d8a8..540cdf641f5c 100644
--- a/x11-misc/gromit/Manifest
+++ b/x11-misc/gromit/Manifest
@@ -1,4 +1,4 @@
 AUX gromit-20041213-build.patch 870 BLAKE2B 7f06b91d77c666bf90254472aeef96d20b4813aa5d1d6309b3c6a523484070399915de951a5eea3675aaaeb0796088a4b3c531b096ed9e00c743db26e527ae58 SHA512 fc1119d8e9e0dc565a1dbb96aeaedc95b49a7b1904e63103c36bc562c99c3b059deba1a50cd16ab0ee11c7521fe59e834a7e43525b59005719d24b7781138427
 DIST gromit-20041213.tar.gz 21970 BLAKE2B 44740d29086bb5f7cfd11a882ffb8e89cd0ea87bd91c0017376b312211b64bd999f9dc81fce358b6a1d7d311f0a34940bd81b205ee2baa54112c930309109585 SHA512 8d10953bf0500e9b411ce6d7b6c43b295ab64113e8a873438409de8a1aad19b685483045341b0af889e7c833816f035c95dda90d3c201caf7c69ea7cbad57e42
 EBUILD gromit-20041213-r1.ebuild 617 BLAKE2B e459b2ee7776a3ec8cb3a89b157ca84beb1ff76313cac7120da0668d388fbdd29997cb86f9276753ecf746a3bf924c01858478d2a59cd3b6df8c18c2bc1fce5d SHA512 5aa89fa8be20241fdbda51a68d4bddb788679bf3f8ead23f76a439831c8796e3330ce77bc845d2a74ed6274f01d8ead9cfe9ec64fa191fba7607e26a151a76f3
-MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-misc/gromit/metadata.xml b/x11-misc/gromit/metadata.xml
index 19bf1be2581e..6f49eba8f496 100644
--- a/x11-misc/gromit/metadata.xml
+++ b/x11-misc/gromit/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index 6aac922bda5f..6f223d7ea161 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -2,5 +2,5 @@ DIST lightdm-gentoo-patch-2.tar.gz 695543 BLAKE2B 62e21dd413b90053160f774663d89c
 DIST lightdm-gtk-greeter-2.0.6.tar.gz 575668 BLAKE2B 6aa5e4db80f411b5a5e34c5ce332906a11d7755af71f617dfedf1658c60777ba732e0ed81a9d5e01c93e2a7fd74364dffc8043d640cd6ab91f3e604769863c01 SHA512 778215351a9140f164c67c75d69efc55b1edf97a493f42a14e2a40e322f738cba99534274d00198291454466fbf407efdc927479c4821d04e12d742feb31cc3a
 DIST lightdm-gtk-greeter-2.0.7.tar.gz 580726 BLAKE2B 1cb2a92a9bda0e28b718cf033ad01e8a8a955600715c61bc5f27723a1b5f4a4624caa61bbe9bdca13064919116f5f08959db2622a5d6b097998d762ffd9cfc28 SHA512 62ad8d522db9aeea7bd0acc76c989a1d39e8be619847b294048530b2dfbebf5a5982f84daf1a5f49b0a8a7abe3234e1571fb5d4f5429b02867801015f30e4944
 EBUILD lightdm-gtk-greeter-2.0.6.ebuild 2082 BLAKE2B dce5c3a2287c63eed4ea373740f47181004984d4ee33a7132d509354d994c0fe47bc2f623631990b556c14f1e8cf29d6138a99e85b9bc53d2fcf475997f54f76 SHA512 6fb43d653fbbb9564a6d25cd34ac60db0c8c0cce6998c14aec934e90718c386382fb08241b8ffef5e4e826f2cc508f4fcc6c026129298d7d20cf7ff38e7dfe20
-EBUILD lightdm-gtk-greeter-2.0.7-r1.ebuild 2080 BLAKE2B c3c96fbc74ec7b2c203625b9e5deeed46b129f43f9fe43ea926a54114a8bd5c9dee3588a57658451c80543c464130a28633757d6e876b65ba4b8ca8e4efe3ed8 SHA512 2c41e34a76da2cf56d354eb6dbc57cc5ce921fde1371c3c00b6e3491021a391f1fbf986d685507b3b31c8ceecae8b31605b1b2a7389a355ff7cfac946287ad51
+EBUILD lightdm-gtk-greeter-2.0.7-r1.ebuild 2078 BLAKE2B 5e4252ccc3d0fb4102a0f8741a051845cb9953b15004feeee6d62e22a6a385e3ee996da2ce4825e68312fa0bcb58be704e257643601bf9350e00d5d19b7689ef SHA512 8cb1c44379697de9f7328abb26ed83e18b3591dbc52eecd4f74ded1569f4daf44320d9d40dbe0cad547c4e9cccfdf5eecd9cbd7d79292172d02cb70426c989f6
 MISC metadata.xml 338 BLAKE2B d67c21b3faacdf75178e2dd79f1365b5d8891431f2388a959c986f9e21f1da21a5138ba6d1831c4d28f6102a6964850ce3ebe8971d955e68be0d9d97fbfa2fa4 SHA512 2b2065cbe74e2166fc4fe4970fcc01e20dc34c92842e163bcc799d162da39e2cce09f1491e6fc853d5fadd9cb40cc975f0f1e4d57462fbce2442a99441ed7403
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild
index c8eeed761446..5cbefb2fe18b 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(ver_cut 1-2)/${PV}/+downloa
 LICENSE="GPL-3 LGPL-3
 	branding? ( CC-BY-3.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86"
 IUSE="appindicator branding"
 
 COMMON_DEPEND="appindicator? ( dev-libs/libindicator:3 )
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index b024e883e61f..972530dd9043 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -6,5 +6,5 @@ DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c
 DIST lightdm-1.28.0.tar.xz 517460 BLAKE2B 98a0b60623dcac07bbb6bff95fa20da9425b714fe5da0d7d86c788362e40604bea2b46675c57e70c70356f71a542adbd6431723e40b815db8565d67ddecc20a1 SHA512 e1e8a952e723bbcc106043d33a64278b228a5a47a7e54235375817b08483594cc5e46ec52f5cbb9d258266e44b045785bca1d4c62daf83071c0f668b3c480071
 DIST lightdm-1.30.0.tar.xz 509220 BLAKE2B 5b6fcc6b955d7a7eb3a810a7e28707a812810d7f2568d6985a4411b1bf6f06b35ff721bd8a9388a85a4e4a64a39f5e30e86a9dbaa6d344e898ae49e9f39785ff SHA512 bca25a0aa73caf7d51e5882889a1707d2527470a170658c1be98ecfb96c8f85fd616494fc5bed658e744f91b9f8b0a98d2a0cf42f9c030242ae470c8a27145ce
 EBUILD lightdm-1.28.0.ebuild 3920 BLAKE2B 9a50dfa326aac3c678291c95efad0d700f6a940b1bff0c5d8b414777e4029502d4260b6e9afaac7d770bb30231c07a9f98dc1799fc6875b609206e75a249e312 SHA512 3ae4cbeaf8a786861a2a88e47693ebd713350b6139991c91a57abe7a741009480fd82706ac98de1fdedee570d2475f9373a80ef0a8b21bcb9679c640185e5004
-EBUILD lightdm-1.30.0.ebuild 4269 BLAKE2B 43615f719c69291e9e6dfc602ac6e093968e974c93c8f70fbdd77a08d835bc96f46a311fec518872cc7c4651af3244fffdb122579a353a56f4ad2a84ac4e1910 SHA512 077850b3f85078e822aed1e90148a6abdd59613d281de0b60eebaa6e6da4ca32dd1d8b069f0bda53fa3cf68b66f77605360b4cacef51c1364dae8e3d9a24d933
+EBUILD lightdm-1.30.0.ebuild 4267 BLAKE2B a68f01ea8c9dc1725c859a7ba74627f57230c22669d4a090ac8704b28fdd56233d71a031ca0e7dd2e65ae5bdc9994b88fcc5707b2afd134f956b7d93782d0942 SHA512 782a2ab3242a1fbb202989f380cc6a625be99aea157f150a649ae41599dc00be941d70be1e0af32314db48445e00d783c6d3b54c4cc486286bc3ae837cf3a4ff
 MISC metadata.xml 462 BLAKE2B 8360d85d185558b5d6c3b2d18d5210c532537d1cc93007b0f0b91d37b388d02c966dda14c298ff8c3b47bd39696b332f989fffa6e1a68001116ddd69141b21d6 SHA512 d76a144235e233e46103c3f10ee64d3b5306b82220366e006671851dc725027ddbf600ca8fab8370c7fca3b09182cd7c85b458d79e7ddca681f279909f4737ba
diff --git a/x11-misc/lightdm/lightdm-1.30.0.ebuild b/x11-misc/lightdm/lightdm-1.30.0.ebuild
index 1d2ebf04158b..ea3868227341 100644
--- a/x11-misc/lightdm/lightdm-1.30.0.ebuild
+++ b/x11-misc/lightdm/lightdm-1.30.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.ta
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86"
 IUSE="audit +gnome +gtk +introspection non_root qt5 vala"
 
 COMMON_DEPEND="
diff --git a/x11-misc/obmenu/Manifest b/x11-misc/obmenu/Manifest
deleted file mode 100644
index 026db2548514..000000000000
--- a/x11-misc/obmenu/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST obmenu-1.0.tar.gz 26375 BLAKE2B 1667cebcce4308777c2ae049a43bc2dd1a9b02eb9c6f78692d2f91fca336d6e6ee096ff4529856ce89fd12a13649c895787cdbc488f4f9d3ab8e78367d9474ed SHA512 64f36c5847c9e20ad989ba1e5a1fd780e420ad52ed3c188b06910a5bebb54373ad6b826621916fbcb1f900a34569f1d7c484094de99a227ed31cd2ff87ef78c5
-EBUILD obmenu-1.0-r1.ebuild 388 BLAKE2B 42bd7a9bab612d60053448151eba97db840e53186d504773d93b4f61d6b3ea269e5c1cf1c39bde7c77afe1fda57490f54883480a860d2629e47783d8f0aa59cf SHA512 e846335fc694119428d14c1afde8631b53a13330c2887e91d4a820d48275163f787af855027ddad986b0052c6ebfc5f2421c631748dbe51aadf3b4f801eb23a2
-MISC metadata.xml 243 BLAKE2B 53ca6951e895433d722b097b4ba0164e3001c6bc2442dcb38ba14651d83026a18b599f390539cfa3810f6dd49b4b6d05cc391e633a2e1d7e39c9178c8153ddf8 SHA512 f507a7ed16ad39c33a24e0d4ff7a310748064d9bc0b3352fb288aab198085810caa20187bf4d5504f8973c23e2625eb6c332bff668b0cbe0d639204cb3e247dd
diff --git a/x11-misc/obmenu/metadata.xml b/x11-misc/obmenu/metadata.xml
deleted file mode 100644
index 3db4c15a38ec..000000000000
--- a/x11-misc/obmenu/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-needed -->
-	<upstream>
-		<remote-id type="sourceforge">obmenu</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-misc/obmenu/obmenu-1.0-r1.ebuild b/x11-misc/obmenu/obmenu-1.0-r1.ebuild
deleted file mode 100644
index b595f0e3ad72..000000000000
--- a/x11-misc/obmenu/obmenu-1.0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="Menu editor designed for openbox"
-HOMEPAGE="http://obmenu.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-RDEPEND="dev-python/pygtk"
diff --git a/x11-misc/obtheme/Manifest b/x11-misc/obtheme/Manifest
deleted file mode 100644
index 54cfc21c1ab2..000000000000
--- a/x11-misc/obtheme/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST obtheme-2013.2.20.2.tar.xz 25080 BLAKE2B 5828a20a94825d5a858a1bbe9695c7c08e1b81b5368ee998d4f295874a9a968a346156adbba2d2446e64bc656c91c2f69e88cf315f100cb6dc58849704d810a3 SHA512 5e7d1d187c0d5f3e6851b3a09be9aeed3b2708277940abd19efba4a501bf3ab20e0307f51e4b63e33ba07d301abf41607cec7074b3e478c9c5e6b065b3773f77
-EBUILD obtheme-2013.2.20.2.ebuild 681 BLAKE2B f033cc6968bcda151eca6b07b8270d1e85772c9208a89571bd07ccf8fa04e04aecded6eed1a63fc2002de4c45cd535146c13adeaeca88a18ec6ddeec79e1c243 SHA512 1b79761e6f5bf6014668c3d5ff080c9ff971e42d91c7e68f0d4e465978778bb7ac9020969762d0c404897885a4dc7fc4fb5a26f3dffc842fe98a0965aba24ffb
-MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/obtheme/metadata.xml b/x11-misc/obtheme/metadata.xml
deleted file mode 100644
index 2ba8e9e851e4..000000000000
--- a/x11-misc/obtheme/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>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/x11-misc/obtheme/obtheme-2013.2.20.2.ebuild b/x11-misc/obtheme/obtheme-2013.2.20.2.ebuild
deleted file mode 100644
index 3913afadb960..000000000000
--- a/x11-misc/obtheme/obtheme-2013.2.20.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-r1
-
-DESCRIPTION="A gui theme editor for openbox"
-HOMEPAGE="http://xyne.archlinux.ca/projects/obtheme/"
-SRC_URI="http://xyne.archlinux.ca/projects/obtheme/src/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/fuse-python
-	x11-libs/gtk+:2
-"
-
-src_install() {
-	python_foreach_impl python_doscript ${PN}
-	domenu ${PN}.desktop
-	dodoc README CHANGELOG
-}
diff --git a/x11-misc/picom/Manifest b/x11-misc/picom/Manifest
index 1b693725d0c7..e2a402f8dfb8 100644
--- a/x11-misc/picom/Manifest
+++ b/x11-misc/picom/Manifest
@@ -2,6 +2,6 @@ AUX picom-7.5-no_opengl.patch 680 BLAKE2B d0d0e9cf752ac003bc312b736dd64388924b6a
 DIST picom-7.5.tar.gz 219456 BLAKE2B 54113547b575ad6aa1329e92ae331b7d49207fdcdc6b49d31d8ab125f7335730a7e53b260c6a6c33d5350bec1e9e6357fd34023dc7837de165289446f8f492b8 SHA512 6535e5eab1a243bbee62448bc48830b7ea3566f94b2c45d9ca76fd8b8056e1f00e55f0e4b58110364d2c4f56652cc005622d644c1db1db41d2811ecc19e6d44a
 DIST picom-8.tar.gz 242059 BLAKE2B cfeec7f40eaa43c115bd326abeaa547553f7bdd22a2e6b2a96f46d87c164b0e9403a876f069077e3b85d11af685aadb0cff2a4e7df2cf87646f2552f9c1a01df SHA512 154dd42dea16aca463e7d7f9913a8f10740df892bfdda2fee210a94b13c8eaf6201b35e505daf45075fdb1980bb9b85adf170b649702c1b1e2fcdc1d88406b4a
 EBUILD picom-7.5-r1.ebuild 1335 BLAKE2B 09bd5c512559e6767258c7729d0756a5654f4eed20adb0d81d768a7ab546a828becbc73c861385cc15063658cb934614a57f12bc6ae1c5851aed2e1a2c0a8e87 SHA512 589200086b027dc00a743f8d30bba2d48e20480c8c2c2f7462aeb88668fef202211e891e7967d8d6e7baea23c00ea0df863a5806e6b5280375958f935a5c08a2
-EBUILD picom-8.ebuild 1412 BLAKE2B 8a4431b463235129a885d174d4bc7237cdc1f62bd8c446575238ad85056db56d2c0b56c2e3958f15537918edf822272ae02f5888684c536eb6e909b41996ab31 SHA512 5a6563845404a0268d45b86bf2567138532dc4c791d9707bb415735d663e5793d3ec96226ba600cd3439a8e4229543f97c88847392bb4820b9d322e6e2bc556c
+EBUILD picom-8.ebuild 1419 BLAKE2B a991549fde6f0bec57766fe29e7a0c15fe9277ec4c178b6697789bbb0d1f923e3e9c307161e2fc2557b4d8bcdc58d705325c018cf19f7518165fcddf21fede18 SHA512 3611ee43a9782ff7df23edab1a509450573daea133ff32c01c8149dbedf70a3ff6f3b49c73931a69aba2cd401ab1daf5217b603b4b9c8351ca01342f5c42af65
 EBUILD picom-9999.ebuild 1057 BLAKE2B e5d700777b0e76cbec5967e0149f61842c79de34372f861fe9ea0256d079aa20004a6f77eeba74655f9e63de8b24e9548816dae5a12648bf7fa0a8410da086fe SHA512 9e60499fcb059bbc8a846ca532daf07ba0cc02e7b56fbf956a5f52a3b84cd75e1049349be779f5ba31f87275ca6010a9df8f3f5fdbc0b45df4df0aef76613e4d
 MISC metadata.xml 677 BLAKE2B 3d9d1ca23a81c30ac451c45ecad35c3cfbc63ea0a1d5c2cfed587990b33158ca8b3c188fe611aa51b77d2c66a270f8cc95ea5f38cb6270bd1ebf92411cb8ba8f SHA512 9a77cc79578426ae9e1e89e471d4368ef662f3bff757015d4cb48f08e2cbec446753ad16233bafde8ae1c61da0ec1bbd8539534c6097c7525c5905532c8cc9a5
diff --git a/x11-misc/picom/picom-8.ebuild b/x11-misc/picom/picom-8.ebuild
index b521266c63e2..2530591a444a 100644
--- a/x11-misc/picom/picom-8.ebuild
+++ b/x11-misc/picom/picom-8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/yshui/picom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0 MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="+config-file dbus +doc +drm opengl pcre test"
 
 REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!"
diff --git a/x11-misc/qlipper/Manifest b/x11-misc/qlipper/Manifest
index c44452217bd1..8e5623c833a4 100644
--- a/x11-misc/qlipper/Manifest
+++ b/x11-misc/qlipper/Manifest
@@ -2,5 +2,5 @@ AUX qlipper-5.0.0-build.patch 1690 BLAKE2B 904b17740275aba865f5dc619a4dd95862f2c
 DIST qlipper-5.0.0.tar.gz 94281 BLAKE2B 04834165a70d71fad2ee945c0b8389ffefef110554d234e0b1f25f02f7b33a0c8cf809cafd7f7a74a2845f949d35a6ad8045d23981efdd9e6c091c5e61ac9367 SHA512 d2bd834f33531a175201244bdd6e9436da16c6f77e1fdc79616c8c3faef531ae50d4cc3b072074fd5efa494cc7be30ffe617912cf54494a66a72420095b0c642
 DIST qlipper-5.1.2.tar.gz 104652 BLAKE2B 841b984d4720dfe7d69424a79beee8d84f5d66109ac1afb75c39cf16ff27da309d929f91eab2222e43a547d4d010809f31d59adb321c9f9f0ae19fb580cff0a2 SHA512 1ad49424855abf5f446026856178291b6ed8c1152338013f2228bbe5a923bc2e989754fe41e8b03f069f815c3850073eb1063842b5f40462005693a9029b187b
 EBUILD qlipper-5.0.0.ebuild 774 BLAKE2B d416c001338ac1b644282e4d2ab6c9153030a77c6d73d9ed27c55f98120f11d09a4bfbf6440b64c5352ae58f7b6d59b7d3fb0e9426d6b714d4d7308a8346ec4c SHA512 214ef740bea26e7646f77fee465aba7f25f566783503e5b66556e537cfb29cdca6588614a4de1645c01d84fb7fdfd6830d0285f77d1debf1c6c80e8f6dff0b51
-EBUILD qlipper-5.1.2.ebuild 670 BLAKE2B ecf92f459f85223e30131a5161c04b0ffe04bf8a3561deee0fd95b427d8981e922a40daa399f060a9926701a28635aa23cb5f11f44f2972e46fa85c0cb615e34 SHA512 faf2c1784c69bdbd5fd1aaca1ad90bd4f3e84ef6b4c00a23b82a2b0a9be7dd68609285cfb8b73dccd567b523ac3f5c405f5b8cd4914401fc03f45d2160bf0fbe
+EBUILD qlipper-5.1.2.ebuild 669 BLAKE2B d462649c3b3e35e636293da4d125d08e47b076b6909b01127c7b5a184e23efd2d728870e5713bb7d725b454ddcf21374f9701fe5b58e1ac650abc733a5471390 SHA512 1647756c69566c8b2a75602975a79ddee841f595ad4ce3705efa33d316bee3db73018ec57b1123bf305901103e749d4808a2c30e08274f9f9b421c958b5695bc
 MISC metadata.xml 326 BLAKE2B 345890725be13fba9c48c60bcdf1be0b14d41d803820fa1d7fa170d44c442a60c50454552697386ddd3732b3d5226f8c96e66fea9bd1b75a1a7c48a08d8e3520 SHA512 5a8bfb530bd363777d529b7b70eec99ba70e6ee41ad9f6fb5ba7fd4c9259ffd381d4343d7a1c6dce34fc1566f5cab4fd474bc3726bbee49edc92d78250d87775
diff --git a/x11-misc/qlipper/qlipper-5.1.2.ebuild b/x11-misc/qlipper/qlipper-5.1.2.ebuild
index df5f55a1362f..746b675f1bdd 100644
--- a/x11-misc/qlipper/qlipper-5.1.2.ebuild
+++ b/x11-misc/qlipper/qlipper-5.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pvanek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # bundles x11-libs/libqxt but no qt5 system version is available yet
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index 0fdc557872c3..c2af318fc842 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,5 +1,5 @@
 DIST shared-mime-info-1.10.tar.xz 616800 BLAKE2B a63c97aba9184e7926db01968aef2a741ef089a46ab9365eb8dad5a78f585f90171751baeaa3bc62ed0a37eed6e93d60598fbe1e7e63168106fc8aa05f2f5cc8 SHA512 efc2b63cae11e6b0332f8607ba57a885dec68a23ac299bbda3eb6e2c7ed071c7c40dba73e9cf23ab675fcaa86ea3777fa931a9f25000a08ec6a748734c88beda
 DIST shared-mime-info-1.15.tar.xz 772708 BLAKE2B 763c7b5f1128882cb8a027ee7fb35daa5d141ccab07ba7aeae5139b94c1ed1c5702741b30c8803b7796bb6eb66fa02fde41d14e078b1960003bd3ba5e0de4e1a SHA512 3666aa500dfa6a28bd0524400c47fa16d90ae61f8c80f350fd895972319ec2f511618b8a7fa3cbde621edee46fde19e4506bda62f0bd2d0ede1b08d7bdb9aef2
 EBUILD shared-mime-info-1.10-r1.ebuild 1773 BLAKE2B bd008173ac18b6b06be56cfad43cddaf9e0495853c5f7526f1b236e81cd1e2f7c0730148bb020dd414e42c106e51825d02ee5c6d0234c36a33a361a290424dea SHA512 cdd5dfbc93748884a3defb0447afb0bf24283c06df886085f6880400018bdbd5b764cf056d8b4ef9c60066c16b0f08b4085f3400d7379b5eb48968df40dca453
-EBUILD shared-mime-info-1.15.ebuild 1275 BLAKE2B 843273dca380f25bc9a10f0512acda41857d32576fe6c00fb2df0af74421f0a891a87239cbdb3dffe97cb2b2f162da37579eebeae61942812805877a244783ff SHA512 ef7eac6866dfe080d98d331dbd04ab3c967ff63509992051bf0eda894d96180cb12caa3c588d6237d44c23d7f926604e9af220da3739c9796e633dcd3f0d79c4
+EBUILD shared-mime-info-1.15.ebuild 1274 BLAKE2B 0c17cc9a27afbf1f678dae46af667d3f661c408a8738b199579e5084212a7a65b81da72716eb4530504cf4927802f8e13f31bd7656fda9d4dc4e0a9f97b3d1ed SHA512 5a108f4bfc9fc34e35f16849dc183ddac0296ede5166eb86c961b0da409e2a9e4516e97c0f25a3d6e6ace8fb3e21348e1909ce1a5c623ad8a33f0f54bdc021d9
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild
index f6f8b023c364..35038d58bea6 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.freedesktop.org/xdg/${PN}/uploads/${HASH}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	dev-util/itstool
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index a3ebd5d7ccc0..2d61dadac04d 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -1,4 +1,5 @@
 AUX shutter-0.90-goocanvas.patch 581 BLAKE2B a944b2d15b16fc429f73456f1aa266e1687a3d765f018b1f206358e140589d12733fff2bd37b8484207abd8849548b2987fad09b7c789481ec167ea1da0cee6d SHA512 2f3e0fbfbc86740efc4aa9ed7a31caf66560948003e3afc5b9dfba9f0935fffe4de5a217fb322ef9135b981030ef79ce964b1de0a28ad28bc36e58e2261f83e5
 DIST shutter-0.94.3.tar.gz 3375447 BLAKE2B e996966722999ee11ed3c185fd17a77e8982688ec17253f3558f89ccfd2e3afefec34d9214acffb10009fc1a28f587a5b994e32d7bb3538cde5e4f398b8e7b95 SHA512 7f67ed6fbc94aee4b6caa73662ab20684e2d8bdfd7208dcd407bdce4e1b93f2aa1fa256ad6bce66b92c741500726b90e5701e7f31bc831709568e5c4c27bff3b
+EBUILD shutter-0.94.3-r1.ebuild 2083 BLAKE2B 3314d2c7a31903e529434c3e3a4f72ea13768ee6fb09e8b121b054648fc44ba51797c14f524731e2fe85396467f8cfc41c5b02c7e084d085e86e3fea9612100b SHA512 c40be1fa15b4b7bf3297a29b769e2b317cbc71c8594f988ee4e531168856a9cf15fe08e9c18c701344ebe5ab8425e8c012e4115135cd831fb2e9ca1bf514f2d0
 EBUILD shutter-0.94.3.ebuild 2601 BLAKE2B 950db9d14ef692b89d48e73f8264d49b776565ba692a7a5a6b712c809a8a4c30ff7c08f2b01b400631eb2da739af479632adadd99e4281a2297a759e132ac21c SHA512 e8155275463b8456a74a7b18180b0705e328f2597359bb87141bb488c0a45c4278bdfd1db3a7d713e4e64bf9e54dcd7d39925f3ac11e2a4915ce71e4636f8923
-MISC metadata.xml 318 BLAKE2B 3e11d3fc694ec5a14878e69c1eccbcf1e4152ac240a266ece373ce2522af05ec7ee4409c1afa209ab464d5fa6985aee388014cd435d42dc1d28ea8ec339bd1ee SHA512 46572230d719235fa4ed51361dafe34de6e8cc3057503b957f422516651e6b9ac99a131abf8e6a5b677f4d76163628ef5940d76c466a2d4ab1f9d60f8d64fef1
+MISC metadata.xml 439 BLAKE2B 688e0946d2c791929e7b351a877ca58d45eaeda73d13fa8eba1e97f3644e8f1d7eadbee432f9f028dc8bda21f72397156386875f7ae3db200fc1ce7108e265a0 SHA512 b4fb3c9f38b71cd3c31af6d819f69709b36ec68035ed695092c54794ca226be58190e7c35019c82e057046630dd5b338dead49b2d09e91ebb40fd979e11c7107
diff --git a/x11-misc/shutter/metadata.xml b/x11-misc/shutter/metadata.xml
index cfdc0bb6b2d7..f341b92a1e2e 100644
--- a/x11-misc/shutter/metadata.xml
+++ b/x11-misc/shutter/metadata.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
-<use>
-	<flag name="drawing">Enables drawing tool</flag>
-</use>
+	<maintainer type="person">
+		<email>alexey+gentoo@asokolov.org</email>
+		<name>Alexey Sokolov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="drawing">Enables drawing tool</flag>
+	</use>
 </pkgmetadata>
diff --git a/x11-misc/shutter/shutter-0.94.3-r1.ebuild b/x11-misc/shutter/shutter-0.94.3-r1.ebuild
new file mode 100644
index 000000000000..d2df1d6487bc
--- /dev/null
+++ b/x11-misc/shutter/shutter-0.94.3-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils xdg-utils
+
+DESCRIPTION="Feature-rich screenshot program"
+HOMEPAGE="https://shutter-project.org/"
+SRC_URI="https://launchpad.net/shutter/0.9x/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/libxml-perl
+	dev-perl/gnome2-canvas
+	dev-perl/gnome2-perl
+	dev-perl/gnome2-wnck
+	dev-perl/Gtk2-Unique
+	dev-perl/Gtk2-ImageView
+	dev-perl/File-DesktopEntry
+	dev-perl/File-HomeDir
+	dev-perl/File-Which
+	dev-perl/JSON
+	dev-perl/File-Copy-Recursive
+	dev-perl/File-MimeInfo
+	dev-perl/Locale-gettext
+	dev-perl/Net-DBus
+	dev-perl/Proc-Simple
+	dev-perl/Proc-ProcessTable
+	dev-perl/Sort-Naturally
+	dev-perl/WWW-Mechanize
+	dev-perl/X11-Protocol
+	dev-perl/XML-Simple
+	dev-perl/libwww-perl
+	virtual/imagemagick-tools[perl]
+"
+
+src_install() {
+	dobin bin/shutter
+	dodoc README
+	domenu share/applications/shutter.desktop
+	doicon share/pixmaps/shutter.png
+
+	# Man page is broken. Reconstruct it.
+	gunzip share/man/man1/shutter.1.gz || die "gunzip failed"
+	doman share/man/man1/shutter.1
+
+	insinto /usr/share
+	doins -r share/shutter
+	doins -r share/locale
+	doins -r share/icons
+
+	insinto /usr/share/metainfo
+	doins share/appdata/shutter.appdata.xml
+
+	find "${ED}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \
+		|| die "failed to make plugins executables"
+	# shutter executes perl scripts as standalone scripts, and after that "require"s them.
+	find "${ED}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \
+		-name "*.pm" -exec chmod 755 {} \; || die "failed to make upload plugins executables"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+
+	optfeature "writing Exif information" media-libs/exiftool
+	optfeature "drawing tool" dev-perl/Goo-Canvas
+	optfeature "image hostings uploading" "dev-perl/JSON-MaybeXS dev-perl/Net-OAuth dev-perl/Path-Class"
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/x11-misc/slop/Manifest b/x11-misc/slop/Manifest
index 6ee7d94b6a41..c48634512f13 100644
--- a/x11-misc/slop/Manifest
+++ b/x11-misc/slop/Manifest
@@ -1,4 +1,6 @@
 DIST slop-7.4.tar.gz 50079 BLAKE2B 20815270bf1bffe0ef26630fd31d0d4cc7261633cef389e64c232a89033b6e8b5e1651fb5c882e2870808107734c4c088123b85675fa2aae932570d770344dc8 SHA512 13d09c2c9f05760ee0a273edb6d40da8a87989d3f071a8c868a0c7e535ba89b9eb934c79d56212cd689687f86e3683cef1b749ef7b37be3805ea8eb05c796e58
+DIST slop-7.5.tar.gz 51060 BLAKE2B 8d0fcf932181dfc482be7c54cf5a08605a32c85bcd8b27223a4cd8a08323382e802a7f20faa6c51fe67583b1d320cf783c7b5cc8b871e534ea11a32b827e1f45 SHA512 c02e40c5b924841996617fcc9629a6a739a04b6128c18e1eb06dc285d2f8026d847e67077fb59a111fc45c112f871a6e5faef20108c3d777271e1d4aca7f4737
 EBUILD slop-7.4.ebuild 841 BLAKE2B e9d7a1c367746cf7755c53e6e67b49350636a9e492fb4925227301e3bbd75b7fff0305cdcb5d44c0d68545677770b5cc286e9762c68da9175379bb4b0856cb04 SHA512 2d488df26b6f1c39539d9eba88baa621a6166b53b30ec30d68bda1eb617dbd9da5b17d74a2fffc5193012141e1e3a68c180ed6d62d3703dd26d35eab4410e078
-EBUILD slop-9999.ebuild 785 BLAKE2B ec4f42dd28595eac50293489235b2eea52adf49a71f37417e20a6f1110b847ab06ce56b77d44f7ae2b66ce1a657667b3d900b8d473d5a6d6ee4d769380082ddb SHA512 5d67f66c0d85e385f79fbde652ea225b25a360df13bb49330b11ffcd2831701566f309e22166df015e8738ecd637abc69fb610fe3c02506bc6e249372f9fafa1
+EBUILD slop-7.5.ebuild 808 BLAKE2B 98fbd3f0b5395b71b11c07a235aa3358a3723a346876dbc88487335b1ed74e552e6ca15bf55d01d54f47b275ada783e3177a359d542b4c74ec03b24a4a9f4e6e SHA512 92c9f8c8920abfc9e321cbdbe4788cc35a470bac8e83fc3f278e2eb63faf05896d07fb6d1f5a323455597c0c15bad731828aa240764e9805526f05dd27dce6b2
+EBUILD slop-9999.ebuild 808 BLAKE2B 98fbd3f0b5395b71b11c07a235aa3358a3723a346876dbc88487335b1ed74e552e6ca15bf55d01d54f47b275ada783e3177a359d542b4c74ec03b24a4a9f4e6e SHA512 92c9f8c8920abfc9e321cbdbe4788cc35a470bac8e83fc3f278e2eb63faf05896d07fb6d1f5a323455597c0c15bad731828aa240764e9805526f05dd27dce6b2
 MISC metadata.xml 630 BLAKE2B dbf7d848908c12d7104c7cd18cd2ca16114073803bd4600e10906a1fc4f86ddeb646359d26885551d998a279d1e11f0d74ad21b135e14a2bea827ef21ade15f7 SHA512 98eea5cce0e8a692076b5cb423a2f0522151d716ef0c9f346e915bfee8590d32dab59c183180ea7f87561bfb92e3840ad710f890a734640173bbcd471d779b0e
diff --git a/x11-misc/slop/slop-7.5.ebuild b/x11-misc/slop/slop-7.5.ebuild
new file mode 100644
index 000000000000..a9c376b256ec
--- /dev/null
+++ b/x11-misc/slop/slop-7.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Application that queries the user for a selection for printing"
+HOMEPAGE="https://github.com/naelstrof/slop"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/naelstrof/slop.git"
+else
+	SRC_URI="https://github.com/naelstrof/slop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+IUSE="opengl"
+
+RDEPEND="
+	dev-libs/icu:=
+	x11-libs/libX11
+	x11-libs/libXext
+	opengl? (
+		media-libs/glew:0=
+		media-libs/libglvnd
+		virtual/opengl
+		x11-libs/libXrender:=
+	)
+"
+DEPEND="${RDEPEND}
+	media-libs/glm
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSLOP_OPENGL=$(usex opengl)
+	)
+	cmake_src_configure
+}
diff --git a/x11-misc/slop/slop-9999.ebuild b/x11-misc/slop/slop-9999.ebuild
index afc048826632..a9c376b256ec 100644
--- a/x11-misc/slop/slop-9999.ebuild
+++ b/x11-misc/slop/slop-9999.ebuild
@@ -26,9 +26,11 @@ RDEPEND="
 	x11-libs/libXext
 	opengl? (
 		media-libs/glew:0=
+		media-libs/libglvnd
 		virtual/opengl
 		x11-libs/libXrender:=
-	)"
+	)
+"
 DEPEND="${RDEPEND}
 	media-libs/glm
 "
diff --git a/x11-misc/snixembed/Manifest b/x11-misc/snixembed/Manifest
index e64ed9a1e1ef..e9633174703b 100644
--- a/x11-misc/snixembed/Manifest
+++ b/x11-misc/snixembed/Manifest
@@ -1,3 +1,5 @@
 DIST snixembed-0.2.2.tar.gz 5870 BLAKE2B fa0ff00808579419410e462e0271d2bc72db0975c6de5b03751ea9d7831c2d4507ef5886058bfa66d12b5dea79f690103243a0398e77c788ee3d77025580cfbe SHA512 474eba11a31c44437a29d034b3e1e8df1b9a0dbc728566fd8727bc957237763e3c88d175bd6c349aaca5fec8dec7213c17e2241e91aefed1686a2368554be05a
+DIST snixembed-0.3.0.tar.gz 6866 BLAKE2B a19b128ad88a6c6126dd261ac2300b42406dabbc6f8e0be7b4cf87829c43028a604e177cd95fee8b78069e065455b329252a8cd08058f73da4e0a210e73a0eac SHA512 617309a1156a939f5613a5574b982173f66ba38c3af9800debbcde7cede22ce763ddec3aa0c738cbd0b8636f38aed79e557a84ace1f1a4e4cb2dd21ee5347051
 EBUILD snixembed-0.2.2.ebuild 1006 BLAKE2B 7c2da73d6054bbe3a281a6a990627dc9f40d8135c9815eb3bb80246bd7be6c520644e06b382b48bb5c9070c1c95d0af67a797881933fcffcab2e4bcc0740e387 SHA512 abf5ab3ee3e75abf4ed39cdacd546cc5d202cda53c3fece6f5ff58ea128ff2be87436055c1567e2427cb0b11be2be1861f7035d758bd5e33b93111e03edf598f
+EBUILD snixembed-0.3.0.ebuild 906 BLAKE2B 4011ba451e73bf6aeaba769d26a93eb8558e5f869d5ddb407be974bd54b7166aa4db796e279cdac2f4fb0e2a70e7a07eddf8523cb1ed6d74c0e143dbe9740c44 SHA512 757aaf816ef2bf14d0d7334a7219daf7f37dcc8d07942029c11612897c7f1f07377f09ac8d2c17db70c22d6d0a509d151fc46ef3790543345ac4213d24b24ae4
 MISC metadata.xml 247 BLAKE2B 25c731c759786cef3c3ffdb2513becb723ad51c2e3902853311cf3845ab1e9c193672430b2ba6510df55ff43039f593a6f73bc8e057ac6237462b814beb69d37 SHA512 4926bbe8526eca3acea716f8f865c02398b29f7b0481eb07cc9c92f17974a44b038db4489bdd5ea9fc8b73e6e7212bd6dd0948727f8290b5002014291e748de8
diff --git a/x11-misc/snixembed/snixembed-0.3.0.ebuild b/x11-misc/snixembed/snixembed-0.3.0.ebuild
new file mode 100644
index 000000000000..9f781bcdd16e
--- /dev/null
+++ b/x11-misc/snixembed/snixembed-0.3.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vala
+
+DESCRIPTION="Proxy StatusNotifierItems as XEmbedded systemtray-spec icons"
+HOMEPAGE="https://git.sr.ht/~steef/snixembed"
+SRC_URI="https://git.sr.ht/~steef/snixembed/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+DEPEND="dev-libs/glib:2
+	dev-libs/libdbusmenu[gtk3]
+	x11-libs/gtk+:3"
+RDEPEND="${DEPEND}"
+BDEPEND="$(vala_depend)
+	virtual/pkgconfig
+	doc? ( dev-lang/vala[valadoc] )"
+
+src_prepare() {
+	default
+
+	use doc && local VALA_USE_DEPEND="valadoc"
+	vala_src_prepare
+
+	sed -e "s:valac :${VALAC} :" \
+		-e "s:valadoc :${VALADOC} :" \
+		-i makefile || die
+}
+
+src_compile() {
+	default
+	use doc && emake doc
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}" BINDIR="/usr/bin" install
+	use doc && HTML_DOCS=( doc/. )
+	einstalldocs
+}
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 42f29b8458a2..0a8822ac80cf 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -2,7 +2,11 @@ AUX vgl-helper.sh 881 BLAKE2B 5373592a2fb784e38c1542aadb4f150937a69f51284bf21337
 AUX vgl.confd-r2 629 BLAKE2B 9794409221cc6a95b2f7a48e02063d3c6bcfd66c6b3e1929073947b3794ab1f9e69c76be47b9d06fa4ec9404e3ec4b4f7cc3f0395fc3d09684f346304db6202f SHA512 bab0ad095a2f075a1923f1b58531101bce634c89b30e77c239ee224b58eac3083c7eba4d21bd997a4dc8b6e4cfb0be7b013732bdf37a27a16a3301a098d60c29
 AUX vgl.initd-r3 856 BLAKE2B df423f82debf67ef0611c603bf38aa76173044012d3bc5a6276d1325e0d706fc6ff868957d7bc4ea1e14171a7000dabfef4acf3f736e22f9a40c3bdbb4ac0033 SHA512 fcc6c02265e0e2bb1faa00e5da2246b56a7bd8c730faa912904953f5c67eae12bffa99fe57f2a76d199c22956fc1b6ca940fba40972b2afbf73ae7f4f2a0fc7d
 AUX vgl.service 254 BLAKE2B 0a0e73228821019a764b1bc3ff61a752b15001018f704739d86eebbf326ee3a0612475cf7a0c360993e1a27c87815626290dfe4d85fc7e1aaa3897ce41f787c2 SHA512 18615552301c52c272bc47f942c47121100c175651b3957ddf996ca40e755d96dd51194ecb599c92e62fbdba3b9245e999ef488c889833009f8eba1c038c38f9
+AUX virtualgl-2.6.3-mesa-19.3.patch 3803 BLAKE2B cd2120dfc1fdc9c65cb65e428fd5bf98082c0bfcba3ce18ddd736bd1f421188ad9df4170bd6aa7bc2c8ef15f36398ec37a80554aa82e959e2e858faa910171d7 SHA512 6845a60071aac333ac1c2ad5c3861f9fbe8cdf9f28425817a18c2b6f8c280b5469ce3be4831a0bf8a6600955bf5177217ff684c61f728783f2d09be6885f2815
 DIST VirtualGL-2.6.1.tar.gz 1278335 BLAKE2B 62abb082eb8c82fecff33dd5b5036ebaead99b837cf0dc42581790863f09814858fd7a23a479c0c4ac5e59a4cc99af58903016a5109a6636191ce98d6da3d0bd SHA512 36580e55e11ba3e93945d62e865fe0b63ecd5aa1ee3889fb4d0940c68da06737fff4689a77638f5c8c57dbc9d020ba821bdec9aa2f6b2f0f144b18f1c3d8c5e5
+DIST VirtualGL-2.6.3.tar.gz 1197037 BLAKE2B d331ddac80d98e5c1d6be90e90d06706ff3ea8c0c303aeab41536eb1a33014e5e100900f0f1f8734fad317d073c8259523dddb98d9658c2cfb2345ea1410fc0e SHA512 c01c602335d51c94840c32021a5ce4f982939d67efbe1458fce67582c5a76ac42f5b733998a8c8f04a77d57d7c2de01377f7cabcf848c01bfd9b2d8e0b318fea
 EBUILD virtualgl-2.6.1-r1.ebuild 2709 BLAKE2B 95b4f319aeae46ee30ddd72eed37956bf465857e25e0397c8837a6e86689c2803513ab2d13385cd7e8ad879a78a5567fc33e3f0070a69d0ad26688c9a0694aed SHA512 2981a1b63d890e16159ae292e70a34e50deb363183eaa9910ff1501a15de61d279eb77bdf2cf5e0fc39100ad7dcff841a07f426eb60f6bf2d0cd5da25e4cdc01
+EBUILD virtualgl-2.6.3-r1.ebuild 2960 BLAKE2B 15f663fe63ebcf45c8efc7efa31af1bf2f98b39916533e335e30eb2fa03fba204e28e1c06c6a1e83c0f612a8b6cb56c22340ee77cf10685f60aec5f8eec86f2c SHA512 159f58a730f670615a26640e9b5f9d7e55b10562e2af06cc1dc93b5066b5c6d4b7095e0718ee3382f126376e0803446927afc7a5552dcf77d62b2794f6c1b504
+EBUILD virtualgl-2.6.3.ebuild 2902 BLAKE2B 0a444af34d6c2271e4effba1fe73a78f367d65137df33ed720da9dbc8e0d935cfabc657df117b3a5f0b74f69d3e525aafd1d88a78b6a1f8e80814eecc4f52eca SHA512 d102d8952f57a5e1aa789f33a547fee0b9b3aa3b3c0c4ea67713e3b9a6122e98f2eb8b1df1a1bb4ac5dc301d95fd875fb7279c85c41d3d53ca98572364532c17
 EBUILD virtualgl-9999.ebuild 2711 BLAKE2B 6e80ffef02dbb840712e2d8767a3de5acde047a119e3550ad341174d7206ebb811b86a2fade4af739a66363d681106811c6b78a55d8e01160d59ee85a58e6cbd SHA512 53dc4e4e1bd74c0866d165e8e76cc36717081408046ebb798cf31abfcca27d0b93048ebb9a66c513a5914a8f455127d89b667ad210696eb849380f85457bcc10
-MISC metadata.xml 736 BLAKE2B b0fef33f453e573f7742dff774acdd66aae3a8ed586718eb2c88fb5776c8c8040a94285971022ea52a47a702911a6d0f0f669e0cc8facac09d127a73ab6d083d SHA512 b1d37b1974a1db8cb9080279863708a6c1e50a86114ccfb17540980c178093ae6617b1bdfa470e73899277b44af231e41ec2b28504da5e335c0e34d509457600
+MISC metadata.xml 840 BLAKE2B bce303f2b3aac9d5cccd03062f64761f6fadc1194fc78c5850e8ecc3ae00ae0282d21be2f64e2fed294255c3fc3405a48b8cab7270e2c6e20b557b72d1dd82ae SHA512 7b4ffc9dccfe1c5bee2168216854b4020d1854fd85402a4757b8cbd6cf11e90e85ddf352f210d02d55388569b1dafd953377793a35f4130bd45210625c95f3af
diff --git a/x11-misc/virtualgl/files/virtualgl-2.6.3-mesa-19.3.patch b/x11-misc/virtualgl/files/virtualgl-2.6.3-mesa-19.3.patch
new file mode 100644
index 000000000000..6f45ba8a3ffa
--- /dev/null
+++ b/x11-misc/virtualgl/files/virtualgl-2.6.3-mesa-19.3.patch
@@ -0,0 +1,105 @@
+From faedcc1e36b4ed89a325e01822447900840a0b77 Mon Sep 17 00:00:00 2001
+From: DRC <information@virtualgl.org>
+Date: Thu, 13 Feb 2020 19:11:46 -0600
+Subject: [PATCH] Faker: Fix build issue w/ Mesa 19.3.0+ headers
+
+Mesa changed the signatures for glXGetTransparentIndexSUN() and
+glXQueryGLXPbufferSGIX() to match the official GLX extension specs:
+https://www.khronos.org/registry/OpenGL/extensions/SUN/GLX_SUN_get_transparent_index.txt
+https://www.khronos.org/registry/OpenGL/extensions/SGIX/GLX_SGIX_pbuffer.txt
+
+Reference:
+https://gitlab.freedesktop.org/mesa/mesa/commit/3dd299c3d5b88114894ec30d1fac85fba688201f
+
+Fixes #109
+---
+ ChangeLog.md         |  2 ++
+ server/faker-glx.cpp | 14 +++++++++++++-
+ server/faker-sym.h   |  8 +++++++-
+ 3 files changed, 22 insertions(+), 2 deletions(-)
+
+diff --git a/ChangeLog.md b/ChangeLog.md
+index 8d092bd7..78391d06 100644
+--- a/ChangeLog.md
++++ b/ChangeLog.md
+@@ -6,6 +6,8 @@
+ 1. VirtualGL now works properly with 3D applications that use the
+ `glDrawBuffers()` function and render to the front buffer.
+ 
++2. VirtualGL can now be built using the GLX headers from Mesa 19.3.0 and later.
++
+ 
+ 2.6.3
+ =====
+diff --git a/server/faker-glx.cpp b/server/faker-glx.cpp
+index faea37b6..6e7beb63 100644
+--- a/server/faker-glx.cpp
++++ b/server/faker-glx.cpp
+@@ -1,6 +1,6 @@
+ // Copyright (C)2004 Landmark Graphics Corporation
+ // Copyright (C)2005, 2006 Sun Microsystems, Inc.
+-// Copyright (C)2009, 2011-2019 D. R. Commander
++// Copyright (C)2009, 2011-2020 D. R. Commander
+ //
+ // This library is free software and may be redistributed and/or modified under
+ // the terms of the wxWindows Library License, Version 3.1 or (at your option)
+@@ -2192,11 +2192,18 @@ void glXQueryDrawable(Display *dpy, GLXDrawable draw, int attribute,
+ 	CATCH();
+ }
+ 
++#if defined(GLX_GLXEXT_VERSION) && GLX_GLXEXT_VERSION >= 20190000
++void glXQueryGLXPbufferSGIX(Display *dpy, GLXPbuffer pbuf, int attribute,
++	unsigned int *value)
++#else
+ int glXQueryGLXPbufferSGIX(Display *dpy, GLXPbuffer pbuf, int attribute,
+ 	unsigned int *value)
++#endif
+ {
+ 	glXQueryDrawable(dpy, pbuf, attribute, value);
++	#if !defined(GLX_GLXEXT_VERSION) || GLX_GLXEXT_VERSION < 20190000
+ 	return 0;
++	#endif
+ }
+ 
+ 
+@@ -2358,8 +2365,13 @@ void glXSwapBuffers(Display *dpy, GLXDrawable drawable)
+ 
+ // Returns the transparent index from the overlay visual on the 2D X server
+ 
++#if defined(GLX_GLXEXT_VERSION) && GLX_GLXEXT_VERSION >= 20190000
++int glXGetTransparentIndexSUN(Display *dpy, Window overlay, Window underlay,
++	unsigned long *transparentIndex)
++#else
+ int glXGetTransparentIndexSUN(Display *dpy, Window overlay, Window underlay,
+ 	long *transparentIndex)
++#endif
+ {
+ 	int retval = False;
+ 	XWindowAttributes xwa;
+diff --git a/server/faker-sym.h b/server/faker-sym.h
+index b9aa30d0..0168ac7b 100644
+--- a/server/faker-sym.h
++++ b/server/faker-sym.h
+@@ -1,6 +1,6 @@
+ // Copyright (C)2004 Landmark Graphics Corporation
+ // Copyright (C)2005, 2006 Sun Microsystems, Inc.
+-// Copyright (C)2009, 2011, 2013-2016, 2018-2019 D. R. Commander
++// Copyright (C)2009, 2011, 2013-2016, 2018-2020 D. R. Commander
+ //
+ // This library is free software and may be redistributed and/or modified under
+ // the terms of the wxWindows Library License, Version 3.1 or (at your option)
+@@ -535,8 +535,14 @@ FUNCDEF2(GLXFBConfigSGIX, glXGetFBConfigFromVisualSGIX, Display *, dpy,
+ 
+ // GLX_SUN_get_transparent_index
+ 
++#if defined(GLX_GLXEXT_VERSION) && GLX_GLXEXT_VERSION >= 20190000
++FUNCDEF4(int, glXGetTransparentIndexSUN, Display *, dpy, Window, overlay,
++	Window, underlay, unsigned long *, transparentIndex,
++	glXGetTransparentIndexSUN)
++#else
+ FUNCDEF4(int, glXGetTransparentIndexSUN, Display *, dpy, Window, overlay,
+ 	Window, underlay, long *, transparentIndex, glXGetTransparentIndexSUN);
++#endif
+ 
+ 
+ // GL functions
diff --git a/x11-misc/virtualgl/metadata.xml b/x11-misc/virtualgl/metadata.xml
index 332eeeea7599..9262412c8f84 100644
--- a/x11-misc/virtualgl/metadata.xml
+++ b/x11-misc/virtualgl/metadata.xml
@@ -6,6 +6,10 @@
 		<name>NP-Hardass</name>
 	</maintainer>
 	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+		<name>Pacho Ramos</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>rei4dan@gmail.com</email>
 		<name>My Th</name>
 	</maintainer>
diff --git a/x11-misc/virtualgl/virtualgl-2.6.3-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.6.3-r1.ebuild
new file mode 100644
index 000000000000..ed68cde9f2f2
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-2.6.3-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic systemd
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git"
+	inherit git-r3
+else
+	MY_PN="VirtualGL"
+	MY_P="${MY_PN}-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
+HOMEPAGE="https://www.virtualgl.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+IUSE="libressl ssl"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXtst[${MULTILIB_USEDEP}]
+	x11-libs/libXv[${MULTILIB_USEDEP}]
+	virtual/glu[${MULTILIB_USEDEP}]
+	virtual/opencl[${MULTILIB_USEDEP}]
+	virtual/opengl[${MULTILIB_USEDEP}]
+	amd64? ( abi_x86_32? (
+		>=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
+		>=x11-libs/libX11-1.6.2[abi_x86_32]
+		>=x11-libs/libXext-1.3.2[abi_x86_32]
+		>=x11-libs/libXtst-1.2.3[abi_x86_32]
+		>=x11-libs/libXv-1.0.10[abi_x86_32]
+		>=virtual/glu-9.0-r1[abi_x86_32]
+		virtual/opencl[abi_x86_32]
+		>=virtual/opengl-7.0-r1[abi_x86_32]
+	) )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	# Fix build issue w/ Mesa 19.3.0+ headers (fixed in next version)
+	"${FILESDIR}/${P}-mesa-19.3.patch"
+)
+
+src_prepare() {
+	# Use /var/lib, bug #428122
+	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
+		server/vglrun.in server/vglgenkey server/vglserver_config || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Completely breaks steam/wine for discrete graphics otherwise
+	# see https://github.com/VirtualGL/virtualgl/issues/16
+	append-ldflags "-Wl,--no-as-needed"
+
+	abi_configure() {
+		local mycmakeargs=(
+			-DVGL_USESSL="$(usex ssl)"
+			-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
+			-DTJPEG_INCLUDE_DIR=/usr/include
+			-DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL
+			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+		)
+		cmake_src_configure
+	}
+	multilib_parallel_foreach_abi abi_configure
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	# Make config dir
+	dodir /var/lib/VirtualGL
+	fowners root:video /var/lib/VirtualGL
+	fperms 0750 /var/lib/VirtualGL
+	newinitd "${FILESDIR}/vgl.initd-r3" vgl
+	newconfd "${FILESDIR}/vgl.confd-r2" vgl
+
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/vgl-helper.sh"
+	systemd_dounit "${FILESDIR}/vgl.service"
+
+	# Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
+	mv "${D}"/usr/bin/{,v}glxinfo || die
+
+	# Remove license files, bug 536284
+	rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
+
+	# Directory is created if needed at runtime
+	rm -r "${D}"/var/lib || die
+}
diff --git a/x11-misc/virtualgl/virtualgl-2.6.3.ebuild b/x11-misc/virtualgl/virtualgl-2.6.3.ebuild
new file mode 100644
index 000000000000..223864f51a21
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-2.6.3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic systemd
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git"
+	inherit git-r3
+else
+	MY_PN="VirtualGL"
+	MY_P="${MY_PN}-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
+HOMEPAGE="https://www.virtualgl.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+IUSE="libressl ssl"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXtst[${MULTILIB_USEDEP}]
+	x11-libs/libXv[${MULTILIB_USEDEP}]
+	virtual/glu[${MULTILIB_USEDEP}]
+	virtual/opengl[${MULTILIB_USEDEP}]
+	amd64? ( abi_x86_32? (
+		>=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
+		>=x11-libs/libX11-1.6.2[abi_x86_32]
+		>=x11-libs/libXext-1.3.2[abi_x86_32]
+		>=x11-libs/libXtst-1.2.3[abi_x86_32]
+		>=x11-libs/libXv-1.0.10[abi_x86_32]
+		>=virtual/glu-9.0-r1[abi_x86_32]
+		>=virtual/opengl-7.0-r1[abi_x86_32]
+	) )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	# Fix build issue w/ Mesa 19.3.0+ headers (fixed in next version)
+	"${FILESDIR}/${P}-mesa-19.3.patch"
+)
+
+src_prepare() {
+	# Use /var/lib, bug #428122
+	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
+		server/vglrun.in server/vglgenkey server/vglserver_config || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Completely breaks steam/wine for discrete graphics otherwise
+	# see https://github.com/VirtualGL/virtualgl/issues/16
+	append-ldflags "-Wl,--no-as-needed"
+
+	abi_configure() {
+		local mycmakeargs=(
+			-DVGL_USESSL="$(usex ssl)"
+			-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
+			-DTJPEG_INCLUDE_DIR=/usr/include
+			-DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL
+			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+		)
+		cmake_src_configure
+	}
+	multilib_parallel_foreach_abi abi_configure
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	# Make config dir
+	dodir /var/lib/VirtualGL
+	fowners root:video /var/lib/VirtualGL
+	fperms 0750 /var/lib/VirtualGL
+	newinitd "${FILESDIR}/vgl.initd-r3" vgl
+	newconfd "${FILESDIR}/vgl.confd-r2" vgl
+
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/vgl-helper.sh"
+	systemd_dounit "${FILESDIR}/vgl.service"
+
+	# Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
+	mv "${D}"/usr/bin/{,v}glxinfo || die
+
+	# Remove license files, bug 536284
+	rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
+
+	# Directory is created if needed at runtime
+	rm -r "${D}"/var/lib || die
+}
diff --git a/x11-misc/wmakerconf/Manifest b/x11-misc/wmakerconf/Manifest
deleted file mode 100644
index 3a1f56140afa..000000000000
--- a/x11-misc/wmakerconf/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX wmakerconf-2.12-desktop.patch 337 BLAKE2B 6fb3b059a2240cc147ba720f72a18cbe2c5d5c5f0aeca2d52f809bce9902f2ce2fb67510d6efe97a616c2e2a28177fce35c584d46ccca697c12b942f49ef686d SHA512 599c668a481c51d9a0cd802c09ef855e6c0e1960ed27b1127390ee3da5f89967e6ad9a443bdb8cc47802d0d74b1d226be55fc4f6fa4f71eab61bf651cf3a2162
-AUX wmakerconf-2.12-format-security.patch 575 BLAKE2B ea65a217b77218f6946f7a15dbb131fc319f377ac9d1d6bba471a391e2c6eaa79999198a78306c870f19eb0af155110fb02f1dd0fa5f4c3eeb6c3ef4717cfb80 SHA512 b341490da9937165f408311a1f4d56e513eef4b7362cc569d9cce327b01b7b614b688a5994b9cef8dc7872930930381fc031ba1a2a0a058a5e207f843ea137b3
-AUX wmakerconf-2.12-glib-2.62.patch 500 BLAKE2B 0e2358e79a0c9d028b58527b66311afdfd47774019027850b94dcd9a446377c05877b0986f0d36b5a3e33f9665e2389238e820944aa5956c2cbd458b6ff987ec SHA512 d607c6ef920173909187610ffc87fa6351b0ccc0be7ad55bb83575d0e0034be52d6c0e079824081f4436c0dce183aedd7de2328a7305837775a1bcc00a01d51a
-AUX wmakerconf-2.12-wmaker-0.95_support.patch 3548 BLAKE2B 0f79184e802703db3a9e9276edf7f1a94ee88fc9053774b8c5f326ce175fa090d8ad15339d66804b03584a82182abd8cafcf2fab707ac7e97c4e45dbeff33ca5 SHA512 be084d96f35ef6c94a1994abb75b5b71a68ffbc6e3ba9b122b380b632d42da743c94951618094ce42305f87ff238a0c667c76859a320229992c4e0316fcbc79a
-DIST wmakerconf_2.12.tar.gz 830156 BLAKE2B 65dd7d16606304b9746e84a3e71764b5491149ac27f4a1802faa5c14a66cbeaa4d04ecce66649acaf05f798e4fe643ac48b9df15c22e5b4e054951adf1d921df SHA512 4289846b20667a12c729b646ce5cc9d673adc49c3c99f1afcf0bf2eb978d7a62c93104e44f38c47984f5fc7bd22a78fff89d68646701c7e763a26ec18d4ff059
-EBUILD wmakerconf-2.12-r3.ebuild 1409 BLAKE2B d6852d9ae60dc9eb2aa8700876168211f9cef830a0c316a30799dca64fd96ecf0c1dba7fef1215f6723c3d72c874952abb47e4e08c217a19da1064d589207d45 SHA512 187e1aac499dc3d632a96e159c7d4cfed40d94596661f88a80ab494463aded7f10bbddde42a7147a9e7572a39510adc8cb70b6598df27f25856f56d949903d02
-MISC metadata.xml 337 BLAKE2B 8a0c239dd9d71185a61e17ec3308c84ffa97f60dd152e50eaa50a250746f3fa7049d137d6bbe795444d9e84d66cfcf0bb6fe96031113e29e592eee52c00ab041 SHA512 8f144b1c6d8110362014ab291ecde3aef2192ffbe57ce8261849ef9069ad9449f6871a8aa7c2246b2ae866b4264e38261dee2836b86b25b73396ea7c19d1f9f5
diff --git a/x11-misc/wmakerconf/files/wmakerconf-2.12-desktop.patch b/x11-misc/wmakerconf/files/wmakerconf-2.12-desktop.patch
deleted file mode 100644
index 184fa55ea04e..000000000000
--- a/x11-misc/wmakerconf/files/wmakerconf-2.12-desktop.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- wmakerconf-2.12.orig/wmakerconf.desktop.in	2015-08-23 23:14:56.272180470 +0200
-+++ wmakerconf-2.12/wmakerconf.desktop.in	2015-08-23 23:15:05.446195859 +0200
-@@ -10,4 +10,4 @@
- Icon=@prefix@/share/wmakerconf/wmakerconf.xpm
- Terminal=false
- Type=Application
--Categories=GTK;Application;DesktopSettings
-+Categories=GTK;DesktopSettings;
diff --git a/x11-misc/wmakerconf/files/wmakerconf-2.12-format-security.patch b/x11-misc/wmakerconf/files/wmakerconf-2.12-format-security.patch
deleted file mode 100644
index 91b6109fddbe..000000000000
--- a/x11-misc/wmakerconf/files/wmakerconf-2.12-format-security.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur wmakerconf-2.12.orig/src/error.c wmakerconf-2.12/src/error.c
---- wmakerconf-2.12.orig/src/error.c	2004-12-05 02:44:37.000000000 +0100
-+++ wmakerconf-2.12/src/error.c	2016-04-11 20:42:32.810590888 +0200
-@@ -109,7 +109,7 @@
-       GtkTextIter    iter;
-       GtkTextBuffer *buffer;
-       
--      g_log ("Wmakerconf", G_LOG_LEVEL_WARNING, message);
-+      g_log ("Wmakerconf", G_LOG_LEVEL_WARNING, "%s", message);
-       Free (text);
-       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (log_text));
-       gtk_text_buffer_get_iter_at_offset (buffer, &iter, -1);
diff --git a/x11-misc/wmakerconf/files/wmakerconf-2.12-glib-2.62.patch b/x11-misc/wmakerconf/files/wmakerconf-2.12-glib-2.62.patch
deleted file mode 100644
index 422aa9e813a9..000000000000
--- a/x11-misc/wmakerconf/files/wmakerconf-2.12-glib-2.62.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur wmakerconf-2.12.orig/src/error.h wmakerconf-2.12/src/error.h
---- wmakerconf-2.12.orig/src/error.h	2001-04-18 23:13:33.000000000 +0200
-+++ wmakerconf-2.12/src/error.h	2020-03-07 23:21:51.336443663 +0100
-@@ -37,8 +37,8 @@
- #define  N_(string)	(string)
- /* I18n */
- 
--#define error     error_line=__LINE__,error_file=__FILE__,_error
--#define warning   error_line=__LINE__,error_file=__FILE__,_warning
-+#define error     _error
-+#define warning   _warning
- #define MAXSTRLEN 1024
- 
- #undef NO
diff --git a/x11-misc/wmakerconf/files/wmakerconf-2.12-wmaker-0.95_support.patch b/x11-misc/wmakerconf/files/wmakerconf-2.12-wmaker-0.95_support.patch
deleted file mode 100644
index 5b598c3c1542..000000000000
--- a/x11-misc/wmakerconf/files/wmakerconf-2.12-wmaker-0.95_support.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -Naur wmakerconf-2.12.orig/src/menu.c wmakerconf-2.12/src/menu.c
---- wmakerconf-2.12.orig/src/menu.c	2012-02-10 17:34:57.601475631 +0100
-+++ wmakerconf-2.12/src/menu.c	2012-02-10 17:35:03.917287748 +0100
-@@ -500,10 +500,10 @@
-  *  No return value.
-  */
- {
--   if (!WMWritePropListToFile (orig_wmaker, orig_wmaker_fname, YES))
-+   if (!WMWritePropListToFile(orig_wmaker, orig_wmaker_fname))
-       warning (_("Can't revert to backupfile of `WindowMaker'. "
- 		 "Please manually revert from file WindowMaker.bak."));
--   if (orig_rootmenu && !WMWritePropListToFile (orig_rootmenu, orig_rootmenu_fname, YES))
-+   if (orig_rootmenu && !WMWritePropListToFile(orig_rootmenu, orig_rootmenu_fname))
-       warning (_("Can't revert to backupfile of `WMRootMenu'. "
- 		 "Please manually revert from file WMRootMenu.bak."));
-    gtk_main_quit ();
-diff -Naur wmakerconf-2.12.orig/src/rootmenu.c wmakerconf-2.12/src/rootmenu.c
---- wmakerconf-2.12.orig/src/rootmenu.c	2012-02-10 17:34:57.601475631 +0100
-+++ wmakerconf-2.12/src/rootmenu.c	2012-02-10 17:35:03.929287391 +0100
-@@ -365,7 +365,7 @@
- 		       node_freeitem, NULL);
-       g_node_destroy (node);
- 
--      if (WMWritePropListToFile (menu, filename, YES))
-+      if (WMWritePropListToFile(menu, filename))
-       {
- 	 menu_changed = NO;
- 	 message (_("Window Maker root menu file '%s' saved."), filename);
-diff -Naur wmakerconf-2.12.orig/src/themebrowser.c wmakerconf-2.12/src/themebrowser.c
---- wmakerconf-2.12.orig/src/themebrowser.c	2012-02-10 17:34:57.601475631 +0100
-+++ wmakerconf-2.12/src/themebrowser.c	2012-02-10 17:35:56.515722786 +0100
-@@ -2705,7 +2705,7 @@
- 	 oldfiles = g_list_remove (oldfiles, tmp);
- 	 Free (tmp);
-       }
--      if (!WMWritePropListToFile (theme, stylename, YES))
-+      if (!WMWritePropListToFile(theme, stylename))
-       {
- 	 dialog_popup (DIALOG_ERROR, NULL, NULL,
- 		       _("Can't save theme file\n`%s'\n"
-diff -Naur wmakerconf-2.12.orig/src/window.c wmakerconf-2.12/src/window.c
---- wmakerconf-2.12.orig/src/window.c	2012-02-10 17:34:57.601475631 +0100
-+++ wmakerconf-2.12/src/window.c	2012-02-10 17:35:03.953286677 +0100
-@@ -1069,7 +1069,7 @@
- 	 WMReleasePropList (all_keys);
-       }
- 
--      if (WMWritePropListToFile (newwm, orig_wmaker_fname, YES))
-+      if (WMWritePropListToFile(newwm, orig_wmaker_fname))
-       {
- 	 changed = NO;
- 	 message (_("Window Maker config file '%s' saved."),
-diff -Naur wmakerconf-2.12.orig/src/wmconfig.c wmakerconf-2.12/src/wmconfig.c
---- wmakerconf-2.12.orig/src/wmconfig.c	2012-02-10 17:34:57.601475631 +0100
-+++ wmakerconf-2.12/src/wmconfig.c	2012-02-10 17:35:03.957286559 +0100
-@@ -216,7 +216,7 @@
- 	 /*
- 	  *  Generate backup file "'path'.bak"
- 	  */
--	 if (WMWritePropListToFile (orig_rootmenu, new, YES))
-+	 if (WMWritePropListToFile(orig_rootmenu, new))
- 	    message (_("Backupfile `%s' generated."), new);
- 	 else
- 	    error (_("Can't write backupfile `%s'."), new);
-@@ -280,7 +280,7 @@
-    if (!windowmaker)
-    {
-       windowmaker = global_windowmaker;
--      if (WMWritePropListToFile (windowmaker, orig_wmaker_fname, YES))
-+      if (WMWritePropListToFile(windowmaker, orig_wmaker_fname))
- 	 warning (_("New WindowMaker configuration file `%s' created."),
- 		  orig_wmaker_fname);
-       else
-@@ -294,7 +294,7 @@
-       /*
-        *  Generate backup file "'path'.bak"
-        */
--      if (WMWritePropListToFile (windowmaker, new, YES))
-+      if (WMWritePropListToFile(windowmaker, new))
- 	 message (_("Backupfile `%s' generated."), new);
-       else
- 	 error (_("Can't write backupfile `%s'."), new);
diff --git a/x11-misc/wmakerconf/metadata.xml b/x11-misc/wmakerconf/metadata.xml
deleted file mode 100644
index 2fc688f08024..000000000000
--- a/x11-misc/wmakerconf/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">wmakerconf</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild b/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild
deleted file mode 100644
index dcb30653f053..000000000000
--- a/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="X based config tool for the windowmaker X windowmanager"
-HOMEPAGE="http://wmakerconf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="nls perl"
-
-RDEPEND="x11-libs/gtk+:2
-	>=x11-wm/windowmaker-0.95.2
-	perl? ( dev-lang/perl
-		dev-perl/HTML-Parser
-		|| ( dev-perl/libwww-perl
-		www-client/lynx
-		net-misc/wget ) )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-desktop.patch
-	"${FILESDIR}"/${P}-format-security.patch
-	"${FILESDIR}"/${P}-wmaker-0.95_support.patch
-	"${FILESDIR}"/${P}-glib-2.62.patch
-)
-
-src_prepare() {
-	sed -e "/^LIBS =/s/$/ -lX11/" -i src/Makefile.in || die
-	default
-}
-
-src_configure() {
-	econf \
-		--disable-imlibtest \
-		$(use_enable perl upgrade) \
-		$(use_enable nls) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" gnulocaledir="${ED}/usr/share/locale" install
-	dodoc AUTHORS ChangeLog MANUAL NEWS README TODO
-	doman man/*.1
-
-	rm -f "${ED}"/usr/share/${PN}/{AUTHORS,README,COPYING,NEWS,MANUAL,ABOUT-NLS,NLS-TEAM1,ChangeLog}
-}
-
-pkg_postinst() {
-	elog "New features added with WindowMaker >= 0.95 will not be available in wmakerconf"
-	elog "WPrefs is the recommended configuration tool"
-}
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index ccf9baa9f8f0..292c0b76e31c 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,5 +1,7 @@
 AUX xkeyboard-config-2.29-fix-python3-support.patch 1042 BLAKE2B 0ca08ee5c3b82b4af1c9fe9b49fe5ad04a9978a7215f4381c4be96506067068fdf4204dbbd23976a4dd049779701ec3c52a09a961d9e1fecd153007e9ff00ecc SHA512 5619cbfa849792138b0e2785d8d94560707937bf15e026ed85a1ce255212d13bce61de5eeb3b8a6d4a431f41de58d03421911ef7abaf095163a38ca0c5304b3a
 DIST xkeyboard-config-2.29.tar.bz2 1707176 BLAKE2B 436f2e8f4c7bea5a96e551daf01cdf6f7eeb2468dbacd28b977be003e159d0af9f233f17749fb5379444ce84c8d5c78f1c949e4bddfa3db6d39338ae01f0aefe SHA512 202255af097f3063d76341d1b4a7672662dc645f9bcd7afa87bc966a41db4c20fc6b8f4fbe2fcaec99b6bc458eac10129141a866a165857c46282f6705b78670
+DIST xkeyboard-config-2.30.tar.bz2 1689137 BLAKE2B 54ba0a3a82d65f4cf15c45aa500bd8a44865c9ce845d5bc1ae85d3544a384622c580baa119b8882defa9868d8210697153f868a273a38852d938bf318ed09c3b SHA512 2d775dcaab49d80f62b8eaadc9be406b42c9a3643d3a360f864a462c61865abce67d0a8a80772d54f8136603114c61b5168fd06771f9c132411911914abb1ea4
 EBUILD xkeyboard-config-2.29.ebuild 1395 BLAKE2B 5b12916ab898994fd013590bfe57ea2925310d251f8609f1995b9a64cf5ec4fc5f9beae49dbd2de9ee0ffed017d466c2f995487d32669e86fc149e4789c0bafb SHA512 c20621c807ffd9150558c0c2df7af2fde339045b695cca5f97f51da29ccb136a538b4125492f11617526c363d98fe496057edb5c8ff405130a5d7763d0876325
+EBUILD xkeyboard-config-2.30.ebuild 1344 BLAKE2B 3c02114e37b8db6084419232eac2b01e9b9d3b7417403a77e78a340bf5c0457ae307217d6ee79e50ab0130b79c7e173824a68b4b946d25ae6cbf8e763b9bf84f SHA512 3133d952555a82d6aa55a8e8a5d39a6357d8b8e9f13f5ed5f1be0dde0ccbef4bb381fe1effab2ff259500b1810aa697892c2795084fae4b319213158fe4a4260
 EBUILD xkeyboard-config-9999.ebuild 1344 BLAKE2B 3c02114e37b8db6084419232eac2b01e9b9d3b7417403a77e78a340bf5c0457ae307217d6ee79e50ab0130b79c7e173824a68b4b946d25ae6cbf8e763b9bf84f SHA512 3133d952555a82d6aa55a8e8a5d39a6357d8b8e9f13f5ed5f1be0dde0ccbef4bb381fe1effab2ff259500b1810aa697892c2795084fae4b319213158fe4a4260
 MISC metadata.xml 337 BLAKE2B ab0893146e71b0d96879e7ec41c7c4e057cb92570227daef015b6fa1a24c55709cd3d19e16df5afe80f706995e12a44a9fc29826a552bd436b1e9381e44acde5 SHA512 6a43f86407638d3f156d4ae64caee882878dbd1ee7c23991c8f378d55cfb0afe016202866f95c328d8b4e59186efa6a7cb7335a1c86e3fbdda4c16a96e175cf0
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild
new file mode 100644
index 000000000000..66e3276b4ab7
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit python-any-r1
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
+	inherit autotools git-r3
+	# x11-misc/util-macros only required on live ebuilds
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND=""
+DEPEND="${LIVE_DEPEND}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
+		--enable-compat-rules
+		# do not check for runtime deps
+		--disable-runtime-deps
+		--with-xkb-rules-symlink=xorg
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_test() {
+	:;
+}
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 6c80c82ffead..fc3026664dee 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -1,6 +1,7 @@
 AUX xlockmore-5.46-freetype261.patch 561 BLAKE2B f5fde1a8984784a2892363b85413728b86082f8bdd3303358643bcd634a80bc6064fce930aabca92624897fddf71c0647a6202e7e0debb02b4127d275c99b57e SHA512 58b75f4509f4762f4009fce797b5f0420ac3bee79a3fa4444a90603b1522c5f60deb9a1ce94ecacb025d27ac6272f2b431075af912b121f6e5cfa541b696caca
 AUX xlockmore-5.47-CXX.patch 613 BLAKE2B ace9eb868bcdf4fa7fda07d5a0dfc316f992fd176616c531aa71ff5d051169165f991dd8a586685b5a0b8e1a66b0da247a441fd7a56ecd24cc39bd58f2267e8b SHA512 4eef79a2b791401433ae0c6e55179975f88b74c4e57cd64ca81df48a232723e5edaccbd7045c9f67ba81ba159e70257d5e070ea59808f52430ac08539ea91087
 AUX xlockmore-5.47-strip.patch 2048 BLAKE2B 0f0f00a38e1d3b5edebf40416698ad3b87323ce9167e7a3e0a44ca2fca853b16e9c1ff59ff74b0bf50b3484e25722a3ee840b312f2f249644614aef55095bfcc SHA512 2de24cbacab2a54e7a41f4604625096030763ad6212ec30b34be2c2fc4035b44f146bfb9d0a34df9c9ce4fa96a0eb1c9c7701b512a917fdf3eb56a5195c8585e
+AUX xlockmore-5.64_alpha0-LDFLAGS.patch 906 BLAKE2B 477e2fa3b3e74ef3bcb93d0f87f82f05f05dbd0b8fe395a2be3540986df74acff7650dcaaae84809f2cef9d5da7ff8360cd40e261328d2f404b58338e7353b13 SHA512 ae42b30b37eeccbf767e6e44a557611ae8bd549778b1b4671355d0cd4c3fbb195c23a6b3dfac7b4aa2563cfba86ddbafa791bc3786b9c8c1b84ae057e625e2b5
 DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
 DIST xlockmore-5.62.tar.xz 1943836 BLAKE2B 6ce9b9ad709881a50eba0e32ae1e7524414a5e92e34daeff1ce68b6bb4738117155543d15219723ab514d520064601824a22d438541a699c742ab0c620285c64 SHA512 fc7c63a8ce781ba1a9598b5e3d585cc85051da864dbd59e3232b2fa6b6529743f9244e52bdf588ae438c02a2e1e745eb81b372234189e73ae6698cc962c387c2
 DIST xlockmore-5.63.tar.xz 1944624 BLAKE2B 8ee27c5cc88a7088705b7a017563698fa4bf99418bf3237594a1237547fa1eb9d5274327672f33344e97d2333eca71f95e51f760f0548abef06f8006a97c55c0 SHA512 0b067ced9afe0c5498f0b1e19bf163b0363bbb4bc2bc2007c1c0416328cdc2d528d664b122ef68322c38f2bcc37a15665b31ee6e8ce2369bad9e50528b93a047
@@ -8,5 +9,5 @@ DIST xlockmore-5.64ALPHA0.tar.xz 1944032 BLAKE2B 859561b8a4986ffc34c1a229b957792
 EBUILD xlockmore-5.50.ebuild 2231 BLAKE2B 3accf80283ec7705cfafe4531bc38c1694d9d27381c9aa375bb14a1d59e865dd1c2aa8c99d1cdd26a93fe929b3302ca4646fe93f740feb56c86b70ca9362ed6c SHA512 f0116108dcbae364e4a7c391054890fca090fc182b8bd11c613e84bc91ccb07904e5bd14c515b934e2895c9e6bd2f82762d09719de4e648f6077338e3f05ff97
 EBUILD xlockmore-5.62.ebuild 2290 BLAKE2B 684053c5ea68511e810fdddff942f61ad18ffcdffa32a1b6eb68ed4269def2d03b82a70b75c3e37500615c5816077a49944b93858a53b9e07b8eba27c68bcba0 SHA512 e7818da25a25f015a06aec1f8096a3394981bc4c68a73f7a6a178fff6e278a91f088b02423eaf937aea0d9e33b5115973f23e714e78b12ae5458977012efb22f
 EBUILD xlockmore-5.63.ebuild 2284 BLAKE2B 5dfca5003f797a6765b33f14a91664b40559441812611677f392b2291a7e29297c254fb29ec3ea895df6e903f98e5926215b74d2ea0b342527da35eb045cc2f0 SHA512 0ec91c240df64f0a3e6c3c0aa7fbf35bdb889cb4d4cc76825223802cf3dd807067f228980838e1d813214f20ba8269d1cc9df96548dc14d2dca4b2d8ee102671
-EBUILD xlockmore-5.64_alpha0.ebuild 2290 BLAKE2B 684053c5ea68511e810fdddff942f61ad18ffcdffa32a1b6eb68ed4269def2d03b82a70b75c3e37500615c5816077a49944b93858a53b9e07b8eba27c68bcba0 SHA512 e7818da25a25f015a06aec1f8096a3394981bc4c68a73f7a6a178fff6e278a91f088b02423eaf937aea0d9e33b5115973f23e714e78b12ae5458977012efb22f
+EBUILD xlockmore-5.64_alpha0.ebuild 2337 BLAKE2B 73ba42d7fc570be8efda9ce39f50174fdfb2ff653f64b4ac5ede455d737c7d248d5a128cee3433eb00bd8973a3dc525a212bd5bac6f92474034b0ec7c2a2cb46 SHA512 e1996a03cc088f2e07fd077fb4c5209607d3ea288935ed6469356af6edff47739a99fac2dec4d8d98583591167ff81f9d7da1bf60418ff47c6046c667af76f07
 MISC metadata.xml 446 BLAKE2B d638ac6f12a203ae9ada10ae4c33e3a3d9901e350b6e6925c50078d66b29343cae42a67f84d5334182c1e816bddb05d062eb7b7e47c9125b273db118c4de573b SHA512 c8fafb010e63c39beeee5b53ad37354d19e98ac4cf33f29606b0af379811a0738c9c70d1fb7c31a5673d4a6365fb658a6a8bf49135b748bea9069a690ce543ed
diff --git a/x11-misc/xlockmore/files/xlockmore-5.64_alpha0-LDFLAGS.patch b/x11-misc/xlockmore/files/xlockmore-5.64_alpha0-LDFLAGS.patch
new file mode 100644
index 000000000000..f36e3ab0b7a2
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.64_alpha0-LDFLAGS.patch
@@ -0,0 +1,33 @@
+--- a/modes/Makefile.in
++++ b/modes/Makefile.in
+@@ -344,7 +344,7 @@
+ CXXFLAGS = @CXXFLAGS@
+ #CFLAGS = -O
+ #CFLAGS = -g
+-XLOCKLDFLAGS = @XLOCKLDFLAGS@ $(CHECKLDFLAG)
++XLOCKLDFLAGS = $(LDFLAGS) @XLOCKLDFLAGS@ $(CHECKLDFLAG)
+ XLIBS = @XLIBS@
+ XLOCKLIBS = $(MODULELIB) @XLOCKLIBS@
+ 
+--- a/xmlock/Makefile.in
++++ b/xmlock/Makefile.in
+@@ -94,7 +94,7 @@
+ CFLAGS = @CFLAGS@
+ #CFLAGS = -O
+ #CFLAGS = -g
+-XMLOCKLDFLAGS = @XMLOCKLDFLAGS@
++XMLOCKLDFLAGS = $(LDFLAGS) @XMLOCKLDFLAGS@
+ XLIBS = @XLIBS@
+ XMLOCKLIBS = @XMLOCKLIBS@
+ #If you have purify, and want to use it, uncomment this definition or
+--- a/xglock/Makefile.in
++++ b/xglock/Makefile.in
+@@ -92,7 +92,7 @@
+ CFLAGS = @GTK_CFLAGS@ @CFLAGS@
+ #CFLAGS = -O
+ #CFLAGS = -g
+-XGLOCKLDFLAGS = @XGLOCKLDFLAGS@
++XGLOCKLDFLAGS = $(LDFLAGS) @XGLOCKLDFLAGS@
+ XLIBS = @XLIBS@
+ XGLOCKLIBS = @XGLOCKLIBS@
+ #If you have purify, and want to use it, uncomment this definition or
diff --git a/x11-misc/xlockmore/xlockmore-5.64_alpha0.ebuild b/x11-misc/xlockmore/xlockmore-5.64_alpha0.ebuild
index 2071d0700818..26cf0a2b0721 100644
--- a/x11-misc/xlockmore/xlockmore-5.64_alpha0.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.64_alpha0.ebuild
@@ -50,6 +50,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.46-freetype261.patch
 	"${FILESDIR}"/${PN}-5.47-CXX.patch
 	"${FILESDIR}"/${PN}-5.47-strip.patch
+	"${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch
 )
 S=${WORKDIR}/${P/_alpha/ALPHA}
 
diff --git a/x11-misc/xmobar/Manifest b/x11-misc/xmobar/Manifest
index f9eed008cc96..eb8d4f621c5d 100644
--- a/x11-misc/xmobar/Manifest
+++ b/x11-misc/xmobar/Manifest
@@ -1,8 +1,10 @@
+AUX xmobar-0.24.3-alsa-mixer-0.3.patch 1113 BLAKE2B bd73e83144c9544b96ecce7c0990a68e14befc8556e325d62634bb62745f9f0dd84711b2b4873d31c6b228ba1383132edb3fb75638eb0e306333e354cf2c78c6 SHA512 87e1a2461aa98d02f6b4e0602429e24fd906de86f982328affb055514151e338ce20a4294485f490ef1678e7a3633736d7bb553d66c464a9dddf1becf6dc2b58
 AUX xmobar-0.24.3-noxpm.patch 363 BLAKE2B f7bc04a5c317400501c0bfc86b403cb7c12e5407ff492a58cc252b54d4723a00fe2dbb954c0ff85f0b9d9f283b0b1739ef7b882e797f8f26125044dbd56b36ff SHA512 54e87bfac3476d0821c7b42ace5f9f3f2709ca89bdb182f3e93bdfb3e09cb0432267698e20aa325099949694120f0f81810e5c5a026839899de2b1d4550485c8
 DIST xmobar-0.23.1.tar.gz 96169 BLAKE2B 5d16d3fc0a052614bc86cbc5ab515a5e2879d39d7bdf4541a3a10193c08bdc34a9bb07468ff7142c73e58694fb24c2fe581934404fd5ca737c4736855c60d316 SHA512 0215c02d32d90efff4d041d48b663755ccfb1944281f8a2cabb3e88cc9fd77221da03dd709b9c96f5ca8d7204561fe33fdabf37a2d919a83374df71909cc5978
 DIST xmobar-0.24.2.tar.gz 100179 BLAKE2B a5ca50d66bdb83274be62d1df83545d3527a3d05fc41708be44927ff75519f8686a2afc6671bede1142b881ebef37ede5116abff557b03276d509b031f5292d3 SHA512 c271e50d615d509c2c15ffa716b45df3211cfa143b128126c55a78a056475c9fbb6d7abc60a6a058e20a12aced5f33b94cecc35c73a76505e33e62ea1f1561f8
 DIST xmobar-0.24.3.tar.gz 100317 BLAKE2B 3ca7aeb977688b975674dc767f645d15aaf296ff906f51d79529ee58d827188437695b4ee0b960563f6c0ce1489baf1f5bdc4360807989277078a93dfafb3ed1 SHA512 aa16d55b16cf108005ee8ec6c3d1b348b3e70a5182cbb97eed2aeb67bed83bee4b23acff6d29d5bda5a30ce35dc87463a6ade6e0814b588f53b173a1c3b5a5b3
 EBUILD xmobar-0.23.1.ebuild 2874 BLAKE2B df35ca980a34b443b73170fb496fa0cf9d41861a54d1c804b113e4e72b979799b3bb4a2134287f2374590baebc4e258f08e1175a8958d0c56dd1b4da4e8ac92e SHA512 5eb9e8afde181c8ae13da72013ca22b77ae79ed16b57f0a8dd89df395725354fd6c31f95255763e6d6d7d45520525d07bffc0044a03b7a42eb9e9b5c55177e4d
 EBUILD xmobar-0.24.2.ebuild 3017 BLAKE2B 0b304a167a5da7222cba30e8d4b88a4566e7891a960eedafe6f555e5a7afbe6434d0117fa02390d05f2ec4bd1e78c0dddca57ad57a4ea6cc87aa99bb1a6a08f0 SHA512 284eba89d9aed6997268b90d1aa0b6fc83d6c7e031bc267a071caad9308e8235bfc8c25c9b2ba86ca1cac1e070296575d10f3337c387bba9193fa9253bbe0ed6
-EBUILD xmobar-0.24.3.ebuild 3036 BLAKE2B 3d844be3c3ac6f677693cbc84c5fe4b91c59411ff03ba22a598bc27b4efb55f4bd6bda751e8ee30ef59c423be27c5c9739b1c8d18c7d762e562dfd8e27b28f27 SHA512 bb8c785a79532028f89ea28d6f77422da2a628bf6cd422f9bb0283c90063625c56730862eb8ae3b72b194f62ad0816ff97e8ddb0ef4f1254fe79c02f831a8651
+EBUILD xmobar-0.24.3-r1.ebuild 3131 BLAKE2B 9559d065d2fc80acbb5284f06fe6f7ceb1c1664663d889376f86aacb1846ead62c4f3818d8dee68638b3aea84ff42e6b0ccaeb79e84b3666a10784cb0245b3ff SHA512 a3e3295e0654c6c36d2024e53c1fbf8d3fa0b6edf9705c876a63acbe5b6f6397c76eeb32364ae4cf92aafdd7c4d3c08d8a21af019adce163d9cb274277b39442
+EBUILD xmobar-0.24.3.ebuild 3090 BLAKE2B 4a8baabbcef3c4f8d52ce2edba2a96762f520159ae836272eec9d8b51696f8f5fa4535539af3ef981b15fc59c50dab8cb5b58521d34ef1c7f2e6eb4727c129a3 SHA512 2d8318df250ca22d86562e3aaa93c04eac88fd9a9b81e7495cb1a99c655bdfb431dbe4589b5092333e0c2673be250e8ae358abe5064d65b4bd00d8929c648c70
 MISC metadata.xml 807 BLAKE2B 3529fa66e04b28b6a55fd835e942c7bbe0e1e3888d16374eb62a7a57c5e88244a4bbd6fbc8370f3e27a586f3ed46b32f28afcd0d5f0254374230809c0338f9d7 SHA512 3753cd9088cf4c0d7858876d7606379c52b65ab5ed2314b69a480d3b21c522b8f3934b2572c61f72efb7be1da3b77665e055b6a76641c7f22d7c0de65e98ec44
diff --git a/x11-misc/xmobar/files/xmobar-0.24.3-alsa-mixer-0.3.patch b/x11-misc/xmobar/files/xmobar-0.24.3-alsa-mixer-0.3.patch
new file mode 100644
index 000000000000..837df1d29753
--- /dev/null
+++ b/x11-misc/xmobar/files/xmobar-0.24.3-alsa-mixer-0.3.patch
@@ -0,0 +1,26 @@
+--- a/src/Plugins/Monitors/Volume.hs
++++ b/src/Plugins/Monitors/Volume.hs
+@@ -122,7 +122,8 @@ formatDb opts dbi = do
+ runVolume :: String -> String -> [String] -> Monitor String
+ runVolume mixerName controlName argv = do
+     opts <- io $ parseOpts argv
+-    (lo, hi, val, db, sw) <- io readMixer
++    (lo', hi', val', db, sw) <- io readMixer
++    let (lo, hi, val) = (toInteger <$> lo', toInteger <$> hi', toInteger <$> val')
+     p <- liftMonitor $ liftM3 formatVol lo hi val
+     b <- liftMonitor $ liftM3 formatVolBar lo hi val
+     v <- liftMonitor $ liftM3 formatVolVBar lo hi val
+@@ -164,11 +165,11 @@ runVolume mixerName controlName argv = do
+ 
+     getDB :: Maybe Volume -> IO (Maybe Integer)
+     getDB Nothing = return Nothing
+-    getDB (Just v) = channel (dB v) 0
++    getDB (Just v) = fmap toInteger <$> channel (dB v) 0
+ 
+     getVal :: Maybe Volume -> IO (Maybe Integer)
+     getVal Nothing = return Nothing
+-    getVal (Just v) = channel (value v) 0
++    getVal (Just v) = fmap toInteger <$> channel (value v) 0
+ 
+     getSw :: Maybe Switch -> IO (Maybe Bool)
+     getSw Nothing = return Nothing
diff --git a/x11-misc/xmobar/xmobar-0.24.3-r1.ebuild b/x11-misc/xmobar/xmobar-0.24.3-r1.ebuild
new file mode 100644
index 000000000000..7cf587b82685
--- /dev/null
+++ b/x11-misc/xmobar/xmobar-0.24.3-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.9999
+#hackport: flags: -all_extensions,+with_threaded,+with_utf8,with_iwlib:wifi,with_alsa:alsa,with_xft:xft,with_datezone:timezone,with_dbus:dbus,with_mpd:mpd,with_inotify:inotify,with_mpris:mpris,with_xpm:xpm
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal
+
+DESCRIPTION="A Minimalistic Text Based Status Bar"
+HOMEPAGE="https://xmobar.org"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa dbus inotify mpd mpris timezone wifi conduit uvmeter xft xpm"
+
+RDEPEND=">=dev-haskell/http-4000.2.4:=
+	>=dev-haskell/mtl-2.1:= <dev-haskell/mtl-2.3:=
+	dev-haskell/old-locale:=
+	>=dev-haskell/parsec-3.1:= <dev-haskell/parsec-3.2:=
+	dev-haskell/regex-compat:=
+	>=dev-haskell/stm-2.3:= <dev-haskell/stm-2.5:=
+	>=dev-haskell/utf8-string-0.3:= <dev-haskell/utf8-string-1.1:=
+	>=dev-haskell/x11-1.6.1:=
+	>=dev-lang/ghc-7.8.2:=
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	alsa? ( >=dev-haskell/alsa-core-0.5:= <dev-haskell/alsa-core-0.6:=
+		>=dev-haskell/alsa-mixer-0.3:= )
+	dbus? ( >=dev-haskell/dbus-0.10:= )
+	inotify? ( >=dev-haskell/hinotify-0.3:= <dev-haskell/hinotify-0.4:= )
+	mpd? ( >=dev-haskell/libmpd-0.9:= <dev-haskell/libmpd-0.10:= )
+	mpris? ( >=dev-haskell/dbus-0.10:= )
+	timezone? ( >=dev-haskell/timezone-olson-0.1:= <dev-haskell/timezone-olson-0.2:=
+			>=dev-haskell/timezone-series-0.1:= <dev-haskell/timezone-series-0.2:= )
+	wifi? ( net-wireless/wireless-tools )
+	conduit? ( dev-haskell/http-conduit:=
+			dev-haskell/http-types:= )
+	xft? ( >=dev-haskell/x11-xft-0.2:= <dev-haskell/x11-xft-0.4:= )
+	xpm? ( x11-libs/libXpm )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-noxpm.patch
+	"${FILESDIR}"/${P}-alsa-mixer-0.3.patch
+)
+
+src_prepare() {
+	default
+	# xmobar is an idle multithreaded program
+	# which sits in 'while { sleep(1); }'
+	# loops in multiple threads.
+	# It has a pathological behaviour in GHC:
+	#   everything program does is thread context switch
+	#   100 times per second. It's easily seen with
+	#
+	#       $ strace -f -p `pidof xmobar`
+	#
+	#   where rt_sigreturn() manages to enter/exit
+	# kernel 32 times in each second to do nothing
+	# This workaround allows shrinkng wakeups/thread
+	# switches down to one per second (internal xmobar's
+	# cycle).
+	# Be careful when remove it :]
+	HCFLAGS+=" -with-rtsopts=-V0"
+
+	cabal_chdeps \
+		'stm >= 2.3 && < 2.5' 'stm >= 2.3'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-all_extensions \
+		$(cabal_flag alsa with_alsa) \
+		$(cabal_flag conduit with_conduit) \
+		$(cabal_flag timezone with_datezone) \
+		$(cabal_flag dbus with_dbus) \
+		$(cabal_flag inotify with_inotify) \
+		$(cabal_flag wifi with_iwlib) \
+		$(cabal_flag mpd with_mpd) \
+		$(cabal_flag mpris with_mpris) \
+		--flag=with_threaded \
+		--flag=with_utf8 \
+		$(cabal_flag uvmeter with_uvmeter) \
+		$(cabal_flag xft with_xft) \
+		$(cabal_flag xpm with_xpm)
+}
+
+src_install() {
+	cabal_src_install
+
+	dodoc samples/xmobar.config readme.md news.md
+}
diff --git a/x11-misc/xmobar/xmobar-0.24.3.ebuild b/x11-misc/xmobar/xmobar-0.24.3.ebuild
index 9c2fcc1f822d..62173b3a3355 100644
--- a/x11-misc/xmobar/xmobar-0.24.3.ebuild
+++ b/x11-misc/xmobar/xmobar-0.24.3.ebuild
@@ -67,6 +67,9 @@ src_prepare() {
 	# cycle).
 	# Be careful when remove it :]
 	HCFLAGS+=" -with-rtsopts=-V0"
+
+	cabal_chdeps \
+		'stm >= 2.3 && < 2.5' 'stm >= 2.3'
 }
 
 src_configure() {
diff --git a/x11-misc/xvfb-run/Manifest b/x11-misc/xvfb-run/Manifest
index b90b083957b9..e150df89a5cd 100644
--- a/x11-misc/xvfb-run/Manifest
+++ b/x11-misc/xvfb-run/Manifest
@@ -3,5 +3,5 @@ DIST xorg-server_1.19.3-2.diff.gz 139662 BLAKE2B b88708c4358a121a6f7bd099b15711b
 DIST xorg-server_1.20.8-2.diff.gz 171769 BLAKE2B 5572320e4bc1de63ba221e5c9804d6676cc7c918d417b4069572fec4385d62b73e5636a4f17eebb1897f410e323e190dff68056abd888373df4ccdd688ed7c47 SHA512 89115023fc802a3cf2fc21fabed4499112b1e6f52967eb134795f041194b05d86c59b1477d8b9001c2935efdeb64e8a0dd281a43a6252802df2d19349972f7d7
 EBUILD xvfb-run-1.18.4_p2.ebuild 773 BLAKE2B f43e286a6a376a355c527990a3600eadb7ca7078ee4e9942aa43f8b6c4679e4fccf7521914065bbc77538a5ff18e64081acfa1367919e2920d414c13b6c6225e SHA512 078d5ce6b8a52c4917c61cfc287caac0400e6db5e44b6df8c67455330e400e3cfce0fd0cd497e7c2d5081ad19076c1ce38191b6668f64bc492a663cb3c9aae4e
 EBUILD xvfb-run-1.19.3_p2.ebuild 743 BLAKE2B 9bc489339913c6139369aacb2898c8f4d4f2e987283dd70029705d28942b88ae2e011ac08bfdf72603fcb98e907869edd5a9cd145f92205ad0fdf38e8555a12b SHA512 9cf5be301ecd7fb6aec136deb9fab6e595fa0bdc1dd7392a1c654675f341056e33c9d4118a4e8dc88955ed12f865a8e3c602bf948ab6b013183dd21f48d2a311
-EBUILD xvfb-run-1.20.8_p2.ebuild 737 BLAKE2B 614c1d8d9efdf63d7ff78b80cb45ab25d417fbcc2f2139fc5035ed02459e2b4e17bb3dd8b7623b7397e34f59e5cf1b439ca058d6215e37b903467d7865f0d95f SHA512 e94d3e9b316c5c878e97c521d5c994412580c14f9dd3310a11899c25a54958661cde1ee2b0333dcab74c2189a47b51a4d8a4e804737754c53134f0c7aad6512b
+EBUILD xvfb-run-1.20.8_p2.ebuild 736 BLAKE2B e016ed38a269117a3ac32af70add252192bdbe94c7e305097119552d76a88e5c0b4baa2686261b73a2dd01366336e1494777fa1a51d9b686014c1138b054f9fd SHA512 8fc9c6c2f5eab50040ab95f79c8f34a43b59c9c56ad1308624c982725a33420afaa4860b2825477903c5456a6e6b9605a66407228d693b3573e0044ccef1f212
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild b/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild
index abcfe943c509..1c1b5f678fce 100644
--- a/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-util/patchutils"
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index fa58b60757b9..60c71041ecab 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,9 +1,6 @@
 AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd031096cf2bcbd4d4cb86b31ceff18dda880b5cf1f8441e452642dd28275c9ce6e20c7da0a3a77b4157da13d5d4bbe9b6a30a9086 SHA512 a2e202986c77490898c15f6c4e647667fd6662422e8bbd638624a52a33989cd4259f95b37f488ff4a947f04354704ee9df7b9d60aae2fcc928f1f3186955ea1a
-DIST zim-0.71.1.tar.gz 2883082 BLAKE2B 66d1c571a67e12d8d38cbc6d8bd32918f98f47bff0aa34971986896b3aeec91170cd1f2a87a411a8fccda502addd3de8176cc70ebfbafedc87c462a751e87036 SHA512 0da59955f730cc0bbee033a292c7e531b1a302c950773aed68bd8a18bf1485826086522c4144f24f500e9240ebcb9b592b33dda390923ca0eba6ab57273c0896
-DIST zim-0.72.0.tar.gz 2590406 BLAKE2B 0d77052e9eaa62b855be30eee64863197498ee54949f8610528ccd86cf32e7c9c55fb2faca719a4d92e0568941dc6b100299e76a33f8c49bddc5e367ec98d923 SHA512 60f59c2cf2ebb920515ecbc77e7fb1ddb9b0a6f6179503176b582b6b87ada759707ec4ccee929896a8a7d489f25ff13f7a6ff61fa637ecdb3d02640182cda0b9
 DIST zim-0.72.1.tar.gz 2596910 BLAKE2B cdc6c875ed316dcd5655d75c280b46189d9b7068922ea0cc05606bce8f5bd0ef7d92b7965ee0af067add28ef75f53363e864b3ca43d216dbf99fe2cac6e19a73 SHA512 3b74388eb9272e6c5c89e752d784428b18ffc6cbc76311162aa8f42f2de434ad8e9f9c6932b8aaa62e2a3abdb879a31c982cc3103e7eaa3a5407a02cb6750bfc
-EBUILD zim-0.71.1-r1.ebuild 1951 BLAKE2B 252170b5d9f586212befa366909af94a1ce9e5eb78536bd9dc952f4c539c5e32e0eed71e96deb276c877dfcaff698f91993dd715e08c4b07c54dd79cd7053c30 SHA512 9525cb0a84df79ea7330ade619d242bb315184a893cb570965014fff8bc2f1c9face8f790b989859ef2c203b5cf1369b4c55a1b3b6bffcea3f0ad9bab9c71577
-EBUILD zim-0.72.0.ebuild 1934 BLAKE2B 55516ba1fe0208901156c6beab8bc6a36ed3bfc60bcd1891ea129ab33d213effa7c6d3d12c9de3a588d7ca2f939d2800729577178283340d9816322bae244b84 SHA512 842f5ef971f44df01dd775c7ec65b13766b615caa6bdc862ddbf878c1022356e1749220d2c6437bc80ba234904535d00893094e76768ea92525d47c4dbb1d052
-EBUILD zim-0.72.1-r1.ebuild 1934 BLAKE2B 55516ba1fe0208901156c6beab8bc6a36ed3bfc60bcd1891ea129ab33d213effa7c6d3d12c9de3a588d7ca2f939d2800729577178283340d9816322bae244b84 SHA512 842f5ef971f44df01dd775c7ec65b13766b615caa6bdc862ddbf878c1022356e1749220d2c6437bc80ba234904535d00893094e76768ea92525d47c4dbb1d052
-EBUILD zim-0.72.1-r2.ebuild 1940 BLAKE2B dfa3171f6443e914b989010e49b505895b1ea0aa06501942c5abf3c041cd501e6e2f9ba4e5b8ee6c809ae6d6984ae0ccc117b2ad972c5827ac308a553e8f08df SHA512 e9f686901a40ccf79e72a38cd4d2da0654e928c8369f36743c3880dcbe149d36d1c043dca6da5d5b0a3161a8bedb41cde177a68ac3ff879a25dfa7572d6800c6
+DIST zim-0.73.0.tar.gz 2615116 BLAKE2B 0d7c3910dfaa49f5260b4f7d23f812aa4cd9288bb19ffca0ca7297c49a508b89d4815ee7f2e98883f43c5cad92c6084939b827ccc4cb4e976edbf1cbc910eafa SHA512 0c01c63f68fe661263e25eef80e9b5872f2e5315d1e6a378de6b2486c081d39e5970435feee879a444f16f67ff2eda1a1e790630a3829a630c0ea95e59a505fa
+EBUILD zim-0.72.1-r2.ebuild 1938 BLAKE2B 8df050f51ac404af6410471445eacd43d9450d50f151780e97082d131144d7d2ac84c5dae37e08ac6fbe242311663216a30e5afc9b91a2cc26c340f78b189606 SHA512 3b7f99d4dc56c86c98fbd72fb285c9fdf825062ef25fde9c0de72c9ffc571ebc015a241edb1dc8a76e836d989d1096ebd4adf8eff49d9fffbbe4fa14c612ddff
+EBUILD zim-0.73.0.ebuild 1940 BLAKE2B dfa3171f6443e914b989010e49b505895b1ea0aa06501942c5abf3c041cd501e6e2f9ba4e5b8ee6c809ae6d6984ae0ccc117b2ad972c5827ac308a553e8f08df SHA512 e9f686901a40ccf79e72a38cd4d2da0654e928c8369f36743c3880dcbe149d36d1c043dca6da5d5b0a3161a8bedb41cde177a68ac3ff879a25dfa7572d6800c6
 MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.71.1-r1.ebuild b/x11-misc/zim/zim-0.71.1-r1.ebuild
deleted file mode 100644
index 5408e1591821..000000000000
--- a/x11-misc/zim/zim-0.71.1-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-inherit xdg-utils distutils-r1 gnome2-utils virtualx
-
-DESCRIPTION="A desktop wiki"
-HOMEPAGE="
-	https://zim-wiki.org/
-	https://github.com/zim-desktop-wiki/zim-desktop-wiki
-"
-SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="test"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-	')
-	x11-libs/gtk+:3[introspection]
-	x11-misc/xdg-utils
-"
-DEPEND="
-	${RDEPEND}
-"
-DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
-PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
-S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
-
-python_prepare_all() {
-	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
-
-	if [[ ${LINGUAS} ]]; then
-		local lingua
-		for lingua in translations/*.po; do
-			lingua=${lingua/.po}
-			lingua=${lingua/translations\/}
-			has ${lingua} ${LINGUAS} || \
-				{ rm translations/${lingua}.po || die; }
-		done
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	if ! has_version ${CATEGORY}/${PN}; then
-		elog "Please install these packages for additional functionality"
-		elog "    dev-lang/R"
-		elog "    dev-python/gtkspell-python"
-		elog "    dev-vcs/bzr"
-		elog "    media-gfx/graphviz"
-		elog "    media-gfx/imagemagick"
-		elog "    media-gfx/scrot"
-		elog "    media-sound/lilypond"
-		elog "    sci-visualization/gnuplot"
-		elog "    virtual/latex-base app-text/dvipng"
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-misc/zim/zim-0.72.1-r1.ebuild b/x11-misc/zim/zim-0.72.1-r1.ebuild
deleted file mode 100644
index 64ca6bb5736a..000000000000
--- a/x11-misc/zim/zim-0.72.1-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-inherit xdg-utils distutils-r1 virtualx
-
-DESCRIPTION="A desktop wiki"
-HOMEPAGE="
-	https://zim-wiki.org/
-	https://github.com/zim-desktop-wiki/zim-desktop-wiki
-"
-SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-	')
-	x11-libs/gtk+:3[introspection]
-	x11-misc/xdg-utils
-"
-DEPEND="
-	${RDEPEND}
-"
-DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
-PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
-S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
-
-python_prepare_all() {
-	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
-
-	if [[ ${LINGUAS} ]]; then
-		local lingua
-		for lingua in translations/*.po; do
-			lingua=${lingua/.po}
-			lingua=${lingua/translations\/}
-			has ${lingua} ${LINGUAS} || \
-				{ rm translations/${lingua}.po || die; }
-		done
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	if ! has_version ${CATEGORY}/${PN}; then
-		elog "Please install these packages for additional functionality"
-		elog "    dev-lang/R"
-		elog "    dev-python/gtkspell-python"
-		elog "    dev-vcs/bzr"
-		elog "    media-gfx/graphviz"
-		elog "    media-gfx/imagemagick"
-		elog "    media-gfx/scrot"
-		elog "    media-sound/lilypond"
-		elog "    sci-visualization/gnuplot"
-		elog "    virtual/latex-base app-text/dvipng"
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-misc/zim/zim-0.72.1-r2.ebuild b/x11-misc/zim/zim-0.72.1-r2.ebuild
index 51a1c261843f..c970ffe1e845 100644
--- a/x11-misc/zim/zim-0.72.1-r2.ebuild
+++ b/x11-misc/zim/zim-0.72.1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 RESTRICT="test"
 
 RDEPEND="
diff --git a/x11-misc/zim/zim-0.72.0.ebuild b/x11-misc/zim/zim-0.73.0.ebuild
index 64ca6bb5736a..51a1c261843f 100644
--- a/x11-misc/zim/zim-0.72.0.ebuild
+++ b/x11-misc/zim/zim-0.73.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
 inherit xdg-utils distutils-r1 virtualx
author	V3n3RiX <venerix@redcorelinux.org>	2020-06-13 10:39:22 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-06-13 10:39:22 +0100
commit	9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch)
tree	8ac67e26b45f34d71c5aab3621813b100a0d5f00 /x11-misc
parent	f516638b7fe9592837389826a6152a7e1b251c54 (diff)